From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs | 75 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
index 824fc89..0b64046 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -117,25 +117,14 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = function.collect
};
- //controlView.AddChidren(btnCollection);
+ controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
- btnChangeTVAV = new Button()
- {
- Y = Application.GetRealHeight(8),
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(90),
- Height = Application.GetRealHeight(49),
- Text = "TV/AV",
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- };
- controlView.AddChidren(btnChangeTVAV);
+
#region 杞洏鎺у埗鍖哄煙
topMenuView = new FrameLayout()
@@ -287,28 +276,28 @@
#region 搴曢儴鎺у埗鍖哄煙
btnBack = new Button()
{
- X = Application.GetRealWidth(30),
- Y = Application.GetRealHeight(386),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
+ X = Application.GetRealWidth(52),
+ Y = Application.GetRealHeight(402),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVBackIcon.png",
};
controlView.AddChidren(btnBack);
- btnMenu = new Button()
+ btnChangeTVAV = new Button()
{
- X = Application.GetRealWidth(106),
- Y = Application.GetRealHeight(386),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
- UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVMenuIcon.png",
+ X = Application.GetRealWidth(116),
+ Y = Application.GetRealHeight(402),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVAV.png",
};
- controlView.AddChidren(btnMenu);
+ controlView.AddChidren(btnChangeTVAV);
btn123 = new Button()
{
- X = Application.GetRealWidth(182),
- Y = Application.GetRealHeight(386),
+ X = Application.GetRealWidth(180),
+ Y = Application.GetRealHeight(402),
Width = Application.GetRealWidth(40),
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/TV123Icon.png",
@@ -317,20 +306,30 @@
btnMute = new Button()
{
- X = Application.GetRealWidth(258),
- Y = Application.GetRealHeight(386),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
+ X = Application.GetRealWidth(244),
+ Y = Application.GetRealHeight(402),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVMuteIcon.png",
};
controlView.AddChidren(btnMute);
+ btnMenu = new Button()
+ {
+ X = Application.GetRealWidth(116),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVMenuIcon.png",
+ };
+ controlView.AddChidren(btnMenu);
+
btnPower = new Button()
{
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(462),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
+ X = Application.GetRealWidth(180),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/TVPowerIcon.png",
};
controlView.AddChidren(btnPower);
--
Gitblit v1.8.0