Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs

@@ -70,7 +70,9 @@
            //场景点击

            sceneContr.ButtonClickEvent += (sender, e) =>

            {

                this.SceneUpHandler();

                //不能反复点击

                sceneContr.CanClick = false;

                this.SceneUpHandler(sceneContr);

            };



            //收藏

@@ -243,8 +245,13 @@
                {

                    //隐藏右划菜单

                    this.HideMenu();

                    scene.SceneDelayTime = t;

                    btnDelayTime.Text = CommonFormResouce.GetTimeString(t);

                    if (t != 0)

                    {

                        scene.SceneDelayTime = t;

                        btnDelayTime.Text = CommonFormResouce.GetTimeString(t);

                        //编辑延时时,需要刷新主页

                        UserView.UserPage.Instance.RefreshAllForm = true;

                    }

                };

            };

        }

@@ -254,9 +261,8 @@
        /// <summary>

        /// 

        /// </summary>

        /// <param name="btnScenePic"></param>

        /// <param name="btnSceneName"></param>

        private async void SceneUpHandler()

        /// <param name="sceneContr"></param>

        private async void SceneUpHandler(ScenePictrueControl sceneContr)

        {

            if (scene.SceneDelayTime <= 0 && scene.RemainTime <= 0)

            {

@@ -267,6 +273,7 @@
            var result = await HdlSceneLogic.Current.ControlScene(scene);

            if (result == false)

            {

                sceneContr.CanClick = true;

                return;

            }

            

@@ -274,8 +281,12 @@
            scene.SceneDelayTime = 0;

            if (scene.RemainTime <= 0)

            {

                sceneContr.CanClick = true;

                return;

            }

            //调用有延时的场景,需要刷新主页

            UserView.UserPage.Instance.RefreshAllForm = true;



            int myRemainTime = scene.RemainTime;

            //开启内部延时时间线程(旨在全部地方的同一场景时间同步)

            HdlSceneLogic.Current.StartDelayTimeThread(scene);

@@ -298,6 +309,7 @@
                        SetTimeImage();

                        //直接开启Loading特效

                        this.StartLoadingApreal();

                        sceneContr.CanClick = true;

                    }

                });

            })