UI优化

wxr

2023-11-07 54be52bc0ab6ce3207d421db4e5b05d14886b148

UI优化

 HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs

@@ -45,12 +45,14 @@
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            this.AddChidren(bodyView);
            new TopViewDiv(this, bodyView, titleStr).LoadTopView(closeAction);
            var topView = new TopViewDiv(this, bodyView, titleStr);
            topView.maginY = 10;
            topView.LoadTopView(closeAction);
            //WebView
            mWebView = new WebView()
            {
                Y = Application.GetRealHeight(64),
                Height = bodyView.Height - Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = bodyView.Height - Application.GetRealHeight(64+10),
                X = Application.GetRealWidth(16),
                Width = bodyView.Width - Application.GetRealWidth(32)
            };

 HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs

@@ -95,7 +95,7 @@
            //返回键
            var btnBack = new PicViewControl(40, 28);
            btnBack.X = Application.GetRealWidth(10);
            btnBack.Y = Application.GetRealHeight(9);

            btnBack.Y = Application.GetRealHeight(19);

            btnBack.UnSelectedImagePath = "Public/BackIcon.png";
            topFrameLayout.AddChidren(btnBack);

            topFrameLayout.AddTag("btnBack", btnBack);
@@ -119,7 +119,7 @@
            //标题

            var btnTilte = new NormalViewControl(270, 25, true);

            btnTilte.Gravity = Gravity.CenterHorizontal;

            btnTilte.Y = Application.GetRealHeight(10);

            btnTilte.Y = Application.GetRealHeight(20);

            btnTilte.TextAlignment = TextAlignment.Center;

            btnTilte.TextSize = UI.CSS.CSS_FontSize.HeadlineFontSize;

            btnTilte.TextColor = UI.CSS.CSS_Color.FirstLevelTitleColor;


 HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs

@@ -302,12 +302,20 @@
        /// <param name="btnHigherCollection">上一级界面的收藏控件(原来on的框架太坑)</param>

        /// <param name="btnHigherDeviceName">上一级界面的设备名字控件(原来on的框架太坑)</param>

        private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)

        {

            //设置图标(门锁界面需要借用这个图标的X轴和Y轴,所以加进来)

            var btnSetting = new PicViewControl(28, 28);

            btnSetting.X = Application.GetRealWidth(337);

            btnSetting.Y = Application.GetRealHeight(9);

            btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";

        {
            //设置图标(门锁界面需要借用这个图标的X轴和Y轴,所以加进来)
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),

                Y = Application.GetRealHeight(19),

                Width = Application.GetMinRealAverage(32),

                Height = Application.GetMinRealAverage(32),

                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
            };

            //var btnSetting = new PicViewControl(28, 28);

            //btnSetting.X = Application.GetRealWidth(337);

            //btnSetting.Y = Application.GetRealHeight(9);

            //btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";

            btnSetting.Name = "btnSetting";

            topFrameLayout.AddChidren(btnSetting);



@@ -317,7 +325,7 @@
                btnSetting.Visible = false;

            }



            btnSetting.ButtonClickEvent += (sender, e) =>

            btnSetting.MouseUpEventHandler += (sender, e) =>

            {

                var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>

                {


 HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs

@@ -17,7 +17,7 @@
        /// <summary>

        /// 画面TopFrameLayout的高度(高度：44)

        /// </summary>

        public static int TopFrameHeight = Application.GetRealHeight(44);

        public static int TopFrameHeight = Application.GetRealHeight(44 + 10);

        /// <summary>

        /// 画面BodyFrameLayout的高度(不能直接指定数值,不然有可能会出现误差,导致无法铺满)

        /// </summary>


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

@@ -84,50 +84,24 @@
                    skipView.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
                new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
                var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
                topView.maginY = 10;
                topView.LoadTopView_LightFunction(action);
            }
            else
            {
                new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
                var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
                topView.maginY = 10;
                topView.LoadTopView();
            }



#if DEBUG
            //Button testBtn = new Button()
            //{
            //    X = Application.GetRealWidth(80),
            //    Height = Application.GetRealHeight(64),
            //    BackgroundColor = 0xFFFF0000
            //};
            //bodyView.AddChidren(testBtn);
            //int ddd = 0;
            //testBtn.MouseUpEventHandler = (sender, e) => {
            //    ddd++;
            
            //        Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
            //    if (ddd % 2 == 0)
            //    {
            //        function_online.online = true;
            //    }
            //    else
            //    {
            //        function_online.online = false;
            //    }
            //    HomePage.LoadEvent_RefreshDevcieOnline(function_online);
            //    FunctionPage.UpdataOnline(function_online);
            //    RoomPage.UpdataOnline(function_online);


            //};
#endif

            /// <summary>
            /// 房间内容显示区域
            /// </summary>
            var roomFloorChangeView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(52),
            };
            bodyView.AddChidren(roomFloorChangeView);
@@ -158,8 +132,8 @@

            functionListView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64 + 52),
                Height = Application.GetRealHeight(603 - 12 - 52),
                Y = Application.GetRealHeight(64 + 52 +10),
                Height = Application.GetRealHeight(603 - 12 - 52-10),
            };
            bodyView.AddChidren(functionListView);


 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs

