From 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 09:31:44 +0800
Subject: [PATCH] 合并代码，更改面板目标信息
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 7182c20..9e91845 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -208,7 +208,7 @@
rowNewWind.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindFreshAirDev, bindList, 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();
@@ -259,7 +259,15 @@
{
continue;
}
- bindFreshAirName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindFreshAirName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindFreshAirName = bDev.ESName;
+ }
+
bindFreshAirDev = device;
}
if (device.Type == DeviceType.TemperatureSensor)
@@ -267,35 +275,66 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- bindTemperatureName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindTemperatureName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindTemperatureName = bDev.ESName;
+ }
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- bindHumidityName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
bindHumidityDev = device;
}
}
if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- bindHumidityName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
bindHumidityDev = device;
}
if (device.Type == DeviceType.PMSensor)
{
if (bDev.BindCluster == 1026)
{
- bindTemperatureName = device.DeviceEpointName;
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
bindTemperatureDev = device;
}
if (bDev.BindCluster == 1029)
{
- bindHumidityName = device.DeviceEpointName;
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
bindHumidityDev = device;
}
if (bDev.BindCluster == 1066)
{
- bindPmName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindPmName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindPmName = bDev.ESName;
+ }
+
bindPMDev = device;
}
}
@@ -327,7 +366,7 @@
var btnPMStatu = rowPM.AddMostRightView(msg, 700);
rowPM.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindPMDev, bindList, 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();
@@ -372,7 +411,7 @@
var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
rowTemPerature.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindTemperatureDev, bindList, 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();
@@ -417,7 +456,7 @@
var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
rowHumidity.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindHumidityDev, bindList, 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