From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs | 108 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
index 8a7f32d..424eb2f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
@@ -60,19 +60,58 @@
ZigBee.Device.ZbGateway.StatusList.Add(this);
}
- #region 鈼� 鍙橀噺鐢虫槑__________________________
+ #region 鍙橀噺鐢虫槑
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣
+ /// </summary>
ZigBee.Device.DoorLock doorLock;
+ /// <summary>
+ /// 璁剧疆鏃堕棿绫诲瀷
+ /// </summary>
string setTimeType = "";
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣鏃堕棿
+ /// </summary>
DateTime CurentDoorLockTime;
+ /// <summary>
+ /// 鏄剧ず鏃ユ湡鐨勬枃鏈�
+ /// </summary>
Button textDisplayDate;
+ /// <summary>
+ /// 鏄剧ず鏃堕棿鐨勬枃鏈�
+ /// </summary>
Button textDisplayTime;
+ /// <summary>
+ /// 鏈湴鍙橀噺鈥滃勾鈥�
+ /// </summary>
int curYear = 0;
+ /// <summary>
+ /// 鏈湴鍙橀噺鈥滄湀鈥�
+ /// </summary>
int curMonth = 0;
+ /// <summary>
+ /// 鏈湴鍙橀噺鈥滄棩鈥�
+ /// </summary>
int curDay = 0;
+ /// <summary>
+ /// 鏈湴鍙橀噺鈥滄椂鈥�
+ /// </summary>
int curHour = 0;
+ /// <summary>
+ /// 鏈湴鍙橀噺鈥滃垎鈥�
+ /// </summary>
int curMin = 0;
+ /// <summary>
+ /// 鏈湴鍙橀噺鈥滅鈥�
+ /// </summary>
int curSec = 0;
+ /// <summary>
+ /// 璁剧疆鏃堕棿鐨凙ction
+ /// </summary>
public Action timeSetAction;
+ /// <summary>
+ /// 绛夊緟鑾峰彇闂ㄩ攣鏃剁殑绛夊緟鏃堕棿
+ /// </summary>
DateTime waitGetDoorLockTime = DateTime.MaxValue;
#endregion
@@ -112,7 +151,9 @@
this.MidFrameLayout(this);
MidFrameLayoutContent();
}
-
+ /// <summary>
+ /// 涓儴甯冨眬
+ /// </summary>
public void MidFrameLayoutContent()
{
if (setTimeType == "DoorLockTime")
@@ -149,6 +190,7 @@
var dtNow = DateTime.Now;
for (int i = 0; i < 2; i++)
{
+ #region MidTopFrameLayout UI
var rowLayout = new FrameLayout()
{
Height = Application.GetRealHeight(127 + 23),
@@ -200,7 +242,9 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
};
MidTopFrameLayout.AddChidren(btnLine);
+ #endregion
+ #region 鏄剧ず澶勭悊
if (i == 0)
{
btnDateTime.Y = textDisplayDateFrameLayout.Y = btnNextFrameLayout.Y = Application.GetRealHeight(50);
@@ -278,6 +322,9 @@
}
btnLine.Visible = false;
}
+ #endregion
+
+ #region 浜嬩欢澶勭悊
int curIndex = i;
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
@@ -577,6 +624,7 @@
textDisplayDateFrameLayout.MouseDownEventHandler += hander;
btnNextFrameLayout.MouseDownEventHandler += hander;
btnNext.MouseDownEventHandler += hander;
+
if (curIndex == 0)
{
textDisplayDate.MouseDownEventHandler += hander;
@@ -585,44 +633,54 @@
{
textDisplayTime.MouseDownEventHandler += hander;
}
+ #endregion
}
btnCancel.MouseUpEventHandler += (sender1, e1) =>
{
this.shadowRadiusFrameLayout.RemoveFromParent();
};
- btnFinish.MouseUpEventHandler += async (sender1, e1) =>
+ btnFinish.MouseUpEventHandler += (sender1, e1) =>
{
if (setTimeType == "DoorLockTime")
- {
- var curDateTime = new DateTime(curYear, curMonth, curDay, curHour, curMin, curSec);
- var setTimestamp = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetUnixTimeStamp(curDateTime);
- try
- {
- CommonPage.Loading.Start("");
- var rectifyResult = await doorLock.RectifyDoorLockTimeAsync(int.Parse(setTimestamp));
- if (rectifyResult != null && rectifyResult.setWritableValueResponData != null)
+ {
+ System.Threading.Tasks.Task.Run(async () => {
+ try
{
- if (rectifyResult.setWritableValueResponData.Status == 0)
+ var curDateTime = new DateTime(curYear, curMonth, curDay, curHour, curMin, curSec);
+ var setTimestamp = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetUnixTimeStamp(curDateTime);
+ Application.RunOnMainThread(() => {
+ CommonPage.Loading.Start("");
+ });
+ var rectifyResult = await doorLock.RectifyDoorLockTimeAsync(int.Parse(setTimestamp));
+ if (rectifyResult != null && rectifyResult.setWritableValueResponData != null)
{
- this.shadowRadiusFrameLayout.RemoveFromParent();
+ Application.RunOnMainThread(() => {
+ if (rectifyResult.setWritableValueResponData.Status == 0)
+ {
+ doorLock.ReadAttri(ZigBee.Device.Cluster_ID.DoorLock, ZigBee.Device.AttriButeId.DoorLock);
+ System.Threading.Thread.Sleep(1000);
+ this.shadowRadiusFrameLayout.RemoveFromParent();
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RectifyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ }
+ });
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RectifyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ Application.RunOnMainThread(() => {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ });
}
}
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Hide(); });
}
- }
- catch { }
- finally
- {
- System.Threading.Thread.Sleep(3000);
- CommonPage.Loading.Hide();
- }
+ });
}
};
this.shadowRadiusFrameLayout.MouseUpEventHandler += (sender1, e1) =>
@@ -640,7 +698,7 @@
}
}
- #region 鈼� 鎺ュ彛瀹炵幇__________________________
+ #region 鎺ュ彛瀹炵幇
/// <summary>
/// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
/// </summary>
--
Gitblit v1.8.0