配合测试完成诸多BUG修复

HttpCoreLibrary/src/main/java/com/rc/httpcore/bean/UserData.java

@@ -0,0 +1,118 @@
+package com.rc.httpcore.bean;
+
+public class UserData {
+    public String account;
+    public String avatar;
+    public Object isInitPasswd;
+    public String license;
+    public int tenantId;
+    public String token;
+    public String userId;
+    public String userName;
+    public int userType;
+    public String cardNum;
+
+    public UserValidationBean userValidationBean;
+
+
+    public UserData(String account, String avatar, Object isInitPasswd, String license, int tenantId, String token, String userId, String userName, int userType, String cardNum) {
+        this.account = account;
+        this.avatar = avatar;
+        this.isInitPasswd = isInitPasswd;
+        this.license = license;
+        this.tenantId = tenantId;
+        this.token = token;
+        this.userId = userId;
+        this.userName = userName;
+        this.userType = userType;
+        this.cardNum = cardNum;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public UserValidationBean getUserValidationBean() {
+        return userValidationBean;
+    }
+
+    public void setUserValidationBean(UserValidationBean userValidationBean) {
+        this.userValidationBean = userValidationBean;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public Object getIsInitPasswd() {
+        return isInitPasswd;
+    }
+
+    public void setIsInitPasswd(Object isInitPasswd) {
+        this.isInitPasswd = isInitPasswd;
+    }
+
+    public String getLicense() {
+        return license;
+    }
+
+    public void setLicense(String license) {
+        this.license = license;
+    }
+
+    public int getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(int tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public int getUserType() {
+        return userType;
+    }
+
+    public void setUserType(int userType) {
+        this.userType = userType;
+    }
+
+    public String getCardNum() {
+        return cardNum;
+    }
+
+    public void setCardNum(String cardNum) {
+        this.cardNum = cardNum;
+    }
+}

HttpCoreLibrary/src/main/java/com/rc/httpcore/bean/UserData.kt

@@ -1,15 +0,0 @@
-package com.rc.httpcore.bean
-
-data class UserData(
-    val account: String,  //工号or学号
-    val avatar: String,
-//    val expiresIn: Int,
-    val isInitPasswd: Any,
-    val license: String,
-    val tenantId: Int,
-    val token: String,
-    val userId: String,
-    val userName: String,
-    val userType: Int,
-    var cardNum:String //卡号
-)

app/src/main/java/com/example/chemical/iml/IBankTeps.kt

@@ -1,5 +0,0 @@
-package com.example.chemical.iml
-
-interface IBankTeps {
-    fun onViewLint()
-}

app/src/main/java/com/example/chemical/ui/common/BaseCountDownActivity.java

@@ -9,6 +9,9 @@ import androidx.viewbinding.ViewBinding;
 import com.blankj.utilcode.util.LogUtils;
 import com.example.chemical.ChemicalApp;
 import com.example.chemical.comm.Constants;
+import com.example.chemical.ui.MainActivity;
+import com.example.chemical.utils.UiManager;
+import com.kongzue.dialogx.dialogs.WaitDialog;
 import com.rc.core.ui.activity.RcBaseActivity;
 import com.rc.httpcore.bean.ConfigBean;
 import com.rc.httpcore.client.ApiRepository;
@@ -54,11 +57,11 @@ public abstract class BaseCountDownActivity<VB extends ViewBinding> extends RcBa
 
     private void cdEnd() {
         // 下面逻辑是之前开发者的  很难理解为什么写
-                    if (BaseCountDownActivity.class instanceof UseActivity.class) {
-                        cdFinish();
-                    } else {
-                        UiManager.INSTANCE.switcher(BaseCountDownActivity.this, MainActivity.class);
-                    }
+        if (Constants.INSTANCE.getVIEW_TYPE()) {
+            cdFinish();
+        } else {
+            UiManager.INSTANCE.switcher(BaseCountDownActivity.this, MainActivity.class);
+        }
     }
 
     private void invokeTime(int cd) {
@@ -133,18 +136,17 @@ public abstract class BaseCountDownActivity<VB extends ViewBinding> extends RcBa
     }
 
     protected void callLogoutApi(Consumer<Boolean> unit) {
-
-        showLoading("退出中...", false);
+        WaitDialog.show("退出中...");
         addDisposable(ApiRepository.INSTANCE.loginOut().subscribe(new Consumer<Boolean>() {
             @Override
             public void accept(Boolean aBoolean) throws Exception {
-                dismissLoading();
+                WaitDialog.dismiss();
                 unit.accept(true);
             }
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                dismissLoading();
+                WaitDialog.dismiss();
                 unit.accept(false);
             }
         }));

app/src/main/java/com/example/chemical/ui/discard/ChecklistsActivity.kt

@@ -104,7 +104,7 @@ class ChecklistsActivity : BaseCountDownActivity<ActivityChecklistsBinding>() {
     }
 
     override fun cdTime(cd: Int) {
-        TODO("Not yet implemented")
+        viewBinding.tvReturn.text = "返回${cd}s"
     }
 
     private fun initTitle() {

app/src/main/java/com/example/chemical/ui/discard/WasteChemicalsActivity.kt

@@ -18,7 +18,6 @@ import com.example.chemical.ChemicalApp
 import com.example.chemical.R
 import com.example.chemical.comm.Constants
 import com.example.chemical.databinding.ActivityWasteChemicalsBinding
-import com.example.chemical.iml.IBankTeps
 import com.example.chemical.receiver.OnSerialScanListener
 import com.example.chemical.receiver.PortScanHelper
 import com.example.chemical.receiver.UsbReceiver
@@ -1260,7 +1259,7 @@ class WasteChemicalsActivity : BaseCountDownActivity<ActivityWasteChemicalsBindi
     }
 
     override fun cdTime(cd: Int) {
-        TODO("Not yet implemented")
+        viewBinding.tvReturn.text = "返回${cd}s"
     }
 
     //=================开锁流程================
@@ -1368,7 +1367,6 @@ class WasteChemicalsActivity : BaseCountDownActivity<ActivityWasteChemicalsBindi
     }
 
 
-
     //查询开锁信息
     private fun getLocks() {
         mCabinetLockVoList!!.forEachIndexed { index, fruit ->

app/src/main/java/com/example/chemical/ui/inquiry/InquiryActivity.kt

@@ -211,12 +211,28 @@ class InquiryActivity : BaseCountDownActivity<ActivityInquiryBinding>() {
                     }
                 }
 
-                if (isLock) {
-                    viewBinding.butOpen.visibility = View.VISIBLE
+                val userData = ChemicalApp.userData
+                if (null != userData) {
+                    val userValidation = userData.userValidationBean
+                    if (null != userValidation) {
+                        if (isLock) {
+                            if (userValidation.cabinetAdmin == true || userValidation.safeUser == true || userValidation.adminUser == true) {
+                                viewBinding.butOpen.visibility = View.VISIBLE
+                            } else {
+                                viewBinding.butOpen.visibility = View.GONE
+                            }
+                        } else {
+                            viewBinding.butOpen.visibility = View.GONE
+                        }
+
+                    }
                 } else {
-                    viewBinding.butOpen.visibility = View.GONE
+                    if (isLock) {
+                        viewBinding.butOpen.visibility = View.VISIBLE
+                    } else {
+                        viewBinding.butOpen.visibility = View.GONE
+                    }
                 }
-
             }
         }
 
@@ -274,18 +290,30 @@ class InquiryActivity : BaseCountDownActivity<ActivityInquiryBinding>() {
                                 return@forEach
                             }
                         }
+                        val userData = ChemicalApp.userData
+                        if (null != userData) {
+                            val userValidation = userData.userValidationBean
+                            if (null != userValidation) {
+                                if (isLock) {
+                                    if (userValidation.cabinetAdmin == true || userValidation.safeUser == true || userValidation.adminUser == true) {
+                                        viewBinding.butOpen.visibility = View.VISIBLE
+                                    } else {
+                                        viewBinding.butOpen.visibility = View.GONE
+                                    }
+                                } else {
+                                    viewBinding.butOpen.visibility = View.GONE
+                                }
 
-                        if (isLock) {
-                            viewBinding.butOpen.visibility = View.VISIBLE
+                            }
                         } else {
-                            viewBinding.butOpen.visibility = View.GONE
+                            if (isLock) {
+                                viewBinding.butOpen.visibility = View.VISIBLE
+                            } else {
+                                viewBinding.butOpen.visibility = View.GONE
+                            }
                         }
-
                     }
-
-
                 }