@@ -29,12 +29,14 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints));
            topView.maginY = 10;
            topView.LoadTopView();

            #region 投诉联系
            FrameLayout phoneRow = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealWidth(50),
            };
            bodyView.AddChidren(phoneRow);

 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs

@@ -14,12 +14,14 @@

        public void ShowPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate));
            topView.maginY = 10;
            topView.LoadTopView();

            var contentView = new VerticalScrolViewLayout()
            {
                X = Application.GetRealWidth(12),
                Y = Application.GetRealHeight(90),
                Y = Application.GetRealHeight(100),
                Height = bodyView.Height,
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };

 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs

@@ -14,12 +14,14 @@
        }
        public void ShowPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes));
            topView.maginY = 10;
            topView.LoadTopView();

            var contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(90),
                Height = bodyView.Height ,
                Y = Application.GetRealHeight(100),
                Height = Application.GetRealHeight(490) ,
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(contentView);

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs

@@ -92,11 +92,15 @@
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            if (isAdd)
            {
                new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView();
                var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
                topView.maginY = 10;
                topView.LoadTopView();
            }
            else
            {
                new TopViewDiv(bodyView, "").LoadTopView_SettingText(()=> {
                var topView = new TopViewDiv(bodyView, "");
                topView.maginY = 10;
                topView.LoadTopView_SettingText(()=> {

                    Action action = () => {
                        var waitPage = new Loading();
@@ -158,8 +162,8 @@
            }
            var contentView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667-64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667-64-10),
            };
            bodyView.AddChidren(contentView);

@@ -371,7 +375,7 @@
            functionListView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(220),
                Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100),
                Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100-10),
            };
            bodyView.AddChidren(functionListView);


 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs

@@ -22,7 +22,9 @@
        public void LoadPage()
        {

            new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_AddIcon("CombinedDimming",
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
            topView.maginY = 10;
            topView.LoadTopView_AddIcon("CombinedDimming",
                (s, c) =>
                {
                    try
@@ -44,8 +46,8 @@

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(contentView);

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs

@@ -60,12 +60,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming));
            topView.maginY = 10;
            topView.LoadTopView();

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
            };
            bodyView.AddChidren(contentView);


 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs

@@ -34,11 +34,13 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember));
            topView.maginY = 10;
            topView.LoadTopView();

            var btnMemberName = new Button()
            {
                Y = Application.GetRealHeight(70),
                Y = Application.GetRealHeight(70+10),
                X = Application.GetRealWidth(16),
                Height = Application.GetRealHeight(32),
                TextColor = CSS_Color.FirstLevelTitleColor,

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs

File was deleted

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs

@@ -29,12 +29,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            new TopViewDiv(bodyView, memberInfo.nickName).LoadTopView();
            var topView = new TopViewDiv(bodyView, memberInfo.nickName);
            topView.maginY = 10;
            topView.LoadTopView();

            #region 人脸管理
            var btnMemberFaceTitle = new Button()
            {
                Y = Application.GetRealHeight(80),
                Y = Application.GetRealHeight(80+10),
                X = Application.GetRealWidth(16),
                Height = Application.GetRealHeight(32),
                TextColor = CSS_Color.FirstLevelTitleColor,

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs

@@ -84,11 +84,13 @@
        public void LoadPage(int tId)
        {
            titleId = tId;
            new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
            topView.maginY = 10;
            topView.LoadTopView();

            allRoomView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
@@ -128,8 +130,8 @@

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64+50),
                Height = Application.GetRealHeight(450),
                Y = Application.GetRealHeight(64+50+10),
                Height = Application.GetRealHeight(450-10),
            };
            bodyView.AddChidren(contentView);


 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs

@@ -29,24 +29,6 @@
                //是否需要保存
                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);

                //if (titleId == StringId.PermissionToUse)//从个人中心进入单独分享
                //{
                //    Action action = () =>
                //    {
                //        UploadShareDeviceList();
                //    };
                //    //是否需要保存
                //    new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
                //}
                //else
                //{
                //    //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
                //    //2020-12-01 屏蔽页面
                //    //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
                //    //MainPage.BasePageView.AddChidren(page);
                //    //page.LoadPage();
                //    //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                //}
            };
        }


 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs

@@ -31,11 +31,13 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.MemberPermissionManagement)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MemberPermissionManagement));
            topView.maginY = 10;
            topView.LoadTopView();

            FrameLayout headPortraitView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(66),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs

@@ -270,6 +270,7 @@
                        BorderColor = CSS.CSS_Color.DividingLineColor,
                        BorderWidth = 3,
                        TextColor = CSS.CSS_Color.TextualColor,
                        Radius = 1,
                    };
                    searchView.AddChidren(searchTv);


 HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs

@@ -44,9 +44,11 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement));
            topView.maginY = 10;
            topView.LoadTopView();

            int bodyY = Application.GetRealHeight(64);
            int bodyY = Application.GetRealHeight(64+10);
            bodyScrolView = new VerticalScrolViewLayout()
            {
                Y = bodyY,

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs

@@ -57,12 +57,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement));
            topView.maginY = 10;
            topView.LoadTopView();

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
            };
            bodyView.AddChidren(contentView);