From ad94907bfe5389114dcb841b339886c6a8ef6851 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 17:09:23 +0800
Subject: [PATCH] 2020-04-2-02-3
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 96 ++++++++++++++++++++------------
ZigbeeApp/Shared/Common/Logic.cs | 1
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 24 +++----
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 2
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
5 files changed, 72 insertions(+), 51 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 167a519..cdbb4d6 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,15 +1,9 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SkipView.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="732" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="98" Column="74" />
- <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="428" Column="47" />
- <File FileName="Shared/Common/Device.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="643" Column="8" />
- <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="205" Column="19" />
- <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="272" Column="18" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -22,8 +16,12 @@
<Node name="CommonForm" expanded="True" />
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="LogicIfon.cs" selected="True" />
+ <Node name="LogicView" expanded="True" />
+ <Node name="SkipView.cs" selected="True" />
</Node>
+ </Node>
+ <Node name="UserCenter" expanded="True">
+ <Node name="DoorLock" expanded="True" />
</Node>
</Node>
</Node>
@@ -32,13 +30,11 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.9992EB40-E6DD-48F4-AFED-CEB5E811ACDD" />
+ <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/hdl/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs" relfile="Shared/Phone/Device/Logic/Method.cs" line="643" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 9091e69..d4aa5c8 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/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index da5d19a..f5f40e5 100644
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -29,6 +29,7 @@
///<para>0锛氱鐢ㄨ閫昏緫</para>
///<para>1锛氫娇鑳借閫昏緫</para>
///<para>2: 鍙Е鍙戜竴娆°�傝Е鍙戝悗璇ュ瓧娈靛皢鑷姩缃负0锛屽嵆绂佺敤鐘舵�併��</para>
+ ///3锛氬け鑳戒竴娆★紙鏉′欢绗竴娆℃垚绔嬩細琚拷鐣ワ紝瑙﹀彂涓嶄簡閫昏緫锛岀劧鍚嶪sValid鑷姩缃�1銆備互鍚庢潯浠跺啀鎴愮珛灏嗕笉浼氳蹇界暐锛�
/// </summary>
public int IsEnable;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 133f08d..81ca490 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -61,6 +61,7 @@
{
Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
}
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
int h =int.Parse(DateTime.Now.ToString("hh"));
int m = int.Parse(DateTime.Now.ToString("mm"));
//榛樿涓�涓椂闂存(寮�濮嬫椂闂翠负:绯荤粺褰撳墠锛岀粨鏉熸椂闂翠负:寮�濮嬫椂闂�+1涓椂闂�)
@@ -91,7 +92,7 @@
Common.Logic.CurrentLogic = new Common.Logic();
Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
Common.Logic.CurrentLogic.LogicType = 2;//鏍囪閫昏緫绫诲瀷
- Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
+ Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
Common.Logic.CurrentLogic.Conditions.Add(timeDictionary);//娣诲姞鏉′欢
Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
var oneLogic = new OneLogic();
@@ -693,13 +694,14 @@
#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>();
@@ -708,7 +710,7 @@
timeConditionsInfo.Add("DateType", "0");
timeConditionsInfo.Add("RemindTime", "0");
timeConditionsInfo.Add("EnDelay", "0");
- timeConditionsInfo.Add("DelayTime", "0");
+ timeConditionsInfo.Add("DelayTime", "0");
timeConditionsInfo.Add("StartHour", h);
timeConditionsInfo.Add("StartMin", m);
timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
@@ -725,57 +727,79 @@
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;
+ List<Common.Logic> 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);
}
-
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 1831d1e..2d4cf26 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1101,7 +1101,7 @@
UpdateNomallyOpenStatus();
string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
this.ShowTipMsg(msg2);
- Shared.Phone.Device.Logic.SkipView.LockDelLogic(doorLock);
+ Shared.Phone.Device.Logic.SkipView.LockCloseLogic(doorLock);
//
}
}
--
Gitblit v1.8.0