From acb2b278663952ce555b06a2e821f359225f15e0 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 10 七月 2020 09:41:15 +0800 Subject: [PATCH] 备份 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 627 ++++++++++++++++++++++++++++++-------------------------- 1 files changed, 340 insertions(+), 287 deletions(-) diff --git a/Home0630/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs similarity index 97% rename from Home0630/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs rename to ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs index af32d4c..508cab0 100644 --- a/Home0630/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using Shared.Common; -using Shared.Phone.UserCenter.Device.Bind; -using Shared.Phone.UserCenter.DeviceBind; +using Shared.Phone.UserCenter.Device.Bind; +using Shared.Phone.UserCenter.DeviceBind; using ZigBee.Device; namespace Shared.Phone.UserCenter.Device @@ -13,8 +13,7 @@ /// </summary> public class DeviceMacInfoEditorForm : EditorCommonForm { - #region 鈻� 鍙橀噺澹版槑___________________________ - + #region 鈻� 鍙橀噺澹版槑___________________________ /// <summary> /// 璁惧瀵硅薄 /// </summary> @@ -34,30 +33,30 @@ /// <summary> /// 涓ぎ绌鸿皟鐨勭増鏈帶浠� /// </summary> - private NormalViewControl btnAirConditionerVersion = null; - /// <summary> - /// 绠�绾﹂潰鏉跨粦瀹氱殑娓╁害鐩爣鍚嶅瓧 - /// </summary> - private string bindTemperatureName = string.Empty; - /// <summary> - /// 绠�绾﹂潰鏉跨粦瀹氱殑婀垮害鐩爣鍚嶅瓧 - /// </summary> - private string bindHumidityName = string.Empty; - /// <summary> - /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸娓╁害 - /// </summary> - private CommonDevice bindTemperatureDev; - /// <summary> - /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸婀垮害 - /// </summary> + private NormalViewControl btnAirConditionerVersion = null; + /// <summary> + /// 绠�绾﹂潰鏉跨粦瀹氱殑娓╁害鐩爣鍚嶅瓧 + /// </summary> + private string bindTemperatureName = string.Empty; + /// <summary> + /// 绠�绾﹂潰鏉跨粦瀹氱殑婀垮害鐩爣鍚嶅瓧 + /// </summary> + private string bindHumidityName = string.Empty; + /// <summary> + /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸娓╁害 + /// </summary> + private CommonDevice bindTemperatureDev; + /// <summary> + /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸婀垮害 + /// </summary> private CommonDevice bindHumidityDev; - /// <summary> - /// 绠�绾﹂潰鏉垮綋鍓峂ac + /// <summary> + /// 绠�绾﹂潰鏉垮綋鍓峂ac /// </summary> private string deviceMacTemp = string.Empty; - // <summary> - /// 绠�绾﹂潰鏉夸腑琚粦瀹氱殑娓╂箍搴︾洰鏍囧垪琛� - /// </summary> + // <summary> + /// 绠�绾﹂潰鏉夸腑琚粦瀹氱殑娓╂箍搴︾洰鏍囧垪琛� + /// </summary> private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>(); #endregion @@ -99,12 +98,12 @@ //绠�绾﹀鍔熻兘闈㈡澘鑾峰彇缁戝畾鐩爣鐨勬樉绀� if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction) - { - //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅 - var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62); - var key = new ZigBee.Device.Panel(); - key.DeviceAddr = deviceMac; - key.CurrentGateWayId = dev.CurrentGateWayId; + { + //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅 + var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62); + var key = new ZigBee.Device.Panel(); + key.DeviceAddr = deviceMac; + key.CurrentGateWayId = dev.CurrentGateWayId; InitBindInfo(key); } } @@ -289,12 +288,12 @@ //绠�绾﹀鍔熻兘闈㈡澘 this.AddIBindRow(deviceMacTemp); this.AddFunctionSettionRow(); - this.AddHumiditySourceRow(deviceMacTemp); + this.AddHumiditySourceRow(deviceMacTemp); this.AddTemperatureSensorRow(deviceMacTemp); - } + } else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) - { - //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤) + { + //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤) this.AddSimplePanelSettionRow(); } else @@ -578,16 +577,16 @@ var form = new DevicePanel.PanelButtonSettionForm(); form.AddForm(listNewDevice[0]); }; - } - + } + #region 鈻� 绠�绾︾幆澧�(闈㈡澘)_____________________ - + /// <summary> /// 娣诲姞銆愭寜閿缃�戣绠�绾︾幆澧�(闈㈡澘) /// </summary> private void AddSimplePanelSettionRow() - { - //鎸夐敭璁剧疆 + { + //鎸夐敭璁剧疆 string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion); var btnFunction = new FrameRowControl(listview.rowSpace / 2); listview.AddChidren(btnFunction); @@ -597,18 +596,19 @@ //搴曠嚎 btnFunction.AddBottomLine(); btnFunction.ButtonClickEvent += (sender, e) => - { - //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆 - var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm(); + { + //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆 + var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm(); form.AddForm(listNewDevice[0]); }; - } - + } + #endregion + #endregion - + #region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________ - + /// <summary> /// 娣诲姞銆愭寜閿缃�戣(鏂规偊) /// </summary> @@ -644,7 +644,7 @@ //鏂规偊鐜闈㈡澘鐨勬寜閿厤缃� var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm(); form.AddForm(listNewDevice[0]); - } + } else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir) { //鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃� @@ -816,15 +816,15 @@ { var form = new DevicePanel.PanelFangyueFunctionSettionForm(); form.AddForm(listNewDevice[0], deviceEnumInfo); - } - //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆 - else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction) - { - var form = new DeviceFunctionSettionForm(); - if (listNewDevice.Count > 62) - { - form.AddForm(listNewDevice[62], true); - } + } + //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆 + else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction) + { + var form = new DeviceFunctionSettionForm(); + if (listNewDevice.Count > 62) + { + form.AddForm(listNewDevice[62], true); + } } //娌充笢鐨勯潰鏉胯澶� else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true) @@ -1009,15 +1009,15 @@ var form = new DeviceAirConditioner.IndoorUnitListForm(); form.AddForm(listNewDevice[0].DeviceAddr); }; - } - #endregion - + } + #endregion + #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________ /// <summary> /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣 /// </summary> private void AddIBindRow(string deviceMac) - { + { string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets); var btnBindTargets = new FrameRowControl(listview.rowSpace / 2); listview.AddChidren(btnBindTargets); @@ -1028,235 +1028,235 @@ btnBindTargets.AddBottomLine(); btnBindTargets.ButtonClickEvent += (sender, e) => { - var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(deviceMac); - Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage); - Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; - simpleMutilfunctionTargetsPage.Show(); + var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(deviceMac); + Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage); + Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; + simpleMutilfunctionTargetsPage.Show(); }; - } - - /// <summary> - /// 婀垮害鏉ユ簮琛� - /// </summary> - private void AddHumiditySourceRow(string deviceMac) - { - //婀垮害 - var rowHumidity = new FrameRowControl(listview.rowSpace / 2); - listview.AddChidren(rowHumidity); - rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600); - //搴曠嚎 - rowHumidity.AddBottomLine(); - //鍙崇澶� - rowHumidity.AddRightArrow(); - var msg = Language.StringByID(R.MyInternationalizationString.nothing); - if (!string.IsNullOrEmpty(bindHumidityName)) - { - msg = bindHumidityName; - } - var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700); - rowHumidity.ButtonClickEvent += (sender, e) => - { - - var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧 - var device = new CommonDevice(); - if (dev != null) - { - device.CurrentGateWayId = dev.CurrentGateWayId; - } - device.Type = DeviceType.OnOffSwitch; - device.DeviceAddr = deviceMac; - device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾 - var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity); - Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp); - Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; - paneTargetsBaseFormp.Show(); - paneTargetsBaseFormp.actionHumidityTarget += (bindName) => - { - Application.RunOnMainThread(() => - { - if (string.IsNullOrEmpty(bindName)) - { - btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); - } - else - { - btnHumidityStatu.Text = bindName; - } - }); - }; - }; - } - - /// <summary> - /// 娓╁害鏉ユ簮琛� - /// </summary> + } + + /// <summary> + /// 婀垮害鏉ユ簮琛� + /// </summary> + private void AddHumiditySourceRow(string deviceMac) + { + //婀垮害 + var rowHumidity = new FrameRowControl(listview.rowSpace / 2); + listview.AddChidren(rowHumidity); + rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600); + //搴曠嚎 + rowHumidity.AddBottomLine(); + //鍙崇澶� + rowHumidity.AddRightArrow(); + var msg = Language.StringByID(R.MyInternationalizationString.nothing); + if (!string.IsNullOrEmpty(bindHumidityName)) + { + msg = bindHumidityName; + } + var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700); + rowHumidity.ButtonClickEvent += (sender, e) => + { + + var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧 + var device = new CommonDevice(); + if (dev != null) + { + device.CurrentGateWayId = dev.CurrentGateWayId; + } + device.Type = DeviceType.OnOffSwitch; + device.DeviceAddr = deviceMac; + device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾 + var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity); + Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp); + Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; + paneTargetsBaseFormp.Show(); + paneTargetsBaseFormp.actionHumidityTarget += (bindName) => + { + Application.RunOnMainThread(() => + { + if (string.IsNullOrEmpty(bindName)) + { + btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + } + else + { + btnHumidityStatu.Text = bindName; + } + }); + }; + }; + } + + /// <summary> + /// 娓╁害鏉ユ簮琛� + /// </summary> private void AddTemperatureSensorRow(string deviceMac) { - //娓╁害鏉ユ簮 - var rowTemPerature = new FrameRowControl(listview.rowSpace / 2); - listview.AddChidren(rowTemPerature); - rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600); - //搴曠嚎 - rowTemPerature.AddBottomLine(); - //鍙崇澶� - rowTemPerature.AddRightArrow(); - var msg = Language.StringByID(R.MyInternationalizationString.nothing); - if (!string.IsNullOrEmpty(bindTemperatureName)) - { - msg = bindTemperatureName; - } - var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700); - rowTemPerature.ButtonClickEvent += (sender, e) => - { - var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧 - var device = new CommonDevice(); - if (dev != null) - { - device.CurrentGateWayId = dev.CurrentGateWayId; - } - device.Type = DeviceType.OnOffSwitch; - device.DeviceAddr = deviceMac; - device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾 - var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature); - Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp); - Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; - paneTargetsBaseFormp.Show(); - paneTargetsBaseFormp.actionTemperatureTarget += (bindName) => - { - Application.RunOnMainThread(() => - { - if (string.IsNullOrEmpty(bindName)) - { - btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); - } - else - { - btnTemperatureStatu.Text = bindName; - } - }); - }; - }; - } - - /// <summary> - ///璇绘俯婀垮害鏁版嵁 - /// </summary> - void InitBindInfo(CommonDevice curControlDev) - { - System.Threading.Tasks.Task.Run(async () => - { - try - { - Application.RunOnMainThread(() => - { - CommonPage.Loading.Start(""); - }); - //1銆佽幏鍘荤粦瀹氱殑娓╁害浼犳劅鍣� - curControlDev.DeviceEpoint = 64; - var result = await GetBindName(curControlDev); - if (!result) - { - Application.RunOnMainThread(() => - { - new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance); - }); - return; - } - - //2銆佽幏鍘荤粦瀹氱殑婀垮害搴︿紶鎰熷櫒 - curControlDev.DeviceEpoint = 65; - var result2 = await GetBindName(curControlDev); - if (!result2) - { - Application.RunOnMainThread(() => - { - new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance); - }); - return; - } - } - catch (Exception ex) - { - var mess = ex.Message; - } - finally - { - Application.RunOnMainThread(() => - { - //鍒濆鍖栦腑閮ㄦ帶浠� - this.InitMiddleFrame(); - CommonPage.Loading.Hide(); - }); - } - }); - } - - /// <summary> - /// 鑾峰彇缁戝畾鐨勬俯婀垮害鐩爣 - /// </summary> - /// <param name="curControlDev"></param> - /// <returns></returns> - private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curControlDev) - { - bool result = false; - 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.Type == DeviceType.TemperatureSensor) - { - var bD = device as TemperatureSensor; - if (bD.SensorDiv == 1 && bDev.BindCluster == 1026) - { - if (string.IsNullOrEmpty(bDev.ESName)) - { - bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device); - } - else - { - bindTemperatureName = bDev.ESName; - } - bindTemperatureDev = device; - } - if (bD.SensorDiv == 2 && bDev.BindCluster == 1029) - { - if (string.IsNullOrEmpty(bDev.ESName)) - { - bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); - } - else - { - bindHumidityName = bDev.ESName; - } - - bindHumidityDev = device; - } - } - if (device.Type == DeviceType.FreshAirHumiditySensor) - { - if (string.IsNullOrEmpty(bDev.ESName)) - { - bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); - } - else - { - bindHumidityName = bDev.ESName; - } - - bindHumidityDev = device; - } - } - result = true; - } - return result; - } + //娓╁害鏉ユ簮 + var rowTemPerature = new FrameRowControl(listview.rowSpace / 2); + listview.AddChidren(rowTemPerature); + rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600); + //搴曠嚎 + rowTemPerature.AddBottomLine(); + //鍙崇澶� + rowTemPerature.AddRightArrow(); + var msg = Language.StringByID(R.MyInternationalizationString.nothing); + if (!string.IsNullOrEmpty(bindTemperatureName)) + { + msg = bindTemperatureName; + } + var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700); + rowTemPerature.ButtonClickEvent += (sender, e) => + { + var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧 + var device = new CommonDevice(); + if (dev != null) + { + device.CurrentGateWayId = dev.CurrentGateWayId; + } + device.Type = DeviceType.OnOffSwitch; + device.DeviceAddr = deviceMac; + device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾 + var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature); + Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp); + Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; + paneTargetsBaseFormp.Show(); + paneTargetsBaseFormp.actionTemperatureTarget += (bindName) => + { + Application.RunOnMainThread(() => + { + if (string.IsNullOrEmpty(bindName)) + { + btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing); + } + else + { + btnTemperatureStatu.Text = bindName; + } + }); + }; + }; + } + + /// <summary> + ///璇绘俯婀垮害鏁版嵁 + /// </summary> + void InitBindInfo(CommonDevice curControlDev) + { + System.Threading.Tasks.Task.Run(async () => + { + try + { + Application.RunOnMainThread(() => + { + CommonPage.Loading.Start(""); + }); + //1銆佽幏鍘荤粦瀹氱殑娓╁害浼犳劅鍣� + curControlDev.DeviceEpoint = 64; + var result = await GetBindName(curControlDev); + if (!result) + { + Application.RunOnMainThread(() => + { + new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance); + }); + return; + } + + //2銆佽幏鍘荤粦瀹氱殑婀垮害搴︿紶鎰熷櫒 + curControlDev.DeviceEpoint = 65; + var result2 = await GetBindName(curControlDev); + if (!result2) + { + Application.RunOnMainThread(() => + { + new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance); + }); + return; + } + } + catch (Exception ex) + { + var mess = ex.Message; + } + finally + { + Application.RunOnMainThread(() => + { + //鍒濆鍖栦腑閮ㄦ帶浠� + this.InitMiddleFrame(); + CommonPage.Loading.Hide(); + }); + } + }); + } + + /// <summary> + /// 鑾峰彇缁戝畾鐨勬俯婀垮害鐩爣 + /// </summary> + /// <param name="curControlDev"></param> + /// <returns></returns> + private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curControlDev) + { + bool result = false; + 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.Type == DeviceType.TemperatureSensor) + { + var bD = device as TemperatureSensor; + if (bD.SensorDiv == 1 && bDev.BindCluster == 1026) + { + if (string.IsNullOrEmpty(bDev.ESName)) + { + bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device); + } + else + { + bindTemperatureName = bDev.ESName; + } + bindTemperatureDev = device; + } + if (bD.SensorDiv == 2 && bDev.BindCluster == 1029) + { + if (string.IsNullOrEmpty(bDev.ESName)) + { + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); + } + else + { + bindHumidityName = bDev.ESName; + } + + bindHumidityDev = device; + } + } + if (device.Type == DeviceType.FreshAirHumiditySensor) + { + if (string.IsNullOrEmpty(bDev.ESName)) + { + bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device); + } + else + { + bindHumidityName = bDev.ESName; + } + + bindHumidityDev = device; + } + } + result = true; + } + return result; + } #endregion - + #region 鈻� 鍔熻兘绫诲瀷(绌烘皵寮�鍏充笓鐢�)_____________ - + /// <summary> /// 娣诲姞銆愬姛鑳界被鍨嬨�戣(绌烘皵寮�鍏充笓鐢�) /// </summary> @@ -1498,7 +1498,17 @@ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭d釜鍥炶矾鍘诲畾浣�) bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]); - var frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1); + TopRightMenuControl frame = null; + + if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction) + { + frame = new TopRightMenuControl(3, 1); + } + else + { + frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1); + } + string deviceMenu = string.Empty; if (canTest == true) { @@ -1527,7 +1537,24 @@ //鍒犻櫎鎸囧畾璁惧 this.DoDeleteDevice(); }); - }); + }); + + //鍚屾 + deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization); + if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0])) + { + frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () => + { + //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁� + if (Common.Config.Instance.Home.IsVirtually == true) + { + return; + } + + //鍚屾鎸囧畾璁惧 + this.SynchronizationDevice(); + }); + } } @@ -1555,6 +1582,32 @@ this.CloseForm(); }); }); + } + + /// <summary> + /// 鍚屾鎸囧畾璁惧 + /// </summary> + private void SynchronizationDevice() + { + HdlThreadLogic.Current.RunThread(async () => + { + //鎵撳紑杩涘害鏉� + this.ShowProgressBar(); + + //鍚屾璁惧 + bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice); + //鍏抽棴杩涘害鏉� + this.CloseProgressBar(); + if (result == false) + { + return; + } + HdlThreadLogic.Current.RunMain(() => + { + //鍏抽棴鐣岄潰 + this.CloseForm(); + }); + }); } #endregion -- Gitblit v1.8.0