被登处理

ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,53 +13,5 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYSearchViewController.m"
-            timestampString = "569750651.722723"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "490"
-            endingLineNumber = "490"
-            landmarkName = "-loginOut:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYMineViewController.m"
-            timestampString = "569750817.325857"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "366"
-            endingLineNumber = "366"
-            landmarkName = "-loginOut:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYExpViewController.m"
-            timestampString = "569750916.481297"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "456"
-            endingLineNumber = "456"
-            landmarkName = "-doSomeWithLoadUrl:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -252,8 +252,8 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
 
 //收到消息退出并重新加载web
 -(void)webViewRequestByMsg{
-//    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/kicked"];
-    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t"];
+
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t&flag=kicked"];
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
 }
@@ -339,16 +339,8 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
     if (!self.signOutContent) {
         self.signOutContent = @"1";
     }
-    NSString *url = [NSString stringWithFormat:@"%@%@?sign=%@", kHost, @"jyapp/free/signOut", [LXUserDefaults token]];
-    url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    
-//    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectZero];
-//    webView.delegate = self;
-//    [self.view addSubview:webView];
-//    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-    
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
     [self jsRemoveUserToken:nil];
+    [self webViewRequestByMsg];
 }
 
 - (void)hideTabBar {
@@ -451,10 +443,7 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
     if (!url) {
         return;
     }
-    if ([url containsString:@"signOut"]) { // 收到退出消息后 跳转到登录页面
-        //        [self webViewFirstRequest];
-        [self webViewRequestByMsg];
-    }else if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
+    if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
         if (self.signOutContent && ![self.signOutContent isEqualToString:@"1"]) {
             [[LXViewControllerManager shareViewControllerManager] showAlertViewWithTitle:@"提示" message:self.signOutContent actions:@[[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                 self.signOutContent = nil;

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

@@ -279,8 +279,8 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 //收到消息退出并重新加载web
 -(void)webViewRequestByMsg{
-//    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/kicked"];
-    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t"];
+
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t&flag=kicked"];
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
 }
@@ -371,16 +371,9 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     if (!self.signOutContent) {
         self.signOutContent = @"1";
     }
-    NSString *url = [NSString stringWithFormat:@"%@%@?sign=%@", kHost, @"jyapp/free/signOut", [LXUserDefaults token]];
-    url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-//    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectZero];
-//    webView.delegate = self;
-//    [self.view addSubview:webView];
-//    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-    
-    //    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+
     [self jsRemoveUserToken:nil];
+    [self webViewRequestByMsg];
 }
 
 - (void)hideTabBar {
@@ -482,10 +475,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     if (!url) {
         return;
     }
-    if ([url containsString:@"signOut"]) { // 收到退出消息后 跳转到登录页面
-        //        [self webViewFirstRequest];
-        [self webViewRequestByMsg];
-    }else if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
+    if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
         if (self.signOutContent && ![self.signOutContent isEqualToString:@"1"]) {
             [[LXViewControllerManager shareViewControllerManager] showAlertViewWithTitle:@"提示" message:self.signOutContent actions:@[[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                 self.signOutContent = nil;

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

@@ -390,8 +390,8 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
 
 //收到消息退出并重新加载web
 -(void)webViewRequestByMsg{
-//    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/kicked"];
-    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t"];
+
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t&flag=kicked"];
     
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
@@ -478,16 +478,10 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     if (!self.signOutContent) {
         self.signOutContent = @"1";
     }
-    NSString *url = [NSString stringWithFormat:@"%@%@?sign=%@", kHost, @"jyapp/free/signOut", [LXUserDefaults token]];
-    url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    
-//    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectZero];
-//    webView.delegate = self;
-//    [self.view addSubview:webView];
-//    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-    
-    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+
     [self jsRemoveUserToken:nil];
+    [self webViewRequestByMsg];
+    
 }
 
 //前往登录页面
@@ -742,10 +736,7 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     if (!url) {
         return;
     }
-    if ([url containsString:@"signOut"]) { // 收到退出消息后 跳转到登录页面
-        //        [self webViewFirstRequest];
-        [self webViewRequestByMsg];
-    }else if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
+    if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
         if (self.signOutContent && ![self.signOutContent isEqualToString:@"1"]) {
             [[LXViewControllerManager shareViewControllerManager] showAlertViewWithTitle:@"提示" message:self.signOutContent actions:@[[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                 self.signOutContent = nil;

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

@@ -251,8 +251,7 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 //收到消息退出并重新加载web
 -(void)webViewRequestByMsg{
-//    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/kicked"];
-    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t&flag=kicked"];
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
 }
@@ -340,16 +339,8 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
     }
     
     
-    NSString *url = [NSString stringWithFormat:@"%@%@?sign=%@", kHost, @"jyapp/free/signOut", [LXUserDefaults token]];
-    url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    
-//    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectZero];
-//    webView.delegate = self;
-//    [self.view addSubview:webView];
-//    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-//
-    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
     [self jsRemoveUserToken:nil];
+    [self webViewRequestByMsg];
 }
 
 - (void)hideTabBar {
@@ -454,10 +445,7 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
     if (!url) {
         return;
     }
-    if ([url containsString:@"signOut"]) { // 收到退出消息后 跳转到登录页面
-        //        [self webViewFirstRequest];
-        [self webViewRequestByMsg];
-    }else if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
+    if ([url containsString:@"/free/login"]){ //  如果通过接收消息 跳转到登录页面 展示消息内容
         if (self.signOutContent && ![self.signOutContent isEqualToString:@"1"]) {
             [[LXViewControllerManager shareViewControllerManager] showAlertViewWithTitle:@"提示" message:self.signOutContent actions:@[[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                 self.signOutContent = nil;