封装sortview

ALand.xcodeproj/project.pbxproj

@@ -139,6 +139,8 @@
 		19D906B71CC86DA300CD42DC /* SettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906B51CC86DA300CD42DC /* SettingViewController.xib */; };
 		19D906BB1CC87F3B00CD42DC /* OrderExpressTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D906B91CC87F3B00CD42DC /* OrderExpressTableViewCell.m */; };
 		19D906BC1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906BA1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib */; };
+		19D906C31CC8A20F00CD42DC /* OrderDetailBottomView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19D906C21CC8A20F00CD42DC /* OrderDetailBottomView.xib */; };
+		19D906C61CC8A21700CD42DC /* OrderDetailBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D906C51CC8A21700CD42DC /* OrderDetailBottomView.m */; };
 		19DC6AFC1CBF867E0064A9FD /* JavenShopModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */; };
 		19DC6B0F1CC0AA7D0064A9FD /* MyTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B0E1CC0AA7D0064A9FD /* MyTeamViewController.m */; };
 		19DC6B131CC0ACDE0064A9FD /* MyteamTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B121CC0ACDE0064A9FD /* MyteamTopView.m */; };
@@ -483,6 +485,9 @@
 		19D906B81CC87F3B00CD42DC /* OrderExpressTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderExpressTableViewCell.h; sourceTree = "<group>"; };
 		19D906B91CC87F3B00CD42DC /* OrderExpressTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderExpressTableViewCell.m; sourceTree = "<group>"; };
 		19D906BA1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderExpressTableViewCell.xib; sourceTree = "<group>"; };
+		19D906C21CC8A20F00CD42DC /* OrderDetailBottomView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderDetailBottomView.xib; sourceTree = "<group>"; };
+		19D906C41CC8A21700CD42DC /* OrderDetailBottomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderDetailBottomView.h; sourceTree = "<group>"; };
+		19D906C51CC8A21700CD42DC /* OrderDetailBottomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderDetailBottomView.m; sourceTree = "<group>"; };
 		19DC6AFA1CBF867E0064A9FD /* JavenShopModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenShopModel.h; sourceTree = "<group>"; };
 		19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenShopModel.m; sourceTree = "<group>"; };
 		19DC6B0D1CC0AA7D0064A9FD /* MyTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTeamViewController.h; sourceTree = "<group>"; };
@@ -766,6 +771,9 @@
 				199B4D691CABBEF400451E0E /* OrderDetailTopView.xib */,
 				199B4D6B1CABBF0800451E0E /* OrderDetailTopView.h */,
 				199B4D6C1CABBF0800451E0E /* OrderDetailTopView.m */,
+				19D906C21CC8A20F00CD42DC /* OrderDetailBottomView.xib */,
+				19D906C41CC8A21700CD42DC /* OrderDetailBottomView.h */,
+				19D906C51CC8A21700CD42DC /* OrderDetailBottomView.m */,
 				199B4D831CAE43F800451E0E /* OrderDetailTableViewCell.h */,
 				199B4D841CAE43F800451E0E /* OrderDetailTableViewCell.m */,
 				199B4D851CAE43F800451E0E /* OrderDetailTableViewCell.xib */,
@@ -1392,8 +1400,8 @@
 				1979752B1CA90D3900407E3F /* CommodityManagement */,
 				199BC79F1C9AA7DF00E4E0B8 /* HomeViewController.h */,
 				199BC7A01C9AA7DF00E4E0B8 /* HomeViewController.m */,
-				1929F18C1CA10C94000E9B26 /* HomeCollectionViewController.h */,
 				1929F18D1CA10C94000E9B26 /* HomeCollectionViewController.m */,
+				1929F18C1CA10C94000E9B26 /* HomeCollectionViewController.h */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -1856,6 +1864,7 @@
 				199B4D891CAE67C600451E0E /* SeeLogistics.xib in Resources */,
 				199BC7B21C9AD4FD00E4E0B8 /* LoginViewController.xib in Resources */,
 				19ADD38F1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.xib in Resources */,
+				19D906C31CC8A20F00CD42DC /* OrderDetailBottomView.xib in Resources */,
 				199B4D981CAE701F00451E0E /* StoreManagermentViewController.xib in Resources */,
 				199BC7C81C9BA2A300E4E0B8 /* ResetPasswordViewController.xib in Resources */,
 				197975311CA90DA400407E3F /* CommodityManagementTopView.xib in Resources */,
@@ -2011,6 +2020,7 @@
 				19DCCB691C9A9EB30072C3BF /* IBTObject.m in Sources */,
 				19DCCBDD1C9AA0450072C3BF /* IBTFileManager.m in Sources */,
 				1900A3411CB6059000B2B7C4 /* introductionViewController.m in Sources */,
