Merge remote-tracking branch 'origin/dev' into dev_lishuo

Assets/Scripts/Apis/ApiBase.cs

@@ -446,7 +446,7 @@ namespace Assets.Scripts.Apis
         private void AddLanguage()
         {
             httpClient.DefaultRequestHeaders.Remove("Language");
-            //httpClient.DefaultRequestHeaders.Add("Language", PubCommData.Lauguage);
+            httpClient.DefaultRequestHeaders.Add("Language", "en");
         }
 
         /// <summary>

Assets/Scripts/Apis/Models/UserResultModel.cs

@@ -69,5 +69,8 @@ namespace Assets.Scripts.Apis.Models
         public DateTime LastUpdateWeightTime { get; set; }
 
         public DateTime LastUpdateBicycleWeightTime { get; set; }
+        public DateTime LastUpdateMaxHeartRate { get; set; }
+        public DateTime LastUpdateWheelStraight { get; set; }
+        public DateTime UpdateTime { get; set; }
     }
 }

Assets/Scripts/Apis/ThirdPartApi.cs

@@ -26,7 +26,9 @@ namespace Assets.Scripts.Apis
         }
         public async Task<Stream> GetMapImage(IpToGeoModel locationInfo) 
         {
-            return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/mapbox/dark-v10/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token=pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA");
+            return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token=pk.eyJ1IjoianV6ZXRlc3QiLCJhIjoiY2ttazhsbnpiMGVrdjJucGhyNnh6eXcxYSJ9.6zj2U9eFCNJRMljNlMxjVg");
+            //pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA
+            //pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA
         }
     }
 }