Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs

@@ -822,6 +822,9 @@
            this.editorScene.IconPath = this.cloneScene.IconPath;

            this.editorScene.Save();



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

            UserView.UserPage.Instance.RefreshForm = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

                //调用回调函数

@@ -889,6 +892,9 @@
            this.editorScene.IconPath = this.cloneScene.IconPath;

            this.editorScene.Save();



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

            UserView.UserPage.Instance.RefreshForm = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

                //调用回调函数