+				19D906C61CC8A21700CD42DC /* OrderDetailBottomView.m in Sources */,
 				19ADD3771CA4D19F00EE6E5A /* AddCommodityViewController.m in Sources */,
 				199B4D6D1CABBF0800451E0E /* OrderDetailTopView.m in Sources */,
 				19DCCBC71C9AA0450072C3BF /* NSDate+FormatterAdditions.m in Sources */,

ALand/Assets.xcassets/02订单详情_iPhone_assets/icon_order_address.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_order_address.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_order_address@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/CodeClass/Home/View/Commodity/CommodityListCollectionViewCell.xib

@@ -62,8 +62,9 @@
                                     <constraint firstAttribute="height" constant="1" id="qzP-Z6-Apx"/>
                                 </constraints>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aRu-lu-Ec8">
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aRu-lu-Ec8" customClass="MBButtonWithFontAdapter">
                                 <rect key="frame" x="6" y="9" width="115" height="25"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <state key="normal" title="添加到店铺" image="commodityUnAdded">
                                     <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>

ALand/CodeClass/Home/View/Order/OrderCellView.xib

@@ -28,7 +28,7 @@
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bloem天然草本更年期综合营养 胶囊100粒 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dhI-dB-05Q">
                     <rect key="frame" x="106" y="8" width="206" height="41"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="96粒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bGv-K4-Dnw">

ALand/CodeClass/Home/View/Order/OrderDetailBottomView.h

+//
+//  OrderDetailBottomView.h
+//  ALand
+//
+//  Created by Z on 16/4/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface OrderDetailBottomView : UIView
+@property (weak, nonatomic) IBOutlet UILabel *laberRemark;
+@property (weak, nonatomic) IBOutlet UIView *viewRemark;
+
+
+- (void)updateHeight;
+@end

ALand/CodeClass/Home/View/Order/OrderDetailBottomView.m

+//
+//  OrderDetailBottomView.m
+//  ALand
+//
+//  Created by Z on 16/4/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "OrderDetailBottomView.h"
+
+@implementation OrderDetailBottomView
+
+- (void)setString:(NSString *)string {
+    self.laberRemark.text = string;
+    [self layoutIfNeeded];
+    self.height = self.viewRemark.bottom;
+    CLog(@"%f", self.height);
+}
+
+
+
+- (void)updateHeight {
+    self.height = self.viewRemark.bottom + 163;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

ALand/CodeClass/Home/View/Order/OrderDetailTableViewCell.m

@@ -17,6 +17,7 @@
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 
+
     // Configure the view for the selected state
 }
 

ALand/CodeClass/Home/View/Order/OrderDetailTopView.h

@@ -17,12 +17,16 @@ typedef NS_ENUM(NSInteger, ORDERTOPTYPE)
 };
 
 @interface OrderDetailTopView : UIView
-@property (weak, nonatomic) IBOutlet UILabel *labelAddress;
-@property (weak, nonatomic) IBOutlet UILabel *labelRemark;
 @property (nonatomic, assign) ORDERTOPTYPE orderType;
+@property (weak, nonatomic) IBOutlet UILabel *labelAddress;
+@property (weak, nonatomic) IBOutlet UIView *bottomView;
+@property (weak, nonatomic) IBOutlet UILabel *labelName;
+@property (weak, nonatomic) IBOutlet UILabel *labelPhoneNumber;
+
+
 
 @property (nonatomic) CGFloat viewHeight;
 
-- (void)updateTag;
-- (CGFloat)viewHeight;
+- (void)updateHeight;
+
 @end

ALand/CodeClass/Home/View/Order/OrderDetailTopView.m

@@ -9,9 +9,6 @@
 #import "OrderDetailTopView.h"
 
 @interface OrderDetailTopView ()
-@property (weak, nonatomic) IBOutlet UILabel *labelBottom;
-@property (weak, nonatomic) IBOutlet UIView *labelLastView;
-@property (weak, nonatomic) IBOutlet UIImageView *imageViewTag;
 
 @end
 @implementation OrderDetailTopView
@@ -20,41 +17,12 @@
        
 }
 
