弹框修改完毕

ios/JianYuIOS/JianYuIOS/BaseClass1/GlobalData.h

@@ -16,7 +16,7 @@
 @property (nonatomic,assign)BOOL mineIsRed;//红点
 @property (nonatomic,assign)BOOL isReLogin;//是否重新登录
 @property (nonatomic,assign)BOOL isOpen;//是否打开-启动
-
+@property (nonatomic,assign)BOOL isPasteLogin;//是否登录粘贴板
 
 //Plist 表相关
 

ios/JianYuIOS/JianYuIOS/BaseClass1/GlobalData.m

@@ -61,6 +61,7 @@
     self.mineIsRed = NO;
     self.isReLogin = NO;
     self.isOpen = NO;
+    self.isPasteLogin = NO;
 }
 
 -(NSString *)getPlistPath {

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -111,6 +111,10 @@ _Pragma("clang diagnostic pop")\
 #define RemoteNotifications @"RemoteNotifications"
 //通知-粘贴板数据
 #define UpdateClipboard @"UpdateClipboard"
+//通知-打开粘贴板页面
+#define OpenTheClipboard @"OpenTheClipboard"
+
+
 
 //渐变色
 #define ColorGradientArray [NSArray arrayWithObjects:(id)UIColorFromRGB(0x094303).CGColor,(id)UIColorFromRGB(0x343d32).CGColor,(id)UIColorFromRGB(0xB2B7B7).CGColor, nil]
@@ -148,7 +152,7 @@ _Pragma("clang diagnostic pop")\
 #import "ZKFaceVerifyMsgView.h"
 
 
-//#define kHost @"http://web-jydev-ws.jianyu360.cn/" //王山
+#define kHost @"http://web-jydev-ws.jianyu360.cn/" //王山
 //
 //#define kHost @"http://web-jydev-zyh.jianyu360.cn/" //张雨涵
 
@@ -160,23 +164,20 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"http://web-jydev-xzh.jianyu360.cn/" //徐志恒
 
-//#define kHost @"http://web-jydev-zyx.jianyu360.cn/"
 
-//#define kHost @"https://app-jytest.jianyu360.cn/"  //老测试
-//#define kHost @"http://anti.jianyu360.cn/"         //新测试
-//#define kHost @"https://app3-jytest.jianyu360.cn/" //app3测试
+
 
 //#define kHost @"https://res.jianyu360.com/"   //正式https
 //#define kHost @"http://res.jianyu360.com/"    //正式http
 
 
-#define kHost @"http://app2-jytest.jianyu360.cn/"  //测试http
+//#define kHost @"http://app2-jytest.jianyu360.cn/"  //测试http
 //#define kHost @"https://app2-jytest.jianyu360.cn/" //测试https
 
 //#define kHost @"http://app-i1.jianyu360.com/"   //新正式
 
 
-
+//#define kHost @"http://app207-jytest.jianyu360.cn/"   //测试http
 
 
 

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewExpViewController.m

@@ -200,6 +200,8 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     
     //粘贴板-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateClipboard:) name:UpdateClipboard object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openTheClipboard:) name:OpenTheClipboard object:nil];
 }
 
 #pragma mark – Gesture Recognizer –
@@ -715,6 +717,13 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     }else {
         
     }
+    
+    //弹出页面
+    if ([GlobalData shareInstance].isPasteLogin) {
+        [GlobalData shareInstance].isPasteLogin = NO;
+        NSString  *content = [UIPasteboard generalPasteboard].string;
+        [self popPasteVIew:content];
+    }
 }
 -(void)jsBackUrl:(NSDictionary *)dict {
     NSString *status = [NSString stringWithFormat:@"%@",dict[@"status"]];
@@ -923,7 +932,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
             NSLog(@"SDK识别成功！！！");
             //调用js - 告知成功
             NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",orderNo];
-            [self isExitCallToJS:textJS withMethodName:@"getParam"];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
         } failed:^(NSError * _Nonnull error, id  _Nullable extension) {
             /** SDK异常回调 */
             NSLog(@"识别出错！！！"); //200101 用户取消操作
@@ -969,7 +978,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     if (faceVerifyResult.isSuccess) {
         NSLog(@"活体检测成功：%@",faceVerifyResult.orderNo);
         NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",faceVerifyResult.orderNo];
-        [self isExitCallToJS:textJS withMethodName:@"faceEnd"];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
         self.verifyMsgView.descTitle = @"活体检测成功";
         [self.verifyMsgView show];
     }else {
@@ -1500,50 +1509,60 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     }
 }
 
