bug fix

ALand.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		190A467A1CE064FE006037CB /* JavenOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46791CE064FE006037CB /* JavenOrderModel.m */; };
 		190A46BE1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */; };
 		190A46C11CE1BC5D006037CB /* CustomerDetailSectionHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */; };
+		190C395D1CF0932B0027E26C /* NSString+OrderState.m in Sources */ = {isa = PBXBuildFile; fileRef = 190C395C1CF0932B0027E26C /* NSString+OrderState.m */; };
 		1912FCD71CCDC945004CF976 /* JavenReseller.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD61CCDC945004CF976 /* JavenReseller.m */; };
 		1912FCDA1CCDC955004CF976 /* JavenResellerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD91CCDC955004CF976 /* JavenResellerModel.m */; };
 		1912FCFB1CD08166004CF976 /* CommotityListBrand.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCF61CD08166004CF976 /* CommotityListBrand.m */; };
@@ -367,6 +368,8 @@
 		190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomerDetailSectionHeader.xib; sourceTree = "<group>"; };
 		190A46BF1CE1BC5D006037CB /* CustomerDetailSectionHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerDetailSectionHeader.h; sourceTree = "<group>"; };
 		190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerDetailSectionHeader.m; sourceTree = "<group>"; };
+		190C395B1CF0932B0027E26C /* NSString+OrderState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+OrderState.h"; sourceTree = "<group>"; };
+		190C395C1CF0932B0027E26C /* NSString+OrderState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+OrderState.m"; sourceTree = "<group>"; };
 		1912FCD51CCDC945004CF976 /* JavenReseller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenReseller.h; sourceTree = "<group>"; };
 		1912FCD61CCDC945004CF976 /* JavenReseller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenReseller.m; sourceTree = "<group>"; };
 		1912FCD81CCDC955004CF976 /* JavenResellerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenResellerModel.h; sourceTree = "<group>"; };
@@ -1017,30 +1020,30 @@
 		191383361CAB961B005F6440 /* Order */ = {
 			isa = PBXGroup;
 			children = (
-				191383371CAB96D4005F6440 /* OrderTableViewCell.h */,
-				191383381CAB96D4005F6440 /* OrderTableViewCell.m */,
-				191383391CAB96D4005F6440 /* OrderTableViewCell.xib */,
-				19D906B81CC87F3B00CD42DC /* OrderExpressTableViewCell.h */,
-				19D906B91CC87F3B00CD42DC /* OrderExpressTableViewCell.m */,
-				19D906BA1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib */,
-				1952C2EB1CED93D80017E4D6 /* OrderListHeaderView.h */,
-				1952C2EC1CED93D80017E4D6 /* OrderListHeaderView.m */,
-				1952C2EE1CED93E90017E4D6 /* OrderListHeaderView.xib */,
-				1952C2F01CED95230017E4D6 /* OrderListFooterView.h */,
-				1952C2F11CED95230017E4D6 /* OrderListFooterView.m */,
-				1952C2F31CED952B0017E4D6 /* OrderListFooterView.xib */,
 				1913833E1CAB9DD4005F6440 /* OrderCellView.h */,
 				1913833F1CAB9DD4005F6440 /* OrderCellView.m */,
 				1913833C1CAB9DC2005F6440 /* OrderCellView.xib */,
-				199B4D691CABBEF400451E0E /* OrderDetailTopView.xib */,
-				199B4D6B1CABBF0800451E0E /* OrderDetailTopView.h */,
-				199B4D6C1CABBF0800451E0E /* OrderDetailTopView.m */,
-				19D906C21CC8A20F00CD42DC /* OrderDetailBottomView.xib */,
 				19D906C41CC8A21700CD42DC /* OrderDetailBottomView.h */,
 				19D906C51CC8A21700CD42DC /* OrderDetailBottomView.m */,
+				19D906C21CC8A20F00CD42DC /* OrderDetailBottomView.xib */,
 				199B4D831CAE43F800451E0E /* OrderDetailTableViewCell.h */,
 				199B4D841CAE43F800451E0E /* OrderDetailTableViewCell.m */,
 				199B4D851CAE43F800451E0E /* OrderDetailTableViewCell.xib */,
+				199B4D6B1CABBF0800451E0E /* OrderDetailTopView.h */,
+				199B4D6C1CABBF0800451E0E /* OrderDetailTopView.m */,
+				199B4D691CABBEF400451E0E /* OrderDetailTopView.xib */,
+				19D906B81CC87F3B00CD42DC /* OrderExpressTableViewCell.h */,
+				19D906B91CC87F3B00CD42DC /* OrderExpressTableViewCell.m */,
+				19D906BA1CC87F3B00CD42DC /* OrderExpressTableViewCell.xib */,
+				1952C2F01CED95230017E4D6 /* OrderListFooterView.h */,
+				1952C2F11CED95230017E4D6 /* OrderListFooterView.m */,
+				1952C2F31CED952B0017E4D6 /* OrderListFooterView.xib */,
+				1952C2EB1CED93D80017E4D6 /* OrderListHeaderView.h */,
+				1952C2EC1CED93D80017E4D6 /* OrderListHeaderView.m */,
+				1952C2EE1CED93E90017E4D6 /* OrderListHeaderView.xib */,
+				191383371CAB96D4005F6440 /* OrderTableViewCell.h */,
+				191383381CAB96D4005F6440 /* OrderTableViewCell.m */,
+				191383391CAB96D4005F6440 /* OrderTableViewCell.xib */,
 				199B4D8A1CAE688400451E0E /* SeeLogistics.h */,
 				199B4D8B1CAE688400451E0E /* SeeLogistics.m */,
 				199B4D881CAE67C600451E0E /* SeeLogistics.xib */,
@@ -1320,7 +1323,7 @@
 				199BC7931C9AA70C00E4E0B8 /* Massage（消息） */,
 				199BC7971C9AA70C00E4E0B8 /* MIne（我的） */,
 				199BC79B1C9AA70C00E4E0B8 /* Store（商城 - 已隐藏） */,
-				19DCCA851C9A95E70072C3BF /* Home（我的） */,
+				19DCCA851C9A95E70072C3BF /* Home（主页） */,
 			);
 			path = CodeClass;
 			sourceTree = "<group>";
@@ -1575,7 +1578,6 @@
 				19D906A91CC7898C00CD42DC /* MineViewController.h */,
 				19D906AA1CC7898C00CD42DC /* MineViewController.m */,
 				19D906AB1CC7898C00CD42DC /* MineViewController.xib */,
-				192900971CD2129B00D226E7 /* MyAcountViewController.h */,
 				192900981CD2129B00D226E7 /* MyAcountViewController.m */,
 				192900991CD2129B00D226E7 /* MyAcountViewController.xib */,
 				19D906B31CC86DA300CD42DC /* SettingViewController.h */,
@@ -1590,6 +1592,7 @@
 				194FB0D81CE32EAB0089A3D5 /* ChangePasswordViewController.m */,
 				194FB0D91CE32EAB0089A3D5 /* ChangePasswordViewController.xib */,
 				194502F51CE9A307005C0781 /* MyBillViewController.h */,
+				192900971CD2129B00D226E7 /* MyAcountViewController.h */,
 				194502F61CE9A307005C0781 /* MyBillViewController.m */,
 			);
 			path = ViewController;
@@ -1848,14 +1851,14 @@
 			path = CustomerManagement;
 			sourceTree = "<group>";
 		};
