From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 94bfddc..8dd444b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -146,6 +146,7 @@
Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
Direction = AMPopTipDirection.None,
}.Show(MainPage.BaseView);
+ return;
}
new System.Threading.Thread(() =>
{
@@ -158,7 +159,7 @@
{ IsBackground = true }.Start();
function.trait_on_off.curValue = "off";
function.SetAttrState(FunctionAttributeKey.Percent, 0);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ var d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(function, d);
//CurtainAnimation(100);
@@ -174,6 +175,7 @@
Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
Direction = AMPopTipDirection.None,
}.Show(MainPage.BaseView);
+ return;
}
new System.Threading.Thread(() => {
System.Threading.Thread.Sleep(2000);
@@ -199,6 +201,7 @@
Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
Direction = AMPopTipDirection.None,
}.Show(MainPage.BaseView);
+ return;
}
new System.Threading.Thread(() =>
{
@@ -235,7 +238,7 @@
// DriverLayer.Control.Ins.SendWriteCommand(function, d);
//};
- if (!function.online)
+ if (function.online)
{
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
--
Gitblit v1.8.0