备份

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -59,8 +59,6 @@
 		761BCA63272A816900259676 /* JYNewMessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 761BCA62272A816900259676 /* JYNewMessViewController.m */; };
 		761BCA72272AA0CE00259676 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 761BCA6F272AA0CE00259676 /* README.txt */; };
 		761BCA73272AA0CE00259676 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 761BCA71272AA0CE00259676 /* libWeChatSDK.a */; };
-		763EF7C7281B752500D1F36B /* libUMSPosPayOnly.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 763EF7C6281B752500D1F36B /* libUMSPosPayOnly.a */; };
-		763EF7CB281B758300D1F36B /* libPaymentControlMini.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 763EF7CA281B758300D1F36B /* libPaymentControlMini.a */; };
 		76ED394028813ACC00B211C9 /* JhtDownloadRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 76ED391B28813ACC00B211C9 /* JhtDownloadRequest.m */; };
 		76ED394128813ACC00B211C9 /* JhtDocFileOperations.m in Sources */ = {isa = PBXBuildFile; fileRef = 76ED391E28813ACC00B211C9 /* JhtDocFileOperations.m */; };
 		76ED394228813ACC00B211C9 /* JhtNetworkCheckTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 76ED392128813ACC00B211C9 /* JhtNetworkCheckTools.m */; };
@@ -200,12 +198,6 @@
 		761BCA6F272AA0CE00259676 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
 		761BCA70272AA0CE00259676 /* WechatAuthSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WechatAuthSDK.h; sourceTree = "<group>"; };
 		761BCA71272AA0CE00259676 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeChatSDK.a; sourceTree = "<group>"; };
-		763EF7C3281B752500D1F36B /* UMSPPPayUnifyPayPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSPPPayUnifyPayPlugin.h; sourceTree = "<group>"; };
-		763EF7C4281B752500D1F36B /* UMSPPPayVersionsInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSPPPayVersionsInfo.h; sourceTree = "<group>"; };
-		763EF7C5281B752500D1F36B /* UMSPPPayPluginSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSPPPayPluginSettings.h; sourceTree = "<group>"; };
-		763EF7C6281B752500D1F36B /* libUMSPosPayOnly.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libUMSPosPayOnly.a; sourceTree = "<group>"; };
-		763EF7C9281B758300D1F36B /* UPPaymentControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPaymentControl.h; sourceTree = "<group>"; };
-		763EF7CA281B758300D1F36B /* libPaymentControlMini.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libPaymentControlMini.a; sourceTree = "<group>"; };
 		76ED391728813ACC00B211C9 /* JhtDocViewer_Define.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JhtDocViewer_Define.h; sourceTree = "<group>"; };
 		76ED391A28813ACC00B211C9 /* JhtDownloadRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JhtDownloadRequest.h; sourceTree = "<group>"; };
 		76ED391B28813ACC00B211C9 /* JhtDownloadRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JhtDownloadRequest.m; sourceTree = "<group>"; };
@@ -285,9 +277,7 @@
 				18E05D0422F11D69001E5B44 /* SystemConfiguration.framework in Frameworks */,
 				18E05D0222F11D62001E5B44 /* libc++.tbd in Frameworks */,
 				18E05CFE22F11D4E001E5B44 /* CoreMotion.framework in Frameworks */,
-				763EF7CB281B758300D1F36B /* libPaymentControlMini.a in Frameworks */,
 				C550BF362018591400F0BC2A /* CoreGraphics.framework in Frameworks */,
-				763EF7C7281B752500D1F36B /* libUMSPosPayOnly.a in Frameworks */,
 				761BCA73272AA0CE00259676 /* libWeChatSDK.a in Frameworks */,
 				182493C1255B8A3100BF4AB2 /* libc.tbd in Frameworks */,
 				18E05CFC22F11CDE001E5B44 /* AlipaySDK.framework in Frameworks */,
@@ -401,8 +391,6 @@
 			isa = PBXGroup;
 			children = (
 				76ED391628813ACC00B211C9 /* JhtDocViewer_SDK */,
-				763EF7C8281B758300D1F36B /* UPPaymentControl */,
-				763EF7C1281B752500D1F36B /* UMSPosPayOnly */,
 				761BCA6C272AA0CE00259676 /* WeChatSDK1.9.2 */,
 				18E05CF622F11CDD001E5B44 /* AlipaySDK */,
 			);
