From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
index 645b3dc..1e95885 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
@@ -60,6 +60,7 @@
this.ButtonClickEvent += (sender, e) =>
{
//璋冪敤鍦烘櫙
+ this.CanClick = false;
this.SetSceneAction();
};
}
@@ -125,12 +126,17 @@
timeSelect.Init();
timeSelect.TimeAction = (time) =>
{
+ //閫夋嫨鐨勬槸涓嶅紑鍚�
+ if (time == 0) { return; }
+
i_scene.SceneDelayTime = time;
//鏃堕棿鍥炬爣涓嶆樉绀�
this.btnTimeIcon.Visible = false;
//鏄剧ず鍓╀綑鐨勬椂闂�
this.btnTimeView.Text = this.GetTimeString(time, hourText, minuText, secondText);
+ //閫夋嫨寤舵椂鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
};
};
@@ -195,7 +201,13 @@
var result = await HdlSceneLogic.Current.ControlScene(scene);
if (result == false)
{
+ this.CanClick = true;
return;
+ }
+ if (scene.SceneDelayTime > 0)
+ {
+ //璋冪敤鏈夊欢鏃剁殑鍦烘櫙,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
//淇敼鏃堕棿
scene.RemainTime = scene.SceneDelayTime;
@@ -236,6 +248,7 @@
}
//寮�鍚欢鏃跺�掕鏃剁壒鏁�
+ this.CanClick = false;
this.StartRemainTimeApreal(i_scene);
}
@@ -251,6 +264,7 @@
{
if (i_scene.RemainTime <= 0)
{
+ this.CanClick = true;
return;
}
int remainTine = i_scene.RemainTime;
@@ -284,6 +298,7 @@
this.btnTimeView.Text = string.Empty;
//鐩存帴寮�鍚疞oading鐗规晥
this.StartLoadingApreal();
+ this.CanClick = true;
});
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0