From 863b530a1b95d59aee08d1cfa791ee8a1984596c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 05 十一月 2019 13:45:15 +0800
Subject: [PATCH] 2019-11-05-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 70 +++++++++++++----------------------
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 19 ++++-----
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/GateWay.Ios/Resources/Phone/.DS_Store | 0
5 files changed, 35 insertions(+), 56 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index b2ff7e0..b373bcf 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,13 +2,13 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
<Files>
- <File FileName="Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs" Line="45" Column="31" />
- <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1929" Column="22" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="17" Column="33" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="905" Column="14" />
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="718" Column="47" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="540" Column="65" />
+ <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="21" Column="110" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="897" Column="58" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -18,13 +18,10 @@
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="DoorLockLogic" expanded="True" />
- <Node name="LogicCommunalPage.cs" selected="True" />
+ <Node name="Send.cs" selected="True" />
</Node>
</Node>
- <Node name="UserCenter" expanded="True">
- <Node name="DoorLock" expanded="True" />
- </Node>
+ <Node name="UserCenter" expanded="True" />
<Node name="ZigBee" expanded="True">
<Node name="Device" expanded="True" />
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index afa26e9..58ca23f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Phone/.DS_Store b/ZigbeeApp/GateWay.Ios/Resources/Phone/.DS_Store
index 5d68855..a8659b7 100644
--- a/ZigbeeApp/GateWay.Ios/Resources/Phone/.DS_Store
+++ b/ZigbeeApp/GateWay.Ios/Resources/Phone/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index c5f558d..bc56662 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -16,23 +16,12 @@
Button selectedIcon = new Button();
public static Action action;
public static bool edit=false;
- Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
- Dictionary<string, string> userdictionary = new Dictionary<string, string>();
+
public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
{
- if (!edit)
- {
- deviceConditionsInfo.Add("Type", "1");
- deviceConditionsInfo.Add("IsValid", "1");
- deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
- deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
- deviceConditionsInfo.Add("Cluster_ID", "64529");
- deviceConditionsInfo.Add("AttriButeData1", "2");
- deviceConditionsInfo.Add("Range", "0");
- editdeviceConditionsInfo = deviceConditionsInfo;
- }
+
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -214,8 +203,8 @@
};
lockRow.AddChidren(Btncomplete);
#endregion
-
- string SelectedDeviceStatuscondition = "";
+ ///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
+ string userId = "", openMode = "", accountname="", SelectedDeviceStatuscondition = "";
lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
for (int i = 0; i < user.UserIdMode.Count; i++)
@@ -285,48 +274,27 @@
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
+ userId = userifon.UserId;
+ openMode = userifon.OpenMode.ToString();
+ accountname = Btntitle.Text + doorlockBtn.Text;
//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- if (deviceConditionsInfo.ContainsKey("AttriButeId"))
- {
- deviceConditionsInfo.Remove("AttriButeId");
- }
- if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
- {
- deviceConditionsInfo.Remove("AttriButeData2");
- }
- deviceConditionsInfo.Add("AttriButeId", userifon.OpenMode.ToString());
- deviceConditionsInfo.Add("AttriButeData2", userifon.UserId);
- if (userdictionary.ContainsKey("Account"))
- {
- userdictionary.Remove("Account");
- }
- if (userdictionary.ContainsKey("Type"))
- {
- userdictionary.Remove("Type");
- }
- if (userdictionary.ContainsKey("UserId"))
- {
- userdictionary.Remove("UserId");
- }
- userdictionary.Add("Account", Btntitle.Text+doorlockBtn.Text);
- userdictionary.Add("Type", "1");
- userdictionary.Add("UserId", userifon.UserId);
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
doorlockSelected.MouseUpEventHandler += doorlockclick;
doorlockfra.MouseUpEventHandler += doorlockclick;
- if (edit&&editdeviceConditionsInfo!=null)
+
+ if (edit && editdeviceConditionsInfo != null)
{
- deviceConditionsInfo = editdeviceConditionsInfo;
+
if (editdeviceConditionsInfo["AttriButeData2"] == userifon.UserId.ToString())
{
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
}
-
+
}
}
@@ -334,7 +302,21 @@
Btncomplete.MouseUpEventHandler += (sender3, e3) =>
{
-
+ var deviceConditionsInfo = new Dictionary<string, string>();
+ var userdictionary = new Dictionary<string, string>();
+ deviceConditionsInfo.Add("Type", "1");
+ deviceConditionsInfo.Add("IsValid", "1");
+ deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
+ deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
+ deviceConditionsInfo.Add("Cluster_ID", "64529");
+ deviceConditionsInfo.Add("AttriButeData1", "2");
+ deviceConditionsInfo.Add("Range", "0");
+ deviceConditionsInfo.Add("AttriButeId", openMode);
+ deviceConditionsInfo.Add("AttriButeData2", userId);
+ userdictionary.Add("Account",accountname);
+ userdictionary.Add("Type", "1");
+ userdictionary.Add("UserId", userId);
+
if (SelectedDeviceStatuscondition != "")
{
bool add = false;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 0d09b50..0d4d8b0 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -943,7 +943,7 @@
for (int j = 0; j < doorlockifonlist.Count; j++)
{
///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
- if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
+ if (membershipifon.SubAccountDistributedMark == doorlockifonlist[j].CloudAccountId)
{
LockMode lockMode = new LockMode();
lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;
--
Gitblit v1.8.0