From 22c5c030f2262b6a9d6840bf3b5196b7ab2d4dd5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 三月 2020 14:31:53 +0800
Subject: [PATCH] 2020-03-10 1.替换最新控件库，增加无网络监听，Loading效果优化。 2.电能插座修复点亮统计个数问题。 3 .定时检测网关是否在线，发送CheckGateway间隔为10S，收到主题刷新该时间，重置发送次数，发送次数到达3次以上，则判定网关为离线状态。 4.远程重复增加为3次，重发后等待5s才回调结果。 5.修复去掉普通继电器读电能操作。 6.读状态间隔缩短为200ms。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs | 98 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs
index 789239d..e7b626e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs
@@ -94,7 +94,7 @@
continue;
}
foreach (var light in room.DeviceList) {
- if (light.Type == DeviceType.LightSwitchSocket) {
+ if (light.Type == DeviceType.LightEnergySocket) {
if ((light as LightSwitch).CurrentBrightness == 100)
brighingCount++;
}
@@ -149,7 +149,7 @@
if (roomRow.Tag.ToString () == room.Name) {
int oCount = 0;
foreach (var light in room.DeviceList) {
- if (light.Type == DeviceType.LightSwitchSocket) {
+ if (light.Type == DeviceType.LightEnergySocket) {
if ((light as LightSwitch).CurrentBrightness == 100)
oCount++;
}
@@ -185,7 +185,7 @@
/// 鎺у埗鎵�鏈夌殑鐏�
/// </summary>
/// <param name="b">The blue component.</param>
- void controlAllLight (byte b)
+ void controlAllLightOld (byte b)
{
if (CommonPage.IsRemote) {
if (!SmartHome.MqttCommon.IsGatewayOnline) {
@@ -207,7 +207,7 @@
foreach (var common in room.DeviceList) {
//controlDeviceIndex++;
byte [] returnBytes = null;
- if (common.Type == DeviceType.LightSwitchSocket || common.Type == DeviceType.LightEnergySocket) {
+ if (common.Type == DeviceType.LightEnergySocket) {
returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, 0, 0 });
if (showTip) {
if (returnBytes == null) {
@@ -235,6 +235,85 @@
}
}
}
+ }
+ } catch (Exception ex) {
+ Console.WriteLine (ex.Message);
+ } finally {
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鎺у埗鎵�鏈夌殑鐏�
+ /// </summary>
+ /// <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 (() => {
+ try {
+ int mSendCount = 0;
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Start ("Sending...");
+ });
+ foreach (var room in Room.Lists) {
+ if (string.IsNullOrEmpty (room.Name)) {
+ continue;
+ }
+ foreach (var common in room.DeviceList) {
+ //controlDeviceIndex++;
+ byte [] returnBytes = null;
+ if (common.Type == DeviceType.LightEnergySocket) {
+ new System.Threading.Thread (() => {
+ mSendCount++;
+ returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, 0, 0 });
+ if (showTip) {
+ if (returnBytes == null) {
+ Application.RunOnMainThread (() => {
+
+ var btnTip = new Button () {
+ Height = Application.GetRealHeight (140),
+ Text = common.Name + ErrorCode.ControlFailure,
+ BackgroundColor = 0xFFD7D7D7,
+ };
+ MainPage.MainFrameLayout.AddChidren (btnTip);
+ btnTip.MouseUpEventHandler += (sender, e) => {
+ btnTip.RemoveFromParent ();
+ };
+
+ System.Threading.Tasks.Task.Run (() => {
+ System.Threading.Thread.Sleep (3000);
+ Application.RunOnMainThread (() => {
+ btnTip.RemoveFromParent ();
+ });
+ });
+
+ });
+ }
+ }
+ mSendCount--;
+ }) { IsBackground = true}.Start();
+
+ //绛夊緟100ms鍐嶅彂閫佺浜屼釜璁惧鏁版嵁
+ System.Threading.Thread.Sleep (100);
+
+ }
+ }
+ }
+
+
+ while (mSendCount > 0) {
+ System.Threading.Thread.Sleep (100);
}
} catch (Exception ex) {
Console.WriteLine (ex.Message);
@@ -335,7 +414,7 @@
continue;
}
foreach (var common in room.DeviceList) {
- if (common.Type == DeviceType.LightSwitchSocket || common.Type == DeviceType.LightEnergySocket) {
+ if (common.Type == DeviceType.LightEnergySocket) {
LightCount++;
var light = common as LightSwitch;
var lightView = new FrameLayout () {
@@ -425,7 +504,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);
+ System.Threading.Thread.Sleep (200);
}
Thread.Sleep (10000);
}
@@ -490,7 +569,7 @@
continue;
}
var list = room.DeviceList.FindAll ((obj) => {
- return obj.Type == DeviceType.LightSwitchSocket;
+ return obj.Type == DeviceType.LightEnergySocket;
});
foreach (Common common in list) {
common.LastUpdateTime = DateTime.MinValue;
@@ -509,7 +588,7 @@
continue;
}
var list = room.DeviceList.FindAll ((obj) => {
- return obj.LastUpdateTime.AddMinutes (Common.Time) <= DateTime.Now && obj.Type == DeviceType.LightSwitchSocket;
+ return obj.LastUpdateTime.AddMinutes (Common.Time) <= DateTime.Now && obj.Type == DeviceType.LightEnergySocket;
});
foreach (Common common in list) {
var s = common.Type + "_" + common.SubnetID + "_" + common.DeviceID;
@@ -518,7 +597,8 @@
continue;
}
readList.Add (s);
- Control.ControlBytesSendHasReturn (Command.ReadLightEquipmentAllLoopBrightness, common.SubnetID, common.DeviceID, new byte [] { });
+ Control.ControlBytesSend (Command.ReadLightEquipmentAllLoopBrightness, common.SubnetID, common.DeviceID, new byte [] { });
+ Thread.Sleep (200);
}
}
IsReadingAll = false;
--
Gitblit v1.8.0