合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs

@@ -45,14 +45,6 @@
            //弄一点初始值

            this.editorRoom = i_editorRoom;

            this.cloneRoom = HdlRoomLogic.Current.CloneRoomClass(i_editorRoom);

            if (i_editorRoom.HumidityDevice == string.Empty)

            {

                this.cloneRoom.Humidity = -1000;

            }

            if (i_editorRoom.TemperatrueDevice == string.Empty)

            {

                this.cloneRoom.Temperatrue = -1000;

            }



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorRoom));

@@ -75,15 +67,11 @@


            //加一个白色背景

            var frameBack1 = new FrameLayout();

            frameBack1.Height = Application.GetRealHeight(450);

            frameBack1.Height = Application.GetRealHeight(750);

            frameBack1.Y = Application.GetRealHeight(196);

            frameBack1.BackgroundColor = UserCenterColor.Current.White;

            frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            listBackControl.frameTable.AddChidren(frameBack1);



            //初始化信息桌布

            var tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);



            //房间图片底部阴影

            var btnShadow = new PicViewControl(853, 593);

@@ -117,7 +105,7 @@
            btnZhezhao.Radius = (uint)Application.GetRealHeight(17);

            listBackControl.frameTable.AddChidren(btnZhezhao);

            //分享的房间不能编辑

            if (this.editorRoom.IsSharedRoom == false)

            if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)

            {

                btnZhezhao.MouseUpEventHandler += (sender, e) =>

                {

@@ -126,8 +114,9 @@
                };

            }



            //变更一下那个白色背景的Y轴,它到图片的中间位置

            frameBack1.Y = btnPic.Y + btnPic.Height / 2;

            //初始化信息桌布

            var tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);



            //添加全部菜单

            this.AddAllMenuRow(tableContr, btnPic);

@@ -148,6 +137,7 @@
            {

                txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), this.cloneRoom.Name, this.listview.rowSpace / 2);

                txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);

                txtRoomName.txtInput.MaxByte = 48;//限制只能输入48个字节

                listview.AddChidren(txtRoomName);

                txtRoomName.InitControl();

                //底线

@@ -174,7 +164,7 @@
                //底线

                btnBelone.AddBottomLine();

                //分享的房间不能修改

                if (this.editorRoom.IsSharedRoom == false)

                if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)

                {

                    //右箭头

                    btnBelone.AddRightArrow();

@@ -196,7 +186,8 @@
            //底线

            rowTemperature.AddBottomLine();

            //分享的房间不能修改 或者当前住宅不是虚拟的

            if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)

            if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false

                && Common.Config.Instance.Home.IsShowTemplate == false)

            {

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

                {

@@ -204,7 +195,8 @@
                    this.ShowTemperatrueDevice(btnTemper);

                };

            }

            if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false)

            if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false

                && Common.Config.Instance.Home.IsShowTemplate == false)

            {

                //获取温度

                this.GetTemperatrueValue(btnTemper, cloneRoom.TemperatrueDevice);

@@ -220,7 +212,8 @@
            //底线

            rowHumidity.AddBottomLine();

            //分享的房间不能修改 或者当前住宅不是虚拟的

            if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)

            if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false

                && Common.Config.Instance.Home.IsShowTemplate == false)

            {

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

                {

@@ -228,7 +221,8 @@
                    this.ShowHumidityDevice(btnHumi);

                };

            }

            if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false)

            if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false

                && Common.Config.Instance.Home.IsShowTemplate == false)

            {

                //获取湿度

                this.GetHumidityValue(btnHumi, cloneRoom.HumidityDevice);

@@ -239,7 +233,7 @@
            tableContr = null;



            //分享的房间不能保存

            if (this.editorRoom.IsSharedRoom == true)

            if (this.editorRoom.IsSharedRoom == true|| Common.Config.Instance.Home.IsShowTemplate == true)

            {

                return;

            }

@@ -289,15 +283,7 @@
                editorRoom.FloorId = cloneRoom.FloorId;

                editorRoom.Name = cloneRoom.Name;

                editorRoom.HumidityDevice = cloneRoom.HumidityDevice;

                if (cloneRoom.Humidity != -1000)

                {

                    editorRoom.Humidity = cloneRoom.Humidity;

                }

                editorRoom.TemperatrueDevice = cloneRoom.TemperatrueDevice;

                if (cloneRoom.Temperatrue != -1000)

                {

                    editorRoom.Temperatrue = cloneRoom.Temperatrue;

                }

                editorRoom.BackgroundImage = cloneRoom.BackgroundImage;

                editorRoom.BackgroundImageType = cloneRoom.BackgroundImageType;

                editorRoom.Save();

@@ -306,16 +292,16 @@
                if (changedFloor == false)

                {

                    //刷新左滑的房间列表界面的指定房间的信息

                    MainPage.ListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);

                    MainPage.LeftListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);

                }

                else

                {

                    //刷新左滑的房间列表界面的房间列表信息

                    MainPage.ListRoomViewFrom.Instance.RefreshListRoom();

                    MainPage.LeftListRoomViewFrom.Instance.RefreshListRoom();

                }



                //算了,这里如果按下保存,则主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;

                UserView.UserPage.Instance.RefreshAllForm = true;



                this.CloseForm();

            };

@@ -375,6 +361,11 @@
                {

                    listDevice.Add(device);

                }

                //PM2.5是温度和湿度合在同一个端点

                else if (device.Type == ZigBee.Device.DeviceType.PMSensor)

                {

                    listDevice.Add(device);

                }

            }

            var listSelect = new List<string>() { cloneRoom.TemperatrueDevice };

            var form = new SelectDeviceForm();

