From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 41b7dc8..b92f1ca 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -31,7 +31,10 @@
/// 璁板綍閫変腑鏃堕棿
/// </summary>
public int timeValue = 0;
-
+ /// <summary>
+ /// 鏍囪鏄剧ず鎵ц鏃ユ湡(鐢ㄧ綉鍏崇殑锛岃繕鏄敤绯荤粺鐨勬椂闂�)
+ /// </summary>
+ public bool _if = false;
/// <summary>
/// 鏃堕棿鎴�
/// </summary>
@@ -94,7 +97,6 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
middle.AddChidren(fLayout);
- ModeView();
#endregion
#region 甯稿紑鑷姩鍖�
///绗笁鍧楃涓�绾х埗鎺т欢
@@ -108,7 +110,7 @@
};
middle.AddChidren(listLogicFl);
listLogicFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
-
+ ModeView();
///娣诲姞甯稿紑鑷姩鍖栫殑鐖舵帶浠�
var addLogicfL = new FrameLayout
{
@@ -282,6 +284,7 @@
Send.DelLogic(logicId);
}
Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+ _if = false;
ModeView();
}
else
@@ -304,8 +307,8 @@
var timeTextBtn = new Button
{
Y = Application.GetRealHeight(127 + 69),
- X = Application.GetRealWidth(125),
- Width = Application.GetRealWidth(634 + 200),
+ X = Application.GetRealWidth(86),//125
+ Width = Application.GetRealWidth(907),//634 + 200
Height = Application.GetRealHeight(60),
TextSize = 15,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -313,24 +316,50 @@
if (logicId != 0)
{
openModeFl.AddChidren(timeTextBtn);
- 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 dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
- // int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
- // int days = int.Parse(d) + dayInt;
- int minute = datetime.Minute;//鍒嗛挓
- string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
- string text2 = Language.StringByID(MyInternationalizationString.yearSone);
- string text3 = Language.StringByID(MyInternationalizationString.monthSone);
- string text4 = Language.StringByID(MyInternationalizationString.numberSone);
- string text5 = Language.StringByID(MyInternationalizationString.hour1);
- string text6 = Language.StringByID(MyInternationalizationString.executeSone);
- // timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
- timeTextBtn.Text = text1 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;
+ 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 dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+ // int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
+ // int days = int.Parse(d) + dayInt;
+ int minute = datetime.Minute;//鍒嗛挓
+ string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
+ string text2 = Language.StringByID(MyInternationalizationString.yearSone);
+ string text3 = Language.StringByID(MyInternationalizationString.monthSone);
+ string text4 = Language.StringByID(MyInternationalizationString.numberSone);
+ string text5 = Language.StringByID(MyInternationalizationString.hour1);
+ string text6 = Language.StringByID(MyInternationalizationString.executeSone);
+ timeTextBtn.Text = text1 + y + text2 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;
+
+ }
+ else
+ {
+
+
+
+ ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
+ var m = 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;//鍒嗛挓
+ string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
+ string text2 = Language.StringByID(MyInternationalizationString.yearSone);
+ string text3 = Language.StringByID(MyInternationalizationString.monthSone);
+ string text4 = Language.StringByID(MyInternationalizationString.numberSone);
+ string text5 = Language.StringByID(MyInternationalizationString.hour1);
+ string text6 = Language.StringByID(MyInternationalizationString.executeSone);
+ timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
+ }
}
@@ -419,6 +448,7 @@
logicId = addResult;
timeValue = int.Parse(str);
Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+ _if = false;
ModeView();
///娣诲姞APP寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
@@ -450,6 +480,11 @@
listLogicFl.Height = Application.GetRealHeight(Method.H - 184) - fLayout.Height;
listLogicFl.Width = Application.GetRealWidth(1022);
listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+
+ // verticalRefresh.Y = Application.GetRealHeight(187);
+ // verticalRefresh.X = Application.GetRealWidth(46);
+ verticalRefresh.Height = listLogicFl.Height - Application.GetRealHeight(187);//鍔ㄦ�佹敼鍔ㄤ笂涓嬫粦鍔╲iew楂樺害;
+ //verticalRefresh.Width = listLogicFl.Width - Application.GetRealWidth(46);
}
/// <summary>
/// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
--
Gitblit v1.8.0