-		19DCCA851C9A95E70072C3BF /* Home（我的） */ = {
+		19DCCA851C9A95E70072C3BF /* Home（主页） */ = {
 			isa = PBXGroup;
 			children = (
 				19DCCA861C9A95E70072C3BF /* Model */,
 				19DCCA871C9A95E70072C3BF /* View */,
 				19DCCA881C9A95E70072C3BF /* ViewController */,
 			);
-			name = "Home（我的）";
+			name = "Home（主页）";
 			path = Home;
 			sourceTree = "<group>";
 		};
@@ -2143,6 +2146,8 @@
 				192860FE1CBF708C00FA6E85 /* MBProgressHUD+Javen.m */,
 				197BA6831CD85632000E2087 /* NSNumber+Fommater.h */,
 				197BA6841CD85632000E2087 /* NSNumber+Fommater.m */,
+				190C395B1CF0932B0027E26C /* NSString+OrderState.h */,
+				190C395C1CF0932B0027E26C /* NSString+OrderState.m */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
@@ -2557,6 +2562,7 @@
 				197BA6731CD8516B000E2087 /* JavenIdCard.m in Sources */,
 				19DC6B191CC0B5690064A9FD /* MyTeamCollectionViewCell.m in Sources */,
 				19DCCB691C9A9EB30072C3BF /* IBTObject.m in Sources */,
+				190C395D1CF0932B0027E26C /* NSString+OrderState.m in Sources */,
 				192900811CD1AECB00D226E7 /* ShareInstance.m in Sources */,
 				1952C2ED1CED93D80017E4D6 /* OrderListHeaderView.m in Sources */,
 				19DCCBDD1C9AA0450072C3BF /* IBTFileManager.m in Sources */,
@@ -2893,8 +2899,8 @@
 			baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = Aland/PrefixHeader.pch;
 				HEADER_SEARCH_PATHS = (

ALand/Application/AppDelegate.m

@@ -14,6 +14,7 @@
 #import "UMSocialWechatHandler.h"
 #import "IQKeyboardManager.h"
 #import "ZCUIBaseController.h"
+#import "MobClick.h"
 @interface AppDelegate ()
 
 @end
@@ -27,7 +28,7 @@
     self.window.backgroundColor = [UIColor whiteColor];
     [self.window makeKeyAndVisible];
     
-    [UMSocialData setAppKey:@"507fcab25270157b37000010"];
+    [UMSocialData setAppKey:@"573ed34ae0f55a408c000018"];
     [UMSocialQQHandler setQQWithAppId:@"100424468" appKey:@"c7394704798a158208a74ab60104f0ba" url:@"http://www.umeng.com/social"];
     [UMSocialWechatHandler setWXAppId:@"wx2e218a9fb84928fa" appSecret:@"400c1925383f36f7768de707c69035e2" url:@"http://www.umeng.com/social"];
     
@@ -39,7 +40,21 @@
         IBTUINavigationController *navc = [[IBTUINavigationController alloc] initWithRootViewController:loginVC];
         self.window.rootViewController = navc;
     }
-
+    [MobClick startWithAppkey:@"573ed34ae0f55a408c000018" reportPolicy:(REALTIME) channelId:nil];
+    [MobClick setLogEnabled:YES];
+    
+    Class cls = NSClassFromString(@"UMANUtil");
+    SEL deviceIDSelector = @selector(openUDIDString);
+    NSString *deviceID = nil;
+    if(cls && [cls respondsToSelector:deviceIDSelector]){
+        deviceID = [cls performSelector:deviceIDSelector];
+    }
+    NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@{@"oid" : deviceID}
+                                                       options:NSJSONWritingPrettyPrinted
+                                                         error:nil];
+    
+    NSLog(@"%@", [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]);
+    
     [[[IQKeyboardManager sharedManager] disabledDistanceHandlingClasses] addObject:[ZCUIBaseController class]];
     [[IQKeyboardManager sharedManager].disabledToolbarClasses addObject:[ZCUIBaseController class]];
 

ALand/CodeClass/Home/Model/Order/JavenOrderModel.h

@@ -17,6 +17,16 @@
 
 @class JavenReseller, JavenLastModifyInfo, JavenTicket, JavenShop, JavenCreateInfo, JavenConsumer, JavenAddress;
 
+typedef NS_ENUM(NSInteger, ORDERTOPTYPE)
+{
+    ORDERTOPTYPE_NOPAYMENT,//代支付
+    ORDERTOPTYPE_WAITFORDISPATCH,//待发货
+    ORDERTOPTYPE_TRANSPORTED,//已发货
+    ORDERTOPTYPE_COMMPLETE,//已完成
+    ORDERTOPTYPE_CANCELED//已取消
+};
+
+
 @interface JavenOrderModel : NSObject <NSCoding, NSCopying>
 
 @property (nonatomic, strong) NSArray<JavenGoodsDetails *> *goodsDetails;
@@ -50,5 +60,5 @@
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;
 - (NSDictionary *)dictionaryRepresentation;
-
+- (NSString *)getState;
 @end

ALand/CodeClass/Home/Model/Order/JavenOrderModel.m

@@ -129,6 +129,8 @@ NSString *const kJavenOrderModelShkjtNo = @"shkjtNo";
 
     }
     
+    
+    
     return self;
     
 }
@@ -296,5 +298,19 @@ NSString *const kJavenOrderModelShkjtNo = @"shkjtNo";
     return copy;
 }
 
+- (NSString *)getState
+{
+    NSArray *arrStateCode = @[@"toBePaid",@"toBeShipped",@"shipped",@"paid",@"cancelled"];
+    NSArray *arrTitle = @[@"待支付",@"待发货",@"已发货",@"已完成",@"已取消"];
+    
+    NSString *state;
+    for (int i = 0; i < arrStateCode.count; i++) {
+        if ([arrStateCode[i] isEqualToString:self.state]) {
+            state = arrTitle[i];
+            break;
+        }
+    }    return state;
+}
+
 
 @end

ALand/CodeClass/Home/View/CustomerManagement/CustomerDetailSectionHeader.m

