From 19d0e070e128daf855beaf72e00f55334be9f87b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 28 八月 2021 13:47:25 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index d480411..bf04c98 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -331,8 +331,12 @@
{
try
{
- //鍏ㄥ紑鍏ㄥ叧
- //if (DB_ResidenceData.Instance.GatewayType == 0 && !Control.Ins.IsRemote)
+ //浼戠湢鏃堕棿(ms)
+ int sleepTime = 100;
+ if(DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ sleepTime = 200;
+ }
if (Control.Ins.GatewayOnline_Local)
{
switch (functionCategory)
@@ -344,7 +348,7 @@
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(sleepTime);
}
break;
case ShowFunction.FloorHeating:
@@ -354,7 +358,7 @@
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(sleepTime);
}
break;
case ShowFunction.Light:
@@ -364,7 +368,7 @@
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(sleepTime);
}
break;
case ShowFunction.Electric:
@@ -374,7 +378,7 @@
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(sleepTime);
}
break;
case ShowFunction.FreshAir:
@@ -384,7 +388,7 @@
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(sleepTime);
}
break;
}
@@ -438,8 +442,11 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
@@ -484,8 +491,11 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
--
Gitblit v1.8.0