From 276b14dffead08293e951cc761be87436bdcf921 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 31 十月 2019 14:57:16 +0800
Subject: [PATCH] 2019-10-31-2
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index a511835..9d23eb6 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -1370,41 +1370,7 @@
break;
case DeviceType.DoorLock:
{
- #region ------
- 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);
- var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
- Send.UserList.Clear();
- for (int i = 0; i < listInfo.Count; i++)
- {
- var membership = new Send.MembershipIfon();
- var membershipifon = listInfo[i];
- for (int j = 0; j < doorlockifonlist.Count; j++)
- {
- ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
- if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
- {
- membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
- membership.MembershipName = membershipifon.UserName;
- membership.MembershipId = membershipifon.SubAccountDistributedMark;
-
- }
-
- }
- if (membership.UserIdMode.Count != 0)
- {
- ///杩囨护鎺夐噸澶嶆暟鎹紱
- var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
- if (str == null)
- {
- Send.UserList.Add(membership);
- }
- }
-
- }
- #endregion
+
var memberList = new MemberList();
UserView.HomePage.Instance.AddChidren(memberList);
@@ -1413,9 +1379,9 @@
memberList.Show(common);
}
break;
-
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 +1416,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 +1435,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 +1454,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