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 | 115 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 63 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
index b9bc1a6..0b64046 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -2,6 +2,9 @@
using Shared;
using HDL_ON.UI.CSS;
using HDL_ON.Entity;
+using System.Collections.Generic;
+using HDL_ON.DriverLayer;
+
namespace HDL_ON.UI
{
public partial class TVPage : FrameLayout
@@ -114,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(78),
- 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()
@@ -198,12 +190,12 @@
X = Application.GetRealWidth(26),
Y = Application.GetRealHeight(246),
Width = Application.GetRealWidth(44),
- Height = Application.GetRealHeight(102),
+ Height = Application.GetRealWidth(102),
BackgroundImagePath = "FunctionIcon/Electrical/TV/MenuBgIcon.png",
};
controlView.AddChidren(channleView);
- btnChlReduce = new Button()
+ btnChlPlus = new Button()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(10),
@@ -211,7 +203,7 @@
Height = Application.GetRealWidth(24),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/PlusIcon.png"
};
- channleView.AddChidren(btnChlReduce);
+ channleView.AddChidren(btnChlPlus);
Button btnChlText;
btnChlText = new Button()
@@ -225,27 +217,27 @@
};
channleView.AddChidren(btnChlText);
- btnChlPlus = new Button()
+ btnChlReduce = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(66),
+ Y = Application.GetRealWidth(66),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/ReduceIcon.png"
};
- channleView.AddChidren(btnChlPlus);
+ channleView.AddChidren(btnChlReduce);
volView = new FrameLayout()
{
X = Application.GetRealWidth(257),
Y = Application.GetRealHeight(246),
Width = Application.GetRealWidth(44),
- Height = Application.GetRealHeight(102),
+ Height = Application.GetRealWidth(102),
BackgroundImagePath = "FunctionIcon/Electrical/TV/MenuBgIcon.png",
};
controlView.AddChidren(volView);
- btnVolReduce = new Button()
+ btnVolPlus = new Button()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(10),
@@ -253,7 +245,7 @@
Height = Application.GetRealWidth(24),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/PlusIcon.png"
};
- volView.AddChidren(btnVolReduce);
+ volView.AddChidren(btnVolPlus);
Button btnVolText;
btnVolText = new Button()
@@ -267,15 +259,15 @@
};
volView.AddChidren(btnVolText);
- btnVolPlus = new Button()
+ btnVolReduce = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(66),
+ Y = Application.GetRealWidth(66),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
UnSelectedImagePath = "FunctionIcon/Electrical/TV/ReduceIcon.png"
};
- volView.AddChidren(btnVolPlus);
+ volView.AddChidren(btnVolReduce);
@@ -284,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",
@@ -314,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);
@@ -368,7 +370,6 @@
for (int i = 0; i < 10; i++)
{
-
Button btn = new Button()
{
Width = Application.GetRealWidth(98),
@@ -420,8 +421,18 @@
}
numberView.AddChidren(btn);
btn.MouseUpEventHandler = (sender, e) => {
+ string index = (sender as Button ).Text;
btn.IsSelected = false;
- tvTemp.ControlTV(i,function);
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add($"number_{index}", "");
+ Control.Ins.SendWriteCommand(function, d);
+ }
+ else
+ {
+ tvTemp.ControlTV(i, function);
+ }
};
btn.MouseDownEventHandler = (sender, e) => {
btn.IsSelected = true;
--
Gitblit v1.8.0