@@ -439,34 +427,6 @@
 			path = WeChatSDK1.9.2;
 			sourceTree = "<group>";
 		};
-		763EF7C1281B752500D1F36B /* UMSPosPayOnly */ = {
-			isa = PBXGroup;
-			children = (
-				763EF7C2281B752500D1F36B /* include */,
-				763EF7C6281B752500D1F36B /* libUMSPosPayOnly.a */,
-			);
-			path = UMSPosPayOnly;
-			sourceTree = "<group>";
-		};
-		763EF7C2281B752500D1F36B /* include */ = {
-			isa = PBXGroup;
-			children = (
-				763EF7C3281B752500D1F36B /* UMSPPPayUnifyPayPlugin.h */,
-				763EF7C4281B752500D1F36B /* UMSPPPayVersionsInfo.h */,
-				763EF7C5281B752500D1F36B /* UMSPPPayPluginSettings.h */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		763EF7C8281B758300D1F36B /* UPPaymentControl */ = {
-			isa = PBXGroup;
-			children = (
-				763EF7C9281B758300D1F36B /* UPPaymentControl.h */,
-				763EF7CA281B758300D1F36B /* libPaymentControlMini.a */,
-			);
-			path = UPPaymentControl;
-			sourceTree = "<group>";
-		};
 		76ED391628813ACC00B211C9 /* JhtDocViewer_SDK */ = {
 			isa = PBXGroup;
 			children = (
@@ -1199,7 +1159,7 @@
 				CODE_SIGN_ENTITLEMENTS = "JianYuIOS/剑鱼标讯Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 74;
 				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1285,7 +1245,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 74;
 				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/zhengkun.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>

ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -24,9 +24,6 @@
 #import "JYKeyCustom.h"
 #import <WebKit/WebKit.h>
 #import "WXApi.h"
-#import "UMSPPPayVersionsInfo.h"
-#import "UMSPPPayPluginSettings.h"
-#import "UMSPPPayUnifyPayPlugin.h"
 
 //JPUSHRegisterDelegate
 @interface AppDelegate ()<UIApplicationDelegate, WXApiDelegate,UNUserNotificationCenterDelegate>
@@ -104,9 +101,7 @@
     }
 }
 
--(void)initUMSPay {
-    NSLog(@"全民付插件当前SDK版本：%@",[UMSPPPayVersionsInfo getVersionsInfoForPosPayPlugin]);
-}
+
 -(void)initUM {
     /* 打开调试日志 */
     [[UMSocialManager defaultManager] openLog:YES];

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -182,21 +182,18 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"https://app-jytest.jydev.jianyu360.com/"  //测试1
 //#define kHost @"https://app2-jytest.jydev.jianyu360.com/"  //测试2
-#define kHost @"https://app5-jytest.jydev.jianyu360.com/"  //测试5
-
-
-
-//#define kHost @"https://app-i2.jianyu360.cn/"   //新正式
-
+//#define kHost @"https://app5-jytest.jydev.jianyu360.com/"  //测试5
 
+#define kHost @"https://app-i3.jianyu360.cn/"   //新正式
 
 //测试
-#define OCRAPPID @"TIDAXUV9"
-#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iGu6HjKkDlKWhcLFmMimw9NjpIBSVubmbZq9LI6yCTVVpJe934uUSpRX+4aGhH3x6M7Uv+aOz232qxVldLxSWeS+16IVVI+uoGILEgpTOLbdNGjtYxAI5X3GdyR9/ZXPHUKbSwNaJWj4svMDm+unKSvshPmZ9we28IzWx0ddxn22w=="
+//#define OCRAPPID @"TIDAXUV9"
+//#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iGu6HjKkDlKWhcLFmMimw9NjpIBSVubmbZq9LI6yCTVVpJe934uUSpRX+4aGhH3x6M7Uv+aOz232qxVldLxSWeS+16IVVI+uoGILEgpTOLbdNGjtYxAI5X3GdyR9/ZXPHUKbSwNaJWj4svMDm+unKSvshPmZ9we28IzWx0ddxn22w=="
+
 
 //正式
-//#define OCRAPPID @"IDA24rmI"
-//#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iG2cYczbyncMrpud8GaWP/O2BhbWuWeoCpqhfOM16agoAHKepGWdhhkZTDOaVPKUMmbaQ8I2dFlk9IfOrmqc1UFO+mni7bJ90T8NjjyOPbcKYtJPFwVjyGzTse9klfXuHgNealpJfvXrTnS85BNZcxYxVh+U3H58Bel+LRnFIVUag=="
+#define OCRAPPID @"IDA24rmI"
+#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iG2cYczbyncMrpud8GaWP/O2BhbWuWeoCpqhfOM16agoAHKepGWdhhkZTDOaVPKUMmbaQ8I2dFlk9IfOrmqc1UFO+mni7bJ90T8NjjyOPbcKYtJPFwVjyGzTse9klfXuHgNealpJfvXrTnS85BNZcxYxVh+U3H58Bel+LRnFIVUag=="
 
 
 

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

@@ -686,7 +686,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
             ctr.titleShow = title;
         }
         kMainQueue(^{
-            [self presentViewController:ctr animated:NO completion:nil];
+            [self presentViewController:ctr animated:YES completion:nil];
         });
     }
 }
