From 9d3c2727f1cd12f0a29c75f4ddff851d5243ac81 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 16 四月 2020 18:29:38 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
index 8da0a5c..e2765e4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
@@ -89,6 +89,22 @@
/// 闈㈡澘涓瓨鍦ㄧ殑閿��
/// </summary>
List<String> panelBindListKey = null;
+ /// <summary>
+ /// 鏂伴缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ Action actionFreshAirTarget = null;
+ /// <summary>
+ /// 娓╁害缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ Action actionTemperatureTarget = null;
+ /// <summary>
+ /// 婀垮害缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ Action actionHumidityTarget = null;
+ /// <summary>
+ /// PM缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ Action actionPMTarget = null;
#endregion
#region UI璁捐
@@ -986,7 +1002,19 @@
{
foreach (var bd in oldTargetList)
{
- await RemoveTargets(bd);
+ var res = await RemoveTargets(bd);
+ if (res != 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ return;
+ });
+ }
+
}
}
@@ -1017,7 +1045,7 @@
var dev = new AddedDeviceBindResponseAllData();
dev = await curControlDev.AddDeviceBindAsync(addBindeDev);
- if (dev.addedDeviceBindResponseData == null)
+ if (dev != null || dev.addedDeviceBindResponseData == null)
{
Application.RunOnMainThread(() =>
{
@@ -1138,17 +1166,12 @@
{
foreach (var re in delResult.delDeviceBindResponseData.RemoveBindList)
{
- switch (re.Result)
+ if (re.Result == 0)
{
- case 0:
- return 0;
- break;
- case 1:
- return 1;
- break;
- case 2:
- return 2;
- break;
+ return 0;
+ }
+ {
+ return -1;
}
}
}
--
Gitblit v1.8.0