From 8465d2e7af612a505cbf65dc50bd507ee4abd316 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 03 八月 2023 23:37:14 +0800
Subject: [PATCH] ios echats图表问题修复
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index a639e02..dc454e8 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -143,7 +143,7 @@
//}.Show(MainPage.BaseView);
return;
}
- if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
+ if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB || function.spk == SPK.LightCCT)
{
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
onDimmerBar = true;
@@ -405,17 +405,17 @@
/// </summary>
void LoadEvent_DivSkipEvent()
{
- if (function.spk == SPK.GroupControl)
- {
- EventHandler<MouseEventArgs> handler = (sender, e) => {
- var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
- dialog.ShowDialog();
- };
- this.MouseUpEventHandler = handler;
- btnName.MouseUpEventHandler = handler;
- btnFromFloor.MouseUpEventHandler = handler;
- return;
- }
+ //if (function.spk == SPK.GroupControl)
+ //{
+ // EventHandler<MouseEventArgs> handler = (sender, e) => {
+ // var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+ // dialog.ShowDialog();
+ // };
+ // this.MouseUpEventHandler = handler;
+ // btnName.MouseUpEventHandler = handler;
+ // btnFromFloor.MouseUpEventHandler = handler;
+ // return;
+ //}
var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action);
this.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0