2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -98,12 +98,6 @@
            };
            contentView.AddChidren(btnBackIcon);

            btnBack = new Button()
            {
                Width = Application.GetRealWidth(100),
            };
            contentView.AddChidren(btnBack);

            Button btnTilte = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
@@ -118,6 +112,12 @@
            contentView.AddChidren(btnTilte);


            btnBack = new Button()
            {
                Width = Application.GetRealWidth(70),
            };
            contentView.AddChidren(btnBack);

            LoadEventList();
        }
        /// <summary>
@@ -131,7 +131,7 @@
            LoadTopView();
        }

        public void LoadTopView_RoomTop(Action backAction ,Action editAction)
        public void LoadTopView_RoomTop(Action backAction, Action editAction)
        {
            this.backAction = backAction;

@@ -147,7 +147,7 @@
            };

            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -158,11 +158,39 @@
        }

        /// <summary>
        /// 灯光功能列表界面
        /// 带组合调光编辑
        /// </summary>
        /// <param name="backAction"></param>
        /// <param name="editAction"></param>
        public void LoadTopView_LightFunction( Action editAction)
        {
            LoadTopView();

            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
            };

            contentView.AddChidren(btnSetting);
            btnSetting.MouseUpEventHandler = (sender, e) =>
            {
                editAction();
            };
        }



        /// <summary>
        /// 向framelayout添加顶部区域,拥有配置图标按钮
        /// </summary>
        /// <param name="frame"></param>
        /// <param name="tilte"></param>
        public void LoadTopView_FunctionTop(Function function, Action action)
        public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
        {
            backAction = action;

@@ -177,7 +205,7 @@
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
            };
            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -186,7 +214,7 @@
            {
                var infoView = new FunctionBaseInfoSetPage(function, action);
                MainPage.BasePageView.AddChidren(infoView);
                infoView.LoadPage();
                infoView.LoadPage(locationSet);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
        }
@@ -210,7 +238,7 @@
            };

            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -275,7 +303,7 @@
        /// <summary>
        /// 楼层管理顶部栏
        /// </summary>
        public void LoadTopView_FloorTopView(Action<string> callBack,Action action)
        public void LoadTopView_FloorTopView(Action<string> callBack, Action action)
        {
            LoadTopView();

@@ -376,7 +404,7 @@
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "FunctionIcon/ArmCenter/HistoryIcon.png",
            };
            contentView.AddChidren(btnAddIcon);
            //contentView.AddChidren(btnAddIcon);

            btnAddIcon.MouseUpEventHandler += (sender, e) =>
            {