|
|
@@ -32,13 +32,14 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
|
|
|
private var tabTitles = mutableListOf("账号登录", "手机号登录")
|
|
|
private var loginType = 0
|
|
|
- lateinit var rxTimer: RxTimer
|
|
|
+ private lateinit var rxTimer: RxTimer
|
|
|
|
|
|
override fun initViews() {
|
|
|
rxTimer = RxTimer()
|
|
|
initTabLayout()
|
|
|
}
|
|
|
|
|
|
+ @SuppressLint("InflateParams")
|
|
|
private fun initTabLayout() {
|
|
|
for (position in tabTitles.indices) {
|
|
|
val doc = tabTitles[position]
|
|
|
@@ -249,6 +250,9 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 开始倒计时
|
|
|
+ */
|
|
|
private fun timer() {
|
|
|
binding.tvCode.isClickable = false
|
|
|
val time = 60.toLong()
|
|
|
@@ -294,15 +298,20 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
val tv: TextView? = tab?.customView?.findViewById(R.id.tv_tab)
|
|
|
tv?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
|
|
|
tv?.invalidate()
|
|
|
- val positon = tab?.position ?: 0
|
|
|
- binding.tvCode.show(positon == 1)
|
|
|
- loginType = positon
|
|
|
- if (positon == 0) {
|
|
|
+ val index = tab?.position ?: 0
|
|
|
+ loginType = index
|
|
|
+ if (index == 0) {
|
|
|
binding.username.hint = "请输入用户名"
|
|
|
binding.password.hint = "请输入密码"
|
|
|
+ binding.tvCode.post {
|
|
|
+ binding.tvCode.visibility = View.GONE
|
|
|
+ }
|
|
|
} else {
|
|
|
binding.username.hint = "请输入手机号"
|
|
|
binding.password.hint = "请输入验证码"
|
|
|
+ binding.tvCode.post {
|
|
|
+ binding.tvCode.visibility = View.VISIBLE
|
|
|
+ }
|
|
|
}
|
|
|
tab?.customView?.findViewById<TextView>(R.id.tv_tab)?.isSelected = false
|
|
|
}
|
|
|
@@ -318,4 +327,9 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
|
|
|
override fun onTabReselected(tab: TabLayout.Tab?) {
|
|
|
}
|
|
|
|
|
|
+ override fun onDestroy() {
|
|
|
+ rxTimer.cancel()
|
|
|
+ super.onDestroy()
|
|
|
+ }
|
|
|
+
|
|
|
}
|