Merge branch 'Dev-Wxr' into Dev-Branch

wxr

2023-05-09 bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0

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

@@ -47,6 +47,7 @@
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
            this.BackgroundColor = CSS_Color.MainBackgroundColor;

            Button btnOnIcon = new Button()
            {
@@ -105,26 +106,26 @@
            bodyView.AddChidren(lineView);

            #region 功能介绍
            var functionView = new ListCellView()
            {
                Y = lineView.Bottom,
            };
            bodyView.AddChidren(functionView);
            functionView.BtnTilte.TextID = StringId.FunctionIntroduced;
            Action functionAction = () =>
            {
                var mPage = new FunctionIntroductionPage();
                MainPage.BasePageView.AddChidren(mPage);
                mPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            functionView.GoAction = functionAction;
            //var functionView = new ListCellView()
            //{
            //    Y = lineView.Bottom,
            //};
            //bodyView.AddChidren(functionView);
            //functionView.BtnTilte.TextID = StringId.FunctionIntroduced;
            //Action functionAction = () =>
            //{
            //    var mPage = new FunctionIntroductionPage();
            //    MainPage.BasePageView.AddChidren(mPage);
            //    mPage.LoadPage();
            //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            //};
            //functionView.GoAction = functionAction;
            #endregion

            #region 投诉
            var complaintsView = new ListCellView()
            {
                Y = functionView.Bottom,
                Y = lineView.Bottom,
            };
            bodyView.AddChidren(complaintsView);
            complaintsView.BtnTilte.TextID = StringId.Complaints;
@@ -184,6 +185,43 @@
            #endregion
            privacyPolicyView.GoAction = privacyPolicyAction;
            CheckIfNeedUpdateAsync();

#if __IOS__
            #region 固件升级
            var firUpdateView = new ListCellView()
            {
                Y = privacyPolicyView.Bottom,
            };
            firUpdateView.BtnTilte.TextID = StringId.FirmwareUpdate;
            bodyView.AddChidren(firUpdateView);
            Action firmwareUpdateAction = () =>
            {
                var mPage = new HDL_ON.UI.UI2.PersonalCenter.AboutOn.FirmwareUpdateView();
                MainPage.BasePageView.AddChidren(mPage);
                mPage.ShowPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            firUpdateView.GoAction = firmwareUpdateAction;
            #endregion


            #region HomeKit支持说明
            var homeKitView = new ListCellView()
            {
                Y = firUpdateView.Bottom,
            };
            bodyView.AddChidren(homeKitView);
            homeKitView.BtnTilte.TextID = StringId.SupportHomeKitNotes;
            Action homeKitSupportViewAction = () => {
                var mPage = new HDL_ON.UI.UI2.PersonalCenter.AboutOn.SupportHomeKitNotesPage();
                MainPage.BasePageView.AddChidren(mPage);
                mPage.ShowPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            homeKitView.GoAction = homeKitSupportViewAction;
            #endregion
#endif

        }