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/Room/UserRoom.cs | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
index 5cfda16..1917d47 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
@@ -1821,9 +1821,10 @@
}
};
#endregion
- } else if (devcieCommon.Type == DeviceType.LightSwitch ||
- devcieCommon.Type == DeviceType.LightEnergySocket ||
- devcieCommon.Type == DeviceType.LightEnergySwitch || devcieCommon.Type == DeviceType.LightSwitchSocket) {
+ } else if (devcieCommon.Type == DeviceType.LightSwitch
+ || devcieCommon.Type == DeviceType.LightEnergySocket
+ || devcieCommon.Type == DeviceType.LightEnergySwitch
+ || devcieCommon.Type == DeviceType.LightSwitchSocket) {
#region 缁х數鍣�
LightSwitch switchLight = devcieCommon as LightSwitch;
tempSwitch.IsSelected = switchLight.CurrentBrightness == 100 ? true : false;
@@ -2049,14 +2050,14 @@
};
DeviceRowView.AddChidren (tempSwitch);
if (udDevice.ActionType == 0) {
- tempSwitch.Text = udDevice.ON_Text;
- //tempSwitch.TextID = R.MyInternationalizationString.ON;
+ //tempSwitch.Text = udDevice.ON_Text;
+ tempSwitch.TextID = R.MyInternationalizationString.ON;
} else if (udDevice.ActionType == 1) {
- tempSwitch.Text = udDevice.OFF_Text;
- //tempSwitch.TextID = R.MyInternationalizationString.OFF;
+ //tempSwitch.Text = udDevice.OFF_Text;
+ tempSwitch.TextID = R.MyInternationalizationString.OFF;
} else if (udDevice.ActionType == 2) {
- tempSwitch.Text = udDevice.OFF_Text;
- //tempSwitch.TextID = R.MyInternationalizationString.OFF;
+ //tempSwitch.Text = udDevice.OFF_Text;
+ tempSwitch.TextID = R.MyInternationalizationString.OFF;
Button tempON = new Button () {
Width = Application.GetRealWidth (110),
@@ -2082,25 +2083,26 @@
DeviceRowView.BorderColor = SkinStyle.Current.SelectedColor;
tempON.BorderColor = SkinStyle.Current.SelectedColor;
};
- tempSwitch.MouseUpEventHandler += (sender3, e3) => {
- if (udDevice.UniversalType == 0xE01C) {
- if (udDevice.ActionType == 0) {
- //2020-02-10 寰呬慨鏀�
- Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 255 }, SendCount.Zero);
- } else if (udDevice.ActionType == 1) {
- Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
- } else if (udDevice.ActionType == 2) {
- Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
- }
- }
- DeviceRowView.BorderColor = SkinStyle.Current.Transparent;
- tempSwitch.BorderColor = SkinStyle.Current.BorderColor;
- };
- tempSwitch.MouseDownEventHandler += (sende3r, e3) => {
- DeviceRowView.BorderColor = SkinStyle.Current.SelectedColor;
- tempSwitch.BorderColor = SkinStyle.Current.SelectedColor;
- };
}
+ tempSwitch.MouseUpEventHandler += (sender3, e3) => {
+ if (udDevice.UniversalType == 0xE01C) {
+ if (udDevice.ActionType == 0) {
+ //2020-02-10 寰呬慨鏀�
+ Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 255 }, SendCount.Zero);
+ } else if (udDevice.ActionType == 1) {
+ Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
+ } else if (udDevice.ActionType == 2) {
+ Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
+ }
+ }
+ DeviceRowView.BorderColor = SkinStyle.Current.Transparent;
+ tempSwitch.BorderColor = SkinStyle.Current.BorderColor;
+ };
+ tempSwitch.MouseDownEventHandler += (sende3r, e3) => {
+ DeviceRowView.BorderColor = SkinStyle.Current.SelectedColor;
+ tempSwitch.BorderColor = SkinStyle.Current.SelectedColor;
+ };
+
#endregion
} else if (devcieCommon.Type.ToString ().Contains ("Sensor")) {
#region 浼犳劅鍣�
--
Gitblit v1.8.0