@@ -18,16 +18,7 @@
 
 - (void)viewWithModel:(JavenOrderModel *)model {
     self.labelDate.text = model.createInfo.time;
-    
-    NSArray *arrStateCode = @[@"toBePaid",@"toBeShipped",@"shipped",@"paid",@"cancelled"];
-    NSArray *arrTitle = @[@"待支付",@"待发货",@"已发货",@"已完成",@"已取消"];
-    
-    for (int i = 0; i < arrStateCode.count; i++) {
-        if ([arrStateCode[i] isEqualToString:model.state]) {
-            self.labelState.text = arrTitle[i];
-            break;
-        }
-    }
+    self.labelState.text = [model.state getOrderStateString];
 }
 /*
 // Only override drawRect: if you perform custom drawing.

ALand/CodeClass/Home/View/CustomerManagement/CustomerTopView.xib

@@ -179,7 +179,7 @@
         </view>
     </objects>
     <resources>
-        <image name="bac" width="13" height="24"/>
+        <image name="bac" width="11" height="20"/>
         <image name="call_icon" width="45" height="45"/>
         <image name="defaultUserIcon" width="84" height="84"/>
     </resources>

ALand/CodeClass/Home/View/HomeCollectionFooterReusableView.m

@@ -11,6 +11,7 @@
 #import "JavenAdModel.h"
 #import "HomeAdViewController.h"
 #import "UIView+Category.h"
+#import "NSString+Category.h"
 @interface HomeCollectionFooterReusableView ()<SDCycleScrollViewDelegate>
 @property (nonatomic, strong) NSMutableArray<JavenAdModel *> *arrDatas;
 
@@ -34,7 +35,15 @@
             for (NSDictionary *dic in responseObject[@"list"]) {
                 JavenAdModel *model = [JavenAdModel modelObjectWithDictionary:dic];
                 [weakSelf.arrDatas addObject: model];
-                [arrPic addObject:model.picture];
+                
+                NSString *imgUrl;
+                if ([model.picture isHasChinese]) {
+                    imgUrl = [model.picture stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                }else{
+                    imgUrl = model.picture;
+                }
+
+                [arrPic addObject:imgUrl];
             }
             
             SDCycleScrollView *scrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, width, height) delegate:self placeholderImage:[UIImage imageNamed:@"cyclescrollplaceholder"]];
@@ -53,6 +62,7 @@
     return self;
 }
 
+
 - (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index
 {
     HomeAdViewController *adVC = [[HomeAdViewController alloc] init];

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

@@ -16,6 +16,8 @@
 @property (weak, nonatomic) IBOutlet UILabel *labelTax;
 @property (weak, nonatomic) IBOutlet UILabel *labelTotal;
 @property (weak, nonatomic) IBOutlet UILabel *labelCommission;
+@property (weak, nonatomic) IBOutlet UILabel *labelTime;
+@property (weak, nonatomic) IBOutlet UILabel *labelCode;
 
 
 @end
@@ -30,6 +32,8 @@
     self.labelTotal.text = [NSString stringWithFormat:@"￥%.2f", order.total];
     self.labelCommission.text = [NSString stringWithFormat:@"￥%.2f", order.commissions];
     self.labelRemark.text = order.remark;
+    self.labelTime.text = order.createInfo.time;
+    self.labelCode.text = order.billNumber;
 }
 
 - (void)updateHeight {

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

@@ -287,15 +287,17 @@
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="labelCode" destination="aoW-zQ-3TF" id="wZz-wy-v4u"/>
                 <outlet property="labelCommission" destination="A7h-to-ZFP" id="dVK-Vu-NQy"/>
                 <outlet property="labelFreight" destination="7hy-IY-Wba" id="nfX-3j-EO5"/>
                 <outlet property="labelPrice" destination="20G-Ig-3ql" id="wQl-yh-zLx"/>
                 <outlet property="labelRemark" destination="Dfr-K5-NeA" id="mNv-De-Xcz"/>
                 <outlet property="labelTax" destination="wye-4u-nVq" id="tph-ep-8hW"/>
+                <outlet property="labelTime" destination="sKX-f4-drT" id="M2a-xH-yQF"/>
                 <outlet property="labelTotal" destination="VEX-fb-el0" id="AbW-N5-hm8"/>
                 <outlet property="viewRemark" destination="CoV-Us-WDw" id="JZe-Oc-FgW"/>
             </connections>
-            <point key="canvasLocation" x="281" y="-58.5"/>
+            <point key="canvasLocation" x="236" y="-72.5"/>
         </view>
     </objects>
 </document>

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

@@ -9,14 +9,6 @@
 #import <UIKit/UIKit.h>
 #import "MBLabelWithFontAdapter.h"
 #import "JavenOrderModel.h"
-typedef NS_ENUM(NSInteger, ORDERTOPTYPE)
-{
-    ORDERTOPTYPE_NOPAYMENT,//代支付
-    ORDERTOPTYPE_WAITFORDISPATCH,//待发货
-    ORDERTOPTYPE_TRANSPORTED,//已发货
-    ORDERTOPTYPE_COMMPLETE,//已完成
-    ORDERTOPTYPE_CANCELED//已取消
-};
 
 @interface OrderDetailTopView : UIView
 @property (nonatomic, assign) ORDERTOPTYPE orderType;

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

@@ -28,40 +28,6 @@
 
     }
     
-    switch (self.orderType) {
-        case ORDERTOPTYPE_NOPAYMENT:
-        {
-            self.imgIcon.image = [UIImage imageNamed:@"orderDetail_waitforpay"];
-            self.labelState.text = @"等待付款";
-        }
-            break;
-        case ORDERTOPTYPE_WAITFORDISPATCH:
-        {
-            self.imgIcon.image = [UIImage imageNamed:@"orderDetail_waitefortransport"];
-            self.labelState.text = @"等待发货";
-        }
-            break;
-        case ORDERTOPTYPE_TRANSPORTED:
-        {
-            self.imgIcon.image = [UIImage imageNamed:@"orderDetail_transported"];
-            self.labelState.text = @"已发货";
-        }
-            break;
-        case ORDERTOPTYPE_COMMPLETE:
-        {
-            self.imgIcon.image = [UIImage imageNamed:@"orderDetail_completed"];
-            self.labelState.text = @"已完成";
-        }
-            break;
-        case ORDERTOPTYPE_CANCELED:
-        {
-            self.imgIcon.image = [UIImage imageNamed:@"orderDetail_canceled"];
-            self.labelState.text = @"已取消";
-        }
-            break;
-        default:
-            break;
-    }
 }
 - (void)updateHeight {
     
@@ -69,11 +35,18 @@
 }
 
 - (void)viewWithModel:(JavenOrderModel *)model {
+    self.labelState.text = [model.state getOrderStateString];
+    self.imgIcon.image = [UIImage imageNamed:[model.state getOrderStateImage]];
     self.labelName.text = model.address.name;
     JavenAddress *address = model.address;
     self.labelAddress.text = [NSString stringWithFormat:@"%@%@%@%@%@", address.nation ? address.nation : @"", address.province, address.city, address.country, address.address];
     self.labelPhoneNumber.text = model.consumer.code;
+    self.labelExpressTime.text = model.lastModifyInfo.time;
+    WS(weakSelf)
     [[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"order/getLogistics/%@", model.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        if (kIsResponseSuccess(responseObject)) {
+            weakSelf.labelExpress.text = responseObject[@"logistics"];
+        }
         
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         

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

@@ -20,7 +20,7 @@
 {
     self.labelCosumer.text = model.consumer.code;
     self.labelTime.text = [(JavenCreateInfo *)model.createInfo time];
-    self.labelState.text = state;
+    self.labelState.text = [model.state getOrderStateString];
 }
 /*
 // Only override drawRect: if you perform custom drawing.

ALand/CodeClass/Home/ViewController/Commodity/AddCommodityViewController.m

@@ -283,6 +283,18 @@
     [self.navigationController pushViewController:commodityVC animated:YES];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [MobClick beginLogPageView:@"addCommodity"];//("PageOne"为页面名称，可自定义)
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    [MobClick endLogPageView:@"addCommodity"];
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.m

@@ -79,10 +79,8 @@
     }
     
     NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
-                                                                        @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                        @"parameters" : @[kDomain]},
                                                                       @{@"operation" : operation,
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[parameters]}],
                                                     @"orders" : @[@{@"field" : self.field,
                                                                     @"direction" : self.direction}],

ALand/CodeClass/Home/ViewController/Commodity/CommoditySearchViewController.m

@@ -81,7 +81,7 @@
                                                                       @{@"operation" : @"online only",
                                                                         @"parameters" : @[[NSNull null]]},
                                                                       @{@"operation" : @"domain equals",
-                                                                        @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                        @"parameters" : @[kDomain]},
                                                                      ],
                                                     @"orders" : @[@{@"direction" : self.direction,
                                                                     @"field" : self.field}],

ALand/CodeClass/Home/ViewController/CommodityManagementViewController.m

@@ -40,6 +40,7 @@
 @property (nonatomic, assign) BOOL isLeft;//判断排序判断选中了左边还是右边
 @property (nonatomic, assign) NSInteger row;//判断排序判断选中了哪一行
 
+@property (nonatomic, assign) CGFloat sortViewBottom;
 
 
 
@@ -90,6 +91,11 @@
 }
 
 - (void)cancelSearchAction {
+    [UIView animateWithDuration:0.5 animations:^{
+        
+        self.view.top = 64;
+        self.view.height = kHeight ;
+    }];
     self.searchText = @"";
     self.condition = @"shop online only";
     self.searchBar.width = 0;
@@ -111,6 +117,7 @@
 - (void)setUpViews {
     [self.view addSubview:self.topView];
     [self.view addSubview:self.sorView];
+    self.sortViewBottom = self.sorView.bottom;
     
     //设置现在默认选中的排序方式
     [self.sorView defaultSelectISLeft:YES row:0];
@@ -236,14 +243,11 @@
                                               @"orders" : @[@{@"field" : self.field,
                                                               @"direction" : self.direction}],
                                               @"conditions" : @[@{@"parameters" : @[info.domain],
-                                                                  @"operation" : @"domain equals",
-                                                                  @"parameter" : @{@"operation" : @"string"}},
+                                                                  @"operation" : @"domain equals"},
                                                                 @{@"parameters" : @[@[[UserInfo shareInstance].shop.uuid]],
-                                                                  @"operation" : @"shop uuid equals",
-                                                                  @"parameter" : @{@"operation" : @"sring"}},
+                                                                  @"operation" : @"shop uuid equals"},
                                                                 @{@"parameters" : @[self.searchText],
-                                                                  @"operation" : self.condition,
-                                                                  @"parameter" : @{@"operation" : @"sring"}}],
+                                                                  @"operation" : self.condition}],
                                               @"pageSize" : kPageSize,
                                               @"page" : @0},
                              @"fetchParts" : @[@"string"]};
@@ -255,6 +259,13 @@
 #pragma mark =========== action ===========
 
 - (void)searchAct {
+    
+    [UIView animateWithDuration:0.5 animations:^{
+        
+        self.view.top = -self.sortViewBottom + 64;
+        self.view.height = self.view.height + self.sortViewBottom ;
+    }];
+    
     [self.sorView hide];
     CLog(@"search");
     WS(weakSelf)
@@ -328,7 +339,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    
+    [self cancelSearchAction];
     CommodityDetailViewController *detailVC = [[CommodityDetailViewController alloc] init];
     detailVC.model = self.arrItemDatas[indexPath.row];
     CommodityTableViewCell *cell = (CommodityTableViewCell *)[tableView cellForRowAtIndexPath:indexPath];
@@ -367,13 +378,15 @@
 - (CommodityManagementTopView *)topView {
     if (!_topView) {
         _topView = [CommodityManagementTopView viewWithNibName:@"CommodityManagementTopView"];
-        _topView.frame = CGRectMake(0, 0, kWidth, 64 + 64);
-//        _topView.arrDatas = self.arrItemDatas;
        
     }
     return _topView;
 }
 
+- (void)viewWillLayoutSubviews {
+    _topView.frame = CGRectMake(0, 0, kWidth, 64);
+
+}
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];

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

@@ -100,17 +100,13 @@
 - (NSDictionary *)getParams
 {
     NSDictionary *searchParams = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
-                                                                  @"parameter" : @{@"operation" : @"string"},
-                                                                  @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                  @"parameters" : @[kDomain]},
                                                                 @{@"operation" : @"createInfo.time between",
-                                                                  @"parameter" : @{@"operation" : @"string"},
                                                                   @"parameters" : @[self.customerCreateDate, [NSNull null]]},
                                                                 @{@"operation" : @"reseller uuid equals",
-                                                                  @"parameter" : @{@"operation" : @"string"},
                                                                   @"parameters" : @[[UserInfo shareInstance].uuid]}
                                                                 ,
                                                                 @{@"operation" : @"consumer mobilephone equals",
-                                                                  @"parameter" : @{@"operation" : @"string"},
                                                                   @"parameters" : @[_phoneNo]}
                                                                 ],
                                               @"orders" : @[@{@"field" : self.field,
@@ -121,13 +117,10 @@
                              @"fetchParts" : @[@""]};
     
     NSDictionary *params = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
-                                                                        @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                        @"parameters" : @[kDomain]},
                                                                       @{@"operation" : @"createInfo.time between",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[self.customerCreateDate, [NSNull null]]},
                                                                       @{@"operation" : @"reseller uuid equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[[UserInfo shareInstance].uuid]}
                                                                       ],
                                                     @"orders" : @[@{@"field" : self.field,
@@ -149,13 +142,13 @@
     self.searchBar.tintColor = kTextColorLiteGray;
     self.searchBar.backgroundColor = kRandomColor;
     self.searchBar.delegate = self;
-    self.searchBar.placeholder = @"请输入手机号";
+    self.searchBar.placeholder = @"请输入完整手机号";
     self.searchBar.frame = CGRectMake(0, 0, kWidth - 60, 35);
     self.searchBar.centerX = titleView.centerX;
     self.searchBar.backgroundImage = [UIImage imageWithColor:color];
     [titleView addSubview:self.searchBar];
     self.navigationItem.titleView = titleView;
-    
+
 }
 
 - (void)setUpSortView {
@@ -246,6 +239,7 @@
 
 //改变排序条件之后重新请求数据
 - (void)resetReloadData {
+    [self.results removeAllObjects];
     [self.arrCellData removeAllObjects];
     [self setUpData];
     
@@ -290,11 +284,19 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    
-    CustomerViewController *customerVC = [[CustomerViewController alloc] init];
-    customerVC.isShowNavigationBar = NO;
-    customerVC.customer = self.arrCellData[indexPath.row];
-    [self.navigationController pushViewController:customerVC animated:YES];
+    [self.searchBar resignFirstResponder];
+    if (self.searchBar.isFirstResponder && self.results.count > 0) {
+        CustomerViewController *customerVC = [[CustomerViewController alloc] init];
+        customerVC.isShowNavigationBar = NO;
+        customerVC.customer = self.results[indexPath.row];
+        [self.navigationController pushViewController:customerVC animated:YES];
+    }else{
+        CustomerViewController *customerVC = [[CustomerViewController alloc] init];
+        customerVC.isShowNavigationBar = NO;
+        customerVC.customer = self.arrCellData[indexPath.row];
+        [self.navigationController pushViewController:customerVC animated:YES];
+    }
+
 }
 
 #pragma mark =========== searchbar delegate ===========

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

@@ -81,13 +81,10 @@
 
 - (NSDictionary *)getParams {
     NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
-                                                                        @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                        @"parameters" : @[kDomain]},
                                                                       @{@"operation" : @"reseller uuid equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[[UserInfo shareInstance].uuid]},
                                                                       @{@"operation" : @"consumer uuid equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[self.customer.consumer.uuid]}],
                                                     @"orders" : @[@{@"field" : @"reseller",
                                                                     @"direction" : @"desc"}],
@@ -106,7 +103,7 @@
     
     self.topView = [CustomerTopView viewWithNibName:@"CustomerTopView"];
     self.topView.labelCount.text = [NSString stringWithFormat:@"%.0f", self.customer.orderCount];
-    self.topView.labelTotalIncome.text = [NSString stringWithFormat:@"%.0f", self.customer.commissionTotal];
+    self.topView.labelTotalIncome.text = [NSString stringWithFormat:@"%.2f", self.customer.commissionTotal];
     self.topView.labelPhoneNumber.text = self.customer.consumer.mobilephone;
     kButtonAddAction(self.topView.buttonBac, popAction);
     
@@ -134,22 +131,6 @@
     return 50;
 }
 
-//- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
-//    UIView *view = [UIView new];
-//    view.backgroundColor = kSysWhite;
-//    
-//    UIView *line = [UIView new];
-//    [view addSubview:line];
-//    line.backgroundColor = kBacroundColor;
-//    line.sd_layout.bottomEqualToView(view).leftEqualToView(view).rightEqualToView(view).heightIs(1);
-//    
-//    return view;
-//}
-//
-//- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
-//    return 20;
-//}
-
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     return 130;
 }
@@ -184,8 +165,6 @@
     NSInteger position = -kTopHeight + 64;
     if (scrollView.contentOffset.y > position) {
         self.aTopBackView.alpha = (scrollView.contentOffset.y - position) * 1.0 / 64 > 1 ? 1 : (scrollView.contentOffset.y - position) * 1.0 / 64.0;
-//        CLog(@"%f",self.aTopBackView.alpha);
-
 
     }else{
         self.aTopBackView.alpha = 0;

ALand/CodeClass/Home/ViewController/HomeViewController.m

@@ -30,6 +30,7 @@
     [self setUpdata];
 }
 
+
 - (void)setUpdata {
     
     WS(weakSelf)

ALand/CodeClass/Home/ViewController/InviteParterner/SeeMoreViewController.m

@@ -17,7 +17,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.title = @"分销政策";
+    self.title = @"新营养部落分销政策概述";
     
     NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/abcShare.html", [UserInfo shareInstance].webShopBaseUrl];
     

ALand/CodeClass/Home/ViewController/ManagementViewController.m

@@ -167,15 +167,12 @@
     NSDictionary *params = @{@"defintion" : @{@"probePages" : @0,
                                               @"orders" : @[@{@"field" : self.field,
                                                               @"direction" : self.direction}],
-                                              @"conditions" : @[@{@"parameters" : @[[UserInfo shareInstance].domain],
-                                                                  @"operation" : @"domain equals",
-                                                                  @"parameter" : @{@"operation" : @"string"}},
+                                              @"conditions" : @[@{@"parameters" : @[kDomain],
+                                                                  @"operation" : @"domain equals"},
                                                                 @{@"parameters" : @[@[[UserInfo shareInstance].shop.uuid]],
-                                                                  @"operation" : @"shop uuid equals",
-                                                                  @"parameter" : @{@"operation" : @"sring"}},
+                                                                  @"operation" : @"shop uuid equals"},
                                                                 @{@"parameters" : @[@""],
-                                                                  @"operation" : self.condition,
-                                                                  @"parameter" : @{@"operation" : @"sring"}}],
+                                                                  @"operation" : self.condition}],
                                               @"pageSize" : kPageSize,
                                               @"page" : @0},
                              @"fetchParts" : @[@"string"]};
@@ -301,7 +298,7 @@
     }
     
     NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
-                                            @"domain" : [UserInfo shareInstance].domain,
+                                            @"domain" : kDomain,
                                             @"operator" : @{@"id" : [UserInfo shareInstance].uuid,
                                                             @"fullName" : [UserInfo shareInstance].name}},
                              @"shopUuid" : [UserInfo shareInstance].shop.uuid,

ALand/CodeClass/Home/ViewController/MyTeams/MyTeamViewController.m

@@ -69,7 +69,7 @@
     NSDictionary *params = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"reseller uuid equals",
                                                                   @"parameters" : @[[UserInfo shareInstance].uuid]},
                                                                 @{@"operation" : @"domain equals",
-                                                                  @"parameters" : @[[UserInfo shareInstance].domain]}],
+                                                                  @"parameters" : @[kDomain]}],
                                               @"orders" : @[@{@"direction" : @"desc",
                                                               @"field" : @""}],
                                               @"page" : @0,

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

@@ -87,28 +87,19 @@
 
 
 - (NSDictionary *)getParams {
-    NSString *orderState;
     
-    if ([self.orderTag isEqualToString:@"待支付"]) {
-        orderState = @"toBePaid";
-    }else if([self.orderTag isEqualToString:@"待发货"]){
-        orderState = @"toBeShipped";
-    }else if ([self.orderTag isEqualToString:@"已发货"]){
-        orderState = @"shipped";
-    }else if ([self.orderTag isEqualToString:@"已完成"]){
-        orderState = @"paid";
-    }else if ([self.orderTag isEqualToString:@"已取消"]){
-        orderState = @"cancelled";
+    
+     id orderState = [self.orderTag getOrderState];
+    
+    if ([self.orderTag isEqualToString:@"全部订单"]) {
+        orderState = [NSNull null];
     }
     
     NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
-                                                                        @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                        @"parameters" : @[kDomain]},
                                                                       @{@"operation" : @"reseller uuid equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[[UserInfo shareInstance].uuid]},
                                                                       @{@"operation" : @"order state equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[orderState]}],
                                                     @"orders" : @[@{@"field" : @"createInfo.time",
                                                                     @"direction" : @"desc"}],
@@ -173,15 +164,15 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     OrderDetailViewController *orderDetailVC = [[OrderDetailViewController alloc] init];
-    if ([self.orderTag isEqualToString:@"代支付"]) {
+    if ([self.title isEqualToString:@"代支付"]) {
         orderDetailVC.orderType = ORDERTOPTYPE_NOPAYMENT;
-    }else if([self.orderTag isEqualToString:@"待发货"]){
+    }else if([self.title isEqualToString:@"待发货"]){
         orderDetailVC.orderType = ORDERTOPTYPE_WAITFORDISPATCH;
-    }else if ([self.orderTag isEqualToString:@"已发货"]){
+    }else if ([self.title isEqualToString:@"已发货"]){
         orderDetailVC.orderType = ORDERTOPTYPE_TRANSPORTED;
-    }else if ([self.orderTag isEqualToString:@"已完成"]){
+    }else if ([self.title isEqualToString:@"已完成"]){
         orderDetailVC.orderType = ORDERTOPTYPE_COMMPLETE;
-    }else if ([self.orderTag isEqualToString:@"已取消"]){
+    }else if ([self.title isEqualToString:@"已取消"]){
         orderDetailVC.orderType = ORDERTOPTYPE_CANCELED;
     }
     

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

@@ -45,7 +45,7 @@
 
 - (void)setUpView {
     
-    NSArray *arrTitle = @[@"待支付",@"待发货",@"已发货",@"已完成",@"已取消"];
+    NSArray *arrTitle = @[@"全部订单",@"待支付",@"已支付",@"待发货",@"配送中"];
     
     NSMutableArray *arrVC = [NSMutableArray array];
     

ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m

@@ -188,7 +188,7 @@
     UserInfo *user = [UserInfo shareInstance];
     NSDictionary *dicShop = [self.shopModel dictionaryRepresentation];
     NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
-                                            @"domain" : user.domain,
+                                            @"domain" : kDomain,
                                             @"operator" : @{@"id" : user.uuid,
                                                             @"fullName" : user.name}},
                              @"shop" : dicShop};

ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.m

@@ -36,7 +36,7 @@
     NSDictionary *dicShop = [self.shopModel dictionaryRepresentation];
     
     NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
-                                                  @"domain" : user.domain,
+                                                  @"domain" : kDomain,
                                                   @"operator" : @{@"id" : user.uuid,
                                                                   @"fullName" : user.name}},
                                    @"shop" : dicShop};

ALand/CodeClass/Home/ViewController/StoreManagerment/introductionViewController.m

@@ -28,7 +28,7 @@
     NSDictionary *dicShop = [self.shopModel dictionaryRepresentation];
     
     NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
-                                            @"domain" : user.domain,
+                                            @"domain" : kDomain,
                                             @"operator" : @{@"id" : user.uuid,
                                                             @"fullName" : user.name}},
                              @"shop" : dicShop};

ALand/CodeClass/Login/LoginViewController.m

@@ -69,7 +69,7 @@
                 [info updateWithDictionary:responseObject[@"reseller"]];
                 info.webShopBaseUrl = responseObject[@"appConfig"][@"webShopBaseUrl"];
                 
-                
+                [MobClick profileSignInWithPUID:info.code];
                 BaseViewController *baseVC = [[BaseViewController alloc] init];
                 baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
                 [weakSelf presentViewController:baseVC animated:YES completion:nil];
@@ -77,7 +77,7 @@
             }else{
                 
                 [[NSUserDefaults standardUserDefaults] setObject:nil forKey:@"passWord"];
-                [MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:2 complete:nil];
+                [MBProgressHUD Javen_showError:responseObject[@"message"] onView:kWindow delay:2 complete:nil];
             }
         } failure:^(NSURLSessionDataTask *task, NSError *error) {
             [MBProgressHUD hideHUDForView:self.view animated:YES];

ALand/CodeClass/Login/NextResetPasswordViewController.h

@@ -9,5 +9,5 @@
 #import "IBTUIViewController.h"
 
 @interface NextResetPasswordViewController : IBTUIViewController
-
+@property (nonatomic, copy) NSString *mobilePhone;
 @end

ALand/CodeClass/Login/NextResetPasswordViewController.m

@@ -11,7 +11,7 @@
 @interface NextResetPasswordViewController ()
 @property (weak, nonatomic) IBOutlet UIButton *sendCode;
 @property (weak, nonatomic) IBOutlet UIButton *setPasswordVisible;
-@property (weak, nonatomic) IBOutlet UITextField *phoneNumber;
+@property (weak, nonatomic) IBOutlet UITextField *labelCode;
 @property (weak, nonatomic) IBOutlet UITextField *password;
 @property (nonatomic) BOOL isPasswordVisible;
 @end
@@ -22,6 +22,7 @@
     [super viewDidLoad];
     self.isPasswordVisible = NO;
     self.navigationItem.title = @"重置密码";
+    [self.sendCode startWithTime:60 title:@"重新发送" countDownTitle:@"s" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
     // Do any additional setup after loading the view from its nib.
 }
 - (IBAction)sendCodeAction:(UIButton *)sender {
@@ -32,8 +33,44 @@
 //确定
 - (IBAction)confirmAction:(UIButton *)sender {
     
+    NSDictionary *params = @{@"domain" : kDomain,
+                                   @"mobilephone" : self.mobilePhone,
+                                   @"smsCode" : self.labelCode.text,
+                                   @"password" : [self.password.text MD5String]};
+    WS(weakSelf)
+    if (self.labelCode.text.length > 0 || self.password.text.length > 0) {
+        
+        [[HTTPCilent shareCilent] POST:@"app/resellerResetPwd" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
+            if (kIsResponseSuccess(responseObject)) {
+                
+                [[NSUserDefaults standardUserDefaults] setObject:weakSelf.mobilePhone forKey:@"userName"];
+                [[NSUserDefaults standardUserDefaults] setObject:[weakSelf.password.text MD5String] forKey:@"passWord"];
+                [[NSUserDefaults standardUserDefaults] synchronize];
+                
+                
+                [MBProgressHUD Javen_showSuccess:@"重置成功！" onView:weakSelf.view delay:0.5 complete:^{
+                    
+                    [weakSelf.navigationController popToRootViewControllerAnimated:YES];
+                }];
+                
+            }else{
+                NSString *message = responseObject[@"message"];
+                [MBProgressHUD Javen_showError:message onView:weakSelf.view delay:0.7 complete:nil];
+            }
+
+        } failure:^(NSURLSessionDataTask *task, NSError *error) {
+            
+        }];
+        
+        
+        
+    }else{
+        [MBProgressHUD Javen_showError:@"" onView:self.view delay:0.7 complete:nil];
+    }
     
 }
+
+
 - (IBAction)setPasswordVisibleAction:(UIButton *)sender {
     self.isPasswordVisible = !self.isPasswordVisible;
     if (self.isPasswordVisible) {

ALand/CodeClass/Login/NextResetPasswordViewController.xib

@@ -7,8 +7,8 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NextResetPasswordViewController">
             <connections>
+                <outlet property="labelCode" destination="jqa-GY-Qfj" id="woE-Tq-O2O"/>
                 <outlet property="password" destination="wPh-tP-Ouv" id="bpg-LN-OlL"/>
-                <outlet property="phoneNumber" destination="jqa-GY-Qfj" id="Xce-xT-m2X"/>
                 <outlet property="sendCode" destination="dyL-CN-fvr" id="pI2-Uz-k9w"/>
                 <outlet property="setPasswordVisible" destination="yTa-cD-PxS" id="v0n-gk-Ppw"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>

ALand/CodeClass/Login/ResetPasswordViewController.m

@@ -8,8 +8,10 @@
 
 #import "ResetPasswordViewController.h"
 #import "NextResetPasswordViewController.h"
-@interface ResetPasswordViewController ()
+#import "NSString+Category.h"
+@interface ResetPasswordViewController ()<UITextFieldDelegate>
 @property (weak, nonatomic) IBOutlet UITextField *phoneNumber;
+@property (weak, nonatomic) IBOutlet UIButton *btnNext;
 
 @end
 
@@ -18,15 +20,59 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.navigationItem.title = @"重置密码";
-    
+
+    self.phoneNumber.delegate = self;
     // Do any additional setup after loading the view from its nib.
 }
 
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+    NSString *strName = [textField.text stringByReplacingCharactersInRange:range withString:string];
+    self.btnNext.enabled = strName.length > 0;
+    
+    return YES;
+}
+
 - (IBAction)nextAction:(UIButton *)sender {
+    
+    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    
+    NSDictionary *parameters = @{@"mobilephone":self.phoneNumber.text,
+                                 @"template":[NSNull null]};
+    WS(weakSelf)
+    
 #ifdef DEBUG
-    NextResetPasswordViewController *nextVC = [[NextResetPasswordViewController alloc] initWithNibName:@"NextResetPasswordViewController" bundle:[NSBundle mainBundle]];
-    [self.navigationController pushViewController:nextVC animated:YES];
+    
+    [[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
+        [MBProgressHUD hideHUDForView:weakSelf.view];
+        if (kIsResponseSuccess(responseObject)) {
+            NextResetPasswordViewController *nextVC = [[NextResetPasswordViewController alloc] initWithNibName:@"NextResetPasswordViewController" bundle:[NSBundle mainBundle]];
+            nextVC.isShowNavigationBar = YES;
+            nextVC.mobilePhone = weakSelf.phoneNumber.text;
+            [weakSelf.navigationController pushViewController:nextVC animated:YES];
+        }
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        [MBProgressHUD hideHUDForView:weakSelf.view];
+
+    }];
 #else
+    if ([self.phoneNumber.text isMobileNumber]) {
+        [[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
+            [MBProgressHUD hideHUDForView:weakSelf.view];
+
+            if (kIsResponseSuccess(responseObject)) {
+                NextResetPasswordViewController *nextVC = [[NextResetPasswordViewController alloc] initWithNibName:@"NextResetPasswordViewController" bundle:[NSBundle mainBundle]];
+                nextVC.isShowNavigationBar = YES;
+                nextVC.mobilePhone = weakSelf.phoneNumber.text;
+                [weakSelf.navigationController pushViewController:nextVC animated:YES];
+            }
+        } failure:^(NSURLSessionDataTask *task, NSError *error) {
+            
+        }];
+    }else{
+        [MBProgressHUD hideHUDForView:weakSelf.view];
+
+        [MBProgressHUD Javen_showError:@"号码格式不正确" onView:self.view delay:0.7 complete:nil];
+    }
     
 #endif
     

ALand/CodeClass/Login/ResetPasswordViewController.xib

@@ -7,6 +7,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ResetPasswordViewController">
             <connections>
+                <outlet property="btnNext" destination="IuR-81-Oe4" id="Rct-rX-Iwb"/>
                 <outlet property="phoneNumber" destination="qH5-hL-hdE" id="jHC-Ar-JIA"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
@@ -36,7 +37,7 @@
                         <constraint firstAttribute="trailing" secondItem="qH5-hL-hdE" secondAttribute="trailing" constant="32" id="tTc-fY-9MM"/>
                     </constraints>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IuR-81-Oe4">
+                <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IuR-81-Oe4">
                     <rect key="frame" x="32" y="181" width="311" height="44"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="aaT-L6-bmf"/>
@@ -46,6 +47,7 @@
                     <state key="normal" title="下一步" backgroundImage="rigist_btn_bg">
                         <color key="titleColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                     </state>
+                    <state key="disabled" backgroundImage="btn_background_gray"/>
                     <connections>
                         <action selector="nextAction:" destination="-1" eventType="touchUpInside" id="5lA-Tq-aCo"/>
                     </connections>
@@ -64,6 +66,7 @@
         </view>
     </objects>
     <resources>
+        <image name="btn_background_gray" width="490" height="70"/>
         <image name="rigist_btn_bg" width="490" height="65"/>
     </resources>
 </document>

ALand/CodeClass/Login/RigistViewController.m

@@ -56,11 +56,9 @@
 
 // 发送验证码
 - (IBAction)sendCodeAction:(UIButton *)sender {
-    
-    
-    
+
     NSDictionary *parameters = @{@"mobilephone":self.phoneNumberTextFiled.text,
-                                 @"template":@"1234"};
+                                 @"template":[NSNull null]};
     WS(weakSelf)
     
     [[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
@@ -95,11 +93,9 @@
             
             [weakSelf.navigationController popViewControllerAnimated:YES];
 
-
-            
         }else{
             
-            [MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:2 complete:^{
+            [MBProgressHUD Javen_showError:responseObject[@"message"] onView:kWindow delay:2 complete:^{
                 
             }];
         }

ALand/CodeClass/Login/ToLoginViewController.m

@@ -47,6 +47,8 @@
             [[NSUserDefaults standardUserDefaults] setObject:weakSelf.phoneNumberTextFiled.text forKey:@"userName"];
             [[NSUserDefaults standardUserDefaults] setObject:[weakSelf.passwordTextFiled.text MD5String] forKey:@"passWord"];
             
+            
+            [MobClick profileSignInWithPUID:info.code];
             BaseViewController *baseVC = [[BaseViewController alloc] init];
             baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
             [weakSelf presentViewController:baseVC animated:YES completion:^{
@@ -55,7 +57,7 @@
             
         }else{
             
-            [MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:2 complete:^{
+            [MBProgressHUD Javen_showError:responseObject[@"message"] onView:kWindow delay:2 complete:^{
                 
             }];
         }

ALand/CodeClass/MIne/Model/JavenResellerBigModel.h

@@ -24,7 +24,7 @@
 
 @property (nonatomic, assign) double birthday;
 @property (nonatomic, strong) NSString *portrait;
-@property (nonatomic, strong) JavenOwnerOrg *ownerOrg;
+//@property (nonatomic, strong) JavenOwnerOrg *ownerOrg;
 @property (nonatomic, strong) NSString *code;
 @property (nonatomic, strong) NSString *telephone;
 @property (nonatomic, strong) NSString *mobilephone;

ALand/CodeClass/MIne/Model/JavenResellerBigModel.m

@@ -47,7 +47,7 @@ NSString *const kJavenResellerModelDescription = @"description";
 
 @synthesize birthday = _birthday;
 @synthesize portrait = _portrait;
-@synthesize ownerOrg = _ownerOrg;
+//@synthesize ownerOrg = _ownerOrg;
 @synthesize code = _code;
 @synthesize telephone = _telephone;
 @synthesize mobilephone = _mobilephone;
@@ -87,7 +87,7 @@ NSString *const kJavenResellerModelDescription = @"description";
     if(self && [dict isKindOfClass:[NSDictionary class]]) {
             self.birthday = [[self objectOrNilForKey:kJavenResellerModelBirthday fromDictionary:dict] doubleValue];
             self.portrait = [self objectOrNilForKey:kJavenResellerModelPortrait fromDictionary:dict];
-            self.ownerOrg = [JavenOwnerOrg modelObjectWithDictionary:[dict objectForKey:kJavenResellerModelOwnerOrg]];
+//            self.ownerOrg = [JavenOwnerOrg modelObjectWithDictionary:[dict objectForKey:kJavenResellerModelOwnerOrg]];
             self.code = [self objectOrNilForKey:kJavenResellerModelCode fromDictionary:dict];
             self.telephone = [self objectOrNilForKey:kJavenResellerModelTelephone fromDictionary:dict];
             self.mobilephone = [self objectOrNilForKey:kJavenResellerModelMobilephone fromDictionary:dict];
@@ -135,7 +135,7 @@ NSString *const kJavenResellerModelDescription = @"description";
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setValue:[NSNumber numberWithDouble:self.birthday] forKey:kJavenResellerModelBirthday];
     [mutableDict setValue:self.portrait forKey:kJavenResellerModelPortrait];
-    [mutableDict setValue:[self.ownerOrg dictionaryRepresentation] forKey:kJavenResellerModelOwnerOrg];
+//    [mutableDict setValue:[self.ownerOrg dictionaryRepresentation] forKey:kJavenResellerModelOwnerOrg];
     [mutableDict setValue:self.code forKey:kJavenResellerModelCode];
     [mutableDict setValue:self.telephone forKey:kJavenResellerModelTelephone];
     [mutableDict setValue:self.mobilephone forKey:kJavenResellerModelMobilephone];
@@ -194,7 +194,7 @@ NSString *const kJavenResellerModelDescription = @"description";
 
     self.birthday = [aDecoder decodeDoubleForKey:kJavenResellerModelBirthday];
     self.portrait = [aDecoder decodeObjectForKey:kJavenResellerModelPortrait];
-    self.ownerOrg = [aDecoder decodeObjectForKey:kJavenResellerModelOwnerOrg];
+//    self.ownerOrg = [aDecoder decodeObjectForKey:kJavenResellerModelOwnerOrg];
     self.code = [aDecoder decodeObjectForKey:kJavenResellerModelCode];
     self.telephone = [aDecoder decodeObjectForKey:kJavenResellerModelTelephone];
     self.mobilephone = [aDecoder decodeObjectForKey:kJavenResellerModelMobilephone];
@@ -226,7 +226,7 @@ NSString *const kJavenResellerModelDescription = @"description";
 
     [aCoder encodeDouble:_birthday forKey:kJavenResellerModelBirthday];
     [aCoder encodeObject:_portrait forKey:kJavenResellerModelPortrait];
-    [aCoder encodeObject:_ownerOrg forKey:kJavenResellerModelOwnerOrg];
+//    [aCoder encodeObject:_ownerOrg forKey:kJavenResellerModelOwnerOrg];
     [aCoder encodeObject:_code forKey:kJavenResellerModelCode];
     [aCoder encodeObject:_telephone forKey:kJavenResellerModelTelephone];
     [aCoder encodeObject:_mobilephone forKey:kJavenResellerModelMobilephone];
@@ -260,7 +260,7 @@ NSString *const kJavenResellerModelDescription = @"description";
 
         copy.birthday = self.birthday;
         copy.portrait = [self.portrait copyWithZone:zone];
-        copy.ownerOrg = [self.ownerOrg copyWithZone:zone];
+//        copy.ownerOrg = [self.ownerOrg copyWithZone:zone];
         copy.code = [self.code copyWithZone:zone];
         copy.telephone = [self.telephone copyWithZone:zone];
         copy.mobilephone = [self.mobilephone copyWithZone:zone];

ALand/CodeClass/MIne/ViewController/MyBandCard/AddDetailInfoViewController.m

@@ -103,7 +103,7 @@
     UserInfo *user = [UserInfo shareInstance];
     NSDictionary *reseller = [resellerModel dictionaryRepresentation];
     NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
-                                            @"domain" : user.domain,
+                                            @"domain" : kDomain,
                                             @"operator" : @{@"id" : user.uuid,
                                                             @"fullName" : user.name}},
                              @"reseller" : reseller};

ALand/CodeClass/MIne/ViewController/MyBandCard/ChangeMyBankCardViewController.m

@@ -105,7 +105,7 @@
     UserInfo *user = [UserInfo shareInstance];
     NSDictionary *reseller = [resellerModel dictionaryRepresentation];
     NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
-                                            @"domain" : user.domain,
+                                            @"domain" : kDomain,
                                             @"operator" : @{@"id" : user.uuid,
                                                             @"fullName" : user.name}},
                              @"reseller" : reseller};

ALand/CodeClass/MIne/ViewController/MyBillViewController.m

@@ -213,16 +213,12 @@
 - (NSDictionary *)getParams
 {
     NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
-                                                                        @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                        @"parameters" : @[kDomain]},
                                                                       @{@"operation" : @"reseller uuid equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : @[[UserInfo shareInstance].uuid]},
                                                                       @{@"operation" : @"action equals",
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : self.state},
                                                                       @{@"operation" : self.confirmed,
-                                                                        @"parameter" : @{@"operation" : @"string"},
                                                                         @"parameters" : [NSNull null]}
                                                                       ],
                                                     @"orders" : @[@{@"field" : @"createInfo.time",

ALand/CodeClass/MIne/ViewController/SettingViewController.m

@@ -61,7 +61,7 @@
         if ([responseObject[@"code"] isEqualToNumber:@0]) {
             
             [MBProgressHUD Javen_showSuccess:@"注销成功！" onView:weakSelf.view delay:0.5 complete:^{
-                
+                [MobClick profileSignOff];
                 [self.tabBarController dismissViewControllerAnimated:YES completion:nil];
                 [[NSUserDefaults standardUserDefaults] setObject:nil forKey:@"passWord"];
                 
@@ -216,10 +216,11 @@
 
 //生成上传图片URL的参数
 - (NSDictionary *)getParamsWithReseller:(JavenResellerBigModel *)resellerModel {
+//    resellerModel.ownerOrg = nil;
     UserInfo *user = [UserInfo shareInstance];
     NSDictionary *reseller = [resellerModel dictionaryRepresentation];
     NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
-                                            @"domain" : user.domain,
+                                            @"domain" : kDomain,
                                             @"operator" : @{@"id" : user.uuid,
                                                             @"fullName" : user.name}},
                              @"reseller" : reseller};
@@ -231,12 +232,15 @@
 {
     WS(weakSelf)
     [[HTTPCilent shareCilent] POST:@"reseller/save" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
+        
+        [MBProgressHUD hideHUDForView:weakSelf.view];
+        
         if ([responseObject[@"code"] isEqualToNumber:@0]) {
-            
-            [MBProgressHUD hideHUDForView:weakSelf.view];
             [MBProgressHUD Javen_showSuccess:@"修改成功！" onView:weakSelf.view  delay:0.7 complete:^{
                 [weakSelf setUpdata];
             }];
+        }else{
+            [MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:0.7 complete:nil];
         }
         
     } failure:^(NSURLSessionDataTask *task, NSError *error) {

ALand/General/Categories/NSString+Category.h

@@ -109,5 +109,9 @@
               containLetter:(BOOL)containLetter
       containOtherCharacter:(NSString *)containOtherCharacter
         firstCannotBeDigtal:(BOOL)firstCannotBeDigtal;
-
+/** 编码 好像有问题 */
+-(NSString *) URLEncodingUTF8String;//编码
+/** 解码 没试过 */
+-(NSString *) URLDecodingUTF8String;
+- (BOOL)isHasChinese;
 @end

