上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 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)

                    {

                        //没有选择固件

@@ -175,6 +184,26 @@
                //日立空调模块

                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

            {

                //空调升级模块