发布到商店的版本

黄学彪

2020-08-21 9cc8fd11b13813adbdd3c6c31554e5c0bebf4026

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

old mode 100755
new mode 100644
@@ -602,7 +602,7 @@
            btnFunction.ButtonClickEvent += (sender, e) =>

            {

                //简约环境面板的按键配置

                var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();

                var form = new DevicePanel.PanelSettionWithSourceForm();

                form.AddForm(listNewDevice[0]);

            };

        }

@@ -643,16 +643,10 @@
                        var form = new DevicePanel.PanelFangyueButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

                    else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

                    else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

                    {

                        //方悦环境面板的按键配置

                        var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

                    else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

                    {

                        //方悦新风面板的按键配置

                        var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

                        //方悦环境面板的按键配置&方悦新风面板的按键配置

                        var form = new DevicePanel.PanelSettionWithSourceForm();

                        form.AddForm(listNewDevice[0]);

                    }

                    else

@@ -1333,7 +1327,7 @@
            listview.AddChidren(rowVersion);

            rowVersion.AddLeftCaption(caption, 600);

            //版本

            this.btnAirConditionerVersion = rowVersion.AddMostRightView("", 800);

            this.btnAirConditionerVersion = rowVersion.AddMostRightView(((AC)this.listNewDevice[0]).AcModelVersion, 800);

            //底线

            rowVersion.AddBottomLine();



@@ -1688,27 +1682,39 @@
            {

                return;

            }

            //获取中....

            this.btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGetting;

            //如果是虚拟住宅或者展示模板的话

            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)

            {

                return;

            }



            bool notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty;

            if (notVersion == true)

            {

                //获取中

                btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGetting);

            }

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //读取空调模块版本

                var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);

                if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        //获取失败

                        btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGettingFail;

                    });

                {
                    if (notVersion == true)
                    {
                        //获取失败
                        HdlThreadLogic.Current.RunMain(() =>
                        {
                            btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail);
                        });
                    }

                    return;

                }

                else

                HdlThreadLogic.Current.RunMain(() =>

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        btnAirConditionerVersion.Text = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);

                    });

                }

                    ((AC)this.listNewDevice[0]).AcModelVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);

                    btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion;

                });

            });

        }