gxc
2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -54,23 +54,31 @@
            //清空bodyFrame
            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 = (uint)Application.GetRealHeight(17);
            framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
            bodyFrameLayout.AddChidren(framePic);
            var btnPic = new ImageView();
            btnPic.Y = Application.GetRealHeight(60);
            btnPic.Width = Application.GetMinRealAverage(887);
            btnPic.Height = Application.GetMinRealAverage(444);
            btnPic.Gravity = Gravity.CenterHorizontal;
            btnPic.Radius = 17;
            btnPic.Radius = (uint)Application.GetRealHeight(17);
            btnPic.ImagePath = "RoomIcon/0.JPG";
            bodyFrameLayout.AddChidren(btnPic);
            btnPic.MouseUpEventHandler += (sender, e) =>
            framePic.AddChidren(btnPic);
            //在上面放一层阴影
            var btnPicBack = new FrameLayout();
            btnPicBack.Radius = (uint)Application.GetRealHeight(17);
            btnPicBack.BackgroundColor = 0x26000000;
            framePic.AddChidren(btnPicBack);
            btnPicBack.MouseUpEventHandler += (sender, e) =>
            {
                //房间图片选择
                this.RoomPictrueSelect(btnPic);
            };
            //添加阴影特效
            var btnTemp = new ButtonBase();
            btnTemp.AddBottomShadow(btnPic, true);
            btnTemp = null;
            framePic.SetViewShadow(true);
            this.newRoom = new Common.Room();
            newRoom.FloorId = this.floorKeys;
@@ -170,7 +178,7 @@
                    string picName = $"RoomIcon_{DateTime.Now.ToString("yyyyMMddHHmmss")}.png";
                    string picFullName = System.IO.Path.Combine(Common.Config.Instance.FullPath, picName);
                    Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
                    newRoom.BackgroundImage = picFullName;
                    newRoom.BackgroundImage = picName;
                    //备份
                    Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(picName);
                }
@@ -279,7 +287,7 @@
            btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
            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)
@@ -293,26 +301,29 @@
                {
                    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℃";
                            }
                            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, ".") + "℃";
                            }
                        });
                    }
                }
            }));
@@ -385,18 +396,21 @@
                {
                    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%";
                            }
                            else
                            {
                                //小数点需要一位(湿度没有负数)
                                string strValue = data.AttriButeData.ToString();
                                strValue = strValue.Substring(0, strValue.Length - 1);
                                btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
                            }
                        });
                    }
                }
            });