apple 5 years ago
parent
commit
9be07af1f4

BIN
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 4 - 4
ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -33,15 +33,15 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
-
-//    [self initOldKey];
-    [self initJYBXKey];
-    
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     JYTabBarController *tabBarVc = [[JYTabBarController alloc] init];
     self.window.rootViewController = tabBarVc;
     [self.window makeKeyAndVisible];
 
+    
+    //    [self initOldKey];
+    [self initJYBXKey];
+    
 //    NSURLCache *URLCache = [[NSURLCache alloc] initWithMemoryCapacity:4 * 1024 * 1024 diskCapacity:20 * 1024 * 1024 diskPath:nil];
 //
 //    [NSURLCache setSharedURLCache:URLCache];

+ 1 - 1
ios/JianYuIOS/JianYuIOS/BaseClass1/JYKeyCustom.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreFoundation/CoreFoundation.h>
-#import <MobileCoreServices/MobileCoreServices.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface JYKeyCustom : NSURLProtocol

+ 0 - 1
ios/JianYuIOS/JianYuIOS/BaseClass1/JYKeyCustom.m

@@ -51,7 +51,6 @@ static NSString* const JYNewKey = @"JYNewKey";
 {
     //判断是否包含版本--
     NSString *curUrl = [NSString stringWithFormat:@"%@",self.request.URL.absoluteString];
-    NSLog(@"测试测试…%@",curUrl);
     if ([curUrl containsString:@"?v="]) {
         NSString *verName = @"";
         NSLog(@"有相关版本号url:%@",curUrl);

+ 0 - 1
ios/JianYuIOS/JianYuIOS/BaseClass1/JYOldCustom.h

@@ -8,7 +8,6 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreFoundation/CoreFoundation.h>
-#import <MobileCoreServices/MobileCoreServices.h>
 
 
 NS_ASSUME_NONNULL_BEGIN

+ 1 - 1
ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -135,7 +135,7 @@ _Pragma("clang diagnostic pop")\
 #import "NJKWebViewProgress.h"
 #import "JYNewWebController.h"
 
-//#define kHost @"http://web-jydev-wss.jianyu360.cn/" //王山
+//#define kHost @"https://web-jydev-wss.jianyu360.cn/" //王山
 
 //#define kHost @"https://web-jydev-wcj.jianyu360.cn/"//王传近
 

+ 2 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewMineViewController.m

@@ -110,6 +110,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         _webView.UIDelegate = self;
         _webView.navigationDelegate = self;
 //        _webView.allowsBackForwardNavigationGestures = true;
+        _webView.userInteractionEnabled = YES;
         [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
     }
     return _webView;
@@ -573,7 +574,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         JYNewWebController *ctr = [[JYNewWebController alloc] init];
 //        NewWebController *ctr = [[NewWebController alloc] init];
         ctr.url = url;
-        if (!title || [title isEqualToString:@""] || [title isEqualToString:@"undefined"]) {
+        if (!title || [title isEqualToString:@""]||[title isEqualToString:@"undefined"]) {
             ctr.titleShow = nil;
         }else{
             ctr.titleShow = title;

+ 2 - 2
ios/JianYuIOS/JianYuIOS/JYNewWebController.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-NS_ASSUME_NONNULL_BEGIN
+//NS_ASSUME_NONNULL_BEGIN
 
 @interface JYNewWebController : UIViewController
 
@@ -17,4 +17,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
+//NS_ASSUME_NONNULL_END

+ 3 - 2
ios/JianYuIOS/JianYuIOS/JYNewWebController.m

@@ -89,6 +89,7 @@
     [titleView addSubview:lineView];
     CGFloat H = 0.0;
     if (self.titleShow) {
+        titleLabel.text = self.titleShow;
         if ([self.titleShow isEqualToString:@"-1"]) {
             titleView.hidden = YES;
             backBtn_1.hidden = YES;
@@ -133,7 +134,7 @@
     if (self.webView.canGoBack) {// web能退 就后退
         [self.webView goBack];
     }else{// 跳回上级页面
-        [self dismissViewControllerAnimated:NO completion:nil];
+        [self dismissViewControllerAnimated:YES completion:nil];
     }
 }
 -(void)backBtn2Click
@@ -141,7 +142,7 @@
     if (self.webView.canGoBack) {// web能退 就后退
         [self.webView goBack];
     }else{// 跳回上级页面
-        [self dismissViewControllerAnimated:NO completion:nil];
+        [self dismissViewControllerAnimated:YES completion:nil];
     }
 }
 

+ 1 - 0
ios/JianYuIOS/JianYuIOS/NewWebController.h

@@ -11,6 +11,7 @@
 @interface NewWebController : UIViewController
 
 @property(nonatomic, strong)NSString *url;
+
 @property(nonatomic, strong)NSString *titleShow;
 
 @end