From d9338a1defea49b1173640b0d637ebd6e89ab14e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 19:49:26 +0800
Subject: [PATCH] 20201218-5

---
 HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
old mode 100755
new mode 100644
index 2626c25..d2180e5
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -16,15 +16,16 @@
         /// <param name="updataFunction"></param>
         public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView,Room room=null)
         {
-            try
+            Application.RunOnMainThread(() =>
             {
-                Application.RunOnMainThread(() =>
+
+                try
                 {
-                    if (view == null || scrolView == null)
+                    if (view == null || scrolView == null || updataFunction == null)
                     {
                         return;
                     }
-                    if(!scrolView.ScrollEnabled)
+                    if (!scrolView.ScrollEnabled)
                     {
                         return;
                     }
@@ -56,8 +57,8 @@
                                     {
                                         case FunctionCategory.Light:
                                         case FunctionCategory.Thermostat:
-                                            #region 鎸夐挳鐘舵�佹洿鏂�
-                                            if (cTag == updataFunction.sid + "_Switch")
+                                                #region 鎸夐挳鐘舵�佹洿鏂�
+                                                if (cTag == updataFunction.sid + "_Switch")
                                             {
                                                 try
                                                 {
@@ -68,9 +69,9 @@
                                                     MainPage.Log($"{this.GetType()} error 0 : {ex.Message}");
                                                 }
                                             }
-                                            #endregion
-                                            #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
-                                            else if (cTag == updataFunction.sid + "_DimmerBar")
+                                                #endregion
+                                                #region 璋冨厜鐘舵�佽繘搴︽洿鏂�
+                                                else if (cTag == updataFunction.sid + "_DimmerBar")
                                             {
                                                 try
                                                 {
@@ -90,9 +91,9 @@
                                                     MainPage.Log($"{this.GetType()} error 1 : {ex.Message}");
                                                 }
                                             }
-                                            #endregion
-                                            #region 鍔熻兘鐘舵�佷俊鎭洿鏂�
-                                            else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
+                                                #endregion
+                                                #region 鍔熻兘鐘舵�佷俊鎭洿鏂�
+                                                else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
                                             {
                                                 try
                                                 {
@@ -107,8 +108,8 @@
                                             break;
                                             #endregion
                                         case FunctionCategory.Curtain:
-                                            #region 绐楀笜鏇存柊
-                                            var uCurtain = updataFunction as Curtain;
+                                                #region 绐楀笜鏇存柊
+                                                var uCurtain = updataFunction as Curtain;
                                             if (cTag == updataFunction.functionType + "_off_" + updataFunction.sid)
                                             {
                                                 try
@@ -131,36 +132,35 @@
                                                     MainPage.Log($"{this.GetType()} error 4 : {ex.Message}");
                                                 }
                                             }
-                                            #endregion
-                                            break;
+                                                #endregion
+                                                break;
                                         case FunctionCategory.Music:
-                                            #region 闊充箰鏇存柊
-                                            var uMusic = updataFunction as Music.A31MusicModel;
+                                                #region 闊充箰鏇存柊
+                                                var uMusic = updataFunction as Music.A31MusicModel;
                                             if (cTag == updataFunction.functionType + "_State_" + updataFunction.sid)
                                             {
                                                 try
                                                 {
-                                                    (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play" ;
+                                                    (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play";
                                                 }
                                                 catch (Exception ex)
                                                 {
                                                     MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
                                                 }
                                             }
-                                            #endregion
-                                            break;
+                                                #endregion
+                                                break;
                                     }
                                 }
                             }
                         }
                     }
-                });
-            }
-            catch (Exception ex)
-            {
-                MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
-            }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
+                }
+            });
         }
-
-  }
+    }
 }

--
Gitblit v1.8.0