feat(channel): 支持渠道 Manifest 增量合并

ExtraPluginCfgs/Android/enjoypay/AndroidManifest.xml

@@ -1,54 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.arkgame.ft.ep"
-        xmlns:tools="http://schemas.android.com/tools">
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <application android:extractNativeLibs="true" android:name="com.unity3d.player.TYApp"
-    tools:replace="android:usesCleartextTraffic"
-    android:usesCleartextTraffic="true">
-        <activity android:name="com.unity3d.player.TYUnityActivity"
-                  android:theme="@style/UnityThemeSelector">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="fishingtraveliae.onelink.me" android:pathPrefix="/jT1Q"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:host="mainactivity" android:scheme="zzft" />
-            </intent-filter>
-
-            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
-
-            <meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="true" />
-            <meta-data android:name="google_analytics_default_allow_ad_storage" android:value="true" />
-            <meta-data android:name="google_analytics_default_allow_ad_user_data" android:value="true" />
-            <meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="true" />
-        </activity>
-        <meta-data android:name="com.arkgame.ft.channel" android:value="EnjoyPay" />
-
-        <meta-data android:name="com.sensorsdata.analytics.android.MainProcessName"
+    <application>
+        <meta-data
+            android:name="com.sensorsdata.analytics.android.MainProcessName"
             android:value="${applicationId}"
             tools:replace="android:value" />
-
     </application>
-    <queries>
-       <provider android:authorities="com.facebook.katana.provider.PlatformProvider" />
-       <provider android:authorities="com.facebook.orca.provider.PlatformProvider" />
-        <intent>
-            <action android:name="android.intent.action.MAIN"/>
-        </intent>
-     </queries>
 </manifest>

ExtraPluginCfgs/Android/enjoypay/mainTemplate.gradle

@@ -18,6 +18,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':channel_manifest_lib')
 
     api "com.android.support:support-v4:28.0.0"
     api "com.android.support:appcompat-v7:28.0.0"

ExtraPluginCfgs/Android/enjoypay/settingsTemplate.gradle

