parent
1bcef7f347
commit
69645e3526
|
|
@ -5,7 +5,7 @@ object Constants {
|
|||
const val DEBUG_BASE_URL = "https://jitutu.batiao8.com" //debug
|
||||
const val LOG_REQUEST = "RabbitRequest"
|
||||
const val agreementUrl = "https://jitutu.batiao8.com/static/policy-jietutu/user.html" //用户协议
|
||||
const val privacyUrl = "https://jitutu.batiao8.com/static/policy-jietutu/privacy-ios.html"//隐私政策
|
||||
const val privacyUrl = "https://jitutu.batiao8.com/static/policy-jietutu/provacy.html"//隐私政策
|
||||
|
||||
//const val getuiAppId = "40qbPjPkYs7TnVAYCX0Ig6"//个推appid (gradle.properties)
|
||||
const val WxAppId = "wx7d1a7d1507482cef" // 微信APPID
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ fun LoginScreen(navController: NavHostController? = null, generalViewModel: Gene
|
|||
.fillMaxSize()
|
||||
) {
|
||||
Box(modifier = Modifier.fillMaxSize()){
|
||||
loginViewModel.setIsPolicyAgreement(false)
|
||||
when(loginViewModel.loginScreenType.value){
|
||||
LoginScreenType.LOGIN_ONE_KEY -> {
|
||||
//一键登录
|
||||
|
|
@ -167,7 +168,6 @@ fun LoginScreen(navController: NavHostController? = null, generalViewModel: Gene
|
|||
Box(modifier = Modifier.align(Alignment.Center).padding(bottom = 100.dp)){
|
||||
AliPayLoginScreen(context, loginViewModel)
|
||||
}
|
||||
|
||||
}
|
||||
else -> {
|
||||
//默认验证码登录
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class LoginViewModel : BaseViewModel() {
|
|||
var oneKeyPreLogin: OnekeyPreLogin? = null
|
||||
|
||||
// 是否同意政策协议
|
||||
private val _policyAgreement = mutableStateOf(true)
|
||||
private val _policyAgreement = mutableStateOf(false)
|
||||
val isPolicyAgreement: State<Boolean> = _policyAgreement
|
||||
fun setIsPolicyAgreement(isAgreement: Boolean) {
|
||||
_policyAgreement.value = isAgreement
|
||||
|
|
|
|||
Loading…
Reference in New Issue