Merge branch 'ajp/7.29.0_web' into 'master'

Ajp/7.29.0 web

See merge request !17

GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMBasicInfoCardView.m

@@ -21,9 +21,8 @@
 #import "GMToFacePayPopView.h"
 #import "RequestHeader.h"
 #import <GMBase/GMBaseTool.h>
-#import <GMBaseWeb/GMBaseWeb-Swift.h>
-#import <GMBaseWeb/GMWebutil.h>
 
+@import GMBaseWeb;
 #define counsellorAllHeight (573 + UIView.safeAreaInsetsBottom)
 #define counsellorHalfHeight (366 + UIView.safeAreaInsetsBottom)
 #define doctorAllHeight (573 + UIView.safeAreaInsetsBottom)
@@ -32,7 +31,7 @@
 #define dispatchAllHeight (522 + UIView.safeAreaInsetsBottom)
 #define dispatchHalfHeight (286 + UIView.safeAreaInsetsBottom)
 
-@interface GMBasicInfoCardView ()<WKBaseWebViewDelegate>
+@interface GMBasicInfoCardView ()<GMJSBridgeProtocol>
 @property (nonatomic, strong) GMBaseWebViewComponent *webCompent;
 @property (nonatomic, strong) GMVideoWaitingView *waitingView;
 @property (nonatomic, assign) int currentTime;
@@ -130,7 +129,9 @@
     }
 }
 
