发布2.2.1正式版

Lighting/Class/Experiencecentre/Scene/Controller/SceneViewController.m

@@ -351,7 +351,6 @@
     //下拉刷新
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        
         weakSelf.goodsModel.page.page = ONE;
         [weakSelf.sceneOrProductClollectionView.mj_footer resetNoMoreData];
         [weakSelf getGoodsListDatasisRemove:YES Withobject:weakSelf.goodsModel];
@@ -362,7 +361,6 @@
     [self.sceneOrProductClollectionView.mj_header beginRefreshing];
     //上拉加载
     self.sceneOrProductClollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        
         if (++ weakSelf.goodsModel.page.page > weakSelf.totalPages) {
             [weakSelf.sceneOrProductClollectionView.mj_footer endRefreshingWithNoMoreData];
         }else

Lighting/Class/Login/Controller/LoginViewController.m

@@ -417,7 +417,7 @@
     NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
     //获取服务端版本大小
     WS(weakSelf);
-    NSString *string = [NSString stringWithFormat:@"/employee/getUpgrade?apptype=ipa&version=%@",version];
+    NSString *string = [NSString stringWithFormat:@"/employee/getUpgrade?apptype=ios&version=%@",version];
     [HTTP networkWithDictionaryRequestWithURL:SERVERREQUESTURL(string)  withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
         if (RESULT(returnValue)) {
             NSDictionary *dict = RESPONSE(returnValue);

Lighting/Class/RIghtVC/ProductLibraryVC/Controller/ProductLibraryViewController.m

@@ -152,14 +152,14 @@
     {
         if (![[self class] isBlankString:self.selectedCode]) {
             switch (weakSelf.selectedIndex) {
-                case 0://风格
+                case 0://类型
                 {
-                    weakSelf.condtionModel.styleEquals = weakSelf.selectedCode;
+                    weakSelf.condtionModel.categoryEquals = weakSelf.selectedCode;
                 }
                     break;
-                case 1://类型
+                case 1://风格
                 {
-                    weakSelf.condtionModel.categoryEquals = weakSelf.selectedCode;
+                    weakSelf.condtionModel.styleEquals = weakSelf.selectedCode;
                 }
                     break;
                 case 2://空间
@@ -235,9 +235,7 @@
                 [weakSelf.datasArray addObject:model];
             }
             [weakSelf.collectionView reloadData];
-        }
-        else
-        {
+        }else {
            [XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
         }
     }withFailureBlock:^(NSError *error) {
@@ -262,8 +260,7 @@
             [weakSelf.datasArray removeAllObjects];
             [weakSelf.datasArray addObject:goods];
             [weakSelf.collectionView reloadData];
-        }else
-        {
+        }else {
             [XBLoadingView showHUDViewWithText:@"查询失败"];
         }
     }withFailureBlock:^(NSError *error) {
@@ -279,7 +276,6 @@
 {
     UIButton *screeningButton = [UIButton buttonWithType:UIButtonTypeSystem];
     screeningButton.frame = CGRectMake(ScreenWidth-100, ScreenHeight*6/10, 50, 50);
-    
     //阴影层
     CALayer *layer = [CALayer layer];
     layer.frame = CGRectMake(ScreenWidth-97.5, ScreenHeight*6/10+2.5, 45, 45);//保证layer的size比筛选按钮高宽都短5像素
@@ -523,10 +519,8 @@
 - (void)showScreeningResponse
 {
     if (self.temporaryArray.goodsEntity.count == 0) {
-        
         [XBLoadingView showHUDViewWithText:@"暂无数据"];
-    }else
-    {
+    }else {
         self.datasArray = [NSMutableArray arrayWithArray:self.temporaryArray.goodsEntity];
         [self.collectionView reloadData];
         [self dismissScreenView];
@@ -567,8 +561,7 @@
     [HTTP networkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG)  withRequestType:ZERO withParameter:shopCar withReturnValueBlock:^(id returnValue) {
         if (RESULT(returnValue)) {
             response();
-        }else
-        {
+        }else {
             [XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
         }
     }withFailureBlock:^(id error) {
@@ -577,8 +570,6 @@
     }];
 }
 
-
-
 #pragma mark -清空模型
 - (void)emptyModel
 {

Lighting/Supporting Files/LightingDis-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.9</string>
+	<string>2.2.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Podfile.lock

@@ -110,7 +110,7 @@ SPEC CHECKSUMS:
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
   MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5
   PNChart: 84774d225c2126ded6c93d4dbe6ae98c3a73c2d2
-  SDWebImage: '098e97e6176540799c27e804c96653ee0833d13c'
+  SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa
   UITableView+FDTemplateLayoutCell: 5c949b4a5059c404b442926c0e80f81d10a2d66f
   UMengAnalytics: ef8d45f94c0e5771dc364cf6a5731d9d3b101da2

Pods/Manifest.lock

@@ -110,7 +110,7 @@ SPEC CHECKSUMS:
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
   MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5
   PNChart: 84774d225c2126ded6c93d4dbe6ae98c3a73c2d2
-  SDWebImage: '098e97e6176540799c27e804c96653ee0833d13c'
+  SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa
   UITableView+FDTemplateLayoutCell: 5c949b4a5059c404b442926c0e80f81d10a2d66f
   UMengAnalytics: ef8d45f94c0e5771dc364cf6a5731d9d3b101da2

fastlane/report.xml

@@ -5,32 +5,27 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.002304">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.00244">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.005053">
+      <testcase classname="fastlane.lanes" name="1: cocoapods" time="9.870129">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: cocoapods" time="11.410097">
+      <testcase classname="fastlane.lanes" name="2: increment_version_number" time="2.311339">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_version_number" time="3.247682">
+      <testcase classname="fastlane.lanes" name="3: gym" time="168.4917">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: gym" time="149.773087">
-        
-      </testcase>
-    
-      
-      <testcase classname="fastlane.lanes" name="5: pgyer" time="186.11317">
+      <testcase classname="fastlane.lanes" name="4: pgyer" time="59.270876">
         
       </testcase>