diff --git a/app/build.gradle b/app/build.gradle
index 820203965..7b25c2eda 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,19 +66,19 @@ android {
signingConfigs {
v2 {
- storeFile file('../yinyou.jks')
- storePassword "yinyou2021"
- keyAlias "yinyou"
- keyPassword "yinyou2021"
+ storeFile file('../moshen.jks')
+ storePassword "moshen2020"
+ keyAlias "moshen"
+ keyPassword "moshen2020"
v2SigningEnabled true
v1SigningEnabled true
}
v1 {
- storeFile file('../yinyou.jks')
- storePassword "yinyou2021"
- keyAlias "yinyou"
- keyPassword "yinyou2021"
+ storeFile file('../moshen.jks')
+ storePassword "moshen2020"
+ keyAlias "moshen"
+ keyPassword "moshen2020"
v2SigningEnabled false
v1SigningEnabled true
}
@@ -137,7 +137,7 @@ android {
buildTypes {
release {
- buildConfigField "String", "BASE_URL", "\"https://api.lecheng163.com/\""
+ buildConfigField "String", "BASE_URL", "\"https://yinyou.api.shengxuanwangluo.com/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -150,8 +150,8 @@ android {
debug {
buildConfigField "String", "BASE_URL", "\"http://api.uat.lecheng163.com/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
- buildConfigField "String", "BASE_URL_STAGING", "\"https://api.lecheng163.com/\""
- buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.lecheng163.com/\""
+ buildConfigField "String", "BASE_URL_STAGING", "\"https://yinyou.api.shengxuanwangluo.com/\""
+ buildConfigField "String", "BASE_URL_RELEASE", "\"https://yinyou.api.shengxuanwangluo.com/\""
minifyEnabled false
shrinkResources false
signingConfig signingConfigs.v1
diff --git a/app/src/main/java/com/mango/moshen/base/BaseLoginAct.java b/app/src/main/java/com/mango/moshen/base/BaseLoginAct.java
index d1b639e90..1ade4a1ae 100644
--- a/app/src/main/java/com/mango/moshen/base/BaseLoginAct.java
+++ b/app/src/main/java/com/mango/moshen/base/BaseLoginAct.java
@@ -107,7 +107,7 @@ public abstract class BaseLoginAct extends BaseActivity {
//showTvLoginTip(loginTipsInfo.isShowWechat() || loginTipsInfo.isShowQq());
//showThirdPartLogin(loginTipsInfo.isShowWechat(), loginTipsInfo.isShowQq(), loginTipsInfo.isShowOneClick());
showTvLoginTip(false);
- showThirdPartLogin(false, false, loginTipsInfo.isShowOneClick());
+ showThirdPartLogin(false, false, false);
} else {
showTvLoginTip(false);
showThirdPartLogin(false, false, false);
diff --git a/app/src/module_quick_pass/res/layout/act_quick_pass.xml b/app/src/module_quick_pass/res/layout/act_quick_pass.xml
index 7e4f80687..b3c05a2cf 100644
--- a/app/src/module_quick_pass/res/layout/act_quick_pass.xml
+++ b/app/src/module_quick_pass/res/layout/act_quick_pass.xml
@@ -55,6 +55,7 @@
android:text="本机号码一键登录"
android:textColor="@color/white"
android:textSize="@dimen/dp_15"
+ android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_logo"
@@ -85,14 +86,14 @@
android:background="@drawable/bg_login_protocol_hint"
android:gravity="center_horizontal|bottom"
android:paddingBottom="6dp"
- android:visibility="gone"
android:text="同意隐私政策和用户协议后,才可以注册登录哦~"
android:textColor="@color/white"
android:textSize="10dp"
- tools:visibility="visible"
+ android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_protocol" />
+ app:layout_constraintTop_toBottomOf="@id/tv_protocol"
+ tools:visibility="visible" />
-
-
+
+
diff --git a/xplan-flutter b/xplan-flutter
deleted file mode 160000
index a46a357c5..000000000
--- a/xplan-flutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a46a357c589ca6b1905e25390864b85171e1cec9