From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 0431e70..7664076 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -11,8 +12,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 +25,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)
{
@@ -33,7 +42,7 @@
{
LoadSceneFunctionControlZone();
}
- DB_ResidenceData.residenceData.SaveResidenceData();
+ function.SaveFunctionData();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -94,7 +103,7 @@
}
/// <summary>
- /// 鏇存柊鐏厜鏄剧ず鐘舵��
+ /// 鏇存柊鏄剧ず鐘舵��
/// </summary>
public static void UpdataFunctionStates(Function function)
{
@@ -108,7 +117,7 @@
{
if (view.Tag.ToString() == function.sid)
{
- var state = function.on_off == "on";
+ var state = function.trait_on_off.value.ToString() == "on";
for (int i = 0; i < view.ChildrenCount; i++)
{
if (view.GetChildren(i).GetType() == typeof(Button))
@@ -117,7 +126,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;
+ }
}
}
}
@@ -135,19 +151,18 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd ,Function function)
+ void LoadEvent_ControlScene(Button btnCoverd,Button btnName,Button btnZone ,Function function)
{
- btnCoverd.MouseDownEventHandler = (sender, e) =>
- {
- btnCoverd.IsSelected = true;
- };
- btnCoverd.MouseUpEventHandler = (sender, e) =>
+
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Send(function as Scene);
+ Control.ins.ControlScene(function as Scene);
};
-
+ btnCoverd.MouseUpEventHandler = eventHandler;
+ btnName.MouseUpEventHandler = eventHandler;
+ btnZone.MouseUpEventHandler = eventHandler;
}
/// <summary>
@@ -162,10 +177,24 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- function.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, function);
+ function.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", function.trait_on_off.value.ToString());
+ Control.ins.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);
};
}
@@ -181,8 +210,11 @@
btnClose.MouseUpEventHandler = (sender, e) =>
{
btnClose.IsSelected = false;
- curtain.on_off = "off";
- Control.Send(CommandType_A.write, curtain);
+ curtain.trait_on_off.value = "off";
+ curtain.percent = 0;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off",curtain.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
btnOpen.MouseDownEventHandler = (sender, e) =>
@@ -192,8 +224,11 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
btnOpen.IsSelected = false;
- curtain.on_off = "on";
- Control.Send(CommandType_A.write, curtain);
+ curtain.trait_on_off.value = "on";
+ curtain.percent = 100;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0