From 6e580804d74d7a6fb118b6ba381e88aa81f267c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 三月 2021 15:30:23 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into dev-tzy

---
 HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
index ea72033..2467e67 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
@@ -16,9 +16,9 @@
 
             //鍥為��鍒锋柊淇℃伅浜嬩欢
             actionRefresh = () => {
-                btnFunctionName.Text = btnFunctionName_Out.Text = tv.name;
-                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = tv.GetRoomListName();
-                tv.UpdataFuncitonInfo();
+                btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+                function.UpdataFuncitonInfo();
             };
         }
 
@@ -28,8 +28,8 @@
         void LoadCollectionEvent()
         {
             btnCollection.MouseUpEventHandler += (sender, e) => {
-                btnCollection.IsSelected = tv.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
-                tv.CollectFunction();
+                btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+                function.CollectFunction();
             };
         }
 
@@ -40,32 +40,32 @@
         {
             btnChangeTVAV.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.AV_TV);
+                tvTemp.ControlTV(InfraredCode_TV.AV_TV,function);
             };
             btnChlPlus.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.ChannelUp);
+                tvTemp.ControlTV(InfraredCode_TV.ChannelUp, function);
             };
             btnChlReduce.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.ChannelDown);
+                tvTemp.ControlTV(InfraredCode_TV.ChannelDown, function);
             };
             btnVolPlus.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.VolUp);
+                tvTemp.ControlTV(InfraredCode_TV.VolUp, function);
             };
             btnVolReduce.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.VolDown);
+                tvTemp.ControlTV(InfraredCode_TV.VolDown, function);
             };
             btnBack.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.Back);
+                tvTemp.ControlTV(InfraredCode_TV.Back, function);
             };
 
             btnMenu.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.Menu);
+                tvTemp.ControlTV(InfraredCode_TV.Menu, function);
             };
             btn123.MouseUpEventHandler = (sender, e) =>
             {
@@ -73,27 +73,27 @@
             };
             btnMute.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.Mute);
+                tvTemp.ControlTV(InfraredCode_TV.Mute, function);
             };
             btnPower.MouseUpEventHandler = (sender, e) =>
             {
-                tv.ControlTV(InfraredCode_TV.Power);
+                tvTemp.ControlTV(InfraredCode_TV.Power, function);
             };
 
             btnTopMenuUp.MouseUpEventHandler = (sender, e) => {
-                tv.ControlTV(InfraredCode_TV.Up);
+                tvTemp.ControlTV(InfraredCode_TV.Up, function);
             };
             btnTopMenuLeft.MouseUpEventHandler = (sender, e) => {
-                tv.ControlTV(InfraredCode_TV.Left);
+                tvTemp.ControlTV(InfraredCode_TV.Left, function);
             };
             btnTopMenuRight.MouseUpEventHandler = (sender, e) => {
-                tv.ControlTV(InfraredCode_TV.Right);
+                tvTemp.ControlTV(InfraredCode_TV.Right, function);
             };
             btnTopMenuDown.MouseUpEventHandler = (sender, e) => {
-                tv.ControlTV(InfraredCode_TV.Down);
+                tvTemp.ControlTV(InfraredCode_TV.Down, function);
             };
             btnOk.MouseUpEventHandler = (sender, e) => {
-                tv.ControlTV(InfraredCode_TV.Confrim);
+                tvTemp.ControlTV(InfraredCode_TV.Confrim, function);
             };
         }
 

--
Gitblit v1.8.0