From 796c8eef0f690d0d04e14db1ecd3d365ed604017 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 19:01:57 +0800
Subject: [PATCH] 2020-05-18-3
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 18ab2aa..41b7dc8 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -16,7 +16,7 @@
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
- public Action<bool> action;
+ public Action<bool> action;
///绗簩鍧楃涓�绾х埗鎺т欢
FrameLayout fLayout = new FrameLayout();
///绗笁鍧楃涓�绾х埗鎺т欢
@@ -31,9 +31,14 @@
/// 璁板綍閫変腑鏃堕棿
/// </summary>
public int timeValue = 0;
+
+ /// <summary>
+ /// 鏃堕棿鎴�
+ /// </summary>
+ public int timeLong = 0;
public async void Show()
{
-
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -60,11 +65,12 @@
this.AddChidren(middle);
#endregion
//鏄父寮�妯″紡鍐嶅幓璇诲彇
+
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
//杩涙潵鏇存柊涓�娆�
//鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
- var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
+ var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
if (logic != null)
{
try
@@ -72,6 +78,8 @@
//杩涙潵鏇存柊涓�娆″��
logicId = logic.LogicId;
timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);
+
}
catch { }
}
@@ -164,6 +172,7 @@
actionsInfo.Add("Epoint", "200");
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
Dictionary<string, string> accounts = new Dictionary<string, string>();
+ accounts.Add("Type", "8");
accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
//new涓�涓柊閫昏緫瀵硅薄锛�
@@ -219,7 +228,7 @@
/// <summary>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
/// </summary>
- public void ModeView()
+ public void ModeView()
{
fLayout.RemoveAll();
@@ -304,20 +313,24 @@
if (logicId != 0)
{
openModeFl.AddChidren(timeTextBtn);
+ var datetime = GetLocalTime(timeLong);
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
- 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;
+ 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.executeSone);
- timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
+ 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;
}
@@ -442,7 +455,7 @@
/// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
/// </summary>
/// <param name="yes"></param>
- private async void Read( bool yes)
+ private async void Read(bool yes)
{
if (yes)
{
@@ -496,6 +509,10 @@
verticalRefresh.RemoveAll();
foreach (var logic in Common.Logic.SoneLogicList)
{
+ if (!SkipView.ExistLogic(logic, Send.CurrentDoorLock))
+ {
+ continue;
+ }
#region 鑷姩鍖栧竷灞�View
///鑷姩鍖栫埗鎺т欢
var fLayoutLogic = new FrameLayout
@@ -586,7 +603,7 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRow.AddRightView(edit);
-
+
///鍒犻櫎
var del = new Button
{
@@ -619,6 +636,7 @@
else
{
//閫昏緫鍏�
+ logic.IsEnable = 0;
typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
typeBjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
}
@@ -652,6 +670,17 @@
};
}
}
-
+
+ /// <summary>
+ /// 灏哢NIX鏃堕棿鎴宠浆鎹㈡垚绯荤粺鏃堕棿(绮剧‘鍒扮)
+ /// <returns></returns>
+ public DateTime GetLocalTime(int unixTimeStamp)
+ {
+ DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+ long lTime = long.Parse(unixTimeStamp + "0000000");
+ TimeSpan toNow = new TimeSpan(lTime);
+ DateTime dtResult = dtStart.Add(toNow);
+ return dtResult;
+ }
}
}
--
Gitblit v1.8.0