Commit 94188255 by 霍志良

feat:跳过按钮展示

parent d8dc8868
...@@ -121,7 +121,8 @@ object LoginUtils { ...@@ -121,7 +121,8 @@ object LoginUtils {
if (size <= 2) {//当前stack只有两个页面,必然没有MainActivity if (size <= 2) {//当前stack只有两个页面,必然没有MainActivity
ActivityManager.finishAll() ActivityManager.finishAll()
if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) { if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) {
activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java)) UserIn.mainIntent(activity)
// activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
} else { } else {
UserIn.mainIntent(activity) UserIn.mainIntent(activity)
} }
...@@ -150,7 +151,8 @@ object LoginUtils { ...@@ -150,7 +151,8 @@ object LoginUtils {
} else { } else {
ActivityManager.finishAll() ActivityManager.finishAll()
if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) { if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) {
activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java)) UserIn.mainIntent(activity)
// activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
} else { } else {
UserIn.mainIntent(activity) UserIn.mainIntent(activity)
} }
......
...@@ -39,6 +39,7 @@ import com.yidianling.user.api.listener.LoginCallBackListener ...@@ -39,6 +39,7 @@ import com.yidianling.user.api.listener.LoginCallBackListener
import com.yidianling.user.constants.UserBIConstants import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.LoginApiRequestUtil import com.yidianling.user.http.LoginApiRequestUtil
import com.yidianling.user.http.request.PhoneLoginAutoParam import com.yidianling.user.http.request.PhoneLoginAutoParam
import com.yidianling.user.route.UserIn
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import java.math.BigDecimal import java.math.BigDecimal
...@@ -301,6 +302,7 @@ object OneKeyLoginHelp { ...@@ -301,6 +302,7 @@ object OneKeyLoginHelp {
} }
.build() .build()
) )
var loginLogo = "ic_ydl_login_logo" var loginLogo = "ic_ydl_login_logo"
var loginHeight = 40 var loginHeight = 40
var loginWidth = 118 var loginWidth = 118
...@@ -313,6 +315,34 @@ object OneKeyLoginHelp { ...@@ -313,6 +315,34 @@ object OneKeyLoginHelp {
loginWidth = 60 loginWidth = 60
appPrivacyOneTip = "壹点灵专家使用协议" 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( phoneNumberAuthHelper.setAuthUIConfig(
AuthUIConfig.Builder() AuthUIConfig.Builder()
.setStatusBarColor(Color.TRANSPARENT) .setStatusBarColor(Color.TRANSPARENT)
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
app:layout_constraintBottom_toBottomOf="@id/img_reg_back" app:layout_constraintBottom_toBottomOf="@id/img_reg_back"
android:layout_marginEnd="@dimen/platform_dp_16" android:layout_marginEnd="@dimen/platform_dp_16"
android:id="@+id/skip_bind" android:id="@+id/skip_bind"
android:visibility="gone" android:visibility="visible"
> >
</TextView> </TextView>
<TextView <TextView
......
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