-                LogUtils.d()
                 //第一个页面
                 goQueryTwoFragment()
             }, { throwable ->

app/src/main/java/com/example/chemical/ui/login/SwipeActivity.kt

@@ -30,6 +30,7 @@ import com.example.chemical.weidith.CustomDialog
 import com.rc.core.log.RcLog
 import com.rc.httpcore.HttpClient
 import com.rc.httpcore.HttpConfig
+import com.rc.httpcore.bean.UserData
 import com.rc.httpcore.client.ApiRepository
 import com.rc.httpcore.exception.NetException
 import org.greenrobot.eventbus.EventBus
@@ -149,7 +150,7 @@ class SwipeActivity : BaseCountDownActivity<ActivitySwipeBinding>() {
         val disposable = ApiRepository.cardNum(cont)
             .subscribe({ data ->
                 ChemicalApp.userData = data
-                authenticationInfo(data.userId, ChemicalApp.subjectId!!)
+                authenticationInfo(data, ChemicalApp.subjectId!!)
             }, { throwable ->
                 dismissLoading()
                 throwableView(throwable)
@@ -159,10 +160,11 @@ class SwipeActivity : BaseCountDownActivity<ActivitySwipeBinding>() {
     }
 
     //验证当前人员身份
-    private fun authenticationInfo(userId: String, subId: String) {
+    private fun authenticationInfo(user: UserData, subId: String) {
         showLoading("验证中...")
-        val disposable = ApiRepository.userCardValidation(userId, subId)
+        val disposable = ApiRepository.userCardValidation(user.userId, subId)
             .subscribe({ data ->
+                ChemicalApp.userData!!.userValidationBean = data
                 dismissLoading()
                 LogUtils.json(data)
                 val allFalse = with(data) {

app/src/main/java/com/example/chemical/ui/uses/UseActivity.kt

@@ -20,7 +20,6 @@ import com.example.chemical.R
 import com.example.chemical.blu.BluetoothConnectionManager
 import com.example.chemical.comm.Constants
 import com.example.chemical.databinding.ActivityUseBinding
-import com.example.chemical.iml.IBankTeps
 import com.example.chemical.ui.SplashActivity
 import com.example.chemical.ui.adapter.CabinetDoorAdapter
 import com.example.chemical.ui.adapter.CabinetDoorRighAdapter
@@ -44,7 +43,7 @@ import java.math.BigDecimal
 import java.nio.charset.StandardCharsets
 
 //化学品 领用
-class UseActivity : BaseCountDownActivity<ActivityUseBinding>(), IBankTeps {
+class UseActivity : BaseCountDownActivity<ActivityUseBinding>() {
 
     private val mAdapter by lazy { UseListAdapter() }
     private val mAdapterLeft by lazy { CabinetDoorAdapter(this) }  //左边柜子
@@ -1329,7 +1328,14 @@ class UseActivity : BaseCountDownActivity<ActivityUseBinding>(), IBankTeps {
 
     override fun cdFinish() {
         super.cdFinish()
-        onViewLint()
+        if (Constants.VIEW_TYPE) {
+            Constants.VIEW_TYPE = false
+        }
+        if (mIsLock) {
+            outTimeWarnData()
+        } else {
+            finish()
+        }
     }
 
     override fun onDestroy() {
@@ -1372,18 +1378,6 @@ class UseActivity : BaseCountDownActivity<ActivityUseBinding>(), IBankTeps {
         addDisposable(disposable)
     }
 
-    //自动返回
-    override fun onViewLint() {
-        if (Constants.VIEW_TYPE) {
-            Constants.VIEW_TYPE = false
-        }
-        if (mIsLock) {
-            outTimeWarnData()
-        } else {
-            finish()
-        }
-    }
-
     private fun outTimeWarnData() {
         var mStockModelList = mutableListOf<TimeWarBean>()
         val map = mutableMapOf<String, Any>()

app/src/main/java/com/example/chemical/ui/verify/DoubleVerifyActivityHelp.java

@@ -329,61 +329,60 @@ public class DoubleVerifyActivityHelp {
     private void startQrTimer() {
         if (null != qrTimer) {
             qrTimer.cancel();
-            qrTimer.start();
-        } else {
-            qrTimer = new CountDownTimer(3000, 1000) {
-                @Override
-                public void onTick(long millisUntilFinished) {
+            qrTimer = null;
+        }
+        qrTimer = new CountDownTimer(3000, 1000) {
+            @Override
+            public void onTick(long millisUntilFinished) {
 
-                }
+            }
 
-                @Override
-                public void onFinish() {
-                    if (activity.detectType != DetectType.SCAN_DETECT) {
-                        qrTimer.cancel();
-                        qrTimer = null;
-                    } else {
-                        ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<UserValidationBean>() {
-                            @Override
-                            public UserValidationBean doInBackground() throws Throwable {
-                                List<HxpCabinetDoorVo> planAddDataDoorList = activity.planAddData.getDoorList();
-                                List<String> doorIdList = new ArrayList<>();
-                                if (null != planAddDataDoorList && !planAddDataDoorList.isEmpty()) {
-                                    for (int i = 0; i < planAddDataDoorList.size(); i++) {
-                                        doorIdList.add(String.valueOf(planAddDataDoorList.get(i).getDoorId()));
-                                    }
+            @Override
+            public void onFinish() {
+                if (activity.detectType != DetectType.SCAN_DETECT) {
+                    qrTimer.cancel();
+                    qrTimer = null;
+                } else {
+                    ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<UserValidationBean>() {
+                        @Override
+                        public UserValidationBean doInBackground() throws Throwable {
+                            List<HxpCabinetDoorVo> planAddDataDoorList = activity.planAddData.getDoorList();
+                            List<String> doorIdList = new ArrayList<>();
+                            if (null != planAddDataDoorList && !planAddDataDoorList.isEmpty()) {
+                                for (int i = 0; i < planAddDataDoorList.size(); i++) {
+                                    doorIdList.add(String.valueOf(planAddDataDoorList.get(i).getDoorId()));
                                 }
-                                Response response = HttpTool.aioScanLogin1(qrScanTime, ChemicalApp.subjectId, doorIdList);
-                                if (response.isSuccessful()) {
-                                    String json = response.body().string();
-                                    JSONObject jsonObject = new JSONObject(json);
-                                    int code = jsonObject.getInt("code");
-                                    if (200 == code) {
-                                        return GsonUtils.fromJson(jsonObject.getJSONObject("data").toString(), UserValidationBean.class);
-                                    } else {
-                                        PopTip.show(jsonObject.getString("message"));
-                                    }
+                            }
+                            Response response = HttpTool.aioScanLogin1(qrScanTime, ChemicalApp.subjectId, doorIdList);
+                            if (response.isSuccessful()) {
+                                String json = response.body().string();
+                                JSONObject jsonObject = new JSONObject(json);
+                                int code = jsonObject.getInt("code");
+                                if (200 == code) {
+                                    return GsonUtils.fromJson(jsonObject.getJSONObject("data").toString(), UserValidationBean.class);
                                 } else {
-                                    PopTip.show(response.message());
+                                    PopTip.show(jsonObject.getString("message"));
                                 }
-                                return null;
+                            } else {
+                                PopTip.show(response.message());
                             }
+                            return null;
+                        }
 
-                            @Override
-                            public void onSuccess(UserValidationBean result) {
-                                if (null != result) {
-                                    qrTimer.cancel();
-                                    qrTimer = null;
-                                    verifyProcess(result);
-                                }
+                        @Override
+                        public void onSuccess(UserValidationBean result) {
+                            if (null != result) {
+                                qrTimer.cancel();
+                                qrTimer = null;
+                                verifyProcess(result);
                             }
-                        });
-                        qrTimer.start();
-                    }
+                        }
+                    });
+                    qrTimer.start();
                 }
-            };
-            qrTimer.start();
-        }
+            }
+        };
+        qrTimer.start();
     }
 
     private void switchDetectUi(DetectType detectType, boolean isFirst) {

app/src/main/java/com/example/chemical/weidith/BluetoothWeighDialog.java

@@ -170,7 +170,6 @@ public class BluetoothWeighDialog extends AppCompatDialog {
     BluetoothTool.BluetoothCallBack bluetoothCallBack = new BluetoothTool.BluetoothCallBack() {
         @Override
         public void callBack(String weight) {
-            LogUtils.d(weight);
             hxpChemicalVo.setWeigh(Double.parseDouble(weight));
             ThreadUtils.runOnUiThread(() -> {
                 binding.weighTV.setText(weight + "g");

app/src/main/res/layout/activity_main.xml

@@ -307,14 +307,14 @@
                     android:layout_width="260dp"
                     android:layout_height="125dp"
                     android:layout_marginLeft="@dimen/dp_10"
-                    android:background="@mipmap/img_bg_xz">
+                    android:background="@mipmap/img_bg_cx">
 
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="45dp"
-                        android:background="@mipmap/icon_sy_cx" />
+                        android:background="@mipmap/icon_hxpsy_bq" />
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -335,7 +335,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Label management"
+                            android:text="Label"
                             android:textColor="@color/white"
                             android:textSize="14sp"
                             android:textStyle="bold" />