From 29209469ac17d877eb92d008456b58ad901bfb58 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 30 十月 2019 14:37:42 +0800
Subject: [PATCH] 2019-10-30-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
old mode 100755
new mode 100644
index 59e67bb..2d9f8b6
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -1371,7 +1371,7 @@
case DeviceType.DoorLock:
{
#region ------
- var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
+ var doorlockifonlist = Send.ReadDoorLockIfon(common.DeviceAddr);
//var list = Send.ReadDoorLockIfon(common.DeviceAddr);
var pra = new UserCenter.MemberListInfoPra();
string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
@@ -1416,6 +1416,7 @@
case DeviceType.TemperatureSensor:
{
+ string current = Language.StringByID(MyInternationalizationString.current);
devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 * 2 - 20 - 50);
devicefra.Height = Application.GetRealHeight(140 + 160 * 2 + 20 + 50);
var temperatureSensor = common as TemperatureSensor;
@@ -1450,12 +1451,12 @@
{
dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());
- Btntemperaturevalue.Text = "褰撳墠>" + horizontalSeekBarVol.Progress.ToString() + "鈩�";
+ Btntemperaturevalue.Text = current+">" + horizontalSeekBarVol.Progress.ToString() + "鈩�";
}
else
{
- Btntemperaturevalue.Text = "褰撳墠<" + horizontalSeekBarVol.Progress.ToString() + "%";
+ Btntemperaturevalue.Text = current+"<" + horizontalSeekBarVol.Progress.ToString() + "%";
dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//娓╁害鍊�
}
};
@@ -1469,12 +1470,12 @@
dictionary(deviceConditionsInfo, "Range", "0");//0澶т簬AttriButeData1鏃惰Е鍙戝姩浣�
dictionary(deviceConditionsInfo, "AttriButeData1", "0");
dictionary(deviceConditionsInfo, "AttriButeData2", "0");
- Btntemperaturevalue.Text = "褰撳墠>0鈩�";
+ Btntemperaturevalue.Text = current+">0鈩�";
}
else
{
- Btntemperaturevalue.Text = "褰撳墠<0%";
+ Btntemperaturevalue.Text = current+"<0%";
dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
dictionary(deviceConditionsInfo, "AttriButeId", "0");
dictionary(deviceConditionsInfo, "Range", "2");//2灏忎簬AttriButeData1鏃惰Е鍙戝姩浣�
@@ -1488,12 +1489,12 @@
if (temperatureSensor.SensorDiv == 1)
{
- Btntemperaturevalue.Text = "褰撳墠>" + devices["AttriButeData1"] + "鈩�";
+ Btntemperaturevalue.Text = current+">" + devices["AttriButeData1"] + "鈩�";
}
else
{
- Btntemperaturevalue.Text = "褰撳墠<" + devices["AttriButeData1"] + "%";
+ Btntemperaturevalue.Text = current+"<" + devices["AttriButeData1"] + "%";
}
}
--
Gitblit v1.8.0