@@ -405,44 +396,80 @@
            {

                return;

            }

            if (cloneRoom.Temperatrue == -1000)

            {

                //没有获取得到过温度

                btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);

            }

            else

            {

                btnTemper.Text = this.cloneRoom.Temperatrue == 0 ? "0.0℃" : this.cloneRoom.Temperatrue.ToString() + "℃";

                btnTemper.Text += "  " + Language.StringByID(R.MyInternationalizationString.Getting);

            }

            //获取中

            btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);



            bool receiveData = false;

            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A设备属性上报, ((report) =>

            {

                string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);

                if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null)

                if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null

                || report.DeviceStatusReport.CluterID != 1026)

                {

                    return;

                }

                receiveData = true;

                var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);

                HdlThreadLogic.Current.RunMain(() =>

                {

                    if (((ZigBee.Device.TemperatureSensor)localDevice).Temperatrue == 0)

                    decimal temperatrue = (decimal)device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, device, null);

                    if (temperatrue == 0)

                    {

                        //0℃

                        //0

                        btnTemper.Text = "0.0℃";

                        this.cloneRoom.Temperatrue = 0;

                    }

                    else

                    {

                        //记录温度

                        this.cloneRoom.Temperatrue = ((ZigBee.Device.TemperatureSensor)localDevice).Temperatrue;

                        btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "℃";

                        btnTemper.Text = temperatrue + "℃";

                    }



                }, ShowErrorMode.NO);

            }));

            //发送获取温度的命令

            ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();

            device.ReadAttri(ZigBee.Device.Cluster_ID.TemperatureMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);



            HdlThreadLogic.Current.RunThread(() =>

            {

                //去获取设备列表的信息

                System.Threading.Thread.Sleep(1500);

                var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);

                if (result != null)

                {

                    device.AttributeStatus.Clear();

                    device.AttributeStatus.AddRange(result.AttributeStatus);

                    device.ReSave();

                }

                if (receiveData == true)

                {

                    //已经读取到数据

                    return;

                }



                foreach (var data in device.AttributeStatus)

                {

                    if (data.ClusterId == 1026

                       && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)

                    {

                        //处理网关返回的温度值

                        decimal temperatrue = Common.LocalDevice.Current.AdjustTemperatrueValue(data.AttributeData);



                        device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.SetField, null, device, new object[] { temperatrue });

                        device.ReSave();



                        //制作虚假的属性上报

                        var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };

                        report.DeviceStatusReport.CluterID = 1026;

                        HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A设备属性上报);



                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            btnTemper.Text = temperatrue == 0 ? "0.0℃" : temperatrue.ToString() + "℃";

                        });

                        break;

                    }

                }

            });

        }



        #endregion

@@ -463,7 +490,13 @@
                {

                    listDevice.Add(device);

                }

                //新风

                else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)

                {

                    listDevice.Add(device);

                }

                //PM2.5是温度和湿度合在同一个端点

                else if (device.Type == ZigBee.Device.DeviceType.PMSensor)

                {

                    listDevice.Add(device);

                }

@@ -497,45 +530,81 @@
            {

                return;

            }

            if (cloneRoom.Humidity == -1000)

            {

                //没有获取得到过湿度

                btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);

            }

            else

            {

                btnHumi.Text = this.cloneRoom.Humidity == 0 ? "0.0%" : this.cloneRoom.Humidity.ToString() + "%";

                btnHumi.Text += "  " + Language.StringByID(R.MyInternationalizationString.Getting);

            }

            //获取中

            btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);



            bool receiveData = false;

            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A设备属性上报, (report) =>

            {

                string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);

                if (cloneRoom.HumidityDevice != mainKeys || btnHumi == null)

                if (cloneRoom.HumidityDevice != mainKeys || btnHumi == null

                || report.DeviceStatusReport.CluterID != 1029)

                {

                    return;

                }

                receiveData = true;

                var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);

                HdlThreadLogic.Current.RunMain(() =>

                {

                    decimal humidity = (decimal)localDevice.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, localDevice, null);

                    decimal humidity = (decimal)localDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, localDevice, null);

                    if (humidity == 0)

                    {

                        //0

                        btnHumi.Text = "0.0%";

                        this.cloneRoom.Humidity = 0;

                    }

                    else

                    {

                        //记录湿度

                        this.cloneRoom.Humidity = humidity;

                        btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";

                        btnHumi.Text = humidity.ToString() + "%";

                    }



                }, ShowErrorMode.NO);

            });

            //发送获取湿度的命令

            device.GetType().InvokeMember("ReadTemperatureOrHumidity", System.Reflection.BindingFlags.InvokeMethod, null, device, null);

            device.ReadAttri(ZigBee.Device.Cluster_ID.RelativeHumidityMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);



            HdlThreadLogic.Current.RunThread(() =>

            {

                //去获取设备列表的信息

                System.Threading.Thread.Sleep(1500);

                var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);

                if (result != null)

                {

                    device.AttributeStatus.Clear();

                    device.AttributeStatus.AddRange(result.AttributeStatus);

                    device.ReSave();

                }

                if (receiveData == true)

                {

                    //已经读到数据

                    return;

                }



                //初始值,取缓存数据

                foreach (var data in device.AttributeStatus)

                {

                    if (data.ClusterId == 1029

                       && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)

                    {

                        //处理网关返回的湿度值

                        decimal humidity = Common.LocalDevice.Current.AdjustHumidityValue(data.AttributeData);



                        device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.SetField, null, device, new object[] { humidity });

                        device.ReSave();



                        //制作虚假的属性上报

                        var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };

                        report.DeviceStatusReport.CluterID = 1029;

                        HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A设备属性上报);



                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            btnHumi.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";

                        });

                        break;

                    }

                }

            });

        }



        #endregion