From 6aae0b4d094c54cd5d7d27cda7b439d9d62d0bc7 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 23 五月 2021 14:43:04 +0800
Subject: [PATCH] 能耗功能，红外宝功能
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 136 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 118 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index f2f00ae..6521986 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -113,6 +113,7 @@
public void LoadPage()
{
+ MainPage.CurPageIndex = 0;
try
{
this.BeginHeaderRefreshingAction = () =>
@@ -163,7 +164,7 @@
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.Instance.CurrentRegion.Name,
+ Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
IsBold = true
};
topView.AddChidren(btnResidenceName);
@@ -380,6 +381,90 @@
MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
}
+
+#if DEBUG
+ 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>
/// 鍔犺浇鍐呭鍖哄煙
@@ -466,12 +551,18 @@
try
{
int index = 0;
- foreach (var function in FunctionList.List.GetDeviceFunctionList())
+ var list = FunctionList.List.GetDeviceFunctionList();
+ foreach (var function in list)
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
if (function.Spk_Prefix == FunctionCategory.Music)
{
- var music = function as Music.A31MusicModel;
+ //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;
@@ -671,6 +762,11 @@
};
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()
{
@@ -731,12 +827,12 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- //view.AddChidren(btnCollection);
+ view.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- view.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // view.AddChidren(btnCollection);
+ //}
LoadEvent_FunctionCollection(btnCollection, function);
if (//SPK.CurtainSpkList().Contains(function.spk))
@@ -772,14 +868,18 @@
LoadEvent_ControlCurtain(function, btnCurtainClose, btnCurtainOpen);
}
- else if (function.spk == SPK.ElectricTV || function.spk == SPK.TvIr)
+ else if (function.spk == SPK.ElectricTV || function.spk == SPK.TvIr
+ ||function.spk == SPK.StbIr || function.spk == SPK.PjtIr)
{
- btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
+
+ //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+
Button btnPower;
btnPower = new Button()
{
X = Application.GetRealWidth(131),
- Y = Application.GetRealHeight(70),
+ Y = Application.GetRealHeight(80),
Width = Application.GetRealWidth(32),
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/PowerClose.png",
@@ -959,7 +1059,7 @@
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
//鐢佃涓嶉渶瑕佹洿鏂扮姸鎬�
- if(function.spk!= SPK.ElectricTV)
+ if(function.spk!= SPK.ElectricTV && function.spk != SPK.StbIr && function.spk != SPK.PjtIr)
{
UpdataFunctionStates(function);
}
@@ -1005,7 +1105,7 @@
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
view.AddChidren(btnSettingIcon);
}
@@ -1050,12 +1150,12 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- //view.AddChidren(btnCollection);
+ view.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- view.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // view.AddChidren(btnCollection);
+ //}
LoadEvent_SceneCollection(btnCollection, scene);
--
Gitblit v1.8.0