erp mobile slide view 高度可从模版取得

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -202,13 +202,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.7499731"
+            timestampString = "568537551.318794"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1244"
             endingLineNumber = "1244"
-            landmarkName = "CategoryViewController"
-            landmarkType = "3">
+            landmarkName = "-didRotateFromInterfaceOrientation:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -218,12 +218,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.75026"
+            timestampString = "568537551.319396"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1231"
             endingLineNumber = "1231"
-            landmarkName = "-didRotateFromInterfaceOrientation:"
+            landmarkName = "-SelectCategory:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -234,7 +234,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.750423"
+            timestampString = "568537551.319851"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1230"
@@ -250,7 +250,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/home/HomeViewController.m"
-            timestampString = "555931358.793353"
+            timestampString = "568537826.359961"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "257"
@@ -266,13 +266,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.75059"
+            timestampString = "568537551.320379"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1487"
             endingLineNumber = "1487"
-            landmarkName = "CategoryViewController"
-            landmarkType = "3">
+            landmarkName = "-checkToolBar"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -282,7 +282,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.750699"
+            timestampString = "568537551.3208489"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1210"
@@ -426,11 +426,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/home/HomeViewController.m"
-            timestampString = "555931358.793884"
+            timestampString = "568537826.360743"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "683"
-            endingLineNumber = "683"
+            startingLineNumber = "725"
+            endingLineNumber = "725"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -458,12 +458,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.75177"
+            timestampString = "568537551.3216701"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1934"
             endingLineNumber = "1934"
-            landmarkName = "-collectionCell:setImageForIndexPath:"
+            landmarkName = "-collectionView:cellForItemAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -474,7 +474,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.75209"
+            timestampString = "568537551.322502"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1963"
@@ -522,7 +522,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.752527"
+            timestampString = "568537551.323355"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1916"
@@ -570,7 +570,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.752866"
+            timestampString = "568537551.324463"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2550"
@@ -714,11 +714,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/home/HomeViewController.m"
-            timestampString = "555931358.794943"
+            timestampString = "568537826.361539"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "949"
-            endingLineNumber = "949"
+            startingLineNumber = "991"
+            endingLineNumber = "991"
             landmarkName = "-reload_data"
             landmarkType = "7">
          </BreakpointContent>
@@ -826,12 +826,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.753984"
+            timestampString = "568537551.326462"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2654"
             endingLineNumber = "2654"
-            landmarkName = "-reload_data"
+            landmarkName = "-categoryString:node:level:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -842,13 +842,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.754086"
+            timestampString = "568537551.3275501"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1246"
             endingLineNumber = "1246"
-            landmarkName = "-willRotateToInterfaceOrientation:duration:"
-            landmarkType = "7">
+            landmarkName = "CategoryViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -858,12 +858,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.754179"
+            timestampString = "568537551.327981"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1232"
             endingLineNumber = "1232"
-            landmarkName = "-didRotateFromInterfaceOrientation:"
+            landmarkName = "-SelectCategory:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1002,7 +1002,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.754716"
+            timestampString = "568537551.3285969"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1513"
@@ -1018,7 +1018,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.754787"
+            timestampString = "568537551.328988"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1490"
@@ -1034,7 +1034,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.7549241"
+            timestampString = "568537551.329368"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1467"
@@ -1098,7 +1098,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.755259"
+            timestampString = "568537551.32981"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1350"
@@ -1146,7 +1146,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "557721184.755536"
+            timestampString = "568537551.330227"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1213"
@@ -1226,7 +1226,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/categoryMenu_RATree/RAViewController.m"
-            timestampString = "567765436.2423609"
+            timestampString = "567855521.423064"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "56"
@@ -1587,5 +1587,101 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/home/HomeViewController.m"
+            timestampString = "568537826.363878"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "422"
+            endingLineNumber = "422"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/home/HomeViewController.m"
+            timestampString = "568537826.365685"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "511"
+            endingLineNumber = "511"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/RANetwork.m"
+            timestampString = "568713630.2565089"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3264"
+            endingLineNumber = "3264"
+            landmarkName = "+Category:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/RANetwork.m"
+            timestampString = "568713630.264015"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3305"
+            endingLineNumber = "3305"
+            landmarkName = "+Category:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/RANetwork.m"
+            timestampString = "568713630.264292"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3304"
+            endingLineNumber = "3304"
+            landmarkName = "+Category:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/RANetwork.m"
+            timestampString = "568713630.264538"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3263"
+            endingLineNumber = "3263"
+            landmarkName = "+Category:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -19,18 +19,18 @@
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
+         contextName = "-[CycleScrollView reset]:CycleScrollView.m">
          <PersistentStrings>
             <PersistentString
