From 07d1e935abc09ae4fb34ebdbc7d7880671f8eb97 Mon Sep 17 00:00:00 2001 From: memory <547527489@qq.com> Date: Fri, 16 Sep 2022 00:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 22 +++++++++--------- .../com/mango/moshen/base/BaseLoginAct.java | 2 +- .../res/layout/act_quick_pass.xml | 7 +++--- .../java/com/mango/core/UriProvider.java | 9 ++----- .../XChatConstants.java | 2 +- gradle.properties | 2 +- mob.gradle | 8 +++---- moshen.jks | Bin 0 -> 2066 bytes tmpmob/ShareSDK/assets/ShareSDK.xml | 4 ++-- xplan-flutter | 1 - 10 files changed, 26 insertions(+), 31 deletions(-) create mode 100644 moshen.jks delete mode 160000 xplan-flutter 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" /> qHScb-a$(n7VNWW2I&1JGn*@i5`P-Gj+6=ovaq%rrBEM1ARWr>Wv zEZHVo(}ZM@B*p01jR+a(Kc`ps&Hp^-`{MiJd0u><@A(|A9j<{uAP86B-{K1mzaHox z#!G*@q@nAu5GKGbueM&YxFV`EZq6WQ!6_;gH0)-cPZKy(XGaDNZ-u+8Omz+Z%TzI(phw(8!&ukSyI8nXWgq4z zH?O3L>TRu19;*DgF|Aq}WQ5=3=f_ElR^)MkDv344a%w}Iqg(dl^0S~QxCo1}Prz#@ ztY1c|i_geW{~^K8-#Xs}|L9WqU9KT|M+d*y#gE7Lp1)#pj1KRZ$E z@=ff-=NKugU0Z!+lIavMG}{75`|ODiT}u1Hc~BUOq~5x39@4ylz)UUcXB9a`pkD~= zchNlKEfF4DgqXh&unfZpks-uza4B;WBih=~-`zXhR``T|V%6YPFHyV#O)su|dFHMc ztI>DV^}aanD)6-?ma>evzADI?iI6X&u}*c13G*Fyyj20iyq&+`7{CqrSgD#f+} zJFj8{ms~oP1QHH#n7|SdK?FlJI}V+fA0?Ycq`MPi|M^Z1um04k_GIX_jMRow4P$z- z)8nGDh>=dRWzufCdH6Isyecb+>M2H;(+Rcs%Jw+pV-YRg#?a_@qBa-EgkGUIC^-@lLkWml8hW5Udc3DNz_+8-FGf;? zA`yiRmw9DSs(S6`t<*KkO4QkPPs)-!N9u=z7~MZ4B4wn6ZXRQlsQ4vOYr1i@o|(Bc z7#{a6V_uAsTZ6la_vF*ntn$1du*n?PDtwJ)6nt8c7E*>GaEZnc_1R^saUm zOb}b?6WWC$52SP|7jEmKiyXPtCJgIrHI(}n&DNi&tJbK$%aJ*EbiYoUEn!-0xvg$= zLA>m0x^>Qb+(b1#d;bIFFDx~_dNqLQj?%Ghng5y9AtAbJ6|`(t(cZHi>nzd{1m;jd zHxJ1~4VG`V(XQF{pO;K*j7rYigeOiYZ#S*9~tU8-O-jl5SdaU5tAlnH9 z*1D0SrM@%Hwts#<_wPH1T=~KPP3zWvbY;dekh{89CQ5V9X`=uGE-4uR2{H(fz;(qu z5HJJ+)olq51K@nHlVof1E*uON;sR3=DGrG8@wh~h!|2@xTFAoVU!i6$e5JCcjLCFJk_=0EE?WziYTy1*m zj_ry)`M%dzn_(7wnSQV*BrSRDvo+SaT#o>Ed=5@{8B0k}o{Y3DuFonSU^NnSG34OGf0JM=BIdGO)Yr*}BWD*^co;}xA4J2(C6a5lyz*2{r%p$}PVjNhKk>gOLbG^?rpES|k{~qnJ-U-i*Hj>6$ zKuS(4e^Yy5Q;wbykmhz!q@pCzO!Vp#iP^+V6F*N)LU_O+@MC4*7@)vSTtOHr1(iHs zvbfy!Ww<9BCv4>})GxMYxa9rc5V=3%h6o0kr(SF~Js(JOi>uDnFu#bSf6es*jx|guO9J$mpNKIHqJstbNFncazZ3# u`jGv-UUPj;^BQ?U-51lhQ#II~No(5=A)3 - - + + 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