先上传一个非最新的版本

黄学彪

2020-04-26 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -107,12 +107,18 @@
                if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)

                {

                    //添加场景

                    Add_Scene();

                    var form = new AddOrEditorSceneForm();

                    form.AddForm(new object[] { null });

                    form.SceneChangedEvent += (scene, roomId) =>

                    {

                        //刷新bodyView

                        this.RefreshBodyView();

                    };

                }

                else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)

                {

                    //添加自动化

                    Add_Automation();

                    Device.Logic.SkipView.SkipAddLogic(0);

                }

            };

        }

@@ -149,7 +155,7 @@
                frameSwitchBack.AddChidren(btnFloorName);

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

                {

                    var floors = new Device.Category.SelectFloor();

                    var floors = new SelectFloorForm();

                    AddChidren(floors);

                    floors.Init(580, 330, Direction.Right);

                    floors.changeFloor = true;

@@ -605,21 +611,43 @@
            }



            var dicSceneContr = new Dictionary<int, SceneCategoryView>();

            var listview = new VerticalListControl();

            functionSceneBodyView.AddChidren(listview);

            //主人，管理员专用刷新控件

            VerticalListRefreshControl listview1 = null;

            //成员专用不能刷新的控件

            VerticalListControl listview2 = null;

            //if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)

            //{

            //    listview1 = new VerticalListRefreshControl();

            //    functionSceneBodyView.AddChidren(listview1);

            //}

            //else

            {

                listview2 = new VerticalListControl();

                functionSceneBodyView.AddChidren(listview2);

            }

          
            foreach (var scene in listScene)

            {

                //场景卡片控件

                var sceneView = new SceneCategoryView();

                listview.AddChidren(sceneView);

                listview1?.AddChidren(sceneView);

                listview2?.AddChidren(sceneView);

                sceneView.InitControl(scene, room);



                dicSceneContr[scene.Id] = sceneView;

            }

            HdlThreadLogic.Current.RunThread(() =>

            {

                //获取全部场景的延时时间

                this.GetAllDelayScene(dicSceneContr, listview);

                if (listview1 != null)

                {

                    //获取全部场景的延时时间

                    this.GetAllDelayScene(dicSceneContr, listview1);

                }

                else

                {

                    //获取全部场景的延时时间

                    this.GetAllDelayScene(dicSceneContr, listview2);

                }

            }, ShowErrorMode.NO);

        }



@@ -627,7 +655,7 @@
        /// 获取全部场景的延时时间

        /// </summary>

        /// <param name="dicSceneContr"></param>

        private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, VerticalListControl listview)

        private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, ViewGroup listview)

        {

            //读取全部的延时时间

            var result = await Scene.CatDelaySceneAsync();

@@ -897,30 +925,6 @@
                timeStr += sec + secondText;

            }

            return timeStr;

        }



        /// <summary>

        /// 添加场景(郭雪城的代码)

        /// </summary>

        private void Add_Scene()

        {

            var scene = new Device.Category.CategoryAddScene();

            UserView.HomePage.Instance.AddChidren(scene);

            UserView.HomePage.Instance.PageIndex += 1;

            scene.Show();

            scene.AddAction = () =>

            {

                //刷新bodyView

                this.RefreshBodyView();

            };

        }



        /// <summary>

        /// 添加自动化(郭雪城的代码)

        /// </summary>

        private void Add_Automation()

        {

            Shared.Phone.Device.Logic.SkipView.SkipAddLogic(0);

        }



        #endregion