|
@@ -30,7 +30,8 @@ public class LoginDataManager:Singleton<LoginDataManager>
|
|
|
adata = new AccountData();
|
|
|
adata.number = testAclist[i];
|
|
|
adata.name = testAclist[i];
|
|
|
- adata.avatar = Application.streamingAssetsPath + "/icon/" + i + ".png";
|
|
|
+ adata.avatar = new AccountAvatar();
|
|
|
+ adata.avatar.path = Application.streamingAssetsPath + "/icon/" + i + ".png";
|
|
|
ldata.Add(adata);
|
|
|
}
|
|
|
}
|
|
@@ -42,6 +43,7 @@ public class LoginDataManager:Singleton<LoginDataManager>
|
|
|
{
|
|
|
Debug.Log("DGJ ==> "+ jObject["data"]["list"].ToString());
|
|
|
|
|
|
+ Debug.Log(JsonConvert.DeserializeObject<List<AccountData2>>(jObject["data"]["list"].ToString()).Count);
|
|
|
ldata.AddRange(JsonConvert.DeserializeObject<List<AccountData>>(jObject["data"]["list"].ToString()));
|
|
|
Debug.Log(ldata.Count);
|
|
|
WindowsManager.Instance.StartCoroutine(testBack(callback));
|
|
@@ -80,7 +82,7 @@ public class LoginDataManager:Singleton<LoginDataManager>
|
|
|
adata = new AccountData();
|
|
|
adata.number = data[i]["number"].ToString();
|
|
|
adata.name = data[i]["name"].ToString();
|
|
|
- adata.avatar = data[i]["avatar"].ToString();
|
|
|
+ adata.avatar.path = data[i]["avatar"].ToString();
|
|
|
adata.phone = data[i]["phone"].ToString();
|
|
|
OftenUseldata.Add(adata);
|
|
|
}
|
|
@@ -110,6 +112,7 @@ public class LoginDataManager:Singleton<LoginDataManager>
|
|
|
{
|
|
|
yield return null;
|
|
|
callback.Invoke(OftenUseldata);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
@@ -120,7 +123,7 @@ public class LoginDataManager:Singleton<LoginDataManager>
|
|
|
accData["name"] = adata.name;
|
|
|
accData["phone"] = adata.phone;
|
|
|
accData["number"] = adata.number;
|
|
|
- accData["avatar"] = adata.avatar;
|
|
|
+ accData["avatar"] = JsonConvert.SerializeObject(adata.avatar);
|
|
|
int index = checkData(accData);
|
|
|
|
|
|
JsonData accDataNew = new JsonData();
|
|
@@ -168,5 +171,19 @@ public class AccountData
|
|
|
public string name { get; set; }
|
|
|
public string phone { get; set; }
|
|
|
public string number { get; set; }
|
|
|
- public string avatar { get; set; }
|
|
|
+ public AccountAvatar avatar { get; set; }
|
|
|
}
|
|
|
+public class AccountData2
|
|
|
+{
|
|
|
+ public string name { get; set; }
|
|
|
+ public string phone { get; set; }
|
|
|
+ public string number { get; set; }
|
|
|
+ public AccountAvatar avatar { get; set; }
|
|
|
+}
|
|
|
+
|
|
|
+public class AccountAvatar
|
|
|
+{
|
|
|
+ public int id { get; set; }
|
|
|
+ public string name { get; set; }
|
|
|
+ public string path { get; set; }
|
|
|
+}
|