Merge branch 'dev_lishuo' into dev_cyp
# Conflicts: # Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab # Assets/Scenes/Login-Mobile.unity # Assets/Scenes/Login.unity # Assets/Scripts/App.cs # Assets/Scripts/Editor.meta # Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
This commit is contained in:
commit
190a66bb68
89 files changed
+9195
-1628
No files matched your search
@@ -45,6 +45,13 @@ namespace Assets.Scripts.Apis
|
||||
httpClient = new System.Net.Http.HttpClient(httpClientHandler);
|
||||
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
|
||||
HandleHeaders(httpClient.DefaultRequestHeaders);
|
||||
App.ChangeLanguageEvent += App_ChangeLanguageEvent;
|
||||
}
|
||||
//语言切换
|
||||
private static void App_ChangeLanguageEvent()
|
||||
{
|
||||
httpClient.DefaultRequestHeaders.Remove("Language");
|
||||
httpClient.DefaultRequestHeaders.Add("Language", App.GetLocalLanguage());
|
||||
}
|
||||
|
||||
protected async Task<bool> GetAsFileSync(string url, string fileName)
|
||||
@@ -487,7 +494,7 @@ namespace Assets.Scripts.Apis
|
||||
private void AddLanguage()
|
||||
{
|
||||
httpClient.DefaultRequestHeaders.Remove("Language");
|
||||
httpClient.DefaultRequestHeaders.Add("Language", "en");
|
||||
httpClient.DefaultRequestHeaders.Add("Language", App.GetLocalLanguage());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in new issue
Block a user