代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -2,7 +2,6 @@
using System.Collections.Generic;

using System.Threading.Tasks;

using Shared.Common;

using Shared.Phone.UserView;

using ZigBee.Device;



namespace Shared.Phone.UserCenter.Device

@@ -30,6 +29,10 @@
        /// 设备具体类型的信息

        /// </summary>

        private DeviceEnumInfo deviceEnumInfo = null;

        /// <summary>

        /// 中央空调的版本控件

        /// </summary>

        private NormalViewControl btnAirConditionerVersion = null;



        #endregion



@@ -749,29 +752,12 @@
            listview.AddChidren(rowVersion);

            rowVersion.AddLeftCaption(caption, 600);

            //版本

            var btnVersion = rowVersion.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGetting), 800);

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

            //底线

            rowVersion.AddBottomLine();

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //读取空调模块版本

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

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

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        //获取失败

                        btnVersion.TextID = R.MyInternationalizationString.uGettingFail;

                    });

                }

                else

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

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

                    });

                }

            });



            //获取中央空调模块的版本

            this.ReadAirConditionerVersion();

        }



        #endregion

@@ -820,7 +806,7 @@
                {

                    //中央空调的升级的话，是特殊的

                    var form = new DeviceAirConditioner.ACZbGatewayUpdateMenuForm();

                    form.AddForm(listNewDevice[0].DeviceAddr, btnNewVersion.Visible);

                    form.AddForm((AC)listNewDevice[0], btnNewVersion.Visible);

                }

                btnNewVersion.Visible = false;

            };

@@ -1042,8 +1028,56 @@


        #endregion



        #region ■ 界面重新激活事件___________________



        /// <summary>

        /// 自身的上层界面关闭后,它自身处于最上层时,触发的事件

        /// </summary>

        public override int FormActionAgainEvent()

        {

            //重新获取中央空调模块的版本

            this.ReadAirConditionerVersion();



            return 0;

        }



        #endregion



        #region ■ 一般方法___________________________



        /// <summary>

        /// 获取中央空调模块的版本

        /// </summary>

        private void ReadAirConditionerVersion()

        {

            if (this.btnAirConditionerVersion == null)

            {

                return;

            }

            //获取中....

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

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //读取空调模块版本

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

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

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        //获取失败

                        btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGettingFail;

                    });

                }

                else

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

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

                    });

                }

            });

        }



        #endregion

    }

}