完善网页回调

RedAnt CRM/APEX CRM/APEX CRM/RAWKWebView.m

@@ -158,20 +158,14 @@
     
     scanVC.completion = ^(NSString *value) {
         
-        if(![params isNull:@"returnid"] )
-        {
-            
-            [self webPageReturn:params[@"returnid"] value:value];
-
-        }else if(![params isNull:@"callback"])
-        {
+        [self returnToWebPage:params value:value];
 
-        }
     };
     
     [self.ra_viewController.navigationController pushViewController:scanVC animated:YES];
 }
 
+
 - (void)ra_previewDocument:(NSDictionary *)params {
     /**
      cc = "test1@abc.com,test2@abc.com";
@@ -349,17 +343,33 @@
 
 #pragma mark - Web Callback
 
+-(void) returnToWebPage:(NSDictionary*)params value:(NSObject*)value
+{
+    if(![params isNull:@"returnid"] )
+    {
+        
+        [self webPageReturn:params[@"returnid"] value:value];
+        
+    }else if(![params isNull:@"callback"])
+    {
+        [self webPageCallback:params caller:params[@"id"] value:value];
+    }
+}
 -(void) webPageCallback:(NSDictionary*)params caller:(NSString*) callerid value:(NSObject*)value
 {
-    NSString *jsStr = [NSString stringWithFormat:params[@"callback"],callerid,value];
+    NSString* caller = [NSString stringWithFormat:@"'%@'",callerid];
+    if([value isKindOfClass:NSString.class])
+    {
+        value =[NSString stringWithFormat:@"'%@'",value];
+    }
+    NSString *jsStr = [NSString stringWithFormat:params[@"callback"],caller,value];
     [self.wkwebView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
         NSLog(@"%@----%@",result, error);
     }];
 }
-
 -(void) webPageReturn:(NSString*) returnid value:(NSObject*)value
 {
-    NSString *jsStr = [NSString stringWithFormat:@"document.getElementById(\"%@\").value = %@;",returnid,value];
+    NSString *jsStr = [NSString stringWithFormat:@"document.getElementById(\"%@\").value = \"%@\";",returnid,value];
     [self.wkwebView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
         NSLog(@"%@----%@",result, error);
     }];
@@ -441,6 +451,7 @@
     NSLog(@"%@",message.name);
     NSLog(@"body:%@",message.body);
     
+    
     NSDictionary* params=[RAConvertor string2dict:message.body];
 //    RAConvertor 
     if ([message.name isEqualToString:@"CamScan"]) {
@@ -518,10 +529,12 @@
     {
         NSDictionary* button = arr_btns[i];
         [alert addAction:[UIAlertAction actionWithTitle:button[@"text"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-            NSString *jsStr = [NSString stringWithFormat:params[@"callback"],button[@"id"]];
-            [self.wkwebView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
-                NSLog(@"%@----%@",result, error);
-            }];
+            
+            [self returnToWebPage:params value:button[@"value"]];
+//            NSString *jsStr = [NSString stringWithFormat:params[@"callback"],button[@"value"]];
+//            [self.wkwebView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
+//                NSLog(@"%@----%@",result, error);
+//            }];
         }]];
     }
         UIViewController* vc=[RAUtils getViewController:self];

RedAnt CRM/RedAnt CRM.xcworkspace/xcuserdata/ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.193975"
+            timestampString = "565165783.156828"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "296"
-            endingLineNumber = "296"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -26,11 +26,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.197377"
+            timestampString = "565165783.158249"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "296"
-            endingLineNumber = "296"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.198949"
+            timestampString = "565165783.158936"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "296"
-            endingLineNumber = "296"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.200294"
+            timestampString = "565165783.159659"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "296"
-            endingLineNumber = "296"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.201506"
+            timestampString = "565165783.160344"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "296"
-            endingLineNumber = "296"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -122,11 +122,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.202677"
+            timestampString = "565165783.161074"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "257"
-            endingLineNumber = "257"
+            startingLineNumber = "234"
+            endingLineNumber = "234"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -138,11 +138,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.203608"
+            timestampString = "565165783.161671"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "272"
-            endingLineNumber = "272"
+            startingLineNumber = "249"
+            endingLineNumber = "249"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -154,12 +154,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.204405"
+            timestampString = "565165783.162213"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "67"
             endingLineNumber = "67"
-            landmarkName = "-layoutSubviews"
+            landmarkName = "-initWKWebView"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.205231"
+            timestampString = "565165783.162745"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "277"
-            endingLineNumber = "277"
+            startingLineNumber = "254"
+            endingLineNumber = "254"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -186,11 +186,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.2060781"
+            timestampString = "565165783.163201"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "279"
-            endingLineNumber = "279"
+            startingLineNumber = "256"
+            endingLineNumber = "256"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.207127"
+            timestampString = "565165783.16378"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "293"
-            endingLineNumber = "293"
+            startingLineNumber = "270"
+            endingLineNumber = "270"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -218,11 +218,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.207953"
+            timestampString = "565165783.164315"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "240"
-            endingLineNumber = "240"
+            startingLineNumber = "217"
+            endingLineNumber = "217"
             landmarkName = "-ra_previewDocument:"
             landmarkType = "7">
          </BreakpointContent>
@@ -234,11 +234,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.20874"
+            timestampString = "565165783.164788"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "213"
-            endingLineNumber = "213"
+            startingLineNumber = "190"
+            endingLineNumber = "190"
             landmarkName = "-ra_previewDocument:"
             landmarkType = "7">
          </BreakpointContent>
@@ -250,11 +250,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.209573"
+            timestampString = "565165783.165375"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "221"
-            endingLineNumber = "221"
+            startingLineNumber = "198"
+            endingLineNumber = "198"
             landmarkName = "-ra_previewDocument:"
             landmarkType = "7">
             <Locations>
@@ -298,11 +298,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.210448"
+            timestampString = "565165783.1658241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "220"
-            endingLineNumber = "220"
+            startingLineNumber = "197"
+            endingLineNumber = "197"
             landmarkName = "-ra_previewDocument:"
             landmarkType = "7">
          </BreakpointContent>
@@ -314,11 +314,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.211346"
+            timestampString = "565165783.166272"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "222"
-            endingLineNumber = "222"
+            startingLineNumber = "199"
+            endingLineNumber = "199"
             landmarkName = "-ra_previewDocument:"
             landmarkType = "7">
          </BreakpointContent>
@@ -330,12 +330,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.212229"
+            timestampString = "565165783.166773"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "147"
             endingLineNumber = "147"
-            landmarkName = "-ra_openPhotoLibrary:"
+            landmarkName = "-ra_openCamera:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -346,7 +346,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/RAConvertor.m"
-            timestampString = "565080991.213115"
+            timestampString = "565165783.167245"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "114"
@@ -362,12 +362,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.2157249"
+            timestampString = "565165783.167693"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "119"
             endingLineNumber = "119"
-            landmarkName = "-destroyMessageHandler"
+            landmarkName = "-dealloc"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -378,13 +378,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.217345"
+            timestampString = "565165783.168359"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "384"
-            endingLineNumber = "384"
-            landmarkName = "-ra_share:"
-            landmarkType = "7">
+            startingLineNumber = "377"
+            endingLineNumber = "377"
+            landmarkName = "RAWKWebView"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -394,11 +394,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.218084"
+            timestampString = "565165783.1689889"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "268"
-            endingLineNumber = "268"
+            startingLineNumber = "245"
+            endingLineNumber = "245"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -410,11 +410,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.219082"
+            timestampString = "565165783.1695009"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "260"
-            endingLineNumber = "260"
+            startingLineNumber = "237"
+            endingLineNumber = "237"
             landmarkName = "-ra_mail:"
             landmarkType = "7">
          </BreakpointContent>
@@ -426,12 +426,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565080991.219644"
+            timestampString = "565165783.170123"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "298"
-            endingLineNumber = "298"
-            landmarkName = "-ra_mail:"
+            startingLineNumber = "275"
+            endingLineNumber = "275"
+            landmarkName = "-ra_share:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -442,12 +442,124 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
-            timestampString = "565081025.914099"
+            timestampString = "565165783.170684"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "426"
-            endingLineNumber = "426"
-            landmarkName = "-ra_share:"
+            startingLineNumber = "419"
+            endingLineNumber = "419"
+            landmarkName = "RAWKWebView"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
+            timestampString = "565165783.171227"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "172"
+            endingLineNumber = "172"
+            landmarkName = "-ra_previewDocument:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
+            timestampString = "565165783.1716909"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "533"
+            endingLineNumber = "533"
+            landmarkName = "-handlePostDialog:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
+            timestampString = "565165783.1721669"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "348"
+            endingLineNumber = "348"
+            landmarkName = "-returnToWebPage:value:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
+            timestampString = "565165783.172581"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "366"
+            endingLineNumber = "366"
+            landmarkName = "-webPageCallback:caller:value:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[RAWKWebView webPageCallback:caller:value:]"
+                  moduleName = "APEX CRM"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20CRM/APEX%20CRM/APEX%20CRM/RAWKWebView.m"
+                  timestampString = "565165307.684224"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "361"
+                  endingLineNumber = "361"
+                  offsetFromSymbolStart = "264">
+               </Location>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[RAWKWebView webPageCallback:caller:value:]_block_invoke"
+                  moduleName = "APEX CRM"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20CRM/APEX%20CRM/APEX%20CRM/RAWKWebView.m"
+                  timestampString = "565165307.686584"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "362"
+                  endingLineNumber = "362"
+                  offsetFromSymbolStart = "80">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "APEX CRM/APEX CRM/RAWKWebView.m"
+            timestampString = "565165783.172954"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "347"
+            endingLineNumber = "347"
+            landmarkName = "-returnToWebPage:value:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>