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

Assets/Scripts/Apis/ApiBase.cs

@@ -106,6 +106,23 @@ namespace Assets.Scripts.Apis
         //{
         //    return http.Get(ConfigHelper.Host + url, query);
         //}
+        protected async Task<string> GetStringAsync(string url)
+        {
+            //var result = await Task.Factory.StartNew(() =>
+            //{
+            //    return Get(url, query);
+            //});
+
+            //return result;
+            AddLanguage();
+            var response = await httpClient.GetAsync(ConfigHelper.Host + url, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
+            return await ParseStringAsync(response);
+        }
+
+        async Task<string> ParseStringAsync(HttpResponseMessage response)
+        {
+            return await response.Content.ReadAsStringAsync();
+        }
 
         protected async Task<T> GetAsync<T>(string url)
         {

Assets/Scripts/Apis/MapApi.cs

@@ -56,11 +56,11 @@ namespace Assets.Scripts.Apis
         /// <param name="sort">hot, distance</param>
         /// <param name="sortDire">asc</param>
         /// <returns></returns>
-        public JsonResult<List<MapRoute>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
+        public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
         {
             var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}";
 
-            return Get<JsonResult<List<MapRoute>>>(url);
+            return GetAsync<JsonResult<List<MapRoute>>>(url);
         }
 
         /// <summary>

Assets/Scripts/Apis/Models/SummaryResultModel.cs

@@ -46,5 +46,7 @@ namespace Assets.Scripts.Apis.Models
         public double CompleteRoute { get; set; }
 
         public string Tips { get; set; }
+
+        
     }
 }

Assets/Scripts/Apis/Models/UserResultModel.cs

@@ -63,5 +63,11 @@ namespace Assets.Scripts.Apis.Models
 
         public string Unionid { get; set; }
         public int Height { get; set; }
+
+        public DateTime LastUpdateFtpTime { get; set; }
+
+        public DateTime LastUpdateWeightTime { get; set; }
+
+        public DateTime LastUpdateBicycleWeightTime { get; set; }
     }
 }

Assets/Scripts/Apis/UserApi.cs

@@ -1,4 +1,5 @@
 using Assets.Scripts.Apis.Models;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -66,6 +67,9 @@ namespace Assets.Scripts.Apis
                     user.ConnectedToStrava = ret.data.ConnectedToStrava;
                 }
                 user.Birthday = ret.data.Birthday;
+                user.LastUpdateFtpTime = ret.data.LastUpdateFtpTime;
+                user.LastUpdateWeightTime = ret.data.LastUpdateWeightTime;
+                user.LastUpdateBicycleWeightTime = ret.data.LastUpdateBicycleWeightTime;
                 //todo: check local database, insert new user
 
                 //PubCommData.CurrentUser = user;
@@ -77,7 +81,37 @@ namespace Assets.Scripts.Apis
                 return new JsonResult<UserResultModel>() { result = false, data = null, errMsg = ret.errMsg };
             }
         }
+        public async Task<JsonResult<object>> LoginV1(string phone, string pwd, string countryCode)
+        {
+            var param = new
+            {
+                Phone = phone,
+                Pwd = pwd,
+                countryCode
+            };
 
+            JsonResult<object> ret = null;
+            try
+            {
+                ret = await PostAsync<JsonResult<object>>("NoAuth/v1/Login", param);
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult<object> { result = false, errMsg = ex.Message };
+            }
+            //ApiBase.cookies = response.Cookies;
+            //var ret = response.DynamicBody;
+            if (ret.result)
+            {
+                var user = JObject.FromObject(ret.data).ToObject<UserResultModel>();
+                user.cookie = cookies[0].Value;
+                return new JsonResult<object>() { result = true, data = user };
+            }
+            else
+            {
+                return new JsonResult<object>() { result = false, data = ret.data, errMsg = ret.errMsg };
+            }
+        }
         /// <summary>
         /// 获取个人中心的统计信息
         /// </summary>
@@ -95,7 +129,7 @@ namespace Assets.Scripts.Apis
 
             return DateTime.Parse(result);
         }
-        public async Task<JsonResult<UserResultModel>> Register(string Phone, string Pwd, string Captcha) 
+        public async Task<JsonResult<object>> Register(string Phone, string Pwd, string Captcha) 
         {
             var param = new
             {
@@ -104,18 +138,31 @@ namespace Assets.Scripts.Apis
                 Captcha
             };
 
-            JsonResult<UserResultModel> ret = null;
+            JsonResult<object> ret = null;
             try
             {
-                ret = await PostAsync<JsonResult<UserResultModel>>("NoAuth/v1/Register", param);
-                ret.data.cookie = cookies[0].Value;
+                ret = await PostAsync<JsonResult<object>>("NoAuth/v1/Register", param);
+                if (ret.result)
+                {
+                    var u = JObject.FromObject(ret.data).ToObject<UserResultModel>();
+                    u.cookie = cookies[0].Value;
+                    return new JsonResult<object> { result = true, data = u,errMsg = ret.errMsg};
+                }
+                else 
+                {
+                    return new JsonResult<object> { result = false,data = ret.data, errMsg = ret.errMsg };
+                }
             }
             catch (Exception ex)
             {
-                return new JsonResult<UserResultModel> { result = false, errMsg = ex.Message };
+                return new JsonResult<object> { result = false, errMsg = ex.Message };
             }
-            return ret;
         }
+        public async Task<string> GetHeadImg(string phone)
+        {
+            return await GetStringAsync($"noauth/getheadimg?phone={phone}");
+        }
+
         public async Task<JsonResult<JObject>> GetCaptcha(string phone) 
         {
             return await PostAsync<JsonResult<JObject>>("NoAuth/v1/GetCaptcha",new {phone });
@@ -154,16 +201,25 @@ namespace Assets.Scripts.Apis
             }
             return r;
         }
-        public async Task<JsonResult<UserResultModel>> OnWebWxLogin(string Phone, string Captcha
+        public async Task<JsonResult<object>> OnWebWxLogin(string Phone, string Captcha
             , string UnionId, string WxWebOpenId, string WxHeadImg, string NickName, int? Sex, string Password)
         {
-            var r = await PostAsync<JsonResult<UserResultModel>>("NoAuth/OnWebWxLogin",
-                new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Password });
-            r.data.cookie = cookies[0].Value;
-            return r;
+            var r = await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLogin",
+                new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Pwd = Password });
+            if (r.result)
+            {
+                var u = JObject.FromObject(r.data);
+                u.Add("cookie", cookies[0].Value);
+                return new JsonResult<object> { result = true, data = u, errMsg = r.errMsg };
+            }
+            else return r;
         }
-        
-        
+        public async Task<JsonResult<object>> AddFeedBack(string content, List<string> files)
+        {
+            var res = Upload("feedback/add", new { content } , files);
+            return Newtonsoft.Json.JsonConvert.DeserializeObject<JsonResult<object>>(res);
+        }
+
         public async Task<JsonResult<JObject>> Update(UserResultModel currUser, string filePath = "")
         {
             //return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {
@@ -223,5 +279,7 @@ namespace Assets.Scripts.Apis
         {
             return await GetAsync<JsonResult<JObject>>("/Home/GetNotify");
         }
+
+        
     }
 }