From 9c2f7a430c9b475123ac0c4889074911d4e5a01e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期六, 09 五月 2020 17:58:07 +0800
Subject: [PATCH] 2020-05-09-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 122 +++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 52 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 0927e3a..fa90f8c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -3,12 +3,12 @@
using Shared.Common;
using Shared.R;
using Shared;
+using Shared.Phone.UserCenter.DoorLock;
namespace Shared.Phone.Device.Logic
{
public class SoneLogicList : FrameLayout
{
-
public static SoneLogicList soneLogicList;
public SoneLogicList()
{
@@ -16,7 +16,7 @@
soneLogicList = this;
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
- public Action<bool> action;
+ public Action<bool> action;
///绗簩鍧楃涓�绾х埗鎺т欢
FrameLayout fLayout = new FrameLayout();
///甯稿紑妯″紡鍥炬爣
@@ -32,7 +32,6 @@
public async void Show()
{
-
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -41,10 +40,6 @@
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
UserView.HomePage.Instance.ScrollEnabled = true;
- if (updateThread != null && updateThread.IsAlive)
- {
- updateThread.Abort();
- }
//鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
soneLogicList = null;
this.RemoveFromParent();
@@ -213,7 +208,7 @@
/// </summary>
public async void ModeView()
{
-
+
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
/// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
@@ -242,23 +237,35 @@
button1.MouseUpEventHandler = async (sender, e) =>
{
- var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
- if (result)
+ CommonPage.Loading.Start();
+ try
{
- if (logic != null)
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ if (result)
{
- ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
- ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
- Send.DelLogic(logic.LogicId);
+ if (logic != null)
+ {
+ ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
+ Send.DelLogic(logic.LogicId);
+ }
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+ ModeView();
}
- Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
- ModeView();
+ else
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
+ }
}
- else
+ catch { }
+ finally
{
- LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
- }
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ }
};
if (logic != null)
{
@@ -271,21 +278,11 @@
button2.TextSize = 15;
button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
- }
- else
- {
- button2.Width = Application.GetRealWidth(0);
- button2.Height = Application.GetRealHeight(0);
- }
- ///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
- try
- {
-
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"));//褰撳墠绯荤粺鏃堕棿
- var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
int days = int.Parse(d) + dayInt;
@@ -296,7 +293,13 @@
string text5 = Language.StringByID(MyInternationalizationString.executeSone);
button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
}
- catch { }
+ else {
+ button2.Y = Application.GetRealHeight(0);
+ button2.X = Application.GetRealWidth(0);
+ button2.Width = Application.GetRealWidth(0);
+ button2.Height = Application.GetRealHeight(0);
+ }
+
}
else
@@ -332,6 +335,7 @@
button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png";
button2.TextSize = 15;
button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+ button2.Text ="";
button2.MouseUpEventHandler = (sender, e) =>
{
@@ -340,9 +344,11 @@
{///鍐嶆纭
LogicView.TipView.ShowInputTip(true, async (str) =>
{///纭鍙戦�佸懡浠�
+ CommonPage.Loading.Start();
try
{
///xm
+
var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
if (!result)
{
@@ -365,11 +371,20 @@
Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
ModeView();
+
}
}
catch
{
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+
+ });
}
});
@@ -597,30 +612,33 @@
}
}
+
+ //public static Action<bool> action1=DoorLockCommonInfo.LogicAction;
+
+
/// <summary>
/// 瀹氭椂鏇存柊甯稿紑妯″紡(闃叉閫氳繃闂ㄩ攣鍏抽棴娌″強鏃跺埛鏂扮姸鎬�)
/// </summary>
- System.Threading.Thread updateThread;
- public void UpdateModeIcon()
- {
- updateThread = new System.Threading.Thread(() =>
- {
- while (this.Parent != null)
- {
- System.Threading.Thread.Sleep(1000);
- Application.RunOnMainThread(() =>
- {
- try
- {
- ModeView();
- }
- catch { }
-
- });
- }
- });
- updateThread.Start();
- }
+ //System.Threading.Thread updateThread;
+ //public void UpdateModeIcon()
+ //{
+ // updateThread = new System.Threading.Thread(() =>
+ // {
+ // while (this.Parent != null)
+ // {
+ // System.Threading.Thread.Sleep(1000);
+ // Application.RunOnMainThread(() =>
+ // {
+ // try
+ // {
+ // ModeView();
+ // }
+ // catch { }
+ // });
+ // }
+ // });
+ // updateThread.Start();
+ //}
}
--
Gitblit v1.8.0