@@ -1189,15 +1189,13 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     NSString *filetype = [NSString stringWithFormat:@"%@",dict[@"filetype"]];
     NSString *fileurl = [NSString stringWithFormat:@"%@",dict[@"fileurl"]];
     NSString *filesize = [NSString stringWithFormat:@"%@",dict[@"filesize"]];
-    
-    
+    NSString *new_filename = [NSString stringWithFormat:@"%@.%@",[filename stringByRemovingPercentEncoding],filetype];
+    new_filename=[new_filename stringByReplacingOccurrencesOfString:@"/" withString:@""];
     LoadDocViewController *load = [[LoadDocViewController alloc] init];
     JhtFileModel *fileModel = [[JhtFileModel alloc] init];
-    fileModel.fileName = [NSString stringWithFormat:@"%@.%@",filename,filetype];
-    if ([filetype isEqualToString:@"doc"]||[filetype isEqualToString:@"docx"]) {
+    fileModel.fileName = new_filename;
+    if ([filetype isEqualToString:@"doc"] || [filetype isEqualToString:@"word"]||[filetype isEqualToString:@"docx"]) {
         fileModel.viewFileType =Type_Docx;
-    }else if([filetype isEqualToString:@"word"]) {
-        fileModel.viewFileType =Type_Word;
     }else if([filetype isEqualToString:@"excel"]||[filetype isEqualToString:@"xls"]||[filetype isEqualToString:@"xlsx"]) {
         fileModel.viewFileType =Type_Xlsx;
     }else if([filetype isEqualToString:@"ppt"]||[filetype isEqualToString:@"pptx"]) {
@@ -1224,6 +1222,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
 }
 
 
+
 #pragma mark   *****其他方法
 -(void)judgeIsHiddenBottom {
     if(self.tabBarController.selectedIndex == 3) {

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

@@ -686,7 +686,7 @@ NSString *const new_AesKey_5 = @"mGlAgnIBB8bx2nch";
             ctr.titleShow = title;
         }
         kMainQueue(^{
-            [self presentViewController:ctr animated:NO completion:nil];
+            [self presentViewController:ctr animated:YES completion:nil];
         });
     }
 }
@@ -1192,15 +1192,13 @@ NSString *const new_AesKey_5 = @"mGlAgnIBB8bx2nch";
     NSString *filetype = [NSString stringWithFormat:@"%@",dict[@"filetype"]];
     NSString *fileurl = [NSString stringWithFormat:@"%@",dict[@"fileurl"]];
     NSString *filesize = [NSString stringWithFormat:@"%@",dict[@"filesize"]];
-    
-    
+    NSString *new_filename = [NSString stringWithFormat:@"%@.%@",[filename stringByRemovingPercentEncoding],filetype];
+    new_filename=[new_filename stringByReplacingOccurrencesOfString:@"/" withString:@""];
     LoadDocViewController *load = [[LoadDocViewController alloc] init];
     JhtFileModel *fileModel = [[JhtFileModel alloc] init];
