From d7ad5a3953a8cd001659092ebde204b881f94b9d Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 31 十月 2019 10:47:13 +0800
Subject: [PATCH] 2019-10-31-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 2d9f8b6..24b3a70 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -1371,8 +1371,7 @@
case DeviceType.DoorLock:
{
#region ------
- var doorlockifonlist = Send.ReadDoorLockIfon(common.DeviceAddr);
- //var list = Send.ReadDoorLockIfon(common.DeviceAddr);
+ var doorlockifonlist = await Send.UserListIfon(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);
@@ -1386,9 +1385,20 @@
///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
{
- membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
- membership.MembershipName = membershipifon.UserName;
+ var lockMode = new Send.LockMode();
+ lockMode.UserId = doorlockifonlist[j].DoorLockLocalUserId;
+ lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;
+ membership.UserIdMode.Add(lockMode);
membership.MembershipId = membershipifon.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(membershipifon.UserName))
+ {
+ membership.MembershipName = membershipifon.Account;
+ }
+ else
+ {
+ membership.MembershipName = membershipifon.UserName;
+
+ }
}
@@ -1396,7 +1406,7 @@
if (membership.UserIdMode.Count != 0)
{
///杩囨护鎺夐噸澶嶆暟鎹紱
- var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
+ var str = Send.UserList.Find((c) => { return c.MembershipId == membershipifon.SubAccountDistributedMark; });
if (str == null)
{
Send.UserList.Add(membership);
@@ -1413,7 +1423,6 @@
memberList.Show(common);
}
break;
-
case DeviceType.TemperatureSensor:
{
string current = Language.StringByID(MyInternationalizationString.current);
@@ -1451,12 +1460,12 @@
{
dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());
- Btntemperaturevalue.Text = current+">" + horizontalSeekBarVol.Progress.ToString() + "鈩�";
+ Btntemperaturevalue.Text = current + ">" + horizontalSeekBarVol.Progress.ToString() + "鈩�";
}
else
{
- Btntemperaturevalue.Text = current+"<" + horizontalSeekBarVol.Progress.ToString() + "%";
+ Btntemperaturevalue.Text = current + "<" + horizontalSeekBarVol.Progress.ToString() + "%";
dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//娓╁害鍊�
}
};
@@ -1470,12 +1479,12 @@
dictionary(deviceConditionsInfo, "Range", "0");//0澶т簬AttriButeData1鏃惰Е鍙戝姩浣�
dictionary(deviceConditionsInfo, "AttriButeData1", "0");
dictionary(deviceConditionsInfo, "AttriButeData2", "0");
- Btntemperaturevalue.Text = current+">0鈩�";
+ Btntemperaturevalue.Text = current + ">0鈩�";
}
else
{
- Btntemperaturevalue.Text = current+"<0%";
+ Btntemperaturevalue.Text = current + "<0%";
dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
dictionary(deviceConditionsInfo, "AttriButeId", "0");
dictionary(deviceConditionsInfo, "Range", "2");//2灏忎簬AttriButeData1鏃惰Е鍙戝姩浣�
@@ -1489,12 +1498,12 @@
if (temperatureSensor.SensorDiv == 1)
{
- Btntemperaturevalue.Text = current+">" + devices["AttriButeData1"] + "鈩�";
+ Btntemperaturevalue.Text = current + ">" + devices["AttriButeData1"] + "鈩�";
}
else
{
- Btntemperaturevalue.Text = current+"<" + devices["AttriButeData1"] + "%";
+ Btntemperaturevalue.Text = current + "<" + devices["AttriButeData1"] + "%";
}
}
--
Gitblit v1.8.0