From 4f0ab0ad21ce450b7856d50f98322a7899361386 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:30:01 +0800
Subject: [PATCH] 不要下载这个备份

---
 ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
index 58b89b3..c674940 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();
             };
         }
@@ -86,7 +87,7 @@
             //鍦烘櫙鑳屾櫙鍥炬帶浠�
             this.btnSceneBackGroud = new PicViewControl(this.Width, this.Height, false);
             btnSceneBackGroud.UnSelectedImagePath = "Scene/Background.png";
-            this.AddChidren(btnSceneBackGroud, ChidrenBindMode.BindEventOnly);
+            this.AddChidren(btnSceneBackGroud, ChidrenBindMode.BindEvent);
 
             //寤舵椂鏃堕棿鏄剧ず鎺т欢
             this.btnTimeView = new NormalViewControl(HdlControlLogic.Current.GetPictrueRealSize(280), HdlControlLogic.Current.GetPictrueRealSize(63), false);
@@ -98,7 +99,7 @@
             {
                 btnTimeView.Text= this.GetTimeString(i_scene.SceneDelayTime, hourText, minuText, secondText);
             }
-            this.AddChidren(btnTimeView, ChidrenBindMode.BindEventOnly);
+            this.AddChidren(btnTimeView, ChidrenBindMode.BindEvent);
 
             //鏃堕棿鍥炬爣鎺т欢
             this.btnTimeIcon = new IconViewControl(63);
@@ -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;
                 };
             };
 
@@ -150,7 +156,7 @@
                 {
                     //鍙栨秷鏀惰棌
                     HdlSceneLogic.Current.DeleteLoveScene(i_scene);
-                    if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+                    if (HdlRoomLogic.Current.NowMainPageRoom.IsLove == true)
                     {
                         //濡傛灉褰撳墠鎴块棿鏄垜鐨勫枩鐖辩殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑浜嬩欢
                         this.CardNeedRemoveEvent?.Invoke();
@@ -169,7 +175,7 @@
             btnSceneName.Y = HdlControlLogic.Current.GetPictrueRealSize(236);
             btnSceneName.IsBold = true;
             btnSceneName.TextColor = UserCenterColor.Current.White;
-            this.AddChidren(btnSceneName, ChidrenBindMode.BindEventOnly);
+            this.AddChidren(btnSceneName, ChidrenBindMode.BindEvent);
 
             //鍒锋柊鎺т欢鐘舵��
             this.RefreshControlInfo(i_scene);
@@ -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;
@@ -271,20 +285,21 @@
                 while (remainTine > 0 && this.Parent != null)
                 {
                     System.Threading.Thread.Sleep(1000);
-                    Application.RunOnMainThread(() =>
+                    HdlThreadLogic.Current.RunMain(() =>
                     {
                         this.btnTimeView.Text = this.GetTimeString(remainTine, hourText, minuText, secondText);
-                    });
+                    }, ShowErrorMode.NO);
                     remainTine--;
                 }
-                Application.RunOnMainThread(() =>
+                HdlThreadLogic.Current.RunMain(() =>
                 {
                     //鍊掕鏃剁粨鏉熸椂锛屾椂闂村浘鏍囨樉绀�
                     this.btnTimeIcon.Visible = true;
                     this.btnTimeView.Text = string.Empty;
                     //鐩存帴寮�鍚疞oading鐗规晥
                     this.StartLoadingApreal();
-                });
+                    this.CanClick = true;
+                }, ShowErrorMode.NO);
             })
             { IsBackground = true }.Start();
         }

--
Gitblit v1.8.0