-//粘贴板相关-梳理
+#pragma mark   ****粘贴板相关-梳理
 -(void)updateClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 2) {
         NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
         NSDictionary *dict = notificaition.userInfo;
         NSString *content = [NSString stringWithFormat:@"%@",dict[@"content"]];
         if ([current_url containsString:@"jyapp/free/login"]) {
-            NSLog(@"登录页面-调用js");
-            NSString *textJS =  [NSString stringWithFormat:@"distribInfo('%@')",content];
-            [self isExitCallToJS:textJS withMethodName:@"distribInfo"];
-            
+            [GlobalData shareInstance].isPasteLogin = YES;
         }else {
-        
-            [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
-                NSLog(@"%@",progress);
-            } success:^(id responseObject) {
-                NSLog(@"responseObject=%@",responseObject);
-                if ([responseObject objectForKey:@"data"]) {
-                    NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
-                    self.clipboardView.title =dict[@"title"];
-                    self.clipboardView.subTitle =dict[@"subTitle"];
-                    self.clipboardView.imgUrl =dict[@"imgUrl"];
-                    self.clipboardView.appUrl =dict[@"appUrl"];
-                    self.clipboardView.butTxt =dict[@"butTxt"];
-                    self.clipboardView.bottomTxt =dict[@"bottomTxt"];
-                    [self.clipboardView show];
-                }
-            } failure:^(NSError *error) {
-                NSLog(@"error=%@",error);
-            }];
+            [self popPasteVIew:content];
         }
     }
 }
+    
+-(void)openTheClipboard:(NSNotification *)notificaition{
+    if(self.tabBarController.selectedIndex == 2) {
+        NSLog(@"百宝箱打开指定粘贴板url");
+        NSDictionary *dict = notificaition.userInfo;
+        NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
+        tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        kMainQueue(^{
+            [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
+        })
+    }
+}
+//弹出粘贴板框
+-(void)popPasteVIew:(NSString *)content {
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
+        NSLog(@"%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+        if ([responseObject objectForKey:@"data"]&&responseObject[@"data"]!=nil) {
+            NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
+            self.clipboardView.title =dict[@"title"];
+            self.clipboardView.subTitle =dict[@"subTitle"];
+            self.clipboardView.imgUrl =dict[@"imgUrl"];
+            self.clipboardView.appUrl =dict[@"appUrl"];
+            self.clipboardView.butTxt =dict[@"butTxt"];
+            self.clipboardView.bottomTxt =dict[@"bottomTxt"];
+            [self.clipboardView show];
+        }
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+}
 
 #pragma mark  **** 代理方法
 -(void)clipboardClick:(NSString *)url {
-    NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, url];
-    tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    kMainQueue(^{
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
-    })
+    //发送通知打开粘贴板-url
+    [[NSNotificationCenter defaultCenter] postNotificationName:OpenTheClipboard object:nil userInfo:@{@"url":url}];
 }
 
 
+
 -(void)clearWeb{
     NSURLCache * cache = [NSURLCache sharedURLCache];
     [cache removeAllCachedResponses];

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewMineViewController.m

@@ -215,6 +215,8 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     
     //粘贴板-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateClipboard:) name:UpdateClipboard object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openTheClipboard:) name:OpenTheClipboard object:nil];
 
 }
 
@@ -733,10 +735,20 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
             AppDelegate *delegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
             JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
             tab.selectedIndex = 0;
+            
+            //
         });
     }else {
         
     }
+    
+    
+    //弹出页面
+    if ([GlobalData shareInstance].isPasteLogin) {
+        [GlobalData shareInstance].isPasteLogin = NO;
+        NSString  *content = [UIPasteboard generalPasteboard].string;
+        [self popPasteVIew:content];
+    }
 }
 -(void)jsBackUrl:(NSDictionary *)dict {
     NSString *status = [NSString stringWithFormat:@"%@",dict[@"status"]];
@@ -947,7 +959,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
             NSLog(@"SDK识别成功！！！");
             //调用js - 告知成功
             NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",orderNo];
-            [self isExitCallToJS:textJS withMethodName:@"getParam"];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
         } failed:^(NSError * _Nonnull error, id  _Nullable extension) {
             /** SDK异常回调 */
             NSLog(@"识别出错！！！"); //200101 用户取消操作
@@ -993,7 +1005,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     if (faceVerifyResult.isSuccess) {
         NSLog(@"活体检测成功：%@",faceVerifyResult.orderNo);
         NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",faceVerifyResult.orderNo];
-        [self isExitCallToJS:textJS withMethodName:@"faceEnd"];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
         self.verifyMsgView.descTitle = @"活体检测成功";
         [self.verifyMsgView show];
     }else {
@@ -1535,47 +1547,56 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     }
 }
 
