From 76f93f093282d72e97894132277d3412b6bf8bea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 20 九月 2022 13:31:27 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 314 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 243 insertions(+), 71 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d4c6a4c..024382e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -194,18 +194,6 @@
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
- //if (UserInfo.Current.VerOpenDoorPw || string.IsNullOrEmpty(UserInfo.Current.doorPasswordString))
- //{
- // var page = new DoorLockUnlockPage(new Function());
- // MainPage.BasePageView.AddChidren(page);
- // page.LoadView();
- // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //}
- //else
- //{
- // Control.Ins.OneKeyUnlocking(new Function(), UserInfo.Current.doorPasswordString);
- //}
-
};
#endif
@@ -568,19 +556,157 @@
#if DEBUG
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯姊﹀够绐楀笜",
- spk = SPK.CurtainDream,
- sid = "1234577",
- attributes = new List<FunctionAttributes> {
- new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
- new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
+ spk = SPK.AcstParent,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ value = new List<string>
+ {
+ AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ AcstParent_Attr_ModeValueEnum.dry.ToString(),
+ AcstParent_Attr_ModeValueEnum.fan.ToString(),
+ AcstParent_Attr_ModeValueEnum.heat.ToString(),
+ AcstParent_Attr_ModeValueEnum.humidity.ToString(),
+ AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(),
+ }
+ },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ value = new List<string>()
+ {
+ AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ AcstParent_Attr_SceneValueEnum.leave_home.ToString(),
+ AcstParent_Attr_SceneValueEnum.sleep.ToString(),
+ }
+ },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
+ }
+ });
+
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
+ spk = SPK.AcstSub,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
+ spk = SPK.AcstSub,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
+ spk = SPK.AcstSub,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
+ spk = SPK.AcstSub,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
+ spk = SPK.AcstSub,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+
+
+
+
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯姊﹀够绐楀笜",
+ // spk = SPK.CurtainDream,
+ // sid = "1234577",
+ // attributes = new List<FunctionAttributes> {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
+ // new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
+ // }
+ //});
+
+ //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.HvacCac,
+ attributes = new List<FunctionAttributes>
+ {
+ 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 = "" },
}
});
//FunctionList.List.Functions.Add(new Function
//{
- // name = "娴嬭瘯闂ㄩ攣",
+ // name = "闂ㄩ攣",
// spk = SPK.DoorLock,
// sid = "12345",
// attributes = new List<FunctionAttributes> {
@@ -689,41 +815,10 @@
//{
// spk = SPK.AirFreshStandard,
// name = "娴嬭瘯鏂伴",
- // sid = "098765433242342342",
// attributes = new List<FunctionAttributes>()
// {
// new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
// new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
- // },
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.PanelEnvironment,
- // name = "娴嬭瘯鐜闈㈡澘",
- // targetSids = new List<string> {
- // "098765433242342342",
- // "ac1",
- // "floorheat1"
- // }
- //});
-
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.HvacCac,
- // name = "娴嬭瘯閲戣寕娓╂帶",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "mode",curValue= "cool",state = "cool" ,value = new List<string>(){ "cool", "heat" } },
- // new FunctionAttributes(){ key = "set_temp",curValue= "22",state = "22" ,value = new List<string>(){},min = 0,max = 30 },
- // //new FunctionAttributes(){ key = "set_temp_step",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low", "auto", "stop" } },
- // new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
- // new FunctionAttributes(){ key = "room_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 },
- // new FunctionAttributes(){ key = "dew_point_temp",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
- // new FunctionAttributes(){ key = "room_humidity",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 1000 },
- // //new FunctionAttributes(){ key = "tvoc",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
// },
//});
@@ -932,7 +1027,6 @@
/// <summary>
/// 鍔犺浇璁惧鍔熻兘鏄剧ず鍖哄煙
- /// Tag 鏀惰棌鍗＄墖
/// </summary>
void LoadDeviceFunctionControlZone()
{
@@ -1019,6 +1113,11 @@
LoadDeviceFunctionDiv(functionView, function);
index++;
+ if(SPK.ArmSensorSpkList().Contains(function.spk))
+ {
+ btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
+ btnbg.SelectedImagePath = "Collection/FunctionArmOnbg.png";
+ }
//if (!function.online)
//{
@@ -1146,7 +1245,6 @@
/// <summary>
/// 鍔犺浇鍔熻兘鎺у埗鍗＄墖
- /// Tag 鍗＄墖鑷畾涔�
/// </summary>
void LoadDeviceFunctionDiv(FrameLayout view, Function function)
{
@@ -1161,9 +1259,6 @@
Height = Application.GetMinRealAverage(32),
};
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()
@@ -1195,6 +1290,7 @@
};
view.AddChidren(btnZone);
+
Button btnState;
btnState = new Button()
{
@@ -1209,6 +1305,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)
{
@@ -1324,7 +1483,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);
};
}
@@ -1360,10 +1519,23 @@
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
@@ -1412,19 +1584,19 @@
UpdataFunctionStates(function);
}
- //var btnOffline = new Button()
- //{
- // X = btnIcon.Right,
- // Y = Application.GetRealWidth(16),
- // Height = Application.GetMinRealAverage(32),
- // TextID = StringId.DeviceOffline,
- // TextColor = CSS_Color.WarningColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "OnlineTag",
- // Visible = !function.online
- //};
- //view.AddChidren(btnOffline);
+ var btnOffline = new Button()
+ {
+ X = btnIcon.Right,
+ Y = Application.GetRealWidth(16),
+ Height = Application.GetMinRealAverage(32),
+ TextID = StringId.DeviceOffline,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "OnlineTag",
+ Visible = !function.online
+ };
+ view.AddChidren(btnOffline);
}
catch (Exception ex)
--
Gitblit v1.8.0