From 6ad070dbf9a88bb95a6eb38ed40e91959ca56115 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 10 一月 2023 10:18:25 +0800
Subject: [PATCH] 空调控制界面优化
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 16 +++++++++++-----
HDL_ON/UI/MainPage.cs | 1 +
HDL_ON/UI/UI1-Login/LoginPage.cs | 3 ++-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 3d3d5ad..2c95b5e 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -141,6 +141,7 @@
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
+ _RoomNotSupportFunctionList.Add(SPK.SensorLight);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
}
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a17b965..e960ea7 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -226,7 +226,8 @@
//etAccount.Text = "13288623489";//缃楁檽涓�
//etAccount.Text = "18244942707";
//etAccount.Text = "13143792049";
- etAccount.Text = "18688414428";
+ //etAccount.Text = "18688414428";
+ etAccount.Text = "18244942707";
}
else
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index f956017..1289164 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -129,7 +129,13 @@
}
else
{
- btnTemp.Text = setTempAttr.curValue.ToString();
+ if (setTempAttr.curValue.ToString().Contains("."))
+ {
+ btnTemp.Text = setTempAttr.curValue.ToString().Split(".")[0];
+ }else
+ {
+ btnTemp.Text = setTempAttr.curValue.ToString();
+ }
}
btnTemp.Width = btnTemp.GetTextWidth();
FrameWhiteCentet1.AddChidren(btnTemp);
@@ -971,15 +977,15 @@
{
btnSwitch.IsSelected = true;
//setTempBar.IsOffline = false;
- setTempBar.Enable = true;
- setTempBar.ProgressBarColor = CSS_Color.MainColor;
+ //setTempBar.Enable = true;
+ //setTempBar.ProgressBarColor = CSS_Color.MainColor;
}
else
{
btnSwitch.IsBold = false;
//setTempBar.IsOffline = true;
- setTempBar.Enable = false;
- setTempBar.ProgressBarColor = CSS_Color.DividingLineColor;
+ //setTempBar.Enable = false;
+ //setTempBar.ProgressBarColor = CSS_Color.DividingLineColor;
}
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, device.trait_on_off.curValue.ToString());
--
Gitblit v1.8.0