From 965290476c027deb96891cde1095d9a100581a6b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 20 二月 2020 09:13:32 +0800
Subject: [PATCH] 2020-02-20 1.优化更新。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs | 97 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 37 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs
index dd0a47d..789239d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs
@@ -187,6 +187,12 @@
/// <param name="b">The blue component.</param>
void controlAllLight (byte b)
{
+ if (CommonPage.IsRemote) {
+ if (!SmartHome.MqttCommon.IsGatewayOnline) {
+ new Alert ("", "Gateway offline" + ErrorCode.ControlFailure, "Close").Show ();
+ return;
+ }
+ }
showTip = true;
System.Threading.Tasks.Task.Run (() => {
@@ -204,31 +210,28 @@
if (common.Type == DeviceType.LightSwitchSocket || common.Type == DeviceType.LightEnergySocket) {
returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, 0, 0 });
if (showTip) {
- Application.RunOnMainThread (() => {
- if (returnBytes == null) {
- string tipString = Language.StringByID (R.MyInternationalizationString.ControlFailure);
+ if (returnBytes == null) {
+ Application.RunOnMainThread (() => {
+
var btnTip = new Button () {
Height = Application.GetRealHeight (140),
- Text = common.Name + tipString,// + "..." + controlDeviceIndex.ToString () + @"/" + sceneDeviceCount.ToString (),
- BackgroundColor = 0xFF000000,
- //TextColor = 0xFF000000
+ Text = common.Name + ErrorCode.ControlFailure,
+ BackgroundColor = 0xFFD7D7D7,
};
MainPage.MainFrameLayout.AddChidren (btnTip);
btnTip.MouseUpEventHandler += (sender, e) => {
btnTip.RemoveFromParent ();
- //MainPage.MainFrameLayout.Remove (btnTip);
};
System.Threading.Tasks.Task.Run (() => {
System.Threading.Thread.Sleep (3000);
Application.RunOnMainThread (() => {
btnTip.RemoveFromParent ();
- //MainPage.MainFrameLayout.Remove (btnTip);
- showTip = false;
});
});
- }
- });
+
+ });
+ }
}
}
}
@@ -364,13 +367,15 @@
};
lightView.AddChidren (tempSwitch);
tempSwitch.MouseUpEventHandler += (sender3, e3) => {
- tempSwitch.IsSelected = !tempSwitch.IsSelected;
- if (tempSwitch.IsSelected) {
- light.CurrentBrightness = 100;
- } else {
- light.CurrentBrightness = 0;
- }
- Control.ControlBytesSend (Command.SetSingleLight, light.SubnetID, light.DeviceID, new byte [] { light.LoopID, light.CurrentBrightness, light.DelayTimeHeight, light.DelayTimeLow });
+ //tempSwitch.IsSelected = !tempSwitch.IsSelected;
+ //if (tempSwitch.IsSelected) {
+ // light.CurrentBrightness = 100;
+ //} else {
+ // light.CurrentBrightness = 0;
+ //}
+ int mSetBrightness = tempSwitch.IsSelected ? 0 : 100;
+ //Control.ControlBytesSend (Command.SetSingleLight, light.SubnetID, light.DeviceID, new byte [] { light.LoopID, light.CurrentBrightness, light.DelayTimeHeight, light.DelayTimeLow });
+ SendControl.SendControlSetSingleLight (light, new byte [] { light.LoopID, (byte)mSetBrightness, light.DelayTimeHeight, light.DelayTimeLow });
};
if (light.CurrentBrightness == 100) {
@@ -420,6 +425,7 @@
foreach (var c in EnergtLightList) {
Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 10, c.LoopID }, SendCount.Zero);
Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
+ System.Threading.Thread.Sleep (500);
}
Thread.Sleep (10000);
}
@@ -461,20 +467,31 @@
#endregion
}
+ /// <summary>
+ /// 璇诲彇鏍囧織
+ /// </summary>
+ static bool IsReadingAll = false;
+
static System.Threading.Thread thread;
/// <summary>
/// 璇诲彇璁惧鐘舵��
/// </summary>
- public static void readAllStatus (bool isRead = false)
+ public static void readAllStatus (bool isRead = false, bool isCheckIsReadingAll = false)
{
+ if (isCheckIsReadingAll) {
+ if (IsReadingAll && !isRead) {
+ Console.WriteLine ("IsLightReadingAll 璇诲彇涓�");
+ return;
+ }
+ }
if (isRead) {
foreach (Room room in Room.Lists) {
- if (string.IsNullOrEmpty(room.Name)) {
+ if (string.IsNullOrEmpty (room.Name)) {
continue;
}
var list = room.DeviceList.FindAll ((obj) => {
return obj.Type == DeviceType.LightSwitchSocket;
- });
+ });
foreach (Common common in list) {
common.LastUpdateTime = DateTime.MinValue;
}
@@ -485,29 +502,35 @@
}
thread = new Thread (() => {
try {
- System.Collections.Generic.List<string> readList = new System.Collections.Generic.List<string> ();
- foreach (Room room in Room.Lists) {
- if (string.IsNullOrEmpty(room.Name)) {
- continue;
- }
- var list = room.DeviceList.FindAll ((obj) => {
- return obj.LastUpdateTime.AddMinutes (Common.Time) <= DateTime.Now && obj.Type == DeviceType.LightSwitchSocket;
- });
- foreach (Common common in list) {
- var s = common.Type + "_" + common.SubnetID + "_" + common.DeviceID;
- //宸茬粡璇诲彇杩囧綋鍓嶈澶囧氨涓嶅啀璇诲彇
- if (readList.Contains (s)) {
+ IsReadingAll = true;
+ System.Collections.Generic.List<string> readList = new System.Collections.Generic.List<string> ();
+ foreach (Room room in Room.Lists) {
+ if (string.IsNullOrEmpty (room.Name)) {
continue;
}
- readList.Add (s);
- Control.ControlBytesSendHasReturn (Command.ReadLightEquipmentAllLoopBrightness, common.SubnetID, common.DeviceID, new byte [] { });
+ var list = room.DeviceList.FindAll ((obj) => {
+ return obj.LastUpdateTime.AddMinutes (Common.Time) <= DateTime.Now && obj.Type == DeviceType.LightSwitchSocket;
+ });
+ foreach (Common common in list) {
+ var s = common.Type + "_" + common.SubnetID + "_" + common.DeviceID;
+ //宸茬粡璇诲彇杩囧綋鍓嶈澶囧氨涓嶅啀璇诲彇
+ if (readList.Contains (s)) {
+ continue;
+ }
+ readList.Add (s);
+ Control.ControlBytesSendHasReturn (Command.ReadLightEquipmentAllLoopBrightness, common.SubnetID, common.DeviceID, new byte [] { });
+ }
}
- }
- } catch { } finally {
+ IsReadingAll = false;
+ } catch {
+ IsReadingAll = false;
+ } finally {
thread = null;
}
});
thread.Start ();
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0