wxr
2024-10-28 ae95e3f4b9cbc1e7be2773068e28e2ac911c48c4
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,12 +815,13 @@
                                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)
                                        {
                                            OnAppConfig.Instance.GlobalRegion = server;
                                            OnAppConfig.Instance.RequestHttpsHost = server.regionUrl;
                                            SetServerText();
                                        }
                                    }
@@ -834,6 +831,7 @@
                                        if (server != null)
                                        {
                                            OnAppConfig.Instance.GlobalRegion = server;
                                            OnAppConfig.Instance.RequestHttpsHost = server.regionUrl;
                                            SetServerText();
                                        }
                                    }
@@ -847,9 +845,9 @@
                        IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
                    }
                }
                catch
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"获取服务器异常:{ex.StackTrace}");
                }
                finally
                {