From da9285368099529de4f6aa92be55297d05dc63dc Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 29 五月 2020 09:45:11 +0800 Subject: [PATCH] 2020-05-29-1 --- ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 8 ++------ ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0 .DS_Store | 0 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.DS_Store b/.DS_Store index 923826e..8e9340b 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 6e3ea4f..234cfc5 100644 --- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml +++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml @@ -1,11 +1,7 @@ 锘�<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/SoneLogicList.cs"> - <Files> - <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="11" Column="38" /> - <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="240" Column="17" /> - </Files> + <MonoDevelop.Ide.Workbench> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> @@ -16,7 +12,7 @@ <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> - <Node name="SoneLogicList.cs" selected="True" /> + <Node name="SkipView.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide index 413d903..abb0027 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/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs index a2cf90c..7633cde 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs @@ -64,7 +64,6 @@ this.AddChidren(middle); #endregion //鏄父寮�妯″紡鍐嶅幓璇诲彇 - Send.CurrentDoorLock.IsDoorLockNormallyMode = true; if (Send.CurrentDoorLock.IsDoorLockNormallyMode) { //杩涙潵鏇存柊涓�娆� @@ -222,7 +221,7 @@ catch { } }; - UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) => { var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint; if (DoorlockKey == key) { try { Application.RunOnMainThread(() => { Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool; ModeView(); }); } catch { } } }; + //UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) => //{ // var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint; // if (DoorlockKey == key) // { // try // { // Application.RunOnMainThread(() => // { // Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool; // ModeView(); // }); // } // catch { } // } //}; } /// <summary> /// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈� -- Gitblit v1.8.0