合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 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)

@@ -462,8 +472,25 @@
            btnFunction.AddBottomLine();

            btnFunction.ButtonClickEvent += (sender, e) =>

            {

                var form = new DevicePanel.PanelButtonSettionForm();

                form.AddForm(listNewDevice[0]);

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                {

                    //方悦面板的按键配置

                    var form = new DevicePanel.PanelFangyueButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

                {

                    //方悦环境面板的按键配置

                    var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                else

                {

                    var form = new DevicePanel.PanelButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

            };

        }



@@ -577,6 +604,11 @@
            {

                return;

            }

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

            {

                //环境面板没有功能设置

                return;

            }



            //功能设置

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

@@ -589,8 +621,16 @@
            btnFunction.AddBottomLine();

            btnFunction.ButtonClickEvent += (sender, e) =>

            {

                //方悦面板

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                {

                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                //河东的面板设备

                if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)

                else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)

                {

                    var form = new DevicePanel.PanelFunctionSettionForm();

                    form.AddForm(listNewDevice[0]);

@@ -724,10 +764,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 +979,7 @@
                {

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

                    var form = new DeviceAirConditioner.ACZbGatewayUpdateMenuForm();

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

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

                }

                btnNewVersion.Visible = false;

            };

@@ -1196,7 +1238,7 @@
            HdlThreadLogic.Current.RunThread(async () =>

            {

                //读取空调模块版本

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

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

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

                {

                    HdlThreadLogic.Current.RunMain(() =>