From ea0459ec04f155ceec5eb59c796379826d005ea4 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 13 五月 2020 17:13:42 +0800
Subject: [PATCH] 2020-05-13
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 20 +++++-----
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 29 +++++++++-----
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 51 +++++++++++++------------
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 10 ++--
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 4 +-
8 files changed, 63 insertions(+), 55 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 4c0faa9..a58c738 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,35 +1,42 @@
锘�<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/SkipView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="101" Column="73" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="807" Column="21" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="673" Column="88" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="137" Column="37" />
+ <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="391" Column="51" />
+ <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" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
<Node name="Shared" expanded="True">
- <Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="DoorLockLogic" expanded="True" />
+ <Node name="DoorLockLogic" expanded="True">
+ <Node name="LockLogicList.cs" selected="True" />
+ </Node>
<Node name="LogicView" expanded="True" />
- <Node name="SkipView.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
- <Node name="DoorLock" expanded="True" />
+ <Node name="Residence" expanded="True" />
</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 4c56cc6..5b42769 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 a2e99ab..b9531ef 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -98,33 +98,34 @@
{
continue;
}
- bool yes = false;
- for (int a = 0; a < logic.Accounts.Count; a++)
- {
- //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
- if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
- {
- //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
- //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- yes = false;
+ Common.Logic.LockLogicList.Add(logic);
+ //bool yes = false;
+ //for (int a = 0; a < logic.Accounts.Count; a++)
+ //{
+ // //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
+ // if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ // {
+ // //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
+ // //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
+ // yes = false;
- }
- else
- {
- yes = true;
+ // }
+ // else
+ // {
+ // yes = true;
- }
- //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
- //{
- // //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
- // yes = true;
- // break;
- //}
- }
- if (yes)
- {
- Common.Logic.LockLogicList.Add(listlogic[j]);
- }
+ // }
+ // //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
+ // //{
+ // // //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
+ // // yes = true;
+ // // break;
+ // //}
+ //}
+ //if (yes)
+ //{
+ // Common.Logic.LockLogicList.Add(listlogic[j]);
+ //}
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 431837d..00a8ad2 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -725,8 +725,8 @@
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
Dictionary<string, string> accounts = new Dictionary<string, string>();
- accounts.Add("DeviceAddr", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
- accounts.Add("Epoint", common.DeviceEpoint.ToString());
+ accounts.Add("Option4", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+ accounts.Add("Option2", common.DeviceEpoint.ToString());
Common.Logic currentLogic = new Common.Logic();
currentLogic.IsEnable = 1;//榛樿涓哄紑
@@ -752,7 +752,7 @@
/// 娉ㄦ剰(鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�);
/// 杩斿洖鍊硷細0涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
/// </summary>
- public static async System.Threading.Tasks.Task<int> Exist(int valueInt)
+ public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
{
int exist = 0;
var Idlist = await Send.GetLogicId(valueInt);
@@ -769,7 +769,7 @@
var logic = await Send.GetLogic(id, 3);
if (logic != null)
{
- if (ExistLogic(logic))
+ if (ExistLogic(logic, doorLock))
{
exist = id;
}
@@ -787,7 +787,7 @@
///鑾峰彇闂ㄩ攣閫昏緫淇℃伅
/// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
/// </summary>
- public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon()
+ public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
{
Common.Logic logic = null;
var Idlist = await Send.GetLogicId(3);
@@ -796,7 +796,7 @@
//榛樿鍙栫涓�涓�昏緫ID(鏃舵晥鎬у彧鏈変竴鏉￠�昏緫)
int exist = Idlist[0];
logic = await Send.GetLogic(exist, 3);
- if (!ExistLogic(logic))
+ if (!ExistLogic(logic, doorLock))
{
logic = null;
}
@@ -808,7 +808,7 @@
///鍒犻櫎璇ラ棬閿佹墍鏈夋椂鏁堟�ц嚜鍔ㄥ寲
/// 杩斿洖鍊硷細true鎴愬姛;false澶辫触;
/// </summary>
- public static async System.Threading.Tasks.Task<bool> GetLogicAll()
+ public static async System.Threading.Tasks.Task<bool> GetLogicAll(ZigBee.Device.DoorLock doorLock)
{
bool _if = false;
var Idlist = await Send.GetLogicId(3);
@@ -822,7 +822,7 @@
var logic = await Send.GetLogic(id, 3);
if (logic != null)
{
- if (ExistLogic(logic))
+ if (ExistLogic(logic, doorLock))
{
//鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
//闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
@@ -838,13 +838,13 @@
/// 鏌ユ壘杩欎竴鏉¤嚜鍔ㄥ寲鏄惁灞炰簬璇ラ棬閿�
/// </summary>
/// <returns></returns>
- public static bool ExistLogic(Common.Logic logic)
+ public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
{
bool yes = false;
for (int j = 0; j < logic.Accounts.Count; j++)
{
//Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
- if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ if (logic.Accounts[j]["Option4"].ToString() != doorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != doorLock.DeviceEpoint.ToString())
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index ebef314..7ab97b5 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -64,7 +64,7 @@
{
//杩涙潵鏇存柊涓�娆�
//鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
- var logic = await SkipView.GetLogicIfon();
+ var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
if (logic != null)
{
try
@@ -388,7 +388,7 @@
else
{
///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
- SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+ SkipView.GetLogicAll(Send.CurrentDoorLock);//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
if (addResult == 0)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
old mode 100755
new mode 100644
index c4d3d74..40ab0de
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -548,7 +548,7 @@
{
//娓╁眳鍩庣殑瑕佺綉鍏充腑鏄惁鏈夐�昏緫瀛樺湪
//鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�
- var result = await Shared.Phone.Device.Logic.SkipView.Exist(2);
+ var result = await Shared.Phone.Device.Logic.SkipView.Exist(2, (ZigBee.Device.DoorLock)device);
HdlThreadLogic.Current.RunMain(() =>
{
//寮瑰嚭寰愭鐨勯偅涓獥鍙�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 53de6e4..682519c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -308,7 +308,7 @@
//鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
if (haveLogic)
{
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
//娓╁眳鍩庢柟娉曪紵锛燂紵
//姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 041574e..2c9af49 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -684,7 +684,7 @@
DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
Application.RunOnMainThread(async () =>
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
if (resTemp == 1)
{
HaveLogicNormallyOpenMode = true;
@@ -1103,7 +1103,7 @@
//鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//if (resTemp == 3)
//{
// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
@@ -1131,7 +1131,7 @@
//鍏堝垹闄ゅ凡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//if (resTemp == 3)
//{
// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
@@ -1208,7 +1208,7 @@
//鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//if (resTemp == 3)
//{
// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
@@ -1247,7 +1247,7 @@
//鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//鍥犱负鐩墠鏈哄埗闂锛岄�昏緫缁忓父澶辫触锛屾墍浠ヤ笉鎻愮ず锛屽悗鏈熸満鍒惰鏀癸紝閲嶆柊鍋氫竴涓繖涓晫闈�
//if (resTemp == 3)
//{
--
Gitblit v1.8.0