From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs | 186 +++++++++++++---------------------------------
1 files changed, 54 insertions(+), 132 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..e8b73b7 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 };
@@ -82,25 +63,32 @@
bool LoadMethod_GetResidenceMemberAccount()
{
var result = false;
- ResponsePack responePack = new HttpServerRequest().GetResidenceMemberAccount();
- if (responePack.StateCode.ToUpper() == "SUCCESS")
+ var responePack = new HttpServerRequest().GetResidenceMemberAccount();
+ if (responePack.Code == StateCode.SUCCESS)
{
- var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.ResponseData.ToString());
+ var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
foreach (var mInfo in responeObj)
{
- ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.Account);
- var dataStr = JObject.FromObject(memberInfoResponePack.ResponseData);
- FileStream fs = null;
+ //ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.childAccountId);
+ //var dataStr = JObject.FromObject(memberInfoResponePack.ResponseData);
+ //FileStream fs = null;
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;
+ //var headImageString = dataStr.GetValue("HeadImage").ToString();
+ //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.childAccountId + ".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)
{
@@ -108,11 +96,11 @@
}
finally
{
- if (fs != null)
- {
- fs.Close();
- }
- //-----------
+ //if (fs != null)
+ //{
+ // fs.Close();
+ //}
+ ////-----------鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
LoadMethod_GetMemberSharedDataList(mInfo);
}
residenceMemberInfos.Add(mInfo);
@@ -122,42 +110,17 @@
//澶辫触
else
{
- string tipStr = "Sever erorr";
- switch (responePack.StateCode)
- {
- case "ValidCodeAndPhoneNoEqual":
- tipStr = Language.StringByID(StringId.VerificationCodeError);
- break;
- case "USERNAMEORPWDERROR":
- tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- break;
- case "ACCOUNTNOEXISTS":
- tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
- break;
- case "NoRecord":
- tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
- break;
- case "Self:Net_Error":
- tipStr = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
+ //鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
//璐﹀彿鎴栬�呭瘑鐮侀敊璇�
Application.RunOnMainThread(() =>
{
waitPage.Hide();
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
});
}
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ waitPage?.Hide();
});
return result;
}
@@ -168,33 +131,31 @@
/// <param name="info"></param>
void LoadMethod_GetMemberSharedDataList(ResidenceMemberInfo info)
{
- ResponsePack responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.SubAccountDistributedMark);
- if (responePack.StateCode.ToUpper() == "SUCCESS")
+ var responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.childAccountId);
+ if (responePack.Code == StateCode.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)
+ var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.Data.ToString());
+ 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")
+ var shareDataBytes = new HttpServerRequest().GetShareData(sd);
+ if (shareDataBytes != null)
{
- info.CurShareData = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.ResponseData.ToString());
+ sd.ShareDataBytes = shareDataBytes;
+ return true;
}
+ return false;
}
/// <summary>
@@ -210,7 +171,7 @@
{
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.NicknameCannotBeEmpty),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
@@ -223,37 +184,18 @@
{
try
{
- var responsePack = new HttpServerRequest().EditSubAccountNickName(str,mInfo.SubAccountDistributedMark);
- if (responsePack.StateCode.ToUpper() == "SUCCESS")
+ var responsePack = new HttpServerRequest().EditSubAccountNickName(str, mInfo.childAccountId);
+ if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
{
Application.RunOnMainThread(() =>
{
btn1.Text = str;
});
- mInfo.Nickname = str;
+ mInfo.nickName = str;
}
else
{
- var tipStr = "Server erorr";
- switch (responsePack.StateCode)
- {
- case "NoLogin":
- tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
- break;
- case "ParameterOrEmpty":
- break;
- }
- Application.RunOnMainThread(() =>
- {
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- });
+ IMessageCommon.Current.ShowErrorInfoAlter(responsePack.Code);
}
}
catch (Exception ex)
@@ -270,17 +212,16 @@
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.Nickname, callBack, StringId.HouseNameCannotBeEmpty, 0, new List<string>());
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.nickName, callBack, StringId.HouseNameCannotBeEmpty, 0, new List<string>());
};
btn1.MouseUpEventHandler = eventHandler;
btn2.MouseUpEventHandler = eventHandler;
-
}
/// <summary>
/// 淇敼鍒涘缓鍦烘櫙鏉冮檺
/// </summary>
- void LoadView_ChangeCreateSceneState(Button btn1,Button btn2, ResidenceMemberInfo mInfo)
+ void LoadView_ChangeCreateSceneState(Button btn1, Button btn2, ResidenceMemberInfo mInfo)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
@@ -288,36 +229,18 @@
{
try
{
- var responsePack = new HttpServerRequest().ChangeCreateSceneState(DB_ResidenceData.residenceData.residecenInfo.RegionID, mInfo.SubAccountDistributedMark);
- if (responsePack.StateCode.ToUpper() == "SUCCESS")
+ bool isAllow = !btn1.IsSelected;
+ var responsePack = new HttpServerRequest().ChangeCreateSceneState(isAllow, mInfo.childAccountId);
+ if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
{
Application.RunOnMainThread(() =>
{
- btn1.IsSelected = !btn1.IsSelected;
+ btn1.IsSelected = isAllow;
});
}
else
{
- var tipStr = "Server erorr";
- switch (responsePack.StateCode)
- {
- case "NoLogin":
- tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
- break;
- case "ParameterOrEmpty":
- break;
- }
- Application.RunOnMainThread(() =>
- {
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- });
+ IMessageCommon.Current.ShowErrorInfoAlter(responsePack.Code);
}
}
catch (Exception ex)
@@ -338,6 +261,5 @@
btn2.MouseUpEventHandler = eventHandler;
}
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0