ALand/General/Categories/NSString+Category.m

@@ -347,4 +347,37 @@
 }
 
 
+-(NSString *)URLEncodingUTF8String{
+    NSString *result = (NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
+                                                                           (CFStringRef)self,
+                                                                           NULL,
+                                                                           CFSTR("!*'();:@&=+$,/?%#[]"),
+                                                                           kCFStringEncodingUTF8));
+    return result;
+}
+-(NSString *)URLDecodingUTF8String{
+    NSString *result = (NSString *)CFBridgingRelease(CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
+                                                                                           (CFStringRef)self,
+                                                                                           CFSTR(""),
+                                                                                           kCFStringEncodingUTF8));
+    return result;
+}
+
+- (BOOL)isHasChinese
+{
+    int length = (int)[self length];
+    
+    for (int i=0; i<length; ++i)
+    {
+        NSRange range = NSMakeRange(i, 1);
+        NSString *subString = [self substringWithRange:range];
+        const char    *cString = [subString UTF8String];
+        if (strlen(cString) == 3)
+        {
+            return YES;
+        }
+    }
+    return NO;
+}
+
 @end

ALand/General/Categories/NSString+OrderState.h

+//
+//  NSString+OrderState.h
+//  ALand
+//
+//  Created by Z on 16/5/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (OrderState)
+
+/** 返回订单状态 中文 */
+- (NSString *)getOrderStateString;
+/** 返回订单状态 英文*/
+- (NSString *)getOrderState;
+/** 返回订单对应的图片名 */
+- (NSString *)getOrderStateImage;
+@end

