From 3440b71229fe2c6c65e465e23932e4866f7001ba Mon Sep 17 00:00:00 2001 From: 18142669586 <1669783059@qq.com> Date: Tue, 20 Aug 2024 18:11:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/google_online/google-services.json | 38 ++++++++++++++++++- app/src/google_test/google-services.json | 38 ++++++++++++++++++- .../com/yunbao/common/CommonAppConfig.java | 2 +- .../yunbao/main/activity/EntryActivity.java | 2 +- 4 files changed, 74 insertions(+), 6 deletions(-) diff --git a/app/src/google_online/google-services.json b/app/src/google_online/google-services.json index 2e37458be..989be3f53 100644 --- a/app/src/google_online/google-services.json +++ b/app/src/google_online/google-services.json @@ -12,7 +12,36 @@ "package_name": "com.newpdlive.sy" } }, - "oauth_client": [], + "oauth_client": [ + { + "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.newpdlive.sy", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.newpdlive.sy", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.newpdlive.sy", + "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" + } + }, + { + "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com", + "client_type": 3 + } + ], "api_key": [ { "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI" @@ -20,7 +49,12 @@ ], "services": { "appinvite_service": { - "other_platform_oauth_client": [] + "other_platform_oauth_client": [ + { + "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com", + "client_type": 3 + } + ] } } } diff --git a/app/src/google_test/google-services.json b/app/src/google_test/google-services.json index 2e37458be..989be3f53 100644 --- a/app/src/google_test/google-services.json +++ b/app/src/google_test/google-services.json @@ -12,7 +12,36 @@ "package_name": "com.newpdlive.sy" } }, - "oauth_client": [], + "oauth_client": [ + { + "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.newpdlive.sy", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.newpdlive.sy", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.newpdlive.sy", + "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" + } + }, + { + "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com", + "client_type": 3 + } + ], "api_key": [ { "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI" @@ -20,7 +49,12 @@ ], "services": { "appinvite_service": { - "other_platform_oauth_client": [] + "other_platform_oauth_client": [ + { + "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com", + "client_type": 3 + } + ] } } } diff --git a/common/src/main/java/com/yunbao/common/CommonAppConfig.java b/common/src/main/java/com/yunbao/common/CommonAppConfig.java index c91b4005f..2bf10babe 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("LINE_ID"); + public static final int LINE_CHANNEL_ID = getMetaDataInt("LINE_ID"); //外部sd卡 public static final String DCMI_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath(); //内部存储 /data/data//files目录 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 4fc090ab4..951927855 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -443,7 +443,7 @@ public class EntryActivity extends AppCompatActivity { try { // App-to-app login LogUtils.e(CommonAppConfig.LINE_CHANNEL_ID,CommonAppConfig.BUILD_TIME); - Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), CommonAppConfig.LINE_CHANNEL_ID, new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE)) + Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), String.valueOf(CommonAppConfig.LINE_CHANNEL_ID), new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE)) // .nonce("") // nonce can be used to improve security .build()); startActivityForResult(loginIntent, 1001);