From eb9cf55fc8568cb2d4b4bfac9deb617ce766a7a5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 20 十二月 2019 14:58:37 +0800
Subject: [PATCH] 2019.12.30

---
 ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
index 7b3c175..74a7512 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
@@ -40,7 +40,10 @@
         /// sceneUI
         /// </summary>
         public SceneUI sceneUI;
-
+        /// <summary>
+        /// 褰撳墠鍦烘櫙鏈韩锛屾坊鍔犲満鏅椂浣跨敤
+        /// </summary>
+        public SceneUI currentSceneUI;
 
         #endregion
 
@@ -270,6 +273,10 @@
                 for (int i = 0; i < sceneList.Count; i++)
                 {
                     var scene = sceneList[i];
+                    if (currentSceneUI?.Id == scene.Id)
+                    {
+                        continue;
+                    }
                     if (beforeSceneTargetDeviceUIs.Find((obj) => obj.SceneUI.Id == scene.Id) != null)
                     {
                         continue;
@@ -286,7 +293,7 @@
                     sceneRowLayout.Init();
                     sceneRowLayout.SetTitle(scene.Name);
                     sceneRowLayout.ClickButton.Tag = scene;
-                    if(sceneUI==null)
+                    if (sceneUI == null)
                     {
                         if (i == 0)
                         {
@@ -297,7 +304,7 @@
                     }
                     else
                     {
-                        if(sceneUI.Id==scene.Id)
+                        if (sceneUI.Id == scene.Id)
                         {
                             tempSceneRow = sceneRowLayout;
                             sceneUI = scene;

--
Gitblit v1.8.0