From 34f902db7b768114f6aec18706debbb7ffb5d7f2 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 19 五月 2020 13:19:11 +0800
Subject: [PATCH] 2020-05-19-3
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 1
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 55 +++++++++++++++++++++------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 36 +++++++++--------
4 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 7f210bc..8073fee 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,20 +1,49 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
- <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="505" Column="79" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" />
- <File FileName="GateWay.Droid/Assets/Language.ini" />
- <File FileName="Shared/R.cs" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" />
- <File FileName="Shared/Common/Logic.cs" />
- <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="351" Column="8" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="266" Column="57" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="720" Column="71" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="174" Column="50" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1043" Column="38" />
+ <File FileName="Shared/Common/Logic.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="Assets" expanded="True" />
+ </Node>
+ <Node name="Home.IOS" expanded="True">
+ <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="LogicView" expanded="True" />
+ </Node>
+ </Node>
+ <Node name="UserCenter" expanded="True">
+ <Node name="CommonBase" expanded="True">
+ <Node name="Controls" expanded="True">
+ <Node name="MessageControls" expanded="True" />
+ </Node>
+ </Node>
+ <Node name="DoorLock" expanded="True">
+ <Node name="UserDoorLockPage.cs" selected="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </State>
+ </Pad>
+ </Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 5922cb2..0036ad3 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/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 5b02be1..efe72aa 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -65,6 +65,7 @@
timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
+
TimeView();
};
functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 9ecaf4d..c6c2e5f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -80,7 +80,7 @@
{
//杩涙潵鏇存柊涓�娆″��
logicId = logic.LogicId;
- timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"])/3600;
timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);
}
@@ -322,33 +322,35 @@
string text4 = Language.StringByID(MyInternationalizationString.numberSone);
string text5 = Language.StringByID(MyInternationalizationString.hour1);
string text6 = Language.StringByID(MyInternationalizationString.executeSone);
+ string year = "";
+ string month = "";
+ int days =0;
+ int hour =0;
+ int minute =0;
+
if (_if)
{
-
///绗竴娆¤繘鏉ヨ鍙栫綉鍏虫椂闂达紱
var datetime = GetLocalTime(timeLong);
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
- var y = datetime.Year.ToString();//閭ｄ竴骞�
- var m = datetime.Month.ToString();//閭ｄ竴鏈�
- var d = datetime.ToString("dd");//閭ｄ竴澶�
- var h = int.Parse(datetime.ToString("HH"));//灏忔椂
- int minute = datetime.Minute;//鍒嗛挓
- timeTextBtn.Text = text1 + y + text2 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;
-
+ year = datetime.Year.ToString();//閭ｄ竴骞�
+ month = datetime.Month.ToString();//閭ｄ竴鏈�
+ days = int.Parse(datetime.ToString("dd"));//閭ｄ竴澶�
+ hour = int.Parse(datetime.ToString("HH"));//灏忔椂
+ minute = datetime.Minute;//鍒嗛挓
}
else
{
-
- ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
- var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
+ ///鍦ㄥ綋鍓嶇晫闈㈢紪杈戞樉绀虹郴缁熸椂闂�(涓嶈兘姣忎竴娆＄紪杈戦兘鍘荤綉鍏虫嬁鏁版嵁)
year = DateTime.Now.Year.ToString();//閭ｄ竴骞�
+ month = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
var h = int.Parse(DateTime.Now.ToString("HH"));//灏忔椂
- int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
- int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
- int days = int.Parse(d) + dayInt;
- int minute = DateTime.Now.Minute;//鍒嗛挓
- timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
+ int dayInt = (h + timeValue) / 24;//璁剧疆鏃堕棿+褰撳墠绯荤粺鏃堕棿鏄惁瓒呭嚭24灏忔椂
+ hour = (h + timeValue) % 24;//璁剧疆鏃堕棿+褰撳墠绯荤粺鏃堕棿鏄惁瓒呭嚭24灏忔椂鍓╀笅澶氬皯灏忔椂
+ days = int.Parse(d) + dayInt;//褰撳墠绯荤粺澶╂暟+鎵ц鍚庡ぉ鏁�
+ minute = DateTime.Now.Minute;//鍒嗛挓
}
+ timeTextBtn.Text = text1 + year + text2 + month + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
}
--
Gitblit v1.8.0