请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

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

        /// 设备

        /// </summary>

        private AC deviceAc = null;

        private CommonDevice deviceAc = null;

        /// <summary>

        /// 前回选择的控件

        /// </summary>

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

        /// </summary>

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

        public void ShowForm(AC i_deviceAc)

        public void ShowForm(CommonDevice i_deviceAc)

        {

            this.deviceAc = i_deviceAc;

            this.otaDevice = Common.LocalDevice.Current.GetOTADevice(i_deviceAc.DeviceAddr);

@@ -170,6 +170,11 @@
                //重工空调模块

                textView = Language.StringByID(R.MyInternationalizationString.uHicAirConditioningModule);

            }

            else if (info.Name.Contains("IRACC_HITACHI") == true)

            {

                //日立空调模块

                textView = Language.StringByID(R.MyInternationalizationString.uHitachiAirConditioningModule);

            }

            else

            {

                //空调升级模块