From e06be53dff56744de8db2a2aec136d494cc187bf Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 十一月 2023 16:47:02 +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/CurtainModulePageBLL.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 242fb61..11f09af 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -72,7 +72,7 @@
         void LoadEvent_ControlEvent()
         {
             btnCurtainClose.MouseUpEventHandler = (sender, e) => {
-                if (!function.online)
+                if (!function.isOnline())
                 {
                     new Tip()
                     {
@@ -80,6 +80,7 @@
                         Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                         Direction = AMPopTipDirection.None,
                     }.Show(MainPage.BaseView);
+                    return;
                 }
                 new System.Threading.Thread(() => {
                     System.Threading.Thread.Sleep(2000);
@@ -116,7 +117,7 @@
 
             btnCurtainStop.MouseUpEventHandler = (sender, e) =>
             {
-                if (!function.online)
+                if (!function.isOnline())
                 {
                     new Tip()
                     {
@@ -124,6 +125,7 @@
                         Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                         Direction = AMPopTipDirection.None,
                     }.Show(MainPage.BaseView);
+                    return;
                 }
                 new System.Threading.Thread(() => {
                     System.Threading.Thread.Sleep(2000);
@@ -139,7 +141,7 @@
             };
             btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
             {
-                if (!function.online)
+                if (!function.isOnline())
                 {
                     new Tip()
                     {
@@ -147,6 +149,7 @@
                         Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                         Direction = AMPopTipDirection.None,
                     }.Show(MainPage.BaseView);
+                    return;
                 }
                 new System.Threading.Thread(() => {
                     System.Threading.Thread.Sleep(2000);

--
Gitblit v1.8.0