Skip to content

B
beyond-clouds-android
Commit babab948 by 段启岩
Options

短信登录优化

parent a0aa1a0c
Showing with 26 additions and 8 deletions
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/login/LoginActivity.java
...@@ -131,13 +131,15 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit ...@@ -131,13 +131,15 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
public void onChanged(AuthenticationViewModel.VerifyCodeState verifyCodeState) { public void onChanged(AuthenticationViewModel.VerifyCodeState verifyCodeState) {
if (verifyCodeState == AuthenticationViewModel.VerifyCodeState.UN_SEND) { if (verifyCodeState == AuthenticationViewModel.VerifyCodeState.UN_SEND) {
binding.btnSendVerifyCode.setText("发送验证码"); binding.btnSendVerifyCode.setText("发送验证码");
binding.btnSendVerifyCode.setTextColor(0xff75d098); binding.btnSendVerifyCode.setTextColor(getResources().getColor(R.color.colorSendVerifyCode));
binding.btnSendVerifyCode.setEnabled(true); binding.btnSendVerifyCode.setEnabled(true);
binding.txtSeconds.setVisibility(View.GONE);
return; return;
} else { } else {
binding.btnSendVerifyCode.setEnabled(false); binding.btnSendVerifyCode.setEnabled(false);
binding.btnSendVerifyCode.setTextColor(0xffaaaaaa); binding.btnSendVerifyCode.setTextColor(getResources().getColor(R.color.colorTextLevel5));
verifyCodeScheduledFuture = authenticationViewModel.startVerifyCodeCountdown(); verifyCodeScheduledFuture = authenticationViewModel.startVerifyCodeCountdown();
binding.txtSeconds.setVisibility(View.VISIBLE);
} }
if (verifyCodeState == AuthenticationViewModel.VerifyCodeState.SEND_FAILURE) { if (verifyCodeState == AuthenticationViewModel.VerifyCodeState.SEND_FAILURE) {
...@@ -156,7 +158,7 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit ...@@ -156,7 +158,7 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
@Override @Override
public void onChanged(Integer leftSeconds) { public void onChanged(Integer leftSeconds) {
if (authenticationViewModel.getVerifyCodeState().getValue() != AuthenticationViewModel.VerifyCodeState.UN_SEND) { if (authenticationViewModel.getVerifyCodeState().getValue() != AuthenticationViewModel.VerifyCodeState.UN_SEND) {
binding.btnSendVerifyCode.setText(leftSeconds + "s"); binding.btnSendVerifyCode.setText(leftSeconds + "");
if (leftSeconds == 0) { if (leftSeconds == 0) {
if (null != verifyCodeScheduledFuture) { if (null != verifyCodeScheduledFuture) {
verifyCodeScheduledFuture.cancel(true); verifyCodeScheduledFuture.cancel(true);
......
app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/AuthenticationViewModel.java
...@@ -418,7 +418,7 @@ public class AuthenticationViewModel extends ViewModel { ...@@ -418,7 +418,7 @@ public class AuthenticationViewModel extends ViewModel {
* 开始倒计时 * 开始倒计时
*/ */
public ScheduledFuture startVerifyCodeCountdown() { public ScheduledFuture startVerifyCodeCountdown() {
verifyCodeLeftSeconds.setValue(10); verifyCodeLeftSeconds.setValue(60);
return appExecutors.scheduledExecutor().scheduleAtFixedRate(new Runnable() { return appExecutors.scheduledExecutor().scheduleAtFixedRate(new Runnable() {
@Override @Override
public void run() { public void run() {
......
app/src/main/res/layout/activity_login.xml
...@@ -218,19 +218,35 @@ ...@@ -218,19 +218,35 @@
app:layout_constraintStart_toStartOf="@id/edit_text_verify_code" app:layout_constraintStart_toStartOf="@id/edit_text_verify_code"
app:layout_constraintTop_toTopOf="@id/edit_text_verify_code" /> app:layout_constraintTop_toTopOf="@id/edit_text_verify_code" />
<Button <TextView
android:id="@+id/btn_send_verify_code" android:id="@+id/btn_send_verify_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/send_verify_code" android:text="@string/send_verify_code"
android:textSize="13sp" android:textSize="13sp"
android:textColor="@color/colorSendVerifyCode" android:textColor="@color/colorSendVerifyCode"
android:background="@android:color/transparent"
android:visibility="@{viewModel.loginWay == LoginWay.SMS ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.loginWay == LoginWay.SMS ? View.VISIBLE : View.GONE}"
app:layout_constraintTop_toTopOf="@id/edit_text_verify_code" app:layout_constraintTop_toTopOf="@id/edit_text_verify_code"
app:layout_constraintBottom_toBottomOf="@id/edit_text_verify_code" app:layout_constraintBottom_toBottomOf="@id/edit_text_verify_code"
app:layout_constraintEnd_toEndOf="@id/edit_text_verify_code" /> app:layout_constraintEnd_toEndOf="@id/txt_seconds" />
<TextView
android:id="@+id/txt_seconds"
android:textSize="10sp"
android:textColor="@color/colorTextLevel5"
android:text="s"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/view_fill_edit_verify_code_end"
app:layout_constraintTop_toTopOf="@id/edit_text_verify_code"
app:layout_constraintBottom_toBottomOf="@id/edit_text_verify_code"/>
<View
android:id="@+id/view_fill_edit_verify_code_end"
app:layout_constraintEnd_toEndOf="@id/edit_text_verify_code"
app:layout_constraintTop_toTopOf="@id/edit_text_verify_code"
app:layout_constraintBottom_toBottomOf="@id/edit_text_verify_code"
android:layout_width="15dp"
android:layout_height="0dp" />
<!-- 验证码输入框 end --> <!-- 验证码输入框 end -->
<Button <Button
......
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