diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java b/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java index f136d9fc1..60ed9381c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java @@ -18,36 +18,37 @@ import com.yizhuan.erban.R; public class CodeDownDescTimer extends CountDownTimer { private TextView mTvSecond; - private TextView mTvDesc; + private TextView tvGetCode; /** * @param tv_second 秒数 - * @param tv_desc 秒数后面的字 + * @param tv_get_code 秒数后面的字 * @param millisInFuture The number of millis in the future from the call * to {@link #start()} until the countdown is done and {@link #onFinish()} * is called. * @param countDownInterval The interval along the way to receiver * {@link #onTick(long)} callbacks. */ - public CodeDownDescTimer(TextView tv_second, TextView tv_desc, long millisInFuture, long countDownInterval) { + public CodeDownDescTimer(TextView tv_second, TextView tv_get_code, long millisInFuture, long countDownInterval) { super(millisInFuture, countDownInterval); this.mTvSecond = tv_second; - this.mTvDesc = tv_desc; + this.tvGetCode = tv_get_code; } @Override public void onTick(long millisUntilFinished) { mTvSecond.setVisibility(View.VISIBLE); mTvSecond.setText(millisUntilFinished / 1000 + ""); //设置倒计时时间 - mTvDesc.setClickable(false); //设置不可点击 - mTvDesc.setText(Html.fromHtml("s " + "后可重新获取验证码")); + tvGetCode.setClickable(false); //设置不可点击 + tvGetCode.setText(Html.fromHtml("s " + "后可重新获取验证码")); } @Override public void onFinish() { mTvSecond.setVisibility(View.GONE); - mTvDesc.setText(Html.fromHtml("重新获取验证码")); - mTvDesc.setClickable(true);//重新获得点击 + tvGetCode.setText(Html.fromHtml("重新获取验证码")); + tvGetCode.setClickable(true);//重新获得点击 + } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java index 621c4068d..4c3d6fdf4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java @@ -120,6 +120,10 @@ public class LoginCodeActivity extends BaseLoginAct { // startActivity(intent); } }); + + tvGetCode.setOnClickListener(v -> { + getSmsCode(); + }); } @Override diff --git a/app/src/model_customer_server/res/layout/activity_login_code.xml b/app/src/model_customer_server/res/layout/activity_login_code.xml index d708c8b41..8ee289f68 100644 --- a/app/src/model_customer_server/res/layout/activity_login_code.xml +++ b/app/src/model_customer_server/res/layout/activity_login_code.xml @@ -66,10 +66,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" + android:gravity="center" app:layout_constraintTop_toBottomOf="@id/et_code" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginTop="@dimen/dp_10" > @@ -86,8 +89,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/sp_11" + tools:text="重新获取验证码" android:textColor="@color/white" android:paddingBottom="@dimen/dp_10" + android:paddingTop="@dimen/dp_10" />