Просмотр исходного кода

Apex CRM 修改消息转发,需要网页返回成功标志

Ray Zhang 7 лет назад
Родитель
Сommit
cb927ce631

BIN
RedAnt CRM/APEX CRM/APEX CRM.xcodeproj/project.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 11 - 3
RedAnt CRM/APEX CRM/APEX CRM/WKWebTestViewController.m

@@ -111,10 +111,18 @@
     
     
     user = [user ra_stringByEscapingForJavascriptWithDelimiter:'\'' wrapWithDelimiters:YES];
     user = [user ra_stringByEscapingForJavascriptWithDelimiter:'\'' wrapWithDelimiters:YES];
     password = [password ra_stringByEscapingForJavascriptWithDelimiter:'\'' wrapWithDelimiters:YES];
     password = [password ra_stringByEscapingForJavascriptWithDelimiter:'\'' wrapWithDelimiters:YES];
-    
+    __weak typeof(self) weakSelf = self;
     NSString *jsFunction = [NSString stringWithFormat:@"showPageForNotification(%@, %@, %@)", user, password, notificationstr];
     NSString *jsFunction = [NSString stringWithFormat:@"showPageForNotification(%@, %@, %@)", user, password, notificationstr];
     [self.webview evaluateJs:jsFunction completionHandler:^(id result, NSError *error) {
     [self.webview evaluateJs:jsFunction completionHandler:^(id result, NSError *error) {
        
        
+        
+        if(result!=nil&&[result isKindOfClass:[NSString class]])
+        {
+            NSString* stresult = result;
+            
+            if([stresult isEqualToString:@"success"])
+                weakSelf.notificationstr = nil;
+        }
         NSLog(@"handleNotificationByJs: Result: %@ Error: %@", result, error.localizedDescription);
         NSLog(@"handleNotificationByJs: Result: %@ Error: %@", result, error.localizedDescription);
     }];
     }];
 }
 }
@@ -161,8 +169,8 @@
     
     
     @synchronized (self) {
     @synchronized (self) {
         if (self.loaded) {
         if (self.loaded) {
-            
-            [self readNotificationNow:notificationstr];
+            self.notificationstr = notificationstr;
+            [self readNotificationNow:self.notificationstr];
             
             
         } else {
         } else {
             
             

BIN
RedAnt CRM/RedAnt CRM.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 25 - 9
RedAnt CRM/RedAnt CRM.xcworkspace/xcuserdata/ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -31,7 +31,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "734"
             startingLineNumber = "734"
             endingLineNumber = "734"
             endingLineNumber = "734"
-            landmarkName = "-userContentController:didReceiveScriptMessage:"
+            landmarkName = "-mailComposeController:didFinishWithResult:error:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -47,7 +47,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "748"
             startingLineNumber = "748"
             endingLineNumber = "748"
             endingLineNumber = "748"
-            landmarkName = "-userContentController:didReceiveScriptMessage:"
+            landmarkName = "-mailComposeController:didFinishWithResult:error:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -63,7 +63,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "755"
             startingLineNumber = "755"
             endingLineNumber = "755"
             endingLineNumber = "755"
-            landmarkName = "-userContentController:didReceiveScriptMessage:"
+            landmarkName = "-mailComposeController:didFinishWithResult:error:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -79,7 +79,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "769"
             startingLineNumber = "769"
             endingLineNumber = "769"
             endingLineNumber = "769"
-            landmarkName = "-userContentController:didReceiveScriptMessage:"
+            landmarkName = "-imagePickerController:didFinishPickingMediaWithInfo:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -95,7 +95,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "394"
             startingLineNumber = "394"
             endingLineNumber = "394"
             endingLineNumber = "394"
-            landmarkName = "-ra_signature:"
+            landmarkName = "-ra_viewPhotos:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -111,7 +111,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "846"
             startingLineNumber = "846"
             endingLineNumber = "846"
             endingLineNumber = "846"
-            landmarkName = "-handlePhoto:"
+            landmarkName = "-userContentController:didReceiveScriptMessage:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -127,7 +127,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "154"
             startingLineNumber = "154"
             endingLineNumber = "154"
             endingLineNumber = "154"
-            landmarkName = "-ra_openPhotoLibrary:"
+            landmarkName = "-destroyMessageHandler"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -143,7 +143,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "580"
             startingLineNumber = "580"
             endingLineNumber = "580"
             endingLineNumber = "580"
-            landmarkName = "-returnToWebPage:value:"
+            landmarkName = "-ra_selectContact:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -159,7 +159,23 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "593"
             startingLineNumber = "593"
             endingLineNumber = "593"
             endingLineNumber = "593"
-            landmarkName = "-webPageCallback:caller:value:"
+            landmarkName = "-ra_requestAppInfo:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "APEX CRM/APEX CRM/WKWebTestViewController.m"
+            timestampString = "574143075.4915"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "118"
+            endingLineNumber = "118"
+            landmarkName = "-handleNotificationByJs:"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>