wxr
2024-12-02 ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -46,12 +46,15 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.About));
            topView.maginY = 10;
            topView.LoadTopView();
            this.BackgroundColor = CSS_Color.MainBackgroundColor;
            Button btnOnIcon = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealWidth(106),
                Y = Application.GetRealWidth(106+10),
                Width = Application.GetRealWidth(58),
                Height = Application.GetRealWidth(58),
                UnSelectedImagePath = "OnIcon.png",
@@ -69,10 +72,6 @@
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                IsBold = true,
            };
            if(Language.CurrentLanguage != "Chinese")
            {
                btnOnTitle.Text = "SANTAN Smart Control";
            }
            bodyView.AddChidren(btnOnTitle);
#if DEBUG
@@ -98,6 +97,10 @@
                Text = Language.StringByID(StringId.VersionNumber) + " " + MainPage.VersionString,
            };
            bodyView.AddChidren(btnOnVersion);
            if(HttpUtil.Ins.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
            {
                btnOnVersion.Text += "(Test Server)";
            }
            var lineView = new FrameLayout()
@@ -147,7 +150,7 @@
            {
                Y = complaintsView.Bottom,
            };
            //bodyView.AddChidren(versionUpdateView);
            bodyView.AddChidren(versionUpdateView);
            versionUpdateView.BtnTilte.TextID = StringId.VersionUpdate;
            Action versionUpdateAction = () =>
            {
@@ -161,8 +164,7 @@
            #region 软件服务协议
            var serviceAgreementView = new ListCellView()
            {
                Y = complaintsView.Bottom,
                //Y = versionUpdateView.Bottom,
                Y = versionUpdateView.Bottom,
            };
            bodyView.AddChidren(serviceAgreementView);
            serviceAgreementView.BtnTilte.TextID = StringId.UserAgreement;
@@ -190,26 +192,6 @@
            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
#endif
        }
@@ -219,14 +201,14 @@
        /// </summary>
        void OpenUrl()
        {
            if (!string.IsNullOrEmpty(newAppVersion))
            if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersionUrl.Contains("http"))
            {
                HDLUtils.OpenUrl(newAppVersionUrl);
            }
            else
            {
                Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
            }
            //else
            //{
            //    Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
            //}
        }
        /// <summary>
@@ -236,7 +218,6 @@
        /// <returns></returns>
        void CheckIfNeedUpdateAsync(bool isTip = false)
        {
            return;
            new System.Threading.Thread(() =>
            {
                newAppVersion = CanUpdateAsync();
@@ -304,7 +285,7 @@
                var newVersion = versionResult.version;
                if (newVersion.CompareTo(MainPage.VersionString) > 0)
                {
                    newAppVersionUrl = versionResult.androidUrl;
                    newAppVersionUrl = versionResult.packageUrl;
                    return newVersion;
                }
                return "";
@@ -327,7 +308,7 @@
            try
            {
                var webClient = new WebClient { };
                var result = webClient.DownloadData("https://itunes.apple.com/cn/lookup?id=1532353432");
                var result = webClient.DownloadData("https://itunes.apple.com/cn/lookup?id=1414071090");
                if (result == null)
                {
                    return null;
@@ -351,7 +332,7 @@
        /// 检测新版本
        /// </summary>
        /// <returns>The https app version async.</returns>
        private AppVersionRes CheckAppVersion()
        private AppVersionResNew CheckAppVersion()
        {
            try
            {
@@ -363,7 +344,7 @@
                        return null;
                    }
                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(result.Data.ToString());
                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(result.Data.ToString());
                    return responeData;
                }
                return null;