@@ -10,6 +10,10 @@ pluginManagement {
 include ':launcher', ':unityLibrary'
 **INCLUDES**
 
+def channelUnityProjectPath = $/**DIR_UNITYPROJECT**/$.replace("\\", "/")
+include ':channel_manifest_lib'
+project(':channel_manifest_lib').projectDir = new File(channelUnityProjectPath, 'Assets/Plugins/Android/channel_manifest_lib')
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {

ExtraPluginCfgs/Android/flexion/AndroidManifest.xml

@@ -1,69 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.arkgame.ft.flexion"
-        xmlns:tools="http://schemas.android.com/tools">
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <application android:extractNativeLibs="true" android:name="com.unity3d.player.TYApp"
-    tools:replace="android:usesCleartextTraffic,android:fullBackupContent"
-    android:fullBackupContent="@xml/flexion_backup_rules"
-    android:usesCleartextTraffic="true">
-        <activity android:name="com.unity3d.player.TYUnityActivity"
-                  android:theme="@style/UnityThemeSelector">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="fishingtraveliae.onelink.me" android:pathPrefix="/jT1Q"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:host="mainactivity" android:scheme="zzft" />
-            </intent-filter>
-
-            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
-        </activity>
-
-        <!-- 渠道标识，ChannelManager 读取此值以识别 Flexion 渠道 -->
-        <meta-data android:name="com.arkgame.ft.channel" android:value="Flexion" />
-
-        <!-- 覆盖 gasdk 与 tuyoosdk 的 MainProcessName 冲突 -->
-        <meta-data android:name="com.sensorsdata.analytics.android.MainProcessName"
+    <application>
+        <meta-data
+            android:name="com.sensorsdata.analytics.android.MainProcessName"
             android:value="${applicationId}"
             tools:replace="android:value" />
 
-        <!-- Flexion SDK 应用标识，从 DropPoint 获取 -->
         <meta-data android:name="com.flexionmobile.fdk.apptoken" android:value="fishingtravel" />
-
-        <!-- 告知 Flexion SDK 当前为 Unity 项目，必须声明 -->
         <meta-data android:name="com.flexionmobile.fdk.sdk-type" android:value="unity" />
 
-        <!--
-            覆盖 tuyoosdk AAR 中硬编码的 Facebook ContentProvider authority。
-            AAR 原值：com.facebook.app.FacebookContentProvider162066986963808
-            追加 ${applicationId}（Flexion 包名）作为后缀后，与 GP 版 authority 不同，
-            两个渠道包可同时安装在同一设备上，不会触发 INSTALL_FAILED_CONFLICTING_PROVIDER。
-            参考：Flexion 官方文档《Unique package name - follow-on requirements》
-        -->        
         <provider
             android:name="com.facebook.FacebookContentProvider"
             android:authorities="com.facebook.app.FacebookContentProvider162066986963808.${applicationId}"
             android:exported="true"
             tools:replace="android:authorities" />
-            
     </application>
-    <queries>
-       <provider android:authorities="com.facebook.katana.provider.PlatformProvider" />
-       <provider android:authorities="com.facebook.orca.provider.PlatformProvider" />
-    </queries>
 </manifest>

ExtraPluginCfgs/Android/flexion/mainTemplate.gradle

@@ -18,6 +18,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':channel_manifest_lib')
 
     api "com.android.support:support-v4:28.0.0"
     api "com.android.support:appcompat-v7:28.0.0"

ExtraPluginCfgs/Android/flexion/settingsTemplate.gradle

@@ -10,6 +10,10 @@ pluginManagement {
 include ':launcher', ':unityLibrary'
 **INCLUDES**
 
+def channelUnityProjectPath = $/**DIR_UNITYPROJECT**/$.replace("\\", "/")
+include ':channel_manifest_lib'
+project(':channel_manifest_lib').projectDir = new File(channelUnityProjectPath, 'Assets/Plugins/Android/channel_manifest_lib')
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {

ExtraPluginCfgs/Android/googleplay/mainTemplate.gradle

@@ -18,6 +18,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':channel_manifest_lib')
 
     api "com.android.support:support-v4:28.0.0"
     api "com.android.support:appcompat-v7:28.0.0"

ExtraPluginCfgs/Android/googleplay/settingsTemplate.gradle

@@ -10,6 +10,10 @@ pluginManagement {
 include ':launcher', ':unityLibrary'
 **INCLUDES**
 
+def channelUnityProjectPath = $/**DIR_UNITYPROJECT**/$.replace("\\", "/")
+include ':channel_manifest_lib'
+project(':channel_manifest_lib').projectDir = new File(channelUnityProjectPath, 'Assets/Plugins/Android/channel_manifest_lib')
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {

ExtraPluginCfgs/Android/rustore/AndroidManifest.xml

@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.arkgame.ft"
-        xmlns:tools="http://schemas.android.com/tools">
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <application android:extractNativeLibs="true" android:name="com.unity3d.player.TYApp"
-    tools:replace="android:usesCleartextTraffic"
-    tools:overrideLibrary="com.tuyoo.gamesdk"
-    android:usesCleartextTraffic="true">
-        <activity android:name="com.unity3d.player.TYUnityActivity"
-                  android:theme="@style/UnityThemeSelector">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-            <intent-filter  android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" /> 
-                <category android:name="android.intent.category.DEFAULT" /> 
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="fishingtraveliae.onelink.me" android:pathPrefix="/jT1Q"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:host="mainactivity" android:scheme="zzft" />
-            </intent-filter>
-
-            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
-        </activity>
-        <meta-data android:name="com.arkgame.ft.channel" android:value="Rustore" />
+    <application tools:overrideLibrary="com.tuyoo.gamesdk">
     </application>
-    <queries>
-       <provider android:authorities="com.facebook.katana.provider.PlatformProvider" /> <!-- allows app to access Facebook app features -->
-       <provider android:authorities="com.facebook.orca.provider.PlatformProvider" /> <!-- allows sharing to Messenger app -->
-     </queries>
 </manifest>

ExtraPluginCfgs/Android/rustore/mainTemplate.gradle

@@ -18,6 +18,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':channel_manifest_lib')
 
     api "com.android.support:support-v4:28.0.0"
     api "com.android.support:appcompat-v7:28.0.0"

ExtraPluginCfgs/Android/rustore/settingsTemplate.gradle

@@ -10,6 +10,10 @@ pluginManagement {
 include ':launcher', ':unityLibrary'
 **INCLUDES**
 
+def channelUnityProjectPath = $/**DIR_UNITYPROJECT**/$.replace("\\", "/")
+include ':channel_manifest_lib'
+project(':channel_manifest_lib').projectDir = new File(channelUnityProjectPath, 'Assets/Plugins/Android/channel_manifest_lib')
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {