修改细节

2021-04-30 21:09:21 +08:00 · 2021-04-30 21:09:21 +08:00 · af34243c28
commit af34243c28
parent 9f4e446850
8 changed files with 1443 additions and 1322 deletions
--- a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab
@ -5517,6 +5517,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: input
      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_ContentType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_KeyboardType
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_CharacterValidation
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
 --- !u!224 &1707200373055839941 stripped
@ -6082,6 +6097,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: input
      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_ContentType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_KeyboardType
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_CharacterValidation
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
 --- !u!224 &8698039831671925482 stripped
@ -6222,6 +6252,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: input
      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_ContentType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_KeyboardType
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_CharacterValidation
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
 --- !u!224 &8698039833564966881 stripped
@ -6362,6 +6407,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: input
      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_ContentType
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_KeyboardType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_CharacterValidation
+      value: 2
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
 --- !u!224 &8698039833552491262 stripped
@ -6692,6 +6752,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: input
      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_ContentType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_KeyboardType
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_CharacterValidation
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
 --- !u!224 &8698039832972322733 stripped
@ -6832,6 +6907,21 @@ PrefabInstance:
      propertyPath: m_Name
      value: input
      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_ContentType
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_KeyboardType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_CharacterValidation
+      value: 2
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
 --- !u!224 &8698039832891251293 stripped
--- a/Assets/Scenes/1-Login.unity
+++ b/Assets/Scenes/1-Login.unity
--- a/Assets/Scripts/Apis/UserApi.cs
+++ b/Assets/Scripts/Apis/UserApi.cs
@ -117,10 +117,9 @@ namespace Assets.Scripts.Apis
        /// 获取个人中心的统计信息
        /// </summary>
        /// <returns></returns>
-        public JsonResult<SummaryResultModel> GetSummary()
+        public async Task<JsonResult<SummaryResultModel>> GetSummary()
        {
-            var result = Get<JsonResult<SummaryResultModel>>("User/GetSummary");
-
+            var result = await GetAsync<JsonResult<SummaryResultModel>>("User/GetSummary");
            return result;
        }

--- a/Assets/Scripts/App.cs
+++ b/Assets/Scripts/App.cs
@ -8,7 +8,7 @@ using System.Net;

 public static class App
 {
-    public static string Host = "http://192.168.0.97:5082/";
+    public static string Host = "http://192.168.0.101:5083/";

    public static string AppVersion = "1.0.0";

--- a/Assets/Scripts/Scenes/LoginController.cs
+++ b/Assets/Scripts/Scenes/LoginController.cs
@ -383,6 +383,8 @@ public class LoginController : MonoBehaviour
                 else
                 {
                     signContainer.gameObject.SetActive(true);
+                     wxLogin1.gameObject.SetActive(false);
+                     wxLogin1.GetComponent<RectTransform>().localPosition = new Vector3(0, -573, 0);
                     pageNums = 4;
                     //wxLogin3.gameObject.SetActive(false);
                     StartScrollPanel(1);
@ -872,7 +874,7 @@ public class LoginController : MonoBehaviour
        userResult.Sex = _genders.SelectedIndex + 1;
        userResult.Country = UIManager.Instance.loginRegOptions.GetCountryName(_countrys.SelectedIndex);
        userResult.Unit = _units.SelectedIndex;
-        userResult.Weight = int.Parse(_weight.Text);
+        userResult.Weight = double.Parse(_weight.Text);
        userResult.Height = int.Parse(_height.Text);
        if (string.IsNullOrEmpty(userResult.Nickname))
        {
--- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
@ -316,9 +316,9 @@ public class EditUserController : PFUIPanel
        }
        user.FTP = int.Parse(mFTP.Text);
        user.Height = int.Parse(mHeight.Text);
-        user.Weight = int.Parse(mWeight.Text);
+        user.Weight = double.Parse(mWeight.Text);
        user.MaxHeartRate = int.Parse(mMHR.Text);
-        user.BicycleWeight = int.Parse(mBW.Text);
+        user.BicycleWeight = double.Parse(mBW.Text);
        user.WheelDiameter = int.Parse(mWD.Text);
        user.Unit = mUnitDropdown.SelectedIndex;
        user.Contact = mName.Text;
@ -334,7 +334,7 @@ public class EditUserController : PFUIPanel
        }
        else
        {
-            App.CurrentUser = user;
+            App.CurrentUser = JObject.FromObject(result.data).ToObject<UserResultModel>();
            var userinfos = UIManager.Instance.userInfos;
            var i = userinfos.FindIndex(x => x.Id == App.CurrentUser.Id);
            if (i != -1)
--- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
@ -170,9 +170,9 @@ public class HomeController : PFUIPanel
            ? App.CurrentUser.LastUpdateFtpTime.ToString("yyyy.MM.dd") 
            : App.CurrentUser.LastUpdateWeightTime.ToString("yyyy.MM.dd");
    }
-    void GetSummary()
+    async void GetSummary()
    {
-        var res = ConfigHelper.userApi.GetSummary();
+        var res = await ConfigHelper.userApi.GetSummary();
        if (res.result)
        {
            //App.CurrentUser.Distance = res.data.TotalDistance;
--- a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
@ -66,14 +66,14 @@ public class UserInfoController : PFUIPanel
            summaryPanel.Find("Panel").Find("RideResultList").GetComponent<ResultListController>().Load();
        }
    }
-    void Load() 
+    async void Load() 
    {
        //if (!App.FromLogin)
        //{
        //    var result = await userApi.Login("15651831367", "123456", "");
        //    App.CurrentUser = result.data;
        //}
-        var r = ConfigHelper.userApi.GetSummary();
+        var r = await ConfigHelper.userApi.GetSummary();
        if (r.result) 
        {
            var summary = r.data;