From 21736b2944d5e88cd705a39ff87fd73d5a16e609 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 09 五月 2020 11:06:35 +0800
Subject: [PATCH] 安川
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 51837e9..49ce8de 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -37,6 +37,22 @@
/// PM鐩爣鍚嶅瓧
/// </summary>
private string bindPmName = string.Empty;
+ /// <summary>
+ /// 琚粦鐩爣鏄柊椋�
+ /// </summary>
+ private CommonDevice bindFreshAirDev;
+ /// <summary>
+ /// 琚粦鐩爣鏄俯搴�
+ /// </summary>
+ private CommonDevice bindTemperatureDev;
+ /// <summary>
+ /// 琚粦鐩爣鏄箍搴�
+ /// </summary>
+ private CommonDevice bindHumidityDev;
+ /// <summary>
+ /// 琚粦鐩爣鏄疨M2.5
+ /// </summary>
+ private CommonDevice bindPMDev;
#endregion
@@ -188,7 +204,7 @@
rowNewWind.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 1);
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindFreshAirDev, 1);
Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
addDevicePage.Show();
@@ -208,8 +224,6 @@
});
};
- //var form = new PanelFangyueFreshAirTargetForm();
- //form.AddForm(this.deviceObj, string.Empty, 3);
};
}
#endregion
@@ -242,19 +256,32 @@
continue;
}
bindFreshAirName = device.DeviceEpointName;
+ bindFreshAirDev = device;
}
if (device.Type == DeviceType.TemperatureSensor)
{
- bindTemperatureName = device.DeviceEpointName;
+ var bD = device as TemperatureSensor;
+ if (bD.SensorDiv == 1)
+ {
+ bindTemperatureName = device.DeviceEpointName;
+ bindTemperatureDev = device;
+ }
+ if (bD.SensorDiv == 2)
+ {
+ bindHumidityName = device.DeviceEpointName;
+ bindHumidityDev = device;
+ }
}
if (device.Type == DeviceType.FreshAirHumiditySensor)
{
bindHumidityName = device.DeviceEpointName;
+ bindHumidityDev = device;
}
- //if (device.Type == DeviceType.FreshAir)
- //{
- // bindPmName = device.DeviceEpointName;
- //}
+ if (device.Type == DeviceType.PMSensor)
+ {
+ bindPmName = device.DeviceEpointName;
+ bindPMDev = device;
+ }
}
result = true;
}
@@ -283,7 +310,7 @@
var btnPMStatu = rowPM.AddMostRightView(msg, 700);
rowPM.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 4);
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindPMDev, 4);
Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
addDevicePage.Show();
@@ -328,7 +355,7 @@
var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
rowTemPerature.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 2);
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindTemperatureDev, 2);
Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
addDevicePage.Show();
@@ -373,7 +400,7 @@
var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
rowHumidity.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 3);
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindHumidityDev, 3);
Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
addDevicePage.Show();
--
Gitblit v1.8.0