-    fileModel.fileName = [NSString stringWithFormat:@"%@.%@",filename,filetype];
-    if ([filetype isEqualToString:@"doc"]||[filetype isEqualToString:@"docx"]) {
+    fileModel.fileName = new_filename;
+    if ([filetype isEqualToString:@"doc"] || [filetype isEqualToString:@"word"]||[filetype isEqualToString:@"docx"]) {
         fileModel.viewFileType =Type_Docx;
-    }else if([filetype isEqualToString:@"word"]) {
-        fileModel.viewFileType =Type_Word;
     }else if([filetype isEqualToString:@"excel"]||[filetype isEqualToString:@"xls"]||[filetype isEqualToString:@"xlsx"]) {
         fileModel.viewFileType =Type_Xlsx;
     }else if([filetype isEqualToString:@"ppt"]||[filetype isEqualToString:@"pptx"]) {
@@ -1228,6 +1226,7 @@ NSString *const new_AesKey_5 = @"mGlAgnIBB8bx2nch";
 
 
 
+
 #pragma mark   *****其他方法
 -(void)judgeIsHiddenBottom {
     if(self.tabBarController.selectedIndex == 2) {

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

@@ -699,7 +699,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
             ctr.titleShow = title;
         }
         kMainQueue(^{
-            [self presentViewController:ctr animated:NO completion:nil];
+            [self presentViewController:ctr animated:YES completion:nil];
         });
     }
 }
@@ -1216,15 +1216,13 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     NSString *filetype = [NSString stringWithFormat:@"%@",dict[@"filetype"]];
     NSString *fileurl = [NSString stringWithFormat:@"%@",dict[@"fileurl"]];
     NSString *filesize = [NSString stringWithFormat:@"%@",dict[@"filesize"]];
-    
-    
+    NSString *new_filename = [NSString stringWithFormat:@"%@.%@",[filename stringByRemovingPercentEncoding],filetype];
+    new_filename=[new_filename stringByReplacingOccurrencesOfString:@"/" withString:@""];
     LoadDocViewController *load = [[LoadDocViewController alloc] init];
     JhtFileModel *fileModel = [[JhtFileModel alloc] init];
-    fileModel.fileName = [NSString stringWithFormat:@"%@.%@",filename,filetype];
-    if ([filetype isEqualToString:@"doc"]||[filetype isEqualToString:@"docx"]) {
+    fileModel.fileName = new_filename;
+    if ([filetype isEqualToString:@"doc"] || [filetype isEqualToString:@"word"]||[filetype isEqualToString:@"docx"]) {
         fileModel.viewFileType =Type_Docx;
-    }else if([filetype isEqualToString:@"word"]) {
-        fileModel.viewFileType =Type_Word;
     }else if([filetype isEqualToString:@"excel"]||[filetype isEqualToString:@"xls"]||[filetype isEqualToString:@"xlsx"]) {
         fileModel.viewFileType =Type_Xlsx;
     }else if([filetype isEqualToString:@"ppt"]||[filetype isEqualToString:@"pptx"]) {
@@ -1245,7 +1243,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     load.titleStr = fileModel.fileName;
     load.currentFileModel = fileModel;
     kMainQueue(^{
-        [self presentViewController:load animated:NO completion:nil];
+        [self presentViewController:load animated:YES completion:nil];
     });
     
 }

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

@@ -479,7 +479,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
                 ctr.url = nextUrl;
                 ctr.titleShow = @"公告信息";
                 kMainQueue(^{
-                     [self presentViewController:ctr animated:NO completion:nil];
+                     [self presentViewController:ctr animated:YES completion:nil];
                 });
                 // 不允许跳转-并跳转新页面
                 decisionHandler(WKNavigationActionPolicyCancel);
@@ -579,23 +579,26 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     //监听购买结果
     [[SKPaymentQueue defaultQueue] addTransactionObserver:self];
     
-//    UIButton *testBtn = [ZKControl createButtonWithFrame:CGRectMake(100, 50, 100, 100) title:@"模拟按钮" imageName:@"" bgImageName:@"" target:self method:@selector(testBtnClick)];
-//    [self.webView addSubview:testBtn];
+    UIButton *testBtn = [ZKControl createButtonWithFrame:CGRectMake(100, 50, 100, 100) title:@"模拟按钮" imageName:@"" bgImageName:@"" target:self method:@selector(testBtnClick)];
+    [self.webView addSubview:testBtn];
     
 }
 
 -(void)testBtnClick {
+
     LoadDocViewController *load = [[LoadDocViewController alloc] init];
     //构建数据
     JhtFileModel *fileModel = [[JhtFileModel alloc] init];
-    fileModel.fileName = @"测试图片.jpg";
-    fileModel.viewFileType = Type_Jpg;
-    fileModel.url = @"https://jy-datafile.oss-cn-beijing.aliyuncs.com/df3c910008ec25b29138902bcab8a3f3f02c6b5e7376ac12bbd89dc58be27877.jpg";
-    fileModel.fileSize = @"19 Kb";
+    fileModel.fileName = @"aaabbb";
+    fileModel.fileName = [fileModel.fileName stringByRemovingPercentEncoding];
+    fileModel.fileName=[fileModel.fileName stringByReplacingOccurrencesOfString:@"/" withString:@""];
+    fileModel.viewFileType = Type_Unknow;
+    fileModel.url = @"https://jy-datafile.oss-cn-beijing.aliyuncs.com/be2344c786e054e93b6cf476f99d4f287dbd3670e4d7f51995af4ce4b5c69928.doc";
+    fileModel.fileSize = @"";
     load.titleStr = fileModel.fileName;
     load.currentFileModel = fileModel;
     kMainQueue(^{
-        [self presentViewController:load animated:NO completion:nil];
+        [self presentViewController:load animated:YES completion:nil];
     });
 }
 
@@ -906,7 +909,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
             ctr.titleShow = title;
         }
         kMainQueue(^{
-            [self presentViewController:ctr animated:NO completion:nil];
+            [self presentViewController:ctr animated:YES completion:nil];
         });
     }
 }
