From ca2041fe760509106981e84428de9b1f48c58f5e Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Mon, 18 Aug 2025 14:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/shuwei/intelligent/shelves/HomeActivity.kt  | 2 +-
 .../main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt | 3 ++-
 .../java/com/shuwei/intelligent/shelves/model/ShelfBody.kt    | 2 ++
 .../main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt | 4 ++--
 .../main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt
index 02241a0..5068f61 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt
@@ -73,7 +73,7 @@ class HomeActivity : BaseActivity() {
         var shelfIndex = 0
 //        public fun getRealWeight():Double = weightArray[shelfIndex]?:0.0
         // 温度
-        var showTemperatureC = ""
+        var showTemperatureC = "0"
         // 湿度
         var showHumidity = "0"
     }
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt
index 89c0be7..1a9de57 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt
@@ -125,7 +125,8 @@ class ShelfActivity : BaseActivity() {
                 goodsName = list[clickIndex].goodsName,
                 weight = realWeight / 1000.0,
                 overdueDay = list[clickIndex].overdueDay,
-                createTime = if (shelfModel?.goodsId == currentGoodsId) null else DateTimeUtil.formatDateTime(dateTime = Date())
+//                createTime = if (shelfModel?.goodsId == currentGoodsId) null else DateTimeUtil.formatDateTime(dateTime = Date())
+                createTime = DateTimeUtil.formatDateTime(dateTime = Date())
             )
             val intent = Intent().apply {
                 putExtra(SHELF_MODEL, data)
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfBody.kt b/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfBody.kt
index ee23f40..f35042b 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfBody.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfBody.kt
@@ -4,6 +4,8 @@ class ShelfBody {
 
     var deviceId: String = ""
     var canteenId: String = ""
+    var temperature: String? = null
+    var humidity: String = "0"
     var goodsList: List<ShelfModel>? = null
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt b/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt
index be54a1a..d80a96b 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt
@@ -2,8 +2,8 @@ package com.shuwei.intelligent.shelves.net
 
 object UrlConfig {
 
-    const val BASE_URL = "http://192.168.1.3:9002"
-//    const val BASE_URL = "https://yyjk.shuziweidao.com/gateway/"
+//    const val BASE_URL = "http://192.168.1.3:9002"
+    const val BASE_URL = "https://yyjk.shuziweidao.com/gateway/"
     const val GET_ACCESS_TOKEN = "restaurant/equipment/stEquipment/getEquipmentToken"
     const val GET_SHELF_LIST = "inventory/smartShelves/app/getShelvesListByDeviceId"
     const val GET_GOODS_LIST = "inventory/smartShelves/app/getGoodsPageList"
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt b/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt
index 89fae70..c0cb6d8 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt
@@ -45,6 +45,8 @@ class SyncTask(appContext: Context, workerParams: WorkerParameters) :
             val body = ShelfBody().also {
                 it.deviceId = App.getInstance().deviceId
                 it.canteenId = App.getInstance().canteenId
+                it.temperature = HomeActivity.showTemperatureC
+                it.humidity = HomeActivity.showHumidity
                 it.goodsList = submitList
             }
             val resp = apiService.saveShelfGoodsList(body)