2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

old mode 100755
new mode 100644
@@ -204,11 +204,11 @@

        }

        public override void RemoveFromParent()

        {

            ZbGateway.StatusList.Remove(this);

        public override void RemoveFromParent()
        {
            ZbGateway.StatusList.Remove(this);
            CommonPage.Instance.IsDrawerLockMode = false;
            base.RemoveFromParent();

            base.RemoveFromParent();
        }

        #region Add____________________________________
@@ -553,10 +553,10 @@
                var fileName = $"RoomIcon_{tradeTime}.png";
                //通过相机拍照裁剪
                CropImage.TakePicture((imagePath) =>
                {

                    if (string.IsNullOrEmpty(imagePath))

                    {

                        return;

                {
                    if (string.IsNullOrEmpty(imagePath))
                    {
                        return;
                    }
                    if (IconPathType != 0)
                    {
@@ -579,9 +579,9 @@
                //从相册选择图片裁剪
                CropImage.SelectPicture((imagePath) =>
                {
                    if (string.IsNullOrEmpty(imagePath))

                    {

                        return;

                    if (string.IsNullOrEmpty(imagePath))
                    {
                        return;
                    }
                    if (IconPathType != 0)
                    {