From 305f57840fff5b7cb1914b35c56eaece618711e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 14 一月 2021 17:06:36 +0800
Subject: [PATCH] 2021-01-14 1. 修改判断当前值是否需要参与签名方法，保持跟云端一致
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 313 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 277 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 1441781..e51c591 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -1,4 +1,6 @@
锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -19,43 +21,74 @@
bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
}
}
+
+ /// <summary>
+ /// 鏇存柊杩炴帴鐘舵�佸浘鏍�
+ /// </summary>
+ void CheckLinkStatus()
+ {
+ if (Control.Ins.GatewayOnline)
+ {
+ if (Control.Ins.IsRemote)
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ }
+ else
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
+ }
+ }
+ else
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+ }
+ }
+
/// <summary>
/// 纭杩炴帴鐘舵��
/// </summary>
public static void LoadEvent_CheckLinkStatus()
{
- if (bodyView != null)
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
+ if (bodyView != null)
{
- if (Control.Ins.GatewayOnline)
- {
- if (Control.Ins.IsRemote)
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
- }
- else
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
- }
- }
- else
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
- }
- });
- }
+ bodyView.CheckLinkStatus();
+ }
+ });
+
+ //if (bodyView != null)
+ //{
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (Control.Ins.GatewayOnline)
+ // {
+ // if (Control.Ins.IsRemote)
+ // {
+ // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ // }
+ // else
+ // {
+ // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
+ // }
+ // }
+ // else
+ // {
+ // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+ // }
+ // });
+ //}
}
/// <summary>
/// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
/// </summary>
- void LoadEvent_FunctionCollection(Button btn,Function function)
+ void LoadEvent_FunctionCollection(Button btn, Function function)
{
btn.MouseUpEventHandler += (sender, e) =>
{
function.collect = false;
- if (function.functionCategory == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ if (function.Spk_Prefix == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
{
if ((function as Music.A31MusicModel).ServerClientType == 1)
{
@@ -65,7 +98,7 @@
}
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
LoadDeviceFunctionControlZone();
- function.SaveFunctionData();
+ function.CollectFunction();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -79,7 +112,7 @@
scene.collect = false;
string msg = scene.name + Language.StringByID(StringId.CollectionCancelled);
LoadSceneFunctionControlZone();
- scene.SaveSceneData();
+ scene.CollectScene();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -144,7 +177,7 @@
/// </summary>
public static void UpdataFunctionStates(Function function)
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((Action)(() =>
{
try
{
@@ -163,13 +196,16 @@
btn.IsSelected = state;
if (btn.Tag != null && btn.Tag.ToString() == "state")
{
- if(function.functionCategory == FunctionCategory.Music)
+ if (function.Spk_Prefix == FunctionCategory.Music)
{
btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
}
else
{
- btn.Text = function.lastState;
+ if (function.spk != SPK.LightSwitch)
+ {
+ btn.Text = function.lastState;
+ }
}
}
}
@@ -182,20 +218,64 @@
{
MainPage.Log($"HomePage updata funciton states error {ex.Message}");
}
- });
+ }));
}
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd,Button btnName,Button btnZone ,Scene scene)
+ void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone,Button btnShowDelay, Scene scene)
{
-
+
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
+ //鍦烘櫙姝ｅ湪鍊掕鏃舵墽琛屼腑锛屼笉鍏佽鍐嶇偣鍑�
+ if (scene.LastExecutionTime == "" || Convert.ToDouble(scene.LastExecutionTime) + Convert.ToDouble(scene.delay) < Convert.ToDouble(Utlis.GetTimestamp(false)))
+ {
+ scene.LastExecutionTime = Utlis.GetTimestamp(false);
+ }
+ else
+ {
+ return;
+ }
string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
Control.Ins.ControlScene(scene);
+ scene.SceneCountDown(btnShowDelay);
+ //new System.Threading.Thread(() => {
+ // int time = Convert.ToInt32(scene.delay);
+ // if (time > 0)
+ // {
+ // while (time > 0)
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (time / 60 > 1)
+ // {
+ // btnShowDelay.Text = (time / 60).ToString() + "min";
+ // }
+ // else
+ // {
+ // btnShowDelay.Text = (time--).ToString() + "s";
+ // }
+ // });
+ // if (time / 60 > 1)
+ // {
+ // System.Threading.Thread.Sleep(time / 60 * 60000);
+ // }
+ // else
+ // {
+ // System.Threading.Thread.Sleep(1000);
+ // }
+ // }
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnShowDelay.Text = "";
+ // });
+ // }
+ //})
+ //{ IsBackground = true, Priority = System.Threading.ThreadPriority.BelowNormal }.Start();
+
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
@@ -215,9 +295,27 @@
new System.Threading.Thread(() =>
{
function.trait_on_off.curValue = 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.curValue.ToString());
- Control.Ins.SendWriteCommand(function, d);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
+ {
+ var light = function as Light;
+ d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
+ if (btnSwitch.IsSelected)
+ {
+ d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
+ }
+ else
+ {
+ light.lastBrightness = light.brightness;
+ }
+ d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
+ Control.Ins.SendWriteCommand(light, d);
+ }
+ else
+ {
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ }
})
{ IsBackground = true }.Start();
};
@@ -228,9 +326,10 @@
/// </summary>
/// <param name="tV"></param>
/// <param name="button"></param>
- void LoadEvent_ControlTV(TV tV,Button button)
+ void LoadEvent_ControlTV(TV tV, Button button)
{
- button.MouseUpEventHandler = (sender, e) => {
+ button.MouseUpEventHandler = (sender, e) =>
+ {
tV.ControlTV(InfraredCode_TV.Power);
};
}
@@ -250,7 +349,7 @@
curtain.trait_on_off.curValue = "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.curValue.ToString());
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -276,9 +375,16 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
+
+ //鎴块棿鍒犻櫎浜嬩欢
+ Action backAction = () => {
+ RegisterGetPushMessageAction();
+ GetUnreadPushMessages();
+ };
+
var skipPage = new MessageCenterPage();
MainPage.BasePageView.AddChidren(skipPage);
- skipPage.LoadPage();
+ skipPage.LoadPage(backAction);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnMsgBg.MouseUpEventHandler = eventHandler;
@@ -287,5 +393,140 @@
btnMsgIcon.MouseUpEventHandler = eventHandler;
}
+
+ #region 鏌ヨ鏈璇绘秷鎭垪琛�
+ /// <summary>
+ /// 鏄惁姝ｅ湪璇诲彇
+ /// </summary>
+ bool isGetting;
+ /// <summary>
+ /// 鏌ヨ鏈娑堟伅骞舵樉绀�
+ /// </summary>
+ void GetUnreadPushMessages()
+ {
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ try
+ {
+ if (isGetting) return;
+
+ isGetting = true;
+
+ var result = new HttpServerRequest().PushSerivceGetPushmessagelist();
+ if (result.Code == StateCode.SUCCESS)
+ {
+ //鏈鐨勬秷鎭垪琛�
+ var unreadList = new List<PushMessageInfo>();
+
+ var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
+
+ if (pushMessageInfoList != null && pushMessageInfoList.Count > 0)
+ {
+ foreach (var info in pushMessageInfoList)
+ {
+ if (!info.isRead)
+ {
+ unreadList.Add(info);
+ break; // 璺冲嚭寰幆
+ }
+ }
+
+ if (unreadList != null && unreadList.Count > 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ ShowMesBtnState(unreadList[0], false);
+ });
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ ShowMesBtnState(pushMessageInfoList[0], true);
+ });
+ }
+ }
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ finally
+ {
+ isGetting = false;
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鏄剧ず鏈璇绘秷鎭�
+ /// </summary>
+ /// <param name="pushMessageInfo"></param>
+ /// <param name="allRead">鎵�鏈夐兘宸茶</param>
+ void ShowMesBtnState(PushMessageInfo pushMessageInfo, bool allRead)
+ {
+ if (bodyView == null) return;
+ btnMsg.Text = pushMessageInfo.messageTitle + ": " + pushMessageInfo.messageContent;
+ btnMsgTime.Text = GetUnixToDateTime(pushMessageInfo.createTime);
+ btnMsgIcon.IsSelected = !allRead;
+ }
+
+ /// <summary>
+ /// 閲嶇疆鏈娑堟伅鎺т欢
+ /// </summary>
+ void ResetMesBtnRead()
+ {
+ if (bodyView == null) return;
+ btnMsg.Text = "...";
+ btnMsgTime.Text = "00:00";
+ btnMsgIcon.IsSelected = false;
+ }
+
+ /// <summary>
+ /// 鏃堕棿鏍煎紡杞崲澶勭悊
+ /// </summary>
+ /// <param name="time">姣鏃堕棿鎴�</param>
+ /// <returns></returns>
+ string GetUnixToDateTime(long time)
+ {
+ try
+ {
+ return Utlis.ToFriendlyDisplay(time);
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
+
+ /// <summary>
+ /// 娉ㄥ唽鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void RegisterGetPushMessageAction()
+ {
+ Action RegisterGetPushMessageAction = () => {
+ if (bodyView != null)
+ {
+ //Utlis.WriteLine("GetPushMessageAction H鏀跺埌鎺ㄩ��");
+ GetUnreadPushMessages();
+ }
+ };
+ HDLCommon.GetPushMessageAction = RegisterGetPushMessageAction;
+ }
+
+ /// <summary>
+ /// 鍙栨秷鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void UnregisterGetPushMessageAction()
+ {
+ HDLCommon.GetPushMessageAction = null;
+ }
+
+ #endregion
+
}
}
--
Gitblit v1.8.0