From 3e4e108d0c6317edb18bbf9c41419fd6d6a0eebb Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 17:53:10 +0800
Subject: [PATCH] 2019-11-28-2
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 18 ++++++++++++++----
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 19 +++++++++++--------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 3cacffc..a0aa02f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,24 +2,27 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DelayTime.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1158" Column="76" />
- <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="1930" Column="62" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="1933" Column="41" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1962" Column="79" />
+ <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="1941" Column="64" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2105" Column="46" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="23" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/DelayTime.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
+ <Node name="GateWay.Droid" expanded="True">
+ <Node name="References" expanded="True" />
+ </Node>
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="DoorLockLogic" expanded="True">
- <Node name="LockLogicCommunalPage.cs" selected="True" />
- </Node>
+ <Node name="DoorLockLogic" expanded="True" />
+ <Node name="DelayTime.cs" selected="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index f59120e..2c82b65 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/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 4144117..061560a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -165,10 +165,20 @@
{
timevalue = int.Parse(Common.Logic.CurrentLogic.Actions[isInt]["DelayTime"].ToString());
- var minutevalue1 = timevalue / 60;
- var secondvalue1 = timevalue % 60;
- //鏇存柊鏈�鏂扮姸鎬�
- mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+ if (timevalue > 3600)
+ {
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(60, timevalue - 3600, 0);
+ }
+ else
+ {
+
+ var minutevalue1 = timevalue / 60;
+ var secondvalue1 = timevalue % 60;
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+ }
+
value = timevalue;
}
string selectde = "";
--
Gitblit v1.8.0