From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 01 九月 2020 15:33:13 +0800 Subject: [PATCH] 上传一个版本 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 288 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 226 insertions(+), 62 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs old mode 100644 new mode 100755 index e575691..402b3a6 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs @@ -36,19 +36,19 @@ /// </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> @@ -56,10 +56,13 @@ /// </summary> private string deviceMacTemp = string.Empty; // <summary> - /// 绠�绾﹂潰鏉夸腑琚粦瀹氱殑娓╂箍搴︾洰鏍囧垪琛� + /// 绠�绾﹀鍔熻兘闈㈡澘涓缁戝畾鐨勬俯婀垮害鐩爣鍒楄〃 /// </summary> private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>(); - #endregion + /// <summary> + /// 绠�绾﹀鍔熻兘闈㈡澘鐨勬帴杩戞劅搴旀暟鎹� + private Panel.PanelProximitySensorInfo proximitySensorsInfo = new Panel.PanelProximitySensorInfo(); + #endregion #region 鈻� 鍒濆鍖朹____________________________ @@ -107,7 +110,7 @@ var key = new ZigBee.Device.Panel(); key.DeviceAddr = deviceMac; key.CurrentGateWayId = dev.CurrentGateWayId; - InitBindInfo(key); + InitBindInfo(key); } } } @@ -139,6 +142,7 @@ string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote); string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]); var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2); + btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺� listview.AddChidren(btnNote); btnNote.InitControl(); //鍒掔嚎 @@ -152,6 +156,11 @@ } if (oldName != btnNote.Text) { + //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈� + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + return; + } //淇敼鍚嶅瓧 this.DeviceReName(btnNote.Text, false); } @@ -173,6 +182,11 @@ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice); //搴曠嚎 rowBeloneArea.AddBottomLine(); + //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈� + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + rowBeloneArea.CanClick = false; + } var listCheck = new List<string>(); rowBeloneArea.SelectRoomEvent += (roomKeys) => @@ -245,8 +259,8 @@ this.CloseForm(); } }; - //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹呯殑璇�,璁╂墍鏈夎彍鍗曢兘涓嶈兘鐐瑰嚮 - if (Common.Config.Instance.Home.IsVirtually == true) + //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈� + if (Common.Config.Instance.Home.IsShowTemplate == true) { for (int i = 0; i < listview.ChildrenCount; i++) { @@ -289,11 +303,13 @@ } else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction) { - //绠�绾﹀鍔熻兘闈㈡澘 + //绠�绾﹀鍔熻兘闈㈡澘 this.AddIBindRow(deviceMacTemp); - this.AddFunctionSettionRow(); + this.AddProximitySensorsRow(deviceMacTemp); + this.AddFunctionSettionRow(); this.AddHumiditySourceRow(deviceMacTemp); this.AddTemperatureSensorRow(deviceMacTemp); + this.DataCorrectionRow(deviceMacTemp); } else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) { @@ -943,10 +959,17 @@ btnSwitch.IsSelected = statu; } }; + //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈� + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + btnSwitch.CanClick = false; + btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain); + return; + } //濡傛灉鏄櫄鎷熶綇瀹� if (Common.Config.Instance.Home.IsVirtually == true) { - btnSwitch.IsSelected = ModelData.DeviceModelDataLogic.Current.GetCurtainHandPullControl(deviceCurtain); + btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain); return; } @@ -1010,7 +1033,7 @@ } #endregion - #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________ + #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________ /// <summary> /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣 /// </summary> @@ -1026,12 +1049,88 @@ 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 dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧 + if (dev != null) + { + var curControlDev = dev as Panel; + var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev); + Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage); + Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; + simpleMutilfunctionTargetsPage.Show(); + } }; } + + #region 鈻� 鎺ヨ繎鎰熷簲___________________________ + + /// <summary> + /// 鎺ヨ繎鎰熷簲琛� + /// </summary> + private void AddProximitySensorsRow(string deviceMac) + { + string proximity = Language.StringByID(R.MyInternationalizationString.ProximitySensors); + var proximitySensors = new FrameRowControl(listview.rowSpace / 2); + listview.AddChidren(proximitySensors); + proximitySensors.AddLeftCaption(proximity, 400); + + //鎺ヨ繎鎰熷簲 + proximitySensors.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400); + //寮�鍏虫帶浠� + var btnSwitch = proximitySensors.AddMostRightSwitchIcon(); + //搴曠嚎 + proximitySensors.AddBottomLine(); + + btnSwitch.ButtonClickEvent +=async (sender, e) => + { + btnSwitch.IsSelected = !btnSwitch.IsSelected; + proximitySensorsInfo.enable = btnSwitch.IsSelected; + + //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅 + var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62); + if (dev != null) + { + var key = new ZigBee.Device.Panel(); + key.DeviceAddr = deviceMac; + key.CurrentGateWayId = dev.CurrentGateWayId; + SetProximitySensor(key); + } + }; + if (proximitySensorsInfo.enable == true) + { + btnSwitch.IsSelected = true; + } + } + #endregion + + #region 鈻� 鏁版嵁鐭_________________________ + /// <summary> + /// 鏁版嵁鐭琛� + /// </summary> + private void DataCorrectionRow(string deviceMac) + { + //鏁版嵁鐭 + var rowLight = new FrameRowControl(listview.rowSpace / 2); + listview.AddChidren(rowLight); + rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.DataCorrection), 600); + //搴曠嚎 + rowLight.AddBottomLine(); + //鍙崇澶� + rowLight.AddRightArrow(); + rowLight.ButtonClickEvent += (sender, e) => + { + var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧 + var device = new CommonDevice(); + if (dev != null) + { + device.CurrentGateWayId = dev.CurrentGateWayId; + } + device.DeviceAddr = deviceMac; + device.DeviceEpoint = 65; + var form = new Shared.Phone.UserCenter.DevicePanel.DataCorrectionForm(); + form.AddForm(device); + }; + } + #endregion /// <summary> /// 婀垮害鏉ユ簮琛� @@ -1063,7 +1162,7 @@ } device.Type = DeviceType.OnOffSwitch; device.DeviceAddr = deviceMac; - device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾 + device.DeviceEpoint = 1;//鑳界粦瀹氭箍搴︾殑鍥炶矾 var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity); Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp); Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; @@ -1114,7 +1213,7 @@ } device.Type = DeviceType.OnOffSwitch; device.DeviceAddr = deviceMac; - device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾 + device.DeviceEpoint = 1;//鑳界粦瀹氭俯搴︾殑鍥炶矾 var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature); Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp); Shared.Phone.UserView.HomePage.Instance.PageIndex += 1; @@ -1137,7 +1236,7 @@ } /// <summary> - ///璇绘俯婀垮害鏁版嵁 + ///鍒濆鍖栨暟鎹� /// </summary> void InitBindInfo(CommonDevice curControlDev) { @@ -1149,8 +1248,8 @@ { CommonPage.Loading.Start(""); }); - //1銆佽幏鍘荤粦瀹氱殑娓╁害浼犳劅鍣� - curControlDev.DeviceEpoint = 64; + //璇绘俯婀垮害鏁版嵁 + curControlDev.DeviceEpoint = 1; var result = await GetBindName(curControlDev); if (!result) { @@ -1160,17 +1259,16 @@ }); return; } - - //2銆佽幏鍘荤粦瀹氱殑婀垮害搴︿紶鎰熷櫒 - curControlDev.DeviceEpoint = 65; - var result2 = await GetBindName(curControlDev); - if (!result2) + + //2銆佽幏璁惧鎺ヨ繎鎰熷簲鍒濆鏁版嵁 + //鎺ヨ繎鎰熷簲(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡) + proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(curControlDev); + if (proximitySensorsInfo == null) { - Application.RunOnMainThread(() => - { - new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance); - }); - return; + proximitySensorsInfo = new Panel.PanelProximitySensorInfo(); + //鍏抽棴杩涘害鏉� + this.CloseProgressBar(ShowReLoadMode.YES); + return ; } } catch (Exception ex) @@ -1181,6 +1279,8 @@ { Application.RunOnMainThread(() => { + //鍒濆鍖栧彸涓婅鑿滃崟 + this.InitTopRightMenu(); //鍒濆鍖栦腑閮ㄦ帶浠� this.InitMiddleFrame(); CommonPage.Loading.Hide(); @@ -1255,6 +1355,43 @@ } return result; } + + #region 鈻� 璁剧疆鏁版嵁___________________________ + + /// <summary> + /// 璁剧疆闈㈡澘鎺ヨ繎鎰熷簲鏁版嵁 + /// </summary> + private void SetProximitySensor(CommonDevice curControlDev) + { + System.Threading.Tasks.Task.Run(async () => + { + try + { + Application.RunOnMainThread(() => + { + CommonPage.Loading.Start(""); + }); + //鎺ヨ繎鎰熷簲(鎻愪緵璁惧鐨勫悓浜嬭闅忎究涓�涓洖璺氨琛�) + var result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(curControlDev, proximitySensorsInfo.enable); + if (result == false) + { + return; + } + } catch (Exception ex) + { + var mess = ex.Message; + } + finally + { + Application.RunOnMainThread(() => + { + CommonPage.Loading.Hide(); + }); + } + }); + } + + #endregion #endregion #region 鈻� 鍔熻兘绫诲瀷(绌烘皵寮�鍏充笓鐢�)_____________ @@ -1281,6 +1418,11 @@ rowFunction.InitControl(); //搴曠嚎 rowFunction.AddBottomLine(); + //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈� + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + rowFunction.CanClick = false; + } } #endregion @@ -1327,7 +1469,11 @@ listview.AddChidren(rowVersion); rowVersion.AddLeftCaption(caption, 600); //鐗堟湰 - this.btnAirConditionerVersion = rowVersion.AddMostRightView(((AC)this.listNewDevice[0]).AcModelVersion, 800); + this.btnAirConditionerVersion = rowVersion.AddMostRightView(string.Empty, 900); + if (this.listNewDevice[0] is AC) + { + this.btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion; + } //搴曠嚎 rowVersion.AddBottomLine(); @@ -1387,7 +1533,8 @@ }; //濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢 - if (Common.Config.Instance.Home.IsVirtually == false) + if (Config.Instance.Home.IsVirtually == false + && Config.Instance.Home.IsShowTemplate == false) { //璁剧疆璁惧鐨勭増鏈俊鎭� this.SetDeviceVersionInfo(btnNewVersion, oTADevice); @@ -1405,10 +1552,22 @@ { bool receiveImageInfo = false; //璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭� - HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, (device, reportData) => + string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint); + HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) => { - receiveImageInfo = true; + if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota) + { + string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint); + if (checkKey == mainKey) + { + //宸茬粡鎺ユ敹寰楀埌 + receiveImageInfo = true; + } + } }); + //鍙戦�佸懡浠� + HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice); + int count = 5; while (receiveImageInfo == false && count > 0) { @@ -1417,14 +1576,14 @@ count--; } //绉婚櫎浜嬩欢 - HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice); + HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo"); oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr); //娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�) - var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString()); + var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString()); //鑾峰彇璁惧鏈�鏂扮増鏈� - var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice, + var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString(), oTADevice.ImgVersion); @@ -1481,6 +1640,11 @@ /// </summary> private void InitTopRightMenu() { + //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈� + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + return; + } var btnIcon = new MostRightIconControl(69, 69); btnIcon.UnSelectedImagePath = "Item/More.png"; topFrameLayout.AddChidren(btnIcon); @@ -1616,8 +1780,7 @@ public override void CloseFormBefore() { HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl"); - //绉婚櫎鑾峰彇璁惧纭欢淇℃伅鐨勭洃鍚嚎绋� - HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]); + HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo"); //璁惧鏂板叆缃� if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true) @@ -1637,21 +1800,13 @@ /// </summary> private void RefreshHardFirmwareInfo() { - if (listNewDevice[0].DriveCode > 0) + if (listNewDevice[0].DriveCode > 0 || Common.Config.Instance.Home.IsShowTemplate == true) { //铏氭嫙璁惧娌℃湁杩欑鎿嶄綔 return; } //閲嶆柊鑾峰彇纭欢淇℃伅 - HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0], (device, reportData) => - { - for (int i = 1; i < listNewDevice.Count; i++) - { - //鍏ㄩ儴鍥炶矾鐨勪俊鎭兘鏄竴鑷寸殑 - HdlDeviceHardInfoLogic.Current.SetHardFirmwareInfo(device.DeviceStatusReport, listNewDevice[i]); - listNewDevice[i].ReSave(); - } - }); + HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]); } #endregion @@ -1688,7 +1843,11 @@ return; } - bool notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty; + bool notVersion = true; + if (this.listNewDevice[0] is AC) + { + notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty; + } if (notVersion == true) { //鑾峰彇涓� @@ -1699,21 +1858,26 @@ //璇诲彇绌鸿皟妯″潡鐗堟湰 var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]); if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0) - { - if (notVersion == true) - { - //鑾峰彇澶辫触 - HdlThreadLogic.Current.RunMain(() => - { - btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail); - }); + { + if (notVersion == true) + { + //鑾峰彇澶辫触 + HdlThreadLogic.Current.RunMain(() => + { + btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail); + }); } return; } HdlThreadLogic.Current.RunMain(() => { - ((AC)this.listNewDevice[0]).AcModelVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty); - btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion; + string strVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty); + if (this.listNewDevice[0] is AC) + { + ((AC)this.listNewDevice[0]).AcModelVersion = strVersion; + this.listNewDevice[0].ReSave(); + } + btnAirConditionerVersion.Text = strVersion; }); }); } -- Gitblit v1.8.0