From 774baeb1f5d2d49bfd692b79faa240bd7949dc17 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 九月 2021 10:06:48 +0800
Subject: [PATCH] 2021-09-02 1.更新控件库，iOS裁剪支持指定大小或者不压缩。2.更新linphoneiOS和Android库，监视关闭麦克风。3.Android丰林和乐橙截图后增加广播推送系统相册刷新。
---
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