@@ -1537,6 +1540,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     if(self.tabBarController.selectedIndex == 0) {
         [self.tabBarController.tabBar showBadgeOnItemIndex:2 withCount:[count intValue]];
     }
+
 }
 
 
@@ -1545,11 +1549,11 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     NSString *filetype = [NSString stringWithFormat:@"%@",dict[@"filetype"]];
     NSString *fileurl = [NSString stringWithFormat:@"%@",dict[@"fileurl"]];
     NSString *filesize = [NSString stringWithFormat:@"%@",dict[@"filesize"]];
-    
-    
+    NSString *new_filename = [NSString stringWithFormat:@"%@.%@",[filename stringByRemovingPercentEncoding],filetype];
+    new_filename=[new_filename stringByReplacingOccurrencesOfString:@"/" withString:@""];
     LoadDocViewController *load = [[LoadDocViewController alloc] init];
     JhtFileModel *fileModel = [[JhtFileModel alloc] init];
-    fileModel.fileName = [NSString stringWithFormat:@"%@.%@",filename,filetype];
+    fileModel.fileName = new_filename;
     if ([filetype isEqualToString:@"doc"] || [filetype isEqualToString:@"word"]||[filetype isEqualToString:@"docx"]) {
         fileModel.viewFileType =Type_Docx;
     }else if([filetype isEqualToString:@"excel"]||[filetype isEqualToString:@"xls"]||[filetype isEqualToString:@"xlsx"]) {
@@ -1579,8 +1583,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 
 
-
-
 #pragma mark   *****其他方法
 -(void)judgeIsHiddenBottom {
     if(self.tabBarController.selectedIndex == 0) {

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

@@ -686,7 +686,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
             ctr.titleShow = title;
         }
         kMainQueue(^{
-            [self presentViewController:ctr animated:NO completion:nil];
+            [self presentViewController:ctr animated:YES completion:nil];
         });
     }
 }
@@ -1191,15 +1191,13 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     NSString *filetype = [NSString stringWithFormat:@"%@",dict[@"filetype"]];
     NSString *fileurl = [NSString stringWithFormat:@"%@",dict[@"fileurl"]];
     NSString *filesize = [NSString stringWithFormat:@"%@",dict[@"filesize"]];
-    
-    
+    NSString *new_filename = [NSString stringWithFormat:@"%@.%@",[filename stringByRemovingPercentEncoding],filetype];
+    new_filename=[new_filename stringByReplacingOccurrencesOfString:@"/" withString:@""];
     LoadDocViewController *load = [[LoadDocViewController alloc] init];
     JhtFileModel *fileModel = [[JhtFileModel alloc] init];
