From 46a177eb1acf7ce91af7fe9ff57af87228de938d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 十月 2023 10:03:24 +0800
Subject: [PATCH] IOS库更新
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index f15644f..99e296c 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -38,12 +38,18 @@
/// 鏄惁鍦ㄨ皟鍏�
/// </summary>
bool onDimmerBar;
+ /// <summary>
+ /// 鍒犻櫎璁惧鍚庡洖璋冪粰鐣岄潰鍒锋柊
+ /// </summary>
+ Action action;
+
#endregion
- public FunctionControlZone(Function func)
+ public FunctionControlZone(Function func,Action action)
{
bodyDiv = this;
bodyDiv.Tag = func.sid;
function = func;
+ this.action = action;
}
public override void RemoveFromParent()
@@ -72,7 +78,11 @@
}
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
-
+ if(function.spk == SPK.GroupControl || function.spk == SPK.CommonSeries)
+ {
+ //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/lightswitch.png";
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/groupControl.png";
+ }
if (SPK.CurtainSpkList().Contains(function.spk))
{//绐楀笜娌℃湁寮�鍏虫寜閽�
CurtainFragment();
@@ -188,8 +198,14 @@
}
else if (function.spk == SPK.VideoDoorLock)
{
- btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon;
+ btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
}
+ else if (function.spk == SPK.AvZkAiks)
+ {
+ //闅愯棌寮�鍏虫寜閽�
+ btnIcon.UnSelectedImagePath = "AksIcon/aks.png";
+ }
+ else if(function.spk == SPK.GroupControl) { }
else if (function.spk == SPK.HvacCac)
{
var btnHumidityIcon = new Button()
@@ -260,7 +276,7 @@
{
ClothesHangerFragment();
}
- else if(function.spk == SPK.IpCam_Imou)
+ else if(function.spk == SPK.IpCam_Imou || function.spk == SPK.ElectricEnergy || function.spk ==SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
{
}
@@ -272,7 +288,7 @@
/// 寮�鍏虫寜閽�
/// </summary>
Button btnSwitch;
- if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+ if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
btnSwitch = new Button()
{
@@ -435,6 +451,7 @@
};
if ( !SPK.ArmSensorSpkList().Contains(function.spk)
&& function.spk != SPK.DoorLock
+ && function.spk != SPK.GroupControl
&& !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
{
bodyDiv.AddChidren(btnCollectionIcon);
@@ -445,7 +462,7 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
- if (!function.online)
+ if (!function.isOnline())
{
bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
btnOffline = new Button()
@@ -460,6 +477,19 @@
};
bodyDiv.AddChidren(btnOffline);
}
+ //鎺掑簭
+ //btnIcon.MouseLongEventHandler = (sender, e) => {
+ // OrderEvent();
+ //};
+ //btnName.MouseLongEventHandler = (sender, e) => {
+ // OrderEvent();
+ //};
+ //btnFromFloor.MouseLongEventHandler = (sender, e) => {
+ // OrderEvent();
+ //};
+ //bodyDiv.MouseLongEventHandler = (sender, e) => {
+ // OrderEvent();
+ //};
}
/// <summary>
@@ -472,6 +502,7 @@
case SPK.LightDimming:
case SPK.LightRGBW:
case SPK.LightRGB:
+ case SPK.LightCCT:
#region Dimmer
var btnDimmerMinValues = new Button()
{
@@ -622,6 +653,11 @@
}
/// <summary>
+ /// 鎺掑簭浜嬩欢
+ /// </summary>
+ public Action OrderEvent;
+
+ /// <summary>
/// 鍔犺浇闊充箰鍔熻兘鎺у埗鍗＄墖
/// </summary>
void MusicFragment()
--
Gitblit v1.8.0