From 631f94758c3cb42abcdda8094e77895f376eff16 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:53:43 +0800
Subject: [PATCH] 2021-1-12-3
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index dd81a73..3e62c97 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -504,20 +504,20 @@
//FunctionType ft = FunctionType.A31Music
//switch (item)
//{
- // case FunctionType.FloorHeating:
+ // case SPK.FloorHeatStandard:
// break;
- // case FunctionType.AC:
+ // case SPK.AcStandard:
// break;
- // case FunctionType.MotorCurtain:
- // case FunctionType.Curtain:
- // case FunctionType.RollingShutter:
+ // case SPK.CurtainTrietex:
+ // case SPK.CurtainSwitch:
+ // case SPK.CurtainRoller:
// break;
- // case FunctionType.Relay:
- // case FunctionType.Dimmer:
- // case FunctionType.RGB:
- // case FunctionType.ColorTemperature:
+ // case SPK.LightSwitch:
+ // case SPK.LightDimming:
+ // case SPK.LightRGB:
+ // case SPK.LightCCT:
// break;
- // case FunctionType.Socket:
+ // case SPK.ElectricSocket:
// break;
//}
FrameLayout functionView = new FrameLayout()
@@ -528,7 +528,6 @@
Tag = item + "_View",
Y = index % 2 == 1 ? lastY2 : lastY1
};
- MainPage.Log($"Load FunctionView Tag = {item}");
//楂樺害绋嶉珮鐨剉iew
if (specialList.Contains(index))
{
@@ -928,7 +927,7 @@
Text = floor.roomName,
TextSize = CSS_FontSize.SubheadingFontSize,
IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
- IsMoreLines = true,
+ //IsMoreLines = true,
};
contentView.AddChidren(btnHomeName);
--
Gitblit v1.8.0