From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
index 0725212..5873fdd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
@@ -47,7 +47,6 @@
#endregion
#region 鍖哄煙鍙橀噺
- //TV tvTemp = new TV();
Function device;
Button btnCollection_Out;
Button btnFunctionName_Out;
@@ -322,9 +321,7 @@
#endregion
- new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(device, actionRefresh);
- DriverLayer.Control.Ins.SendReadCommand(device);
-
+ new TopViewDiv(bodyView, Language.StringByID(StringId.PJT)).LoadTopView_FunctionTop(device, actionRefresh);
LoadEventList();
}
@@ -345,8 +342,8 @@
var bodyView = new FrameLayout()
{
- Y = Application.GetRealHeight(427),//667
- Height = Application.GetRealHeight(240),
+ Y = Application.GetRealHeight(417),//667
+ Height = Application.GetRealHeight(250),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
div.AddChidren(bodyView);
@@ -356,6 +353,7 @@
Y = Application.GetRealHeight(16),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(296 + 200),
+ Height = Application.GetRealHeight(234),
};
bodyView.AddChidren(contentView);
@@ -505,9 +503,6 @@
dialog.Show();
}
-
-
-
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
@@ -546,7 +541,7 @@
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("ch+", "");
+ d.Add("zoom+", "");
Control.Ins.SendWriteCommand(device, d);
}
};
@@ -555,7 +550,7 @@
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("ch-", "");
+ d.Add("zoom-", "");
Control.Ins.SendWriteCommand(device, d);
}
};
@@ -586,16 +581,6 @@
Control.Ins.SendWriteCommand(device, d);
}
};
-
- btnMenu.MouseUpEventHandler = (sender, e) =>
- {
- if (DB_ResidenceData.Instance.GatewayType == 1)
- {
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("menu", "");
- Control.Ins.SendWriteCommand(device, d);
- }
- };
btnPower.MouseUpEventHandler = (sender, e) =>
{
if (DB_ResidenceData.Instance.GatewayType == 1)
@@ -606,7 +591,34 @@
}
};
+
+ btnTopMenuUp.MouseDownEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIconUp.png";
+ };
+ btnTopMenuDown.MouseDownEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIconDown.png";
+ };
+ btnTopMenuLeft.MouseDownEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIconLeft.png";
+ };
+ btnTopMenuRight.MouseDownEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIconRight.png";
+ };
+ btnOk.MouseDownEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIconOk.png";
+ };
+ btnMenu.MouseUpEventHandler = (sender, e) =>
+ {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("menu", "");
+ Control.Ins.SendWriteCommand(device, d);
+ }
+ };
btnTopMenuUp.MouseUpEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -615,6 +627,7 @@
}
};
btnTopMenuLeft.MouseUpEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -623,6 +636,7 @@
}
};
btnTopMenuRight.MouseUpEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -631,6 +645,7 @@
}
};
btnTopMenuDown.MouseUpEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -639,6 +654,7 @@
}
};
btnOk.MouseUpEventHandler = (sender, e) => {
+ topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
--
Gitblit v1.8.0