From 0e1c6c25b1b0961d324811ff2132717a80f99efe Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 26 四月 2020 14:15:05 +0800
Subject: [PATCH] 2020-04-26 1.添加住宅和修改住宅时，改为子线程操作。 2.远程连接模式时，禁用搜索网关和添加设备。3.修复切换住宅时，提示远程连接Loading不关闭问题。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs
index dda83b0..e5f41b7 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++;
}
@@ -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) {
@@ -237,7 +237,7 @@
}
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -273,7 +273,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) {
new System.Threading.Thread (() => {
mSendCount++;
returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, 0, 0 });
@@ -316,7 +316,7 @@
System.Threading.Thread.Sleep (100);
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -414,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 () {
@@ -504,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);
}
@@ -559,7 +559,7 @@
{
if (isCheckIsReadingAll) {
if (IsReadingAll && !isRead) {
- Console.WriteLine ("IsLightReadingAll 璇诲彇涓�");
+ Utlis.WriteLine ("IsLightReadingAll 璇诲彇涓�");
return;
}
}
@@ -569,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;
@@ -588,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;
@@ -597,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