From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 16:39:59 +0800
Subject: [PATCH] 2020-05-18-2
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 12 ++----
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 3 -
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 22 ++++++----
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 20 ++--------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 6 ++
7 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index c869181..09f7bee 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,15 +1,19 @@
锘�<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/UserCenter/DoorLock/UserDoorLockPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="39" Column="69" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="810" Column="32" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="11" Column="36" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="42" Column="36" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="786" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="453" Column="14" />
<File FileName="GateWay.Droid/Assets/Language.ini" Line="547" Column="13" />
<File FileName="Shared/R.cs" Line="842" Column="55" />
- <File FileName="Home.Ios/Resources/Language.ini" Line="554" Column="1" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1061" Column="29" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="806" Column="15" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="224" Column="51" />
+ <File FileName="Shared/Common/Logic.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="328" Column="30" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="836" Column="41" />
+ <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="67" Column="14" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -22,10 +26,12 @@
<Node name="Resources" expanded="True" />
</Node>
<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="SoneLogicList.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
@@ -34,9 +40,7 @@
<Node name="MessageControls" expanded="True" />
</Node>
</Node>
- <Node name="DoorLock" expanded="True">
- <Node name="UserDoorLockPage.cs" selected="True" />
- </Node>
+ <Node name="DoorLock" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 68fa844..f181be9 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 5832fec..6e7edf2 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -103,7 +103,7 @@
//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())
+ // if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr)
// {
// //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
// //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
@@ -318,29 +318,17 @@
/// <returns></returns>
private bool Exist(Common.Logic logic)
{
- 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() == Send.CurrentDoorLock.DeviceAddr)
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- yes = false;
+ return true;
}
- else
- {
- yes = true;
- }
- //if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid)
- //{
- // //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
- // yes = true;
- // break;
- //}
-
}
- return yes;
+ return false;
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index e4fff88..6178384 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -833,7 +833,7 @@
}
if (LogicView.IfString._SoneLogic == if_logic)
{
- //Sone闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
+ //Sone闂ㄩ攣甯稿紑妯″紡閫昏緫鍒楄〃
Common.Logic.SoneLogicList.Add(CurrentLogic);
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 3996c24..0fb79bc 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -35,20 +35,17 @@
if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
{
- Console.WriteLine("鎵撳嵃閫昏緫杩斿洖鏁版嵁1====");
var list = jObjectdata["Data"]["LogicList"];
if (list == null)
{
return;
}
- Console.WriteLine("鎵撳嵃閫昏緫杩斿洖鏁版嵁2====");
foreach (var listIfon in list)
{
var logicId = int.Parse(listIfon["LogicId"].ToString());
logicIdList.Add(logicId);
}
- Console.WriteLine("鎵撳嵃閫昏緫杩斿洖鏁版嵁3===="+logicIdList.Count.ToString());
}
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 3e56e15..52d5210 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -841,22 +841,18 @@
/// <returns></returns>
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() != doorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != doorLock.DeviceEpoint.ToString())
+ if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- yes = false;
+ return true;
}
- else
- {
- yes = true;
- }
+
}
- return yes;
+ return false;
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 2ccd171..435cff9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -501,6 +501,10 @@
verticalRefresh.RemoveAll();
foreach (var logic in Common.Logic.SoneLogicList)
{
+ if (!SkipView.ExistLogic(logic, Send.CurrentDoorLock))
+ {
+ continue;
+ }
#region 鑷姩鍖栧竷灞�View
///鑷姩鍖栫埗鎺т欢
var fLayoutLogic = new FrameLayout
@@ -591,7 +595,7 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRow.AddRightView(edit);
-
+
///鍒犻櫎
var del = new Button
{
--
Gitblit v1.8.0