ALand/General/Categories/NSString+OrderState.m

+//
+//  NSString+OrderState.m
+//  ALand
+//
+//  Created by Z on 16/5/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "NSString+OrderState.h"
+#define kStateCodes @[@"toBePaid",@"toBeShipped",@"shipped",@"paid",@"cancelled"]
+#define kTitles @[@"待支付",@"待发货",@"配送中",@"已支付",@"已取消"]
+#define kImages @[@"orderDetail_waitforpay",@"orderDetail_waitefortransport",@"orderDetail_transported",@"orderDetail_completed",@"orderDetail_canceled"]
+
+@implementation NSString (OrderState)
+
+- (NSString *)getOrderStateString
+{
+
+    for (int i = 0; i < kStateCodes.count; i++) {
+        if ([kStateCodes[i] isEqualToString:self]) {
+            return kTitles[i];
+        }
+    }
+    return nil;
+}
+- (NSString *)getOrderState {
+
+    for (int i = 0; i < kTitles.count; i++) {
+        if ([kTitles[i] isEqualToString:self]) {
+            NSString *state = kStateCodes[i];
+            return state;
+        }
+    }
+    return nil;
+}
+
+- (NSString *)getOrderStateImage
+{
+
+    for (int i = 0; i < kStateCodes.count; i++) {
+        if ([kStateCodes[i] isEqualToString:self]) {
+            return kImages[i];
+        }
+    }
+    
+    for (int i = 0; i < kTitles.count; i++) {
+        if ([kTitles[i] isEqualToString:self]) {
+            return kImages[i];
+        }
+    }
+
+    return [NSString string];
+}
+
+
+@end

