zh

ios/JianYuIOS/JianYuIOS.xcodeproj/xcuserdata/zhanghao.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?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">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>JianYuIOS.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "0"
+   version = "2.0">
+</Bucket>

ios/JianYuIOS/JianYuIOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,109 +3,100 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "Icon40@2x.png",
+      "filename" : "40×40.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "Icon60@3x.png",
+      "filename" : "60×60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon58@2x.png",
+      "filename" : "58×58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon87@3x.png",
+      "filename" : "87×87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon80@2x.png",
+      "filename" : "80×80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon120@3x.png",
+      "filename" : "120×120-1.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "120@2x.png",
+      "filename" : "120×120.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "180@3x.png",
+      "filename" : "180×180.png",
       "scale" : "3x"
     },
     {
-      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "Icon-20.png",
+      "size" : "20x20",
       "scale" : "1x"
     },
     {
-      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "Icon40@2x-1.png",
+      "size" : "20x20",
       "scale" : "2x"
     },
     {
-      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon29.png",
+      "size" : "29x29",
       "scale" : "1x"
     },
     {
-      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon58@2x-1.png",
+      "size" : "29x29",
       "scale" : "2x"
     },
     {
-      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-21.png",
+      "size" : "40x40",
       "scale" : "1x"
     },
     {
-      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon80@2x-1.png",
+      "size" : "40x40",
       "scale" : "2x"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76.png",
+      "size" : "76x76",
       "scale" : "1x"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon152@2x.png",
+      "size" : "76x76",
       "scale" : "2x"
     },
     {
-      "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "Icon167@2x.png",
+      "size" : "83.5x83.5",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "1024.png",
+      "filename" : "1024×1024.png",
       "scale" : "1x"
     }
   ],

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -26,8 +26,8 @@
 #define kLoginOut @"kLoginOut"
 #define kNewsTable @"kNewsTable"
 
-#define kHost @"https://www.jianyu360.com/"
-//#define kHost @"http://webwcj.qmx.top/"
+//#define kHost @"https://www.jianyu360.com/"
+#define kHost @"http://webwcj.qmx.top/"
 //#define kHost @"http://w2blmjy.qmx.top/"
 #endif /* PrefixHeader_pch */
 

ios/JianYuIOS/JianYuIOS/ViewController.m

@@ -125,7 +125,7 @@ JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否
 
 // 首次加载web
 -(void)webViewFirstRequest{
-    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/index"];
     NSString *token = [LXUserDefaults token];
     if (token) {
         url = [url stringByAppendingString:[NSString stringWithFormat:@"?sign=%@&url=/jyapp/jylab/mainSearch&from=restart", token]];
@@ -135,6 +135,12 @@ JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否
     
 }
 
+//收到消息退出并重新加载web
+-(void)webViewRequestByMsg{
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/kicked"];
+    url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+}
 
 
 
@@ -211,7 +217,8 @@ JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否
         return;
     }
     if ([url containsString:@"signOut"]) { // 收到退出消息后 跳转到登录页面
-        [self webViewFirstRequest];
+//        [self webViewFirstRequest];
+        [self webViewRequestByMsg];
     }else 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) {
@@ -298,30 +305,34 @@ JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否
 -(void)dealWXDic:(NSDictionary *)dictionary{
     
     [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
-    
-    NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:dictionary];
-    
-    if (dic) {
-        [dic removeObjectForKey:@"privilege"];
-        [dic removeObjectForKey:@"language"];
-        double currDouble = [[NSDate date] timeIntervalSince1970];
-        [dic setObject:[NSNumber numberWithLong:(long)currDouble] forKey:@"createtime"];
+    //如果获取到用户信息，即用户点击了“登录”，则进行用户信息获取
+    if (dictionary.count > 0) {
         
-//         拼接标志位
-        NSString *sign = [NSString stringWithFormat:@"city=%@&country=%@&createtime=%@&headimgurl=%@&nickname=%@&openid=%@&province=%@&sex=%@&unionid=%@", dic[@"city"], dic[@"country"], dic[@"createtime"], dic[@"headimgurl"], dic[@"nickname"], dic[@"openid"], dic[@"province"],dic[@"sex"],dic[@"unionid"]];
-        sign = [LXMD5 md532BitLower:sign];
-        [dic setObject:sign forKey:@"sign"];
-        NSString *endStr = [[LXViewControllerManager shareViewControllerManager] getJsonStr:dic];
-        NSData *data = [endStr dataUsingEncoding:NSUTF8StringEncoding];
-        endStr = [data base64EncodedStringWithOptions:0];
-
-        
-        JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-        NSString * textJS1 = [NSString stringWithFormat:@"loginByWeixinCallBack('%@')", endStr];
-     JSValue *value =   [context evaluateScript:textJS1];
-        LXLog(@"%@", value);
+        NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:dictionary];
         
+        if (dic) {
+            [dic removeObjectForKey:@"privilege"];
+            [dic removeObjectForKey:@"language"];
+            double currDouble = [[NSDate date] timeIntervalSince1970];
+            [dic setObject:[NSNumber numberWithLong:(long)currDouble] forKey:@"createtime"];
+            
+            //         拼接标志位
+            NSString *sign = [NSString stringWithFormat:@"city=%@&country=%@&createtime=%@&headimgurl=%@&nickname=%@&openid=%@&province=%@&sex=%@&unionid=%@", dic[@"city"], dic[@"country"], dic[@"createtime"], dic[@"headimgurl"], dic[@"nickname"], dic[@"openid"], dic[@"province"],dic[@"sex"],dic[@"unionid"]];
+            sign = [LXMD5 md532BitLower:sign];
+            [dic setObject:sign forKey:@"sign"];
+            NSString *endStr = [[LXViewControllerManager shareViewControllerManager] getJsonStr:dic];
+            NSData *data = [endStr dataUsingEncoding:NSUTF8StringEncoding];
+            endStr = [data base64EncodedStringWithOptions:0];
+            
+            
+            JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
+            NSString * textJS1 = [NSString stringWithFormat:@"loginByWeixinCallBack('%@')", endStr];
+            JSValue *value =   [context evaluateScript:textJS1];
+            LXLog(@"%@", value);
+            
+        }
     }
+    
 }
 
 // js 调用分享

ios/JianYuIOS/Pods/Pods.xcodeproj/xcuserdata/zhanghao.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,29 @@
+<?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">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>AFNetworking.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>FMDB.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>MBProgressHUD.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>Pods-JianYuIOS.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>4</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>