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 @@ + android:value="${facebook_app_id}" /> + android:value="${facebook_client_token}" /> @@ -191,6 +191,9 @@ + /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("") // 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 {