From 1cd93851bde6ec19c07f1445899a76ab0dfa507d Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 13 四月 2023 16:01:53 +0800
Subject: [PATCH] 1.增加推送判断是否加载了类的方法 2.修改launch screen引用 3.去掉门锁测试环境appkey逻辑
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index d82a852..887adeb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -485,13 +485,13 @@
btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";
};
- //浼氬 3000k
+ //浼氬 4500k
var btnMeet = new Button();
btnMeet.X = btnMeetIcon.Right + Application.GetRealWidth(12);
btnMeet.Y = btnMeetIcon.Y;
btnMeet.Width = Application.GetRealWidth(100);
btnMeet.Height = Application.GetRealWidth(24);
- btnMeet.Text = Language.StringByID(StringId.MeetingGuests) + " 3000K";
+ btnMeet.Text = Language.StringByID(StringId.MeetingGuests) + " 4500K";
btnMeet.TextSize = CSS_FontSize.TextFontSize;
btnMeet.TextColor = CSS_Color.FirstLevelTitleColor;
btnMeet.SelectedTextColor = CSS_Color.MainColor;
@@ -499,7 +499,7 @@
frameWhite.AddChidren(btnMeet);
btnMeet.MouseUpEventHandler += (sender, e) =>
{
- barColorTemplatrue.Progress = 30;
+ barColorTemplatrue.Progress = 45;
function.SetAttrState(FunctionAttributeKey.CCT, barColorTemplatrue.Progress * 100);
barColorTemplatrue.SetCustomText((barColorTemplatrue.Progress * 100) + "K");
frameBack.Close();
@@ -563,7 +563,7 @@
btnCozy.IsSelected = true;
btnCozyIcon.IsSelected = true;
}
- if (function.GetAttrState(FunctionAttributeKey.CCT) == "3000")
+ if (function.GetAttrState(FunctionAttributeKey.CCT) == "4500")
{
btnMeet.IsSelected = true;
btnMeetIcon.IsSelected = true;
--
Gitblit v1.8.0