diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java index 9069a94f4..7b7376a21 100644 --- a/app/src/main/java/com/shayu/phonelive/AppContext.java +++ b/app/src/main/java/com/shayu/phonelive/AppContext.java @@ -381,7 +381,7 @@ public class AppContext extends CommonAppContext { if (!CommonAppConfig.IS_UPLOAD_ERROR_LOG) { return; } - if (CommonAppConfig.IS_GOOGLE_PLAY != 2) { + if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) { GoogleUtils.newInstance(this).initializeApp(this); } } @@ -393,7 +393,7 @@ public class AppContext extends CommonAppContext { } String uid = CommonAppConfig.getInstance().getUid(); - if (CommonAppConfig.IS_GOOGLE_PLAY != 2) { + if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) { GoogleUtils.newInstance(sInstance).setFirebaseCrashData( uid, SpUtil.getInstance().getStringValue(SpUtil.USER_INFO), diff --git a/app/src/vivo_online/google-services.json b/app/src/vivo_online/google-services.json new file mode 100644 index 000000000..fca7df245 --- /dev/null +++ b/app/src/vivo_online/google-services.json @@ -0,0 +1,70 @@ +{ + "project_info": { + "project_number": "292494634914", + "project_id": "pdlive-1631521064967", + "storage_bucket": "pdlive-1631521064967.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", + "android_client_info": { + "package_name": "com.pdlive.shayu" + } + }, + "oauth_client": [ + { + "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" + } + }, + { + "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.live.pd" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/vivo_test/google-services.json b/app/src/vivo_test/google-services.json new file mode 100644 index 000000000..fca7df245 --- /dev/null +++ b/app/src/vivo_test/google-services.json @@ -0,0 +1,70 @@ +{ + "project_info": { + "project_number": "292494634914", + "project_id": "pdlive-1631521064967", + "storage_bucket": "pdlive-1631521064967.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", + "android_client_info": { + "package_name": "com.pdlive.shayu" + } + }, + "oauth_client": [ + { + "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" + } + }, + { + "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.live.pd" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/xiaomi_online/google-services.json b/app/src/xiaomi_online/google-services.json new file mode 100644 index 000000000..fca7df245 --- /dev/null +++ b/app/src/xiaomi_online/google-services.json @@ -0,0 +1,70 @@ +{ + "project_info": { + "project_number": "292494634914", + "project_id": "pdlive-1631521064967", + "storage_bucket": "pdlive-1631521064967.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", + "android_client_info": { + "package_name": "com.pdlive.shayu" + } + }, + "oauth_client": [ + { + "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" + } + }, + { + "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.live.pd" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/xiaomi_test/google-services.json b/app/src/xiaomi_test/google-services.json new file mode 100644 index 000000000..fca7df245 --- /dev/null +++ b/app/src/xiaomi_test/google-services.json @@ -0,0 +1,70 @@ +{ + "project_info": { + "project_number": "292494634914", + "project_id": "pdlive-1631521064967", + "storage_bucket": "pdlive-1631521064967.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", + "android_client_info": { + "package_name": "com.pdlive.shayu" + } + }, + "oauth_client": [ + { + "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" + } + }, + { + "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.live.pd" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/CommonAppContext.java b/common/src/main/java/com/yunbao/common/CommonAppContext.java index d3beaf810..4bf7331c4 100644 --- a/common/src/main/java/com/yunbao/common/CommonAppContext.java +++ b/common/src/main/java/com/yunbao/common/CommonAppContext.java @@ -55,7 +55,7 @@ public class CommonAppContext extends MultiDexApplication { // RongPushClient.setPushConfig(config); //将推送相关配置设置到 SDK //设置新加坡融云服务器 有时候国内收不到推送是因为这个 RongIMClient.setServerInfo("navsg01.cn.ronghub.com", null); - if (CommonAppConfig.IS_GOOGLE_PLAY != 2) { + if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) { //谷歌推送 PushConfig gconfig = new PushConfig.Builder().enableFCM(true).build(); RongPushClient.setPushConfig(gconfig); diff --git a/common/src/main/java/com/yunbao/common/HtmlConfig.java b/common/src/main/java/com/yunbao/common/HtmlConfig.java index d128d9001..4ba193aea 100644 --- a/common/src/main/java/com/yunbao/common/HtmlConfig.java +++ b/common/src/main/java/com/yunbao/common/HtmlConfig.java @@ -7,7 +7,7 @@ package com.yunbao.common; public class HtmlConfig { //登录即代表同意服务和隐私条款 - public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3"; + public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=713"; public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59"; //注册用户协议 diff --git a/config.gradle b/config.gradle index e971555bb..144f5ea90 100644 --- a/config.gradle +++ b/config.gradle @@ -24,7 +24,7 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", -// true表示谷歌支付 false 0 链接包(isPluginModel-> true) 1 谷歌包 2华为包 3 samsung包 +// true表示谷歌支付 false 0 链接包(isPluginModel-> true) 1 谷歌包 2华为包 3 samsung包 4 vivo 包 isGooglePlay : 0, //是否上报异常日志 isUploadLog : true, diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index b002e65f9..85c254638 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -318,7 +318,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true, false); } - if (CommonAppConfig.IS_GOOGLE_PLAY != 2) { + if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) { /* GoogleUtils.newInstance(MainActivity.this).setFirebaseTokenListener(MainActivity.this, new GoogleUtils.FirebaseTokenListener() { @Override public void onResultToken(String token) { diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java index eef8e6b27..e79d24194 100644 --- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java +++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java @@ -341,6 +341,7 @@ public class MainHttpUtil { public static void getSettingList(HttpCallback callback) { HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST) .params("version", VersionUtil.getVersion()) + .params("package_name", "pdxy") .execute(callback); } diff --git a/package_config.gradle b/package_config.gradle index 1234cc581..74a46977d 100644 --- a/package_config.gradle +++ b/package_config.gradle @@ -92,6 +92,54 @@ android { isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel ] } + vivo_test { + dimension 'packageApk' + if (project.getPluginManager().hasPlugin("com.android.application")) { + applicationId "com.pdlive.shayu" + } + manifestPlaceholders = [ + serverHost : rootProject.ext.manifestPlaceholders.testServerHost, + isGooglePlay : 4, + isUploadLog : true, + isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel + ] + } + vivo_online { + dimension 'packageApk' + if (project.getPluginManager().hasPlugin("com.android.application")) { + applicationId "com.pdlive.shayu" + } + manifestPlaceholders = [ + serverHost : rootProject.ext.manifestPlaceholders.serverHost, + isGooglePlay : 4, + isUploadLog : true, + isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel + ] + } + xiaomi_test { + dimension 'packageApk' + if (project.getPluginManager().hasPlugin("com.android.application")) { + applicationId "com.pdlive.shayu" + } + manifestPlaceholders = [ + serverHost : rootProject.ext.manifestPlaceholders.testServerHost, + isGooglePlay : 5, + isUploadLog : true, + isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel + ] + } + xiaomi_online { + dimension 'packageApk' + if (project.getPluginManager().hasPlugin("com.android.application")) { + applicationId "com.pdlive.shayu" + } + manifestPlaceholders = [ + serverHost : rootProject.ext.manifestPlaceholders.serverHost, + isGooglePlay : 5, + isUploadLog : true, + isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel + ] + } } } \ No newline at end of file