From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs | 104 +++++++++++++++++++--------------------------------
1 files changed, 39 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
index 4f2258c..d0a93d8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
@@ -178,17 +178,17 @@
});
//闊抽噺+
- btn_jia.MouseDownEventHandler += (sender, e) =>
+ btn_jia.MouseUpEventHandler += (sender, e) =>
{
- btn_jia.IsSelected = true;
ControlCommand(HisenseTVFunctionalAttributeConstant.volume_add, "");
+ this.SetButtonIsSelected(btn_jia);
};
//闊抽噺-
- btn_jian.MouseDownEventHandler += (sender, e) =>
+ btn_jian.MouseUpEventHandler += (sender, e) =>
{
- btn_jian.IsSelected = true;
ControlCommand(HisenseTVFunctionalAttributeConstant.volume_subtract, "");
+ this.SetButtonIsSelected(btn_jian);
};
//鑿滃崟
caidanBtn.SetClickListener((btn) =>
@@ -302,7 +302,7 @@
return;
}
- if (!this.device.online)
+ if (!this.device.online && key != HisenseTVFunctionalAttributeConstant.wol)
{
//璁惧涓嶅湪绾挎帶鍒跺け璐�
Application.RunOnMainThread(() =>
@@ -375,7 +375,7 @@
{
Y = Application.GetRealHeight(24),
X = Application.GetRealWidth(24),
- Height = Application.GetRealHeight(648),
+ Height = Application.GetRealHeight(648-60),
Width = Application.GetRealWidth(327),
BackgroundImagePath = "HisenseTv/onbj.png",
};
@@ -422,7 +422,7 @@
TextAlignment = TextAlignment.CenterLeft,
};
backgroundOpenFl.AddChidren(btnOpenCurrDeviceRoom);
-
+
int yHeight = btnOpenCurrDeviceRoom.Bottom + Application.GetRealHeight(16);
shouyeFL = new CustomFrameLayout();
backgroundOpenFl.AddChidren(shouyeFL);
@@ -458,11 +458,11 @@
var yinliangFL = new FrameLayout();
backgroundOpenFl.AddChidren(yinliangFL);
- yinliangFL.Height = Application.GetRealHeight(146);
+ yinliangFL.Height = Application.GetRealHeight(146-16);
yinliangFL.Width = Application.GetRealWidth(68);
- yinliangFL.Y = Application.GetRealHeight(260);
+ yinliangFL.Y = Application.GetRealHeight(260-8-20);
yinliangFL.X = shouyeFL.X;
- yinliangFL.BackgroundColor = 0xffF2F3F7;
+ yinliangFL.BackgroundColor = 0xFFF2F3F7;
yinliangFL.Radius = (uint)Application.GetRealWidth(34);
btn_jia = new Button
@@ -478,7 +478,7 @@
yinliangFL.AddChidren(btn_jia);
Button btnText = new Button
{
- Y = Application.GetRealHeight(63),
+ Y = Application.GetRealHeight(63-8),
Height = Application.GetRealHeight(20),
//Text = "闊抽噺",
TextID = StringId.yinliang,
@@ -490,7 +490,7 @@
yinliangFL.AddChidren(btnText);
btn_jian = new Button
{
- Y = Application.GetRealHeight(98),
+ Y = Application.GetRealHeight(98-8),
Width = Application.GetRealWidth(32),
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "HisenseTv/yingliangjian.png",
@@ -499,47 +499,38 @@
};
yinliangFL.AddChidren(btn_jian);
- btn_jia.MouseUpEventHandler += (sender, e) =>
- {
- btn_jia.IsSelected = false;
- };
- btn_jian.MouseUpEventHandler += (sender, e) =>
- {
-
- btn_jian.IsSelected = false;
- };
-
+ int bottomValue= 4;
caidanBtn = new CustomButton();
caidanBtn.TextID = StringId.caidan;
- caidanBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(24);
+ caidanBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
caidanBtn.X = shouyeFL.X;
backgroundOpenFl.AddChidren(caidanBtn);
bofangBtn = new CustomButton();
bofangBtn.TextID = StringId.bofang;
- bofangBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(24);
+ bofangBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
bofangBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(bofangBtn);
-
+
zantingBtn = new CustomButton();
zantingBtn.TextID = StringId.zanting;
- zantingBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(24);
+ zantingBtn.Y = shouyeFL.Bottom + Application.GetRealHeight(bottomValue);
zantingBtn.X = bofangBtn.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(zantingBtn);
-
+ int bottomValue1 = 8;
kuaijinBtn = new CustomButton();
kuaijinBtn.TextID = StringId.kuaijin;
- kuaijinBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(16);
+ kuaijinBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(bottomValue1);
kuaijinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(kuaijinBtn);
kauituiBtn = new CustomButton();
kauituiBtn.TextID = StringId.kuaitui;
- kauituiBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(16);
+ kauituiBtn.Y = bofangBtn.Bottom + Application.GetRealHeight(bottomValue1);
kauituiBtn.X = kuaijinBtn.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(kauituiBtn);
@@ -548,14 +539,14 @@
jingyinBtn = new CustomButton();
jingyinBtn.TextID = StringId.jingyin;
- jingyinBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(16);
+ jingyinBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(bottomValue1);
jingyinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(jingyinBtn);
shezhiBtn = new CustomButton();
shezhiBtn.TextID = StringId.shezhi;
- shezhiBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(16);
+ shezhiBtn.Y = kuaijinBtn.Bottom + Application.GetRealHeight(bottomValue1);
shezhiBtn.X = jingyinBtn.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(shezhiBtn);
@@ -563,28 +554,28 @@
jiechujingyinBtn = new CustomButton();
jiechujingyinBtn.TextID = StringId.jiechujingyin;
- jiechujingyinBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(16);
+ jiechujingyinBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(bottomValue1);
jiechujingyinBtn.X = yinliangFL.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(jiechujingyinBtn);
fanhuiBtn = new CustomButton();
fanhuiBtn.TextID = StringId.fanhui;
- fanhuiBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(16);
+ fanhuiBtn.Y = jingyinBtn.Bottom + Application.GetRealHeight(bottomValue1);
fanhuiBtn.X = jiechujingyinBtn.Right + Application.GetRealWidth(37);
backgroundOpenFl.AddChidren(fanhuiBtn);
TypeFrameLayout typeFrameLayout = new TypeFrameLayout();
- typeFrameLayout.middLayout.Y = yinliangFL.Bottom + Application.GetRealHeight(32);
+ typeFrameLayout.middLayout.Y = yinliangFL.Bottom + Application.GetRealHeight(16);
typeFrameLayout.AddView(backgroundOpenFl);
muenFrameLayout = new MenuFramLayout();
- muenFrameLayout.Y = Application.GetRealHeight(482);
+ muenFrameLayout.Y = Application.GetRealHeight(482-60);
muenFrameLayout.AddView(backgroundOpenFl);
sourceFrameLayout = new SourceFrameLayout();
- sourceFrameLayout.Y = Application.GetRealHeight(482);
+ sourceFrameLayout.Y = Application.GetRealHeight(482-60);
backgroundOpenFl.AddChidren(sourceFrameLayout);
sourceFrameLayout.LoadSourcePage();
@@ -656,7 +647,7 @@
/// <summary>
/// 鑷畾涔夛紙棣栭〉锛屽叧鏈猴紝鑿滃崟锛夊鍣�
/// </summary>
- class CustomFrameLayout : FrameLayout
+ class CustomFrameLayout : BaseFramLayout
{
public const int widthFrameLayout = 68;
public const int heightFrameLayout = 68 + 8 + 20;
@@ -714,21 +705,11 @@
/// <param name="button2">娉ㄦ剰:鍦⊿etClickListener()鍓嶉潰璋冪敤AddImageView()鎵嶆湁鏁�</param>
public void SetClickListener(Action<FrameLayout, Button, Button> action)
{
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
- btnImage.IsSelected = true;
- //btnText.IsSelected = true;
- action?.Invoke(this, btnImage, btnText);
- };
- this.MouseDownEventHandler += DownClick;
- btnImage.MouseDownEventHandler += DownClick;
- btnText.MouseDownEventHandler += DownClick;
-
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- btnImage.IsSelected = false;
- //btnText.IsSelected = false;
+ action?.Invoke(this, btnImage, btnText);
+ SetButtonIsSelected(btnImage);
};
this.MouseUpEventHandler += UpClick;
btnImage.MouseUpEventHandler += UpClick;
@@ -753,8 +734,8 @@
this.SelectedTextColor = MusicColor.MusicTxet14SelectedColor;
this.TextAlignment = TextAlignment.Center;
this.IsMoreLines = true;
- this.BackgroundColor = 0xffECEDEE;
- this.SelectedBackgroundColor = 0xFFF2F3F7;
+ this.BackgroundColor = 0xFFF2F3F7;
+ this.SelectedBackgroundColor = 0xffECEDEE;
this.Radius = (uint)Application.GetRealHeight(19);
this.Padding = new Padding(0, 0, 0, 0);
}
@@ -766,19 +747,12 @@
/// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄</param>
public void SetClickListener(Action<Button> action)
{
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
- //this.BackgroundColor = 0xFFF2F3F7;
- this.IsSelected = true;
- action?.Invoke(this);
- };
- this.MouseDownEventHandler += DownClick;
-
-
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- //this.BackgroundColor = 0xffECEDEE;
- this.IsSelected = false;
+
+ action?.Invoke(this);
+ new BaseFramLayout().SetButtonIsSelected(this);
+
};
this.MouseUpEventHandler += UpClick;
@@ -808,7 +782,7 @@
Button leftBtnTitle = new Button
- {
+ {
Height = Application.GetRealHeight(23),
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
@@ -894,7 +868,7 @@
rightLayout.AddChidren(clickRightLayout);
leftBtnTitle.Width = leftLayout.Width;
- leftBtnLine.Y = leftBtnTitle.Bottom + Application.GetRealHeight(4);
+ leftBtnLine.Y = leftBtnTitle.Bottom + Application.GetRealHeight(0);
if (leftBtnTitle.GetTextWidth() < leftBtnTitle.Width)
{
leftBtnTitle.Width = leftBtnTitle.GetTextWidth();
@@ -911,7 +885,7 @@
- rightBtnLine.Y = rightBtnTitle.Bottom + Application.GetRealHeight(4);
+ rightBtnLine.Y = rightBtnTitle.Bottom + Application.GetRealHeight(0);
if (rightBtnTitle.GetTextWidth() < rightBtnTitle.Width)
{
--
Gitblit v1.8.0