From fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:51:14 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs | 104 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
index a278200..2467e67 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
@@ -7,36 +7,18 @@
public partial class TVPage
{
/// <summary>
- /// 鏇存柊鐏厜鐘舵��
- /// </summary>
- public static void UpdataState(TV uTv)
- {
- Application.RunOnMainThread(() =>
- {
- try
- {
- if (bodyView == null)
- return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uTv.on_off == "on";
- }
- catch (Exception ex)
- {
- MainPage.Log($"RelayPage error {ex.Message}");
- }
- });
- }
- /// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
void LoadEventList()
{
- LoadSwitchEvent();
+ LoadControlEvent();
LoadCollectionEvent();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = tv.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = tv.GetRoomListName();
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ function.UpdataFuncitonInfo();
};
}
@@ -46,39 +28,73 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = tv.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
/// <summary>
- /// 鍔犺浇寮�鍏充簨浠�
+ /// 鍔犺浇鎺у埗浜嬩欢
/// </summary>
- void LoadSwitchEvent()
+ void LoadControlEvent()
{
- btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
+ btnChangeTVAV.MouseUpEventHandler = (sender, e) =>
{
- btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
-
- new System.Threading.Thread(() =>
- {
- tv.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, this.tv);
- })
- { IsBackground = true }.Start();
+ tvTemp.ControlTV(InfraredCode_TV.AV_TV,function);
};
- btnSwitch.MouseUpEventHandler += (sender, e) =>
+ btnChlPlus.MouseUpEventHandler = (sender, e) =>
{
- btnSwitch.IsSelected = !btnSwitch.IsSelected;
-
- new System.Threading.Thread(() =>
- {
- tv.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, this.tv);
- })
- { IsBackground = true }.Start();
+ tvTemp.ControlTV(InfraredCode_TV.ChannelUp, function);
+ };
+ btnChlReduce.MouseUpEventHandler = (sender, e) =>
+ {
+ tvTemp.ControlTV(InfraredCode_TV.ChannelDown, function);
+ };
+ btnVolPlus.MouseUpEventHandler = (sender, e) =>
+ {
+ tvTemp.ControlTV(InfraredCode_TV.VolUp, function);
+ };
+ btnVolReduce.MouseUpEventHandler = (sender, e) =>
+ {
+ tvTemp.ControlTV(InfraredCode_TV.VolDown, function);
+ };
+ btnBack.MouseUpEventHandler = (sender, e) =>
+ {
+ tvTemp.ControlTV(InfraredCode_TV.Back, function);
};
+ btnMenu.MouseUpEventHandler = (sender, e) =>
+ {
+ tvTemp.ControlTV(InfraredCode_TV.Menu, function);
+ };
+ btn123.MouseUpEventHandler = (sender, e) =>
+ {
+ ShowNumberView();
+ };
+ btnMute.MouseUpEventHandler = (sender, e) =>
+ {
+ tvTemp.ControlTV(InfraredCode_TV.Mute, function);
+ };
+ btnPower.MouseUpEventHandler = (sender, e) =>
+ {
+ tvTemp.ControlTV(InfraredCode_TV.Power, function);
+ };
+
+ btnTopMenuUp.MouseUpEventHandler = (sender, e) => {
+ tvTemp.ControlTV(InfraredCode_TV.Up, function);
+ };
+ btnTopMenuLeft.MouseUpEventHandler = (sender, e) => {
+ tvTemp.ControlTV(InfraredCode_TV.Left, function);
+ };
+ btnTopMenuRight.MouseUpEventHandler = (sender, e) => {
+ tvTemp.ControlTV(InfraredCode_TV.Right, function);
+ };
+ btnTopMenuDown.MouseUpEventHandler = (sender, e) => {
+ tvTemp.ControlTV(InfraredCode_TV.Down, function);
+ };
+ btnOk.MouseUpEventHandler = (sender, e) => {
+ tvTemp.ControlTV(InfraredCode_TV.Confrim, function);
+ };
}
}
--
Gitblit v1.8.0