fix json

DouKing · DouKing · commit 29ffca57b5ce · 2019-08-26T17:29:13.000+08:00
diff --git a/STMScriptMessageHandler/Demo/index.html b/STMScriptMessageHandler/Demo/index.html
@@ -48,7 +48,7 @@
         });
                              
         App.Bridge.registerMethod('log', function (data, callback) {
-          var message = JSON.parse(data);
+          var message = data;
           log('Native calling js method `log`', message);
           callback({ key: 'from js', value: data });
         });
diff --git a/STMScriptMessageHandler/Source/STMScriptMessageHandler.m b/STMScriptMessageHandler/Source/STMScriptMessageHandler.m
@@ -82,23 +82,23 @@ - (void)callMethod:(NSString *)methodName parameters:(NSDictionary *)parameters
         callbackId = [NSString stringWithFormat:@"cb_%d_%.0f", gSTMCallbackUniqueId++, [NSDate timeIntervalSinceReferenceDate] * 1000];
         self.jsResponseHandlers[callbackId] = handler;
     }
-    NSString *formatParameter = [self _formatParameters:parameters];
-    NSString *js = STM_JS_FUNC(%@.%@.nativeCall('%@','%@','%@'), kSTMApp, self.handlerName, methodName, formatParameter, callbackId);
-    [self _evaluateJavaScript:js completionHandler:nil];
+    NSString *formatParameter = [self _formatParameters:@{@"parameters": parameters}];
+    NSString *js = STM_JS_FUNC(%@.%@.nativeCall('%@',JSON.parse('%@').parameters,'%@'), kSTMApp, self.handlerName, methodName, formatParameter, callbackId);
+    [self _evaluateJavaScript:js];
     [self _debug:@"native call js's method" method:methodName parameters:parameters];
 }
 
 #pragma mark - Private
 
 - (void)_response:(NSString *)methodName callbackId:(NSString *)callbackId parameter:(nullable id)parameter deleteCallback:(BOOL)delete {
-    NSString *formatParameter = [self _formatParameters:parameter];
+    NSString *formatParameter = [self _formatParameters:@{@"responseData": parameter}];
     callbackId = callbackId ?: @"";
     NSString *js = STM_JS_FUNC(
         var callback = %@.%@.callback['%@'];
-        if (callback) { callback('%@'); if (%d) { delete %@.%@.callback.%@ }}
+        if (callback) { callback(JSON.parse('%@').responseData); if (%d) { delete %@.%@.callback.%@ }}
         , kSTMApp, self.handlerName, callbackId, formatParameter, delete, kSTMApp, self.handlerName, callbackId
     );
-    [self _evaluateJavaScript:js completionHandler:nil];
+    [self _evaluateJavaScript:js];
 }
 
 - (void)_addJS1 {
@@ -177,11 +177,23 @@ - (void)_addJSScript:(NSString *)jsScript forMainFrameOnly:(BOOL)flag {
     [self.webView.configuration.userContentController addUserScript:userScript];
 }
 
-- (void)_evaluateJavaScript:(NSString *)javaScriptString
-          completionHandler:(void (^ _Nullable)(_Nullable id info, NSError * _Nullable error))completionHandler {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.webView evaluateJavaScript:javaScriptString completionHandler:completionHandler];
-    });
+- (void)_evaluateJavaScript:(NSString *)javaScriptString {
+    void (^task)(void) = ^{
+        __weak typeof(self) __weak_self__ = self;
+        [self.webView evaluateJavaScript:javaScriptString completionHandler:^(id _Nullable info, NSError * _Nullable error) {
+            __strong typeof(__weak_self__) self = __weak_self__;
+            if (error) {
+                [self.webView reload];
+            }
+        }];
+    };
+    if ([NSThread currentThread].isMainThread) {
+        task();
+    } else {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            task();
+        });
+    }
 }
 
 - (NSString *)_formatParameters:(NSDictionary *)parameters {
