From 355bf4219bcd33f2178ed3b1aa54e0af71905fdf Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 三月 2021 09:44:27 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index f2c7f27..f4596b8 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -26,7 +26,7 @@
/// </summary>
public static void RefreshFunctionView()
{
- if (bodyView != null)
+ if (bodyView != null && MainPage.CurPageIndex==0)
{
bodyView.LoadDeviceFunctionControlZone();
}
@@ -334,7 +334,16 @@
{
button.MouseUpEventHandler = (sender, e) =>
{
- new TV().ControlTV(InfraredCode_TV.Power, tV);
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("on_off", "");
+ Control.Ins.SendWriteCommand(tV, d);
+ }
+ else
+ {
+ new TV().ControlTV(InfraredCode_TV.Power, tV);
+ }
};
}
--
Gitblit v1.8.0