From 2d9e1cd685d1590796d4740bb765166a1914448d Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 20 Aug 2024 15:18:54 +0800
Subject: [PATCH] =?UTF-8?q?update=E9=A3=8E=E6=A0=BC=E5=8C=96=E6=89=93?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                    |  7 +++++--
 .../java/com/yunbao/common/CommonAppConfig.java     |  2 +-
 config.gradle                                       |  3 +++
 .../com/yunbao/main/activity/EntryActivity.java     |  2 +-
 package_config.gradle                               | 13 +++++++++++--
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 00680d337..9d3383045 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -178,10 +178,10 @@
 
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id" />
+            android:value="${facebook_app_id}" />
         <meta-data
             android:name="com.facebook.sdk.ClientToken"
-            android:value="@string/facebook_client_token" />
+            android:value="${facebook_client_token}" />
         <meta-data
             android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
             android:value="false" />
@@ -191,6 +191,9 @@
         <meta-data
             android:name="firebase_analytics_collection_enabled"
             android:value="false" />
+        <meta-data
+            android:name="channelId"
+            android:value="${channelId}" />
 
         <receiver
             android:name="com.shayu.phonelive.utils.CustomMessageReceiver"
diff --git a/common/src/main/java/com/yunbao/common/CommonAppConfig.java b/common/src/main/java/com/yunbao/common/CommonAppConfig.java
index c72a2207d..bc5c40847 100644
--- a/common/src/main/java/com/yunbao/common/CommonAppConfig.java
+++ b/common/src/main/java/com/yunbao/common/CommonAppConfig.java
@@ -39,7 +39,7 @@ public class CommonAppConfig {
     public static final boolean IS_PLUGIN_MODEL = getMetaDataBoolean("IS_PLUGIN_MODEL");
     public static final String BUILD_TIME = getMetaDataString("BUILD_TIME");
     public static final boolean IS_SW_RELEASE = getMetaDataBoolean("SW_RELEASE_MODEL");
-
+    public static final String LINE_CHANNEL_ID = getMetaDataString("channelId");
     //外部sd卡
     public static final String DCMI_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath();
     //内部存储 /data/data/<application package>/files目录
diff --git a/config.gradle b/config.gradle
index d25378708..4444cf601 100644
--- a/config.gradle
+++ b/config.gradle
@@ -30,5 +30,8 @@ ext {
             isUploadLog      : true,
             //是否打包成插件包模式
             isPluginModel    : false,
+            facebook_app_id  : "2011402032399020",
+            facebook_client_token  : "959584e054a33614996361f0044e5253",
+            channelId  : "1656399535"
     ]
 }
diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
index 4175e5785..6543fec4d 100644
--- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
@@ -441,7 +441,7 @@ public class EntryActivity extends AppCompatActivity {
         } else if (loginType == 4) {
             try {
                 // App-to-app login
-                Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), "1656399535", new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
+                Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), CommonAppConfig.LINE_CHANNEL_ID, new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
                         // .nonce("<a randomly-generated string>") // nonce can be used to improve security
                         .build());
                 startActivityForResult(loginIntent, 1001);
diff --git a/package_config.gradle b/package_config.gradle
index eaf28369a..e16c68e66 100644
--- a/package_config.gradle
+++ b/package_config.gradle
@@ -46,11 +46,17 @@ android {
         }
         google_test {
             dimension 'packageApk'
+            if (project.getPluginManager().hasPlugin("com.android.application")) {
+                applicationId "com.test.pd"
+            }
             manifestPlaceholders = [
                     serverHost   : rootProject.ext.manifestPlaceholders.testServerHost,
                     isGooglePlay : 1,
                     isUploadLog  : true,
-                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel
+                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel,
+                    facebook_app_id  : "999999999",
+                    facebook_client_token  : "888888888",
+                    channelId : "google"
             ]
         }
         google_online {
@@ -62,7 +68,10 @@ android {
                     serverHost   : rootProject.ext.manifestPlaceholders.serverHost,
                     isGooglePlay : 1,
                     isUploadLog  : true,
-                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel
+                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel,
+                    facebook_app_id  : "999999999",
+                    facebook_client_token  : "888888888",
+                    channelId : "google"
             ]
         }
         huawei_test {