From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 0431e70..747708a 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;
}
@@ -24,6 +24,14 @@
btn.MouseUpEventHandler += (sender, e) =>
{
function.collection = false;
+ if(function.functionCategory == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ {
+ if ((function as Music.A31MusicModel).ServerClientType == 1)
+ {
+ (function as Music.A31MusicModel).MainPlayCollection = false;
+ Music.A31MusicModel.Save();
+ }
+ }
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
if (isDevice)
{
@@ -94,7 +102,7 @@
}
/// <summary>
- /// 鏇存柊鐏厜鏄剧ず鐘舵��
+ /// 鏇存柊鏄剧ず鐘舵��
/// </summary>
public static void UpdataFunctionStates(Function function)
{
@@ -117,7 +125,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;
+ }
}
}
}
@@ -163,9 +178,25 @@
new System.Threading.Thread(() =>
{
function.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, function);
+ //Control.Send(CommandType_A.write, function);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", (function as Light).on_off.ToString());
+ Control.SendWriteCommand(function, d);
+
})
{ IsBackground = true }.Start();
+ };
+ }
+
+ /// <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);
};
}
@@ -182,7 +213,10 @@
{
btnClose.IsSelected = false;
curtain.on_off = "off";
- Control.Send(CommandType_A.write, curtain);
+ //Control.Send(CommandType_A.write, curtain);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off",curtain.on_off.ToString());
+ Control.SendWriteCommand(curtain, d);
};
btnOpen.MouseDownEventHandler = (sender, e) =>
@@ -193,7 +227,10 @@
{
btnOpen.IsSelected = false;
curtain.on_off = "on";
- Control.Send(CommandType_A.write, curtain);
+ //Control.Send(CommandType_A.write, curtain);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", curtain.on_off.ToString());
+ Control.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0