From dc7747b7997222a58ced3017bcfcf53c45e21359 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 05 十一月 2019 15:27:25 +0800
Subject: [PATCH] 2019-11-05-2
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index bc56662..9077c94 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -302,6 +302,7 @@
Btncomplete.MouseUpEventHandler += (sender3, e3) =>
{
+ string userIdstr = "", openModestr="";
var deviceConditionsInfo = new Dictionary<string, string>();
var userdictionary = new Dictionary<string, string>();
deviceConditionsInfo.Add("Type", "1");
@@ -316,7 +317,16 @@
userdictionary.Add("Account",accountname);
userdictionary.Add("Type", "1");
userdictionary.Add("UserId", userId);
-
+ if (edit)
+ {
+ openModestr = editdeviceConditionsInfo["AttriButeId"];
+ userIdstr = editdeviceConditionsInfo["AttriButeData2"];
+ }
+ else
+ {
+ openModestr = deviceConditionsInfo["AttriButeId"];
+ userIdstr = deviceConditionsInfo["AttriButeData2"];
+ }
if (SelectedDeviceStatuscondition != "")
{
bool add = false;
@@ -326,13 +336,13 @@
{
if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
{
- if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == editdeviceConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == editdeviceConditionsInfo["AttriButeData2"])
+ if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == openModestr && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == userIdstr)
{
Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
Common.Logic.CurrentLogic.Conditions.Insert(i, deviceConditionsInfo);
for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
{
- if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == editdeviceConditionsInfo["AttriButeData2"])
+ if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == userIdstr)
{
Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
--
Gitblit v1.8.0