Bump json5 from 2.2.0 to 2.2.3 in /Electron/im_electron_sdk

Android/Demo/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -26,22 +27,15 @@ android {
             abiFilters.addAll(rootProject.ext.abiFilters)
         }
 
+        /*  集成组件 TUIOfflinePush 离线推送功能需要配置下厂商 vivo 的应用信息，不需要离线推送功能删除即可。
+         *
+         *  "VIVO_APPKEY" : 厂商推送平台注册应用的 AppKey
+         *  "VIVO_APPID" : 厂商推送平台注册应用的 AppID
+         */
         manifestPlaceholders = [
-                // TPNS 推送服务 接入点域名、accessId、accessKey
-                /** 如果您的应用服务接入点为广州，SDK 默认实现该配置。
-                 *  其他服务接入点域名如下：
-                 *  上海：tpns.sh.tencent.com
-                 *  新加坡：tpns.sgp.tencent.com
-                 *  中国香港：tpns.hk.tencent.com
-                 */
-                "XG_SERVER_SUFFIX" : "",
-                "XG_ACCESS_ID" : "",
-                "XG_ACCESS_KEY" : "",
-
-                // 可选：配置首次启动应用时不自动启动推送服务进程，直到调用 XGPushManager.registerPush 接口才开始启动
-                "XG_SERVICE_PULL_UP_OFF" : "true",
-                "VIVO_APPKEY" : "",
-                "VIVO_APPID" : ""
+                "VIVO_APPKEY" : " ",
+                "VIVO_APPID" : " ",
+                "HONOR_APPID" : " "
         ]
     }
 
@@ -76,14 +70,15 @@ android {
             res.srcDirs += "src/main/res-light"
             res.srcDirs += "src/main/res-lively"
             res.srcDirs += "src/main/res-serious"
+            res.srcDirs += "src/main/self-res"
         }
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
     implementation fileTree(include: ['*.jar','*.aar'], dir: '../libs')
-
+    implementation 'com.android.support:multidex:1.0.3'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.squareup.okhttp3:okhttp:3.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -94,35 +89,18 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     // Optional, if you use support library fragments:
 
-    // tpns推送,最新版本号可参考 [Android SDK 发布动态](https://cloud.tencent.com/document/product/548/44520)
-    // 主包
-    implementation 'com.tencent.tpns:tpns:1.3.1.1-release'
-    // Google FCM
-    implementation "com.tencent.tpns:fcm:1.3.1.1-release"
-    // google 云消息传递
-    implementation ('com.google.firebase:firebase-messaging:19.0.1')
-    // 小米
-    implementation "com.tencent.tpns:xiaomi:1.3.1.1-release"
-    // 魅族
-    implementation "com.tencent.tpns:meizu:1.3.1.1-release"
-    // OPPO
-    implementation "com.tencent.tpns:oppo:1.3.1.1-release"
-    // vivo
-    implementation "com.tencent.tpns:vivo:1.3.1.1-release"
-    // 华为
-    implementation 'com.tencent.tpns:huawei:1.3.1.1-release'
-    implementation 'com.huawei.hms:push:5.0.2.300'
-
     // bugly sdk
     implementation 'com.tencent.bugly:crashreport:latest.release'
     implementation 'com.tencent.bugly:nativecrashreport:latest.release'
 
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
+    api project(':tuicommunity')
     api project(':tuiconversation')
     api project(':tuicontact')
     api project(':tuichat')
     api project(':tuisearch')
     api project(':tuigroup')
-    api project(':tuicalling')
+    api project(':tuicallkit')
+    api project(':tuiofflinepush')
 }

Android/Demo/app/google-services.json

@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "******",
+    "firebase_url": "******",
+    "project_id": "******",
+    "storage_bucket": "******.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "******",
+        "android_client_info": {
+          "package_name": "com.tencent.qcloud.tim.tuikit"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "******.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "******"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "******.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}