Merge branch 'develop_sky' into 'canary_release_sky'

Develop sky

See merge request StarlockTeam/app-starlock!195

lib/tools/push/xs_jPhush.dart

@@ -179,9 +179,10 @@ class XSJPushProvider {
           if ('中国' != entity.data!.name) {
             String? token = await CallKitHandler.getVoipToken();
             if (token != null && token.isNotEmpty) {
-              channels.add(<String, dynamic>{
-                'channel': 'voipToken',
-                'channelToken': token,
+              channels.forEach((element) {
+                if(element['channel'] == 'apns') {
+                  element['voipToken'] = token;
+                }
               });
             } else {
               debugPrint(