Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs

@@ -95,7 +95,7 @@
        /// <summary>
        /// 修改场景action
        /// </summary>
        public Action<SceneUI, Common.Room> EditorAction; 
        public Action<SceneUI, Common.Room> EditorAction;

        #endregion

@@ -256,7 +256,7 @@
                        }
                    }
                }
                

                if (sceneTargetDevicesList.Count > 1)
                {
                    var targetRowLayout = new RowLayout()
@@ -582,7 +582,7 @@
                    var fileName = $"SceneIcon_{tradeTime}.png";
                    //通过相机拍照裁剪
                    CropImage.TakePicture((imagePath) =>
                    {
                    {

                        if (isModify)
                        {
                            if (IconPathType != 0)
@@ -607,7 +607,7 @@
                    var fileName = $"SceneIcon_{tradeTime}.png";
                    //从相册选择图片裁剪
                    CropImage.SelectPicture((imagePath) =>
                    {
                    {

                        if (isModify)
                        {
                            if (IconPathType != 0)