Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -20,19 +20,35 @@
        #endregion

        #region
        Room room;
        #endregion 
        static Room room;
        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()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView,room.name).LoadTopView();

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

            functionListView = new VerticalScrolViewLayout()
            {
@@ -41,12 +57,16 @@
            };
            bodyView.AddChidren(functionListView);


            foreach (var function in room.functionData)
            foreach (var function in room.GetRoomFunctions(false))
            {
                if (function.functionCategory == FunctionCategory.Sensor)
                {
                    continue;
                }

                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });

                if (function.functionType == "RGB" || function.functionType == "Dimmer")
                if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
                {
                    var functionDiv = new FunctionControlZone(function)
                    {