From f22ad82d841f98c5f6f05582cbb414406c7781c8 Mon Sep 17 00:00:00 2001 From: 18142669586 <1669783059@qq.com> Date: Thu, 19 Oct 2023 15:15:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OneToOne/build.gradle | 2 +- OneToOne/google-services.json | 63 +++++++++++++ .../activity/login/EntryActivity.java | 2 +- .../src/main/res/layout/activity_entry.xml | 1 - app/agconnect-services.json | 92 ------------------- app/google-services.json | 59 ++++++------ common/src/main/res/values-en-rUS/string.xml | 2 - common/src/main/res/values-zh-rHK/strings.xml | 2 - common/src/main/res/values-zh-rTW/strings.xml | 2 - common/src/main/res/values-zh/strings.xml | 2 - common/src/main/res/values/strings.xml | 4 +- 11 files changed, 93 insertions(+), 138 deletions(-) create mode 100644 OneToOne/google-services.json delete mode 100644 app/agconnect-services.json diff --git a/OneToOne/build.gradle b/OneToOne/build.gradle index a1c705d82..5926a2adf 100644 --- a/OneToOne/build.gradle +++ b/OneToOne/build.gradle @@ -11,7 +11,7 @@ android { defaultConfig { - applicationId "com.shayu.onetoone" + applicationId "com.shayu.onetoonenew" minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode diff --git a/OneToOne/google-services.json b/OneToOne/google-services.json new file mode 100644 index 000000000..4daabca5a --- /dev/null +++ b/OneToOne/google-services.json @@ -0,0 +1,63 @@ +{ + "project_info": { + "project_number": "903482201540", + "project_id": "onetoone-71170", + "storage_bucket": "onetoone-71170.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:903482201540:android:132978cdf497f4d8634091", + "android_client_info": { + "package_name": "com.shayu.onetoonenew" + } + }, + "oauth_client": [ + { + "client_id": "903482201540-ddno3ro8fp0lqqoeodbhbnpqf7f8d439.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.shayu.onetoonenew", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "903482201540-e9ua9huoejtubp7pgsbu3iq76tqkoorp.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.shayu.onetoonenew", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "903482201540-k3cffuuhsed23kkiuopufhf54ano7do4.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.shayu.onetoonenew", + "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" + } + }, + { + "client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCrhj-7WjwdYUHBMzz9Ntie_S474slGjVY" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/EntryActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/EntryActivity.java index 0d0023da3..04cfc881f 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/EntryActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/EntryActivity.java @@ -337,7 +337,7 @@ public class EntryActivity extends AbsOTOActivity { // App-to-app login Intent loginIntent = LineLoginApi.getLoginIntent( view.getContext(), - "1656399535", + "2001228692", new LineAuthenticationParams.Builder() .scopes(Arrays.asList(Scope.PROFILE)) // .nonce("") // nonce can be used to improve security diff --git a/OneToOne/src/main/res/layout/activity_entry.xml b/OneToOne/src/main/res/layout/activity_entry.xml index 9a1f102d6..ca46add50 100644 --- a/OneToOne/src/main/res/layout/activity_entry.xml +++ b/OneToOne/src/main/res/layout/activity_entry.xml @@ -50,7 +50,6 @@ android:layout_marginBottom="21dp"> For the time being, it is only open to the anchor - 2011402032399020 - 959584e054a33614996361f0044e5253 ui10vIggex2F043HnztYNuA3g J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 3742dc4ea..b3fedc05d 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -828,8 +828,6 @@ 暫時只對主播開放 - 2011402032399020 - 959584e054a33614996361f0044e5253 ui10vIggex2F043HnztYNuA3g J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index df1963a96..f609f3ef0 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -828,8 +828,6 @@ 暫時只對主播開放 - 2011402032399020 - 959584e054a33614996361f0044e5253 ui10vIggex2F043HnztYNuA3g J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 5e5f3715a..e9f0715e6 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -828,8 +828,6 @@ 暫時只對主播開放 - 2011402032399020 - 959584e054a33614996361f0044e5253 ui10vIggex2F043HnztYNuA3g J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7ffd31c41..8e9e4e8fa 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -787,8 +787,8 @@ For the time being, it is only open to the anchor - 2011402032399020 - 959584e054a33614996361f0044e5253 + 391137926073929 + 64dbc61681a4492544be268eb1084c3e ui10vIggex2F043HnztYNuA3g J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