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/SoneLogicList.cs |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

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();//閭d竴骞�
-                        var m = datetime.Month.ToString();//閭d竴鏈�
-                        var d = datetime.ToString("dd");//閭d竴澶�
-                        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();//閭d竴骞�
+                        month = datetime.Month.ToString();//閭d竴鏈�
+                        days = int.Parse(datetime.ToString("dd"));//閭d竴澶�
+                        hour = int.Parse(datetime.ToString("HH"));//灏忔椂                   
+                        minute = datetime.Minute;//鍒嗛挓
                     }
                     else
                     {
-
-                        ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
                        var y = DateTime.Now.Year.ToString();//閭d竴骞�
-                        var m = DateTime.Now.Month.ToString();//閭d竴鏈�
+                        ///鍦ㄥ綋鍓嶇晫闈㈢紪杈戞樉绀虹郴缁熸椂闂�(涓嶈兘姣忎竴娆$紪杈戦兘鍘荤綉鍏虫嬁鏁版嵁)
                        year = DateTime.Now.Year.ToString();//閭d竴骞�
+                        month = DateTime.Now.Month.ToString();//閭d竴鏈�
                         var d = DateTime.Now.ToString("dd");//閭d竴澶�
                         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