From 0f5d7d18f98d6d961b3d21dc2b1b59905e261fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 23 二月 2021 17:09:17 +0800
Subject: [PATCH] 20210223-1

---
 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index f81a3b0..8464dfc 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -61,7 +61,10 @@
             }
             LoadDiv();
 
-            if (function.Spk_Prefix == FunctionCategory.Curtain || function.Spk_Prefix == FunctionCategory.Music)//绐楀笜娌℃湁寮�鍏虫寜閽�
+            if (function.Spk_Prefix == FunctionCategory.Curtain//绐楀笜娌℃湁寮�鍏虫寜閽�
+                || function.Spk_Prefix == FunctionCategory.Music//闊充箰娌℃湁寮�鍏虫寜閽�
+                || function.Spk_Prefix == FunctionCategory.Sensor//浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�
+                )
             {
                 switch (function.Spk_Prefix)
                 {
@@ -79,6 +82,24 @@
                                 break;
                         }
                         CurtainFragment();
+                        break;
+                    case FunctionCategory.Sensor:
+                        switch (function.spk)
+                        {
+                            case SPK.SensorPir:
+                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorPirIcon.png";
+                                break;
+                            case SPK.SensorWater:
+                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorWaterImmersionIcon.png";
+                                break;
+                            case SPK.SensorSmoke:
+                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeIcon.png";
+                                break;
+                            case SPK.SensorDoorWindow:
+                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorDoorIcon.png";
+                                break;
+
+                        }
                         break;
                     case FunctionCategory.Music:
                         btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
@@ -239,7 +260,7 @@
             };
             //bodyDiv.AddChidren(btnCollectionIcon);
             //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
-            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare && function.Spk_Prefix != FunctionCategory.Sensor)
             {
                 bodyDiv.AddChidren(btnCollectionIcon);
             }
@@ -397,7 +418,6 @@
             LoadEvent_ControlMusic(btnPlay, btnNext, btnPrev, function as A31MusicModel);
             #endregion
         }
-
 
         /// <summary>
         /// 鍔犺浇鍔熻兘鐘舵�佷俊鎭寜閽�

--
Gitblit v1.8.0