From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs | 187 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 175 insertions(+), 12 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs
index 22af010..374326a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs
@@ -185,22 +185,26 @@
curtainView.AddChidren (btnCloseCurtain);
btnCloseCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, 2 });
+
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, 2 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtainmodel, new byte [] { curtainmodel.LoopID, 2 });
};
btnCloseCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
};
btnOpenCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, 1 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, 1 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtainmodel, new byte [] { curtainmodel.LoopID, 1 });
};
btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
};
btnStopCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, 0 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, 0 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtainmodel, new byte [] { curtainmodel.LoopID, 0 });
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
@@ -287,22 +291,25 @@
curtainView.AddChidren (btnCloseCurtain);
btnCloseCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 1, 2 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 1, 2 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtainroller, new byte [] { 1, 2 });
};
btnCloseCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
};
btnOpenCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 1, 1 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 1, 1 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtainroller, new byte [] { 1, 1 });
};
btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
};
btnStopCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 1, 0 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 1, 0 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtainroller, new byte [] { 1, 0 });
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
@@ -388,22 +395,25 @@
curtainView.AddChidren (btnCloseCurtain);
btnCloseCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { 1, 2 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { 1, 2 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtaintrietex, new byte [] { 1, 2 });
};
btnCloseCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
};
btnOpenCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { 1, 1 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { 1, 1 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtaintrietex, new byte [] { 1, 1 });
};
btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
};
btnStopCurtain.MouseDownEventHandler += (sender3, e3) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { 1, 0 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { 1, 0 });
(sender3 as Button).IsSelected = true;
+ SendControlUpdataCurtain (curtaintrietex, new byte [] { 1, 0 });
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
@@ -450,12 +460,21 @@
}
}
+ bool showTip = true;
/// <summary>
/// 鎺у埗鎵�鏈夌獥甯�
/// </summary>
/// <param name="status">1锛氬紑锛�2锛氬叧.</param>
void controlAllCurtain (byte status)
{
+ if (CommonPage.IsRemote) {
+ if (!SmartHome.MqttCommon.IsGatewayOnline) {
+ new Alert ("", "Gateway offline" + ErrorCode.ControlFailure, "Close").Show ();
+ return;
+ }
+ }
+ showTip = true;
+ MainPage.Loading.Start ("Sending...");
System.Threading.Tasks.Task.Run (() => {
foreach (var room in Room.Lists) {
if (room == null)
@@ -464,18 +483,162 @@
continue;
}
foreach (var common in room.DeviceList) {
+ //2020-02-10
+ byte [] returnBytes = null;
if (common.Type == DeviceType.CurtainModel) {
var curtainmodel = common as CurtainModel;
- Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, status });
+ returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, status });
} else if (common.Type == DeviceType.CurtainRoller) {
var curtainroller = common as CurtainRoller;
- Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { curtainroller.LoopID, status });
+ returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { curtainroller.LoopID, status });
} else if (common.Type == DeviceType.CurtainTrietex) {
var curtaintrietex = common as CurtainTrietex;
- Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { curtaintrietex.LoopID, status });
+ returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { curtaintrietex.LoopID, status });
+ } else {
+ continue;
+ }
+
+ if (showTip) {
+ if (returnBytes == null) {
+ Application.RunOnMainThread (() => {
+
+ string tipString = ErrorCode.ControlFailure;
+ var btnTip = new Button () {
+ Height = Application.GetRealHeight (140),
+ Text = common.Name + tipString,// + "..." + controlDeviceIndex.ToString () + @"/" + sceneDeviceCount.ToString (),
+ BackgroundColor = 0xFFD7D7D7,
+ };
+ MainPage.MainFrameLayout.AddChidren (btnTip);
+ btnTip.MouseUpEventHandler += (sender, e) => {
+ btnTip.RemoveFromParent ();
+ showTip = false;
+ };
+
+ System.Threading.Tasks.Task.Run (() => {
+ System.Threading.Thread.Sleep (3000);
+ Application.RunOnMainThread (() => {
+ btnTip.RemoveFromParent ();
+ });
+ });
+
+ });
+ }
}
}
}
+
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
+ });
+ }
+
+ /// <summary>
+ /// 鎺у埗鎵�鏈夌獥甯�
+ /// </summary>
+ /// <param name="status">1锛氬紑锛�2锛氬叧.</param>
+ void controlAllCurtainNew (byte status)
+ {
+ if (CommonPage.IsRemote) {
+ if (!SmartHome.MqttCommon.IsGatewayOnline) {
+ new Alert ("", "Gateway offline" + ErrorCode.ControlFailure, "Close").Show ();
+ return;
+ }
+ }
+ showTip = true;
+ MainPage.Loading.Start ("Sending...");
+ System.Threading.Tasks.Task.Run (() => {
+
+ int mSendCount = 0;
+ foreach (var room in Room.Lists) {
+ if (room == null)
+ continue;
+ if (string.IsNullOrEmpty (room.Name)) {
+ continue;
+ }
+ foreach (var common in room.DeviceList) {
+ //2020-02-10
+ byte [] returnBytes = null;
+ if (common.Type == DeviceType.CurtainModel || common.Type == DeviceType.CurtainRoller || common.Type == DeviceType.CurtainTrietex) {
+ System.Threading.Tasks.Task.Run (() => {
+ mSendCount++;
+
+ if (common.Type == DeviceType.CurtainModel) {
+ var curtainmodel = common as CurtainModel;
+ returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, status });
+ } else if (common.Type == DeviceType.CurtainRoller) {
+ var curtainroller = common as CurtainRoller;
+ returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { curtainroller.LoopID, status });
+ } else if (common.Type == DeviceType.CurtainTrietex) {
+ var curtaintrietex = common as CurtainTrietex;
+ returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { curtaintrietex.LoopID, status });
+ }
+
+ if (showTip) {
+ if (returnBytes == null) {
+ Application.RunOnMainThread (() => {
+
+ string tipString = ErrorCode.ControlFailure;
+ var btnTip = new Button () {
+ Height = Application.GetRealHeight (140),
+ Text = common.Name + tipString,// + "..." + controlDeviceIndex.ToString () + @"/" + sceneDeviceCount.ToString (),
+ BackgroundColor = 0xFFD7D7D7,
+ };
+ MainPage.MainFrameLayout.AddChidren (btnTip);
+ btnTip.MouseUpEventHandler += (sender, e) => {
+ btnTip.RemoveFromParent ();
+ showTip = false;
+ };
+
+ System.Threading.Tasks.Task.Run (() => {
+ System.Threading.Thread.Sleep (3000);
+ Application.RunOnMainThread (() => {
+ btnTip.RemoveFromParent ();
+ });
+ });
+
+ });
+ }
+ }
+
+ mSendCount--;
+ });
+
+ //绛夊緟100ms鍐嶅彂閫佺浜屼釜璁惧鏁版嵁
+ System.Threading.Thread.Sleep (100);
+
+ }
+
+
+ }
+ }
+
+ while (mSendCount > 0) {
+ System.Threading.Thread.Sleep (100);
+ }
+
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
+ });
+ }
+
+ /// <summary>
+ /// //2020-02-10 甯﹁繑鍥炵粨鏋滅殑淇敼绐楀笜鐘舵��
+ /// </summary>
+ /// <param name="mLightCommon"></param>
+ /// <param name="sendBytes"></param>
+ public static void SendControlUpdataCurtain (Common mCurtainCommon, byte [] sendBytes)
+ {
+ MainPage.Loading.Start ("Sending...");
+ System.Threading.Tasks.Task.Run (() => {
+ byte [] returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, mCurtainCommon.SubnetID, mCurtainCommon.DeviceID, sendBytes);
+ Application.RunOnMainThread (() => {
+ if (returnBytes == null) {
+ new Alert ("", mCurtainCommon.Name + ErrorCode.ControlFailure, "Close").Show ();
+ }
+ MainPage.Loading.Hide ();
+ });
});
}
--
Gitblit v1.8.0