2019.1.2-3

gxc

2020-01-02 34e965100d635346e2d4cd6e6013bdaed66b3004

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

@@ -91,9 +91,11 @@
        /// <summary>
        /// selectedTimeAction
        /// </summary>
        public Action<SceneTargetDeviceUI> selectedAction;


        private Action<SceneTargetDeviceUI> selectedAction;
        /// <summary>
        /// 修改场景action
        /// </summary>
        public Action<SceneUI, Common.Room> EditorAction;

        #endregion

@@ -109,7 +111,6 @@
        /// </summary>
        public override void RemoveFromParent()
        {
            Category.instance?.RefreshBodyView();
            base.RemoveFromParent();
        }
        /// <summary>
@@ -255,7 +256,7 @@
                        }
                    }
                }
                

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

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

                        if (isModify)
                        {
                            if (IconPathType != 0)
@@ -1145,7 +1146,6 @@
                        {
                            CommonPage.Loading.Hide();
                        }

                    }
                }