2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

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

@@ -55,29 +55,30 @@
            this.ClearBodyFrame();



            //房间图片

            var framePic = new FrameLayout();

            framePic.Y = Application.GetRealHeight(60);

            framePic.Width = Application.GetMinRealAverage(887);

            framePic.Height = Application.GetMinRealAverage(444);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Radius = 8;

            framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;

            bodyFrameLayout.AddChidren(framePic);

            var btnPic = new ImageView();

            btnPic.Radius = 8;

            btnPic.Y = Application.GetRealHeight(60);

            btnPic.Width = Application.GetMinRealAverage(887);

            btnPic.Height = Application.GetMinRealAverage(444);

            btnPic.Radius = (uint)Application.GetRealHeight(17);

            btnPic.Gravity = Gravity.CenterHorizontal;

            btnPic.ImagePath = "RoomIcon/0.JPG";

            framePic.AddChidren(btnPic);

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

            bodyFrameLayout.AddChidren(btnPic);

            var btnShadow = new PicViewControl(916, 487);

            btnShadow.Y = btnPic.Y;

            btnShadow.Gravity = Gravity.CenterHorizontal;

            btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";

            bodyFrameLayout.AddChidren(btnShadow);

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

            {

                //房间图片选择

                this.RoomPictrueSelect(btnPic);

            };

            //添加阴影特效

            framePic.SetViewShadow(true);



            this.newRoom = new Common.Room();

            newRoom.FloorId = this.floorKeys;

            newRoom.BackgroundImage = btnPic.ImagePath;

            newRoom.Humidity = -1000;

            newRoom.Temperatrue = -1000;



            //初始化桌布

            var tableContr = new InformationEditorControl();

@@ -179,18 +180,11 @@
                }



                newRoom.FloorId = this.floorKeys;

                var result = newRoom.AddRoom(newRoom);

                if (result == false)

                {

                    //提示用户添加失败

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.FAIL));

                }

                else

                {

                    this.FinishEditorEvent?.Invoke();



                    this.CloseForm();

                }

                HdlRoomLogic.Current.AddRoom(newRoom);

                this.FinishEditorEvent?.Invoke();



                this.CloseForm();

            };

        }



@@ -204,7 +198,7 @@
        /// <param name="control"></param>

        private void ShowSelectFloor(FrameCaptionViewControl control)

        {

            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();



            var listKeys = new List<string>();

            var listName = new List<string>();

@@ -278,44 +272,58 @@
            {

                return;

            }

            //获取中...

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

            if (newRoom.Temperatrue == -1000)

            {

                //没有获取得到过温度

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

            }

            else

            {

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

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

            }



            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

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

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

            {

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

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

                {

                    return;

                }

                //移除掉事件

                HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");



                foreach (var data in report.DeviceStatusReport.AttriBute)

                {

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

                    {

                        if (data.AttriButeData == 0)

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            //0℃

                            btnTemper.Text = "0.0℃";

                        }

                        else if (data.AttriButeData > 32767)

                        {

                            //负数(特殊处理)

                            string strValue = (data.AttriButeData - 65536).ToString();

                            //小数点需要一位

                            strValue = strValue.Substring(0, strValue.Length - 1);

                            btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";

                        }

                        else

                        {

                            //小数点需要一位

                            string strValue = data.AttriButeData.ToString();

                            strValue = strValue.Substring(0, strValue.Length - 1);

                            btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";

                        }

                            if (data.AttriButeData == 0)

                            {

                                //0℃

                                btnTemper.Text = "0.0℃";

                                this.newRoom.Temperatrue = 0;

                            }

                            else if (data.AttriButeData > 32767)

                            {

                                //负数(特殊处理)

                                string strValue = (data.AttriButeData - 65536).ToString();

                                //小数点需要一位

                                strValue = strValue.Substring(0, strValue.Length - 1);

                                //记录温度

                                this.newRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

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

                            }

                            else

                            {

                                //小数点需要一位

                                string strValue = data.AttriButeData.ToString();

                                strValue = strValue.Substring(0, strValue.Length - 1);

                                //记录温度

                                this.newRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

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

                            }

                        });

                    }

                }

            }));

@@ -371,8 +379,16 @@
            {

                return;

            }

            //获取中...

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

            if (newRoom.Humidity == -1000)

            {

                //没有获取得到过湿度

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

            }

            else

            {

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

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

            }



            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");

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

@@ -382,24 +398,28 @@
                {

                    return;

                }

                //移除掉事件

                HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");

                foreach (var data in report.DeviceStatusReport.AttriBute)

                {

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

                    {

                        if (data.AttriButeData == 0)

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            //0

                            btnHumi.Text = "0.0%";

                        }

                        else

                        {

                            //小数点需要一位(湿度没有负数)

                            string strValue = data.AttriButeData.ToString();

                            strValue = strValue.Substring(0, strValue.Length - 1);

                            btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";

                        }

                            if (data.AttriButeData == 0)

                            {

                                //0

                                btnHumi.Text = "0.0%";

                                this.newRoom.Humidity = 0;

                            }

                            else

                            {

                                //小数点需要一位(湿度没有负数)

                                string strValue = data.AttriButeData.ToString();

                                strValue = strValue.Substring(0, strValue.Length - 1);

                                //记录湿度

                                this.newRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

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

                            }

                        });

                    }

                }

            });

@@ -506,7 +526,8 @@
            }

            if (string.IsNullOrEmpty(this.floorKeys) == true)

            {

                if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)

                var listRoom = HdlRoomLogic.Current.GetAllListRooms();

                if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)

                {

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));

                    return false;

@@ -514,7 +535,7 @@
            }

            else

            {

                var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);

                var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);

                if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)

                {

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));