From 3292b5b7fe6c14476df002d78bf186e80f2aab08 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 18 五月 2020 09:30:30 +0800 Subject: [PATCH] 2020-05-28-1 --- ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 1 + ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 14 ++++++++++++++ ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 12 +++++------- ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0 .DS_Store | 0 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 1 + 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.DS_Store b/.DS_Store index 89facd6..923826e 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 0737bca..775f0d7 100644 --- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml +++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml @@ -1,13 +1,10 @@ 锘�<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"> + <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SkipView.cs"> <Files> - <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" /> + <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="489" Column="36" /> + <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="10" Column="2" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -18,7 +15,7 @@ <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> <Node name="DoorLockLogic" expanded="True" /> - <Node name="SoneLogicList.cs" selected="True" /> + <Node name="SkipView.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> @@ -27,6 +24,7 @@ <Node name="MessageControls" expanded="True" /> </Node> </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 1417fac..9270564 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/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs index b1b086f..e9b5aeb 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs @@ -526,6 +526,20 @@ accounts.Add(location); } break; + case 8: + { + var accounts1 = new JObject(); + if (dictionary.ContainsKey("Option4")) + { + accounts1.Add("Option4", dictionary["Option4"]); + } + if (dictionary.ContainsKey("Option2")) + { + accounts1.Add("Option2", int.Parse(dictionary["Option2"])); + } + accounts.Add(accounts1); + } + break; } } diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs index 00a8ad2..3e56e15 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs @@ -725,6 +725,7 @@ actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧 Dictionary<string, string> accounts = new Dictionary<string, string>(); + accounts.Add("Type", "8"); accounts.Add("Option4", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�; accounts.Add("Option2", common.DeviceEpoint.ToString()); diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs index 18ab2aa..d8a77a6 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs @@ -164,6 +164,7 @@ actionsInfo.Add("Epoint", "200"); actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧 Dictionary<string, string> accounts = new Dictionary<string, string>(); + accounts.Add("Type", "8"); accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�; accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString()); //new涓�涓柊閫昏緫瀵硅薄锛� -- Gitblit v1.8.0