Ray Zhang 9 лет назад
Родитель
Сommit
0e28025efd

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

@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519640112.69855"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1019"
-            endingLineNumber = "1019"
+            startingLineNumber = "1022"
+            endingLineNumber = "1022"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -31,8 +31,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1062"
             endingLineNumber = "1062"
-            landmarkName = "-numberOfPhotosInPhotoStackView:"
-            landmarkType = "7">
+            landmarkName = "@implementation DetailHeaderCell"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519641349.319399"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1397"
-            endingLineNumber = "1397"
+            startingLineNumber = "1400"
+            endingLineNumber = "1400"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519641349.319399"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1400"
-            endingLineNumber = "1400"
+            startingLineNumber = "1403"
+            endingLineNumber = "1403"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519641349.319399"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1403"
-            endingLineNumber = "1403"
+            startingLineNumber = "1406"
+            endingLineNumber = "1406"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -122,11 +122,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519641349.319399"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1403"
-            endingLineNumber = "1403"
+            startingLineNumber = "1406"
+            endingLineNumber = "1406"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -234,11 +234,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519640112.69855"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "194"
-            endingLineNumber = "194"
+            startingLineNumber = "197"
+            endingLineNumber = "197"
             landmarkName = "-reload"
             landmarkType = "7">
          </BreakpointContent>
@@ -250,11 +250,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519641349.319399"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1384"
-            endingLineNumber = "1384"
+            startingLineNumber = "1387"
+            endingLineNumber = "1387"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -266,11 +266,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519641349.319399"
+            timestampString = "519803491.800569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1382"
-            endingLineNumber = "1382"
+            startingLineNumber = "1385"
+            endingLineNumber = "1385"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -281,61 +281,61 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519640105.74578"
+            filePath = "common/Functions/modelDetail/DetailHeaderCell.m"
+            timestampString = "519724140.460772"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "182"
-            endingLineNumber = "182"
-            landmarkName = "-reload"
+            startingLineNumber = "1144"
+            endingLineNumber = "1144"
+            landmarkName = "-photoStackView:didSelectPhotoAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "519640109.941173"
+            filePath = "common/TextUtils.m"
+            timestampString = "519724208.041774"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "180"
-            endingLineNumber = "180"
-            landmarkName = "-reload"
+            startingLineNumber = "147"
+            endingLineNumber = "147"
+            landmarkName = "+expression_varable:regex:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/modelDetail/DetailHeaderCell.m"
-            timestampString = "519724140.460772"
+            filePath = "common/RAUtils.m"
+            timestampString = "519724376.016372"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1144"
-            endingLineNumber = "1144"
-            landmarkName = "-photoStackView:didSelectPhotoAtIndex:"
+            startingLineNumber = "191"
+            endingLineNumber = "191"
+            landmarkName = "+expression_varable:regex:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/TextUtils.m"
-            timestampString = "519724208.041774"
+            filePath = "common/Functions/modelDetail/DetailHeaderCell.m"
+            timestampString = "519726561.523658"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "147"
-            endingLineNumber = "147"
-            landmarkName = "+expression_varable:regex:"
+            startingLineNumber = "1146"
+            endingLineNumber = "1146"
+            landmarkName = "-photoStackView:didSelectPhotoAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -345,13 +345,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/RAUtils.m"
-            timestampString = "519724376.016372"
+            filePath = "common/Functions/modelDetail/DetailHeaderCell.m"
+            timestampString = "519803611.842459"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "191"
-            endingLineNumber = "191"
-            landmarkName = "+expression_varable:regex:"
+            startingLineNumber = "1155"
+            endingLineNumber = "1155"
+            landmarkName = "-photoStackView:didSelectPhotoAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -362,11 +362,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailHeaderCell.m"
-            timestampString = "519726561.523658"
+            timestampString = "519803670.645201"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1146"
-            endingLineNumber = "1146"
+            startingLineNumber = "1136"
+            endingLineNumber = "1136"
             landmarkName = "-photoStackView:didSelectPhotoAtIndex:"
             landmarkType = "7">
          </BreakpointContent>

+ 2 - 2
RedAnt ERP Mobile/common/Functions/modelDetail/DetailHeaderCell.m

@@ -1132,13 +1132,13 @@
 
 -(void)photoStackView:(PhotoStackView *)photoStackView didSelectPhotoAtIndex:(NSUInteger)index {
     DebugLog(@"selected %lu", (unsigned long)index);
-    
+ /*
     ContentPreviewController *preVC = [[UIStoryboard storyboardWithName:@"PhotoList" bundle:nil] instantiateViewControllerWithIdentifier:@"ContentPreviewController"];
     preVC.content = self.stack_contents;
     UIViewController *superVC= [RAUtils getViewController:self];
     [superVC.navigationController pushViewController:preVC animated:true];
     return;
-    
+   */
     NSDictionary* item= self.stack_contents[[NSString stringWithFormat:@"item_%d",index]];
     
     if([item[@"type"] isEqualToString:@"video"])

+ 21 - 18
RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -149,6 +149,27 @@ dispatch_async(dispatch_get_main_queue(), ^{
                 
                 NSMutableDictionary* contents = [NSMutableDictionary new];
                 int count = 0;
+                
+                {
+                    for(int ic=0;ic<[videos[@"count"] intValue];ic++)
+                    {
+                        NSString* videocode = videos[[NSString stringWithFormat:@"video_%d",ic]];
+                        
+                        
+                        //                         NSString*   path=[[NSBundle mainBundle] pathForResource:@"play" ofType:@"jpg"];
+                        //
+                        //                        NSMutableDictionary* item =[@{@"type":@"video",@"is_localfile":@(true),@"l":path,@"s":path} mutableCopy];
+                        //
+                        //                        contents[[NSString stringWithFormat:@"item_%d",count]]=item ;
+                        //                        count++;
+                        
+                        NSMutableDictionary* item =[@{@"type":@"video",@"code":videocode} mutableCopy];
+                        
+                        contents[[NSString stringWithFormat:@"item_%d",count]]=item;
+                        count++;
+                    }
+                }
+                
                 {
                     for(int ic=0;ic<[images[@"img_count"] intValue];ic++)
                     {
@@ -169,25 +190,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
                     }
                 }
                 
-                {
-                    for(int ic=0;ic<[videos[@"count"] intValue];ic++)
-                    {
-                        NSString* videocode = videos[[NSString stringWithFormat:@"video_%d",ic]];
-                        
 
-//                         NSString*   path=[[NSBundle mainBundle] pathForResource:@"play" ofType:@"jpg"];
-//                        
-//                        NSMutableDictionary* item =[@{@"type":@"video",@"is_localfile":@(true),@"l":path,@"s":path} mutableCopy];
-//                        
-//                        contents[[NSString stringWithFormat:@"item_%d",count]]=item ;
-//                        count++;
-                        
-                        NSMutableDictionary* item =[@{@"type":@"video",@"code":videocode} mutableCopy];
-                        
-                        contents[[NSString stringWithFormat:@"item_%d",count]]=item;
-                        count++;
-                    }
-                }
                 
                 
                 contents[@"count"]=@(count);

BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/play.imageset/appicon-1.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/play.imageset/appicon-2.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/play.imageset/appicon.png