完成小头像管理器,优化我的信息头像加载器,v1.6.13

This commit is contained in:
dathlin
2017-10-14 21:21:33 +08:00
parent d43866b443
commit 2a3a0c5f98
12 changed files with 415 additions and 427 deletions

View File

@@ -13,6 +13,7 @@ using HslCommunication;
using HslCommunication.BasicFramework;
using System.IO;
using ClientsLibrary.FileSupport;
using Newtonsoft.Json.Linq;
namespace ClientsLibrary
{
@@ -21,11 +22,10 @@ namespace ClientsLibrary
#region Constructor
public FormAccountDetails(UserPortrait userPortrait)
public FormAccountDetails()
{
InitializeComponent();
Icon = UserClient.GetFormWindowIcon();
UserPortrait = userPortrait;
}
#endregion
@@ -107,47 +107,202 @@ namespace ClientsLibrary
#region Load Portrait
public UserPortrait UserPortrait { get; }
private void pictureBox_UserPortrait_Click(object sender, EventArgs e)
{
UserPortrait.ChangePortrait(LoadLargeProtrait,UnloadLargeProtrait);
// UserPortrait.ChangePortrait(LoadLargeProtrait,UnloadLargeProtrait);
using (FormPortraitSelect fps = new FormPortraitSelect())
{
if (fps.ShowDialog() == DialogResult.OK)
{
string FileSavePath = Application.StartupPath + @"\Portrait\" + UserClient.UserAccount.UserName;
string path300 = FileSavePath + @"\" + PortraitSupport.LargePortrait;
string path32 = FileSavePath + @"\" + PortraitSupport.SmallPortrait;
Bitmap bitmap300 = fps.GetSpecifiedSizeImage(300);
Bitmap bitmap32 = fps.GetSpecifiedSizeImage(32);
try
{
bitmap300.Save(path300, System.Drawing.Imaging.ImageFormat.Png);
bitmap32.Save(path32, System.Drawing.Imaging.ImageFormat.Png);
bitmap32.Dispose();
bitmap300.Dispose();
}
catch (Exception ex)
{
// 文件被占用的时候无法进行覆盖
UserClient.LogNet?.WriteException("头像保存失败!", ex);
MessageBox.Show("头像保存失败,原因:" + ex.Message);
// 加载回旧的文件
pictureBox_UserPortrait.Load(path300);
return;
}
// 传送服务器
using (FormFileOperate ffo = new FormFileOperate(
UserClient.Net_File_Client,
new string[]
{
path300,
path32
}, "Files", "Portrait", UserClient.UserAccount.UserName))
{
ffo.ShowDialog();
}
ThreadPool.QueueUserWorkItem(new WaitCallback(obj =>
{
// 上传文件MD5码
string SmallPortraitMD5 = "";
string LargePortraitMD5 = "";
try
{
SmallPortraitMD5 = SoftBasic.CalculateFileMD5(path32);
LargePortraitMD5 = SoftBasic.CalculateFileMD5(path300);
}
catch (Exception ex)
{
UserClient.LogNet.WriteException("获取文件MD5码失败", ex);
MessageBox.Show("文件信息确认失败,请重新上传!");
return;
}
JObject json = new JObject
{
{ UserAccount.UserNameText, new JValue(UserClient.UserAccount.UserName) },
{ UserAccount.SmallPortraitText, new JValue(SmallPortraitMD5) },
{ UserAccount.LargePortraitText, new JValue(LargePortraitMD5) }
};
OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode.MD5,
json.ToString());
if (result.IsSuccess)
{
if (result.Content.Substring(0, 2) == "成功")
{
UserClient.UserAccount.SmallPortraitMD5 = SmallPortraitMD5;
UserClient.UserAccount.LargePortraitMD5 = LargePortraitMD5;
}
else
{
MessageBox.Show("上传头像失败!原因:" + result.Content);
}
}
else
{
MessageBox.Show("上传头像失败!原因:" + result.Message);
}
// 先显示信息
try
{
pictureBox_UserPortrait.Image = new Bitmap(new System.IO.MemoryStream(File.ReadAllBytes(path300)));
}
catch
{
}
}),
null
);
}
}
}
private void ThreadPoolLoadLargePortrait(object obj)
{
Thread.Sleep(200);
UserPortrait.LoadUserLargePortraint(LoadLargeProtrait, UnloadLargeProtrait);
}
private void UnloadLargeProtrait()
{
if (IsHandleCreated && InvokeRequired)
// 先获取服务器端的MD5码
string fileServerMd5 = UserClient.UserAccount.LargePortraitMD5;
if (string.IsNullOrEmpty(fileServerMd5))
{
BeginInvoke(new Action(() =>
{
UnloadLargeProtrait();
}));
return;
return; // 没有文件
}
pictureBox_UserPortrait.Image = null;
}
private void LoadLargeProtrait(string fileName)
{
if (IsHandleCreated && InvokeRequired)
string fileName = Application.StartupPath + @"\Portrait\" + UserClient.UserAccount.UserName + @"\" + PortraitSupport.LargePortrait;
if(File.Exists(fileName))
{
BeginInvoke(new Action(() =>
bool loadSuccess = false;
Invoke(new Action(() =>
{
LoadLargeProtrait(fileName);
try
{
pictureBox_UserPortrait.Image = new Bitmap(new MemoryStream(File.ReadAllBytes(fileName)));
loadSuccess = true;
}
catch
{
}
}));
return;
if (!loadSuccess) goto P1; // 加载不成功,直接重新下载
// 计算md5
string md5 = string.Empty;
try
{
md5 = SoftBasic.CalculateFileMD5(fileName);
}
catch
{
}
if(md5 == UserClient.UserAccount.LargePortraitMD5)
{
return;
}
}
P1:
MemoryStream ms = new MemoryStream();
OperateResult result = UserClient.Net_File_Client.DownloadFile(
PortraitSupport.LargePortrait,
"Files",
"Portrait",
UserClient.UserAccount.UserName,
null,
ms
);
if(result.IsSuccess)
{
if(IsHandleCreated) Invoke(new Action(() =>
{
// 下载完成
Bitmap bitmap = new Bitmap(ms);
pictureBox_UserPortrait.Image = bitmap;
try
{
bitmap.Save(fileName);
}
catch
{
}
}));
}
else
{
// 下载异常,丢弃
}
pictureBox_UserPortrait.ImageLocation = fileName;
ms.Dispose();
}
#endregion

View File

@@ -26,7 +26,7 @@ namespace ClientsLibrary
/// <summary>
/// 头像管理
/// 头像管理器,负责所有小头像数据的缓存
/// </summary>
public class UserPortrait
{
@@ -37,7 +37,7 @@ namespace ClientsLibrary
/// </summary>
/// <param name="filePath">头像存储的文件夹路径</param>
/// <param name="loadPicSmall">加载头像的委托</param>
public UserPortrait(string filePath, Action<Bitmap> loadPicSmall)
public UserPortrait(string filePath)
{
if (!System.IO.Directory.Exists(filePath))
{
@@ -45,229 +45,10 @@ namespace ClientsLibrary
}
FileSavePath = filePath;
m_LoadPicSmall = loadPicSmall;
}
#endregion
#region Change Portrait
/// <summary>
/// 点击更改头像后的操作打开头像选择对话框获取到2种分辨率的头像然后进行上传
/// </summary>
/// <param name="loadPic">加载大头像的委托</param>
/// <param name="unloadPic">卸载大头像的委托</param>
public void ChangePortrait(Action<string> loadPic, Action unloadPic)
{
using (FormPortraitSelect fps = new FormPortraitSelect())
{
if (fps.ShowDialog() == DialogResult.OK)
{
string path300 = FileSavePath + @"\" + PortraitSupport.LargePortrait;
string path32 = FileSavePath + @"\" + PortraitSupport.SmallPortrait;
// 先卸载图片
unloadPic?.Invoke();
Bitmap bitmap300 = fps.GetSpecifiedSizeImage(300);
Bitmap bitmap32 = fps.GetSpecifiedSizeImage(32);
try
{
bitmap300.Save(path300);
bitmap32.Save(path32);
bitmap32.Dispose();
bitmap300.Dispose();
}
catch(Exception ex)
{
// 文件被占用的时候无法进行覆盖
UserClient.LogNet?.WriteException("头像保存失败!", ex);
MessageBox.Show("头像保存失败,原因:" + ex.Message);
// 加载回旧的文件
loadPic?.Invoke(path300);
return;
}
// 传送服务器
using (FormFileOperate ffo = new FormFileOperate(
UserClient.Net_File_Client,
new string[]
{
path300,
path32
}, "Files", "Portrait", UserClient.UserAccount.UserName))
{
ffo.ShowDialog();
}
ThreadPool.QueueUserWorkItem(new WaitCallback(obj =>
{
// 上传文件MD5码
string SmallPortraitMD5 = "";
string LargePortraitMD5 = "";
try
{
SmallPortraitMD5 = SoftBasic.CalculateFileMD5(path32);
LargePortraitMD5 = SoftBasic.CalculateFileMD5(path300);
}
catch(Exception ex)
{
UserClient.LogNet.WriteException("获取文件MD5码失败", ex);
MessageBox.Show("文件信息确认失败,请重新上传!");
return;
}
JObject json = new JObject
{
{ UserAccount.UserNameText, new JValue(UserClient.UserAccount.UserName) },
{ UserAccount.SmallPortraitText, new JValue(SmallPortraitMD5) },
{ UserAccount.LargePortraitText, new JValue(LargePortraitMD5) }
};
OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode.MD5,
json.ToString());
if (result.IsSuccess)
{
if (result.Content.Substring(0, 2) == "成功")
{
UserClient.UserAccount.SmallPortraitMD5 = SmallPortraitMD5;
UserClient.UserAccount.LargePortraitMD5 = LargePortraitMD5;
}
else
{
MessageBox.Show("上传头像失败!原因:" + result.Content);
}
}
else
{
MessageBox.Show("上传头像失败!原因:" + result.Message);
}
// 先显示信息
loadPic?.Invoke(path300);
LoadUserSmallPortraint();
}), null);
}
}
}
#endregion
#region Load Portraint
public static Bitmap DownloadSmallPortraint(string userName)
{
Bitmap bitmap = null;
System.IO.MemoryStream ms = new System.IO.MemoryStream();
OperateResult result = UserClient.Net_File_Client.DownloadFile(
PortraitSupport.SmallPortrait,
"Files",
"Portrait",
userName,
null,
ms
);
if (result.IsSuccess)
{
bitmap = new Bitmap(ms);
}
else
{
bitmap = Properties.Resources.person_1;
}
ms.Dispose();
return bitmap;
}
/// <summary>
/// 加载小尺寸的头像操作,需要放置到线程池中
/// </summary>
public void LoadUserSmallPortraint()
{
m_LoadPicSmall?.Invoke(DownloadSmallPortraint(UserClient.UserAccount.UserName));
}
/// <summary>
/// 加载大尺寸的头像方法,需要放到线程池中操作
/// </summary>
/// <param name="largeLoadAction"></param>
public void LoadUserLargePortraint(Action<string> largeLoadAction, Action largeUnloadAction)
{
// 先获取服务器端的MD5码
string fileMd5 = UserClient.UserAccount.LargePortraitMD5;
if (string.IsNullOrEmpty(fileMd5))
{
// 服务器端没有文件,加载结束
return;
}
// 获取本地MD5
string fileName = FileSavePath + @"\" + PortraitSupport.LargePortrait;
if (System.IO.File.Exists(fileName))
{
// 本地存在文件,先进行加载,如果运算不一致,再重新加载
largeLoadAction?.Invoke(fileName);
string currentMd5 = null;
try
{
currentMd5 = SoftBasic.CalculateFileMD5(fileName);
}
catch(Exception ex)
{
MessageBox.Show("计算文件MD5码错误" + ex.Message);
return;
}
// 对比验证
if (fileMd5 == currentMd5)
{
return;
}
}
largeUnloadAction?.Invoke();
// 本地不存在文件或校验失败,需要重新下载
OperateResult result = UserClient.Net_File_Client.DownloadFile(PortraitSupport.LargePortrait,
"Files",
"Portrait",
UserClient.UserAccount.UserName,
null,
fileName);
if (result.IsSuccess)
{
// 下载成功
largeLoadAction?.Invoke(fileName);
}
else
{
MessageBox.Show("头像从服务器下载失败,错误原因:" + result.Message);
}
}
#endregion
#region Download Portraint
@@ -323,19 +104,62 @@ namespace ClientsLibrary
#endregion
#region Public Method
/// <summary>
///
/// </summary>
/// <returns></returns>
public string GetLargePortraitFileName()
#region Pricvate Method
private void SetSmallPortrait(string name,Bitmap bitmap)
{
return FileSavePath + @"\" + PortraitSupport.LargePortrait;
hybirdLock.Enter();
if(dictSmallPortrait.ContainsKey(name))
{
dictSmallPortrait[name] = bitmap;
}
else
{
dictSmallPortrait.Add(name, bitmap);
}
hybirdLock.Leave();
}
public string GetSmallPortraitFileName()
private Bitmap DownloadSmallPortraitByName(string name)
{
return FileSavePath + @"\" + PortraitSupport.SmallPortrait;
OperateResult result = UserClient.Net_File_Client.DownloadFile(
PortraitSupport.SmallPortrait,
"Files",
"Portrait",
name,
null,
out Bitmap bitmap);
if (result.IsSuccess)
{
SetSmallPortrait(name, bitmap);
return bitmap;
}
else
{
return Properties.Resources.person_1;
}
}
public void UpdateSmallPortraitByName(string name)
{
DownloadSmallPortraitByName(name);
}
public Bitmap GetSmallPortraitByUserName(string name)
{
Bitmap bitmap = null;
hybirdLock.Enter();
if (dictSmallPortrait.ContainsKey(name))
{
bitmap = dictSmallPortrait[name];
}
hybirdLock.Leave();
if (bitmap != null) return bitmap;
return DownloadSmallPortraitByName(name);
}
#endregion
@@ -346,11 +170,9 @@ namespace ClientsLibrary
/// 文件的路径
/// </summary>
private string FileSavePath { get; set; }
/// <summary>
/// 加载小头像的委托
/// </summary>
private Action<Bitmap> m_LoadPicSmall { get; set; }
private Dictionary<string, Bitmap> dictSmallPortrait = new Dictionary<string, Bitmap>();
private SimpleHybirdLock hybirdLock = new SimpleHybirdLock();
#endregion
}

View File

@@ -77,33 +77,14 @@ namespace ClientsLibrary.BasicSupport
// 向服务器请求小头像
if (m_NetAccount != null)
{
try
{
System.IO.MemoryStream ms = new System.IO.MemoryStream();
Bitmap bitmap = UserClient.PortraitManager.GetSmallPortraitByUserName(m_NetAccount.UserName);
HslCommunication.OperateResult result = UserClient.Net_File_Client.DownloadFile(
PortraitSupport.SmallPortrait,
"Files",
"Portrait",
m_NetAccount.UserName,
null,
ms
);
if (result.IsSuccess)
{
Bitmap bitmap = new Bitmap(ms);
pictureBox1.Image = bitmap;
}
else
{
// 可能网络错误,也可能因为服务器没有头像
// MessageBox.Show(result.Message);
pictureBox1.Image = Properties.Resources.person_1;
}
}
catch (Exception ex)
if(IsHandleCreated)
{
MessageBox.Show(ex.Message);
Invoke(new Action(() =>
{
pictureBox1.Image = bitmap;
}));
}
}
}

View File

@@ -36,7 +36,7 @@ namespace ClientsLibrary
/// <summary>
/// 本软件的当前版本,用来验证更新的关键依据
/// </summary>
public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171013");
public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171014");
/// <summary>
@@ -133,8 +133,10 @@ namespace ClientsLibrary
return false;
}
/// <summary>
/// 头像管理器
/// </summary>
public static UserPortrait PortraitManager { get; set; }