diff --git a/app/src/google_online/google-services.json b/app/src/google_online/google-services.json index b805493e2..857149049 100644 --- a/app/src/google_online/google-services.json +++ b/app/src/google_online/google-services.json @@ -1,6 +1,5 @@ { "project_info": { - "版本": "谷歌配置", "project_number": "292494634914", "project_id": "pdlive-1631521064967", "storage_bucket": "pdlive-1631521064967.appspot.com" @@ -10,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", "android_client_info": { - "package_name": "com.pdlive.shayu" + "package_name": "com.test.pd" } }, "oauth_client": [ @@ -18,7 +17,7 @@ "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.pdlive.shayu", + "package_name": "com.test.pd", "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" } }, @@ -26,7 +25,7 @@ "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.pdlive.shayu", + "package_name": "com.test.pd", "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" } }, @@ -34,7 +33,7 @@ "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.pdlive.shayu", + "package_name": "com.test.pd", "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" } }, diff --git a/app/src/google_test/google-services.json b/app/src/google_test/google-services.json index b805493e2..fca7df245 100644 --- a/app/src/google_test/google-services.json +++ b/app/src/google_test/google-services.json @@ -1,6 +1,5 @@ { "project_info": { - "版本": "谷歌配置", "project_number": "292494634914", "project_id": "pdlive-1631521064967", "storage_bucket": "pdlive-1631521064967.appspot.com" diff --git a/app/src/huawei_online/google-services.json b/app/src/huawei_online/google-services.json index b805493e2..fca7df245 100644 --- a/app/src/huawei_online/google-services.json +++ b/app/src/huawei_online/google-services.json @@ -1,6 +1,5 @@ { "project_info": { - "版本": "谷歌配置", "project_number": "292494634914", "project_id": "pdlive-1631521064967", "storage_bucket": "pdlive-1631521064967.appspot.com" diff --git a/app/src/huawei_test/google-services.json b/app/src/huawei_test/google-services.json index b805493e2..fca7df245 100644 --- a/app/src/huawei_test/google-services.json +++ b/app/src/huawei_test/google-services.json @@ -1,6 +1,5 @@ { "project_info": { - "版本": "谷歌配置", "project_number": "292494634914", "project_id": "pdlive-1631521064967", "storage_bucket": "pdlive-1631521064967.appspot.com" diff --git a/app/src/link_online/google-services.json b/app/src/link_online/google-services.json index 4d0173dfc..fca7df245 100644 --- a/app/src/link_online/google-services.json +++ b/app/src/link_online/google-services.json @@ -1,21 +1,20 @@ { "project_info": { - "版本": "链接配置", - "project_number": "111114634914", - "project_id": "pdlive-1631521061111", - "storage_bucket": "pdlive-1631521061111.appspot.com" + "project_number": "292494634914", + "project_id": "pdlive-1631521064967", + "storage_bucket": "pdlive-1631521064967.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:2222222:android:d8db197d7e7a6c3a3a4cfb", + "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", "android_client_info": { "package_name": "com.pdlive.shayu" } }, "oauth_client": [ { - "client_id": "2222222-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", + "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", "client_type": 1, "android_info": { "package_name": "com.pdlive.shayu", @@ -23,7 +22,7 @@ } }, { - "client_id": "292494634914-99999999999999.apps.googleusercontent.com", + "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", "client_type": 1, "android_info": { "package_name": "com.pdlive.shayu", @@ -45,7 +44,7 @@ ], "api_key": [ { - "current_key": "BBBBBBBBBBBBBBcurrent_key" + "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU" } ], "services": { diff --git a/app/src/link_test/google-services.json b/app/src/link_test/google-services.json index 4d0173dfc..fca7df245 100644 --- a/app/src/link_test/google-services.json +++ b/app/src/link_test/google-services.json @@ -1,21 +1,20 @@ { "project_info": { - "版本": "链接配置", - "project_number": "111114634914", - "project_id": "pdlive-1631521061111", - "storage_bucket": "pdlive-1631521061111.appspot.com" + "project_number": "292494634914", + "project_id": "pdlive-1631521064967", + "storage_bucket": "pdlive-1631521064967.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:2222222:android:d8db197d7e7a6c3a3a4cfb", + "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", "android_client_info": { "package_name": "com.pdlive.shayu" } }, "oauth_client": [ { - "client_id": "2222222-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", + "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", "client_type": 1, "android_info": { "package_name": "com.pdlive.shayu", @@ -23,7 +22,7 @@ } }, { - "client_id": "292494634914-99999999999999.apps.googleusercontent.com", + "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", "client_type": 1, "android_info": { "package_name": "com.pdlive.shayu", @@ -45,7 +44,7 @@ ], "api_key": [ { - "current_key": "BBBBBBBBBBBBBBcurrent_key" + "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU" } ], "services": { diff --git a/app/src/samsung_online/google-services.json b/app/src/samsung_online/google-services.json index b805493e2..fca7df245 100644 --- a/app/src/samsung_online/google-services.json +++ b/app/src/samsung_online/google-services.json @@ -1,6 +1,5 @@ { "project_info": { - "版本": "谷歌配置", "project_number": "292494634914", "project_id": "pdlive-1631521064967", "storage_bucket": "pdlive-1631521064967.appspot.com" diff --git a/app/src/samsung_test/google-services.json b/app/src/samsung_test/google-services.json index 97fc04aa1..0f0c6af1b 100644 --- a/app/src/samsung_test/google-services.json +++ b/app/src/samsung_test/google-services.json @@ -1,6 +1,5 @@ { "project_info": { - "版本": "谷歌配置", "project_number": "292494634914", "project_id": "pdlive-1631521064967", "storage_bucket": "pdlive-1631521064967.appspot.com" diff --git a/package_config.gradle b/package_config.gradle index 5397b1b5f..eaf28369a 100644 --- a/package_config.gradle +++ b/package_config.gradle @@ -1,4 +1,4 @@ -android{ +android { dexOptions { jumboMode = true javaMaxHeapSize "8g" @@ -55,6 +55,9 @@ android{ } google_online { dimension 'packageApk' + if (project.getPluginManager().hasPlugin("com.android.application")) { + applicationId "com.test.pd" + } manifestPlaceholders = [ serverHost : rootProject.ext.manifestPlaceholders.serverHost, isGooglePlay : 1,