新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

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

@@ -261,7 +261,7 @@
                btnPosition.ButtonClickEvent += (sender, e) =>

                {

                    //定位

                    Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0]);

                    Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0], true);

                };

            }



@@ -309,7 +309,7 @@
                    return;

                }

                var listMacDevice = LocalDevice.Current.GetDevicesByMac(deviceMac, false);

                if (LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)

                if (listMacDevice.Count > 0 && LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)

                {

                    //mini夜灯的功能设置界面

                    var room = HdlRoomLogic.Current.GetRoomByDevice(listMacDevice[0]);

@@ -377,7 +377,8 @@
                    }

                }

                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

                {

                    var listTemp = Common.LocalDevice.Current.GetPanelMatchEpointByMac(listDevice);

                    //展开模式时，扩大依据为:它有几个子控件

@@ -518,12 +519,6 @@
                var form = new DeviceAirConditioner.IndoorUnitSettionForm();

                form.AddForm((AC)device);

            }

            //环境面板

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

            {

                var form = new DeviceFunctionSettionForm();

                form.AddForm(device, true);

            }

            //新风面板

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

            {

@@ -531,7 +526,7 @@
                //干接点

                if (device.Type == DeviceType.FreshAir)

                {

                    var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

                    var form = new DevicePanel.PanelSettionWithSourceForm();

                    form.AddForm(device);

                }

                else

@@ -546,7 +541,7 @@


                if (device.Type == DeviceType.FreshAir || device.Type == DeviceType.Thermostat)

                {

                    var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();

                    var form = new DevicePanel.PanelSettionWithSourceForm();

                    form.AddForm(device);

                }

                else

@@ -555,7 +550,7 @@
                    form.AddForm(device, true);

                }

            }

            //简约环境面板的按键配置

            //简约多功能面板的按键配置

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

            {

                var form = new DeviceFunctionSettionForm();

@@ -731,6 +726,11 @@
                        ProgressBar.Close();

                        if (result2 == -1)

                        {

                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //隐藏下拉刷新特效

                                listView.EndHeaderRefreshing();

                            });

                            return;

                        }

                    }

@@ -979,10 +979,10 @@
                        return;

                    }

                    //添加升级固件信息(成不成功都无所谓)

                    var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());

                    var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A设备, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());



                    //获取设备最新版本

                    var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,

                    var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,

                        ota.HwVersion.ToString(),

                        ota.ImgTypeId.ToString(),

                        ota.ImgVersion);

@@ -1397,7 +1397,7 @@
                btnName.Height = Application.GetRealHeight(60);

                btnName.TextSize = 15;

                btnName.Y = Application.GetRealHeight(57);

                btnName.Text = "小度小度";

                btnName.Text = "智能音箱";



                this.AddRightArrow();

                this.AddMostRightView("", 300, false).Name = "smartSoundLayout";