yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增配置隱藏第三方登陸按鈕

Browse Source
This commit is contained in:
zlzw 2024-09-04 14:23:58 +08:00
parent 238dfcc2d3
commit 528647a0bc
8 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/google_test/google-services.json
View File

@ -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"
}
},

12
app/src/main/AndroidManifest.xml
View File

@ -178,6 +178,18 @@
<meta-data
android:name="com.openinstall.APP_KEY"
android:value="smvslm" />
<meta-data
android:name="HIDE_GOOGLE_LOGIN"
android:value="${isHideGoogleLogin}" />
<meta-data
android:name="HIDE_FACEBOOK_LOGIN"
android:value="${isHideFacebookLogin}" />
<meta-data
android:name="HIDE_LINE_LOGIN"
android:value="${isHideLineLogin}" />
<meta-data
android:name="HIDE_TWITTER_LOGIN"
android:value="${isHideTwitterLogin}" />
<meta-data

4
common/src/main/java/com/yunbao/common/CommonAppConfig.java
View File

@ -40,6 +40,10 @@ public class CommonAppConfig {
public static final String BUILD_TIME = getMetaDataString("BUILD_TIME");
public static final boolean IS_SW_RELEASE = getMetaDataBoolean("SW_RELEASE_MODEL");
public static final int LINE_CHANNEL_ID = getMetaDataInt("LINE_ID");
public static final boolean IS_HIDE_GOOGLE_LOGIN = getMetaDataBoolean("HIDE_GOOGLE_LOGIN");
public static final boolean IS_HIDE_FACEBOOK_LOGIN = getMetaDataBoolean("HIDE_FACEBOOK_LOGIN");
public static final boolean IS_HIDE_LINE_LOGIN = getMetaDataBoolean("HIDE_LINE_LOGIN");
public static final boolean IS_HIDE_TWITTER_LOGIN = getMetaDataBoolean("HIDE_TWITTER_LOGIN");
//外部sd卡
public static final String DCMI_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath();
//内部存储 /data/data/<application package>/files目录

3
common/src/main/java/com/yunbao/common/utils/AppManager.java
View File

@ -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<Activity>();
}
LogUtils.e();
//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>class com.yunbao.main.activity.MsgAddressBookActivity
if (getActivity(activity.getClass()) != null) {
activityStack.remove(getActivity(activity.getClass()));

6
config.gradle
View File

@ -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登陆
]
}

14
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@ -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) {

4
main/src/main/res/layout/activity_entry.xml
View File

@ -196,6 +196,7 @@
android:visibility="visible" />
<RelativeLayout
android:id="@+id/lt_lyout_twitter"
android:layout_width="57dp"
android:layout_height="wrap_content"
android:layout_weight="1">
@ -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">
<View
android:id="@+id/view2"

6
package_config.gradle
View File

@ -47,7 +47,7 @@ android {
google_test {
dimension 'packageApk'
if (project.getPluginManager().hasPlugin("com.android.application")) {
applicationId "com.newpdlive.sy"
applicationId "com.pdsylive.yo"
}
manifestPlaceholders = [
serverHost : rootProject.ext.manifestPlaceholders.testServerHost,
@ -56,13 +56,13 @@ android {
isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel,
facebook_app_id : "938330614686044",
facebook_client_token : "b1b574a2cdf0ced1ae5df7274636f65d",
lineChannelId : "2006123567"
lineChannelId : "2006123567",
]
}
google_online {
dimension 'packageApk'
if (project.getPluginManager().hasPlugin("com.android.application")) {
applicationId "com.newpdlive.sy"
applicationId "com.pdsylive.yo"
}
manifestPlaceholders = [
serverHost : rootProject.ext.manifestPlaceholders.serverHost,