[2.15.0_merge_3.2.0]

app/src/main/AndroidManifest.xml

@@ -12,8 +12,9 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_shell_name"
         android:largeHeap="true"
-        android:resizeableActivity="false"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="false"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.App"
         android:usesCleartextTraffic="true"
@@ -26,7 +27,7 @@
         <!-- 配置APP渠道号 -->
         <meta-data
             android:name="BUGLY_APP_CHANNEL"
-            android:value="${CHANNEL_VALUE}" />
+            android:value="${CHANNEL_VALUE_HEAD}_${CHANNEL_VALUE_BODY}_${CHANNEL_VALUE_TAIL}" />
 
         <meta-data
             android:name="com.amap.api.v2.apikey"

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -41,7 +41,7 @@ object ConfigStartUp {
         // 演示模式,上一次勾选的数据
         FunctionBuildConfig.isDemoMode = BuildConfig.IS_DEMO_MODE
 //        // app安装的身份信息
-        FunctionBuildConfig.appIdentityMode = BuildConfig.APP_IDENTITY_MODE
+        FunctionBuildConfig.appIdentityMode = "${BuildConfig.APP_IDENTITY_MODE_HEAD}_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
         // 各个module需要的url
         FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java)
         //不能启动自动驾驶的档位