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 | 74 +++++++++++++++++++++++++------------ 1 files changed, 50 insertions(+), 24 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs index 68aa327..49ce8de 100644 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs @@ -1,6 +1,5 @@ 锘縰sing System; using System.Collections.Generic; -using Org.BouncyCastle.Bcpg.OpenPgp; using Shared.Common; using ZigBee.Common; using ZigBee.Device; @@ -38,9 +37,25 @@ /// 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 - + #region 鈻� 鍒濆鍖朹____________________________ /// <summary> @@ -50,8 +65,8 @@ public void ShowForm(CommonDevice i_device) { this.deviceObj = i_device; - //鑾峰彇鏁版嵁 - ReadDoorLockUserInfo(deviceObj); + //鑾峰彇鏁版嵁 + ReadDoorLockUserInfo(deviceObj); //璁剧疆澶撮儴淇℃伅 base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion)); @@ -87,9 +102,9 @@ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028); //鍒濆鍖栬彍鍗曡 - this.InitMenuRow(); - - //鍒濆鍖栨甯冨畬鎴� + this.InitMenuRow(); + + //鍒濆鍖栨甯冨畬鎴� tableContr.FinishInitControl(); tableContr = null; @@ -101,14 +116,14 @@ { //鍏抽棴鑷韩 this.CloseForm(); - }; + }; } /// <summary> /// 鍒濆鍖栬彍鍗曡 /// </summary> private void InitMenuRow() - { + { this.listview.RemoveAll(); //娣诲姞鏂伴鐩爣 this.AddFreshAirRow(); @@ -164,7 +179,7 @@ }); } #endregion - + #region 鈻� 鏂伴鐩爣_________________________ /// <summary> /// 鏂伴鐩爣琛� @@ -178,18 +193,18 @@ //搴曠嚎 rowNewWind.AddBottomLine(); //鍙崇澶� - rowNewWind.AddRightArrow(); + rowNewWind.AddRightArrow(); - var msg = Language.StringByID(R.MyInternationalizationString.nothing); + 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, 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(); @@ -209,8 +224,6 @@ }); }; - //var form = new PanelFangyueFreshAirTargetForm(); - //form.AddForm(this.deviceObj, string.Empty, 3); }; } #endregion @@ -243,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; } @@ -284,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(); @@ -329,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(); @@ -374,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