Merge pull request #22 from timi137137/develop

Fix can't use request event bug

AuroraNative/Attributes/RequestTypeAttribute.cs

@@ -0,0 +1,72 @@
+using AuroraNative.Enum;
+using System;
+
+namespace AuroraNative.Attributes
+{
+    /// <summary>
+    /// 请求事件 特性
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method)]
+    [PostType(PostType.Request)]
+    public class RequestTypeAttribute : Base, IEquatable<RequestTypeAttribute>
+    {
+        #region --属性--
+
+        /// <summary>
+        /// 请求事件 枚举
+        /// </summary>
+        public RequestType RequestType { get => Utils.GetEnumByDescription<RequestType>(Type); set => Type = value.ToString(); }
+
+        #endregion
+
+        #region --构造函数--
+
+        /// <summary>
+        /// 请求事件类型构造函数，初始化 <see cref="Base"/> 类的实例
+        /// </summary>
+        /// <param name="RequestType">请求事件类型</param>
+        public RequestTypeAttribute(RequestType RequestType)
+        {
+            this.RequestType = RequestType;
+        }
+
+        #endregion
+
+        #region --公开函数--
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as MessageTypeAttribute);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        public bool Equals(RequestTypeAttribute other)
+        {
+            if (other != null)
+            {
+                return RequestType == other.RequestType;
+            }
+            return false;
+        }
+
+        #endregion
+    }
+}

AuroraNative/AuroraNative.csproj

@@ -15,13 +15,13 @@
     <SignAssembly>false</SignAssembly>
     <DelaySign>false</DelaySign>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AssemblyVersion>1.1.3.0415</AssemblyVersion>
-    <FileVersion>1.1.3.0415</FileVersion>
+    <AssemblyVersion>1.2.0.0503</AssemblyVersion>
+    <FileVersion>1.2.0.0503</FileVersion>
     <PackageIcon>Icon.png</PackageIcon>
     <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
     <AssemblyName>AuroraNative</AssemblyName>
     <RootNamespace>AuroraNative</RootNamespace>
-    <Version>1.1.3-Beta</Version>
+    <Version>1.2.0-Beta</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>

AuroraNative/Enum/RequestType.cs

@@ -0,0 +1,17 @@
+namespace AuroraNative.Enum
+{
+    /// <summary>
+    /// 请求事件 枚举
+    /// </summary>
+    public enum RequestType
+    {
+        /// <summary>
+        /// 加好友
+        /// </summary>
+        friend = 1,
+        /// <summary>
+        /// 加群
+        /// </summary>
+        group = 2
+    }
+}

AuroraNative/Utils/Event.cs

@@ -1,4 +1,5 @@
-using AuroraNative.Enum;
+using AuroraNative.Attributes;
+using AuroraNative.Enum;
 using AuroraNative.EventArgs;
 using AuroraNative.WebSockets;
 using Newtonsoft.Json.Linq;
@@ -60,13 +61,15 @@ public virtual void GroupMessage(GroupMessageArgs e) { }
         /// </summary>
         /// <param name="e">好友请求参数</param>
         [PostType(PostType.Request)]
+        [RequestType(RequestType.friend)]
         public virtual void FriendAddRequest(FriendAddRequsetArgs e) { }
 
         /// <summary>
         /// 请求事件 - 群请求
         /// </summary>
         /// <param name="e">群请求参数</param>
         [PostType(PostType.Request)]
+        [RequestType(RequestType.group)]
         public virtual void GroupAddRequest(GroupAddRequestArgs e) { }
 
         #endregion