From eaafeab1d8616b3862ffd478dace13433e048045 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Fri, 5 Sep 2025 15:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=99=E9=A2=9D=E4=B8=8D?=
 =?UTF-8?q?=E8=B6=B3=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  13 +----
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   2 +-
 .../sw/platecabinet/activity/BaseActivity.kt  |   8 +++
 .../activity/LoginByPwdActivity.kt            |   4 ++
 .../dialog/BalanceNotEnoughDialog.kt          |  36 ++++++++++++
 .../model/response/EquipmentUserInfo.kt       |  12 +++-
 .../res/layout/dialog_balance_not_enough.xml  |  53 ++++++++++++++++++
 app/swkey.jks                                 | Bin 0 -> 2190 bytes
 9 files changed, 115 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/com/sw/platecabinet/dialog/BalanceNotEnoughDialog.kt
 create mode 100644 app/src/main/res/layout/dialog_balance_not_enough.xml
 create mode 100644 app/swkey.jks

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 34febdd..b268ef3 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -2,18 +2,7 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
-      <SelectionState runConfigName="SmartPlateCabinet.app">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-07-25T08:39:03.160022800Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="Default" identifier="serial=?;connection=93a2ccce" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-      <SelectionState runConfigName="LoginByFaceActivity">
+      <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
     </selectionStates>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ea5d566..f94744b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="17" />
+        <option name="gradleJvm" value="azul-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bccf3fc..e236b7d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="zulu-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
index 0bdee70..8bf3b4b 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
@@ -23,6 +23,7 @@ import com.sw.plate.utils.comn.SerialApi
 import com.sw.plate.utils.comn.SerialPortManager
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
 import com.sw.platecabinet.ext.setClickListeners
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.PermissionHelper
@@ -315,6 +316,13 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
      */
     open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
         Timber.d("handleLoginSuccess isAdmin = $isAdmin")
+        val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble()
+        equipmentUserInfo.balanceIsNotEnough = cardBalance <= 0.toDouble()
+        if (equipmentUserInfo.balanceIsNotEnough) {
+            //提示余额不足弹窗
+            BalanceNotEnoughDialog(this).show()
+            return
+        }
         viewModel.resetUserInfo()
         if (equipmentUserInfo.isOtherEquipment()) {
             MainActivity.start(
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
index 6171368..e9f52c1 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import com.sw.plate.utils.ToastUtils
 import com.sw.platecabinet.databinding.ActivityLoginByPwdBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.KeyboardUtils
 
@@ -44,6 +45,9 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
 
     override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
         super.handleLoginSuccess(equipmentUserInfo, isAdmin)
+        if (equipmentUserInfo.balanceIsNotEnough) {
+            return
+        }
         LoginByFaceActivity.goInitActivity()
         finish()
     }
diff --git a/app/src/main/java/com/sw/platecabinet/dialog/BalanceNotEnoughDialog.kt b/app/src/main/java/com/sw/platecabinet/dialog/BalanceNotEnoughDialog.kt
new file mode 100644
index 0000000..30c9ff9
--- /dev/null
+++ b/app/src/main/java/com/sw/platecabinet/dialog/BalanceNotEnoughDialog.kt
@@ -0,0 +1,36 @@
+package com.sw.platecabinet.dialog
+
+import android.app.Dialog
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Window
+import androidx.fragment.app.FragmentActivity
+import com.sw.platecabinet.databinding.DialogBalanceNotEnoughBinding
+import com.sw.platecabinet.ext.dp
+
+open class BalanceNotEnoughDialog(
+    private var activity: FragmentActivity
+) : Dialog(activity) {
+
+    private lateinit var binding: DialogBalanceNotEnoughBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        binding = DialogBalanceNotEnoughBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        window?.run {
+            attributes = attributes.apply {
+                width = 480.dp
+            }
+            setBackgroundDrawable(ColorDrawable())
+            setCancelable(false)
+        }
+        addListener()
+    }
+
+    private fun addListener() {
+        binding.tvConfirm.setOnClickListener { dismiss() }
+    }
+
+}
diff --git a/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt b/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt
index 0211ac2..8e31904 100644
--- a/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt
+++ b/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt
@@ -5,6 +5,7 @@ import android.os.Parcelable
 import android.text.TextUtils
 import com.google.gson.annotations.SerializedName
 import com.sw.platecabinet.GlobalData
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -58,7 +59,16 @@ data class EquipmentUserInfo(
      * 更新时间
      */
     @SerializedName("updateTime")
-    val updateTime: String? = ""
+    val updateTime: String? = "",
+
+
+    @SerializedName("cardBalance")
+    var cardBalance: Double? = 0.toDouble(),
+
+    /**
+     * 用于cardBalance后续拦截判断
+     */
+    var balanceIsNotEnough: Boolean = false
 ) : Parcelable {
 
     /**
diff --git a/app/src/main/res/layout/dialog_balance_not_enough.xml b/app/src/main/res/layout/dialog_balance_not_enough.xml
new file mode 100644
index 0000000..c1f11f4
--- /dev/null
+++ b/app/src/main/res/layout/dialog_balance_not_enough.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/dialogContainer"
+    android:layout_width="480dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top"
+    android:layout_marginTop="0dp"
+    android:background="@drawable/bg_dialog"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:ignore="HardcodedText">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:src="@drawable/ic_tip_warn_unbind" />
+
+    <TextView
+        android:id="@+id/tv_tip_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="余额不足"
+        android:textColor="#ffffffff"
+        android:textSize="28sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="请通过小程序或到柜台充值后使用"
+        android:textColor="#ff999999"
+        android:textSize="24sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="30dp"
+        android:background="#ff333333" />
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:gravity="center"
+        android:text="知道了"
+        android:textColor="#ffffcc99"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/swkey.jks b/app/swkey.jks
new file mode 100644
index 0000000000000000000000000000000000000000..893b6eb53737814ab377af4fea8cabba0792e39a
GIT binary patch
literal 2190
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
ZXw7F|m9*9v`7ag=aSe-0Uyo%o{2L=&%=G{O

literal 0
HcmV?d00001