From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 465 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 313 insertions(+), 152 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
old mode 100644
new mode 100755
index 06fc920..deb3564
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -8,17 +8,19 @@
namespace Shared.Phone.Device.Logic
{
- public class SkipView
+ public class SkipView:FrameLayout
{
+
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
/// </summary>
- public static void SkipAddLogic(int intvalue,UserCenter.MemberInfoRes accountObj = null,DoorLock doorLock=null)
+ public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
{
- /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.Sone闂ㄩ攣;
switch (intvalue)
{
- case 0: {
+ case 0:
+ {
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -29,59 +31,62 @@
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
- } break;
- case 1: {
+ }
+ break;
+ case 1:
+ {
//杩涘叆闂ㄩ攣鑱斿姩浜嬩欢鍏ュ彛
- Send.UserMemberInfoRes = accountObj;
- Send.CurrentDoorLock = doorLock;
- if (accountObj == null)
- {
- ///闃叉鎶涘紓甯�
- Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
- }
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- Send.CurrentDoorLock = new DoorLock();
- }
- ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- var doorLockLogicList = new DoorLockLogic.LockLogicList();
- UserView.HomePage.Instance.AddChidren(doorLockLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- doorLockLogicList.Show();
- } break;
- case 2: {
- //new涓�涓柊閫昏緫瀵硅薄锛�
- //鏂板闂ㄩ攣甯稿紑妯″紡鑷姩鍖栧叆鍙ｏ紱
- Common.Logic.CurrentLogic = new Common.Logic();
- Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
- Common.Logic.CurrentLogic.LogicType = 2;//鏍囪閫昏緫绫诲瀷
- Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ Send.UserMemberInfoRes = accountObj;
+ Send.CurrentDoorLock = doorLock;
+ if (accountObj == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
+ }
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Send.CurrentDoorLock = new DoorLock();
+ }
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ var doorLockLogicList = new DoorLockLogic.LockLogicList();
+ UserView.HomePage.Instance.AddChidren(doorLockLogicList);
UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
- } break;
+ doorLockLogicList.Show();
+ }
+ break;
+
}
}
-
-
#region 鈼� 鑷姩鍖朹_________________________
-
+ public static bool If_once = true;//杩涙潵鍙涓�娆℃爣璇�;
/// <summary>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
/// </summary>
public static void ShowAutotionView(FrameLayout functionSceneAutoBodyView)
{
- // functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ //functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region ---鎺ㄨ崘妯℃澘鐨勭粍浠�
//鎺ㄨ崘妯℃澘鑳屾櫙鎺т欢
+
+
+ var bjFrameLayout1 = new FrameLayout
+ {
+ Width = Application.GetRealWidth(1080 - 58),
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ X = Application.GetRealWidth(58),
+ //Radius = (uint)Application.GetRealHeight(50),
+ Y = Application.GetRealHeight(30),
+
+ };
+ functionSceneAutoBodyView.AddChidren(bjFrameLayout1);
var bjFrameLayout = new FrameLayout
{
Width = Application.GetRealWidth(1080 - 58),
@@ -90,10 +95,10 @@
X = Application.GetRealWidth(58),
//Radius = (uint)Application.GetRealHeight(50),
Y = Application.GetRealHeight(30),
-
};
functionSceneAutoBodyView.AddChidren(bjFrameLayout);
- bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+ bjFrameLayout1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
+ bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerBottomLeft);
//鍥炬爣鎺т欢
var sigBtn = new Button
{
@@ -148,7 +153,7 @@
Y = scenehorizontalScrol.Bottom,
};
functionSceneAutoBodyView.AddChidren(logicScrolView);
-
+
logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
bool no = false;
//鏄剧ず榛樿妯℃澘鐨勭晫闈簨浠�
@@ -247,16 +252,20 @@
};
//涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
logicScrolView.BeginHeaderRefreshingAction += () =>
- {
- //閲嶆柊鍒锋柊logic鍒楄〃
- Common.Logic.LogicList.Clear();
- Read(logicScrolView, no);
+ {
+ if (!Config.Instance.Home.IsVirtually)
+ {//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ If_once = true;
+ Common.Logic.LogicList.Clear();
+ Read(logicScrolView, no);
+ }
//鍏抽棴鍒锋柊View锛�
logicScrolView.EndHeaderRefreshing();
};
- //鑷姩鍖�
- Read(logicScrolView, no);
+ //鑷姩鍖�
+ Read(logicScrolView, no);
}
/// <summary>
@@ -265,48 +274,74 @@
/// <param name="logicScrolView"></param>
private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
{
+ //if (Config.Instance.HomeId != UserCenter.UserCenterResourse.AccountOption.OldHomeStringId)
+ //{
+ // //鍒囨崲浣忓畢娓呴櫎涔嬪墠缂撳瓨鏁版嵁;
+ // Common.Logic.LogicList.Clear();
+ // Common.Logic.LockLogicList.Clear();
+ // Common.Logic.SoneLogicList.Clear();
+ //}
+
CommonPage.Loading.Start();
- if (Common.Logic.LogicList.Count == 0)
+ try
{
- var Idlist1 = await Send.GetLogicId(0);//
- var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
- if (Idlist1.Count != 0)
+ if (!Config.Instance.Home.IsVirtually)//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
{
- var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
- for (int j = 0; j < listlogic1.Count; j++)
- {
- var logic = listlogic1[j];
- if (logic.LogicType != 0)
- {
- continue;
+ if (If_once)
+ {
+ if (Common.Logic.LogicList.Count == 0)
+ {
+ If_once = false;
+ var Idlist1 = await Send.GetLogicId(0);//
+ var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
+ if (Idlist1.Count != 0)
+ {
+ var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
+ for (int j = 0; j < listlogic1.Count; j++)
+ {
+ var logic = listlogic1[j];
+ if (logic.LogicType != 0)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
+ }
+ }
+ if (Idlist2.Count != 0)
+ {
+ var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
+ for (int j = 0; j < listlogic2.Count; j++)
+ {
+ var logic = listlogic2[j];
+ if (logic.LogicType != 2)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
+ }
+ }
+
}
- Common.Logic.LogicList.Add(logic);
}
}
- if (Idlist2.Count != 0)
- {
- var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
- for (int j = 0; j < listlogic2.Count; j++)
- {
- var logic = listlogic2[j];
- if (logic.LogicType != 2)
- {
- continue;
- }
- Common.Logic.LogicList.Add(logic);
- }
- }
+ }
+ catch (Exception e)
+ {
+ var dd = e.Message;
}
//鑷姩鍖�
Automationview(logicScrolView, no);
CommonPage.Loading.Hide();
}
+ static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
/// <param name="refresview">Refresview.</param>
private static async void Automationview(VerticalRefreshLayout refresview, bool no)
{
+
refresview.RemoveAll();
if (Common.Logic.LogicList.Count == 0 && no == false)
{
@@ -314,7 +349,7 @@
refresview.BackgroundColor = 0x00000000;
var noFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(434 + 200 + 32 + 294-55),
+ Height = Application.GetRealHeight(434 + 200 + 32 + 294 - 55),
//BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
refresview.AddChidren(noFrameLayout);
@@ -322,9 +357,9 @@
var noIconBtn = new Button
{
- Y = Application.GetRealHeight(294-55),
- Width = Application.GetMinRealAverage(756),
- Height = Application.GetMinRealAverage(434),
+ Y = Application.GetRealHeight(294 - 55),
+ Width = Application.GetMinRealAverage(757),
+ Height = Application.GetMinRealAverage(435),
UnSelectedImagePath = "Item/NoFunction.png",
X = Application.GetRealWidth(104),
};
@@ -358,7 +393,7 @@
refresview.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
}
}
-
+ int i = 1;//灞�閮ㄥ彉閲忥紝榛樿鏄涓�鏉￠�昏緫;
foreach (var logic in Common.Logic.LogicList)
{
@@ -377,10 +412,27 @@
LineColor = ZigbeeColor.Current.LogicBackgroundColor,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+ Tag = i.ToString(),
};
fLayout.AddChidren(logicRowlayout);
-
+ //宸︽粦鑿滃崟浜嬩欢
+ logicRowlayout.OpenMenuAction += () =>
+ {
+ if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
+ { //淇濈暀宸︽粦鍙湁涓�涓�;
+ selectedRow.HideMenu();//
+ }
+ selectedRow = logicRowlayout;
+ };
+ if (i == 1)
+ {
+ //瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
+ fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+
+ }
+ i++;
var logicnameBtn = new Button
{
Height = Application.GetRealHeight(58),
@@ -396,8 +448,8 @@
var logicswitchBtn = new Button
{
- Width = Application.GetRealWidth(104),
- Height = Application.GetRealHeight(63),
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(63),
UnSelectedImagePath = "ZigeeLogic/logicclose.png",
SelectedImagePath = "ZigeeLogic/logicopen.png",
X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
@@ -421,7 +473,10 @@
logic.IsEnable = 0;
StatusColor(logic, logicRowlayout, 0);
}
- Device.Logic.Send.LogicControlSwitch(logic);
+ if (!Config.Instance.Home.IsVirtually)
+ {
+ Send.LogicControlSwitch(logic);
+ }
//Logic.Send.AddModifyLogic(logic);
};
if (logic.IsEnable == 1)
@@ -442,14 +497,27 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRowlayout.AddRightView(edit);
+ if (logic.LogicType == 2)
+ {
+ edit.TextID = MyInternationalizationString.look;
+ }
edit.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic = logic;
- var logicCommunalPage = new LogicCommunalPage();
- HomePage.Instance.AddChidren(logicCommunalPage);
- HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });
-
+ if (Common.Logic.CurrentLogic.LogicType == 2)
+ {
+ var oneLogic = new OneLogic();
+ UserView.HomePage.Instance.AddChidren(oneLogic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ oneLogic.Show(true);
+ }
+ else
+ {
+ var logicCommunalPage = new LogicCommunalPage();
+ HomePage.Instance.AddChidren(logicCommunalPage);
+ HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });
+ }
};
///鍒犻櫎
@@ -464,13 +532,16 @@
{
var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.confrim));
- alert.Show();
- alert.ConfirmClickEvent += () =>
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ alert.ConfirmClickEvent += () =>
{
Common.Logic.LogicList.Remove(logic);
Automationview(refresview, no);
- Send.DelLogic(logic.LogicId);
+ if (!Config.Instance.Home.IsVirtually)
+ {
+ Send.DelLogic(logic.LogicId);
+ }
};
};
@@ -483,6 +554,8 @@
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
fLayout.AddChidren(line);
+
+
}
}
@@ -507,7 +580,7 @@
logicRowlayout.AddChidren(logictimeBtn);
///鏄剧ず鎵ц鍛ㄦ湡
- Device.Logic.Method.UpdateWeek(logictimeBtn, logic);
+ Method.UpdateWeek(logictimeBtn, logic);
List<string> indexlist = new List<string>();
@@ -521,7 +594,8 @@
indexlist.Add(linkType);
}
}
- if (indexlist.Contains("0"))
+ //鎺掑垪鍥炬爣椤哄簭;
+ if (indexlist.Contains("0") || indexlist.Contains("8"))
{
iconIndexlist.Add("0");
}
@@ -546,7 +620,7 @@
Height = Application.GetMinRealAverage(82),
X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
Y = Application.GetRealHeight(58 + 30 + 30),
- Radius = (uint)Application.GetRealHeight(41),
+ Radius = (uint)Application.GetMinRealAverage(41),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
logicRowlayout.AddChidren(typebjBtn);
@@ -640,91 +714,178 @@
}
}
}
-
#endregion
/// <summary>
- /// 闂ㄩ攣鍙栨秷璁剧疆鐢ㄧ殑鏂规硶
+ /// 闂ㄩ攣澶辨晥璁剧疆鐢ㄧ殑鏂规硶(鐩稿綋涓�涓叧闂父寮�妯″紡鎸夐挳,鍒嗙被-鑷姩鍖�-涓嶉渶瑕佹樉绀鸿鑷姩鍖�)
/// </summary>
/// <param name="timeVlaue">鏃堕棿鍊�</param>
/// <param name="common">璁惧</param>
/// <returns></returns>
- public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
+ public static async System.Threading.Tasks.Task<int> LockAddModifyLogic(int timeVlaue, CommonDevice common)
{
-
- int hour = timeVlaue / 60;
- int min = timeVlaue % 60;
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ var h = DateTime.Now.ToString("HH");
+ var m = DateTime.Now.ToString("mm");
Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
timeConditionsInfo.Add("Type", "0");
timeConditionsInfo.Add("IsValid", "1");
timeConditionsInfo.Add("DateType", "0");
timeConditionsInfo.Add("RemindTime", "0");
+ timeConditionsInfo.Add("EnDelay", "0");
timeConditionsInfo.Add("DelayTime", "0");
- timeConditionsInfo.Add("StartHour", hour.ToString());
- timeConditionsInfo.Add("StartMin", min.ToString());
+ timeConditionsInfo.Add("StartHour", h);
+ timeConditionsInfo.Add("StartMin", m);
+ if (UserCenter.UserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode == 1)
+ {
+ //寮哄埗鍙樻洿鏃堕棿妯″紡涓哄垎閽�
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
+ }
+ else
+ {
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
+ }
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 8);
actionsInfo.Add("DeviceAddr", common.DeviceAddr);
- actionsInfo.Add("Epoint", common.DeviceEpoint);
- actionsInfo.Add("PassData", "055704010112");//榛樿闂ㄩ攣甯稿紑
+ actionsInfo.Add("Epoint", "200");
+ actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+
+ Dictionary<string, string> accounts = new Dictionary<string, string>();
+ accounts.Add("Type", "8");
+ accounts.Add("Option4", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+ accounts.Add("Option2", common.DeviceEpoint.ToString());
Common.Logic currentLogic = new Common.Logic();
- currentLogic.IsEnable = 0;//榛樿绂佺敤
+ currentLogic.IsEnable = 1;//榛樿涓哄紑
currentLogic.TimeAttribute.Repeat = 0;//鎵ц涓�娆�
+ currentLogic.LogicType = 3;//鏍囪閫昏緫绫诲瀷
currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
currentLogic.Conditions.Add(timeConditionsInfo);
currentLogic.Actions.Add(actionsInfo);
- //淇敼鎴栬�呮坊鍔犳槸鏍规嵁閫昏緫id鍊硷紙0鏂板锛�1锛屼慨鏀癸級
- Send.AddModifyLogic(currentLogic);
+ currentLogic.Accounts.Add(accounts);
+ var logicIfon = await Send.AddModifyLogic(currentLogic);
+ if (logicIfon != null && logicIfon.LogicId != 0)
+ {
+ //娣诲姞闂ㄩ攣澶辨晥鏃堕棿鐨勫巻鍙茶褰�
+ UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
+ return logicIfon.LogicId;//琛ㄧず娣诲姞鎴愬姛;
+ }
+ return 0;//琛ㄧず娣诲姞澶辫触;
}
- ///<summary>
- /// 闂ㄩ攣鍒犻櫎閫昏緫
- /// </summary>
- public static async void LockDelLogic(CommonDevice common)
- {
- int logicId = 0;
- var Idlist = await Send.GetLogicId(2);
- if (Idlist.Count != 0)
- { //鍏堝幓璇诲彇缃戝叧鐪嬫槸鍚﹀瓨鍦ㄦ暟鎹�;
- var listlogic = await Send.ReadList(Idlist.Count, 2);
- for (int j = 0; j < listlogic.Count; j++)
- {
- var logic = listlogic[j];
- foreach (var actions in logic.Actions)
- {
- var linkType = actions["LinkType"].ToString();
- if (linkType != "8")
- {
- //鐢ㄦ埛鏈夊彲鑳藉湪鑷姩鍖栭偅閲屽啀娆＄紪杈�;
- //蹇呴』杩囨护鎺変笉闇�瑕佺殑淇℃伅(杈撳嚭鍔熻兘寤舵椂:鏄病鏈塂eviceAddr鍜孍point),鍚﹀垯鏈夊紓甯�;
- continue;
- }
- var obj1 = actions["DeviceAddr"].ToString();
- var obj2 = actions["Epoint"].ToString();
- if (common.DeviceAddr == obj1 && common.DeviceEpoint.ToString() == obj2)
- {
- logicId = logic.LogicId;
- break;
- //鎵惧埌璺冲嚭寰幆浣�
- }
- }
- if (logicId != 0)
+ ///<summary>
+ /// s-one闂ㄩ攣鏄惁瀛樺湪鑷姩鍖栫殑鏂规硶;
+ /// 娉ㄦ剰(鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�);
+ /// 杩斿洖鍊硷細0涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
+ /// </summary>
+ public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
+ {
+
+ int exist = 0;
+ var IdList = await Send.GetLogicId(valueInt);
+ if (IdList.Count != 0)
+ {
+ for (int i = 0; i < IdList.Count; i++)
+ {
+ var id = IdList[i];
+ var logic = await Send.GetLogic(id, valueInt);
+ if (logic != null)
{
- break;
- //鎵惧埌璺冲嚭寰幆浣�
+ if (ExistLogic(logic, doorLock))
+ {
+ exist = id;
+ ///鎵惧埌閫�鍑�
+ break;
+ }
+ }
+
+ }
+ }
+ return exist;
+ }
+
+ ///<summary>
+ ///鑾峰彇闂ㄩ攣鏃舵晥鎬ч�昏緫淇℃伅
+ /// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
+ /// </summary>
+ public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
+ {
+ Common.Logic logic = null;
+ var Idlist = await Send.GetLogicId(3);
+ if (Idlist.Count != 0)
+ {
+ //榛樿鍙栫涓�涓�昏緫ID(鏃舵晥鎬у彧鏈変竴鏉￠�昏緫)
+ int exist = Idlist[0];
+ logic = await Send.GetLogic(exist, 3);
+ if (!ExistLogic(logic, doorLock))
+ {
+ logic = null;
+ }
+ }
+ return logic;
+ }
+
+ ///<summary>
+ ///鍒犻櫎璇ラ棬閿佹墍鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ /// 杩斿洖鍊硷細true鎴愬姛;false澶辫触;
+ /// </summary>
+ public static async System.Threading.Tasks.Task<bool> DelAllLogic(ZigBee.Device.DoorLock doorLock)
+ {
+ bool _if = false;
+ var Idlist = await Send.GetLogicId(3);
+ if (Idlist.Count != 0)
+ {
+ for (int i = 0; i < Idlist.Count; i++)
+ {
+ int id = Idlist[i];
+ var logic = await Send.GetLogic(id, 3);
+ if (logic != null)
+ {
+ if (ExistLogic(logic, doorLock))
+ {
+ //鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
+ //闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
+ //var valueInt = await Send.DelLogic(id);
+ //if (valueInt == 0)
+ //{
+ // _if = true;
+ //}
+ //(鑰冭檻鎬ц兘榛樿鍒犻櫎鎴愬姛锛岀洿鎺ヨ繑鍥炴垚鍔熺粨鏋渢rue)
+ _if = true;
+ Send.DelLogic(id);
+
+
+ }
}
}
}
- if (logicId == 0)
- {
- //娌℃湁鎵惧埌logicId鍒犻櫎娌℃湁鎰忎箟;
- return;
- }
- Send.DelLogic(logicId);
+ return _if;
}
+ /// <summary>
+ /// 鏌ユ壘杩欎竴鏉¤嚜鍔ㄥ寲鏄惁灞炰簬璇ラ棬閿�
+ /// </summary>
+ /// <returns></returns>
+ public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
+ {
+ for (int j = 0; j < logic.Accounts.Count; j++)
+ {
+ //Option4鏄澶噈ac锛�
+ if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
+ {
+ //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
+ //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
+ return true;
+ }
+
+ }
+ return false;
+ }
+
+
+
}
}
--
Gitblit v1.8.0