-    fileModel.fileName = [NSString stringWithFormat:@"%@.%@",filename,filetype];
-    if ([filetype isEqualToString:@"doc"]||[filetype isEqualToString:@"docx"]) {
+    fileModel.fileName = new_filename;
+    if ([filetype isEqualToString:@"doc"] || [filetype isEqualToString:@"word"]||[filetype isEqualToString:@"docx"]) {
         fileModel.viewFileType =Type_Docx;
-    }else if([filetype isEqualToString:@"word"]) {
-        fileModel.viewFileType =Type_Word;
     }else if([filetype isEqualToString:@"excel"]||[filetype isEqualToString:@"xls"]||[filetype isEqualToString:@"xlsx"]) {
         fileModel.viewFileType =Type_Xlsx;
     }else if([filetype isEqualToString:@"ppt"]||[filetype isEqualToString:@"pptx"]) {
@@ -1225,6 +1223,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     
 }
 
+
 #pragma mark   *****其他方法
 -(void)judgeIsHiddenBottom {
     if(self.tabBarController.selectedIndex == 1) {

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -128,6 +128,13 @@
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
+			<key>jy-datafile.oss-cn-beijing.aliyuncs.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
 			<key>web-jydev-wcj.jianyu360.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>

ios/JianYuIOS/JianYuIOS/Libs(第三方)/JhtDocViewer_SDK/View /JhtLoadDocView/JhtLoadDocView.m

@@ -122,13 +122,14 @@
 /** CreateUI */
 - (void)ldvCreateUI {
     self.backgroundColor = [UIColor whiteColor];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSString *filePath = [_fileUtil stitchLocalFilePath];
-    if ([fileManager fileExistsAtPath:filePath]) {
-        [self ldvCreateDownloadUI:YES];
-    }else {
-        [self ldvCreateDownloadUI:NO];
-    }
+    [self ldvCreateDownloadUI:NO];
+//    NSFileManager *fileManager = [NSFileManager defaultManager];
+//    NSString *filePath = [_fileUtil stitchLocalFilePath];
+//    if ([fileManager fileExistsAtPath:filePath]) {
+//        [self ldvCreateDownloadUI:YES];
+//    }else {
+//        [self ldvCreateDownloadUI:NO];
+//    }
 }
 
 /** 获取本地文件大小 */
@@ -240,13 +241,14 @@
             [self.downloadView.fileProgressView setProgress:downloadProgress.fractionCompleted animated:YES];
         });
     } setupFilePath:^NSURL *(NSURLResponse *response) {
+        [self->_fileUtil removeFileWhenDownloadFileFailure];
         NSString *cachePath = [NSString stringWithFormat:@"%@", self->_currentFileModel.fileName];
         NSString *filePath = [self->_fileUtil stitchDownloadFilePath];
         BOOL isDir = NO;
         NSFileManager *fileManager = [NSFileManager defaultManager];
         BOOL existed = [fileManager fileExistsAtPath:filePath isDirectory:&isDir];
         if (!(isDir == YES && existed == YES)) {
-            [fileManager createDirectoryAtPath:filePath withIntermediateDirectories:YES attributes:nil error:nil];
+            [fileManager createDirectoryAtPath:filePath withIntermediateDirectories:YES attributes:nil error:nil]; //创建文件夹
         }
         NSString *localPath = [filePath stringByAppendingPathComponent:cachePath];
         return [NSURL fileURLWithPath:localPath];

ios/JianYuIOS/JianYuIOS/Libs(第三方)/UMSPosPayOnly/include/UMSPPPayPluginSettings.h

@@ -1,59 +0,0 @@
-//
-//  UMSPluginSettings.h
-//  UMSPosPay
-//
-//  Created by chinaums on 15/10/19.
-//  Copyright © 2015年 ChinaUMS. All rights reserved.
-//
-
-//  sdk_version = 3.1.3
-
-#import <Foundation/Foundation.h>
-
-//1 是走apple 0是不走
-//#define SHOULD_CONTAIN_APPLE_PAY_CODES 0
-
-/*!
- @enum
- @abstract 交易环境
- @constant UMSP_PROD 生产环境
- @constant UMSP_TEST 测试环境
- */
-typedef NS_ENUM(NSInteger, UMSPluginEnvironment) {
-    UMSP_PROD,
-    UMSP_TEST
-};
-
-/**
- *  进入插件的方式
- */
-typedef NS_ENUM(NSInteger, UMSPluginEnterType) {
-    ///默认方式
-    UMSPluginEnterType_Default,
-    ///C扫B方式
-    UMSPluginEnterType_ScanCode
-};
-
-
-@interface UMSPPPayPluginSettings : NSObject
-
-+ (UMSPPPayPluginSettings *)sharedInstance;
-
-/*!
- @property
- @abstract 设置交易环境，默认UMSP_PROD
- */
-@property (nonatomic, assign) UMSPluginEnvironment umspEnviroment;
-
-/**
- *  进入插件方式，默认UMSPluginEnterType_Default
- */
-@property (nonatomic, assign) UMSPluginEnterType umspEnterType;
-
-/*!
- @property
- @abstract 设置是否需要启动页，默认YES
- */
-@property (nonatomic, assign) BOOL umspSplash;
-
-@end

ios/JianYuIOS/JianYuIOS/Libs(第三方)/UMSPosPayOnly/include/UMSPPPayUnifyPayPlugin.h

@@ -1,99 +0,0 @@
-//
-//  UMSPPPayUnifyPayPlugin.h
-//  UMSPosPay
-//
-//  Created by SunXP on 17/4/25.
-//  Copyright © 2017年 ChinaUMS. All rights reserved.
-//
-
-//  sdk_version = 3.1.3
-
-#import <Foundation/Foundation.h>
-#import "WXApi.h"
-
-/**
- *  支付渠道
- *
- *  @param CHANNEL_WEIXIN      微信支付
- *  @param CHANNEL_ALIPAY      支付宝支付
- *  @param CHANNEL_ALIMINIPAY  支付宝小程序支付
- */
-FOUNDATION_EXTERN NSString *const CHANNEL_WEIXIN;
-FOUNDATION_EXTERN NSString *const CHANNEL_ALIPAY;
-FOUNDATION_EXTERN NSString *const CHANNEL_ALIMINIPAY;
-
-typedef void(^TransactionResultBlock)(NSString *resultCode,  NSString *resultInfo);
-
-@interface UMSPPPayUnifyPayPlugin : NSObject
-
-/**
- *  商户下单支付接口
- *
- *  @param payChannel   支付渠道
- *  @param payData       订单信息:appPayRequest对应的json字符串
- *  @param callbackBlock 交易结果回调Block
- */
-+ (void)payWithPayChannel:(NSString *)payChannel payData:(NSString *)payData callbackBlock:(TransactionResultBlock)callbackBlock;
-
-/**
- 云闪付下单接口
-
- @param schemes url schemes
- @param payData 订单信息:appPayRequest对应的json字符串
- @param viewController 启动支付控件的viewController
- @param callbackBlock 交易结果回调Block
- */
-+ (void)cloudPayWithURLSchemes:(NSString *)schemes
-                       payData:(NSString *)payData
-                viewController:(UIViewController *)viewController
-                 callbackBlock:(TransactionResultBlock)callbackBlock;
-
-/**
- *  微信支付配置参数
- *
- *  @param appId   商户注册的微信支付appId
- *  @param universalLink 微信开发者Universal Link
-  *  @return YES：成功 NO：失败
- *  需在AppDelegate的didFinishLaunchingWithOptions方法中调用
- */
-+ (BOOL)registerApp:(NSString *)appId  universalLink:(NSString *)universalLink;
-
-/**
- *  微信支付配置参数
- *
- *  @param url   App处理的openUrl
- *  @param otherDelegate WXApiDelegate对象，用来接收微信触发的非本功能的消息。
- *  @return YES：成功 NO：失败
- *  需在AppDelegate中的方法中调用：
- *  iOS9.0之前版本：- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url
- *                          - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
- *  iOS9.0之后版本：- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options
- */
-+ (BOOL)handleOpenURL:(NSURL *)url otherDelegate:(id<WXApiDelegate>)otherDelegate;
-
-/*! @brief 处理微信通过Universal Link启动App时传递的数据
-*
-* 需要在 application:continueUserActivity:restorationHandler:中调用。
-* @param userActivity 微信启动第三方应用时系统API传递过来的userActivity
-* @param otherDelegate  WXApiDelegate对象，用来接收微信触发的非本功能的消息。
-* 需在AppDelegate中的方法中调用：
- 需要在 application:continueUserActivity:restorationHandler:中调用。
-* @return 成功返回YES，失败返回NO。
- */
-+(BOOL)handleOpenUniversalLink:(NSUserActivity *)userActivity otherDelegate:(id<WXApiDelegate>)otherDelegate API_AVAILABLE(ios(8.0));
-/**
- 云闪付处理
-
- @param url App处理的openUrl
- @return YES：成功 NO：失败
- */
-+ (BOOL)cloudPayHandleOpenURL:(NSURL *)url;
-
-/**
- 支付宝小程序处理
-
- @param url App处理的openUrl
- */
-+ (void)aliMiniPayHandleOpenURL:(NSURL *)url;
-
-@end

ios/JianYuIOS/JianYuIOS/Libs(第三方)/UMSPosPayOnly/include/UMSPPPayVersionsInfo.h

@@ -1,17 +0,0 @@
-//
-//  libUMSVersionsInfo.h
-//  UMSPosPay
-//
-//  Created by diudiu on 16/6/28.
-//  Copyright © 2016年 ChinaUMS. All rights reserved.
-//
-
-//  sdk_version = 3.1.3
-
-#import <Foundation/Foundation.h>
-
-@interface UMSPPPayVersionsInfo : NSObject
-
-+ (NSMutableDictionary *)getVersionsInfoForPosPayPlugin;
-
-@end

ios/JianYuIOS/JianYuIOS/Libs(第三方)/UPPaymentControl/UPPaymentControl.h

@@ -1,63 +0,0 @@
-//
-//  PaymentControl.h
-//  PaymentControl
-//
-//  Created by qcao on 15/10/20.
-//  Copyright © 2015年 China Unionpay Co.,Ltd. All rights reserved.
-//  v3.4.1 build2(mini)
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-
-typedef void (^UPPaymentResultBlock)(NSString* code, NSDictionary* data);
-
-
-@interface UPPaymentControl : NSObject
-
-
-/**
- *  创建支付单例服务
- *
- *  @return 返回单例对象
- */
-
-+ (UPPaymentControl *)defaultControl;
-
-
-/**
- *  支付接口
- *
- *  @param tn             订单信息
- *  @param schemeStr      调用支付的app注册在info.plist中的scheme
- *  @param mode           支付环境
- *  @param viewController 启动支付控件的viewController
- *  @return 返回成功失败
- */
-- (BOOL)startPay:(NSString*)tn
-      fromScheme:(NSString *)schemeStr
-            mode:(NSString*)mode
-  viewController:(UIViewController*)viewController;
-
-
-
-/**
- *  APP是否已安装检测接口，通过该接口得知用户是否安装银联支付的APP。
- *
- *  @return 返回是否已经安装了银联支付APP
- */
-
-
-- (BOOL)isPaymentAppInstalled;
-
-/**
- *  处理钱包或者独立快捷app支付跳回商户app携带的支付结果Url
- *
- *  @param url              支付结果url，传入后由SDK解析
- *  @param completionBlock  结果回调，保证跳转钱包支付过程中，即使调用方app被系统kill时，能通过这个回调取到支付结果。
- */
-
-- (void)handlePaymentResult:(NSURL*)url completeBlock:(UPPaymentResultBlock)completionBlock;
-
-@end

ios/JianYuIOS/JianYuIOS/openfile/LoadDocViewController.m

@@ -109,7 +109,7 @@
     showDumpingViewParamModel.showTextFont = [UIFont boldSystemFontOfSize:15];
     showDumpingViewParamModel.showBackgroundColor = [UIColor whiteColor];
     showDumpingViewParamModel.showBackgroundImageName = @"dumpView";
-    
+  
     // 《用其他应用打开》按钮 配置Model
 //    OtherOpenButtonParamModel *otherOpenButtonParamModel = [[OtherOpenButtonParamModel alloc] init];
 //    otherOpenButtonParamModel.titleFont = [UIFont boldSystemFontOfSize:20.0];
@@ -126,12 +126,14 @@
         self->pathstr = urlStr;
         self->shareBtn.hidden = NO;
         self->backStatus = YES;
+        NSLog(@"%@",urlStr);
     }];
-    
+ 
     [_docView finishShareHandler:^(NSString *urlStr) {
         self->pathstr = urlStr;
         self->shareBtn.hidden = YES;
         [self shareBtnClick];
+        NSLog(@"%@",urlStr);
     }];
 
 }

ios/JianYuIOS/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m

@@ -306,7 +306,6 @@ didFinishDownloadingToURL:(NSURL *)location
         self.downloadFileURL = self.downloadTaskDidFinishDownloading(session, downloadTask, location);
         if (self.downloadFileURL) {
             NSError *fileManagerError = nil;
-
             if (![[NSFileManager defaultManager] moveItemAtURL:location toURL:self.downloadFileURL error:&fileManagerError]) {
                 [[NSNotificationCenter defaultCenter] postNotificationName:AFURLSessionDownloadTaskDidFailToMoveFileNotification object:downloadTask userInfo:fileManagerError.userInfo];
             }