From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 14:10:22 +0800
Subject: [PATCH] 上传一个很特别的新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 1bd57b2..6d3c85d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -713,8 +713,7 @@
private void AddPirSensorWorkModeRow()
{
if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
- || deviceEnumInfo.IsHdlDevice == false
- || this.listNewDevice.Count != 2)
+ || deviceEnumInfo.IsHdlDevice == false)
{
return;
}
@@ -743,8 +742,7 @@
/// </summary>
private void AddPirSensorBindRow()
{
- if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
- || this.listNewDevice.Count != 2)
+ if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)
{
return;
}
@@ -1078,7 +1076,7 @@
paneTargetsBaseFormp.Show();
paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (string.IsNullOrEmpty(bindName))
{
@@ -1129,7 +1127,7 @@
paneTargetsBaseFormp.Show();
paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (string.IsNullOrEmpty(bindName))
{
@@ -1439,13 +1437,13 @@
if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (btnNewVersion != null)
{
btnNewVersion.Visible = true;
}
- });
+ }, ShowErrorMode.NO);
}
});
}
--
Gitblit v1.8.0