20200319

wxr

2020-03-19 b69d7735274b8d0f741da8a6bb8b8e1347477a5a

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

File was renamed from HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs
@@ -12,11 +12,11 @@
        /// <summary>
        /// 当前窗体
        /// </summary>
        FrameLayout bodyView;
        static FrameLayout bodyView;
        /// <summary>
        /// 功能列表集合显示区域
        /// </summary>
        //VerticalScrolViewLayout functionListView;
        static VerticalScrolViewLayout functionListView;
        #endregion

        #region
@@ -34,7 +34,7 @@
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView,room.name).LoadTopView();

            var functionListView =new VerticalScrolViewLayout()
            functionListView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(603-12),
@@ -48,7 +48,7 @@

                if (function.functionType == "RGB" || function.functionType == "Dimmer")
                {
                    var functionDiv = new RoomControlZone(function)
                    var functionDiv = new FunctionControlZone(function)
                    {
                        Gravity = Gravity.CenterHorizontal,
                        Width = Application.GetRealWidth(343),
@@ -57,14 +57,14 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType
                        Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
                }
                else
                {
                    var functionDiv = new RoomControlZone(function)
                    var functionDiv = new FunctionControlZone(function)
                    {
                        Gravity = Gravity.CenterHorizontal,
                        Width = Application.GetRealWidth(343),
@@ -73,7 +73,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType
                        Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);