~wxr/HDL_APP_Project.git

			@@ -381,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>
			/// 加载内容区域
			@@ -678,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()
			{
			@@ -738,7 +827,7 @@
			SelectedImagePath = "Collection/CollectionWhiteIcon.png",
			UnSelectedImagePath = "Collection/CollectionIcon.png",
			};
			//view.AddChidren(btnCollection);
			view.AddChidren(btnCollection);
			//2020-12-16 如果是成员隐藏收藏功能
			//if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
			//{
			@@ -779,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",
			@@ -966,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);
			}
			@@ -1012,10 +1105,10 @@
			Width = Application.GetRealWidth(32),
			UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
			};
			//if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
			//{
			// view.AddChidren(btnSettingIcon);
			//}
			if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
			{
			view.AddChidren(btnSettingIcon);
			}

			Button btnName;
			btnName = new Button()
			@@ -1057,7 +1150,7 @@
			SelectedImagePath = "Collection/CollectionWhiteIcon.png",
			UnSelectedImagePath = "Collection/CollectionIcon.png",
			};
			//view.AddChidren(btnCollection);
			view.AddChidren(btnCollection);
			//2020-12-16 如果是成员隐藏收藏功能
			//if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
			//{