From 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 六月 2022 17:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 290 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 219 insertions(+), 71 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 5c2fe0f..fc4e748 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -161,23 +161,9 @@
};
topView.AddChidren(btnTop);
- btnLinkStateTip = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(46),
- Width = Application.GetRealWidth(6),
- Height = Application.GetRealWidth(6),
- BackgroundColor = CSS_Color.LinkTipFail,
- Radius = (uint)Application.GetRealWidth(3),
- };
- topView.AddChidren(btnLinkStateTip);
- //鏇存柊閾炬帴鐘舵�乮con棰滆壊
- CheckLinkStatus();//2020-12-22
-
-
btnResidenceName = new Button()
{
- X = Application.GetRealWidth(26),
+ X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(32),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(33),
@@ -188,12 +174,38 @@
IsBold = true
};
topView.AddChidren(btnResidenceName);
+ btnLinkStateTip = new Button()
+ {
+ //X = Application.GetRealWidth(16),
+ Y = btnResidenceName.Bottom,
+ Height = Application.GetRealWidth(14),
+ BackgroundColor = CSS_Color.LinkTipFail,
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ };
+ topView.AddChidren(btnLinkStateTip);
+ //btnLinkStateTip.Width = btnLinkStateTip.GetTextWidth();
+ //鏇存柊閾炬帴鐘舵�乮con棰滆壊
+
+ int ddd = 0;
#if DEBUG
- int msdId = 111;
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
- Control.Ins.AuthGateway();
+
+ //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
@@ -203,6 +215,8 @@
Height = Application.GetRealHeight(32),
};
topView.AddChidren(environmentalView);
+ CheckLinkStatus();//2020-12-22
+
#region 鐜鏁版嵁
var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
@@ -553,20 +567,55 @@
#if DEBUG
- 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
+ //{
+ // 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()
//{
@@ -575,6 +624,43 @@
// 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" },
// },
//});
@@ -592,10 +678,41 @@
//{
// 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 },
// },
//});
@@ -804,6 +921,7 @@
/// <summary>
/// 鍔犺浇璁惧鍔熻兘鏄剧ず鍖哄煙
+ /// Tag 鏀惰棌鍗＄墖
/// </summary>
void LoadDeviceFunctionControlZone()
{
@@ -820,30 +938,31 @@
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
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;
- }
- }
+ //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
{
@@ -888,6 +1007,12 @@
functionViews.Add(functionView);
LoadDeviceFunctionDiv(functionView, function);
index++;
+
+
+ //if (!function.online)
+ //{
+ // btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ //}
}
if (index == 0)
@@ -1010,6 +1135,7 @@
/// <summary>
/// 鍔犺浇鍔熻兘鎺у埗鍗＄墖
+ /// Tag 鍗＄墖鑷畾涔�
/// </summary>
void LoadDeviceFunctionDiv(FrameLayout view, Function function)
{
@@ -1151,6 +1277,7 @@
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
+ btnCollection.Visible = false;
Button btnPower;
btnPower = new Button()
{
@@ -1162,8 +1289,8 @@
SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
};
view.AddChidren(btnPower);
- var a31player = (function as UI.Music.A31MusicModel);
- btnState.Text = a31player.A31PlayStatus.Title;
+
+ btnState.Text = function.GetAttrState("song_name");
btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
@@ -1172,21 +1299,22 @@
btnPower.MouseUpEventHandler = (sender, e) =>
{
+
+ string status = "off";
if (btnPower.IsSelected)
{
btnPower.IsSelected = false;
- Music.SendMethod.Pause(a31player);
- a31player.A31PlayStatus.status = "pause";
- a31player.trait_on_off.curValue = "off";
+ status = "off";
}
else
{
btnPower.IsSelected = true;
- Music.SendMethod.Play(a31player);
- a31player.A31PlayStatus.status = "play";
- a31player.trait_on_off.curValue = "on";
+ status = "on";
}
- UpdataFunctionStates(a31player);
+ function.SetAttrState("on_off", status);
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ dic.Add("on_off", status);
+ Music.SendMethod.mMethod.SendControlCommand(function, dic);
};
}
@@ -1222,6 +1350,11 @@
LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
}
+ //绱ф�ユ眰鍔�
+ else if (function.spk == SPK.SensorHelp)
+ {
+
+ }
else
{
@@ -1244,14 +1377,14 @@
//鍙栨秷鏀惰棌浜嬩欢
Action cannelCollect = () => {
function.collect = false;
- if (SPK.MusicSpkList().Contains(function.spk))//澶勭悊闊充箰涓讳粠鍏崇郴
- {
- if ((function as Music.A31MusicModel).ServerClientType == 1)
- {
- (function as Music.A31MusicModel).MainPlayCollection = false;
- Music.A31MusicModel.Save();
- }
- }
+ //if (SPK.MusicSpkList().Contains(function.spk))//澶勭悊闊充箰涓讳粠鍏崇郴
+ //{
+ // if ((function as Music.A31MusicModel).ServerClientType == 1)
+ // {
+ // (function as Music.A31MusicModel).MainPlayCollection = false;
+ // Music.A31MusicModel.Save();
+ // }
+ //}
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
LoadDeviceFunctionControlZone();
function.CollectFunction();
@@ -1268,6 +1401,21 @@
{
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);
+
}
catch (Exception ex)
{
--
Gitblit v1.8.0