From dbb7ccf8c75dd8d42e1efece3ce0ee498a42d54a Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Thu, 15 Jan 2026 11:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shelves/activity/HomeActivity.kt          | 19 ++++++++++++-------
 app/src/main/res/drawable/ripple_effect.xml   |  7 +++++++
 .../res/layout-sw600dp/list_item_shelf.xml    |  2 +-
 local.properties                              |  8 +++-----
 4 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/ripple_effect.xml

diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
index 5275f4f..e265ae5 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
@@ -79,7 +79,7 @@ class HomeActivity : BaseActivity() {
 
         //const val START_CMD= "${HEADER}0F01050020${FOOTER}"
 //        const val ACTIVE_CMD = "${HEADER}000281C5D70A7D428948AD7254FADBB1516738938B4B9CBD73673E9D8E7F2E15062D$FOOTER"
-        //410激活码
+//        410激活码
 //        const val ACTIVE_CMD = "${HEADER}000281C5D70A7D42894EA17650F5D0BB516838E7863C9ABD766C38958AFF0F3C062D${FOOTER}"
         //1楼餐厅激活码
         const val ACTIVE_CMD =
@@ -109,6 +109,9 @@ class HomeActivity : BaseActivity() {
         var showHumidity = "0"
     }
 
+    //401-false，1楼餐厅-true
+    private var isNeedOpenLock = true
+
     private lateinit var binding: ActivityHomeBinding
 
     private val viewModel: NetViewModel by viewModels()
@@ -401,7 +404,7 @@ class HomeActivity : BaseActivity() {
                     "${LOG_PREFIX}[温控信息上报]${cmdFlag}指令:${data}，发送应答指令:${respCmd}"
                 log(logMsg)
                 sendCmd(respCmd)
-                val tempC = HexUtils.signedHexToDec(data.substring(0, 4)) * 0.1
+                val tempC = HexUtils.signedHexToDec(data.take(4)) * 0.1
                 updateLeftStatus("$deviceName  ${"%.1f".format(tempC)}°C / -%")
 
                 //D6DADEDB1001015D020000000027001E00020000001E001C00B40000000000010000000100040000001900440003000F00000000000FFFE6000200010002FFD80044000300010005001E0001FFD80056001400280000000000000000008300090000003C00D2000000000000007F003700000000A100000031323136334238423134303233303456322E313100FFFF
@@ -610,11 +613,13 @@ class HomeActivity : BaseActivity() {
             setOnItemClickListener { _, _, position ->
                 shelfIndex = position
                 lifecycleScope.launch {
-                    val openCmd = if (list[position].deviceNo in 1..5)
-                        LEFT_SHELF_OPEN_CMD
-                    else
-                        RIGHT_SHELF_OPEN_CMD
-                    val openState = SerialPortManager.send(openCmd)
+                    if (isNeedOpenLock) {
+                        val openCmd = if (list[position].deviceNo in 1..5)
+                            LEFT_SHELF_OPEN_CMD
+                        else
+                            RIGHT_SHELF_OPEN_CMD
+                        val openState = SerialPortManager.send(openCmd)
+                    }
 //                    if (openState.not()) {
 //                        toast("${list[position].goodsName}柜门开启失败")
 //                        return@launch
diff --git a/app/src/main/res/drawable/ripple_effect.xml b/app/src/main/res/drawable/ripple_effect.xml
new file mode 100644
index 0000000..f176362
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_effect.xml
@@ -0,0 +1,7 @@
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <color android:color="@android:color/white" />
+    </item>
+</ripple>
diff --git a/app/src/main/res/layout-sw600dp/list_item_shelf.xml b/app/src/main/res/layout-sw600dp/list_item_shelf.xml
index 63b1f7f..d40843c 100644
--- a/app/src/main/res/layout-sw600dp/list_item_shelf.xml
+++ b/app/src/main/res/layout-sw600dp/list_item_shelf.xml
@@ -8,7 +8,7 @@
     android:layout_margin="12dp"
     app:cardBackgroundColor="@color/bg_card_blue"
     app:cardCornerRadius="12dp"
-    app:cardElevation="5dp"
+    app:cardElevation="0dp"
     app:rippleColor="#B0BEC5">
 
     <LinearLayout
diff --git a/local.properties b/local.properties
index 62c4a0c..0fe14f2 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=D\:\\Android\\sdk
\ No newline at end of file
+#Tue Jan 13 10:38:32 CST 2026
+sdk.dir=C\:\\Users\\HUAWEI\\AppData\\Local\\Android\\Sdk