Merge branch 'dev_language' into dev_release

# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab
#	Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab

Assets/Scripts/Apis/ApiBase.cs

@@ -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)
@@ -96,7 +103,7 @@ namespace Assets.Scripts.Apis
             //yield return request.Send();
 
             var client = new HttpClient(httpClientHandler);
-            client.DefaultRequestHeaders.Add("Language", "en");
+            //client.DefaultRequestHeaders.Add("Language", "en");
             HandleHeaders(client.DefaultRequestHeaders);
 
             var result = await client.GetByteArrayAsync(_url).ConfigureAwait(false);
@@ -116,6 +123,8 @@ namespace Assets.Scripts.Apis
             defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion));
 #endif
             defaultRequestHeaders.Add("deviceUniqueIdentifier", SystemInfo.deviceUniqueIdentifier);
+            defaultRequestHeaders.Remove("Language");
+            defaultRequestHeaders.Add("Language", App.GetLocalLanguage());
         }
 
         protected async Task<byte[]> GetUrlAsync(string url)
@@ -487,7 +496,7 @@ namespace Assets.Scripts.Apis
         private void AddLanguage()
         {
             httpClient.DefaultRequestHeaders.Remove("Language");
-            httpClient.DefaultRequestHeaders.Add("Language", "en");
+            httpClient.DefaultRequestHeaders.Add("Language", App.GetLocalLanguage());
         }
 
         /// <summary>

Assets/Scripts/Apis/JsonResult.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,6 +15,10 @@ namespace Assets.Scripts.Apis
         //public dynamic data { get; set; }
         public string errMsg { get; set; }
         public JArray errFieldMsg { get; set; }
+        public override string ToString()
+        {
+            return JsonConvert.SerializeObject(this);
+        }
     }
 
     public class JsonResult<T> : JsonResult