合并代码

黄学彪

2020-01-10 985abd7ee6049147119518aa41fb2d08c0cfc40d

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

@@ -45,6 +45,11 @@
        public void ShowForm(string deviceMac)

        {

            this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);

            if (listNewDevice.Count == 0)

            {

                //针对单纯只有一个200端点的设备

                listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));

            }



            this.listDeviceType.Clear();

            foreach (var device in listNewDevice)

@@ -131,6 +136,11 @@
            {

                foreach (var device in this.listNewDevice)

                {

                    if (device is OTADevice)

                    {

                        //针对单纯只有一个200端点的设备

                        continue;

                    }

                    var room = Room.CurrentRoom.GetRoomByDevice(device);

                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);

                    if (room == null)

@@ -724,10 +734,12 @@
        /// </summary>

        private void AddIndoorUnitSettionRow()

        {

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway

                || this.listNewDevice[0] is OTADevice)//追加：单纯只有200端点的话，不显示这个菜单

            {

                return;

            }



            //室内机设置

            string caption = Language.StringByID(R.MyInternationalizationString.uIndoorUnitSettion);

            var btnFunction = new FrameRowControl(listview.rowSpace / 2);

@@ -937,7 +949,7 @@
                {

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

                    var form = new DeviceAirConditioner.ACZbGatewayUpdateMenuForm();

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

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

                }

                btnNewVersion.Visible = false;

            };