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
94188255
Commit
94188255
authored
May 28, 2022
by
霍志良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:跳过按钮展示
parent
d8dc8868
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
3 deletions
+35
-3
LoginUtils.kt
m-user/src/main/java/com/yidianling/user/LoginUtils.kt
+4
-2
OneKeyLoginHelp.kt
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
+30
-0
user_activity_register_and_login_new.xml
m-user/src/main/res/layout/user_activity_register_and_login_new.xml
+1
-1
No files found.
m-user/src/main/java/com/yidianling/user/LoginUtils.kt
View file @
94188255
...
...
@@ -121,7 +121,8 @@ object LoginUtils {
if
(
size
<=
2
)
{
//当前stack只有两个页面,必然没有MainActivity
ActivityManager
.
finishAll
()
if
(
StatusUtils
.
isFirstLogin
&&
StatusUtils
.
isFirstStartApp
)
{
activity
.
startActivity
(
Intent
(
activity
,
CollectSexAndBirthActivity
::
class
.
java
))
UserIn
.
mainIntent
(
activity
)
// activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
}
else
{
UserIn
.
mainIntent
(
activity
)
}
...
...
@@ -150,7 +151,8 @@ object LoginUtils {
}
else
{
ActivityManager
.
finishAll
()
if
(
StatusUtils
.
isFirstLogin
&&
StatusUtils
.
isFirstStartApp
)
{
activity
.
startActivity
(
Intent
(
activity
,
CollectSexAndBirthActivity
::
class
.
java
))
UserIn
.
mainIntent
(
activity
)
// activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
}
else
{
UserIn
.
mainIntent
(
activity
)
}
...
...
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
View file @
94188255
...
...
@@ -39,6 +39,7 @@ import com.yidianling.user.api.listener.LoginCallBackListener
import
com.yidianling.user.constants.UserBIConstants
import
com.yidianling.user.http.LoginApiRequestUtil
import
com.yidianling.user.http.request.PhoneLoginAutoParam
import
com.yidianling.user.route.UserIn
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
java.math.BigDecimal
...
...
@@ -301,6 +302,7 @@ object OneKeyLoginHelp {
}
.
build
()
)
var
loginLogo
=
"ic_ydl_login_logo"
var
loginHeight
=
40
var
loginWidth
=
118
...
...
@@ -313,6 +315,34 @@ object OneKeyLoginHelp {
loginWidth
=
60
appPrivacyOneTip
=
"壹点灵专家使用协议"
}
//跳过按钮
val
jumpLogin
=
TextView
(
mActivity
)
val
jumpLoginlayoutParams
=
RelativeLayout
.
LayoutParams
(
RelativeLayout
.
LayoutParams
.
MATCH_PARENT
,
RelativeLayout
.
LayoutParams
.
WRAP_CONTENT
)
jumpLoginlayoutParams
.
addRule
(
RelativeLayout
.
ALIGN_PARENT_RIGHT
,
RelativeLayout
.
TRUE
)
// jumpLoginlayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT, RelativeLayout.TRUE)
jumpLoginlayoutParams
.
setMargins
(
RxImageTool
.
dp2px
(
0f
),
RxImageTool
.
dp2px
(
0f
),
RxImageTool
.
dp2px
(
10f
),
RxImageTool
.
dp2px
(
68f
)
)
jumpLogin
.
text
=
"跳过"
jumpLogin
.
setTextColor
(
Color
.
parseColor
(
"#999999"
))
jumpLogin
.
setTextSize
(
TypedValue
.
COMPLEX_UNIT_SP
,
15f
)
jumpLogin
.
gravity
=
Gravity
.
RIGHT
jumpLogin
.
layoutParams
=
jumpLoginlayoutParams
phoneNumberAuthHelper
.
addAuthRegistViewConfig
(
"jump_login"
,
AuthRegisterViewConfig
.
Builder
()
.
setView
(
jumpLogin
)
.
setRootViewId
(
AuthRegisterViewConfig
.
RootViewId
.
ROOT_VIEW_ID_BODY
)
.
setCustomInterface
{
UserIn
.
mainIntent
(
mActivity
)
}
.
build
()
)
phoneNumberAuthHelper
.
setAuthUIConfig
(
AuthUIConfig
.
Builder
()
.
setStatusBarColor
(
Color
.
TRANSPARENT
)
...
...
m-user/src/main/res/layout/user_activity_register_and_login_new.xml
View file @
94188255
...
...
@@ -88,7 +88,7 @@
app:layout_constraintBottom_toBottomOf=
"@id/img_reg_back"
android:layout_marginEnd=
"@dimen/platform_dp_16"
android:id=
"@+id/skip_bind"
android:visibility=
"
gon
e"
android:visibility=
"
visibl
e"
>
</TextView>
<TextView
...
...
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