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/Send.cs | 275 ++++++++++++++-----------
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 13
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 198 +++++++++++++++---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 22 +
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 33 +-
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs | 48 ----
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs | 20 +
8 files changed, 375 insertions(+), 234 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 5207081..d02ce45 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,14 +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/UserCenter/CommonBase/Logic/UserCenterLogic.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="920" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1377" Column="90" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="230" Column="32" />
- <File FileName="Shared/Common/CommonPage.cs" Line="271" Column="59" />
+ <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1381" Column="27" />
+ <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="313" Column="107" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="215" Column="83" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs" Line="16" Column="73" />
+ <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" Line="1379" Column="83" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -22,18 +21,21 @@
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
+ <Node name="Category" expanded="True" />
<Node name="Logic" expanded="True">
<Node name="DoorLockLogic" expanded="True" />
+ <Node name="TemplateDeviceCondition.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
<Node name="CommonBase" expanded="True">
- <Node name="Logic" expanded="True">
- <Node name="UserCenterLogic.cs" selected="True" />
- </Node>
+ <Node name="Common" expanded="True" />
</Node>
<Node name="DoorLock" expanded="True" />
</Node>
+ <Node name="ZigBee" expanded="True">
+ <Node name="Device" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index c21645f..1db2e15 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
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"] + "%";
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 577d841..b80464b 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -14,7 +14,7 @@
Button selectedIcon = new Button();
public int conditionsIndex = -1;
- public void Show()
+ public async void Show()
{
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
var topRowLayout = new RowLayout
@@ -34,8 +34,8 @@
Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
- //TextID = MyInternationalizationString.selection,
- Text = "閫夋嫨鐢ㄦ埛",
+ TextID = MyInternationalizationString.userlist,
+ //Text = "閫夋嫨鐢ㄦ埛",
};
topRowLayout.AddChidren(titleName);
@@ -76,26 +76,82 @@
};
this.AddChidren(middle);
-
- var userlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
- userlist.Clear();
+ var userlist = new List<Send.MembershipIfon>();
///鍒ゆ柇APP鐧诲綍杩涙潵鐢ㄦ埛韬唤(涓讳汉锛岀鐞嗗憳锛屾垚鍛�)
+ var doorlockifonlist = await Send.UserListIfon(LockIfon.DoorLock.DeviceAddr);
if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
{
- var list = LockIfon.GetUserIfon(LockIfon.UserMemberInfoRes.SubAccountDistributedMark);
- foreach (var o in list)
+ Send.MembershipIfon membershipIfon = new Send.MembershipIfon();
+ foreach (var o in doorlockifonlist)
{
- if (userlist.Count != 0)
+
+ if (o.CloudAccountId == LockIfon.UserMemberInfoRes.SubAccountDistributedMark)
{
- continue;
+ Send.LockMode lockMode = new Send.LockMode();
+ lockMode.OpenMode = o.OpenLockMode;
+ lockMode.UserId = o.DoorLockLocalUserId;
+ membershipIfon.UserIdMode.Add(lockMode);
+ membershipIfon.MembershipId = LockIfon.UserMemberInfoRes.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(LockIfon.UserMemberInfoRes.UserName))
+ {
+ membershipIfon.MembershipName = LockIfon.UserMemberInfoRes.Account;
+ }
+ else
+ {
+ membershipIfon.MembershipName = LockIfon.UserMemberInfoRes.UserName;
+ }
}
- userlist.Add(o);
+
}
+ userlist.Add(membershipIfon);
+
}
else
{
- userlist = LockIfon.GetUserList();
+ 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);
+ 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)
+ {
+ Send.LockMode lockMode = new Send.LockMode();
+ lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;
+ lockMode.UserId = doorlockifonlist[j].DoorLockLocalUserId;
+ membership.UserIdMode.Add(lockMode);
+ membership.MembershipId = membershipifon.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(membershipifon.UserName))
+ {
+ membership.MembershipName = membershipifon.Account;
+ }
+ else
+ {
+ membership.MembershipName = membershipifon.UserName;
+
+ }
+
+ }
+
+ }
+ if (membership.UserIdMode.Count != 0)
+ {
+ ///杩囨护鎺夐噸澶嶆暟鎹紱
+ var str = userlist.Find((c) => { return c.MembershipId == membershipifon.SubAccountDistributedMark; });
+ if (str == null)
+ {
+ userlist.Add(membership);
+ }
+ }
+
+ }
+
}
+
for (int i = 0; i < userlist.Count; i++)
{
var user = userlist[i];
@@ -118,12 +174,12 @@
var usernameBtn = new Button
{
- Text = user.UserName,
+ Text = user.MembershipName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(130),
- Tag = userlist[i].ConnectedAccount
+ Tag = userlist[i],
};
userRow.AddChidren(usernameBtn);
@@ -140,8 +196,7 @@
EventHandler<MouseEventArgs> userclick = (sender, e) =>
{
- var uesrifonlist = LockIfon.GetUserIfon(usernameBtn.Tag.ToString());
- SelectedUserID(uesrifonlist, usernameBtn.Text);
+ SelectedUserID(user.UserIdMode, usernameBtn.Text);
};
usernameBtn.MouseUpEventHandler += userclick;
btntimeback.MouseUpEventHandler += userclick;
@@ -155,9 +210,9 @@
/// <summary>
/// 閫夋嫨鏌愪釜鐢ㄦ埛
/// </summary>
- /// <param name="uesrifonlist">瑙﹀彂婧愬垪琛�</param>
+ /// <param name="membershipIfon">瑙﹀彂婧愬垪琛�</param>
/// <param name="userName">鐢ㄦ埛鍚嶅瓧</param>
- void SelectedUserID(List<ZigBee.Device.DoorLock.LocaDoorLockObj> uesrifonlist,string userName) {
+ void SelectedUserID(List<Send.LockMode> membershipIfon, string userName) {
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
@@ -236,13 +291,13 @@
#endregion
string SelectedLockStatus = "";
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * uesrifonlist.Count) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * uesrifonlist.Count) + 20 + 50);
+ lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.Count) - 20 - 50);
+ lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.Count) + 20 + 50);
///瀹氫箟涓や釜鍙橀噺璁板綍閫変腑鐘舵�侊紱
- int attriButeId = 0, attriButeData2 = 0;
- for (int j = 0; j < uesrifonlist.Count; j++)
+ string attriButeId ="", attriButeData2 ="";
+ for (int j = 0; j < membershipIfon.Count; j++)
{
- var userid = uesrifonlist[j];
+ var userIdmode = membershipIfon[j];
var doorlockfra = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -268,19 +323,19 @@
};
doorlockRow.AddChidren(doorlockBtn);
//(0鎸夐敭/3鍗�/15鎸囩汗)
- switch (userid.UnlockType)
+ switch (userIdmode.OpenMode.ToString())
{
- case 0:
+ case "0":
{
doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
}
break;
- case 3:
+ case "3":
{
doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
}
break;
- case 15:
+ case "15":
{
doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
}
@@ -300,7 +355,7 @@
};
doorlockRow.AddChidren(doorlockSelected);
- if ((uesrifonlist.Count - 1) == j)
+ if ((membershipIfon.Count - 1) == j)
{
doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
}
@@ -311,8 +366,8 @@
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- attriButeId = userid.UnlockType;
- attriButeData2 = userid.UserID;
+ attriButeId = userIdmode.OpenMode.ToString();
+ attriButeData2 = userIdmode.UserId;
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
@@ -322,7 +377,7 @@
if (conditionsIndex != -1)
{
var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex];
- if (s["AttriButeId"] == userid.UnlockType.ToString() && s["AttriButeData2"] == userid.UserID.ToString())
+ if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId)
{
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
@@ -339,8 +394,8 @@
lockConditionsInfo.Add("MacAddr", LockIfon.DoorLock.DeviceAddr);
lockConditionsInfo.Add("Epoint", LockIfon.DoorLock.DeviceEpoint.ToString());
lockConditionsInfo.Add("Cluster_ID", "64529");
- lockConditionsInfo.Add("AttriButeId", attriButeId.ToString());
- lockConditionsInfo.Add("AttriButeData2", attriButeData2.ToString());
+ lockConditionsInfo.Add("AttriButeId", attriButeId);
+ lockConditionsInfo.Add("AttriButeData2", attriButeData2);
lockConditionsInfo.Add("AttriButeData1", "2");
lockConditionsInfo.Add("Range", "0");
if (SelectedLockStatus != "")
@@ -373,5 +428,82 @@
lockLogicCommunalPage.Show(() => { });
};
}
+ /*
+ public async List<Send.MembershipIfon> readuserlist(){
+ var userlist = new List<Send.MembershipIfon>();
+ ///鍒ゆ柇APP鐧诲綍杩涙潵鐢ㄦ埛韬唤(涓讳汉锛岀鐞嗗憳锛屾垚鍛�)
+ var doorlockifonlist = await Send.UserListIfon(LockIfon.DoorLock.DeviceAddr);
+ if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
+ {
+ Send.MembershipIfon membershipIfon = new Send.MembershipIfon();
+ //var list = LockIfon.GetUserIfon(LockIfon.UserMemberInfoRes.SubAccountDistributedMark);
+ foreach (var o in doorlockifonlist)
+ {
+
+ if (o.CloudAccountId == LockIfon.UserMemberInfoRes.SubAccountDistributedMark)
+ {
+ membershipIfon.MembershipId = LockIfon.UserMemberInfoRes.SubAccountDistributedMark;
+ membershipIfon.UserIdMode.Add(o.OpenLockMode.ToString());
+ if (string.IsNullOrEmpty(LockIfon.UserMemberInfoRes.UserName))
+ {
+ membershipIfon.MembershipName = LockIfon.UserMemberInfoRes.Account;
+
+ }
+ else
+ {
+ membershipIfon.MembershipName = LockIfon.UserMemberInfoRes.UserName;
+
+ }
+ }
+
+ }
+ userlist.Add(membershipIfon);
+
+ }
+ else
+ {
+ 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);
+ 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.MembershipId = membershipifon.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(membershipifon.UserName))
+ {
+ membership.MembershipName = membershipifon.Account;
+ }
+ else
+ {
+ membership.MembershipName = membershipifon.UserName;
+
+ }
+
+ }
+
+ }
+ if (membership.UserIdMode.Count != 0)
+ {
+ ///杩囨护鎺夐噸澶嶆暟鎹紱
+ var str = userlist.Find((c) => { return c.MembershipId == membership.MembershipId; });
+ if (str == null)
+ {
+ userlist.Add(membership);
+ }
+ }
+
+ }
+
+ }
+ return userlist;
+ }
+ */
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
index 1d13ab0..6a1ce2a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
@@ -9,55 +9,11 @@
/// <summary>
/// 褰撳墠闂ㄩ攣
/// </summary>
- public static ZigBee.Device.DoorLock DoorLock=null;
+ public static ZigBee.Device.DoorLock DoorLock = null;
/// <summary>
- /// 褰撳墠鎴愬憳鐨勪俊鎭�
+ /// 褰撳墠鐢ㄦ埛鐨勪俊鎭�
/// </summary>
public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
- /// <summary>
- /// 鑾峰彇闂ㄩ攣鎵�鏈夌殑鎴愬憳
- /// </summary>
- /// <returns></returns>
- public static List<ZigBee.Device.DoorLock.LocaDoorLockObj> GetUserList()
- {
- var locaDoorLockObjlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
- locaDoorLockObjlist.Clear();
- foreach (var dictionary in DoorLock.localDoorLockUserList)
- {
- if (string.IsNullOrEmpty(dictionary.Value.ConnectedAccount)) {
- //涓嶇煡閬撲紶杩囨潵ConnectedAccount涓轰粈涔堜负绌猴紝闃叉鎶涘紓甯革紱
- continue;
- }
- var @null = locaDoorLockObjlist.Find((o) => { return o.ConnectedAccount == dictionary.Value.ConnectedAccount; });
- if (@null == null)
- {
- locaDoorLockObjlist.Add(dictionary.Value);
- }
- }
- return locaDoorLockObjlist;
- }
- /// <summary>
- /// 鑾峰彇闂ㄩ攣鏌愪釜鎴愬憳鐨勪俊鎭�
- /// </summary>
- /// <returns></returns>
- public static List<ZigBee.Device.DoorLock.LocaDoorLockObj> GetUserIfon(string SubAccountDistributedMark)
- {
- var locaDoorLockObjlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
- locaDoorLockObjlist.Clear();
- foreach (var dictionary in DoorLock.localDoorLockUserList)
- {
- if (string.IsNullOrEmpty(dictionary.Value.ConnectedAccount))
- {
- //涓嶇煡閬撲紶杩囨潵ConnectedAccount涓轰粈涔堜负绌猴紝闃叉鎶涘紓甯革紱
- continue;
- }
- if (dictionary.Value.ConnectedAccount ==SubAccountDistributedMark)
- {
- locaDoorLockObjlist.Add(dictionary.Value);
- }
- }
- return locaDoorLockObjlist;
- }
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 39fe971..763516c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -211,7 +211,7 @@
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
for (int i = 0; i < user.UserIdMode.Count; i++)
{
- var userid = user.UserIdMode[i];
+ var userifon = user.UserIdMode[i];
var doorlockfra = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -237,8 +237,7 @@
};
doorlockRow.AddChidren(doorlockBtn);
//(1鎸夐敭/3鍗�/15鎸囩汗)
- string[] s = userid.Split('_');
- switch (s[1])
+ switch (userifon.OpenMode.ToString())
{
case "0":
{
@@ -286,8 +285,8 @@
{
deviceConditionsInfo.Remove("AttriButeData2");
}
- deviceConditionsInfo.Add("AttriButeId", s[1]);
- deviceConditionsInfo.Add("AttriButeData2", s[0]);
+ deviceConditionsInfo.Add("AttriButeId", userifon.OpenMode.ToString());
+ deviceConditionsInfo.Add("AttriButeData2", userifon.UserId);
if (userdictionary.ContainsKey("Account"))
{
@@ -303,7 +302,7 @@
}
userdictionary.Add("Account", Btntitle.Text+doorlockBtn.Text);
userdictionary.Add("Type", "1");
- userdictionary.Add("UserId", s[0]);
+ userdictionary.Add("UserId", userifon.UserId);
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
@@ -311,7 +310,7 @@
doorlockfra.MouseUpEventHandler += doorlockclick;
if (edit)
{
- if (editdeviceConditionsInfo["AttriButeData2"] == s[1])
+ if (editdeviceConditionsInfo["AttriButeData2"] == userifon.OpenMode.ToString())
{
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 061d345..54081cb 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -609,7 +609,7 @@
logic.IsEnable = int.Parse(Logicifon["IsEnable"].ToString());
logic.LogicName = Logicifon["LogicName"].ToString();
logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
- logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
+ logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
@@ -712,12 +712,12 @@
return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
}
-# endregion
+ #endregion
#region ----鑾峰彇闂ㄩ攣
- public static List<DoorLock> ReadDoorLockIfon(string doorlockMac)
+ public static List<LogicLock> ReadDoorLockIfon(string doorlockMac)
{
- List<DoorLock> list = new List<DoorLock>();
+ List<LogicLock> list = new List<LogicLock>();
string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager";//瀛愯处鍙峰拰涓昏处鍙峰彲鑳介摼鎺ヤ笉鍚�
System.Net.WebClient webClient = new System.Net.WebClient();
System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
@@ -784,9 +784,9 @@
}
- public static List<DoorLock> ReadToken(Residential residential)
+ public static List<LogicLock> ReadToken(Residential residential)
{
- List<DoorLock> list = new List<DoorLock>();
+ List<LogicLock> list = new List<LogicLock>();
string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
System.Net.WebClient webClient = new System.Net.WebClient();
System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
@@ -829,9 +829,9 @@
return list;
}
- public static List<DoorLock> ReadDoorLock(Residential lockifon)
+ public static List<LogicLock> ReadDoorLock(Residential lockifon)
{
- List<DoorLock> list = new List<DoorLock>();
+ List<LogicLock> list = new List<LogicLock>();
System.Net.WebClient webClient = new System.Net.WebClient();
System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
postValues.Add("RequestVersion", CommonPage.RequestVersion);
@@ -856,7 +856,7 @@
for (int i = 0; i < datalist.Count; i++)
{
var data = JObject.Parse(datalist[i].ToString());
- DoorLock doorLock = new DoorLock();
+ LogicLock doorLock = new LogicLock();
doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString();
doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString());
doorLock.CloudAccountId = data["CloudAccountId"].ToString();
@@ -864,13 +864,13 @@
}
}
- catch(Exception e)
+ catch (Exception e)
{
var s = e.Message;
}
});
- var datetime = DateTime.Now;
+ var datetime = DateTime.Now;
while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
{
if (list.Count != 0)
@@ -881,54 +881,17 @@
return list;
}
- public class Residential
+
+
+
+
+ #region ---绗�2绉�
+
+ public static async System.Threading.Tasks.Task<List<LogicLock>> UserListIfon(string doorlockMac)
{
- public string Id = string.Empty;
- public bool IsOthreShare;
- public string MainUserDistributedMark = string.Empty;
- public string Url = string.Empty;
- public string Token = string.Empty;
- public bool IsOtherAccountCtrl;
- public string doorlockmac;
- }
-
- public class DoorLock
- {
- public string DoorLockLocalUserId = string.Empty;
- public int OpenLockMode;
- public string CloudAccountId = string.Empty;
- /// <summary>
- /// 韬唤+瑙﹀彂婧�(0鎸夐敭/3鍗�/15鎸囩汗)
- /// </summary>
- public string UserIdMode
- {
- get
- {
- return DoorLockLocalUserId + "_" + OpenLockMode.ToString();
- }
- }
- }
-
- public class MembershipIfon
- {
- public string MembershipId = string.Empty;
- public List<string> UserIdMode = new List<string>();
- public string MembershipName = string.Empty;
- }
-
- public static List<MembershipIfon> UserList = new List<MembershipIfon>();
-
-
- #endregion
- /*
- public async System.Threading.Tasks.Task<List<>> a()
- {
- string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager";
- System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
- var str = await WebClientAsync(postValues, url);
- var jObject = JObject.Parse(str);
+ List<LogicLock> list = new List<LogicLock>();
+ var s = await ReadUserList(doorlockMac);
+ var jObject = JObject.Parse(s);
if (jObject == null || jObject["StateCode"].ToString() != "Success")
{
return null;
@@ -938,63 +901,19 @@
for (int i = 0; i < datalist.Count; i++)
{
var data = JObject.Parse(datalist[i].ToString());
- if (Config.Instance.HomeId == data["Id"].ToString())
- {
- Residential residential = new Residential();
-
- if (Convert.ToBoolean(data["IsOthreShare"].ToString()))
- {
- //鍒嗕韩鑰匢D
- residential.Id = data["Id"].ToString();
- //鏄惁鏄垎浜处鍙穂true(鏄垎浜�);false;(涓嶆槸鍒嗕韩)];
- residential.IsOthreShare = Convert.ToBoolean(data["IsOthreShare"].ToString());
- //鍒嗕韩鑰呬綇瀹匢D
- residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
- residential.IsOtherAccountCtrl = true;
- //residential.doorlockmac = doorlockMac;
- //list = ReadToken(residential);
- }
- else
- {
- residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
- residential.Token = Config.Instance.Token;
- residential.Id = Config.Instance.HomeId;
- residential.IsOtherAccountCtrl = false;
- //residential.doorlockmac = doorlockMac;
- //list = ReadDoorLock(residential);
-
- }
- }
-
+ LogicLock doorLock = new LogicLock();
+ doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString();
+ doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString());
+ doorLock.CloudAccountId = data["CloudAccountId"].ToString();
+ list.Add(doorLock);
}
+ return list;
}
- public async System.Threading.Tasks.Task<string> aa(int value, string url, Residential residential = null)
+ public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
{
- NameValueCollection postValues = new NameValueCollection();
- if (value == 1)
- {
-
- }
- else if (value == 2)
- {
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("LoginAccessToken", Config.Instance.Token);
- postValues.Add("MainAccountId", residential.MainUserDistributedMark);
- postValues.Add("SharedHid", residential.Id);
- }
- else
- {
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
-
- }
- return await WebClientAsync(postValues, url);
- }
-
- public async System.Threading.Tasks.Task<string> aaa(NameValueCollection postValues, string url)
- {
- var str = await aa(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
+ string s = null;
+ var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
var jObject = JObject.Parse(str);
if (jObject == null || jObject["StateCode"].ToString() != "Success")
{
@@ -1017,10 +936,9 @@
//鍒嗕韩鑰呬綇瀹匢D
residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
residential.IsOtherAccountCtrl = true;
- //residential.doorlockmac = doorlockMac;
- //list = ReadToken(residential);
-
- var str = await WebClientAsync(residential, postValues, url);
+ residential.doorlockmac = doorlockMac;
+ residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
+ s = await ReadUserDoorLock(residential);
}
else
{
@@ -1028,13 +946,34 @@
residential.Token = Config.Instance.Token;
residential.Id = Config.Instance.HomeId;
residential.IsOtherAccountCtrl = false;
- //residential.doorlockmac = doorlockMac;
- var str = await WebClientAsync(postValues, url);
-
+ residential.doorlockmac = doorlockMac;
+ s = await WebClientAsync(2, residential.Url, residential);
}
- }
+ }
}
+ return s;
+ }
+
+ public static async System.Threading.Tasks.Task<string> ReadUserDoorLock(Residential residential)
+ {
+
+ var s = await WebClientAsync(1, residential.Url, residential);
+
+ var jObject = JObject.Parse(s);
+ if (jObject == null || jObject["StateCode"].ToString() != "Success")
+ {
+ return null;
+ }
+ var RequestBaseUrl = jObject["ResponseData"]["RequestBaseUrl"].ToString();
+ var RequestToken = jObject["ResponseData"]["RequestToken"].ToString();
+ Residential lockifon = new Residential();
+ lockifon.Url = RequestBaseUrl + "/DoorLock/GetDoorLockPager";
+ lockifon.Token = RequestToken;
+ lockifon.Id = Config.Instance.HomeId;
+ lockifon.IsOtherAccountCtrl = true;
+ lockifon.doorlockmac = residential.doorlockmac;
+ return await WebClientAsync(2, lockifon.Url, lockifon);
}
/// <summary>
@@ -1043,13 +982,107 @@
/// <param name="postValues">post鍙傛暟</param>
/// <param name="url"></param>
/// <returns></returns>
- public async System.Threading.Tasks.Task<string> WebClientAsync(NameValueCollection postValues, string url)
+ public static async System.Threading.Tasks.Task<string> WebClientAsync(int value, string url, Residential residential = null)
{
+
+ NameValueCollection postValues = new NameValueCollection();
+ if (value == 0)
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
+ }
+ else if (value == 1)
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("LoginAccessToken", Config.Instance.Token);
+ postValues.Add("MainAccountId", residential.MainUserDistributedMark);
+ postValues.Add("SharedHid", residential.Id);
+ }
+ else if (value == 2)
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("LoginAccessToken", residential.Token);
+ postValues.Add("HomeId", residential.Id);
+ postValues.Add("DoorLockId", residential.doorlockmac);//闂ㄩ攣Mac
+ postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
+ }
System.Net.WebClient webClient = new System.Net.WebClient();
byte[] responseArray = webClient.UploadValues(url, postValues);
return System.Text.Encoding.UTF8.GetString(responseArray);
}
- */
+ #endregion
+
+ public class Residential
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string Id = string.Empty;
+ /// <summary>
+ /// 褰撳墠浣忓畢鏄笉鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨�
+ /// </summary>
+ public bool IsOthreShare;
+ /// <summary>
+ /// 褰撳墠浣忓畢鏄笉鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
+ /// </summary>
+ public string MainUserDistributedMark = string.Empty;
+ public string Url = string.Empty;
+ public string Token = string.Empty;
+ public bool IsOtherAccountCtrl;
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣mac
+ /// </summary>
+ public string doorlockmac;
+ }
+
+ public class LogicLock
+ {
+ /// <summary>
+ /// 瑙﹀彂婧怚D
+ /// </summary>
+ public string DoorLockLocalUserId = string.Empty;
+ /// <summary>
+ /// 瑙﹀彂婧愭ā寮�(0:瀵嗙爜;3:鍗�;15:鎸囩汗;)
+ /// </summary>
+ public int OpenLockMode;
+ /// <summary>
+ /// 璇嗗埆鐢ㄦ埛韬唤
+ /// </summary>
+ public string CloudAccountId = string.Empty;
+ }
+
+ public class MembershipIfon
+ {
+ /// <summary>
+ /// 璇嗗埆鐢ㄦ埛韬唤
+ /// </summary>
+ public string MembershipId = string.Empty;
+ /// <summary>
+ /// 瑙﹀彂婧怚D+妯″紡(0:瀵嗙爜;3:鍗�;15:鎸囩汗;)
+ /// </summary>
+ public List<LockMode> UserIdMode = new List<LockMode>();
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string MembershipName = string.Empty;
+ }
+
+ public class LockMode
+ {
+ /// <summary>
+ /// 瑙﹀彂婧怚D
+ /// </summary>
+ public string UserId = string.Empty;
+ /// <summary>
+ /// 瑙﹀彂婧愭ā寮�(0:瀵嗙爜;3:鍗�;15:鎸囩汗;)
+ /// </summary>
+ public int OpenMode;
+
+ }
+
+ public static List<MembershipIfon> UserList = new List<MembershipIfon>();
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
index 1489f2e..074389f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -1361,8 +1361,7 @@
case DeviceType.DoorLock:
{
#region ------
- var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
- //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);
@@ -1376,9 +1375,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;
+
+ }
}
@@ -1386,7 +1396,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);
--
Gitblit v1.8.0