Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi

ios/Runner/AppDelegate.m

@@ -76,12 +76,25 @@
 /*
  *  苹果推送注册成功回调，将苹果返回的deviceToken上传到CloudPush服务器
  */
-- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+//- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+//    NSString *tokenString = [self hexStringFromData:deviceToken];
+//    NSLog(@"starlock didRegisterForRemoteNotificationsWithDeviceToken token: %@", tokenString);
+//    /// Required - 注册 DeviceToken
+//    [JPUSHService registerDeviceToken:deviceToken];
+//
+//}
 
-    /// Required - 注册 DeviceToken
-    [JPUSHService registerDeviceToken:deviceToken];
+- (NSString *)hexStringFromData:(NSData *)data {
+    const unsigned char *dataBuffer = (const unsigned char *)[data bytes];
+    NSMutableString *hexString = [NSMutableString stringWithCapacity:data.length * 2];
 
+    for (NSInteger i = 0; i < data.length; i++) {
+        [hexString appendFormat:@"%02x", dataBuffer[i]];
+    }
+
+    return [hexString copy];
 }
+
 /*
  *  苹果推送注册失败回调
  */

pubspec.lock

@@ -992,8 +992,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: aa93729f48762421658675800be68aee27b6d8fb
+      ref: "807ddb8e396c2dce16919df84efe795072404dde"
+      resolved-ref: "807ddb8e396c2dce16919df84efe795072404dde"
       url: "git@code-internal.star-lock.cn:StarlockTeam/jpush_flutter.git"
     source: git
     version: "2.5.8"

pubspec.yaml

@@ -214,7 +214,7 @@ dependencies:
   jpush_flutter:
     git:
       url: git@code-internal.star-lock.cn:StarlockTeam/jpush_flutter.git
-      ref: main
+      ref: 807ddb8e396c2dce16919df84efe795072404dde
 
   #视频播放器
   video_player: ^2.9.2