合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -15,7 +15,7 @@
        /// <summary>

        /// 设备

        /// </summary>

        private AC deviceAc = null;

        private CommonDevice deviceAc = null;



        #endregion



@@ -26,7 +26,7 @@
        /// </summary>

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

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

        public void ShowForm(AC i_deviceAc, bool hadNewVersion)

        public void ShowForm(CommonDevice i_deviceAc, bool hadNewVersion)

        {

            this.deviceAc = i_deviceAc;



@@ -75,7 +75,7 @@
            btnNewVersion.Visible = hadNewVersion;

            btnNewVersion.X = Application.GetRealWidth(242);

            btnNewVersion.Y = Application.GetRealHeight(23);

            rowComunication.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);

            rowComunication.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);



            //空调模块

            var rowModel = new FrameRowControl(listView.rowSpace / 2);