From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 939ebe3..f998180 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -7,6 +7,46 @@
public partial class HomePage
{
/// <summary>
+ /// 鏇存柊涓婚〉澶╂皵
+ /// </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.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
+ }
+
+ /// <summary>
+ /// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
+ /// </summary>
+ void LoadEvent_FunctionCollection(Button btn,Function function,bool isDevice)
+ {
+ 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)
+ {
+ LoadDeviceFunctionControlZone();
+ }
+ else
+ {
+ LoadSceneFunctionControlZone();
+ }
+ DB_ResidenceData.residenceData.SaveResidenceData();
+ new PublicAssmebly().TipMsgAutoClose(msg, true);
+ };
+ }
+
+ /// <summary>
/// 淇敼鏄剧ず鐨勫姛鑳界被鍨�
/// 璁惧鍔熻兘/鍦烘櫙鍔熻兘
/// </summary>
@@ -62,7 +102,7 @@
}
/// <summary>
- /// 鏇存柊鐏厜鏄剧ず鐘舵��
+ /// 鏇存柊鏄剧ず鐘舵��
/// </summary>
public static void UpdataFunctionStates(Function function)
{
@@ -85,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;
+ }
}
}
}
@@ -103,7 +150,6 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- /// <param name="btnCoverd"></param>
void LoadEvent_ControlScene(Button btnCoverd ,Function function)
{
btnCoverd.MouseDownEventHandler = (sender, e) =>
@@ -112,16 +158,9 @@
};
btnCoverd.MouseUpEventHandler = (sender, e) =>
{
+ string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
+ new PublicAssmebly().TipMsgAutoClose(msg, true);
Control.Send(function as Scene);
- new System.Threading.Thread(() =>
- {
- System.Threading.Thread.Sleep(200);
- Application.RunOnMainThread(() =>
- {
- btnCoverd.IsSelected = false;
- });
- })
- { IsBackground = true }.Start();
};
}
@@ -139,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.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);
};
}
@@ -158,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) =>
@@ -169,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