-- (void)updateTag {
-    switch (self.orderType) {
-        case ORDERTOPTYPE_NOPAYMENT:
-            
-            self.imageViewTag.image = [UIImage imageNamed:@"order_state_noPayment"];
-            
-            break;
-        case ORDERTOPTYPE_WAITFORDISPATCH:
-            
-            self.imageViewTag.image = [UIImage imageNamed:@"order_state_unstasport"];
-            
-            break;
-        case ORDERTOPTYPE_TRANSPORTED:
-            
-            self.imageViewTag.image = [UIImage imageNamed:@"order_state_transported"];
-            
-            
-            break;
-        case ORDERTOPTYPE_COMMPLETE:
-            
-            break;
-        case ORDERTOPTYPE_CANCELED:
-            
-            break;
-            
-        default:
-            break;
-    }
 
+- (void)updateHeight {
+    self.height = self.bottomView.bottom;
 }
-
-
-- (CGFloat)viewHeight {
-    [self.labelLastView layoutIfNeeded];
-    return self.labelLastView.bottom;
+- (IBAction)actionCall:(id)sender {
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"tel://%@", self.labelPhoneNumber.text]]];
 }
 /*
 // Only override drawRect: if you perform custom drawing.

ALand/CodeClass/Home/ViewController/CommodityManagementViewController.h

@@ -8,8 +8,9 @@
 
 #import "IBTUIViewController.h"
 #import "CommodityManagementSortView.h"
+#import "JavenSortView.h"
 
 @interface CommodityManagementViewController : IBTUIViewController
-@property (nonatomic, strong) CommodityManagementSortView *sorView;
+@property (nonatomic, strong) JavenSortView *sorView;
 
 @end

ALand/CodeClass/Home/ViewController/CommodityManagementViewController.m

@@ -14,6 +14,8 @@
 #import "CommodityListModel/CommotityListModel.h"
 #import "ManagementViewController.h"
 #import "Conditions.h"
+
+#import "JavenSortView.h"
 #define kCellID @"commodityCell"
 #define kPageSize @999
 #define kCellId @"CommodityTableViewCell.h"
@@ -297,9 +299,9 @@
 }
 
 #pragma mark =========== lazy loading ===========
-- (CommodityManagementSortView *)sorView {
+- (JavenSortView *)sorView {
     if (!_sorView) {
-        _sorView = [[CommodityManagementSortView new] sortView];
+        _sorView = [JavenSortView sortViewLeftTitles:@[@"销售中",@"未上架"] rightTitles:@[@"最新排序",@"销量排序",@"佣金排序",@"售价排序"]];
         _sorView.frame = CGRectMake(0, _topView.bottom - 50, kWidth, 49);
         
     }

ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerManagementViewController.m

@@ -75,7 +75,7 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    return 110;
+    return kAutoValue(110);
 }
 
 #pragma mark =========== searchbar delegate ===========
@@ -87,24 +87,34 @@
 
 - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
 {
+    self.sortView.userInteractionEnabled = YES;
     [self.searchBar endEditing:YES];
 }
 
 - (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar
 {
+    [self.sortView hide];
+    self.sortView.userInteractionEnabled = NO;
     self.searchBar.showsCancelButton = YES;
     return YES;
 }
 
 - (BOOL)searchBarShouldEndEditing:(UISearchBar *)searchBar
 {
+
     self.searchBar.showsCancelButton = NO;
     return YES;
 }
 
-- (void)cancelSearchAction {
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
+    self.sortView.userInteractionEnabled = YES;
+
+}
 
 
+- (void)popAction {
+    [super popAction];
+    [self.sortView hide];
 }
 
 

ALand/CodeClass/Home/ViewController/ManagementViewController.h

@@ -10,7 +10,7 @@
 #import "CommodityManagementSortView.h"
 #import "CommodityManagementViewController.h"
 @interface ManagementViewController : IBTUIViewController
-@property (nonatomic, strong) CommodityManagementSortView *sorView;
+@property (nonatomic, strong) JavenSortView *sorView;
 @property (nonatomic, strong) NSMutableArray *arrCellData;
 @property (nonatomic, assign) BOOL isLeft;//判断排序判断选中了左边还是右边
 @property (nonatomic, assign) NSInteger row;//判断排序判断选中了哪一行

ALand/CodeClass/Home/ViewController/ManagementViewController.m

@@ -316,13 +316,17 @@
     }];
     
 }
+- (void)popAction {
+    [super popAction];
+    [self.sorView hide];
+}
 
 
 #pragma mark =========== lazyloading ===========
 
-- (CommodityManagementSortView *)sorView {
+- (JavenSortView *)sorView {
     if (!_sorView) {
-        _sorView = [[CommodityManagementSortView new] sortView];
+        _sorView = [JavenSortView sortViewLeftTitles:@[@"销售中",@"未上架"] rightTitles:@[@"最新排序",@"销量排序",@"佣金排序",@"售价排序"]];
         _sorView.frame = CGRectMake(0, 0, kWidth, 49);
     }
     return _sorView;

ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m

@@ -11,9 +11,13 @@
 #import "OrderDetailTableViewCell.h"
 #import "UITableView+Category.h"
 #import "SeeLogistics.h"
+#import "OrderDetailBottomView.h"
+
 #define kCellId @"OrderDetailTableViewCell.h"
 @interface OrderDetailViewController ()<UITableViewDelegate, UITableViewDataSource>
 @property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) OrderDetailBottomView *bottomView;
+@property (nonatomic, strong) OrderDetailTopView *atopView;
 @end
 
 @implementation OrderDetailViewController
@@ -25,24 +29,22 @@
     
     //tableView
     self.tableView = [UITableView plainTableViewWithTarget:self cellNibName:@"OrderDetailTableViewCell" cellId:kCellId];
-    self.tableView.frame = CGRectMake(0, 0, kWidth, kHeight);
+    
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.backgroundColor = kBacroundColor;
     
     [self.view addSubview:self.tableView];//topView
-    OrderDetailTopView *topView = [OrderDetailTopView viewWithNibName:@"OrderDetailTopView"];
-    topView.width = kWidth;
-    topView.labelAddress.text = [NSString randomTestText];
-    topView.labelRemark.text = [NSString randomTestText];
-    topView.frame = CGRectMake(0, -topView.viewHeight, kWidth, topView.viewHeight);
     
-    self.tableView.contentInset = UIEdgeInsetsMake(topView.viewHeight, 0, 64 + 65, 0);
+    
+    OrderDetailTopView *topView = [OrderDetailTopView viewWithNibName:@"OrderDetailTopView"];
+    self.atopView = topView;
+    self.atopView.labelAddress.text = [NSString randomTestText];
     [self.tableView addSubview:topView];
     
-    //改变tag
-    topView.orderType = self.orderType;
-    [topView updateTag];//根据
+    self.bottomView = [OrderDetailBottomView viewWithNibName:@"OrderDetailBottomView"];
+    self.bottomView.laberRemark.text = [NSString randomTestText];
     
+    self.tableView.tableFooterView = self.bottomView;
     
     //底部查看物流按钮
     if (self.orderType == ORDERTOPTYPE_TRANSPORTED) {
@@ -54,8 +56,31 @@
     // Do any additional setup after loading the view.
 }
 
+- (void)viewDidLayoutSubviews {
+    
+    self.tableView.frame = CGRectMake(0, 0, kWidth, kHeight);
+    
+    [self.atopView updateHeight];
+    self.atopView.frame = CGRectMake(0, -self.atopView.height, kWidth, self.atopView.height);
+    
+    
+    
+    [self.bottomView updateHeight];
+    //self.bottomView.y = kHeight - self.bottomView.height;
+    self.bottomView.width = kWidth;
+    
+    self.tableView.contentInset = UIEdgeInsetsMake(self.atopView.height, 0, self.bottomView.height - 250, 0);
+    
+//    self.tableView.frame = CGRectMake(0, 0, kWidth, kHeight - self.atopView.height);
+    [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:YES];
+    
+}
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 316;
+    return 100;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {

ALand/CodeClass/Login/LoginViewController.m

@@ -43,6 +43,12 @@
 
 //本地已有密码时登录
 - (void)defaultLoginAction {
+    
+//    BaseViewController *baseVC = [[BaseViewController alloc] init];
+//    baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+//    [self presentViewController:baseVC animated:YES completion:nil];
+//
+    
     if ([[NSUserDefaults standardUserDefaults] objectForKey:@"passWord"]) {
         
         NSDictionary *paramers = @{@"domain":kDomain,

ALand/Global/JavenSortView.m

@@ -268,19 +268,17 @@
 }
 
 - (void)leftIconAnimateToDefault {
-    WS(weakSelf)
-    [UIView animateWithDuration:0.3 animations:^{
-        weakSelf.leftBtn.imageView.transform = CGAffineTransformMakeRotation(M_PI);
-        
-    }];
+    self.leftBtn.imageView.transform = CGAffineTransformMakeRotation(0);
+    self.isLeftOpen = NO;
+    self.clickCount = 0;
+
+
 }
 
 - (void)rightIconAnimateToDefault {
-    WS(weakSelf)
-    [UIView animateWithDuration:0.3 animations:^{
-        weakSelf.rightBtn.imageView.transform = CGAffineTransformMakeRotation(M_PI);
-        
-    }];
+    self.rightBtn.imageView.transform = CGAffineTransformMakeRotation(0);
+    self.isLeftOpen = YES;
+    self.rightClickCount = 0;
 }