From 98d002e55304e5c8ff13b7cd195920975bef69f5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:16:57 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
old mode 100755
new mode 100644
index e3020d9..8464dfc
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -53,6 +53,7 @@
/// </summary>
public void LoadFunctionDiv()
{
+ //todo 澧炲姞璁惧锛屽鍔犲姛鑳藉垪琛ㄥ崱鐗�
if (function == null)
{
this.RemoveFromParent();
@@ -60,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)
{
@@ -78,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";
@@ -172,6 +194,9 @@
case SPK.ElectricTuyaWeepRobot:
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobotThinIcon.png";
break;
+ case SPK.ElectricTuyaWaterValve:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WaterValve/WaterValveIcon.png";
+ break;
}
btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
break;
@@ -235,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);
}
@@ -393,7 +418,6 @@
LoadEvent_ControlMusic(btnPlay, btnNext, btnPrev, function as A31MusicModel);
#endregion
}
-
/// <summary>
/// 鍔犺浇鍔熻兘鐘舵�佷俊鎭寜閽�
--
Gitblit v1.8.0