From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
index ff85b85..7ee279d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
@@ -156,11 +156,6 @@
             }
             else if (device.Type == DeviceType.PMSensor)
             {
-                //鍦ㄧ綉鍏虫病鏈夊洖澶嶄箣鍓�,榛樿绂荤嚎
-                if (device.HadReadDeviceStatu == false)
-                {
-                    return Language.StringByID(R.MyInternationalizationString.uOffLine);
-                }
                 //绌烘皵璐ㄩ噺
                 string curQuality = "";
                 //娓╁害
@@ -313,7 +308,7 @@
                     //鐑熼浘
                     if (ias.iASInfo?.Alarm1 == 1)
                     {
-                        return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+                        return Language.StringByID(R.MyInternationalizationString.uSmogAlarm);
                     }
                     return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
                 }
@@ -322,9 +317,9 @@
                     //pir
                     if (ias.iASInfo?.Alarm1 == 1)
                     {
-                        return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+                        return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
                     }
-                    return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
+                    return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
                 }
                 else if (info.ConcreteType == DeviceConcreteType.Sensor_Keyfob)
                 {
@@ -340,9 +335,9 @@
                     //杩愬姩浼犳劅鍣�
                     if (ias.iASInfo?.Alarm1 == 1)
                     {
-                        return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+                        return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
                     }
-                    return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
+                    return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
                 }
                 else if (info.ConcreteType == DeviceConcreteType.Sensor_EmergencyButton)
                 {
@@ -377,19 +372,19 @@
                 var tempera = device as TemperatureSensor;
                 if (tempera.SensorDiv == 1)
                 {
-                    if (tempera.Temperatrue == 0)
+                    if (tempera.currentTemperature == 0)
                     {
-                        return "--鈩�";
+                        return "0.0鈩�";
                     }
-                    return $"{tempera.Temperatrue}鈩�";
+                    return $"{tempera.currentTemperature}鈩�";
                 }
                 else if (tempera.SensorDiv == 2)
                 {
-                    if (tempera.Humidity == 0)
+                    if (tempera.currentHumidity == 0)
                     {
                         return "--%";
                     }
-                    return $"{tempera.Humidity}%";
+                    return $"{tempera.currentHumidity}%";
                 }
                 return null;
             }

--
Gitblit v1.8.0