Commit 3631faf9 by YKai

feat:一键登录UI修改,配置正是环境加密key,专家入驻完成

parent 522d0753
...@@ -191,7 +191,7 @@ object OneKeyLoginHelp { ...@@ -191,7 +191,7 @@ object OneKeyLoginHelp {
RelativeLayout.LayoutParams.WRAP_CONTENT RelativeLayout.LayoutParams.WRAP_CONTENT
) )
tvAuthParams.addRule(RelativeLayout.CENTER_HORIZONTAL, RelativeLayout.TRUE) tvAuthParams.addRule(RelativeLayout.CENTER_HORIZONTAL, RelativeLayout.TRUE)
tvAuthParams.setMargins(0, RxImageTool.dp2px(250f), 0, 0) tvAuthParams.setMargins(0, RxImageTool.dp2px(235f), 0, 0)
when (phoneNumberAuthHelper.currentCarrierName) { when (phoneNumberAuthHelper.currentCarrierName) {
"CUCC" -> { "CUCC" -> {
tvAuth.text = "中国联通提供认证服务" tvAuth.text = "中国联通提供认证服务"
...@@ -273,11 +273,11 @@ object OneKeyLoginHelp { ...@@ -273,11 +273,11 @@ object OneKeyLoginHelp {
.setSloganHidden(true) // 设置slogan是否隐藏 .setSloganHidden(true) // 设置slogan是否隐藏
.setNumberColor(Color.parseColor("#242424")) .setNumberColor(Color.parseColor("#242424"))
.setNumberSize(24) .setNumberSize(24)
.setNumFieldOffsetY(215) .setNumFieldOffsetY(200)
.setLogBtnBackgroundPath("bg_one_click_login") // 设置登录按钮背景图片 .setLogBtnBackgroundPath("bg_one_click_login") // 设置登录按钮背景图片
.setLogBtnTextColor(Color.parseColor("#ffffff")) // 设置登录按钮文字颜色 .setLogBtnTextColor(Color.parseColor("#ffffff")) // 设置登录按钮文字颜色
.setLogBtnTextSize(15) .setLogBtnTextSize(17)
.setLogBtnMarginLeftAndRight(40) // 设置登录按钮距离左右距离 .setLogBtnMarginLeftAndRight(23) // 设置登录按钮距离左右距离
.setLogBtnHeight(78) .setLogBtnHeight(78)
.setSwitchAccText("切换号码") .setSwitchAccText("切换号码")
.setSwitchAccTextSize(15) .setSwitchAccTextSize(15)
...@@ -325,10 +325,10 @@ object OneKeyLoginHelp { ...@@ -325,10 +325,10 @@ object OneKeyLoginHelp {
.setNumFieldOffsetY(unit +10) .setNumFieldOffsetY(unit +10)
.setLogBtnBackgroundPath("bg_one_click_login") // 设置登录按钮背景图片 .setLogBtnBackgroundPath("bg_one_click_login") // 设置登录按钮背景图片
.setLogBtnTextColor(Color.parseColor("#ffffff")) // 设置登录按钮颜色 .setLogBtnTextColor(Color.parseColor("#ffffff")) // 设置登录按钮颜色
.setLogBtnTextSize(16) .setLogBtnTextSize(17)
.setLogBtnMarginLeftAndRight(35) // 设置登录按钮距离左右距离 .setLogBtnMarginLeftAndRight(23) // 设置登录按钮距离左右距离
.setLogBtnHeight(78) .setLogBtnHeight(78)
.setLogBtnOffsetY((unit * 2.5).toInt()) .setLogBtnOffsetY(unit * 3-4)
.setSwitchAccText("其它方式登录") .setSwitchAccText("其它方式登录")
.setSwitchAccTextSize(15) .setSwitchAccTextSize(15)
.setSwitchAccTextColor(Color.parseColor("#666666")) .setSwitchAccTextColor(Color.parseColor("#666666"))
......
...@@ -52,8 +52,8 @@ javaapi.test = https://testapi.ydl.com/api/ ...@@ -52,8 +52,8 @@ javaapi.test = https://testapi.ydl.com/api/
javaapi.auto_test = https://auto_testapi.ydl.com/api/ javaapi.auto_test = https://auto_testapi.ydl.com/api/
javaapi.prod = https://api.ydl.com/api/ javaapi.prod = https://api.ydl.com/api/
# 开启网关加密appKey和appSecret # 网关加密的appKey和appSecret
appKey.test = 20BB42485BD448DE888DD745899C457D appKey.test = 20BB42485BD448DE888DD745899C457D
appSecret.test = ABA88F2FF7E64A688D2213B20A9B3A3E appSecret.test = ABA88F2FF7E64A688D2213B20A9B3A3E
appKey.prod = appKey.prod = 49A4A1BBFBC74CA2B0B5C6B77FF13A80
appSecret.prod = appSecret.prod = ABA88F2FF7E64A688D2213B20A9B3A3E
...@@ -720,7 +720,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler { ...@@ -720,7 +720,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
if (overridePayUrl != null) { if (overridePayUrl != null) {
return overridePayUrl; return overridePayUrl;
} }
if (!TextUtils.isEmpty(url) && url.startsWith("http")) {
if (!TextUtils.isEmpty(url)&&url.endsWith(".apk")){
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
startActivity(intent);
} else if (!TextUtils.isEmpty(url) && url.startsWith("http")) {
loadUrl(setUrlHeightParams(url)); loadUrl(setUrlHeightParams(url));
} else { } else {
if (YDLRouterManager.Companion.router(url)) { if (YDLRouterManager.Companion.router(url)) {
...@@ -799,8 +803,10 @@ public class NewH5Activity extends BaseActivity implements PtrHandler { ...@@ -799,8 +803,10 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
return overridePayUrl; return overridePayUrl;
} }
if (!TextUtils.isEmpty(url)&&url.endsWith(".apk")){
if (!TextUtils.isEmpty(url) && url.startsWith("http")) { Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
startActivity(intent);
} else if (!TextUtils.isEmpty(url) && url.startsWith("http")) {
loadUrl(setUrlHeightParams(url)); loadUrl(setUrlHeightParams(url));
} else { } else {
if (YDLRouterManager.Companion.router(url)) { if (YDLRouterManager.Companion.router(url)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment