Explorar o código

修复 categoryviewcontroller 选中时,category id 逻辑混乱的问题。

Ray Zhang %!s(int64=8) %!d(string=hai) anos
pai
achega
dce80006bd

+ 56 - 8
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -106,11 +106,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "536721848.447446"
+            timestampString = "537775682.168537"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "717"
-            endingLineNumber = "717"
+            startingLineNumber = "719"
+            endingLineNumber = "719"
             landmarkName = "-numberOfSectionsInTableView:"
             landmarkType = "7">
          </BreakpointContent>
@@ -122,11 +122,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "536721848.448085"
+            timestampString = "537775682.168614"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "757"
-            endingLineNumber = "757"
+            startingLineNumber = "759"
+            endingLineNumber = "759"
             landmarkName = "-tableView:numberOfRowsInSection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -138,7 +138,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategorySearchFilterViewController.m"
-            timestampString = "537170278.931872"
+            timestampString = "537775682.1686881"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "56"
@@ -154,7 +154,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "537765022.012019"
+            timestampString = "537775682.1687419"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "101"
@@ -163,5 +163,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/category/CategoryViewController.m"
+            timestampString = "537775682.168799"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2224"
+            endingLineNumber = "2224"
+            landmarkName = "-collectionView:didSelectItemAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/ItemSearchViewController.m"
+            timestampString = "537775682.16919"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1998"
+            endingLineNumber = "1998"
+            landmarkName = "-collectionView:didSelectItemAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/ItemSearchViewController.m"
+            timestampString = "537775682.169247"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1951"
+            endingLineNumber = "1951"
+            landmarkName = "-collectionView:didSelectItemAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 11 - 9
RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -2222,16 +2222,18 @@
     {
         NSString* detail_id= [NSString stringWithFormat:@"%@",   [item valueForKey:@"product_id"] ] ;
         NSString *item_category_id = [item valueForKey:@"item_category_id"];
-#ifndef BUILD_NPD
-        item_category_id = self.categoryid;
-#endif
-#ifndef BUILD_HOMER
-        item_category_id = self.categoryid;
-#endif
-#ifndef BUILD_GATIT
-        item_category_id = self.categoryid;
-#endif
+//#ifndef BUILD_NPD
+//        item_category_id = self.categoryid;
+//#endif
+//#ifndef BUILD_HOMER
+//        item_category_id = self.categoryid;
+//#endif
+//#ifndef BUILD_GATIT
+//        item_category_id = self.categoryid;
+//#endif
+
         
+        item_category_id = self.categoryid;
         [self showDetailat:detail_id category_id:item_category_id name:[item valueForKey:@"name"] index:indexPath.row];
        
     }

BIN=BIN
RedAnt ERP Mobile/iSales-GATIT/Images.xcassets/npd_logo.imageset/21_03.png


BIN=BIN
RedAnt ERP Mobile/iSales-GATIT/Images.xcassets/npd_logo.imageset/21_03@2x.png


BIN=BIN
RedAnt ERP Mobile/iSales-GATIT/Images.xcassets/npd_logo.imageset/21_03@3x.png