标讯信息

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -56,7 +56,6 @@
 		18E05D1022F11D97001E5B44 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18E05D0F22F11D97001E5B44 /* Foundation.framework */; };
 		18EF1114232F683C006D4579 /* UIDevice+Hardware.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EF1113232F683B006D4579 /* UIDevice+Hardware.m */; };
 		761708502735284200B60AD8 /* UIImage+GIFImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7617084F2735284200B60AD8 /* UIImage+GIFImage.m */; };
-		76170852273528E800B60AD8 /* message.gif in Resources */ = {isa = PBXBuildFile; fileRef = 76170851273528E800B60AD8 /* message.gif */; };
 		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 */; };
@@ -178,7 +177,6 @@
 		18EF1113232F683B006D4579 /* UIDevice+Hardware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIDevice+Hardware.m"; sourceTree = "<group>"; };
 		7617084E2735284200B60AD8 /* UIImage+GIFImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+GIFImage.h"; sourceTree = "<group>"; };
 		7617084F2735284200B60AD8 /* UIImage+GIFImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+GIFImage.m"; sourceTree = "<group>"; };
-		76170851273528E800B60AD8 /* message.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = message.gif; path = "../../../../../消息模块图标相关/messageGif/message.gif"; sourceTree = "<group>"; };
 		761BCA61272A816900259676 /* JYNewMessViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYNewMessViewController.h; sourceTree = "<group>"; };
 		761BCA62272A816900259676 /* JYNewMessViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JYNewMessViewController.m; sourceTree = "<group>"; };
 		761BCA6D272AA0CE00259676 /* WXApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApi.h; sourceTree = "<group>"; };
@@ -444,7 +442,6 @@
 		C5493106201F04120080CD63 /* Image */ = {
 			isa = PBXGroup;
 			children = (
-				76170851273528E800B60AD8 /* message.gif */,
 				182ECCFC22FD223A00FFC79E /* logo.png */,
 				182ECCFA22FD221000FFC79E /* qidongye@2x.png */,
 				C5FE4B5120468AED00CC8A2F /* noNet@2x.png */,
@@ -653,7 +650,6 @@
 				C5FE4B5220468AED00CC8A2F /* noNet@2x.png in Resources */,
 				182ECCFB22FD221100FFC79E /* qidongye@2x.png in Resources */,
 				C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */,
-				76170852273528E800B60AD8 /* message.gif in Resources */,
 				C5BE6E472011D99100F28B36 /* LaunchScreen.storyboard in Resources */,
 				C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */,
 				C5BE6E422011D99100F28B36 /* Main.storyboard in Resources */,

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -178,24 +178,24 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"https://appdev-jytest.jydev.jianyu360.com/"   //其他测试
 
-//#define kHost @"https://app-jytest.jydev.jianyu360.com/"  //测试1
+#define kHost @"https://app-jytest.jydev.jianyu360.com/"  //测试1
 //#define kHost @"https://app2-jytest.jydev.jianyu360.com/"  //测试2
 //#define kHost @"https://app4-jytest.jydev.jianyu360.com/"  //测试4
 //#define kHost @"https://app5-jytest.jydev.jianyu360.com/"  //测试5
 
 
 
-#define kHost @"https://app-i2.jianyu360.cn/"   //新正式
+//#define kHost @"https://app-i2.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（模块）/JYNewMineViewController.m

@@ -388,6 +388,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         }else if (type && [type isEqualToString:@"getVersion"]) {
             NSDictionary *dict = @{@"type":@"string",
                                    @"value":[self jsGetVersion:paramdict]};
+            NSLog(@"%@",dict);
             completionHandler([self convertToJsonData:dict]);
         }else if (type && [type isEqualToString:@"checkNoticePermission"]) {
             NSDictionary *dict = @{@"type":@"int",

ios/JianYuIOS/JianYuIOS/JYgRPC/JYgRPCClient.m

@@ -168,15 +168,23 @@
     //msgType ==1 普通消息   msgType==2 透传离线
     int msgType =  [pushDict[@"msgType"] intValue];
     if (msgType==2) {//透传退出登录
+        //1、登录 2、判断url是否存在-跳转 3、不存在url判断类型
+        
+        
+        
+        
+        
+        
+        
         NSString *type = [NSString stringWithFormat:@"%@",pushDict[@"type"]];
         if ([LXUserDefaults isExistToken] && [type isEqualToString:@"signOut"]) {
-
             AppDelegate *delegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
             JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
 //            NSLog(@"%lu",(unsigned long)tab.selectedIndex);
             //判断第几个底部栏
             [[NSNotificationCenter defaultCenter] postNotificationName:kLoginOut object:[NSString stringWithFormat:@"%@",pushDict[@"info"][@"body"]] userInfo:@{@"item_index":[NSString stringWithFormat:@"%lu",(unsigned long)tab.selectedIndex]}];
         }
+        
     }else if (msgType==1){
         self.msgIndex++;
         if (@available(iOS 10.0, *)) {