-//粘贴板相关-梳理
+#pragma mark   ****粘贴板相关-梳理
 -(void)updateClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 3) {
         NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
         NSDictionary *dict = notificaition.userInfo;
         NSString *content = [NSString stringWithFormat:@"%@",dict[@"content"]];
         if ([current_url containsString:@"jyapp/free/login"]) {
-            NSLog(@"登录页面-调用js");
-            NSString *textJS =  [NSString stringWithFormat:@"distribInfo('%@')",content];
-            [self isExitCallToJS:textJS withMethodName:@"distribInfo"];
-            
+            [GlobalData shareInstance].isPasteLogin = YES;
         }else {
-        
-            [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
-                NSLog(@"%@",progress);
-            } success:^(id responseObject) {
-                NSLog(@"responseObject=%@",responseObject);
-                if ([responseObject objectForKey:@"data"]) {
-                    NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
-                    self.clipboardView.title =dict[@"title"];
-                    self.clipboardView.subTitle =dict[@"subTitle"];
-                    self.clipboardView.imgUrl =dict[@"imgUrl"];
-                    self.clipboardView.appUrl =dict[@"appUrl"];
-                    self.clipboardView.butTxt =dict[@"butTxt"];
-                    self.clipboardView.bottomTxt =dict[@"bottomTxt"];
-                    [self.clipboardView show];
-                }
-            } failure:^(NSError *error) {
-                NSLog(@"error=%@",error);
-            }];
+            [self popPasteVIew:content];
         }
     }
 }
+    
+-(void)openTheClipboard:(NSNotification *)notificaition{
+    if(self.tabBarController.selectedIndex == 3) {
+        NSLog(@"我的打开指定粘贴板url");
+        NSDictionary *dict = notificaition.userInfo;
+        NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
+        tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        kMainQueue(^{
+            [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
+        })
+    }
+}
+//弹出粘贴板框
+-(void)popPasteVIew:(NSString *)content {
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
+        NSLog(@"%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+        if ([responseObject objectForKey:@"data"]&&responseObject[@"data"]!=nil) {
+            NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
+            self.clipboardView.title =dict[@"title"];
+            self.clipboardView.subTitle =dict[@"subTitle"];
+            self.clipboardView.imgUrl =dict[@"imgUrl"];
+            self.clipboardView.appUrl =dict[@"appUrl"];
+            self.clipboardView.butTxt =dict[@"butTxt"];
+            self.clipboardView.bottomTxt =dict[@"bottomTxt"];
+            [self.clipboardView show];
+        }
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+}
 
 #pragma mark  **** 代理方法
 -(void)clipboardClick:(NSString *)url {
-    NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, url];
-    tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    kMainQueue(^{
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
-    })
+    //发送通知打开粘贴板-url
+    [[NSNotificationCenter defaultCenter] postNotificationName:OpenTheClipboard object:nil userInfo:@{@"url":url}];
 }
 
 
@@ -1583,6 +1604,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 
 
 
+
 -(void)clearWeb{
     NSURLCache * cache = [NSURLCache sharedURLCache];
     [cache removeAllCachedResponses];

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSearchViewController.m

@@ -225,6 +225,8 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshAllVC:) name:RefreshAllVC object:nil];
     //粘贴板-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateClipboard:) name:UpdateClipboard object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openTheClipboard:) name:OpenTheClipboard object:nil];
+    
 }
 
 #pragma mark – Gesture Recognizer –
@@ -962,11 +964,9 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
                 JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
                 tab.selectedIndex = pushIndex;
                 pushIndex = 0;
-                
             }));
         }else {
             [self webViewFirstRequest];
-            
         }
         
     }else if ([status isEqualToString:@""]) {
@@ -975,6 +975,15 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     }else {
         
     }
+    
+    
+    //弹出页面
+    if ([GlobalData shareInstance].isPasteLogin) {
+        [GlobalData shareInstance].isPasteLogin = NO;
+        NSString  *content = [UIPasteboard generalPasteboard].string;
+        [self popPasteVIew:content];
+    }
+  
 }
 
 
