2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

 ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using Shared.Common;
using Shared.Phone.Device.Category;
using Shared.Phone.Device.CommonForm;
using Shared.Phone.UserCenter;

using Shared.Phone.UserView;
@@ -19,7 +18,7 @@
        /// <summary>

        /// 添加到 的背景图控件

        /// </summary>

        private FrameLayoutControl frameAddBackGroud = null;

        private FrameLayoutStatuControl frameAddBackGroud = null;

        /// <summary>

        /// 功能的桌布控件

        /// </summary>

@@ -177,13 +176,13 @@
                SceneBodyTableControl.AddChidren(listSceneView);



                var listScene = HdlSceneLogic.Current.GetUnalloctedScenes();

                if (listScene == null || listScene.Count == 0) { return; }

                if (listScene.Count == 0) { return; }



                foreach (var data in listScene)

                {

                    //场景图片

                    var frameContr = new ScenePictrueControl();

                    listSceneView.AddChidrenFrame(frameContr);

                    listSceneView.AddChidren(frameContr);

                    frameContr.InitControl(data);



                    //添加选择控件

@@ -194,7 +193,7 @@
                    frameContr.CollectEvent += (collect) =>

                    {

                        //如果当前是收藏房间,则需要刷新主页

                        if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)

                        if (HdlRoomLogic.Current.NowMainPageRoom.IsLove == true)

                        {

                            this.dataHadChanged = true;

                        }

@@ -219,7 +218,7 @@
                //促使它超过时,能够往上滑

                var frameTemp = new FrameLayout();

                frameTemp.Height = Application.GetRealHeight(202 + 23);

                listSceneView.AddChidrenFrame(frameTemp);

                listSceneView.AddChidren(frameTemp);

            });

        }



@@ -511,7 +510,7 @@
        private void InitAddToControl()

        {

            //添加到 的背景图控件
            this.frameAddBackGroud = new FrameLayoutControl();
            this.frameAddBackGroud = new FrameLayoutStatuControl();
            frameAddBackGroud.UseClickStatu = false;
            frameAddBackGroud.Height = Application.GetRealHeight(202);
            frameAddBackGroud.Gravity = Gravity.BottomCenter;
@@ -528,7 +527,7 @@
            btnAdd.TextID = R.MyInternationalizationString.AddTo;
            btnAdd.TextSize = 17;
            btnAdd.Radius = (uint)Application.GetRealHeight(35);
            frameAddBackGroud.AddChidren(btnAdd, ChidrenBindMode.BindEventOnly);

            frameAddBackGroud.AddChidren(btnAdd, ChidrenBindMode.BindEvent);

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

            {

                var selectZone = new SelectZone();
@@ -537,7 +536,7 @@
                selectZone.ZoneAction += (selectRoom) =>
                {
                    //变更了当前房间的东西,主页需要刷新
                    if (HdlRoomLogic.Current.CurrentRoom.Id == selectRoom.Id)

                    if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectRoom.Id)

                    {

                        this.dataHadChanged = true;

                    }
@@ -569,7 +568,7 @@
            foreach (var scene in this.dicSelectScene.Values)

            {

                //添加场景

                HdlSceneLogic.Current.AddScene(room, scene);

                HdlSceneLogic.Current.AddSceneToRoom(room, scene);

            }

            //清空缓存

            this.dicSelectScene.Clear();

@@ -636,7 +635,7 @@
                    string path1 = string.Empty;

                    string path2 = string.Empty;

                    //获取图片

                    Common.LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                    dic[typeInfo.BeloneTextId].IconPathSelected = path2;

                    dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;

@@ -660,7 +659,7 @@
                HdlThreadLogic.Current.RunMainInThread(() =>

                {

                    //刷新主页

                    this.LoadFormMethodByName("HomeMainPageForm", "RefreshBodyView");

                    HomeMainPageForm.Instance?.RefreshBodyView();

                });

            }

            base.CloseFormBefore();