From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
index 045ed5d..aab6fc4 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -70,7 +70,9 @@
//鍦烘櫙鐐瑰嚮
sceneContr.ButtonClickEvent += (sender, e) =>
{
- this.SceneUpHandler();
+ //涓嶈兘鍙嶅鐐瑰嚮
+ sceneContr.CanClick = false;
+ this.SceneUpHandler(sceneContr);
};
//鏀惰棌
@@ -243,8 +245,13 @@
{
//闅愯棌鍙冲垝鑿滃崟
this.HideMenu();
- scene.SceneDelayTime = t;
- btnDelayTime.Text = CommonFormResouce.GetTimeString(t);
+ if (t != 0)
+ {
+ scene.SceneDelayTime = t;
+ btnDelayTime.Text = CommonFormResouce.GetTimeString(t);
+ //缂栬緫寤舵椂鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+ }
};
};
}
@@ -254,9 +261,8 @@
/// <summary>
///
/// </summary>
- /// <param name="btnScenePic"></param>
- /// <param name="btnSceneName"></param>
- private async void SceneUpHandler()
+ /// <param name="sceneContr"></param>
+ private async void SceneUpHandler(ScenePictrueControl sceneContr)
{
if (scene.SceneDelayTime <= 0 && scene.RemainTime <= 0)
{
@@ -267,6 +273,7 @@
var result = await HdlSceneLogic.Current.ControlScene(scene);
if (result == false)
{
+ sceneContr.CanClick = true;
return;
}
@@ -274,8 +281,12 @@
scene.SceneDelayTime = 0;
if (scene.RemainTime <= 0)
{
+ sceneContr.CanClick = true;
return;
}
+ //璋冪敤鏈夊欢鏃剁殑鍦烘櫙,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
int myRemainTime = scene.RemainTime;
//寮�鍚唴閮ㄥ欢鏃舵椂闂寸嚎绋�(鏃ㄥ湪鍏ㄩ儴鍦版柟鐨勫悓涓�鍦烘櫙鏃堕棿鍚屾)
HdlSceneLogic.Current.StartDelayTimeThread(scene);
@@ -285,21 +296,22 @@
while (myRemainTime > 0 && this.Parent != null)
{
System.Threading.Thread.Sleep(1000);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
SetTimeText(CommonFormResouce.GetTimeString(scene.RemainTime));
- });
+ }, ShowErrorMode.NO);
myRemainTime--;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (this.Parent != null)
{
SetTimeImage();
//鐩存帴寮�鍚疞oading鐗规晥
this.StartLoadingApreal();
+ sceneContr.CanClick = true;
}
- });
+ }, ShowErrorMode.NO);
})
{ IsBackground = true }.Start();
}
--
Gitblit v1.8.0