@@ -1212,7 +1221,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
             NSLog(@"SDK识别成功！！！");
             //调用js - 告知成功
             NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",orderNo];
-            [self isExitCallToJS:textJS withMethodName:@"getParam"];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
         } failed:^(NSError * _Nonnull error, id  _Nullable extension) {
             /** SDK异常回调 */
             NSLog(@"识别出错！！！"); //200101 用户取消操作
@@ -1258,7 +1267,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     if (faceVerifyResult.isSuccess) {
         NSLog(@"活体检测成功：%@",faceVerifyResult.orderNo);
         NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",faceVerifyResult.orderNo];
-        [self isExitCallToJS:textJS withMethodName:@"faceEnd"];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
         self.verifyMsgView.descTitle = @"活体检测成功";
         [self.verifyMsgView show];
     }else {
@@ -1983,47 +1992,56 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     [self webViewFirstRequest];
 }
 
-//粘贴板相关-梳理
+#pragma mark   ****粘贴板相关-梳理
 -(void)updateClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 0) {
         NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
         NSDictionary *dict = notificaition.userInfo;
         NSString *content = [NSString stringWithFormat:@"%@",dict[@"content"]];
         if ([current_url containsString:@"jyapp/free/login"]) {
-            NSLog(@"登录页面-调用js");
-            NSString *textJS =  [NSString stringWithFormat:@"distribInfo('%@')",content];
-            [self isExitCallToJS:textJS withMethodName:@"distribInfo"];
-            
+            [GlobalData shareInstance].isPasteLogin = YES;
         }else {
-        
-            [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
-                NSLog(@"%@",progress);
-            } success:^(id responseObject) {
-                NSLog(@"responseObject=%@",responseObject);
-                if ([responseObject objectForKey:@"data"]) {
-                    NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
-                    self.clipboardView.title =dict[@"title"];
-                    self.clipboardView.subTitle =dict[@"subTitle"];
-                    self.clipboardView.imgUrl =dict[@"imgUrl"];
-                    self.clipboardView.appUrl =dict[@"appUrl"];
-                    self.clipboardView.butTxt =dict[@"butTxt"];
-                    self.clipboardView.bottomTxt =dict[@"bottomTxt"];
-                    [self.clipboardView show];
-                }
-            } failure:^(NSError *error) {
-                NSLog(@"error=%@",error);
-            }];
+            [self popPasteVIew:content];
         }
     }
 }
+    
+-(void)openTheClipboard:(NSNotification *)notificaition{
+    if(self.tabBarController.selectedIndex == 0) {
+        NSLog(@"首页打开指定粘贴板url");
+        NSDictionary *dict = notificaition.userInfo;
+        NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
+        tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        kMainQueue(^{
+            [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
+        })
+    }
+}
+//弹出粘贴板框
+-(void)popPasteVIew:(NSString *)content {
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
+        NSLog(@"%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+        if ([responseObject objectForKey:@"data"]&&responseObject[@"data"]!=nil) {
+            NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
+            self.clipboardView.title =dict[@"title"];
+            self.clipboardView.subTitle =dict[@"subTitle"];
+            self.clipboardView.imgUrl =dict[@"imgUrl"];
+            self.clipboardView.appUrl =dict[@"appUrl"];
+            self.clipboardView.butTxt =dict[@"butTxt"];
+            self.clipboardView.bottomTxt =dict[@"bottomTxt"];
+            [self.clipboardView show];
+        }
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+}
 
 #pragma mark  **** 代理方法
 -(void)clipboardClick:(NSString *)url {
-    NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, url];
-    tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    kMainQueue(^{
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
-    })
+    //发送通知打开粘贴板-url
+    [[NSNotificationCenter defaultCenter] postNotificationName:OpenTheClipboard object:nil userInfo:@{@"url":url}];
 }
 
 

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSubViewController.m

@@ -206,6 +206,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     
     //粘贴板-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateClipboard:) name:UpdateClipboard object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openTheClipboard:) name:OpenTheClipboard object:nil];
 }
 
 #pragma mark – Gesture Recognizer –
@@ -725,6 +726,17 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     }else {
         
     }
