阿里云日志，注册

wxr

2024-09-27 2a900e186e9ddf97facd33082df063183c7483b8

阿里云日志，注册

阿里云日志增加版本号提示
注册根据中英文选择服务器

 HDL_ON/Common/AliyunLog/AliyunLogClient.cs

@@ -118,7 +118,6 @@
                    LogTags = new Dictionary<string, string>
                    {
                        {"tag1", DateTime.Now.ToLongTimeString()},

                    },
                    Logs = new List<LogInfo>
                    {
@@ -127,7 +126,7 @@
                            Time = DateTimeOffset.Now,
                            Contents = new Dictionary<string, string>
                            {
                                {"id", DateTime.Now.Ticks.ToString()},
                                {"version", MainPage.VersionString},
                                {"userAccount", UserInfo.Current.AccountString},
                                {"userid", UserInfo.Current.ID},
                                {"userName", UserInfo.Current.userName},

 HDL_ON/UI/UI1-Login/RegisterPage.cs

@@ -274,7 +274,6 @@
            };

            new TopViewDiv(this, bodyView, Language.StringByID(StringId.Register)) { maginY = 10 }.LoadTopView(backAction);
            //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.Register));

            #region 注册方式选择
            btnPhoneLogin = new Button()
@@ -760,10 +759,7 @@
                Thread.Sleep(1500);
                Application.RunOnMainThread(() =>
                {
                    ////创建登录线程
                    //var loginThread = LoadThread_Login(account, password);
                    //waitPage = new Loading();
                    //new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
                    //创建登录线程
                    dialog.Close();

                    var isPhone = registerType == 0;
@@ -773,117 +769,5 @@
            { IsBackground = true }.Start();
        }

        //#region 登录线程部分
        ///// <summary>
        ///// 加载登录线程
        ///// </summary>
        //Thread LoadThread_Login(string account,string password)
        //{
        //    var loginThread = new Thread(() =>
        //    {
        //        try
        //        {
        //            //登录
        //            var loginResult = LoadMethod_Login(account,password);
        //            if (loginResult)
        //            {
        //                //获取住宅信息
        //                var getResidencesResult = LoadMethod_GetResidences();
        //                if (getResidencesResult)
        //                {
        //                    /*
        //                     * Wait : 推送注册
        //                     */

        //                    Application.RunOnMainThread(() =>
        //                    {
        //                        waitPage.RemoveFromParent();
        //                        waitPage = null;

        //                        //跳转页面----
        //                        MainPage.GoUserPage();
        //                    });
        //                }
        //            }
        //        }
        //        catch (Exception ex)
        //        {
        //            MainPage.Log($"LoginPage : {ex.Message}");
        //        }
        //    })
        //    { IsBackground = true };
        //    return loginThread;
        //}

        ///// <summary>
        ///// 调用登录接口登录
        ///// </summary>
        //bool LoadMethod_Login(string account, string password)
        //{
        //    var result = false;
        //    //调用登录接口
        //    var loginResult = pm.LoginByPassword(account, password);
        //    if (loginResult.Code == StateCode.SUCCESS)
        //    {
        //        var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
        //        // UserInfo.Current = new UserInfo
        //        //{
        //        //    userType = revertData.userType,
        //        //    accountString = account,
        //        //    password = password,
        //        //    lastTime = DateTime.Now,
        //        //    ID = revertData.userId,
        //        //    loginTokenString = revertData.headerPrefix + revertData.accessToken,
        //        //    refreshToken = revertData.refreshToken,
        //        //    userName = revertData.name
        //        //};
        //        UserInfo.Current.userType = revertData.userType;
        //        UserInfo.Current.AccountString = account;
        //        //UserInfo.Current.password = password;
        //        UserInfo.Current.LastTime = DateTime.Now;
        //        UserInfo.Current.ID = revertData.userId;
        //        UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
        //        UserInfo.Current.RefreshToken = revertData.refreshToken;
        //        UserInfo.Current.userName = revertData.name;

        //        UserInfo.Current.SaveUserInfo();
        //        MainPage.Log("登录成功。");
        //        result = true;
        //    }
        //    else
        //    {
        //        //登录失败
        //        IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
        //        Application.RunOnMainThread(() =>
        //        {
        //            btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
        //            btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
        //        });
        //    }
        //    return result;
        //}

        ///// <summary>
        ///// 获取住宅列表
        ///// </summary>
        //bool LoadMethod_GetResidences()
        //{
        //    var result = false;
        //    var responsePack = pm.GetHomePager();
        //    if (responsePack == StateCode.SUCCESS)
        //    {
        //        //2020-11-13 待确认，没有住宅，不算登录成功
        //        if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
        //        {
        //            result = true;
        //        }
        //    }
        //    else
        //    {
        //        IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
        //    }
        //    return result;
        //}
        //#endregion
    }
}

 HDL_ON/UI/UI1-Login/RegisterPageBLL.cs

@@ -778,33 +778,29 @@
            waitPage.Start(Language.StringByID(StringId.PleaseWait));


            System.Threading.Tasks.Task.Run(async () =>
            {
            System.Threading.Tasks.Task.Run(() => {
                try
                {
                    string country = "CN";

                    try
                    {
                        using (HttpClient client = new HttpClient())
                        {
                            // 使用 ipinfo.io 获取位置信息
                            HttpResponseMessage response = await client.GetAsync("https://ipinfo.io/json");

                            if (response.IsSuccessStatusCode)
                            {
                                string json = await response.Content.ReadAsStringAsync();
                                JObject jsonObject = JObject.Parse(json);

                                // 从返回的 JSON 中提取国家信息
                                country = jsonObject["country"].ToString();
                            }
                        }
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log("Error",$"Error fetching IP info: {ex.StackTrace}");
                    }
                    //string country = "CN";
                    //try
                    //{
                    //    using (HttpClient client = new HttpClient())
                    //    {
                    //        // 使用 ipinfo.io 获取位置信息
                    //        HttpResponseMessage response = await client.GetAsync("https://ipinfo.io/json");
                    //        if (response.IsSuccessStatusCode)
                    //        {
                    //            string json = await response.Content.ReadAsStringAsync();
                    //            JObject jsonObject = JObject.Parse(json);
                    //            // 从返回的 JSON 中提取国家信息
                    //            country = jsonObject["country"].ToString();
                    //        }
                    //    }
                    //}
                    //catch (Exception ex)
                    //{
                    //    MainPage.Log("Error",$"Error fetching IP info: {ex.StackTrace}");
                    //}

                    serverList = new List<GlobalRegionListRes>();
                    var requestJson = HttpUtil.GetSignRequestJson(new GetRegionListObj() { regionMark = HttpUtil.RegionMark });
@@ -819,7 +815,7 @@
                                serverList = responseDataObj;
                                if (serverList.Count > 0)
                                {
                                    if (country == "CN")//if (Language.CurrentLanguage == "Chinese")
                                    if (Language.CurrentLanguage == "Chinese")//if (country == "CN")//
                                    {
                                        var server = serverList.Find((obj) => obj.regionUrl.Contains("china-gateway"));
                                        if (server != null)
@@ -847,9 +843,9 @@
                        IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
                    }
                }
                catch
                catch (Exception ex)
                {

                    MainPage.Log("Error", $"获取服务器异常：{ex.StackTrace}");
                }
                finally
                {