diff --git a/app/src/google_test/google-services.json b/app/src/google_test/google-services.json index 4f9023d32..035b1baaa 100644 --- a/app/src/google_test/google-services.json +++ b/app/src/google_test/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407", "android_client_info": { - "package_name": "com.newpdlive.sy" + "package_name": "com.pdsylive.yo" } }, "oauth_client": [ @@ -17,7 +17,7 @@ "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.pdsylive.yo", "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47" } }, @@ -25,7 +25,7 @@ "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.pdsylive.yo", "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" } }, @@ -33,7 +33,7 @@ "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.pdsylive.yo", "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" } }, @@ -41,7 +41,7 @@ "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.pdsylive.yo", "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" } }, diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 628ac676e..bf84556ba 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -178,6 +178,18 @@ + + + + /files目录 diff --git a/common/src/main/java/com/yunbao/common/utils/AppManager.java b/common/src/main/java/com/yunbao/common/utils/AppManager.java index d4041e02d..c5ef39339 100644 --- a/common/src/main/java/com/yunbao/common/utils/AppManager.java +++ b/common/src/main/java/com/yunbao/common/utils/AppManager.java @@ -2,6 +2,8 @@ package com.yunbao.common.utils; import android.app.Activity; import android.util.Log; + +import com.blankj.utilcode.util.LogUtils; import com.yunbao.common.BuildConfig; import com.yunbao.common.manager.OpenAdManager; @@ -83,6 +85,7 @@ public class AppManager { if (activityStack == null) { activityStack = new Stack(); } + LogUtils.e(); //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>class com.yunbao.main.activity.MsgAddressBookActivity if (getActivity(activity.getClass()) != null) { activityStack.remove(getActivity(activity.getClass())); diff --git a/config.gradle b/config.gradle index beb9df9ca..d7abf9627 100644 --- a/config.gradle +++ b/config.gradle @@ -32,6 +32,10 @@ ext { isPluginModel : false, facebook_app_id : "2011402032399020", facebook_client_token : "959584e054a33614996361f0044e5253", - lineChannelId : "1656399535" + lineChannelId : "1656399535", + isHideGoogleLogin : false, //是否隐藏谷歌登陆 + isHideFacebookLogin : false,//是否隐藏facebook登陆 + isHideLineLogin : false, //是否隐藏line登陆 + isHideTwitterLogin : false, //是否隐藏twitter登陆 ] } 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 951927855..11616f404 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -94,6 +94,7 @@ import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.utils.LiveRoomCheckLivePresenter; +import com.yunbao.common.utils.ViewUtils; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.main.R; @@ -217,7 +218,7 @@ public class EntryActivity extends AppCompatActivity { googleLayout = findViewById(R.id.googleLayout); - if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { + if (CommonAppConfig.IS_GOOGLE_PLAY == 2 || CommonAppConfig.IS_HIDE_GOOGLE_LOGIN) { googleLayout.setVisibility(View.GONE); } @@ -247,6 +248,17 @@ public class EntryActivity extends AppCompatActivity { webViewLayout = findViewById(R.id.webview_container); webBack = findViewById(R.id.btn_back1); initView(); + + if(CommonAppConfig.IS_HIDE_FACEBOOK_LOGIN){ + lt_btn_facebook.setVisibility(View.GONE); + } + if(CommonAppConfig.IS_HIDE_TWITTER_LOGIN){ + findViewById(R.id.lt_lyout_twitter).setVisibility(View.GONE); + } + if(CommonAppConfig.IS_HIDE_LINE_LOGIN){ + btn_line.setVisibility(View.GONE); + } + btn_tip1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml index 2680499be..ea137dc72 100644 --- a/main/src/main/res/layout/activity_entry.xml +++ b/main/src/main/res/layout/activity_entry.xml @@ -196,6 +196,7 @@ android:visibility="visible" /> @@ -300,8 +301,7 @@ android:id="@+id/webview_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" - tools:visibility="visible"> + android:visibility="gone">