2019.12.2

gxc

2019-12-02 5204bc34549ba4718158c447cbb3c74b39ffe163

 ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs

@@ -29,7 +29,7 @@
        /// <summary>
        /// backGround
        /// </summary>
        private Button backGround;
        private ImageView backGround;
        /// <summary>
        /// IconPathType
        /// </summary>
@@ -109,19 +109,15 @@
            };
            AddChidren(bodyFrameLayout);

            backGround = new Button()
            backGround = new ImageView()
            {
                Y = Application.GetRealHeight(60),
                Width = Application.GetMinRealAverage(887),
                Height = Application.GetMinRealAverage(444),
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius),
                UnSelectedImagePath = room.BackgroundImage
                ImagePath = room.BackgroundImageType==0? room.BackgroundImage: System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage)
            };
            if (room.BackgroundImageType != 0)
            {
                backGround.UnSelectedImagePath = System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage);
            }
            bodyFrameLayout.AddChidren(backGround);
            backGround.SetViewShadow(true);
            backGround.MouseUpEventHandler += backGroundIMGHander;
@@ -393,7 +389,7 @@
            confirm.MouseUpEventHandler += (sender, e) =>
            {
                var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
                var fileName = $"Room_{tradeTime}";
                var fileName = $"RoomIcon_{tradeTime}.png";
                room.Name = nameRow.NameText.Text.Trim();
                if (OldIconPathType != 0)
                {
@@ -520,7 +516,7 @@
            {
                selectFL.RemoveFromParent();
                var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
                var fileName = $"Room_{tradeTime}";
                var fileName = $"RoomIcon_{tradeTime}.png";
                //通过相机拍照裁剪
                CropImage.TakePicture((imagePath) =>
                {