不是新代码，别 合并

黄学彪

2020-08-07 ec34983e291d1c85284472a27109d55891f9a6b5

 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs

@@ -291,10 +291,10 @@
                this.ShowAddTargetMenu();

            };



            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //从网关获取场景的执行目标

                var result = await this.GetSceneTargetList();

                var result = this.GetSceneTargetList();

                if (result == true)

                {

                    //添加【执行目标行】

@@ -633,7 +633,7 @@
        /// 从网关获取场景的执行目标

        /// </summary>

        /// <returns></returns>

        private async System.Threading.Tasks.Task<bool> GetSceneTargetList()

        private bool GetSceneTargetList()

        {

            if (this.editorScene == null || this.listAdjustTarget != null)

            {

@@ -643,7 +643,7 @@
            //打开进度条

            this.ShowProgressBar();

            //获取执行目标列表

            var listData = await HdlSceneLogic.Current.GetAdjustTargetList(this.editorScene);

            var listData = HdlSceneLogic.Current.GetAdjustTargetList(this.editorScene);

            if (listData == null)

            {

                this.CloseProgressBar(ShowReLoadMode.YES);

@@ -789,10 +789,10 @@
        /// <summary>

        /// 保存新建的场景

        /// </summary>

        private async void SaveSceneDataByNewMode()

        private void SaveSceneDataByNewMode()

        {

            //添加场景

            this.editorScene = await HdlSceneLogic.Current.AddNewSceneToGateway(this.cloneScene.Name, this.listAdjustTarget);

            this.editorScene = HdlSceneLogic.Current.AddNewSceneToGateway(this.cloneScene.Name, this.listAdjustTarget);

            //关闭进度条

            this.CloseProgressBar();



@@ -823,7 +823,7 @@
            this.editorScene.Save();



            //新建场景,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;

            UserView.UserPage.Instance.RefreshAllForm = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

@@ -844,6 +844,8 @@
                var result = await HdlSceneLogic.Current.EditorSceneNameFromGateway(this.editorScene, this.cloneScene.Name);

                if (result == false)

                {

                    //关闭进度条

                    this.CloseProgressBar();

                    return;

                }

            }

@@ -851,10 +853,10 @@
            {

                //修改场景

                var result = await HdlSceneLogic.Current.EditorSceneFromGateway(this.editorScene, this.listAdjustTarget);

                //关闭进度条

                this.CloseProgressBar();

                if (result == false)

                {

                    //关闭进度条

                    this.CloseProgressBar();

                    return;

                }

            }

@@ -880,7 +882,7 @@
                if (this.editorScene.IconPathType != 0)

                {

                    //删除自定义图片

                    Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, this.editorScene.IconPath));

                    HdlFileLogic.Current.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, this.editorScene.IconPath));

                    HdlAutoBackupLogic.DeleteFile(this.editorScene.IconPath);

                }

                if (this.cloneScene.IconPathType != 0)

@@ -902,7 +904,10 @@
            this.editorScene.Save();



            //编辑场景,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;

            UserView.UserPage.Instance.RefreshAllForm = true;



            //关闭进度条

            this.CloseProgressBar();



            HdlThreadLogic.Current.RunMain(() =>

            {