From b47f91b91bc5371bba0c8801dbd648772ab331fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十一月 2022 13:54:15 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 550 +++++++++++++++++++-----------------------------------
1 files changed, 199 insertions(+), 351 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 0fbcc3f..064bc66 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -194,31 +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);
- //}
-
- //ddd++;
- // Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
- // if(ddd%2 == 0)
- // {
- // function_online.online = true;
- // }
- // else
- // {
- // function_online.online = false;
- // }
- // HomePage.LoadEvent_RefreshDevcieOnline(function_online);
-
-
};
#endif
@@ -578,285 +553,6 @@
}
-#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" },
- }
- });
-
- 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","fan"} },
- 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 = "闂ㄩ攣",
- // spk = SPK.DoorLock,
- // sid = "12345",
- // attributes = new List<FunctionAttributes> {
- // new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
- // new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
- // new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
- // new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
- // new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
- // new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
- // }
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "闂ㄩ攣1",
- // spk = SPK.DoorLock,
- // sid = "123",
- // attributes = new List<FunctionAttributes> {
- // new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
- // new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
- // new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
- // new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
- // new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
- // new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
- // }
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.PanelSocket,
- // name = "闈㈡澘鎻掑骇",
- // attributes = new List<FunctionAttributes>
- // {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "on_off_usb",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "active_power",curValue= "220",state = "220" },
- // new FunctionAttributes(){ key = "voltage",curValue= "5",state = "5" },
- // new FunctionAttributes(){ key = "current",curValue= "110",state = "110" },
- // new FunctionAttributes(){ key = "total_electricity",curValue= "123.33",state = "123.33" },
- // }
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorDryContact,
- // name = "骞叉帴鐐�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // },
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorPm25,
- // name = "娴嬭瘯Pm2.5",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "pm25",curValue= "70",state = "70" },
- // },
- // attrKeyConfigs = new List<AttrKeyConfig>()
- // {
- // new AttrKeyConfig (){
- // key = "pm2.5",
- // type = "interval" ,
- // unit = "ug/m虏",
- // configs = new List<AttrKeyInfo>(){
- // new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "鑹ソ"},
- // new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "杞�/涓害姹℃煋"},
- // new AttrKeyInfo(){ start = "151",end = "500",color = "0xFFFF9D54",desc = "閲嶅害/涓ラ噸姹℃煋"},
- // }
- // }
- // },
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorHelp,
- // name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
- // new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
- // new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
- // },
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.AirSwitch,
- // name = "鏅鸿兘绌哄紑",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // },
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.AirFreshStandard,
- // name = "娴嬭瘯鏂伴",
- // 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.HvacAirFreshJinmao,
- // name = "娴嬭瘯閲戣寕鏂伴",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "mode",curValue= "humidification",state = "humidification" ,value = new List<string>(){ "humidification", "fan" } },
- // new FunctionAttributes(){ key = "energy",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
- // new FunctionAttributes(){ key = "fan",curValue= "level_1",state = "level_1" ,value = new List<string>(){ "level_1", "level_2", "level_3","auto" } },
- // new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
- // new FunctionAttributes(){ key = "indoor_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 },
- // new FunctionAttributes(){ key = "indoor_humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
- // new FunctionAttributes(){ key = "filter_remain",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
- // new FunctionAttributes(){ key = "filter_timeout",curValue= "false",state = "false" ,value = new List<string>(){ "true", "false" }},
- // },
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorGas,
- // name = "鐕冩皵浼犳劅鍣�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
- // new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
- // },
- //});
-
- //FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
- // attributes = new List<FunctionAttributes>() {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "computer",value = new List<string>(){"鐢佃剳" } },
- // new FunctionAttributes(){ key = "video",value = new List<string>(){"瑙嗛" } },
- // new FunctionAttributes(){ key = "source",value = new List<string>(){"淇″彿婧�" } },
- // new FunctionAttributes(){ key = "zoom+",value = new List<string>(){"鍙樼劍+" } },
- // new FunctionAttributes(){ key = "zoom-",value = new List<string>(){"鍙樼劍-" } },
- // new FunctionAttributes(){ key = "page+",value = new List<string>(){"鐢婚潰+" } },
- // new FunctionAttributes(){ key = "page-",value = new List<string>(){"鐢婚潰-" } },
- // new FunctionAttributes(){ key = "menu",value = new List<string>(){"鑿滃崟" } },
- // new FunctionAttributes(){ key = "ok",value = new List<string>(){"纭" } },
- // new FunctionAttributes(){ key = "up",value = new List<string>(){"涓�" } },
- // new FunctionAttributes(){ key = "left",value = new List<string>(){"宸�" } },
- // new FunctionAttributes(){ key = "right",value = new List<string>(){"鍙�" } },
- // new FunctionAttributes(){ key = "down",value = new List<string>(){"涓�" } },
- // new FunctionAttributes(){ key = "exit",value = new List<string>(){"閫�鍑�" } },
- // new FunctionAttributes(){ key = "volume+",value = new List<string>(){"闊抽噺+" } },
- // new FunctionAttributes(){ key = "volume-",value = new List<string>(){"闊抽噺-" } },
- // new FunctionAttributes(){ key = "mute",value = new List<string>(){"闈欓煶" } },
- // new FunctionAttributes(){ key = "auto",value = new List<string>(){"鑷姩" } },
- // new FunctionAttributes(){ key = "pause",value = new List<string>(){"鏆傚仠" } },
- // }
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.StbIr,
- // name = "娴嬭瘯鏈洪《鐩�",
- // attributes = new List<FunctionAttributes>() {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "computer",value = new List<string>(){"鐢佃剳" } },
- // new FunctionAttributes(){ key = "video",value = new List<string>(){"瑙嗛" } },
- // new FunctionAttributes(){ key = "source",value = new List<string>(){"淇″彿婧�" } },
- // new FunctionAttributes(){ key = "zoom+",value = new List<string>(){"鍙樼劍+" } },
- // new FunctionAttributes(){ key = "zoom-",value = new List<string>(){"鍙樼劍-" } },
- // new FunctionAttributes(){ key = "page+",value = new List<string>(){"鐢婚潰+" } },
- // new FunctionAttributes(){ key = "page-",value = new List<string>(){"鐢婚潰-" } },
- // new FunctionAttributes(){ key = "menu",value = new List<string>(){"鑿滃崟" } },
- // new FunctionAttributes(){ key = "ok",value = new List<string>(){"纭" } },
- // new FunctionAttributes(){ key = "up",value = new List<string>(){"涓�" } },
- // new FunctionAttributes(){ key = "left",value = new List<string>(){"宸�" } },
- // new FunctionAttributes(){ key = "right",value = new List<string>(){"鍙�" } },
- // new FunctionAttributes(){ key = "down",value = new List<string>(){"涓�" } },
- // new FunctionAttributes(){ key = "exit",value = new List<string>(){"閫�鍑�" } },
- // new FunctionAttributes(){ key = "volume+",value = new List<string>(){"闊抽噺+" } },
- // new FunctionAttributes(){ key = "volume-",value = new List<string>(){"闊抽噺-" } },
- // new FunctionAttributes(){ key = "mute",value = new List<string>(){"闈欓煶" } },
- // new FunctionAttributes(){ key = "auto",value = new List<string>(){"鑷姩" } },
- // new FunctionAttributes(){ key = "pause",value = new List<string>(){"鏆傚仠" } },
- // }
- //});
-
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.TvIr,
- // name = "娴嬭瘯鐢佃",
- // attributes = new List<FunctionAttributes>() {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "computer",value = new List<string>(){"鐢佃剳" } },
- // new FunctionAttributes(){ key = "video",value = new List<string>(){"瑙嗛" } },
- // new FunctionAttributes(){ key = "source",value = new List<string>(){"淇″彿婧�" } },
- // new FunctionAttributes(){ key = "zoom+",value = new List<string>(){"鍙樼劍+" } },
- // new FunctionAttributes(){ key = "zoom-",value = new List<string>(){"鍙樼劍-" } },
- // new FunctionAttributes(){ key = "page+",value = new List<string>(){"鐢婚潰+" } },
- // new FunctionAttributes(){ key = "page-",value = new List<string>(){"鐢婚潰-" } },
- // new FunctionAttributes(){ key = "menu",value = new List<string>(){"鑿滃崟" } },
- // new FunctionAttributes(){ key = "ok",value = new List<string>(){"纭" } },
- // new FunctionAttributes(){ key = "up",value = new List<string>(){"涓�" } },
- // new FunctionAttributes(){ key = "left",value = new List<string>(){"宸�" } },
- // new FunctionAttributes(){ key = "right",value = new List<string>(){"鍙�" } },
- // new FunctionAttributes(){ key = "down",value = new List<string>(){"涓�" } },
- // new FunctionAttributes(){ key = "exit",value = new List<string>(){"閫�鍑�" } },
- // new FunctionAttributes(){ key = "volume+",value = new List<string>(){"闊抽噺+" } },
- // new FunctionAttributes(){ key = "volume-",value = new List<string>(){"闊抽噺-" } },
- // new FunctionAttributes(){ key = "mute",value = new List<string>(){"闈欓煶" } },
- // new FunctionAttributes(){ key = "auto",value = new List<string>(){"鑷姩" } },
- // new FunctionAttributes(){ key = "pause",value = new List<string>(){"鏆傚仠" } },
- // }
- //});
-#endif
-
}
/// <summary>
/// 鍔犺浇鍐呭鍖哄煙
@@ -967,40 +663,11 @@
if (SPK.MusicSpkList().Contains( function.spk))
{
continue;
- //var music = function as Music.A31MusicModel;
- //var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
- //if (music == null)
- //{
- // continue;
- //}
- //if (music.ServerClientType == -1)
- //{
- // continue;
- //}
- //else if (music.ServerClientType == 1)
- //{
- // if (!music.MainPlayCollection)
- // {
- // continue;
- // }
- //}
- //else
- //{
- // if (!music.collect)
- // {
- // continue;
- // }
- //}
}
else
{
if (!function.collect)
continue;
- //if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
- //{
- // function.collection = false;
- // continue;
- //}
}
if (index % 2 == 0)
{
@@ -1024,23 +691,34 @@
Tag = function.sid
};
rowView.AddChidren(functionView);
-
- var btnbg = new Button()
- {
- UnSelectedImagePath = "Collection/Functionbg.png",
- SelectedImagePath = "Collection/FunctionOnbg.png",
- Tag = function.sid
- };
- functionView.AddChidren(btnbg);
functionViews.Add(functionView);
- LoadDeviceFunctionDiv(functionView, function);
+ //缁垮缓浜哄眳鐜锛岀鎶�绯荤粺
+ if (function.spk == SPK.AcstParent)
+ {
+ LoadAcstDiv(functionView, function);
+ }
+ else //鍏朵粬璁惧
+ {
+
+ var btnbg = new Button()
+ {
+ UnSelectedImagePath = "Collection/Functionbg.png",
+ SelectedImagePath = "Collection/FunctionOnbg.png",
+ Tag = function.sid
+ };
+ functionView.AddChidren(btnbg);
+ LoadDeviceFunctionDiv(functionView, function);
+
+
+
+ if (SPK.ArmSensorSpkList().Contains(function.spk))
+ {
+ btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
+ btnbg.SelectedImagePath = "Collection/FunctionArmOnbg.png";
+ }
+ }
index++;
-
- if (!function.online)
- {
- btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
- }
}
if (index == 0)
@@ -1178,9 +856,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()
{
@@ -1211,6 +886,7 @@
};
view.AddChidren(btnZone);
+
Button btnState;
btnState = new Button()
{
@@ -1225,6 +901,69 @@
Tag = "state",
Text = function.lastState
};
+
+
+ if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ {
+ 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)
{
@@ -1340,7 +1079,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);
};
}
@@ -1375,6 +1114,24 @@
LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
+ }
+
+ else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ {
+ //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
@@ -1443,6 +1200,97 @@
MainPage.Log("homepage LoadControlView error : " + ex.Message);
}
}
+ /// <summary>
+ /// 鍔犺浇缁垮缓绉戞妧绯荤粺鍗＄墖
+ /// </summary>
+ void LoadAcstDiv(FrameLayout view1, Function function)
+ {
+ var view = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(105),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealWidth(15),
+ };
+ view1.AddChidren(view);
+
+ Button btnName;
+ btnName = new Button()
+ {
+ X = Application.GetRealWidth(11),
+ Y = Application.GetRealWidth(10),
+ TextID = StringId.Acst,
+ IsBold = true,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ Height = Application.GetRealWidth(24),
+ Width = Application.GetRealWidth(140),
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ view.AddChidren(btnName);
+
+ var btnLogo = new Button()
+ {
+ Y = Application.GetRealWidth(85),
+ UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
+ SelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealWidth(37),
+ };
+ view.AddChidren(btnLogo);
+
+ Button btnFunctionViewBg;
+ btnFunctionViewBg = new Button()
+ {
+ Height = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(102),
+ UnSelectedImagePath = "FunctionIcon/FunctionBg/AcstFunctionBg.png",
+ };
+ view.AddChidren(btnFunctionViewBg);
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ var page = new AcstParentPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
+
+ //Button btnAcstPower = new Button()
+ //{
+ // X = Application.GetRealWidth(115),
+ // Y = Application.GetRealHeight(70),
+ // Width = Application.GetRealWidth(32),
+ // Height = Application.GetRealWidth(32),
+ // SelectedImagePath = "Public/PowerOpen.png",
+ // UnSelectedImagePath = "Public/PowerClose.png",
+ // IsSelected = function.trait_on_off.curValue.ToString() == "on",
+ //};
+ //view.AddChidren(btnAcstPower);
+ //btnAcstPower.MouseUpEventHandler = (sender, e) => {
+ // btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
+ // new System.Threading.Thread(() =>
+ // {
+ // string onoff = btnAcstPower.IsSelected ? "on" : "off";
+ // Dictionary<string, string> d = new Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.OnOff, onoff);
+ // foreach (var temp in FunctionList.List.GetAcstParentList())
+ // {
+ // Control.Ins.SendWriteCommand(temp, d);
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //};
+
+
+
+
+ }
+
+
+
+
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
--
Gitblit v1.8.0