From fba3a6c55c4de790eaeee55f9897d668bb36dbb8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 13 十月 2022 13:55:21 +0800
Subject: [PATCH] 2022年10月13日13:55:00
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 140 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 124 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index c13e415..4f5815c 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -193,7 +193,12 @@
#if DEBUG
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
+ var imageUrl = ImageUtlis.Current.GetSceneDefaultIconList();
+ if (imageUrl != null)
+ {
+
+ }
//if (UserInfo.Current.VerOpenDoorPw || string.IsNullOrEmpty(UserInfo.Current.doorPasswordString))
//{
// var page = new DoorLockUnlockPage(new Function());
@@ -591,19 +596,38 @@
}
});
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯姣背娉紶鎰熷櫒",
+ // spk = SPK.SenesorMegahealth,
+ // attributes = new List<FunctionAttributes>
+ // {
+ // new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
+ // new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
+ // new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
+ // new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ // new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
+ // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ // }
+ //});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯姣背娉紶鎰熷櫒",
- spk = SPK.SenesorMegahealth,
+ name = "娴嬭瘯娓╂帶鍣�",
+ spk = SPK.HvacCac,
attributes = new List<FunctionAttributes>
{
- new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
- new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
- new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
- new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
- new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
- //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ new FunctionAttributes(){ key = "on_off",curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = "cac_valve",curValue = "on",state = "on" },//姣涚粏闃�
+ new FunctionAttributes(){ key = "fh_valve",curValue = "on",state = "on" },//鍦版殩闃�
+ new FunctionAttributes(){ key = "mode",curValue = "cool",state = "cool", value = new List<string>{ "cool","heat"} },
+ new FunctionAttributes(){ key = "set_temp",curValue = "20",state = "20",min = 16,max = 30 },
+ new FunctionAttributes(){ key = "room_temp",curValue = "20",state = "20" },
+ new FunctionAttributes(){ key = "dew_point_temp",curValue = "20",state = "20" },//闇茬偣娓╁害
+ new FunctionAttributes(){ key = "surface_temp",curValue = "20",state = "20" },//琛ㄩ潰娓╁害
+ new FunctionAttributes(){ key = "energy_saving",curValue = "true",state = "true" },//鑺傝兘
+ new FunctionAttributes(){ key = "room_humidity",curValue = "66",state = "66" },
//new FunctionAttributes(){ key = "",curValue = "",state = "" },
}
});
@@ -1017,11 +1041,16 @@
LoadDeviceFunctionDiv(functionView, function);
index++;
-
- if (!function.online)
+ if(SPK.ArmSensorSpkList().Contains(function.spk))
{
- btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
+ btnbg.SelectedImagePath = "Collection/FunctionArmOnbg.png";
}
+
+ //if (!function.online)
+ //{
+ // btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ //}
}
if (index == 0)
@@ -1159,9 +1188,6 @@
};
view.AddChidren(btnIcon);
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
-
Button btnName;
btnName = new Button()
{
@@ -1192,6 +1218,7 @@
};
view.AddChidren(btnZone);
+
Button btnState;
btnState = new Button()
{
@@ -1206,6 +1233,69 @@
Tag = "state",
Text = function.lastState
};
+
+
+ if (function.spk == SPK.SenesorMegahealth)
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
+ btnName.TextColor = CSS_Color.MainBackgroundColor;
+ btnZone.TextColor = CSS_Color.MainBackgroundColor;
+ btnState.TextColor = CSS_Color.MainBackgroundColor;
+
+ var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
+ if (tempStatus != null)
+ {
+ switch (tempStatus.state)
+ {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ case "0":
+ function.lastState = Language.StringByID(StringId.SensorNormalState);
+ break;
+ case "1":
+ function.lastState = Language.StringByID(StringId.SomeoneIn);
+ break;
+ case "2":
+ if (function.extSet.labModel)
+ {
+ function.lastState = Language.StringByID(StringId.SomeoneRunning);
+ }
+ else
+ {
+ function.lastState = Language.StringByID(StringId.Someone);
+ }
+ break;
+ case "3":
+ if (function.extSet.labModel)
+ {
+ function.lastState = Language.StringByID(StringId.SomeoneSitting);
+ }
+ else
+ {
+ function.lastState = Language.StringByID(StringId.Someone);
+ }
+ break;
+ case "4":
+ function.lastState = Language.StringByID(StringId.SomeoneFell);
+ break;
+ case "5":
+ if (function.extSet.labModel)
+ {
+ function.lastState = Language.StringByID(StringId.SomeoneStanding);
+ }
+ else
+ {
+ function.lastState = Language.StringByID(StringId.Someone);
+ }
+ break;
+ }
+ btnState.Text = function.lastState;
+ }
+ }
+ else
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ }
if (function.spk != SPK.LightSwitch)
{
@@ -1321,7 +1411,7 @@
function.SetAttrState("on_off", status);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("on_off", status);
- Music.SendMethod.mMethod.SendControlCommand(function, dic);
+ Music.SendMethod.Current.SendControlCommand(function, dic);
};
}
@@ -1357,6 +1447,24 @@
LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
}
+
+ else if (function.spk == SPK.SenesorMegahealth)
+ {
+ //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
+ //btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
+ //btnIcon.IsSelected = true;
+ btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
+ btnState.TextColor = CSS_Color.MainColor;//PromptingColor1
+ }
+
+ //绱ф�ユ眰鍔�
+ else if (function.spk == SPK.SensorHelp)
+ {
+ btnName.TextColor = CSS_Color.MainBackgroundColor;
+ btnName.SelectedTextColor = CSS_Color.MainBackgroundColor;
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ }
else
{
--
Gitblit v1.8.0