apple 5 年之前
父节点
当前提交
05f7753c25

二进制
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 3
ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -38,9 +38,6 @@
     JYTabBarController *tabBarVc = [[JYTabBarController alloc] init];
     JYTabBarController *tabBarVc = [[JYTabBarController alloc] init];
     self.window.rootViewController = tabBarVc;
     self.window.rootViewController = tabBarVc;
     [self.window makeKeyAndVisible];
     [self.window makeKeyAndVisible];
-
-    
-   
     [self initJYBXKey];
     [self initJYBXKey];
     
     
     NSURLCache *URLCache = [[NSURLCache alloc] initWithMemoryCapacity:1000 * 1024 * 1024 diskCapacity:1000 * 1024 * 1024 diskPath:nil];
     NSURLCache *URLCache = [[NSURLCache alloc] initWithMemoryCapacity:1000 * 1024 * 1024 diskCapacity:1000 * 1024 * 1024 diskPath:nil];

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

@@ -161,7 +161,7 @@ _Pragma("clang diagnostic pop")\
 
 
 #define kHost @"http://app-i1.jianyu360.com/"   //新正式
 #define kHost @"http://app-i1.jianyu360.com/"   //新正式
 
 
-
+//#define kHost @"http://192.168.20.117:8082/"
 
 
 
 
 
 

+ 1 - 6
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewExpViewController.m

@@ -171,16 +171,11 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     NSLog(@"当前页面:%@",current_url);
     NSLog(@"当前页面:%@",current_url);
     CGRect rect = self.view.bounds;
     CGRect rect = self.view.bounds;
     CGFloat width = CGRectGetWidth(rect);
     CGFloat width = CGRectGetWidth(rect);
-    if (![self.webView canGoBack]) {
+    if (![self.webView canGoBack]||[current_url containsString:@"jyapp/free/login"]) {
         NSLog(@"不可返回");
         NSLog(@"不可返回");
         return;
         return;
     }
     }
 
 
-    if([current_url containsString:@"jyapp/free/login"]) {
-        return;
-    }
-    
-    //    NSString *current_url = self.webView.request.URL.absoluteString;
     if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
     if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
         return;
         return;
     }
     }

+ 3 - 14
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewMineViewController.m

@@ -182,28 +182,17 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 -(void)paningGestureReceive:(UIPanGestureRecognizer *)recoginzer
 -(void)paningGestureReceive:(UIPanGestureRecognizer *)recoginzer
 {
 {
     NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
     NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
-    NSLog(@"当前页面:%@",current_url);
+//    NSLog(@"当前页面:%@",current_url);
     CGRect rect = self.view.bounds;
     CGRect rect = self.view.bounds;
     CGFloat width = CGRectGetWidth(rect);
     CGFloat width = CGRectGetWidth(rect);
-    if (![self.webView canGoBack]) {
+    if (![self.webView canGoBack]||[current_url containsString:@"jyapp/free/login"]) {
         NSLog(@"不可返回");
         NSLog(@"不可返回");
         return;
         return;
     }
     }
-
-    if([current_url containsString:@"jyapp/free/login"]) {
-        return;
-    }
-    
-    //    NSString *current_url = self.webView.request.URL.absoluteString;
     if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
     if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
         return;
         return;
     }
     }
-    
-    //https://www.jianyu360.com/jyapp/free/me
-    //https://www.jianyu360.com/jyapp/jylab/index
-    //https://www.jianyu360.com/jyapp/wxkeyset/keyset/index
-    //https://www.jianyu360.com/jyapp/jylab/mainSearch
-    
+
     CGPoint touchPoint = [recoginzer locationInView:[UIApplication sharedApplication].keyWindow];
     CGPoint touchPoint = [recoginzer locationInView:[UIApplication sharedApplication].keyWindow];
     if (recoginzer.state==UIGestureRecognizerStateBegan) {
     if (recoginzer.state==UIGestureRecognizerStateBegan) {
         _isMoving = YES;
         _isMoving = YES;

+ 1 - 6
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSubViewController.m

@@ -178,16 +178,11 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     NSLog(@"当前页面:%@",current_url);
     NSLog(@"当前页面:%@",current_url);
     CGRect rect = self.view.bounds;
     CGRect rect = self.view.bounds;
     CGFloat width = CGRectGetWidth(rect);
     CGFloat width = CGRectGetWidth(rect);
-    if (![self.webView canGoBack]) {
+    if (![self.webView canGoBack]||[current_url containsString:@"jyapp/free/login"]) {
         NSLog(@"不可返回");
         NSLog(@"不可返回");
         return;
         return;
     }
     }
 
 
-    if([current_url containsString:@"jyapp/free/login"]) {
-        return;
-    }
-    
-    //    NSString *current_url = self.webView.request.URL.absoluteString;
     if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
     if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
         return;
         return;
     }
     }