代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs

@@ -1,6 +1,7 @@
using System;

using System.Collections.Generic;

using System.Text;

using ZigBee.Device;



namespace Shared.Phone.UserCenter.DeviceAirConditioner

{

@@ -12,9 +13,9 @@
        #region ■ 变量声明___________________________



        /// <summary>

        /// 设备mac地址

        /// 设备

        /// </summary>

        private string deviceMac = null;

        private AC deviceAc = null;



        #endregion



@@ -23,11 +24,11 @@
        /// <summary>

        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        /// <param name="i_deviceMac">设备mac地址</param>

        /// <param name="i_deviceAc">设备</param>

        /// <param name="hadNewVersion">拥有新版本</param>

        public void ShowForm(string i_deviceMac, bool hadNewVersion)

        public void ShowForm(AC i_deviceAc, bool hadNewVersion)

        {

            this.deviceMac = i_deviceMac;

            this.deviceAc = i_deviceAc;



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFirmwareUpdate));

@@ -67,7 +68,7 @@
                //这里是设备的Ota升级

                btnNewVersion.Visible = false;

                var form = new Device.DeviceFirmwareUpdateForm();

                form.AddForm(this.deviceMac);

                form.AddForm(this.deviceAc.DeviceAddr);

            };

            //提示有新版本

            btnNewVersion.UnSelectedImagePath = "Item/NewVersion.png";

@@ -84,7 +85,7 @@
            rowModel.ButtonClickEvent += (sender, e) =>

            {

                var form = new ACZbGatewayModuleUpdateForm();

                form.AddForm(deviceMac);

                form.AddForm(deviceAc);

            };



            //调整列表高度