ALand/Global/HTTPCilent.m

@@ -46,7 +46,7 @@
         
         NSDictionary *dic = responseObject;
         
-        CLog(@"POST success！-------->\n%@", [dic JSONString]);
+//        CLog(@"POST success！-------->\n%@", [dic JSONString]);
         
         success(task, responseObject);
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
@@ -70,11 +70,16 @@
     } success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         
         NSDictionary *dic = responseObject;
-        CLog(@"GET success！-------->%@", [dic JSONString]);
+//        CLog(@"GET success！-------->%@", [dic JSONString]);
         success(task, responseObject);
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         
         [MBProgressHUD showMessage:@"网络错误，请检查网络！"];
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [MBProgressHUD hideHUD];
+        });
+        
         CLog(@"GET请求失败！----->%@", [error localizedDescription]);
         failure(task, error);
     }];

ALand/Global/JavenQNManager.m

@@ -57,8 +57,9 @@
                   NSLog(@"info = %@\n", info);
                   NSLog(@"key = %@\n",key);
                   NSLog(@"resp = %@\n", resp);
-                  
-                  commpelete(key);
+                  if (commpelete) {
+                      commpelete(key);
+                  }
                   
                   
               } option:self.option];

ALand/Global/UserInfo.m

@@ -7,14 +7,14 @@
 //
 
 #import "UserInfo.h"
