From 2d414e3b007f750cdad4f9e4a7c04db696bca5e4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 四月 2020 16:13:59 +0800
Subject: [PATCH] 2020-04-23 1.优化远程连接提示，改为Loading方案，防止连接过程用户点击重连图标。 2.点击网络检测图标会判断，是否正在远程连接，如果是，会弹窗提示用户”正在远程连接，是否仍要重新检测“。 3.Help 增加隐藏长按功能，长按后，可以开启远程过程异常弹窗提示。长按后关闭。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserCurtainPage.cs | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserCurtainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserCurtainPage.cs
index e86f8aa..a748560 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserCurtainPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserCurtainPage.cs
@@ -201,8 +201,9 @@
};
curtainView.AddChidren (btnCloseLbl);
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;
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainModel, new byte [] { curtainModel.LoopID, 2 });
};
btnCloseCurtain.MouseUpEventHandler += (sender3, e3) => {
new System.Threading.Thread (() => {
@@ -213,9 +214,11 @@
}) { IsBackground = true }.Start ();
};
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;
- };
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainModel, new byte [] { curtainModel.LoopID, 1 });
+
+ };
btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => {
new System.Threading.Thread (() => {
System.Threading.Thread.Sleep (1000);
@@ -226,8 +229,10 @@
};
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;
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainModel, new byte [] { curtainModel.LoopID, 0 });
+
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
new System.Threading.Thread (() => {
@@ -251,6 +256,11 @@
openRunTime = (runTimeBytes [1] * 256 + runTimeBytes [2])/10;
}
Application.RunOnMainThread (() => {
+ //2020-02-10 澧炲姞璇诲彇鏃堕棿澶辫触鎻愮ず
+ if (runTimeBytes == null) {
+ new Alert ("", "Read device run time failed.", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ }
+
FrameLayout runtimeView = new FrameLayout () {
Height = Application.GetRealHeight (700),
Width = LayoutParams.MatchParent,
@@ -334,7 +344,7 @@
});
}
} catch(Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -344,7 +354,7 @@
};
});
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -502,7 +512,9 @@
curtainView.AddChidren (btnCloseLbl);
btnCloseCurtain.MouseDownEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = true;
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainTrietex.SubnetID, curtainTrietex.DeviceID, new byte [] { 1, 2 });
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainTrietex, new byte [] { 1, 2 });
+
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainTrietex.SubnetID, curtainTrietex.DeviceID, new byte [] { 1, 2 });
stop ();
int startProgress = horizontalSeekBar.Progress;
if (0 < curtainTrietex.Speed) {
@@ -538,9 +550,10 @@
};
btnOpenCurtain.MouseDownEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = true;
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainTrietex.SubnetID, curtainTrietex.DeviceID, new byte [] { 1, 1 });
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainTrietex.SubnetID, curtainTrietex.DeviceID, new byte [] { 1, 1 });
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainTrietex, new byte [] { 1, 1 });
- stop ();
+ stop ();
int startProgress = horizontalSeekBar.Progress;
if (0 < curtainTrietex.Speed) {
@@ -577,8 +590,10 @@
};
btnStopCurtain.MouseDownEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = true;
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainTrietex.SubnetID, curtainTrietex.DeviceID, new byte [] { 1, 0 });
- stop ();
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainTrietex.SubnetID, curtainTrietex.DeviceID, new byte [] { 1, 0 });
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainTrietex, new byte [] { 1, 0 });
+
+ stop ();
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = false;
@@ -776,7 +791,9 @@
rollerView.AddChidren (btnCloseLbl);
btnCloseCurtain.MouseDownEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = true;
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainRoller.SubnetID, curtainRoller.DeviceID, new byte [] { 1, 2 });
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainRoller, new byte [] { 1, 2 });
+
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainRoller.SubnetID, curtainRoller.DeviceID, new byte [] { 1, 2 });
stop ();
int startProgress = horizontalSeekBar.Progress;
if (0 < curtainRoller.Speed) {
@@ -812,7 +829,9 @@
};
btnOpenCurtain.MouseDownEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = true;
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainRoller.SubnetID, curtainRoller.DeviceID, new byte [] { 1, 1 });
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainRoller, new byte [] { 1, 1 });
+
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainRoller.SubnetID, curtainRoller.DeviceID, new byte [] { 1, 1 });
stop ();
int startProgress = horizontalSeekBar.Progress;
if (0 < curtainRoller.Speed) {
@@ -849,7 +868,9 @@
};
btnStopCurtain.MouseDownEventHandler += (sender3, e3) => {
(sender3 as Button).IsSelected = true;
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainRoller.SubnetID, curtainRoller.DeviceID, new byte [] { 1, 0 });
+ UserDeviceToCurtains.SendControlUpdataCurtain (curtainRoller, new byte [] { 1, 0 });
+
+ //Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainRoller.SubnetID, curtainRoller.DeviceID, new byte [] { 1, 0 });
stop ();
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
--
Gitblit v1.8.0