合并乐橙代码

wei

2021-07-06 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -1,5 +1,5 @@
using System;
using System.Collections.Generic;

using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -21,8 +21,8 @@
        /// 场景内容显示区域
        /// </summary>
        FrameLayout floorChangeView;
        /// <summary>

        /// 楼层房间选择的下拉对象

        /// <summary>
        /// 楼层房间选择的下拉对象
        /// </summary>
        FloorRoomSelectPopupView floorRoomSelectView = null;
        Button btnSceneTilte;
@@ -136,9 +136,9 @@
            }
            btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337-20),
                Width = Application.GetMinRealAverage(28+30),
                Height = Application.GetMinRealAverage(28+29),
                X = Application.GetRealWidth(337 - 20),
                Width = Application.GetMinRealAverage(28 + 30),
                Height = Application.GetMinRealAverage(28 + 29),
            };
            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
@@ -189,7 +189,7 @@
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                X = Application.GetRealWidth(16),
               Gravity = Gravity.CenterVertical,
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Public/DownIcon.png",
            };
            floorChangeView.AddChidren(btnFloorDownIcon);
@@ -199,7 +199,7 @@
            btnFloor = new Button()
            {
                X = btnFloorDownIcon.Right,
               Gravity = Gravity.CenterVertical,
                Gravity = Gravity.CenterVertical,
                Width = Application.GetRealWidth(200),
                Height = Application.GetMinRealAverage(16),
                TextColor = CSS_Color.FirstLevelTitleColor,
@@ -207,30 +207,30 @@
                TextAlignment = TextAlignment.CenterLeft,
                Text = DB_ResidenceData.Instance.CurFloor.roomName,
            };
            floorChangeView.AddChidren(btnFloor);



            string nowSelectId = null;

            btnFloor.MouseUpEventHandler += (sender, e) =>

            {

                if (this.floorRoomSelectView == null)

                {

                    //先初始化

                    this.floorRoomSelectView = new FloorRoomSelectPopupView();

                }

                //显示下拉列表

                this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>

                {

                    nowSelectId = selectId;

                    //重新刷新场景列表

                    this.LoadSceneFunctionControlZone(listScene);

                }, nowSelectId);

            floorChangeView.AddChidren(btnFloor);

            string nowSelectId = null;
            btnFloor.MouseUpEventHandler += (sender, e) =>
            {
                if (this.floorRoomSelectView == null)
                {
                    //先初始化
                    this.floorRoomSelectView = new FloorRoomSelectPopupView();
                }
                //显示下拉列表
                this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>
                {
                    nowSelectId = selectId;
                    //重新刷新场景列表
                    this.LoadSceneFunctionControlZone(listScene);
                }, nowSelectId);
            };

            #endregion



            sceneFunctionView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(53),  
                Y = Application.GetRealHeight(53),
                Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
            };
            scenePageView.AddChidren(sceneFunctionView);
@@ -250,15 +250,15 @@
            {
                int index = 0;
                //获取能够显示的场景
                if (listScene == null)

                {

                    //初始值

                    if (this.floorRoomSelectView == null)

                    {

                        //先初始化

                        this.floorRoomSelectView = new FloorRoomSelectPopupView();

                    }

                    listScene = this.floorRoomSelectView.GetCanShowListScene();

                if (listScene == null)
                {
                    //初始值
                    if (this.floorRoomSelectView == null)
                    {
                        //先初始化
                        this.floorRoomSelectView = new FloorRoomSelectPopupView();
                    }
                    listScene = this.floorRoomSelectView.GetCanShowListScene();
                }
                foreach (var scene in listScene)
                {
@@ -503,7 +503,7 @@
            contentPageView.AddChidren(automationPage);
            UI2.Intelligence.Automation.MainView.automationPage = automationPage;
            UI2.Intelligence.Automation.MainView.MainShow();
        }

        }
        #endregion
    }

@@ -606,7 +606,8 @@
                else
                {
                    //跳转到逻辑界面
                    UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                    UI2.Intelligence.Automation.MainView logicMainView = new UI2.Intelligence.Automation.MainView();
                    logicMainView.SkipAddLogicPage();
                }
            };
        }
@@ -615,7 +616,7 @@
        /// <summary>
        /// 加载场景控制事件
        /// </summary>
        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone,Button btnShowDelay, Scene scene)
        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Button btnShowDelay, Scene scene)
        {

            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>