From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index e3fef44..ee3425e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -11,8 +11,8 @@
/// </summary>
public static void LoadEvent_RefreshAir()
{
- bodyView.btnTempValues.Text = MainPage.cityInfo.temperature == null ? "--" : MainPage.cityInfo.temperature;
- bodyView.btnHumidityValues.Text = MainPage.cityInfo.humidity == null ? "--" : MainPage.cityInfo.humidity;
+ bodyView.btnTempValues.Text = MainPage.cityInfo.temperature == null ? "--" : MainPage.cityInfo.temperature + "掳";
+ bodyView.btnHumidityValues.Text = MainPage.cityInfo.humidity == null ? "--" : MainPage.cityInfo.humidity + "%";
bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
}
@@ -117,7 +117,14 @@
btn.IsSelected = state;
if (btn.Tag != null && btn.Tag.ToString() == "state")
{
- btn.Text = function.lastState;
+ if(function.functionCategory == FunctionCategory.Music)
+ {
+ btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
+ }
+ else
+ {
+ btn.Text = function.lastState;
+ }
}
}
}
@@ -170,6 +177,18 @@
}
/// <summary>
+ /// 鍔犺浇鐢佃鎺у埗浜嬩欢
+ /// </summary>
+ /// <param name="tV"></param>
+ /// <param name="button"></param>
+ void LoadEvent_ControlTV(TV tV,Button button)
+ {
+ button.MouseUpEventHandler = (sender, e) => {
+ tV.ControlTV(InfraredCode_TV.Power);
+ };
+ }
+
+ /// <summary>
/// 鍔犺浇绐楀笜鎺у埗浜嬩欢
/// </summary>
void LoadEvent_ControlCurtain(Curtain curtain, Button btnClose, Button btnOpen)
--
Gitblit v1.8.0