From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 17e06f4..49ce8de 100644
--- 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
@@ -122,7 +138,7 @@
}
#endregion
- #region 鈻� 鍒濆鍖栨暟鎹甠________________________
+ #region 鈻� 鍒濆鍖栨暟鎹甠________________________
/// <summary>
/// 鍒濆鍖栨暟鎹�
@@ -164,7 +180,7 @@
}
#endregion
- #region 鈻� 鏂伴鐩爣_________________________
+ #region 鈻� 鏂伴鐩爣_________________________
/// <summary>
/// 鏂伴鐩爣琛�
/// </summary>
@@ -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,26 +256,39 @@
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;
}
return result;
}
- #region 鈻� PM2.5鏉ユ簮_________________________
+ #region 鈻� PM2.5鏉ユ簮_________________________
/// <summary>
/// PM2.5鏉ユ簮琛�
/// </summary>
@@ -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();
@@ -306,7 +333,7 @@
}
#endregion
- #region 鈻� 娓╁害鏉ユ簮_________________________
+ #region 鈻� 娓╁害鏉ユ簮_________________________
/// <summary>
/// 娓╁害鏉ユ簮琛�
/// </summary>
@@ -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();
@@ -351,7 +378,7 @@
}
#endregion
- #region 鈻� 婀垮害鏉ユ簮_________________________
+ #region 鈻� 婀垮害鏉ユ簮_________________________
/// <summary>
/// 婀垮害鏉ユ簮琛�
/// </summary>
@@ -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();
@@ -396,7 +423,7 @@
}
#endregion
- #region 鈻� 浜害璋冭妭_________________________
+ #region 鈻� 浜害璋冭妭_________________________
/// <summary>
/// 浜害璋冭妭琛�
/// </summary>
@@ -423,7 +450,7 @@
}
#endregion
- #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
+ #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
/// <summary>
/// 鍒濆鍖栧彸涓婅鑿滃崟
/// </summary>
--
Gitblit v1.8.0