新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs

@@ -207,7 +207,7 @@
                    bindList = panelBindListRes.getAllBindResponseData.BindList;
                    foreach (var bDev in bindList)
                    {
                        var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                        var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                        if (device == null)
                        {
                            continue;
@@ -215,13 +215,13 @@
                        if (device.Type == DeviceType.FreshAir)
                        {
                            //获取设备类型的
                            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                            var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                            //新风面板的新风设备，则不显示
                            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
                            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
                            {
                                continue;
                            }
                            bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindFreshAirName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                            bindFreshAirDev = device;
                        }
                        else if (device.Type == DeviceType.TemperatureSensor)
@@ -229,35 +229,35 @@
                            var bD = device as TemperatureSensor;
                            if (bD.SensorDiv == 1)
                            {
                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                                bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                                bindTemperatureDev = device;
                            }
                            if (bD.SensorDiv == 2)
                            {
                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                                bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                                bindHumidityDev = device;
                            }
                        }
                        else if (device.Type == DeviceType.FreshAirHumiditySensor)
                        {
                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                            bindHumidityDev = device;
                        }
                        else if (device.Type == DeviceType.Thermostat)
                        {
                            bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindAcName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                            bindAcDev = device;
                        }
                        else if (device.Type == DeviceType.PMSensor)
                        {
                            if (bDev.BindCluster == 1026)
                            {
                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
                                bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
                                bindTemperatureDev = device;
                            }
                            if (bDev.BindCluster == 1029)
                            {
                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
                                bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
                                bindHumidityDev = device;
                            }
                        }
@@ -487,7 +487,7 @@
        private void InitTopRightMenu()
        {
            //检测此回路是否拥有定位功能
            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(deviceObj) == false)
            if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(deviceObj) == false)
            {
                return;
            }
@@ -513,7 +513,7 @@
            frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
            {
                //发送定位功能
                Common.LocalDevice.Current.SetFixedPositionCommand(deviceObj);
                HdlDeviceCommonLogic.Current.SetFixedPositionCommand(deviceObj);
            });
        }