From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001 From: lss <316519258@qq.com> Date: 星期五, 12 六月 2020 09:22:04 +0800 Subject: [PATCH] 2020.06.12 --- ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs index aef3ae0..4cd1d83 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs @@ -78,7 +78,16 @@ private void InitAirConditioningModuleList(VerticalListControl listView) { var list = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.ZigbeeDevice, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString()); - if (list.Count == 0) + var listUpdate = new List<FirmwareVersionInfo>(); + foreach (var data in list) + { + if (data.Name.EndsWith(".bin") == true) + { + //鍙.bin鏂囦欢 + listUpdate.Add(data); + } + } + if (listUpdate.Count == 0) { //娌℃湁鍙崌绾х殑绌鸿皟妯″潡 this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uNotHadAirConditioningUpdateModule)); @@ -86,10 +95,10 @@ } HdlThreadLogic.Current.RunMainInThread(() => { - for (int i = 0; i < list.Count; i++) + for (int i = 0; i < listUpdate.Count; i++) { //娣诲姞妯″潡琛� - this.AddModuleRow(listView, list[i], i.ToString(), i != list.Count - 1); + this.AddModuleRow(listView, listUpdate[i], i.ToString(), i != listUpdate.Count - 1); } //璋冩暣楂樺害 listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23)); @@ -100,7 +109,7 @@ bodyFrameLayout.AddChidren(btnUpdate); btnUpdate.ButtonClickEvent += (sender, e) => { - var selectInfo = this.GetSelectFirmware(listView, list); + var selectInfo = this.GetSelectFirmware(listView, listUpdate); if (selectInfo == null) { //娌℃湁閫夋嫨鍥轰欢 @@ -170,6 +179,31 @@ //閲嶅伐绌鸿皟妯″潡 textView = Language.StringByID(R.MyInternationalizationString.uHicAirConditioningModule); } + else if (info.Name.Contains("IRACC_HITACHI") == true) + { + //鏃ョ珛绌鸿皟妯″潡 + textView = Language.StringByID(R.MyInternationalizationString.uHitachiAirConditioningModule); + } + else if (info.Name.Contains("IRACC_SAEC") == true) + { + //鐢垫満绌鸿皟妯″潡 + textView = Language.StringByID(R.MyInternationalizationString.uSaecAirConditioningModule); + } + else if (info.Name.Contains("IRACC_TOSHIBA") == true) + { + //涓滆姖绌鸿皟妯″潡 + textView = Language.StringByID(R.MyInternationalizationString.uToshibaAirConditioningModule); + } + else if (info.Name.Contains("IRACC_GREE") == true) + { + //鏍煎姏绌鸿皟妯″潡 + textView = Language.StringByID(R.MyInternationalizationString.uGreeAirConditioningModule); + } + else if (info.Name.Contains("IRACC_MIDEA") == true) + { + //缇庣殑绌鸿皟妯″潡 + textView = Language.StringByID(R.MyInternationalizationString.uMideaAirConditioningModule); + } else { //绌鸿皟鍗囩骇妯″潡 -- Gitblit v1.8.0