Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
3631faf9
Commit
3631faf9
authored
Jan 14, 2021
by
YKai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:一键登录UI修改,配置正是环境加密key,专家入驻完成
parent
522d0753
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
13 deletions
+19
-13
OneKeyLoginHelp.kt
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
+7
-7
api.properties
ydl-platform/src/main/res/raw/api.properties
+3
-3
NewH5Activity.java
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
+9
-3
No files found.
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
View file @
3631faf9
...
...
@@ -191,7 +191,7 @@ object OneKeyLoginHelp {
RelativeLayout
.
LayoutParams
.
WRAP_CONTENT
)
tvAuthParams
.
addRule
(
RelativeLayout
.
CENTER_HORIZONTAL
,
RelativeLayout
.
TRUE
)
tvAuthParams
.
setMargins
(
0
,
RxImageTool
.
dp2px
(
2
50
f
),
0
,
0
)
tvAuthParams
.
setMargins
(
0
,
RxImageTool
.
dp2px
(
2
35
f
),
0
,
0
)
when
(
phoneNumberAuthHelper
.
currentCarrierName
)
{
"CUCC"
->
{
tvAuth
.
text
=
"中国联通提供认证服务"
...
...
@@ -273,11 +273,11 @@ object OneKeyLoginHelp {
.
setSloganHidden
(
true
)
// 设置slogan是否隐藏
.
setNumberColor
(
Color
.
parseColor
(
"#242424"
))
.
setNumberSize
(
24
)
.
setNumFieldOffsetY
(
2
15
)
.
setNumFieldOffsetY
(
2
00
)
.
setLogBtnBackgroundPath
(
"bg_one_click_login"
)
// 设置登录按钮背景图片
.
setLogBtnTextColor
(
Color
.
parseColor
(
"#ffffff"
))
// 设置登录按钮文字颜色
.
setLogBtnTextSize
(
1
5
)
.
setLogBtnMarginLeftAndRight
(
40
)
// 设置登录按钮距离左右距离
.
setLogBtnTextSize
(
1
7
)
.
setLogBtnMarginLeftAndRight
(
23
)
// 设置登录按钮距离左右距离
.
setLogBtnHeight
(
78
)
.
setSwitchAccText
(
"切换号码"
)
.
setSwitchAccTextSize
(
15
)
...
...
@@ -325,10 +325,10 @@ object OneKeyLoginHelp {
.
setNumFieldOffsetY
(
unit
+
10
)
.
setLogBtnBackgroundPath
(
"bg_one_click_login"
)
// 设置登录按钮背景图片
.
setLogBtnTextColor
(
Color
.
parseColor
(
"#ffffff"
))
// 设置登录按钮颜色
.
setLogBtnTextSize
(
1
6
)
.
setLogBtnMarginLeftAndRight
(
35
)
// 设置登录按钮距离左右距离
.
setLogBtnTextSize
(
1
7
)
.
setLogBtnMarginLeftAndRight
(
23
)
// 设置登录按钮距离左右距离
.
setLogBtnHeight
(
78
)
.
setLogBtnOffsetY
(
(
unit
*
2.5
).
toInt
()
)
.
setLogBtnOffsetY
(
unit
*
3
-
4
)
.
setSwitchAccText
(
"其它方式登录"
)
.
setSwitchAccTextSize
(
15
)
.
setSwitchAccTextColor
(
Color
.
parseColor
(
"#666666"
))
...
...
ydl-platform/src/main/res/raw/api.properties
View file @
3631faf9
...
...
@@ -52,8 +52,8 @@ javaapi.test = https://testapi.ydl.com/api/
javaapi.auto_test
=
https://auto_testapi.ydl.com/api/
javaapi.prod
=
https://api.ydl.com/api/
#
开启网关加密
appKey和appSecret
#
网关加密的
appKey和appSecret
appKey.test
=
20BB42485BD448DE888DD745899C457D
appSecret.test
=
ABA88F2FF7E64A688D2213B20A9B3A3E
appKey.prod
=
appSecret.prod
=
appKey.prod
=
49A4A1BBFBC74CA2B0B5C6B77FF13A80
appSecret.prod
=
ABA88F2FF7E64A688D2213B20A9B3A3E
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
View file @
3631faf9
...
...
@@ -720,7 +720,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
if
(
overridePayUrl
!=
null
)
{
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
));
}
else
{
if
(
YDLRouterManager
.
Companion
.
router
(
url
))
{
...
...
@@ -799,8 +803,10 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
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
));
}
else
{
if
(
YDLRouterManager
.
Companion
.
router
(
url
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment