From a051c37a96a4b518b1bf1689252649c32430194f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 10 四月 2020 15:49:12 +0800
Subject: [PATCH] 2020-04-10-0-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 230 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 149 insertions(+), 81 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index fee5add..0dda96c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
/// </summary>
- public static void SkipAddLogic(int intvalue,UserCenter.MemberInfoRes accountObj = null,DoorLock doorLock=null)
+ public static void SkipAddLogic(int intvalue,DoorLock doorLock=null,UserCenter.MemberInfoRes accountObj = null)
{
/// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
switch (intvalue)
@@ -56,22 +56,43 @@
doorLockLogicList.Show();
} break;
case 2: {
- ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
}
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ 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("DoorLockOpenDelayTime", "0");
+ timeConditionsInfo.Add("StartHour", h);
+ timeConditionsInfo.Add("StartMin", m);
+ Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+ actionsInfo.Add("LinkType", 8);
+ actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
+ actionsInfo.Add("Epoint", doorLock.DeviceEpoint);
+ actionsInfo.Add("PassData", "055704010112");//榛樿闂ㄩ攣甯稿紑
+
//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);
+ Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//娣诲姞鏉′欢
+ Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
+ var oneLogic = new OneLogic();
+ UserView.HomePage.Instance.AddChidren(oneLogic);
UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+ oneLogic.Show(false);
} break;
}
@@ -272,36 +293,43 @@
private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
{
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 (Common.Logic.LogicList.Count == 0)
{
- var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
- for (int j = 0; j < listlogic1.Count; j++)
+ var Idlist1 = await Send.GetLogicId(0);//
+ var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
+ if (Idlist1.Count != 0)
{
- var logic = listlogic1[j];
- if (logic.LogicType != 0)
+ var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
+ for (int j = 0; j < listlogic1.Count; j++)
{
- continue;
+ var logic = listlogic1[j];
+ if (logic.LogicType != 0)
+ {
+ 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);
+ }
}
}
- 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);
@@ -367,7 +395,7 @@
int i = 1;//灞�閮ㄥ彉閲忥紝榛樿鏄涓�鏉￠�昏緫;
foreach (var logic in Common.Logic.LogicList)
{
-
+
var fLayout = new FrameLayout
{
Height = Application.GetRealHeight(190 + 30),
@@ -375,7 +403,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
refresview.AddChidren(fLayout);
-
+
var logicRowlayout = new RowLayout
{
Height = Application.GetRealHeight(190 + 30),
@@ -393,7 +421,7 @@
logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
i = 2;
}
-
+
var logicnameBtn = new Button
{
Height = Application.GetRealHeight(58),
@@ -434,7 +462,7 @@
logic.IsEnable = 0;
StatusColor(logic, logicRowlayout, 0);
}
- Send.LogicControlSwitch(logic);
+ Send.LogicControlSwitch(logic);
//Logic.Send.AddModifyLogic(logic);
};
if (logic.IsEnable == 1)
@@ -455,14 +483,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); });
+ }
};
///鍒犻櫎
@@ -496,6 +537,8 @@
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
fLayout.AddChidren(line);
+
+
}
}
@@ -658,87 +701,112 @@
#endregion
/// <summary>
- /// 闂ㄩ攣鍙栨秷璁剧疆鐢ㄧ殑鏂规硶
+ /// 闂ㄩ攣鍙栨秷璁剧疆鐢ㄧ殑鏂规硶(鐩稿綋涓�涓叧闂父寮�妯″紡鎸夐挳,鍒嗙被-鑷姩鍖�-涓嶉渶瑕佹樉绀鸿鑷姩鍖�)
/// </summary>
/// <param name="timeVlaue">鏃堕棿鍊�</param>
/// <param name="common">璁惧</param>
/// <returns></returns>
- public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
+ public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
{
-
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ 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", timeVlaue.ToString());
- timeConditionsInfo.Add("StartMin", "0");
+ timeConditionsInfo.Add("DelayTime", "0");
+ timeConditionsInfo.Add("StartHour", h);
+ timeConditionsInfo.Add("StartMin", m);
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.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("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
Common.Logic currentLogic = new Common.Logic();
currentLogic.IsEnable = 1;//榛樿涓哄紑
currentLogic.TimeAttribute.Repeat = 0;//鎵ц涓�娆�
- currentLogic.LogicType = 2;//鏍囪閫昏緫绫诲瀷
+ currentLogic.LogicType = 3;//鏍囪閫昏緫绫诲瀷
currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
currentLogic.Conditions.Add(timeConditionsInfo);
currentLogic.Actions.Add(actionsInfo);
- //淇敼鎴栬�呮坊鍔犳槸鏍规嵁閫昏緫id鍊硷紙0鏂板锛�1锛屼慨鏀癸級
+ Exist(3);//鏌ユ壘鏄惁瀛樺湪璁剧疆杩囧け鏁堟椂闂�(鏈夌殑璇濆垹闄わ紝鍐嶆坊鍔�)
Send.AddModifyLogic(currentLogic);
}
+
///<summary>
- /// 闂ㄩ攣鍒犻櫎閫昏緫
+ /// s-one闂ㄩ攣鏄惁瀛樺湪鑷姩鍖栫殑鏂规硶(true涓哄瓨鍦�)
/// </summary>
- public static async void LockDelLogic(CommonDevice common)
+ public static async System.Threading.Tasks.Task<bool> Exist(int valueInt=2)
{
- int logicId = 0;
+ bool exist = false;
+ var Idlist = await Send.GetLogicId(valueInt);
+ if (Idlist.Count != 0)
+ {
+ if (valueInt==3) {
+ for (int i = 0; i < Idlist.Count; i++)
+ {
+ //valueInt=3涓�鏉＄壒娈婄殑鑷姩鍖�(鐢ㄦ潵璁剧疆澶辨晥鏃堕棿)
+ Send.DelLogic(Idlist[i]);
+ }
+ }
+ exist = true;
+ }
+ return exist;
+ }
+
+ ///<summary>
+ /// s-one闂ㄩ攣纭鍙栨秷(浣挎弧瓒虫潯浠舵墍鏈夐�昏緫澶辫兘涓�娆�)鍙戦�佺殑鏂规硶
+ /// </summary>
+ public static async void LockCloseLogic(CommonDevice common)
+ {
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ int h =int.Parse(DateTime.Now.ToString("HH"));
+ int m= int.Parse(DateTime.Now.ToString("mm"));
+ //杞寲涓哄灏戝垎閽�;
+ int s = h * 60 + m;
+ var logicList = new List<Common.Logic>();
+ logicList.Clear();
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 list = await Send.ReadList(Idlist.Count, 2);
+ for (int j = 0; j < list.Count; j++)
{
- var logic = listlogic[j];
- foreach (var actions in logic.Actions)
+ var logic = list[j];
+ foreach (var conditions in logic.Conditions)
{
- var linkType = actions["LinkType"].ToString();
- if (linkType != "8")
+ var linkType = conditions["Type"];
+ if (linkType == "5")
{
- //鐢ㄦ埛鏈夊彲鑳藉湪鑷姩鍖栭偅閲屽啀娆＄紪杈�;
- //蹇呴』杩囨护鎺変笉闇�瑕佺殑淇℃伅(杈撳嚭鍔熻兘寤舵椂:鏄病鏈塂eviceAddr鍜孍point),鍚﹀垯鏈夊紓甯�;
- continue;
+ int startMin = int.Parse(conditions["StartMin"]);
+ int startHour = int.Parse(conditions["StartHour"]);
+ int stopMin = int.Parse(conditions["StopMin"]);
+ int stopHour = int.Parse(conditions["StopHour"]);
+ int s1 = startMin + startHour * 60;//寮�濮嬫椂闂村��
+ int s2 = stopMin + stopHour * 60;//缁撴潫鏃堕棿鍊�
+ if (s >= s1&&s<=s2)
+ {
+ //鏌ユ壘绯荤粺鏃堕棿鍊兼槸鍚﹀睘浜庤繖涓寖鍥达紱
+ logicList.Add(logic);
+ }
}
- 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)
- {
- break;
- //鎵惧埌璺冲嚭寰幆浣�
- }
+
}
}
- if (logicId == 0)
+ foreach (var logic in logicList)
{
- //娌℃湁鎵惧埌logicId鍒犻櫎娌℃湁鎰忎箟;
- return;
+ logic.IsEnable = 3;//鏀瑰彉閫昏緫浣胯兘鐘舵��;
+ //鐢╢oreach鍙戦�佸懡浠わ紱
+ Send.AddModifyLogic(logic);
}
- Send.DelLogic(logicId);
}
-
}
}
--
Gitblit v1.8.0