-               value = "self.cqty">
+               value = "self.subviews">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "-[CycleScrollView reset]:CycleScrollView.m">
+         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
          <PersistentStrings>
             <PersistentString
-               value = "self.subviews">
+               value = "self.cqty">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -95,5 +95,13 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "+[RANetwork Category:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:]:RANetwork.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "[Singleton sharedInstance].homeClickedItemName">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
    </ContextStates>
 </VariablesViewState>

RedAnt ERP Mobile/common/Functions/home/HomeViewController.m

@@ -306,9 +306,17 @@
         //            return 533;
         
         
-        int i_width = 981;
-        int i_height = 512;
+//        int i_width = 981;
+//        int i_height = 512;
         
+        int i_width = [[view_json valueForKey:@"width"]intValue];
+        int i_height = [[view_json valueForKey:@"height"]intValue];
+        if(i_width<=0||i_height<=0)
+        {
+            i_width=981;
+        
+            i_height=512;
+        }
         int ui_height = (tableView.frame.size.width * i_height)/i_width;
         return ui_height;
         
@@ -403,9 +411,19 @@
 //            
 //        }
         
-        int i_width = 981;
-        int i_height = 512;
+//        int i_width = 981;
+//        int i_height = 512;
+        //如果模版有高度就用模版设置值，没有则用默认值。
+        int i_width = [[view_json valueForKey:@"width"]intValue];
+        int i_height = [[view_json valueForKey:@"height"]intValue];
+        if(i_width<=0||i_height<=0)
+        {
+            i_width=981;
+            i_height=512;
+        }
         
+            
+
         int ui_height = (tableView.frame.size.width * i_height)/i_width;
         
 //        HomeTableViewCellSlide* slidecell = (HomeTableViewCellSlide*)cell;
@@ -478,6 +496,35 @@
         [imgScroll setTotalPagesCount];
         imgScroll.TapActionBlock = ^(NSInteger pageIndex){
             DebugLog(@"点击了第%ld个",(long)pageIndex);
+            NSDictionary * item_json =[view_json objectForKey:[NSString stringWithFormat:@"item_%d",pageIndex] ];
+            NSString* action = [item_json valueForKeyPath:@"action"];
+            
+            [Singleton sharedInstance].homeClickedItemName = @"slide_view";
+            
+//            if([action isEqualToString:@"itemSearch"])
+//            {
+//                [Singleton sharedInstance].homeItemClick = YES;
+//                NSString* covertype = [item_json valueForKeyPath:@"covertype"];
+//
+//                UIApplication * app = [UIApplication sharedApplication];
+//                AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+//                MainViewController* main_vc=(MainViewController*)appDelegate.main_vc;
+//
+//                [main_vc switchToItemSearch:covertype];
+//            }
+//            else
+                if([action isEqualToString:@"category"])
+            {
+                [Singleton sharedInstance].homeItemClick = YES;
+                NSString* cid = [item_json valueForKeyPath:@"category_id"];
+                
+                UIApplication * app = [UIApplication sharedApplication];
+                AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+                MainViewController* main_vc=(MainViewController*)appDelegate.main_vc;
+                
+                [main_vc switchToCagegory:cid];
+            }
+            
             //            NSDictionary * slide_itemjson =[view_json objectForKey:[NSString stringWithFormat:@"item_%d",pageIndex] ];
             //
             //            NSString*

RedAnt ERP Mobile/iSales-UWAVER/iSales-UWAVER-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>181229</string>
+	<string>190108</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>