소스 검색

share detail content is empty -- share detail 内容为空 resolve: #106

Ray Zhang 5 년 전
부모
커밋
94bc7caeea

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 86 - 6
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -458,8 +458,8 @@
             filePath = "RA TradeFiling/Detail/DetailTabBarController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "491"
-            endingLineNumber = "491"
+            startingLineNumber = "569"
+            endingLineNumber = "569"
             landmarkName = "-menuClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1116,7 +1116,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "95"
                   endingLineNumber = "95"
-                  offsetFromSymbolStart = "1022">
+                  offsetFromSymbolStart = "852">
                </Location>
                <Location
                   uuid = "1A82154B-E529-468C-9650-0F348DFF0677 - 845561727e52cadd"
@@ -1131,7 +1131,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "97"
                   endingLineNumber = "97"
-                  offsetFromSymbolStart = "54">
+                  offsetFromSymbolStart = "100">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -1274,8 +1274,8 @@
             filePath = "RA TradeFiling/Detail/DetailTabBarController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "499"
-            endingLineNumber = "499"
+            startingLineNumber = "577"
+            endingLineNumber = "577"
             landmarkName = "-menuClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1744,5 +1744,85 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EDD3C1BE-D24B-40BB-AC35-F9037E43469B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Result/ResultViewController+QuickLook.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "55"
+            endingLineNumber = "55"
+            landmarkName = "-quickLookMenuClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5A5775DC-F11C-4FEE-BE3F-0535DA42E9AE"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Detail/DetailTabBarController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "521"
+            endingLineNumber = "521"
+            landmarkName = "-shareDetail"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D01BC628-6871-448E-AC41-93E7CB18ED45"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Detail/DetailTabBarController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "467"
+            endingLineNumber = "467"
+            landmarkName = "-shareDetail"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F400FF85-FC97-4B50-A223-80AEC83958E4"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Detail/DetailTabBarController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "477"
+            endingLineNumber = "477"
+            landmarkName = "-shareDetail"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7F766F5E-087C-4907-911A-06975E76A753"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Detail/DetailTabBarController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "397"
+            endingLineNumber = "397"
+            landmarkName = "-createShareContent:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 79 - 1
RA TradeFiling/RA TradeFiling/Detail/DetailTabBarController.m

@@ -389,7 +389,76 @@
         [self presentViewController:alertVC animated:YES completion:nil];
     }
 }
-
+-(NSString*) createShareContent:(NSDictionary *)originContent
+{
+    
+    NSString* content = @"";
+    int group_count=[originContent[@"count"] intValue];
+    for(int i=0;i<group_count;i++)
+    {
+        
+        NSDictionary* group = originContent[[NSString stringWithFormat:@"group%d",i]];
+        NSString* groupName = [group[@"_name"] stringValue];
+        NSString* groupType = [group[@"_type"] stringValue];
+        if(i!=0)
+            content=[content stringByAppendingString:@"\r\n"];
+        content=[content stringByAppendingString:groupName];
+        content=[content stringByAppendingString:@"\r\n\r\n"];
+        
+        int item_count = [group[@"count"] intValue];
+        
+        for(int j=0;j<item_count;j++)
+        {
+            NSDictionary* item = group[[NSString stringWithFormat:@"item%d",j]];
+            
+            if([groupType isEqualToString:@"mapping"])
+            {
+                content=[content stringByAppendingString:[item.allKeys[0] stringValue]];
+                content=[content stringByAppendingString:@": "];
+                content=[content stringByAppendingString:[item.allValues[0] stringValue]];
+                content=[content stringByAppendingString:@"\r\n"];
+            }
+            else if([groupType isEqualToString:@"mapping"])
+            {
+                NSString* container_no = [item[@"container#"] stringValue];
+                NSString* seal_no = [item[@"seal_no"] stringValue];
+                content=[content stringByAppendingString:[NSString stringWithFormat:@"Container#: %@",container_no]];
+                content=[content stringByAppendingString:@"\r\n"];
+                content=[content stringByAppendingString:seal_no];
+                content=[content stringByAppendingString:@"\r\n"];
+            }
+            else if([groupType isEqualToString:@"container"])
+            {
+                NSString* container_no = [item[@"container#"] stringValue];
+                NSString* seal_no = [item[@"seal_no"] stringValue];
+                NSString* size = [item[@"size"] stringValue];
+                NSString* qty = [item[@"qty"] stringValue];
+                NSString* service = [item[@"service"] stringValue];
+                NSString* weight = [item[@"weight"] stringValue];
+                content=[content stringByAppendingString:[NSString stringWithFormat:@"Container#: %@",container_no]];
+                content=[content stringByAppendingString:@"\r\n"];
+                content=[content stringByAppendingString:seal_no];
+                content=[content stringByAppendingString:@"\r\n"];
+                content=[content stringByAppendingString:[NSString stringWithFormat:@"Size#: %@",size]];
+                content=[content stringByAppendingString:@"\r\n"];
+                content=[content stringByAppendingString:qty];
+                content=[content stringByAppendingString:@"\r\n"];
+                content=[content stringByAppendingString:service];
+                content=[content stringByAppendingString:@"\r\n"];
+                content=[content stringByAppendingString:weight];
+                content=[content stringByAppendingString:@"\r\n"];
+            }
+            else if([groupType isEqualToString:@"log"])
+            {
+                NSString* log = [item[@"text"] stringValue];
+                content=[content stringByAppendingString:log];
+                content=[content stringByAppendingString:@"\r\n"];
+            }
+        }
+    }
+    
+    return content;
+}
 - (void)shareDetail {
     
     DetailPageViewController *pageVC = (DetailPageViewController *)self.selectedViewController;
@@ -398,6 +467,15 @@
     NSString *subject = [pageVC.content.originContent objectForKey:@"email_subject"];
     NSString *content = [pageVC.content.originContent objectForKey:@"email_content"];
     
+    
+    if(to == nil)
+        to=@"";
+    if(subject == nil)
+        subject=[NSString stringWithFormat:@"SHARE %@",pageVC.title.uppercaseString];
+
+    if(content == nil)
+        content=[self createShareContent:pageVC.content.originContent];
+
 //    content = @"Test Body";
 //    NSArray *activityItems = nil;
 //    if (content) {