正式

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -834,7 +834,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 43;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -916,9 +916,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 43;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -220,19 +220,33 @@
 
 
 - (void)application:(UIApplication *)application
-didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    
-    /// Required - 注册 DeviceToken
+didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken{
+    // Required - 注册 DeviceToken
     [JPUSHService registerDeviceToken:deviceToken];
-    
-    // 收到token
-    NSString *devicetoken =
-    [[[[deviceToken description] stringByReplacingOccurrencesOfString:@"<" withString:@""] stringByReplacingOccurrencesOfString:@">" withString:@""] stringByReplacingOccurrencesOfString:@" " withString:@""];
-    // 保存到后台-用于推送
-    NSLog(@"%@",devicetoken)
-    [LXUserDefaults saveDeviceToken:devicetoken];
-    
-
+    //Xcode11打的包，iOS13获取Token有变化
+    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 13) {
+        if (![deviceToken isKindOfClass:[NSData class]]) {
+            //记录获取token失败的描述
+            return;
+        }
+        const unsigned *tokenBytes = (const unsigned *)[deviceToken bytes];
+        NSString *strToken = [NSString stringWithFormat:@"%08x%08x%08x%08x%08x%08x%08x%08x",
+                              ntohl(tokenBytes[0]), ntohl(tokenBytes[1]), ntohl(tokenBytes[2]),
+                              ntohl(tokenBytes[3]), ntohl(tokenBytes[4]), ntohl(tokenBytes[5]),
+                              ntohl(tokenBytes[6]), ntohl(tokenBytes[7])];
+        NSLog(@"deviceToken1:%@", strToken);
+        // 保存到后台-用于推送
+        [LXUserDefaults saveDeviceToken:strToken];
+    } else {
+        NSString *token = [NSString
+                       stringWithFormat:@"%@",deviceToken];
+        token = [token stringByReplacingOccurrencesOfString:@"<" withString:@""];
+        token = [token stringByReplacingOccurrencesOfString:@">" withString:@""];
+        token = [token stringByReplacingOccurrencesOfString:@" " withString:@""];
+        NSLog(@"deviceToken2 is: %@", token);
+        // 保存到后台-用于推送
+        [LXUserDefaults saveDeviceToken:token];
+    }
 }
 
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -134,6 +134,8 @@ _Pragma("clang diagnostic pop")\
 #import "ZKControl.h"
 #import "ZKMethod.h"
 #import "Reachability.h"
+
+
 //#define kHost @"http://web-jydev-ws.jianyu360.cn/" //王山
 
 //#define kHost @"https://web-jydev-wcj.jianyu360.cn/"//王传近
@@ -148,11 +150,11 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"https://app1.jianyu360.com/"//弃用
 
-#define kHost @"https://app2-jytest.jianyu360.cn/" //测试
+//#define kHost @"https://app2-jytest.jianyu360.cn/" //测试
 
 //#define kHost @"https://app-jytest.jianyu360.cn/" //老测试
 
-//#define kHost @"https://res.jianyu360.com/"//正式
+#define kHost @"https://res.jianyu360.com/"//正式
 
 
 //#define kHost @"http://anti.jianyu360.cn/"//新测试

ios/JianYuIOS/JianYuIOS/BaseClass1/UIDevice+Hardware.m

@@ -121,7 +121,7 @@
     if ([platform isEqualToString:@"i386"])             return @"Simulator";
     if ([platform isEqualToString:@"x86_64"])        return @"Simulator";
     
-    return @"Unknown iOS Device";
+    return @"iOS Device";
 }
 
 - (NSString *)iPhonePlatform:(NSString *)platform{
@@ -152,17 +152,17 @@
     if ([platform isEqualToString:@"iPhone10,4"])  return @"iPhone 8";
     if ([platform isEqualToString:@"iPhone10,2"])  return @"iPhone 8 Plus";
     if ([platform isEqualToString:@"iPhone10,5"])  return @"iPhone 8 Plus";
-    if ([platform isEqualToString:@"iPhone10,3"])  return @"iPhone X";
-    if ([platform isEqualToString:@"iPhone10,6"])  return @"iPhone X";
-    //2018年10月发布：
-    if ([platform isEqualToString:@"iPhone11,8"])  return  @"iPhone XR";
-    if ([platform isEqualToString:@"iPhone11,2"])  return @"iPhone XS";
-    if ([platform isEqualToString:@"iPhone11,4"])  return @"iPhone XS Max";
-    if ([platform isEqualToString:@"iPhone11,6"])  return @"iPhone XS Max";
+    if ([platform isEqualToString:@"iPhone10,3"] ||
+        [platform isEqualToString:@"iPhone10,6"]) return @"iPhone X";
+    if ([platform isEqualToString:@"iPhone11,8"]) return @"iPhone XR";
+    if ([platform isEqualToString:@"iPhone11,2"]) return @"iPhone XS";
+    if ([platform isEqualToString:@"iPhone11,4"] ||
+        [platform isEqualToString:@"iPhone11,6"]) return @"iPhone XS Max";
+    if ([platform isEqualToString:@"iPhone12,1"]) return @"iPhone 11";
+    if ([platform isEqualToString:@"iPhone12,3"]) return @"iPhone 11 Pro";
+    if ([platform isEqualToString:@"iPhone12,5"]) return @"iPhone 11 Pro Max";
     
-    //iphone11
-    
-    return @"Unknown iPhone";
+    return @"iPhone";
 }
 
 - (NSString *)iPadPlatform:(NSString *)platform{
@@ -220,7 +220,7 @@
     if ([platform isEqualToString:@"iPad11,3"])   return @"iPad Air (3rd generation)";
     if ([platform isEqualToString:@"iPad11,4"])   return @"iPad Air (3rd generation)";
 
-    return @"Unknown iPad";
+    return @"iPad";
 }
 
 - (NSString *)iPodPlatform:(NSString *)platform{
@@ -234,7 +234,7 @@
     //2019年5月发布:
     if ([platform isEqualToString:@"iPod9,1"])      return @"iPod touch (7th generation)";
 
-    return @"Unknown iPod";
+    return @"iPod";
 }
 
 - (NSString *)appleTVPlatform:(NSString *)platform{
@@ -244,7 +244,7 @@
     if ([platform isEqualToString:@"AppleTV3,2"])    return @"Apple TV 3";
     if ([platform isEqualToString:@"AppleTV5,3"])    return @"Apple TV 4";
 
-    return @"Unknown Apple TV";
+    return @"Apple TV";
 }
 
 #pragma mark MAC addy