Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL_ON/UI/UI2/2-Classification/RoomPage.cs

@@ -21,23 +21,34 @@

        #region
        static Room room;
        #endregion 
        Action skipEditPageAction;
        Action ReloadRoomName;
        #endregion

        public RoomPage(Room r)
        public RoomPage(Room r,Action rrn)
        {
            bodyView = this;
            room = r;
            skipEditPageAction = () =>
            {
                LoadEvent_SkipEditRoomPage();
            };
            ReloadRoomName = rrn;
        }
        /// <summary>
        /// 重载界面
        /// </summary>
        void ReLoadPage()
        {
            bodyView.RemoveAll();
            LoadPage();
        }

        public void LoadPage()
        {
            Action skipAction = () =>
            {
                LoadEvent_SkipEditRoomPage();
            };
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            new TopViewDiv(bodyView,room.name).LoadTopView(room ,skipAction);
            new TopViewDiv(bodyView,room.name).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);

            functionListView = new VerticalScrolViewLayout()
            {
@@ -46,7 +57,7 @@
            };
            bodyView.AddChidren(functionListView);

            foreach (var function in room.functions)
            foreach (var function in room.GetRoomFunctions(false))
            {
                if (function.functionCategory == FunctionCategory.Sensor)
                {