+    
+    
+    //弹出页面
+    if ([GlobalData shareInstance].isPasteLogin) {
+        [GlobalData shareInstance].isPasteLogin = NO;
+        NSString  *content = [UIPasteboard generalPasteboard].string;
+        [self popPasteVIew:content];
+    }
+    
+    
+    
 }
 -(void)jsBackUrl:(NSDictionary *)dict {
     NSString *status = [NSString stringWithFormat:@"%@",dict[@"status"]];
@@ -933,7 +945,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
             NSLog(@"SDK识别成功！！！");
             //调用js - 告知成功
             NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",orderNo];
-            [self isExitCallToJS:textJS withMethodName:@"getParam"];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
         } failed:^(NSError * _Nonnull error, id  _Nullable extension) {
             /** SDK异常回调 */
             NSLog(@"识别出错！！！"); //200101 用户取消操作
@@ -979,7 +991,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     if (faceVerifyResult.isSuccess) {
         NSLog(@"活体检测成功：%@",faceVerifyResult.orderNo);
         NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",faceVerifyResult.orderNo];
-        [self isExitCallToJS:textJS withMethodName:@"faceEnd"];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
         self.verifyMsgView.descTitle = @"活体检测成功";
         [self.verifyMsgView show];
     }else {
@@ -1511,47 +1523,56 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
 }
 
 
-//粘贴板相关-梳理
+#pragma mark   ****粘贴板相关-梳理
 -(void)updateClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 1) {
         NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
         NSDictionary *dict = notificaition.userInfo;
         NSString *content = [NSString stringWithFormat:@"%@",dict[@"content"]];
         if ([current_url containsString:@"jyapp/free/login"]) {
-            NSLog(@"登录页面-调用js");
-            NSString *textJS =  [NSString stringWithFormat:@"distribInfo('%@')",content];
-            [self isExitCallToJS:textJS withMethodName:@"distribInfo"];
-            
+            [GlobalData shareInstance].isPasteLogin = YES;
         }else {
-        
-            [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
-                NSLog(@"%@",progress);
-            } success:^(id responseObject) {
-                NSLog(@"responseObject=%@",responseObject);
-                if ([responseObject objectForKey:@"data"]) {
-                    NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
-                    self.clipboardView.title =dict[@"title"];
-                    self.clipboardView.subTitle =dict[@"subTitle"];
-                    self.clipboardView.imgUrl =dict[@"imgUrl"];
-                    self.clipboardView.appUrl =dict[@"appUrl"];
-                    self.clipboardView.butTxt =dict[@"butTxt"];
-                    self.clipboardView.bottomTxt =dict[@"bottomTxt"];
-                    [self.clipboardView show];
-                }
-            } failure:^(NSError *error) {
-                NSLog(@"error=%@",error);
-            }];
+            [self popPasteVIew:content];
         }
     }
 }
+    
+-(void)openTheClipboard:(NSNotification *)notificaition{
+    if(self.tabBarController.selectedIndex == 1) {
+        NSLog(@"订阅打开指定粘贴板url");
+        NSDictionary *dict = notificaition.userInfo;
+        NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
+        tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        kMainQueue(^{
+            [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
+        })
+    }
+}
+//弹出粘贴板框
+-(void)popPasteVIew:(NSString *)content {
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@distribution/share/getWordInfo",kHost] parameters:@{@"copyTxt":content} progress:^(NSProgress *progress) {
+        NSLog(@"%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+        if ([responseObject objectForKey:@"data"]&&responseObject[@"data"]!=nil) {
+            NSDictionary *dict = [[NSDictionary alloc]initWithDictionary:responseObject[@"data"]];
+            self.clipboardView.title =dict[@"title"];
+            self.clipboardView.subTitle =dict[@"subTitle"];
+            self.clipboardView.imgUrl =dict[@"imgUrl"];
+            self.clipboardView.appUrl =dict[@"appUrl"];
+            self.clipboardView.butTxt =dict[@"butTxt"];
+            self.clipboardView.bottomTxt =dict[@"bottomTxt"];
+            [self.clipboardView show];
+        }
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+}
 
 #pragma mark  **** 代理方法
 -(void)clipboardClick:(NSString *)url {
-    NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, url];
-    tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    kMainQueue(^{
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:tmpUrl]]];
-    })
+    //发送通知打开粘贴板-url
+    [[NSNotificationCenter defaultCenter] postNotificationName:OpenTheClipboard object:nil userInfo:@{@"url":url}];
 }
 
 

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -98,6 +98,13 @@
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
+			<key>app207-jytest.jianyu360.cn</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
 			<key>jpush.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>