wxr
2024-05-07 f16fd06aa226e9f97a27858624d4ea7cf8975d25
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -361,6 +361,14 @@
            //2020-12-03 修改图片加载方法
            ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
            var roomViewbgColor = new Button()
            {
                Height = Application.GetRealWidth(192),
                Radius = (uint)Application.GetRealWidth(12),
                BackgroundColor = 0x19333333,
            };
            roomView.AddChidren(roomViewbgColor);
            var btnFloorAndRoomName = new Button()
            {
                X = Application.GetRealWidth(16),
@@ -370,7 +378,8 @@
                Text = room.floorName + room.roomName,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                IsBold = true,
            };
            roomView.AddChidren(btnFloorAndRoomName);
@@ -454,13 +463,6 @@
            //roomView.AddChidren(environmentalView);
            #endregion
            var roomViewbgColor = new Button()
            {
                Height = Application.GetRealWidth(192),
                Radius = (uint)Application.GetRealWidth(12),
                BackgroundColor = 0x19333333,
            };
            roomView.AddChidren(roomViewbgColor);
            var btnAllClose = new Button()
            {
@@ -482,8 +484,7 @@
            //    BackgroundColor = CSS_Color.MainBackgroundColor,
            //};
            //roomView.AddChidren(btn);
            roomViewbgColor.MouseUpEventHandler += (sender, e) =>
            EventHandler <MouseEventArgs> roomRowClick = (sender, e) =>
            {
                Action ReloadRoomName = () =>
                {
@@ -508,6 +509,10 @@
                view.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            roomViewbgColor.MouseUpEventHandler = roomRowClick;
            btnFloorAndRoomName.MouseUpEventHandler = roomRowClick;
        }
        /// <summary>
        /// 记载小图房间row
@@ -743,6 +748,12 @@
                        break;
                    case ShowFunction.Panel:
                        break;
                    case ShowFunction.SecurityMonitoring:
                        if (!MainPage.NoLoginMode)
                        {
                            functionCount = 1;
                        }
                        break;
                    case ShowFunction.Sensor:
                        functionCount = FunctionList.List.GetArmSensorList().Count;
                        break;
@@ -821,6 +832,7 @@
                    && item != ShowFunction.Environmental
                    && item != ShowFunction.Sensor
                    && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.FreshAir
                    && item != ShowFunction.Music
                    && item != ShowFunction.EnergyMonitoring
@@ -1111,6 +1123,12 @@
                    case ShowFunction.Panel:
                        btnName.TextID = StringId.Panel;
                        break;
                    case ShowFunction.SecurityMonitoring:
                        btnName.TextID = StringId.EZVIZ;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
                            HDLCommon.Current.Go2EZvizMonitor(bodyView);
                        };
                        break;
                    case ShowFunction.Sensor:
                        btnName.TextID = StringId.Sensor;
                        functionPageTitleId = StringId.Sensor;
@@ -1153,6 +1171,7 @@
                if ( item != ShowFunction.Aks
                    && item != ShowFunction.Music
                    && item != ShowFunction.Environmental
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.DoorLock
                    //&& ShowFunction.EnergyMonitoring != item
                    && ShowFunction.VideoIntercom != item