From 0a0d7ec5080cd1f1802d9fcc96b08102b9b551f1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 29 五月 2020 11:15:19 +0800
Subject: [PATCH] 2020-05-29-2
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 10 ++++++++--
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs | 4 ++--
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 19 +++++++++++++++++--
4 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 234cfc5..d7566aa 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,7 +1,12 @@
锘�<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>
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
+ <Files>
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="428" Column="50" />
+ <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="334" Column="59" />
+ <File FileName="Shared/Phone/Device/Logic/IgnoreTime.cs" Line="143" Column="18" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -12,7 +17,8 @@
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="SkipView.cs" selected="True" />
+ <Node name="LogicView" expanded="True" />
+ <Node name="CurrentDeviceState.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 abb0027..e2338dc 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/IgnoreTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
old mode 100755
new mode 100644
index 1c3300a..7ef78de
--- a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
@@ -134,9 +134,9 @@
deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
deviceConditionsInfo.Add("Cluster_ID", "1280");
deviceConditionsInfo.Add("AttriButeId", "1281");
- deviceConditionsInfo.Add("AttriButeData1", "0");
+ deviceConditionsInfo.Add("AttriButeData1", "1");
deviceConditionsInfo.Add("AttriButeData2", "0");
- deviceConditionsInfo.Add("Range", "1");
+ deviceConditionsInfo.Add("Range", "5");
if (selectetimedvalue != 0)
{
if (timevalue != selectetimedvalue)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 7633cde..ca1a3aa 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -221,8 +221,23 @@
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>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
/// </summary>
--
Gitblit v1.8.0