重写等待框

app/src/main/java/com/rc/core/ui/common/UIDelegateImpl.kt

@@ -1,17 +1,21 @@
 package com.rc.core.ui.common
 
 import android.content.Context
-import android.widget.Toast
+import android.view.View
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
-import xn.hxp.R
-import com.rc.core.ui.dialog.LoadingDialog
+import com.kongzue.dialogx.DialogX
+import com.kongzue.dialogx.dialogs.PopTip
+import com.kongzue.dialogx.dialogs.WaitDialog
+import com.kongzue.dialogx.interfaces.OnBindView
 import com.rc.core.ui.widget.decoration.NoLastLineItemDecoration
 import com.rc.httpcore.exception.NetException
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.disposables.Disposable
 import retrofit2.HttpException
+import xn.hxp.R
 import java.net.ConnectException
 import java.net.SocketTimeoutException
 
@@ -22,37 +26,23 @@ import java.net.SocketTimeoutException
  */
 class UIDelegateImpl : AbsUIDelegate() {
 
-    private var mPdLoading: LoadingDialog? = null
 
     override fun showLoading(
         context: Context,
         message: String?,
         cancelable: Boolean,
     ) {
-        if (null == mPdLoading) {
-            mPdLoading = LoadingDialog(context, message)
-        }
-        mPdLoading?.let {
-            it.setMessage(message)
-            it.setCancelable(cancelable)
-            if (it != null && !it.isShowing) {
-                it.show()
-            }
-        }
+        WaitDialog.show(message).setEnterAnimDuration(0).setExitAnimDuration(0)
+            .setCancelable(DialogX.cancelable)
     }
 
     override fun dismissLoading() {
-        mPdLoading?.let {
-            if (it.isShowing) {
-                it.dismiss()
-                mPdLoading = null
-            }
-        }
+        WaitDialog.dismiss()
     }
 
     override fun showToast(context: Context?, message: String) {
         context?.let {
-            Toast.makeText(it, message, Toast.LENGTH_SHORT).show()
+            PopTip.show(message)
         }
     }
 

app/src/main/java/xn/hxp/app/ChemicalApp.kt

@@ -2,12 +2,15 @@ package xn.hxp.app
 
 import android.app.Application
 import android.content.Context
+import android.graphics.Color
 import android.util.Log
 import androidx.multidex.MultiDex
 import com.blankj.utilcode.util.AppUtils
 import com.blankj.utilcode.util.CrashUtils
 import com.blankj.utilcode.util.FileUtils
 import com.blankj.utilcode.util.LogUtils
+import com.kongzue.dialogx.DialogX
+import com.kongzue.dialogx.util.TextInfo
 import com.rc.core.util.ScreenAdapter
 import com.rc.httpcore.HttpConfig
 import com.rc.httpcore.apk.LabInfo
@@ -15,6 +18,7 @@ import com.rc.httpcore.bean.ConfigBean
 import com.rc.httpcore.bean.UserData
 import com.tencent.smtt.export.external.TbsCoreSettings
 import com.tencent.smtt.sdk.QbSdk
+import xn.hxp.R
 
 //新版化学品-使用V3版本API
 class ChemicalApp : Application() {
@@ -49,6 +53,16 @@ class ChemicalApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        DialogX.init(this)
+        DialogX.globalTheme = DialogX.THEME.DARK
+        DialogX.cancelable = false
+        DialogX.cancelableTipDialog = false
+        DialogX.tipProgressColor = getColor(R.color.teal_700)
+        var textInfo = TextInfo()
+        textInfo.fontColor = getColor(R.color.teal_700)
+        textInfo.fontSizeUnit = TextInfo.FONT_SIZE_UNIT.SP
+        textInfo.fontSize = 20
+        DialogX.tipTextInfo = textInfo
         if (AppUtils.isAppDebug()) {
             HttpConfig.API_BASE_URL = "http://192.168.1.8/api/"
             HttpConfig.API_BASE_IMG_URL = "http://192.168.1.8/api/"

app/src/main/java/xn/hxp/ui/MainActivity.kt

@@ -10,6 +10,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import android.util.Log
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
@@ -374,7 +375,6 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
                     updateRunnable = object : Runnable {
                         override fun run() {
                             // 更新 UI 操作
-                            LogUtils.i("========UI在刷新")
                             val currentPosition = layoutManager.findFirstVisibleItemPosition()
                             if (currentPosition != RecyclerView.NO_POSITION) {
                                 val nextPosition = (currentPosition + 1) % mAdapter.itemCount
@@ -735,7 +735,7 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
         override fun handleMessage(msg: Message) {
             if (WHAT_COUNT_DOWN == msg.what) {
                 val countDown = MAX_TIME - mCounter
-//                Log.d("======返回首页时间", "${countDown}")
+                Log.d("======返回首页时间", "${countDown}")
                 if (isDestroyed) return
                 if (countDown <= 0) {
                     ChemicalApp.confs = null

app/src/main/java/xn/hxp/ui/common/BaseCountDownActivity.java

@@ -1,17 +1,23 @@
 package xn.hxp.ui.common;
 
+import static com.kongzue.dialogx.DialogX.cancelable;
+
 import android.os.Bundle;
 import android.os.CountDownTimer;
+import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
 
 import com.kongzue.dialogx.dialogs.WaitDialog;
+import com.kongzue.dialogx.interfaces.OnBindView;
 import com.rc.core.ui.activity.RcBaseActivity;
 import com.rc.httpcore.bean.ConfigBean;
 import com.rc.httpcore.client.ApiRepository;
 
 import io.reactivex.rxjava3.functions.Consumer;
+import xn.hxp.R;
 import xn.hxp.app.ChemicalApp;
 import xn.hxp.comm.Constants;
 import xn.hxp.ui.MainActivity;
@@ -28,6 +34,7 @@ public abstract class BaseCountDownActivity<VB extends ViewBinding> extends RcBa
     private CountDownTimer countDownTimer = new CountDownTimer(1000, 1000) {
         @Override
         public void onTick(long millisUntilFinished) {
+
         }
 
 
@@ -65,7 +72,7 @@ public abstract class BaseCountDownActivity<VB extends ViewBinding> extends RcBa
 
     private void invokeTime(int cd) {
         if (!isDestroyed()) {
-            cdTime(backTime);
+            cdTime(cd);
         }
     }
 

app/src/main/java/xn/hxp/ui/login/FacialLoginActivity.kt

@@ -1,27 +1,18 @@
 package xn.hxp.ui.login
 
 
-import android.os.*
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.widget.TextView
-import com.blankj.utilcode.util.AppUtils
 import com.blankj.utilcode.util.LogUtils
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
-import xn.hxp.app.ChemicalApp
-import xn.hxp.R
-import xn.hxp.comm.Constants
-import xn.hxp.databinding.ActivityFacialLoginBinding
-import xn.hxp.ui.common.BaseCountDownActivity
-import xn.hxp.utils.HandlerUtil
-import xn.hxp.utils.MediaPlayerHelper
-import xn.hxp.utils.UiManager
-import xn.hxp.weidith.AuthenticationDialog
-import xn.hxp.weidith.CustomDialog
 import com.rc.httpcore.HttpClient
 import com.rc.httpcore.HttpConfig
 import com.rc.httpcore.client.ApiRepository
@@ -35,11 +26,21 @@ import io.fotoapparat.log.loggers
 import io.fotoapparat.selector.back
 import io.fotoapparat.selector.front
 import retrofit2.HttpException
+import xn.hxp.R
+import xn.hxp.app.ChemicalApp
+import xn.hxp.comm.Constants
+import xn.hxp.databinding.ActivityFacialLoginBinding
+import xn.hxp.ui.common.BaseCountDownActivity
+import xn.hxp.utils.MediaPlayerHelper
+import xn.hxp.utils.UiManager
+import xn.hxp.weidith.AuthenticationDialog
+import xn.hxp.weidith.CustomDialog
 import java.io.File
 import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Locale
 
 /**
  * 人脸登录
@@ -49,19 +50,17 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
     private lateinit var mFotoapparat: Fotoapparat
 //    private lateinit var mCountDownTimer: CountDownTimer
 
-    //人脸验证时间
-    private val totalTimeInMillis: Long = 30 * 1000 // 总时常
     private lateinit var faceList: String
     private val handlerBack = Handler(Looper.getMainLooper())
     private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
     private var mDialogsAut: AuthenticationDialog? = null
-    private val countHandler = Handler(Looper.getMainLooper()) //整个页面 60秒后 直接关闭
 
     override fun createViewBinding() = ActivityFacialLoginBinding.inflate(LayoutInflater.from(this))
 
     override fun initViews(savedInstanceState: Bundle?) {
         super.initViews(savedInstanceState)
+        setCTime(30)
         MediaPlayerHelper.playRawMp3(this, R.raw.login_ren_lian)
         // 使用 Glide 加载网络图片
         viewBinding.deptName.text = "${ChemicalApp.confs!!.deptName}-${ChemicalApp.confs!!.roomNum}"
@@ -159,9 +158,6 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
 //        }
 //        mCountDownTimer.start()
         handlerBack.post(countdownRunnableTwo)
-        countHandler.postDelayed({
-            finish()
-        }, totalTimeInMillis) // 15秒后关闭对话框
     }
 
     override fun onStart() {
@@ -200,10 +196,6 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
         } catch (e: Exception) {
 
         }
-        try {
-            countHandler.removeCallbacksAndMessages(null)
-        } catch (e: Exception) {
-        }
     }
 
     private fun takePicture() {

serialport/.cxx/Debug/6e5q1f5t/arm64-v8a/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Logb
 `
 ^D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Í«¢šÒ2

 —’¼‘Ò2_
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	�ñ«œÒ2

 —’¼‘Ò2_
 ]
-[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build.json	Í«¢šÒ2
˜
+[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build.json	�ñ«œÒ2
˜
  œ’¼‘Ò2d
 b
-`D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build_mini.json	Í«¢šÒ2
”	 ¼’¼‘Ò2Q
+`D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build_mini.json	žñ«œÒ2
”	 ¼’¼‘Ò2Q
 O
-MD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja	Í«¢šÒ2
Ž‰
 쑼‘Ò2U
+MD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja	žñ«œÒ2
Ž‰
 쑼‘Ò2U
 S
-QD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja.txt	Í«¢šÒ2Z
+QD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja.txt	žñ«œÒ2Z
 X
-VD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build_file_index.txt	Í«¢šÒ2

? ¿’¼‘Ò2[
+VD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build_file_index.txt	žñ«œÒ2

? ¿’¼‘Ò2[
 Y
-WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json	Í«¢šÒ2
¸ 둼‘Ò2_
+WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json	žñ«œÒ2
¸ 둼‘Ò2_
 ]
-[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json.bin	Í«¢šÒ2	
… 둼‘Ò2e
+[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json.bin	žñ«œÒ2	
… 둼‘Ò2e
 c
-aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\metadata_generation_command.txt	Í«¢šÒ2
+aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\metadata_generation_command.txt	žñ«œÒ2
 
ž ¾’¼‘Ò2X
 V
-TD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\prefab_config.json	Í«¢šÒ2

( ¾’¼‘Ò2]
+TD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\prefab_config.json	žñ«œÒ2

( ¾’¼‘Ò2]
 [
-YD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\symbol_folder_index.txt	Í«¢šÒ2

X ¾’¼‘Ò2C
+YD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\symbol_folder_index.txt	žñ«œÒ2

X ¾’¼‘Ò2C
 A
-?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	Í«¢šÒ2

Ó ÈÒðê©2
+?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	žñ«œÒ2

Ó ÈÒðê©2