From b02e8275a21dc06bf54b66273485d44e007a2616 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 20 七月 2020 14:50:17 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 179 ++++++++++++++++++++++++++---------------------------------
1 files changed, 79 insertions(+), 100 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index de21c0e..db51608 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -1,6 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using Shared.Phone.UserCenter.DeviceBind;
using ZigBee.Common;
using ZigBee.Device;
@@ -70,7 +72,7 @@
{
this.deviceObj = i_device;
//鑾峰彇鏁版嵁
- ReadDoorLockUserInfo(deviceObj);
+ InitInfo(deviceObj);
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
@@ -147,7 +149,7 @@
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
- void ReadDoorLockUserInfo(CommonDevice curControlDev)
+ void InitInfo(CommonDevice curControlDev)
{
System.Threading.Tasks.Task.Run(async () =>
{
@@ -164,7 +166,7 @@
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
}
}
@@ -182,55 +184,6 @@
}
});
}
- #endregion
-
- #region 鈻� 鏂伴鐩爣_________________________
- /// <summary>
- /// 鏂伴鐩爣琛�
- /// </summary>
- private void AddFreshAirRow()
- {
- //鏂伴鐩爣
- var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
- listview.AddChidren(rowNewWind);
- rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewWindTarget), 600);
- //搴曠嚎
- rowNewWind.AddBottomLine();
- //鍙崇澶�
- rowNewWind.AddRightArrow();
-
- var msg = Language.StringByID(R.MyInternationalizationString.nothing);
- if (!string.IsNullOrEmpty(bindFreshAirName))
- {
- msg = bindFreshAirName;
- }
- var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
-
- rowNewWind.ButtonClickEvent += (sender, e) =>
- {
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindFreshAirDev, bindList, 1);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addDevicePage.Show();
-
- addDevicePage.actionFreshAirTarget += (bindName) =>
- {
- Application.RunOnMainThread(() =>
- {
- if (string.IsNullOrEmpty(bindName))
- {
- btnNewWindStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
- }
- else
- {
- btnNewWindStatu.Text = bindName;
- }
- });
- };
-
- };
- }
- #endregion
/// <summary>
/// 鑾峰彇缁戝畾鐩爣
@@ -242,14 +195,17 @@
bool result = false;
//鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣
FreshAir curControlDev = curDev as FreshAir;
- var panelBindListRes = await curControlDev.GetDeviceBindAsync();
+ var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
{
bindList = panelBindListRes.getAllBindResponseData.BindList;
foreach (var bDev in bindList)
{
var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
-
+ if (device == null)
+ {
+ continue;
+ }
if (device.Type == DeviceType.FreshAir)
{
//鑾峰彇璁惧绫诲瀷鐨�
@@ -261,7 +217,7 @@
}
if (string.IsNullOrEmpty(bDev.ESName))
{
- bindFreshAirName = device.DeviceEpointName;
+ bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
}
else
{
@@ -277,20 +233,19 @@
{
if (string.IsNullOrEmpty(bDev.ESName))
{
- bindTemperatureName = device.DeviceEpointName;
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
}
else
{
bindTemperatureName = bDev.ESName;
}
-
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
if (string.IsNullOrEmpty(bDev.ESName))
{
- bindHumidityName = device.DeviceEpointName;
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
}
else
{
@@ -304,7 +259,7 @@
{
if (string.IsNullOrEmpty(bDev.ESName))
{
- bindHumidityName = device.DeviceEpointName;
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
}
else
{
@@ -317,35 +272,19 @@
{
if (bDev.BindCluster == 1026)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = device.DeviceEpointName;
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
-
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
bindTemperatureDev = device;
}
if (bDev.BindCluster == 1029)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = device.DeviceEpointName;
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
bindHumidityDev = device;
}
if (bDev.BindCluster == 1066)
{
if (string.IsNullOrEmpty(bDev.ESName))
{
- bindPmName = device.DeviceEpointName;
+ bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
}
else
{
@@ -360,6 +299,54 @@
}
return result;
}
+
+ #endregion
+
+ #region 鈻� 鏂伴鐩爣_________________________
+ /// <summary>
+ /// 鏂伴鐩爣琛�
+ /// </summary>
+ private void AddFreshAirRow()
+ {
+ //鏂伴鐩爣
+ var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowNewWind);
+ rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewWindTarget), 600);
+ //搴曠嚎
+ rowNewWind.AddBottomLine();
+ //鍙崇澶�
+ rowNewWind.AddRightArrow();
+
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ if (!string.IsNullOrEmpty(bindFreshAirName))
+ {
+ msg = bindFreshAirName;
+ }
+ var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
+
+ rowNewWind.ButtonClickEvent += (sender, e) =>
+ {
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindFreshAirDev, BindInfo.BindType.FreshAir);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionFreshAirTarget += (bindName) =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (string.IsNullOrEmpty(bindName))
+ {
+ btnNewWindStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+ }
+ else
+ {
+ btnNewWindStatu.Text = bindName;
+ }
+ });
+ };
+ };
+ }
+ #endregion
#region 鈻� PM2.5鏉ユ簮_________________________
/// <summary>
@@ -383,12 +370,11 @@
var btnPMStatu = rowPM.AddMostRightView(msg, 700);
rowPM.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindPMDev, bindList, 4);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindPMDev, BindInfo.BindType.PM);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addDevicePage.Show();
-
- addDevicePage.actionPMTarget += (bindName) =>
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionPMTarget += (bindName) =>
{
Application.RunOnMainThread(() =>
{
@@ -428,12 +414,11 @@
var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
rowTemPerature.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindTemperatureDev, bindList, 2);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindTemperatureDev, BindInfo.BindType.Temperature);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addDevicePage.Show();
-
- addDevicePage.actionTemperatureTarget += (bindName) =>
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
{
Application.RunOnMainThread(() =>
{
@@ -473,12 +458,11 @@
var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
rowHumidity.ButtonClickEvent += (sender, e) =>
{
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindHumidityDev, bindList, 3);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindHumidityDev, BindInfo.BindType.Humidity);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addDevicePage.Show();
-
- addDevicePage.actionHumidityTarget += (bindName) =>
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
{
Application.RunOnMainThread(() =>
{
@@ -512,13 +496,8 @@
rowLight.AddRightArrow();
rowLight.ButtonClickEvent += (sender, e) =>
{
- //缁欐柊椋庨潰鏉垮缓绔嬩竴涓柊鐨勬敮鎸侀潰鏉垮璞★紝鐢�200绔偣璁剧疆
- var panel = new Panel();
- panel.DeviceAddr = this.deviceObj.DeviceAddr;
- panel.DeviceEpoint = 200;
- panel.CurrentGateWayId = this.deviceObj.CurrentGateWayId;
- var form = new PanelFangyueFreshAirBackLightSettionForm();
- form.AddForm(panel);
+ var form = new PanelBrightnessAdjustForm();
+ form.AddForm(this.deviceObj);
};
}
#endregion
--
Gitblit v1.8.0