From d5b9ff8bf8cc36f5b13c46b66682f5988d3a6f36 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 15 五月 2020 11:36:11 +0800
Subject: [PATCH] 2020-05-15-1
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 35 ++++-------
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 2
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
.DS_Store | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 104 ++++++++++++++++++----------------
5 files changed, 68 insertions(+), 73 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 54726f6..89facd6 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index a58c738..0737bca 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,23 +1,13 @@
锘�<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/DoorLockLogic/LockLogicList.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="728" Column="34" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="503" Column="76" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1040" Column="27" />
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="282" Column="114" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="850" Column="35" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="392" Column="79" />
- <File FileName="Shared/Common/Logic.cs" Line="46" Column="33" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs" Line="543" Column="18" />
- <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="25" Column="23" />
- <File FileName="Shared/Phone/ZigBee/Device/CommonDevice.cs" Line="21" Column="23" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="300" Column="32" />
- <File FileName="Shared/Phone/UserCenter/Residence/ResidenceListForm.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="267" Column="35" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="101" Column="65" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="323" Column="92" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="52" Column="62" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="63" Column="61" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="618" Column="41" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="891" Column="60" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -27,16 +17,17 @@
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="DoorLockLogic" expanded="True">
- <Node name="LockLogicList.cs" selected="True" />
- </Node>
- <Node name="LogicView" expanded="True" />
+ <Node name="DoorLockLogic" expanded="True" />
+ <Node name="SoneLogicList.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
- <Node name="Residence" expanded="True" />
+ <Node name="CommonBase" expanded="True">
+ <Node name="Controls" expanded="True">
+ <Node name="MessageControls" expanded="True" />
+ </Node>
+ </Node>
</Node>
- <Node name="ZigBee" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 5b42769..1417fac 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/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index b9531ef..5832fec 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -108,12 +108,10 @@
// //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
// //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
// yes = false;
-
// }
// else
// {
// yes = true;
-
// }
// //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
// //{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 7ab97b5..18ab2aa 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -163,6 +163,9 @@
actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
actionsInfo.Add("Epoint", "200");
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+ Dictionary<string, string> accounts = new Dictionary<string, string>();
+ accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+ accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板闂ㄩ攣甯稿紑妯″紡鑷姩鍖栧叆鍙ｏ紱
Common.Logic.CurrentLogic = new Common.Logic();
@@ -171,6 +174,7 @@
Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//娣诲姞鏉′欢
Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
+ Common.Logic.CurrentLogic.Accounts.Add(accounts);
var oneLogic = new OneLogic();
UserView.HomePage.Instance.AddChidren(oneLogic);
UserView.HomePage.Instance.PageIndex += 1;
@@ -371,59 +375,58 @@
{
LogicView.TipView.ShowConfrimTip(() =>
-
{///鍐嶆纭
- LogicView.TipView.ShowInputTip(true, async (str) =>
- {///纭鍙戦�佸懡浠�
- CommonPage.Loading.Start();
- try
- {
- ///xm
- var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
- if (!result)
- {
- LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
- return;
- }
- else
- {
- ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
- SkipView.GetLogicAll(Send.CurrentDoorLock);//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
- var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
- if (addResult == 0)
- {
- ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
- UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
- ///鎻愮ず澶辫触
- LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
- return;
- }
- else
- {
- logicId = addResult;
- timeValue = int.Parse(str);
- Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
- ModeView();
- ///娣诲姞APP寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
- UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock,9001,string.Empty);
- }
+ LogicView.TipView.ShowInputTip(true, async (str) =>
+ {///纭鍙戦�佸懡浠�
+ CommonPage.Loading.Start();
+ try
+ {
+ ///xm
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+ if (!result)
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
+ return;
+ }
+ else
+ {
+ ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
+ SkipView.GetLogicAll(Send.CurrentDoorLock);//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+ var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
+ if (addResult == 0)
+ {
+ ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
+ UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ ///鎻愮ず澶辫触
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
+ return;
+ }
+ else
+ {
+ logicId = addResult;
+ timeValue = int.Parse(str);
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+ ModeView();
+ ///娣诲姞APP寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+ UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
+ }
- }
- }
- catch
- {
+ }
+ }
+ catch
+ {
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- CommonPage.Loading.Hide();
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
- });
- }
- });
+ });
+ }
+ });
});
@@ -460,7 +463,10 @@
{
continue;
}
- Common.Logic.SoneLogicList.Add(logic);
+ if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
+ {
+ Common.Logic.SoneLogicList.Add(logic);
+ }
}
}
}
--
Gitblit v1.8.0