zhangtaotao 6 years ago
parent
commit
c8e5f4ca45

+ 2 - 0
.gitignore

@@ -69,3 +69,5 @@ sample/EasyWeChatClient/EasyWeChatClient/obj/Debug/TemporaryGeneratedFile_036C0B
 sample/EasyWeChatClient/EasyWeChatClient/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
 sample/EasyWeChatClient/EasyWeChatClient/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
 sample/EasyWeChatClient/EasyWeChatClient/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
+/WeChatCore/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+/WeChatCore/.vs/WeChatCore/v15/.suo

+ 1 - 1
WeChatCore/Common/CommonMethodCallBackHandlers.cs

@@ -75,7 +75,7 @@ namespace WeChatCore.Common
             if (SendMsgCompleted != null)
                 SendMsgCompleted.Invoke(e);
             //else
-            //    throw new Exception("未实现方法CommonMethodCallBackHandlers.SendMsgCompleted");
+            //    throw new .Exception("未实现方法CommonMethodCallBackHandlers.SendMsgCompleted");
         }
     }
 }

+ 3 - 2
WeChatCore/Common/MethodsHelper.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
+using WeChatCore.DefineClass;
 
 namespace WeChatCore.Common
 {
@@ -92,8 +93,8 @@ namespace WeChatCore.Common
         /// <returns></returns>
         public static string HeadImageSaveFile(string FilePath,string NickName)
         {
-            if (!Directory.Exists(Environment.CurrentDirectory + "\\" + FilePath))
-                Directory.CreateDirectory(Environment.CurrentDirectory + "\\" + FilePath);
+            if (!Directory.Exists(Environment.CurrentDirectory + "\\" + FilePath+"\\"+ EncryptWithMD5(CommonDefine.BaseContact.User.NickName)))
+                Directory.CreateDirectory(Environment.CurrentDirectory + "\\" + FilePath + "\\" + EncryptWithMD5(CommonDefine.BaseContact.User.NickName));
             return EncryptWithMD5(NickName);
         }
         /// <summary>

+ 13 - 1
WeChatCore/DefineClass/DirectoryDefine.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,6 +12,7 @@ namespace WeChatCore.DefineClass
     /// </summary>
     public class DirectoryDefine
     {
+        static string SystemPath = Environment.CurrentDirectory;
         /// <summary>
         /// 语音消息储存路径
         /// </summary>
@@ -26,7 +28,17 @@ namespace WeChatCore.DefineClass
         /// <summary>
         /// 小图片路径
         /// </summary>
-        public static string ImageMsgTempPath = "Data\\Image\\Temp";
+        public static string ImageMsgTempPath
+        {
+            get
+            {
+                if (!Directory.Exists(SystemPath + "\\Data\\Image\\Temp"))
+                {
+                    Directory.CreateDirectory(SystemPath + "\\Data\\Image\\Temp");
+                }
+                return "Data\\Image\\Temp";
+            }
+        }
         /// <summary>
         /// 头像路径
         /// </summary>

+ 14 - 14
WeChatCore/Entity/AddMsgListItemEntity.cs

@@ -9,19 +9,19 @@ namespace WeChatCore.Entity
     public class AddMsgListItemEntity
     {
         /// <summary>
-        /// 
+        /// 消息id
         /// </summary>
         public string MsgId { get; set; }
         /// <summary>
-        /// 
+        /// 消息来源
         /// </summary>
         public string FromUserName { get; set; }
         /// <summary>
-        /// 
+        /// 发送目标
         /// </summary>
         public string ToUserName { get; set; }
         /// <summary>
-        /// 
+        /// 消息类型
         /// </summary>
         public int MsgType { get; set; }
         /// <summary>
@@ -29,43 +29,43 @@ namespace WeChatCore.Entity
         /// </summary>
         public string Content { get; set; }
         /// <summary>
-        /// 
+        /// 状态
         /// </summary>
         public int Status { get; set; }
         /// <summary>
-        /// 
+        /// 图片状态
         /// </summary>
         public int ImgStatus { get; set; }
         /// <summary>
-        /// 
+        /// 创建时间
         /// </summary>
         public int CreateTime { get; set; }
         /// <summary>
-        /// 
+        /// 语音长度
         /// </summary>
         public int VoiceLength { get; set; }
         /// <summary>
-        /// 
+        /// 播放长度
         /// </summary>
         public int PlayLength { get; set; }
         /// <summary>
-        /// 
+        /// 文件名称
         /// </summary>
         public string FileName { get; set; }
         /// <summary>
-        /// 
+        /// 文件大小
         /// </summary>
         public string FileSize { get; set; }
         /// <summary>
-        /// 
+        /// 媒体ID
         /// </summary>
         public string MediaId { get; set; }
         /// <summary>
-        /// 
+        /// MAP消息URL
         /// </summary>
         public string Url { get; set; }
         /// <summary>
-        /// 
+        /// 公众号、小程序消息类型
         /// </summary>
         public int AppMsgType { get; set; }
         /// <summary>

+ 5 - 5
WeChatCore/Entity/MemberListItemEntity.cs

@@ -246,22 +246,22 @@ namespace WeChatCore.Entity
         public void DownloadImage()
         {
             string uuid = MethodsHelper.HeadImageSaveFile(DirectoryDefine.HeaderImagePath, DisplayNameDef);
-            if (File.Exists(DirectoryDefine.HeaderImagePath + "\\" + uuid + ".jpg"))
+            if (File.Exists(Environment.CurrentDirectory + "\\"+DirectoryDefine.HeaderImagePath + "\\" + MethodsHelper.EncryptWithMD5(CommonDefine.BaseContact.User.NickName) + uuid + ".jpg"))
             {
-                HeadUrlDef = Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + uuid + ".jpg";
+                HeadUrlDef = Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + MethodsHelper.EncryptWithMD5(CommonDefine.BaseContact.User.NickName) + uuid + ".jpg";
                 return;
             }
             if (string.IsNullOrWhiteSpace(HeadUrlDef))
             {
 
-                HttpHelper.HttpMethods.GetFile(UrlDefine.RootUrl + HeadImgUrl, Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + uuid + ".jpg", CommonDefine.Cookies);
+                HttpHelper.HttpMethods.GetFile(UrlDefine.RootUrl + HeadImgUrl, Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + MethodsHelper.EncryptWithMD5(CommonDefine.BaseContact.User.NickName) + uuid + ".jpg", CommonDefine.Cookies);
                 Application.Current.Dispatcher.Invoke(new Action(() =>
                 {
-                    FileInfo fileInfo = new FileInfo(Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + uuid + ".jpg");
+                    FileInfo fileInfo = new FileInfo(Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + MethodsHelper.EncryptWithMD5(CommonDefine.BaseContact.User.NickName) + uuid + ".jpg");
                     if (fileInfo.Length == 0)
                         HeadUrlDef = "pack://application:,,,/WeChatCore;component/Resource/DefultHeader.png";
                     else
-                        HeadUrlDef = Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + uuid + ".jpg";
+                        HeadUrlDef = Environment.CurrentDirectory + "\\" + DirectoryDefine.HeaderImagePath + "\\" + MethodsHelper.EncryptWithMD5(CommonDefine.BaseContact.User.NickName) + uuid + ".jpg";
                 }));
             }
             else

+ 2 - 0
WeChatCore/Entity/MsgEntity.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Documents;
+using Newtonsoft.Json;
 using WeChatCore.Enum;
 
 namespace WeChatCore.Entity
@@ -63,6 +64,7 @@ namespace WeChatCore.Entity
         /// <summary>
         /// 流文档显示
         /// </summary>
+        [JsonIgnore]
         public FlowDocument Document
         {
             get