-
+#import "UIImage+Helper.h"
 @implementation UserInfo
 + (UserInfo *)shareInstance {
     static UserInfo *userInfo = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         userInfo = [[UserInfo alloc] init];
-        
+//        [[JavenQNManager shareInstance] upLoadImage:[UIImage appIcon] isMD5Name:NO name:@"ios上传调试" commpelete:nil];
         
     });
     return userInfo;

ALand/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -42,7 +42,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>1.0.0</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>

ALand/Macro/IMPHeader.h

@@ -22,5 +22,7 @@
 #import "NSNumber+Fommater.h"
 #import "MBProgressHUD+Javen.h"
 #import "JavenQNManager.h"
+#import "MobClick.h"
+#import "NSString+OrderState.h"
 
 #endif /* IMPHeader_h */

Podfile

@@ -11,4 +11,5 @@ pod 'MJExtension', '~> 3.0.10'
 pod 'UMengSocial', '~> 5.0'
 pod "Qiniu", :git => 'https://github.com/qiniu/objc-sdk.git', :branch => 'AFNetworking-3.x'
 pod 'SobotFramework', '~> 1.4.2'
-pod 'MJRefresh', '~> 3.1.0'
+pod 'MJRefresh', '~> 3.1.0'
\ No newline at end of file
+pod 'UMengAnalytics-NO-IDFA'
\ No newline at end of file

Podfile.lock

@@ -33,6 +33,7 @@ PODS:
   - SDWebImage/Core (3.7.5)
   - SobotFramework (1.4.2)
   - SSKeychain (1.3.1)
+  - UMengAnalytics-NO-IDFA (3.6.7)
   - UMengSocial (5.0)
 
 DEPENDENCIES:
@@ -48,6 +49,7 @@ DEPENDENCIES:
   - SDWebImage (~> 3.7.5)
   - SobotFramework (~> 1.4.2)
   - SSKeychain (~> 1.3.1)
+  - UMengAnalytics-NO-IDFA
   - UMengSocial (~> 5.0)
 
 EXTERNAL SOURCES:
@@ -74,6 +76,7 @@ SPEC CHECKSUMS:
   SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
   SobotFramework: a91bd7bd6d0b802dcd1f126db481078aa0a5266c
   SSKeychain: 04c4ec40f4c3deda524e269bc76e5f30e638a174
+  UMengAnalytics-NO-IDFA: 6d02561a00579b2e37718f204eb81347df5d7b8b
   UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1
 
 COCOAPODS: 0.39.0