-- (void)getVideoPermission:(NSDictionary *)data {
+- (void)getVideoPermission:(NSString *)jsonString; {
+    
+    NSDictionary *data = [NSDictionary dictionaryWithJsonString:jsonString];
     //先请求订单接口，付款完成后再进行面诊
     self.dict = [NSMutableDictionary dictionaryWithDictionary:data];
     self.traceId = [GMVideoPhobos getTraceId];
@@ -166,7 +167,12 @@
     [self layoutIfNeeded];
 }
 
--(void)globalDataLoaded:(NSDictionary *)data {
+- (void)globalDataLoaded:(NSString *)jsonString {
+    
+    if (![jsonString isNonEmpty]) {
+        return;
+    }
+    NSDictionary *data = [NSDictionary dictionaryWithJsonString:jsonString];
     int consultation_type = [data[@"consultation_type"] intValue];
     int counsellor_type = [data[@"counsellor_type"] intValue];
     NSDictionary *dict = @{@"page_name":[GMBaseTool getCurrentViewController].pageName,

GMAILab/Classes/ToFace/ToFaceOrder/ViewController/GMTofaceOrderDetailViewController.m

@@ -13,10 +13,9 @@
 #import "GMEndConsultView.h"
 #import "RequestHeader.h"
 #import "GMToFaceNetworking.h"
-#import <GMBaseWeb/GMBaseWeb-Swift.h>
-#import <WebKit/WebKit.h>
+@import GMBaseWeb;
 @import GMHud;
-@interface GMTofaceOrderDetailViewController () <WKBaseWebViewDelegate>
+@interface GMTofaceOrderDetailViewController () <GMJSBridgeProtocol>
 @property (nonatomic, strong) GMComplaintObject *complaintObject;
 
 @end
@@ -72,7 +71,7 @@
     view.complaintType = GMComplaintTypeDoctor;
     view.complaintFinish = ^(NSInteger complaintStatus) {
         NSString *jsStr = [NSString stringWithFormat:@"window.gm&&window.gm.pack&&window.gm.pack.run('notificReportState')"];
-        [self.webCompent.webView evaluateJavaScript:jsStr completionHandler:nil];
+        [self.webCompent.webView _safeAsyncEvaluateJavaScript:jsStr completionHandler:nil];
     };
     [[GMBaseTool getCurrentViewController].view addSubview:view];
 }

GMAILab/Classes/ToFace/WorkingTable/View/GMDiagnosisWorkingTableChooseIdentityView.m

@@ -12,7 +12,7 @@
 #import "NSString+CalculateSize.h"
 #import "WMTagObject.h"
 #import <GMBase/GMBaseTool.h>
-#import <GMBaseWeb/GMWebutil.h>
+@import GMBaseWeb;
 @import GMHud;
 @import GMRouter;
 

GMAILab/Classes/ToFace/WorkingTable/View/GMDiagnosisWorkingTableHeaderView.m

@@ -11,7 +11,6 @@
 #import "GMGMDiagnosisWorkingTableScrollView.h"
 #import "RequestHeader.h"
 #import "GMLibraryHeader.h"
-//#import "WMBrowserViewController.h"
 @import GMRouter;
 @interface GMServiceDataItemView()
 @property (nonatomic, strong) UILabel *line;

GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportListController.m

@@ -12,11 +12,10 @@
 #import "GMComplaintResultView.h"
 #import "GMComplaintObject.h"
 #import "RequestHeader.h"
-#import <GMBaseWeb/GMBaseWeb-Swift.h>
 #import <GMFoundation/GMFoundation-umbrella.h>
+@import GMBaseWeb;
 @import GMNetworking;
-@import WebKit.WKWebView;
-@interface GMBusinessReportListController () <WKBaseWebViewDelegate>
+@interface GMBusinessReportListController () <GMJSBridgeProtocol>
 
 @end
 
@@ -42,14 +41,15 @@
                              @"state" : @(1)
     };
     NSString *jsStr = [NSString stringWithFormat:@"window.gm&&window.gm.pack&&window.gm.pack.run('notificReportState','%@')", [NSString convertToBriefJsonString:params]];
-    [self.webCompent.webView evaluateJavaScript:jsStr completionHandler:nil];
+    [self.webCompent.webView _safeAsyncEvaluateJavaScript:jsStr completionHandler:nil];
 }
 
 - (NSString *)moreQueryParameters {
     return [NSString stringWithFormat:@"&doctor_id=%@&counsellor_id=%@",SafeString(self.doctorId),SafeString(self.counsellorId)];
 }
 
-- (void)videoDiagnoseComplaint:(NSDictionary *)complaint {
+- (void)videoDiagnoseComplaint:(NSString *)jsonString {
+    NSDictionary *complaint = [NSDictionary dictionaryWithJsonString:jsonString];
     GMComplaintResultViewType complaintStatus = [complaint[@"status"] integerValue];
     if (complaintStatus == GMComplaintResultViewTypeNone) {
         GMEndConsultView *view = [[GMEndConsultView alloc] initWithType:GMEndConsultViewTypeDoctorComplaint starNum:0];
@@ -60,7 +60,7 @@
                                      @"state" : @(complaintStatus)
             };
             NSString *jsStr = [NSString stringWithFormat:@"window.gm&&window.gm.pack&&window.gm.pack.run('notificReportState','%@')", [NSString convertToBriefJsonString:params]];
-            [self.webCompent.webView evaluateJavaScript:jsStr completionHandler:nil];
+            [self.webCompent.webView _safeAsyncEvaluateJavaScript:jsStr completionHandler:nil];
         };
         [[GMBaseTool getCurrentViewController].view addSubview:view];
     } else {

GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportResultController.m

@@ -11,14 +11,14 @@
 #import "RequestHeader.h"
 #import "GMAIUploadImagesManager.h"
 //#import "GMUploadImagesManager.h"
-#import <GMBaseWeb/GMBaseWeb-Swift.h>
 #import <GMbase/GMBaseTool.h>
 
+@import GMBaseWeb;
 @import GMHud;
 @import GMNetworking;
 @import GMFoundation;
 @import GMAlbum;
-@interface GMBusinessReportResultController () <WKBaseWebViewDelegate>
+@interface GMBusinessReportResultController () <GMJSBridgeProtocol>
 
 @property (nonatomic, strong) UIImage *shareImage;
 @property (nonatomic, copy) NSString *shareUserId;

GMAILab/Classes/ToFace/WorkingTable/ViewModel/GMEditQuesPartViewModel.m

@@ -9,7 +9,6 @@
 #import "GMEditQuesPartViewModel.h"
 #import "GMBusinessReportListController.h"
 #import <GMBase/GMBaseTool.h>
-//#import "WMBrowserViewController.h"
 #import "RequestHeader.h"
 @import GMHud;
 @import GMRouter;

GMAILab/Classes/ToFace/diagnoseRecord/GMDiagnoseRecordWebViewController.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 
-#import "GMWebViewController.h"
+@import GMBaseWeb;
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/diagnoseRecord/GMDiagnoseRecordWebViewController.m

@@ -15,12 +15,12 @@
 #import "GMToFaceOrderInfoModel.h"
 #import "GMToFaceNetworking.h"
 #import "NSString+AIJsonData.h"
-#import <GMBase/GMBase-Swift.h>
+//#import <GMBase/GMBase-Swift.h>
 #import "RequestHeader.h"
-#import <GMBaseWeb/GMBaseWeb-Swift.h>
 
 @import GMBase;
-@import WebKit.WKWebView;
+@import GMBaseWeb;
+
 @interface GMViewEvaluateModel: GMObject
 //面诊id
 @property (nonatomic, copy) NSString *consultationId;
@@ -31,9 +31,10 @@
 //页面名称
 @property (nonatomic, copy) NSString *tabName;
 @end
+
 @implementation GMViewEvaluateModel @end
 
-@interface GMDiagnoseRecordWebViewController () <WKBaseWebViewDelegate>
+@interface GMDiagnoseRecordWebViewController () <GMJSBridgeProtocol>
 @property (nonatomic, strong) GMComplaintObject *complaintObject;
 
 @property (nonatomic, assign) BOOL isSureOrder;
@@ -103,7 +104,7 @@
                 }
                 NSString *str = [NSDictionary dictionaryToJson:dict];
                 NSString *jsStr = [NSString stringWithFormat:@"window.gm&&window.gm.pack&&window.gm.pack.run('evaluateCallback',%@)", str];
-                [weakSelf.webCompent.webView evaluateJavaScript:jsStr completionHandler:nil];
+                [weakSelf.webCompent.webView _safeAsyncEvaluateJavaScript:jsStr completionHandler:nil];
             };
             view.showComplaint = model.showComplaint;
             view.recordId = model.consultationId;
@@ -160,7 +161,7 @@
             NSDictionary *dict = @{@"type":@(type),@"star":@(star),@"desc":desc};
             NSString *str = [NSDictionary dictionaryToJson:dict];
             NSString *jsStr = [NSString stringWithFormat:@"window.gm&&window.gm.pack&&window.gm.pack.run('confirmCallback',%@)", str];
-            [weakSelf.webCompent.webView evaluateJavaScript:jsStr completionHandler:nil];
+            [weakSelf.webCompent.webView _safeAsyncEvaluateJavaScript:jsStr completionHandler:nil];
         };
         popView.infoModel = infoModel;
         [[GMBaseTool mainWindow]  addSubview:popView];