Merge branch 'develop_liyi' into canary_release

lib/tools/push/message_management.dart

@@ -31,11 +31,34 @@ class MessageManagement {
   //android解析
   static Map<String, dynamic> _androidAnalysis(Map<String, dynamic> data) {
     // {alert: , extras: {cn.jpush.android.TYPE_PLATFORM: 0, cn.jpush.android.CONTENT_TYPE: , cn.jpush.android.MSG_ID: 18101501949885538, cn.jpush.android.EXTRA: {"eventNo":10,"keyId":530,"lockId":7}}, message: }
+    // final Map<Object?, dynamic> extras = data['extras'];
+    // final Map<String, dynamic> extra =
+    //     json.decode(extras['cn.jpush.android.EXTRA'] ?? '{}');
+    // return extra;
+
     final Map<Object?, dynamic> extras = data['extras'];
-    final Map<String, dynamic> extra =
+    final extraData = extras['cn.jpush.android.EXTRA'];
-        json.decode(extras['cn.jpush.android.EXTRA'] ?? '{}');
+
+    if (extraData is String) {
+      return json.decode(extraData);
+    } else if (extraData is Map) {
+      final Map<String, dynamic> extra = {};
+      extraData.forEach((key, value) {
+        if (value is String && value.startsWith('{') && value.endsWith('}')) {
+          // 处理value是JSON字符串的情况
+          try {
+            extra[key.toString()] = json.decode(value);
+          } catch (e) {
+            extra[key.toString()] = value;
+          }
+        } else {
+          extra[key.toString()] = value;
+        }
+      });
       return extra;
     }
+    return {};
+  }
 
 //ios解析
   static Map<String, dynamic> _iosAnalysis(Map<String, dynamic> data) {