From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs | 72 ++++++++++++++----------------------
1 files changed, 28 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index c1bc3e6..5e9e8e3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -17,7 +17,6 @@
}
-
/// <summary>
/// 鍔犺浇鑾峰彇浣忓畢瀛愯处鍙蜂俊鎭嚎绋�
/// </summary>
@@ -52,24 +51,6 @@
waitPage = null;
}
});
-
-#if DEBUG
- residenceMemberInfos.Add(new ResidenceMemberInfo()
- {
- Account = "娴嬭瘯鏁版嵁-璐﹀彿",
- UserName = "娴嬭瘯鏁版嵁-鐢ㄦ埛鍚�",
- Nickname = "娴嬭瘯鏁版嵁-鏄电О",
- SubAccountDistributedMark = Guid.NewGuid().ToString(),
- DistributedMark = Guid.NewGuid().ToString(),
- AccountType = 0,
- IsAllowRemoteCtrl = false,
- });
- Application.RunOnMainThread(() =>
- {
- LoadMemberRow();
- });
-#endif
-
}
})
{ IsBackground = true };
@@ -94,13 +75,20 @@
try
{
var headImageString = dataStr.GetValue("HeadImage").ToString();
- var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
- var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
- var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", mInfo.DistributedMark + ".png");
- fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
- fs.Write(headImageBytes, 0, headImageBytes.Length);
- fs.Flush();
- mInfo.headImagePagePath = filePath;
+ if (!string.IsNullOrEmpty(headImageString))
+ {
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
+ var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
+ var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", mInfo.DistributedMark + ".png");
+ fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
+ fs.Write(headImageBytes, 0, headImageBytes.Length);
+ fs.Flush();
+ mInfo.headImagePagePath = filePath;
+ }
+ if(string.IsNullOrEmpty(mInfo.Nickname))
+ {
+ mInfo.Nickname = mInfo.UserName;
+ }
}
catch (Exception ex)
{
@@ -112,7 +100,7 @@
{
fs.Close();
}
- //-----------
+ //-----------鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
LoadMethod_GetMemberSharedDataList(mInfo);
}
residenceMemberInfos.Add(mInfo);
@@ -149,7 +137,7 @@
var tip = new Tip()
{
Text = tipStr,
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -157,7 +145,7 @@
}
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ waitPage?.Hide();
});
return result;
}
@@ -172,29 +160,27 @@
if (responePack.StateCode.ToUpper() == "SUCCESS")
{
var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.ResponseData.ToString());
- info.sharedDatas = responeObj;
- var sd = responeObj.Find((obj) => obj.HouseDistributedMark == DB_ResidenceData.residenceData.residecenInfo.RegionID );
- if (sd != null)
+ info.CurResidenceShareDate = responeObj;
+ foreach (var sd in info.CurResidenceShareDate)
{
- LoadMethod_GetMemberSharedData(sd,info);
- }
- else
- {
- LoadMethod_GetMemberSharedData(new ShareData(),info);
+ LoadMethod_GetMemberSharedData(sd);
}
}
}
+
/// <summary>
/// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
/// </summary>
/// <param name="info"></param>
- void LoadMethod_GetMemberSharedData(ShareData sd, ResidenceMemberInfo info)
+ bool LoadMethod_GetMemberSharedData(ShareData sd)
{
ResponsePack responePack = new HttpServerRequest().GetShareData(sd.DistributedMark,sd.HouseDistributedMark);
if (responePack.StateCode.ToUpper() == "SUCCESS")
{
- info.CurShareData = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.ResponseData.ToString());
+ sd.ShareDataBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.ResponseData.ToString()).ShareDataBytes;
+ return true;
}
+ return false;
}
/// <summary>
@@ -210,7 +196,7 @@
{
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.NicknameCannotBeEmpty),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
@@ -249,7 +235,7 @@
var tip = new Tip()
{
Text = tipStr,
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -274,7 +260,6 @@
};
btn1.MouseUpEventHandler = eventHandler;
btn2.MouseUpEventHandler = eventHandler;
-
}
/// <summary>
@@ -313,7 +298,7 @@
var tip = new Tip()
{
Text = tipStr,
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -338,6 +323,5 @@
btn2.MouseUpEventHandler = eventHandler;
}
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0