UserInfoQuery

TastSong · TastSong · commit 0c3ddcd59cbb · 2021-11-25T16:19:14.000+08:00
diff --git a/CrazyCar/Assets/Scripts/Game/PlayerController.cs b/CrazyCar/Assets/Scripts/Game/PlayerController.cs
@@ -21,7 +21,7 @@ private void MakeSelfPlayer() {
         this.GetSystem<IPlayerManagerSystem>().SelfPlayer = Instantiate(mPlayerPrefab, GetStartPosition(), Quaternion.identity);
         MPlayer selfPlayer = this.GetSystem<IPlayerManagerSystem>().SelfPlayer;
         selfPlayer.transform.SetParent(transform, false);
-        selfPlayer.userInfo = this.GetModel<IUserModel>().GetUserInfoPart();
+        selfPlayer.userInfo = this.SendQuery(new UserInfoQuery());
         selfPlayer.UpdateSelfParameter();
         selfPlayer.GetComponent<MPlayerStyle>().ChangeEquip(EquipType.Car,
             this.GetModel<IUserModel>().EquipInfo.Value.eid,
diff --git a/CrazyCar/Assets/Scripts/Model/UserModel.cs b/CrazyCar/Assets/Scripts/Model/UserModel.cs
@@ -33,8 +33,6 @@ public interface IUserModel : IModel {
     void SetUserInfoPart(UserInfo userInfo);
 
     void ParseUserInfo(JsonData jsonData);
-
-    UserInfo GetUserInfoPart();
 }
 
 public class UserModel : AbstractModel, IUserModel {
@@ -50,20 +48,6 @@ public class UserModel : AbstractModel, IUserModel {
     public BindableProperty<EquipInfo> EquipInfo { get; } = new BindableProperty<EquipInfo>();
     public BindableProperty<int> RememberPassword { get; } = new BindableProperty<int>();
 
-    public UserInfo GetUserInfoPart() {
-        UserInfo userInfo = new UserInfo();
-        userInfo.aid = Aid.Value;
-        userInfo.avatarNum = AvatarNum.Value;
-        userInfo.equipInfo = EquipInfo.Value;
-        userInfo.isVIP = IsVIP;
-        userInfo.mapNum = MapNum.Value;
-        userInfo.name = Name.Value;
-        userInfo.star = Star.Value;
-        userInfo.uid = Uid.Value;
-        userInfo.travelTimes = TravelTimes.Value;
-        return userInfo;
-    }
-
     public void ParseUserInfo(JsonData jsonData) {
         Name.Value = (string)jsonData["user_info"]["name"];
         Uid.Value = (int)jsonData["user_info"]["uid"];
diff --git a/CrazyCar/Assets/Scripts/Query.meta b/CrazyCar/Assets/Scripts/Query.meta
diff --git a/CrazyCar/Assets/Scripts/Query/UserInfoQuery.cs b/CrazyCar/Assets/Scripts/Query/UserInfoQuery.cs
@@ -0,0 +1,21 @@
+﻿using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TFramework;
+
+public class UserInfoQuery : AbstractQuery<UserInfo> {
+    public override UserInfo Do() {
+        var info = this.GetModel<IUserModel>();
+        UserInfo userInfo = new UserInfo();
+        userInfo.aid = info.Aid.Value;
+        userInfo.avatarNum = info.AvatarNum.Value;
+        userInfo.equipInfo = info.EquipInfo.Value;
+        userInfo.isVIP = info.IsVIP.Value;
+        userInfo.mapNum = info.MapNum.Value;
+        userInfo.name = info.Name.Value;
+        userInfo.star = info.Star.Value;
+        userInfo.uid = info.Uid.Value;
+        userInfo.travelTimes = info.TravelTimes.Value;
+        return userInfo;
+    }
+}
diff --git a/CrazyCar/Assets/Scripts/Query/UserInfoQuery.cs.meta b/CrazyCar/Assets/Scripts/Query/UserInfoQuery.cs.meta
diff --git a/CrazyCar/Assets/Scripts/UI/Homepage/ProfileUI.cs b/CrazyCar/Assets/Scripts/UI/Homepage/ProfileUI.cs
@@ -25,7 +25,7 @@ public IArchitecture GetArchitecture() {
     }
 
     private void OnEnable() {
-        UserInfo userInfo = this.GetModel<IUserModel>().GetUserInfoPart();       
+        UserInfo userInfo = this.SendQuery(new UserInfoQuery());
         vipImage.gameObject.SetActiveFast(userInfo.isVIP);
         userNameInput.text = userInfo.name;
         starText.text = userInfo.star.ToString();

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public IArchitecture GetArchitecture() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`private void OnEnable() {`
`28`		`- UserInfo userInfo = this.GetModel<IUserModel>().GetUserInfoPart();`
	`28`	`+ UserInfo userInfo = this.SendQuery(new UserInfoQuery());`
`29`	`29`	`vipImage.gameObject.SetActiveFast(userInfo.isVIP);`
`30`	`30`	`userNameInput.text = userInfo.name;`
`31`	`31`	`starText.text = userInfo.star.ToString();`