From 5156473bb278de8304605fd15f744de6c0992ec0 Mon Sep 17 00:00:00 2001 From: suntao Date: Fri, 9 Apr 2021 09:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=BC=B9=E6=A1=86=E3=80=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BF=9E=E6=8E=A5=E8=AE=BE=E5=A4=87=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/ANT+_0.png | Bin 0 -> 4575 bytes Assets/Resources/Images/ANT+_0.png.meta | 104 + Assets/Resources/Images/ANT+_1.png | Bin 0 -> 9518 bytes Assets/Resources/Images/ANT+_1.png.meta | 104 + .../Resources/Images/PointerButtonHover.png | Bin 0 -> 364 bytes .../Images/PointerButtonHover.png.meta | 104 + .../User.meta => Resources/Sound.meta} | 2 +- .../Resources/UI/Control/PFUIDropdown.prefab | 2 +- .../UI/Control/PFUIInputField.prefab | 20 +- ...PrimaryButton.prefab => PfUIButton.prefab} | 49 +- ...ton.prefab.meta => PfUIButton.prefab.meta} | 0 Assets/Resources/UI/Prefab/Alert.prefab | 568 +++ Assets/Resources/UI/Prefab/Alert.prefab.meta | 7 + .../Prefab/Device/ConnectDeviceModal.prefab | 252 +- .../UI/Prefab/Home.meta} | 2 +- .../{ => Home}/MainFuncContainer.prefab | 6 +- .../{ => Home}/MainFuncContainer.prefab.meta | 0 .../{ => Home}/MainToolContainer.prefab | 8 +- .../{ => Home}/MainToolContainer.prefab.meta | 0 .../UI/Prefab/{ => Home}/UserInfo.prefab | 344 +- .../UI/Prefab/{ => Home}/UserInfo.prefab.meta | 0 .../UI/Prefab/MapList.meta} | 2 +- .../{Map.prefab => MapList/MapItem.prefab} | 12 +- .../MapItem.prefab.meta} | 0 .../UI/Prefab/Panel/DevicePanel.prefab | 924 ++-- .../UI/Prefab/Panel/EditUserPanel.prefab | 1248 +++-- .../UI/Prefab/Panel/HomePanel.prefab | 4027 ++--------------- .../UI/Prefab/Panel/MapListPanel.prefab | 503 +- .../Resources/UI/Prefab/Panel/MapPanel.prefab | 252 ++ .../UI/Prefab/Panel/MapPanel.prefab.meta | 7 + .../UI/Prefab/Panel/UserInfoPanel.prefab | 18 +- Assets/Scenes/MainScene.unity | 85 +- Assets/Scenes/TestScene.unity | 731 +++ Assets/Scenes/TestScene.unity.meta | 7 + Assets/Scripts/Apis/ApiBase.cs | 4 +- Assets/Scripts/Apis/Models/UserResultModel.cs | 5 + Assets/Scripts/Apis/UserApi.cs | 57 + Assets/Scripts/App.cs | 4 +- Assets/Scripts/Scenes/LoginController.cs | 22 +- Assets/Scripts/Scenes/MainController.cs | 4 +- Assets/Scripts/UI/Control/PFUIDropdown.cs | 77 +- Assets/Scripts/UI/Control/PFUIInputField.cs | 81 +- Assets/Scripts/UI/Control/PfPrimaryButton.cs | 15 - Assets/Scripts/UI/Control/PfUIButton.cs | 229 + ...imaryButton.cs.meta => PfUIButton.cs.meta} | 0 Assets/Scripts/UI/Prefab/Alert.cs | 79 + Assets/Scripts/UI/Prefab/Alert.cs.meta | 11 + .../UI/Prefab/Device/ConnectDeviceModal.cs | 8 +- .../Scripts/UI/Prefab/Login/QuickLoginUser.cs | 22 +- .../MapList/{MapScript.cs => MapItem.cs} | 2 +- .../{MapScript.cs.meta => MapItem.cs.meta} | 0 .../UI/Prefab/Panel/DeviceController.cs | 34 +- .../UI/Prefab/Panel/EditUserController.cs | 157 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 44 +- .../Scripts/UI/Prefab/Panel/MapController.cs | 18 + .../UI/Prefab/Panel/MapController.cs.meta | 11 + .../UI/Prefab/Panel/MapDetailController.cs | 4 +- .../UI/Prefab/Panel/MapListController.cs | 18 +- Assets/Scripts/UI/Prefab/Panel/PFUIPanel.cs | 17 +- Assets/Scripts/UIManager.cs | 80 +- Assets/Scripts/Utils/Utils.cs | 11 + Assets/StreamingAssets.meta | 8 + 62 files changed, 4963 insertions(+), 5447 deletions(-) create mode 100644 Assets/Resources/Images/ANT+_0.png create mode 100644 Assets/Resources/Images/ANT+_0.png.meta create mode 100644 Assets/Resources/Images/ANT+_1.png create mode 100644 Assets/Resources/Images/ANT+_1.png.meta create mode 100644 Assets/Resources/Images/PointerButtonHover.png create mode 100644 Assets/Resources/Images/PointerButtonHover.png.meta rename Assets/{Mapbox/User.meta => Resources/Sound.meta} (77%) rename Assets/Resources/UI/Control/{PfPrimaryButton.prefab => PfUIButton.prefab} (83%) rename Assets/Resources/UI/Control/{PfPrimaryButton.prefab.meta => PfUIButton.prefab.meta} (100%) create mode 100644 Assets/Resources/UI/Prefab/Alert.prefab create mode 100644 Assets/Resources/UI/Prefab/Alert.prefab.meta rename Assets/{NuGet.meta => Resources/UI/Prefab/Home.meta} (77%) rename Assets/Resources/UI/Prefab/{ => Home}/MainFuncContainer.prefab (99%) rename Assets/Resources/UI/Prefab/{ => Home}/MainFuncContainer.prefab.meta (100%) rename Assets/Resources/UI/Prefab/{ => Home}/MainToolContainer.prefab (99%) rename Assets/Resources/UI/Prefab/{ => Home}/MainToolContainer.prefab.meta (100%) rename Assets/Resources/UI/Prefab/{ => Home}/UserInfo.prefab (92%) rename Assets/Resources/UI/Prefab/{ => Home}/UserInfo.prefab.meta (100%) rename Assets/{NuGet/Apis.meta => Resources/UI/Prefab/MapList.meta} (77%) rename Assets/Resources/UI/Prefab/{Map.prefab => MapList/MapItem.prefab} (99%) rename Assets/Resources/UI/Prefab/{Map.prefab.meta => MapList/MapItem.prefab.meta} (100%) create mode 100644 Assets/Resources/UI/Prefab/Panel/MapPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/MapPanel.prefab.meta create mode 100644 Assets/Scenes/TestScene.unity create mode 100644 Assets/Scenes/TestScene.unity.meta delete mode 100644 Assets/Scripts/UI/Control/PfPrimaryButton.cs create mode 100644 Assets/Scripts/UI/Control/PfUIButton.cs rename Assets/Scripts/UI/Control/{PfPrimaryButton.cs.meta => PfUIButton.cs.meta} (100%) create mode 100644 Assets/Scripts/UI/Prefab/Alert.cs create mode 100644 Assets/Scripts/UI/Prefab/Alert.cs.meta rename Assets/Scripts/UI/Prefab/MapList/{MapScript.cs => MapItem.cs} (97%) rename Assets/Scripts/UI/Prefab/MapList/{MapScript.cs.meta => MapItem.cs.meta} (100%) create mode 100644 Assets/Scripts/UI/Prefab/Panel/MapController.cs create mode 100644 Assets/Scripts/UI/Prefab/Panel/MapController.cs.meta create mode 100644 Assets/StreamingAssets.meta diff --git a/Assets/Resources/Images/ANT+_0.png b/Assets/Resources/Images/ANT+_0.png new file mode 100644 index 0000000000000000000000000000000000000000..5941f5637b95ca8d4212e6ea6cb6a7bb36fd7d28 GIT binary patch literal 4575 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 public bool ConnectedToStrava { get; set; } + + public DateTime? Birthday { get; set; } //cookie public string cookie { get; set; } + + + } } diff --git a/Assets/Scripts/Apis/UserApi.cs b/Assets/Scripts/Apis/UserApi.cs index 8e004b9d..cf732663 100644 --- a/Assets/Scripts/Apis/UserApi.cs +++ b/Assets/Scripts/Apis/UserApi.cs @@ -65,6 +65,7 @@ namespace Assets.Scripts.Apis { user.ConnectedToStrava = ret.data.ConnectedToStrava; } + user.Birthday = ret.data.Birthday; //todo: check local database, insert new user //PubCommData.CurrentUser = user; @@ -137,5 +138,61 @@ namespace Assets.Scripts.Apis return await PostAsync>("NoAuth/OnWebWxLogin", new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Password }); } + + + public async Task> Update(UserResultModel currUser, string filePath = "") + { + //return await PostAsync>("User/UpdateUserSetting", new { + // UID = currUser.Id, + // Sex = currUser.Sex, + // currUser.Unit, + // currUser.Weight, + // currUser.FTP, + // currUser.WheelDiameter, + // currUser.Nickname, + // currUser.Country, + // currUser.Province, + // currUser.City, + // currUser.Area, + // currUser.AutoPause, + // currUser.MaxHeartRate, + // currUser.BicycleWeight, + // currUser.Contact, + // currUser.ContactPhone, + // currUser.ContactAddress, + // currUser.Sensitivity, + // imgData = imgData + //}); + var files = new List(); + if (!string.IsNullOrWhiteSpace(filePath)) + { + files.Add(filePath); + } + var res = Upload("v1/User/UpdateUserSetting", new + { + UID = currUser.Id, + Sex = currUser.Sex, + currUser.Unit, + currUser.Weight, + currUser.FTP, + currUser.WheelDiameter, + currUser.Nickname, + currUser.Country, + currUser.Province, + currUser.City, + currUser.Area, + currUser.AutoPause, + currUser.MaxHeartRate, + currUser.BicycleWeight, + currUser.Contact, + currUser.ContactPhone, + currUser.ContactAddress, + currUser.Sensitivity, + currUser.Birthday + //imgData = imgData + }, files); + + return Newtonsoft.Json.JsonConvert.DeserializeObject>(res); + } } } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 8d716d0b..74bf5f1c 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -5,12 +5,12 @@ using UnityEngine; public static class App { - public static string Host = "http://192.168.0.101:5087/"; + public static string Host = "http://192.168.0.97:5082/"; public static string AppVersion = "1.0.0"; public static int RouteIdParam = 0; - public static UserModel CurrentUser { get; set; } + public static UserResultModel CurrentUser { get; set; } public static string WxAppId = "wx9e8ca734e024f084"; public static string WxAppSecret = "906abafb2a18bc7a66ccfa5550f859b6"; } diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 67885f6b..5f27aa30 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -609,17 +609,17 @@ public class LoginController : MonoBehaviour }); PlayerPrefs.SetString("UserInfos", JsonConvert.SerializeObject(userInfos)); } - App.CurrentUser = new UserModel - { - NickName = data.Nickname, - Ftp = data.FTP, - Weight = data.Weight, - BicycleWeight = data.BicycleWeight, - Carlories = "", - Avatar = data.WxHeadImg, - Distance = 0, - Climb = "", - }; + //App.CurrentUser = new UserModel + //{ + // NickName = data.Nickname, + // Ftp = data.FTP, + // Weight = data.Weight, + // BicycleWeight = data.BicycleWeight, + // Carlories = "", + // Avatar = data.WxHeadImg, + // Distance = 0, + // Climb = "", + //}; SceneManager.LoadScene("MainScene"); } async void Submit() diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 612aa7e5..11000cdb 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -7,8 +7,8 @@ public class MainController : MonoBehaviour // Start is called before the first frame update void Start() { - UIManager.Instance.MainPanel = (GameObject)this.transform.Find("Panel").gameObject; - UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").gameObject; + UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent(); + UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent(); //MainMenu.transform.Find("Home").GetComponent