From 041bcaf2ecf5ebc1ba03cb1960a495b6ae70fe87 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Wed, 4 Dec 2024 09:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=98=B2=E6=8A=96=E4=BB=A5=E5=8F=8A=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/auth/CertificatesActivity.java                 |  5 +++--
 .../ui/login/LoginActivity.java                       | 11 +++++++++--
 .../util/view/BaseRecyclerView.java                   |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
index 0ba775a..673ad40 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
@@ -40,6 +40,7 @@ import com.arpa.hndahesudintocctmsdriver.util.PickerUtils;
 import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.map.MapUtil;
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -748,7 +749,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
             }
         });
 
-        submit.setOnClickListener(v -> {
+        submit.setOnClickListener(new OnLimitClickHelper(v->{
             if (!isAuth) {
                 subimt();
             } else {
@@ -792,7 +793,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         break;
                 }
             }
-        });
+        }));
     }
 
     @Override
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
index 989f3c9..6d7a163 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
@@ -32,6 +32,8 @@ import com.arpa.hndahesudintocctmsdriver.request.net.BaseObserver;
 import com.arpa.hndahesudintocctmsdriver.request.net.DataManager;
 import com.arpa.hndahesudintocctmsdriver.request.net.RxHttpCallBack;
 import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity;
+import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
 import com.dahe.mylibrary.net.CommonResponseBean;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -77,6 +79,7 @@ public class LoginActivity extends BaseActivity {
     private int timer_sum = 60;
     private CheckBox cb;
     private UserRequset ur;
+    private CustomDialog customDialog;
 
     @Override
     public void msgMethod(Message m) {
@@ -95,6 +98,8 @@ public class LoginActivity extends BaseActivity {
                     Log.e("--短信发送res--", "短信发送成功");
                 }
                 if (CacheGroup.cacheList.get(LOGIN_RESULT) != null) {
+                    if (customDialog!=null&&customDialog.isShowing())
+                        customDialog.dismiss();
                     //存储登录记录
                     loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
                     Log.e("--登录信息--", new Gson().toJson(loginBean));
@@ -227,12 +232,14 @@ public class LoginActivity extends BaseActivity {
                 }
             }
         });
-        btn_login.setOnClickListener(v -> {
+        btn_login.setOnClickListener(new OnLimitClickHelper(v -> {
             String phone = String.valueOf(input_phone.getText());
             String code = String.valueOf(input_code.getText());
             Log.e("--code--", code);
             if (judgeFormat(phone, code)) {
                 if (key) {
+                    customDialog = new CustomDialog(con, "登陆中...");
+                    customDialog.show();
                     LoginRegInputBean lb = new LoginRegInputBean();
                     lb.setRoleId(4);
                     lb.setUname(phone);
@@ -244,7 +251,7 @@ public class LoginActivity extends BaseActivity {
                     Toast.makeText(con, "请先同意用户协议和隐私政策", Toast.LENGTH_SHORT).show();
                 }
             }
-        });
+        }));
         auto_login.setOnClickListener(v -> {
             JVerificationInterface.getToken(con, 20000, (i, s, s1) -> {
                 JVerifyUIConfig uiConfig = new JVerifyUIConfig.Builder()
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java
index 46f97d3..00f5a7f 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java
@@ -105,6 +105,8 @@ public class BaseRecyclerView extends RecyclerView {
         ra.addItem(mb);
     }
     public void adds(List<ManyBean> list){
+        if (ra==null)
+            return;
         ra.add(list);
     }
     public AdapterAlls createsH(Context con, List<ManyBean> list){