更新

app/build.gradle

@@ -13,7 +13,7 @@ android {
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdk 28
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true

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

@@ -158,26 +158,25 @@ public class MainActivity : BaseActivity() {
                 if (input != null) {
                     // 处理用户输入的逻辑
                     if (input.isNotEmpty()) {
-                        var pwd = "123" //默认密码123
-
                         try {
-                            val urlBase = SharedPreferencesHelper.getUrlBase(this)
-                            if (urlBase != null && urlBase.pwd != null) {
-                                LogUtils.i("=====本地密码:${urlBase!!.pwd}")
-                                pwd = urlBase.pwd!!
+                            if ("admin@098&" == input) {
+                                ActivityUtils.startActivity(SettingActivity::class.java)
+                                finish()
+                            } else {
+                                val urlBase = SharedPreferencesHelper.getUrlBase(this)
+                                if (urlBase?.pwd != null) {
+                                    if (input == urlBase.pwd!!) {
+                                        ActivityUtils.startActivity(SettingActivity::class.java)
+                                        finish()
+                                    } else {
+                                        showToast("密码错误")
+                                    }
+                                }
                             }
                         } catch (e: Exception) {
-
-                        }
-
-                        if (input == pwd) {
                             ActivityUtils.startActivity(SettingActivity::class.java)
                             finish()
-                        } else {
-                            showToast("密码错误")
                         }
-
-
                     }
                 } else {
                     // 用户点击了取消按钮

app/src/main/java/xn/hxp/ui/SettingActivity.java

@@ -53,7 +53,21 @@ public class SettingActivity extends BaseActivity {
                 binding.cameraRG.check(binding.frontRB.getId());
             }
             // 管理员密码
-            binding.oldPasswordET.setText(settingsBean.getPwd());
+            binding.oldPasswordET.setText(TextUtils.isEmpty(settingsBean.getPwd()) ? "admin@098&" : settingsBean.getPwd());
+            // 域名配置
+            String baseApi = settingsBean.getA();
+            if (!TextUtils.isEmpty(baseApi)) {
+                binding.httpUriET.setText(baseApi);
+            }
+        } else {
+            if (AppUtils.isAppDebug()) {
+                binding.httpUriET.setText("http://192.168.1.8/api/");
+            } else {
+                binding.httpUriET.setText("http://172.16.0.65/api/");
+            }
+
+            // 管理员密码
+            binding.oldPasswordET.setText("admin@098&");
         }
         // 测试地址输入
         binding.httpUriTestBT.setOnClickListener(v -> binding.httpUriET.setText("http://192.168.1.8/api/"));

app/src/main/java/xn/hxp/ui/discard/WasteChemicalsActivity.kt

@@ -137,7 +137,7 @@ class WasteChemicalsActivity : BaseActivity() {
                             val disposable = ApiRepository.giveBack(mGiveBackBean)
                                 .subscribe({ data ->
                                     dismissLoading()
-                                    AudioPlayer.getInstance().play(R.raw.feiqichuku)
+                                    AudioPlayer.getInstance().play(R.raw.revoked_recycle_hint)
                                     customDialogView(1, "已废弃出库,请及时进行废弃回收")
                                     viewBinding.relOne.visibility = View.GONE
                                     viewBinding.lint3.visibility = View.GONE
@@ -450,7 +450,7 @@ class WasteChemicalsActivity : BaseActivity() {
                         val disposable = ApiRepository.giveBack(mGiveBackBean)
                             .subscribe({ data ->
                                 dismissLoading()
-                                AudioPlayer.getInstance().play(R.raw.feiqichuku)
+                                AudioPlayer.getInstance().play(R.raw.revoked_recycle_hint)
                                 customDialogView(1, "已废弃出库,请及时进行废弃回收")
                                 viewBinding.relOne.visibility = View.GONE
                                 viewBinding.lint3.visibility = View.GONE
@@ -511,7 +511,7 @@ class WasteChemicalsActivity : BaseActivity() {
             val disposable = ApiRepository.giveBack(mGiveBackBean)
                 .subscribe({ data ->
                     dismissLoading()
-                    AudioPlayer.getInstance().play(R.raw.feiqichuku)
+                    AudioPlayer.getInstance().play(R.raw.revoked_recycle_hint)
                     customDialogView(1, "已废弃出库,请及时进行废弃回收")
                     viewBinding.relOne.visibility = View.GONE
                     viewBinding.lint3.visibility = View.GONE
@@ -1327,7 +1327,7 @@ class WasteChemicalsActivity : BaseActivity() {
             mIsLock = true
 //            discardDialogShow()
             //没有锁 直接显示 需要扫描化学品信息
-            AudioPlayer.getInstance().play(R.raw.gui_men_kai_qing_fei_qi)
+            AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_fq_hxp)
             handlerUtil.stopAllTasks()
             countdownTimer?.cancel()
 //            mStockModelList.add(mDataBean)

app/src/main/java/xn/hxp/ui/inquiry/InquiryActivity.kt

@@ -567,7 +567,7 @@ class InquiryActivity : BaseActivity() {
             dismissLoading()
             //开锁成功
             customDialogView(1, "柜门已开")
-            AudioPlayer.getInstance().play(R.raw.guimenkai)
+            AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai)
             handlerUtil.stopAllTasks()
             countdownTimer?.cancel()
         }

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

@@ -74,7 +74,7 @@ class FacialCardActivity : BaseActivity() {
     override fun onInit() {
         //注册广播
         EventBus.getDefault().register(this)
-        AudioPlayer.getInstance().play(R.raw.login_shua_ka)
+        AudioPlayer.getInstance().play(R.raw.scan_card)
         viewBinding.tvReturn.text = "返回${ChemicalApp.confs!!.backTime}s"
         viewBinding.tvReturn.setOnClickListener {
             finish()
@@ -167,7 +167,7 @@ class FacialCardActivity : BaseActivity() {
 //            .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.AUTOMATIC))
 //            .error(R.mipmap.icon_zhan_wei)
 //            .into(viewBinding.imgView)
-        AudioPlayer.getInstance().play(R.raw.login_ren_lian)
+        AudioPlayer.getInstance().play(R.raw.face_detect_hint)
         HttpClient.token = null
         mFotoapparat = Fotoapparat.with(this)
             .into(viewBinding.cameraView)
@@ -365,7 +365,8 @@ class FacialCardActivity : BaseActivity() {
     //身份认证成功
     private fun authenticationDialog() {
         handlerBack.removeCallbacks(countdownRunnableTwo)
-        AudioPlayer.getInstance().play(R.raw.login_ren_zheng_tong_hua)
+
+        AudioPlayer.getInstance().play(R.raw.people_verify_success)
         mDialogsAut = AuthenticationDialog(
             this,
             mFaceImg,

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

@@ -65,7 +65,7 @@ class FacialLoginActivity : BaseActivity() {
     }
 
     override fun onInit() {
-        AudioPlayer.getInstance().play(R.raw.login_ren_lian)
+        AudioPlayer.getInstance().play(R.raw.face_detect_hint)
         // 使用 Glide 加载网络图片
         viewBinding.deptName.text = "${ChemicalApp.confs!!.deptName}-${ChemicalApp.confs!!.roomNum}"
 
@@ -271,7 +271,7 @@ class FacialLoginActivity : BaseActivity() {
     private fun authenticationDialog(faceImg: String?, userName: String) {
         mFotoapparat.stop()
         handlerBack.removeCallbacks(countdownRunnableTwo)
-        AudioPlayer.getInstance().play(R.raw.login_ren_zheng_tong_hua)
+        AudioPlayer.getInstance().play(R.raw.verify_success)
         mDialogsAut = AuthenticationDialog(
             this,
             faceImg,

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

@@ -94,7 +94,7 @@ class ScanLoginActivity : BaseActivity() {
         viewBinding.tvReturn.setOnClickListener { finish() }
 
 
-        AudioPlayer.getInstance().play(R.raw.login_wei_xin_sao_ma)
+        AudioPlayer.getInstance().play(R.raw.wei_xin_qr)
         viewBinding.deptName.text = "${ChemicalApp.confs!!.deptName}-${ChemicalApp.confs!!.roomNum}"
         viewBinding.tvReturn.text = "返回${ChemicalApp.confs!!.backTime}s"
         Glide.with(this)
@@ -310,7 +310,7 @@ class ScanLoginActivity : BaseActivity() {
     //身份认证成功
     private fun authenticationDialog(faceImg: String?, userName: String) {
         myHandler.stop()
-        AudioPlayer.getInstance().play(R.raw.login_ren_zheng_tong_hua)
+        AudioPlayer.getInstance().play(R.raw.people_verify_success)
         mDialogsAut = AuthenticationDialog(
             this,
             faceImg,

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

@@ -54,7 +54,7 @@ class SwipeActivity : BaseActivity() {
     }
 
     override fun onInit() {
-        AudioPlayer.getInstance().play(R.raw.login_shua_ka)
+        AudioPlayer.getInstance().play(R.raw.scan_card)
         //注册广播
         EventBus.getDefault().register(this)
         viewBinding.tvReturn.text = "返回${ChemicalApp.confs!!.backTime}s"
@@ -264,7 +264,7 @@ class SwipeActivity : BaseActivity() {
 
     //身份认证成功
     private fun authenticationDialog(faceImg: String?, userName: String) {
-        AudioPlayer.getInstance().play(R.raw.login_ren_zheng_tong_hua)
+        AudioPlayer.getInstance().play(R.raw.verify_success)
         mDialogsAut = AuthenticationDialog(
             this,
             faceImg,

app/src/main/java/xn/hxp/ui/still/ChemicalsAlsoActivity.kt

@@ -376,7 +376,7 @@ class ChemicalsAlsoActivity : BaseActivity() {
         //归还列表信息查询
         useList()
 
-        AudioPlayer.getInstance().play(R.raw.saomiaobiaoqian)
+        AudioPlayer.getInstance().play(R.raw.scan_label)
         customDialogView(0, "请扫描标签")
     }
 
@@ -569,7 +569,7 @@ class ChemicalsAlsoActivity : BaseActivity() {
                     val disposable = ApiRepository.giveBack(mGiveBackBean)
                         .subscribe({ data ->
                             dismissLoading()
-                            AudioPlayer.getInstance().play(R.raw.feiqichuku)
+                            AudioPlayer.getInstance().play(R.raw.revoked_recycle_hint)
                             customDialogView(1, "已废弃出库,请及时进行废弃回收")
                             viewBinding.relOne.visibility = View.VISIBLE
                             viewBinding.linTow.visibility = View.GONE
@@ -626,7 +626,7 @@ class ChemicalsAlsoActivity : BaseActivity() {
                     val disposable = ApiRepository.giveBack(mGiveBackBean)
                         .subscribe({ data ->
                             dismissLoading()
-                            AudioPlayer.getInstance().play(R.raw.kongpinfeiqi)
+                            AudioPlayer.getInstance().play(R.raw.empties_recycle_hint)
                             customDialogView(1, "已空瓶出库,请及时进行废弃回收")
                             viewBinding.relOne.visibility = View.VISIBLE
                             viewBinding.linTow.visibility = View.GONE
@@ -738,7 +738,7 @@ class ChemicalsAlsoActivity : BaseActivity() {
         showToast("连接中...", Toast.LENGTH_SHORT)
         BleTool.INSTANCE.setBleCallback(object : BleTool.BleCallback {
             override fun onSuccess() {
-                AudioPlayer.getInstance().play(R.raw.qing_zheng_zhong)
+                AudioPlayer.getInstance().play(R.raw.weight_hint)
             }
 
             override fun onNotifyFailure(exception: java.lang.Exception?) {
@@ -834,7 +834,7 @@ class ChemicalsAlsoActivity : BaseActivity() {
                 dismissLoading()
 //                customDialogView(1, "归还成功")
                 customDialogView(1, "请将化学品放入化学品柜")
-                AudioPlayer.getInstance().play(R.raw.guimenkai_fang)
+                AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_fang_ru_hxp)
                 //1无锁，2是智能锁，3是钥匙柜
                 var isLock = false
                 mCabinetLockVoList = mDataBean.cabinetLockVoList
@@ -902,7 +902,7 @@ class ChemicalsAlsoActivity : BaseActivity() {
 
     private fun dloViews() {
         customDialogView(1, "请将化学品放入化学品柜")
-        AudioPlayer.getInstance().play(R.raw.guimenkai_fang)
+        AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_fang_ru_hxp)
         val cabinetOpenDialog =
             CabinetOpenDialog(this@ChemicalsAlsoActivity,
                 false,

app/src/main/java/xn/hxp/ui/uses/UseActivity.kt

@@ -141,7 +141,7 @@ class UseActivity : BaseActivity() {
                 }
             }
         }
-        AudioPlayer.getInstance().play(R.raw.lingyongguimen)
+        AudioPlayer.getInstance().play(R.raw.select_open_cabinet_door)
         customDialogView(0, "请选择要打开的柜门")
 
         val handler = Handler(Looper.getMainLooper())
@@ -263,7 +263,7 @@ class UseActivity : BaseActivity() {
                     openLock(mLockStr)
                 } else {
                     //没有锁 不需要开锁
-                    AudioPlayer.getInstance().play(R.raw.quchuhuaxuepin)
+                    AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_ly_hxp)
                     LogUtils.i("=====测hi是111")
                     usageLabelDialog()
                 }
@@ -350,7 +350,7 @@ class UseActivity : BaseActivity() {
                             openLock(mLockStr)
                         } else {
                             //没有锁 不需要开锁
-                            AudioPlayer.getInstance().play(R.raw.quchuhuaxuepin)
+                            AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_ly_hxp)
                             LogUtils.i("=====测hi是222")
                             usageLabelDialog()
                         }
@@ -559,7 +559,7 @@ class UseActivity : BaseActivity() {
         showToast("连接中...", Toast.LENGTH_SHORT)
         BleTool.INSTANCE.setBleCallback(object : BleTool.BleCallback {
             override fun onSuccess() {
-                AudioPlayer.getInstance().play(R.raw.qing_zheng_zhong)
+                AudioPlayer.getInstance().play(R.raw.weight_hint)
             }
 
             override fun onNotifyFailure(exception: java.lang.Exception?) {
@@ -1103,7 +1103,7 @@ class UseActivity : BaseActivity() {
             dismissLoading()
             mIsLock = true
             //柜门已开取出化学品
-            AudioPlayer.getInstance().play(R.raw.guimenkaiquchuhuaxue)
+            AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_ly_hxp)
             LogUtils.i("=====测hi是333")
             usageLabelDialog()
             handlerUtil.stopAllTasks()
@@ -1169,7 +1169,7 @@ class UseActivity : BaseActivity() {
                     dismissLoading()
                     mIsLock = true
                     //柜门已开取出化学品
-                    AudioPlayer.getInstance().play(R.raw.guimenkaiquchuhuaxue)
+                    AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_ly_hxp)
                     LogUtils.i("=====测hi是444")
                     usageLabelDialog()
                     handlerUtil.stopAllTasks()
@@ -1235,7 +1235,7 @@ class UseActivity : BaseActivity() {
                         openLock(mLockStr)
                     } else {
                         //没有锁 不需要开锁
-                        AudioPlayer.getInstance().play(R.raw.quchuhuaxuepin)
+                        AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_ly_hxp)
                         LogUtils.i("=====测hi是555")
                         usageLabelDialog()
                     }

app/src/main/java/xn/hxp/ui/verify/DoubleVerifyActivityHelp.java

@@ -170,7 +170,7 @@ public class DoubleVerifyActivityHelp {
 
     private void doubleVerifySuccess() {
         PopTip.show("双人认证成功");
-        AudioPlayer.getInstance().play(R.raw.shuangren_tongguo);
+        AudioPlayer.getInstance().play(R.raw.verify_success);
         Intent intent = new Intent();
         intent.putExtra("userValidation1", GsonUtils.toJson(userValidation1));
         intent.putExtra("userValidation2", GsonUtils.toJson(userValidation2));
@@ -217,7 +217,7 @@ public class DoubleVerifyActivityHelp {
                                 switchShowDetect(DetectType.FACE_DETECT, false, true);
                             }
                         }));
-                        AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie);
+                        AudioPlayer.getInstance().play(R.raw.login_user_face_verify);
                     } else {
                         ImageView imageView = new ImageView(activity);
                         imageView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
@@ -232,7 +232,7 @@ public class DoubleVerifyActivityHelp {
                     imageView.setScaleType(ImageView.ScaleType.FIT_XY);
                     imageView.setBackgroundResource(R.mipmap.img_sfrz_sksyt);
                     binding.include1LL.addView(imageView);
-                    AudioPlayer.getInstance().play(R.raw.diyiwei_shua_ka_renzheng);
+                    AudioPlayer.getInstance().play(R.raw.login_user_card_verify);
                     break;
                 case SCAN_DETECT:
                     ImageView qrIv = new ImageView(activity);
@@ -258,7 +258,7 @@ public class DoubleVerifyActivityHelp {
                         }
                     });
                     binding.include1LL.addView(qrIv);
-                    AudioPlayer.getInstance().play(R.raw.diyiren_saoma);
+                    AudioPlayer.getInstance().play(R.raw.login_user_qr_verify);
                     break;
             }
         } else {
@@ -284,7 +284,7 @@ public class DoubleVerifyActivityHelp {
                                 doubleVerifySuccess();
                             }
                         }));
-                        AudioPlayer.getInstance().play(R.raw.dierwei_renlianshibie);
+                        AudioPlayer.getInstance().play(R.raw.second_face_verify);
                     } else {
                         ImageView imageView = new ImageView(activity);
                         imageView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
@@ -299,7 +299,7 @@ public class DoubleVerifyActivityHelp {
                     imageView.setScaleType(ImageView.ScaleType.FIT_XY);
                     imageView.setBackgroundResource(R.mipmap.img_sfrz_sksyt);
                     binding.include2LL.addView(imageView);
-                    AudioPlayer.getInstance().play(R.raw.dierweishuakarenzheng);
+                    AudioPlayer.getInstance().play(R.raw.second_card_verify);
                     break;
                 case SCAN_DETECT:
                     ImageView qrIv = new ImageView(activity);
@@ -325,7 +325,7 @@ public class DoubleVerifyActivityHelp {
                         }
                     });
                     binding.include2LL.addView(qrIv);
-                    AudioPlayer.getInstance().play(R.raw.dierren_saoma);
+                    AudioPlayer.getInstance().play(R.raw.login_user_qr_verify);
                     break;
             }
         }

app/src/main/java/xn/hxp/ui/verify/ScanCodeTwoActivity.kt

@@ -135,7 +135,7 @@ class ScanCodeTwoActivity : BaseActivity() {
         viewBinding.tvReturn.setOnClickListener {
             finish()
         }
-        AudioPlayer.getInstance().play(R.raw.diyiren_saoma)
+        AudioPlayer.getInstance().play(R.raw.first_qr_verify)
 
         handlerUtil.startTask(task, 10000)
 
@@ -155,9 +155,9 @@ class ScanCodeTwoActivity : BaseActivity() {
             finish()
         }
         if (count == 1) {
-            AudioPlayer.getInstance().play(R.raw.diyiren_saoma)
+            AudioPlayer.getInstance().play(R.raw.first_qr_verify)
         } else {
-            AudioPlayer.getInstance().play(R.raw.diyiren_saoma)
+            AudioPlayer.getInstance().play(R.raw.first_qr_verify)
         }
         mVoiceCount++
 
@@ -490,7 +490,7 @@ class ScanCodeTwoActivity : BaseActivity() {
             .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.AUTOMATIC))
             .error(R.mipmap.icon_zhan_wei)
             .into(viewBinding.imgView)
-        AudioPlayer.getInstance().play(R.raw.diyiren_saoma)
+        AudioPlayer.getInstance().play(R.raw.first_qr_verify)
     }
 
     // 使用 Glide 加载二维码到 ImageView
@@ -645,7 +645,7 @@ class ScanCodeTwoActivity : BaseActivity() {
             }
             return@setOnTouchListener false
         }
-        AudioPlayer.getInstance().play(R.raw.shuangren_tongguo)
+        AudioPlayer.getInstance().play(R.raw.verify_success)
     }
 
     private val countdownRunnable = object : Runnable {

app/src/main/java/xn/hxp/ui/verify/SwipeCodeTwoActivity.kt

@@ -120,7 +120,7 @@ class SwipeCodeTwoActivity : BaseActivity() {
             .load("${HttpConfig.API_BASE_IMG_URL}${ChemicalApp.confs!!.circularLogo}")
             .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.AUTOMATIC))
             .into(viewBinding.image)
-        AudioPlayer.getInstance().play(R.raw.diyiwei_shua_ka_renzheng)
+        AudioPlayer.getInstance().play(R.raw.first_card_verify)
 //        customDialogView(0,"请第一个人进行认证")
         // 定义一个定时任务  双人-刷卡认证
 //        val task = object : TimerTask() {
@@ -153,9 +153,9 @@ class SwipeCodeTwoActivity : BaseActivity() {
             finish()
         }
         if (count == 1) {
-            AudioPlayer.getInstance().play(R.raw.diyiwei_shua_ka_renzheng)
+            AudioPlayer.getInstance().play(R.raw.first_card_verify)
         } else {
-            AudioPlayer.getInstance().play(R.raw.dierweishuakarenzheng)
+            AudioPlayer.getInstance().play(R.raw.second_card_verify)
         }
         mVoiceCount++
 
@@ -498,7 +498,7 @@ class SwipeCodeTwoActivity : BaseActivity() {
             .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.AUTOMATIC))
             .error(R.mipmap.icon_zhan_wei)
             .into(viewBinding.imgView)
-        AudioPlayer.getInstance().play(R.raw.dierweishuakarenzheng)
+        AudioPlayer.getInstance().play(R.raw.first_card_verify)
     }
 
     //获取刷卡信息
@@ -619,7 +619,7 @@ class SwipeCodeTwoActivity : BaseActivity() {
             }
             return@setOnTouchListener false
         }
-        AudioPlayer.getInstance().play(R.raw.shuangren_tongguo)
+        AudioPlayer.getInstance().play(R.raw.verify_success)
     }
 
     private val countdownRunnable = object : Runnable {

app/src/main/java/xn/hxp/ui/verify/TwoPersonActivity.kt

@@ -151,7 +151,7 @@ class TwoPersonActivity : BaseActivity() {
             .logger(loggers(logcat(), fileLogger(this)))
             .build()
 
-        AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie)
+        AudioPlayer.getInstance().play(R.raw.first_face_verify)
         handlerBackTwo.post(countdownRunnableTwo)
         countHandler.postDelayed({
             finish()
@@ -560,7 +560,7 @@ class TwoPersonActivity : BaseActivity() {
             .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.AUTOMATIC))
             .error(R.mipmap.icon_zhan_wei)
             .into(viewBinding.imgView)
-        AudioPlayer.getInstance().play(R.raw.dierwei_renlianshibie)
+        AudioPlayer.getInstance().play(R.raw.first_face_verify)
     }
 
     private fun takePicture() {
@@ -708,7 +708,7 @@ class TwoPersonActivity : BaseActivity() {
             }
             return@setOnTouchListener false
         }
-        AudioPlayer.getInstance().play(R.raw.shuangren_tongguo)
+        AudioPlayer.getInstance().play(R.raw.verify_success)
     }
 
     private val countdownRunnable = object : Runnable {

app/src/main/java/xn/hxp/ui/verify/TwoVerificationActivity.kt

@@ -152,7 +152,7 @@ class TwoVerificationActivity : BaseActivity() {
             //初始化UI
             when (mCertificationType) {
                 1 -> { //人脸+刷卡
-                    AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie)
+                    AudioPlayer.getInstance().play(R.raw.first_face_verify)
                     viewBinding.scan.visibility = View.GONE
                     viewBinding.scanTwo.visibility = View.GONE
                     fotoapparatOpen()
@@ -160,7 +160,7 @@ class TwoVerificationActivity : BaseActivity() {
                 }
 
                 2 -> {//人脸+扫码
-                    AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie)
+                    AudioPlayer.getInstance().play(R.raw.first_face_verify)
                     viewBinding.campus.visibility = View.GONE
                     viewBinding.campusTwo.visibility = View.GONE
                     fotoapparatOpen()
@@ -168,7 +168,7 @@ class TwoVerificationActivity : BaseActivity() {
                 }
 
                 3 -> {//刷卡+扫码
-                    AudioPlayer.getInstance().play(R.raw.diyiwei_shua_ka_renzheng)
+                    AudioPlayer.getInstance().play(R.raw.first_card_verify)
                     mHandleScanEvent = false
                     mVerOne = 2
                     mVerTwo = 2
@@ -190,7 +190,7 @@ class TwoVerificationActivity : BaseActivity() {
                 }
 
                 4 -> {
-                    AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie)
+                    AudioPlayer.getInstance().play(R.raw.first_face_verify)
                     replaceOnes()
                     replaceTwos()
                     fotoapparatOpen()
@@ -202,7 +202,7 @@ class TwoVerificationActivity : BaseActivity() {
             LogUtils.i("======当前认证方式$mTag")
             when (mVerTyps) {
                 1 -> {
-                    AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie)
+                    AudioPlayer.getInstance().play(R.raw.first_face_verify)
                     //只有人脸
                     viewGones()
                     fotoapparatOpen()
@@ -210,7 +210,7 @@ class TwoVerificationActivity : BaseActivity() {
                 }
 
                 2 -> {
-                    AudioPlayer.getInstance().play(R.raw.diyiwei_shua_ka_renzheng)
+                    AudioPlayer.getInstance().play(R.raw.first_card_verify)
                     mHandleScanEvent = false
                     mVerOne = 2
                     mVerTwo = 2
@@ -232,7 +232,7 @@ class TwoVerificationActivity : BaseActivity() {
                 }
 
                 3 -> {
-                    AudioPlayer.getInstance().play(R.raw.diyiren_saoma)
+                    AudioPlayer.getInstance().play(R.raw.first_qr_verify)
                     mVerOne = 3
                     mVerTwo = 3
                     //只有扫码
@@ -284,15 +284,15 @@ class TwoVerificationActivity : BaseActivity() {
                 //第二个人的操作
                 when (mVerOne) {
                     1 -> {
-                        AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie)
+                        AudioPlayer.getInstance().play(R.raw.first_face_verify)
                     }
 
                     2 -> { //刷卡
-                        AudioPlayer.getInstance().play(R.raw.diyiwei_shua_ka_renzheng)
+                        AudioPlayer.getInstance().play(R.raw.first_card_verify)
                     }
 
                     3 -> {//扫码
-                        AudioPlayer.getInstance().play(R.raw.diyiren_saoma)
+                        AudioPlayer.getInstance().play(R.raw.first_qr_verify)
                     }
                 }
             } else {
@@ -300,17 +300,17 @@ class TwoVerificationActivity : BaseActivity() {
                 LogUtils.i("======当前认证方式$mTag")
                 when (mVerTyps) {
                     1 -> {
-                        AudioPlayer.getInstance().play(R.raw.diyiren_renlianshibie)
+                        AudioPlayer.getInstance().play(R.raw.first_face_verify)
                     }
 
                     2 -> {
                         //只有刷卡
-                        AudioPlayer.getInstance().play(R.raw.diyiwei_shua_ka_renzheng)
+                        AudioPlayer.getInstance().play(R.raw.first_card_verify)
                     }
 
                     3 -> {
                         //只有扫码
-                        AudioPlayer.getInstance().play(R.raw.diyiren_saoma)
+                        AudioPlayer.getInstance().play(R.raw.first_qr_verify)
                     }
                 }
             }
@@ -319,15 +319,15 @@ class TwoVerificationActivity : BaseActivity() {
                 //第二个人的操作
                 when (mVerTwo) {
                     1 -> { //关闭人脸
-                        AudioPlayer.getInstance().play(R.raw.dierwei_renlianshibie)
+                        AudioPlayer.getInstance().play(R.raw.second_face_verify)
                     }
 
                     2 -> { //刷卡
-                        AudioPlayer.getInstance().play(R.raw.dierweishuakarenzheng)
+                        AudioPlayer.getInstance().play(R.raw.second_card_verify)
                     }
 
                     3 -> {//扫码
-                        AudioPlayer.getInstance().play(R.raw.dierren_saoma)
+                        AudioPlayer.getInstance().play(R.raw.second_qr_verify)
                     }
                 }
             } else {
@@ -335,17 +335,17 @@ class TwoVerificationActivity : BaseActivity() {
                 LogUtils.i("======当前认证方式$mTag")
                 when (mVerTyps) {
                     1 -> {
-                        AudioPlayer.getInstance().play(R.raw.dierwei_renlianshibie)
+                        AudioPlayer.getInstance().play(R.raw.second_face_verify)
                     }
 
                     2 -> {
                         //只有刷卡
-                        AudioPlayer.getInstance().play(R.raw.dierweishuakarenzheng)
+                        AudioPlayer.getInstance().play(R.raw.second_card_verify)
                     }
 
                     3 -> {
                         //只有扫码
-                        AudioPlayer.getInstance().play(R.raw.shuangren_tongguo)
+                        AudioPlayer.getInstance().play(R.raw.verify_success)
                     }
                 }
             }
@@ -488,7 +488,7 @@ class TwoVerificationActivity : BaseActivity() {
             }
             return@setOnTouchListener false
         }
-        AudioPlayer.getInstance().play(R.raw.shuangren_tongguo)
+        AudioPlayer.getInstance().play(R.raw.verify_success)
     }
 
     private val countdownRunnable = object : Runnable {
@@ -789,7 +789,7 @@ class TwoVerificationActivity : BaseActivity() {
             //第二个人的操作
             when (mVerTwo) {
                 1 -> { //关闭人脸
-                    AudioPlayer.getInstance().play(R.raw.dierwei_renlianshibie)
+                    AudioPlayer.getInstance().play(R.raw.second_face_verify)
                     viewBinding.imgFace.visibility = View.GONE
                     try {
                         mFotoapparat.stop()
@@ -846,7 +846,7 @@ class TwoVerificationActivity : BaseActivity() {
                 }
 
                 2 -> { //刷卡
-                    AudioPlayer.getInstance().play(R.raw.dierweishuakarenzheng)
+                    AudioPlayer.getInstance().play(R.raw.second_card_verify)
                     mHandleScanEvent = false
                     when (mVerOne) {
                         1 -> {
@@ -889,7 +889,7 @@ class TwoVerificationActivity : BaseActivity() {
                 3 -> {//扫码
                     viewBinding.viewScanRoa.visibility = View.VISIBLE
                     viewBinding.imgRoa.visibility = View.VISIBLE
-                    AudioPlayer.getInstance().play(R.raw.dierren_saoma)
+                    AudioPlayer.getInstance().play(R.raw.second_qr_verify)
                     mHandleScanEvent = true
                     when (mVerOne) {
                         1 -> {
@@ -943,7 +943,7 @@ class TwoVerificationActivity : BaseActivity() {
             LogUtils.i("======当前认证方式$mTag")
             when (mVerTyps) {
                 1 -> {
-                    AudioPlayer.getInstance().play(R.raw.dierwei_renlianshibie)
+                    AudioPlayer.getInstance().play(R.raw.second_face_verify)
                     viewBinding.imgFace.visibility = View.GONE
                     //只有人脸
                     try {
@@ -981,13 +981,13 @@ class TwoVerificationActivity : BaseActivity() {
 
                 2 -> {
                     //只有刷卡
-                    AudioPlayer.getInstance().play(R.raw.dierweishuakarenzheng)
+                    AudioPlayer.getInstance().play(R.raw.second_card_verify)
                     mHandleScanEvent = false
                 }
 
                 3 -> {
                     //只有扫码
-                    AudioPlayer.getInstance().play(R.raw.shuangren_tongguo)
+                    AudioPlayer.getInstance().play(R.raw.verify_success)
                 }
             }
         }

app/src/main/java/xn/hxp/ui/warehousing/ChemicalLabelingActivity.kt

@@ -239,7 +239,7 @@ class ChemicalLabelingActivity : BaseActivity() {
                         }
                     } else {
                         //没有锁 不需要开锁
-                        AudioPlayer.getInstance().play(R.raw.quchuhuaxuepin)
+                        AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_hxp)
                     }
 
 //                    //不需要认证
@@ -266,7 +266,7 @@ class ChemicalLabelingActivity : BaseActivity() {
                     }
                 } else {
                     //没有锁 不需要开锁
-                    AudioPlayer.getInstance().play(R.raw.quchuhuaxuepin)
+                    AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_hxp)
                 }
             }
         }
@@ -369,7 +369,7 @@ class ChemicalLabelingActivity : BaseActivity() {
                     }
                 } else {
                     //没有锁 不需要开锁
-                    AudioPlayer.getInstance().play(R.raw.quchuhuaxuepin)
+                    AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_hxp)
                 }
                 Constants.AUTHENTICATION = false
             }
@@ -946,7 +946,7 @@ class ChemicalLabelingActivity : BaseActivity() {
                     dismissLoading()
                     //柜门已开去除化学品
                     customDialogView(1, "柜门已开，请取出化学品")
-                    AudioPlayer.getInstance().play(R.raw.bgm_qu_chu_hua_xue_p)
+                    AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_hxp)
                     handlerUtil.stopAllTasks()
                     countdownTimer?.cancel()
                     viewBinding.openLok.text = "再次开门"
@@ -1055,7 +1055,7 @@ class ChemicalLabelingActivity : BaseActivity() {
             dismissLoading()
             //柜门已开去除化学品
             customDialogView(1, "柜门已开，请取出化学品")
-            AudioPlayer.getInstance().play(R.raw.bgm_qu_chu_hua_xue_p)
+            AudioPlayer.getInstance().play(R.raw.gui_men_yi_kai_qu_chu_hxp)
             handlerUtil.stopAllTasks()
             countdownTimer?.cancel()
             viewBinding.openLok.text = "再次开门"

app/src/main/java/xn/hxp/utils/AudioPlayer.java

@@ -25,7 +25,7 @@ public class AudioPlayer {
         return instance;
     }
 
-    public void play(int audioResId) {
+    public synchronized void play(int audioResId) {
         if (mediaPlayer != null && currentAudioResId == audioResId) {
             if (!mediaPlayer.isPlaying()) {
                 mediaPlayer.start();

app/src/main/java/xn/hxp/utils/PrintTool.java

@@ -104,7 +104,7 @@ public enum PrintTool {
                     LogUtils.d("打印机文字成功");
                     if (AutoReplyPrint.INSTANCE.CP_Pos_HalfCutPaper(pointer)) {
                         LogUtils.d("打印机切割成功");
-                        AudioPlayer.getInstance().play(R.raw.huaxuepinbiaoqian);
+                        AudioPlayer.getInstance().play(R.raw.label_to_the_package);
                     } else {
                         ThreadUtils.runOnUiThread(() -> Toast.makeText(ActivityUtils.getTopActivity(), "打印机切割失败", Toast.LENGTH_LONG).show());
                     }
@@ -156,7 +156,7 @@ public enum PrintTool {
                     LogUtils.d("打印机文字成功");
                     if (AutoReplyPrint.INSTANCE.CP_Pos_HalfCutPaper(pointer)) {
                         LogUtils.d("打印机切割成功");
-                        AudioPlayer.getInstance().play(R.raw.huaxuepinbiaoqian);
+                        AudioPlayer.getInstance().play(R.raw.label_to_the_package);
                     } else {
                         ThreadUtils.runOnUiThread(() -> Toast.makeText(ActivityUtils.getTopActivity(), "打印机切割失败", Toast.LENGTH_LONG).show());
                     }

app/src/main/java/xn/hxp/weidith/AirBottleNewDialog.kt

@@ -48,7 +48,6 @@ class AirBottleNewDialog(private val ct: Context,private var rfids:String?,priva
                 dismiss()
             }
         }
-        AudioPlayer.getInstance().play(R.raw.xinrfidbiaoqian)
         mHandler.postDelayed({
             dismiss()
         }, 1000 * 15) // 15秒后关闭对话框

app/src/main/java/xn/hxp/weidith/LabelDialog.kt

@@ -218,7 +218,7 @@ class LabelDialog(
                 ILin.onItemClick(null, 1)
             }
         }
-        AudioPlayer.getInstance().play(R.raw.saomiaobiaoqian)
+        AudioPlayer.getInstance().play(R.raw.scan_label)
 //        customDialogView(0, "请扫描标签")
         butClos = findViewById<Button>(R.id.butClos)
 

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

serialport/.cxx/Debug/6e5q1f5t/x86/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log\
 Z
 XD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ÜÐþâÓ2

 ï“…‘Ò2Y
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	³ÐŸ‡Ô2

 ï“…‘Ò2Y
 W
-UD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\android_gradle_build.json	ÜÐþâÓ2
ô	 ô“…‘Ò2^
+UD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\android_gradle_build.json	³ÐŸ‡Ô2
ô	 ô“…‘Ò2^
 \
-ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\android_gradle_build_mini.json	ÜÐþâÓ2
ð –”…‘Ò2K
+ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\android_gradle_build_mini.json	³ÐŸ‡Ô2
ð –”…‘Ò2K
 I
-GD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\build.ninja	ÜÐþâÓ2
Õˆ
 “…‘Ò2O
+GD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\build.ninja	³ÐŸ‡Ô2
Õˆ
 “…‘Ò2O
 M
-KD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\build.ninja.txt	ÜÐþâÓ2T
+KD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\build.ninja.txt	³ÐŸ‡Ô2T
 R
-PD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\build_file_index.txt	ÜÐþâÓ2

? ™”…‘Ò2U
+PD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\build_file_index.txt	³ÐŸ‡Ô2

? ™”…‘Ò2U
 S
-QD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\compile_commands.json	ÜÐþâÓ2
¯ Á“…‘Ò2Y
+QD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\compile_commands.json	³ÐŸ‡Ô2
¯ Á“…‘Ò2Y
 W
-UD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\compile_commands.json.bin	ÜÐþâÓ2	
ü Á“…‘Ò2_
+UD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\compile_commands.json.bin	³ÐŸ‡Ô2	
ü Á“…‘Ò2_
 ]
-[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\metadata_generation_command.txt	ÜÐþâÓ2
+[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\metadata_generation_command.txt	³ÐŸ‡Ô2
 
€ ˜”…‘Ò2R
 P
-ND:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\prefab_config.json	ÜÐþâÓ2

( ˜”…‘Ò2W
+ND:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\prefab_config.json	³ÐŸ‡Ô2

( ˜”…‘Ò2W
 U
-SD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\symbol_folder_index.txt	ÜÐþâÓ2

R ™”…‘Ò2C
+SD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\x86\symbol_folder_index.txt	³ÐŸ‡Ô2

R ™”…‘Ò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