Skip to content
This repository was archived by the owner on Mar 19, 2020. It is now read-only.

Commit dfbf519

Browse files
Jie2GGJie2GG
authored
Merge pull request #40 from Jie2GG/Test
V2.0.6.0607
2 parents 0c86553 + c10f737 commit dfbf519

73 files changed

Lines changed: 58222 additions & 1947 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Native.Basic/App/Core/LibExport.tt‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,20 @@ Imports Native.Basic.App.Interface
1616
Imports Native.Basic.Repair
1717
Imports Native.Csharp.Sdk.Cqp
1818
Imports Native.Csharp.Sdk.Cqp.Enum
19-
Imports Native.Csharp.Tool
19+
Imports Native.Csharp.Sdk.Cqp.Other
2020
Imports Unity
2121

2222
Namespace App.Core
2323
Public Class LibExport
24+
25+
Private Shared Property DefaultEncoding As Encoding
2426

25-
''' <summary>
27+
''' <summary>
2628
''' 静态构造函数, 初始化应用基础服务
2729
''' </summary>
2830
Shared Sub New()
31+
DefaultEncoding = Encoding.GetEncoding("GB18030")
32+
2933
' 初始化 Costura
3034
CosturaUtility.Initialize ()
3135

@@ -296,7 +300,7 @@ Namespace App.Core
296300
Dim args As PrivateMessageEventArgs = New PrivateMessageEventArgs()
297301
args.MsgId = msgId
298302
args.FromQQ = fromQQ
299-
args.Msg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
303+
args.Msg = msg.ToString(DefaultEncoding)
300304
args.Handled = False
301305

302306
If subType = 11 Then
@@ -320,7 +324,7 @@ Namespace App.Core
320324
args.MsgId = msgId
321325
args.FromGroup = fromGroup
322326
args.FromQQ = fromQQ
323-
args.Msg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
327+
args.Msg = msg.ToString(DefaultEncoding)
324328
args.FromAnonymous = Nothing
325329
args.IsAnonymousMsg = False
326330
args.Handled = False
@@ -345,7 +349,7 @@ Namespace App.Core
345349
args.MsgId = msgId
346350
args.FromDiscuss = fromDiscuss
347351
args.FromQQ = fromQQ
348-
args.Msg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
352+
args.Msg = msg.ToString(DefaultEncoding)
349353
args.Handled = False
350354

351355
If subType = 1 Then
@@ -360,7 +364,7 @@ Namespace App.Core
360364
<DllExport(ExportName:="_eventGroupUpload", CallingConvention:=CallingConvention.StdCall)>
361365
Private Shared Function EventGroupUpload(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal file As String) As Integer
362366
Dim args As FileUploadMessageEventArgs = New FileUploadMessageEventArgs()
363-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
367+
args.SendTime = sendTime.ToDateTime()
364368
args.FromGroup = fromGroup
365369
args.FromQQ = fromQQ
366370
args.File = Common.CqApi.GetFile(file)
@@ -371,7 +375,7 @@ Namespace App.Core
371375
<DllExport(ExportName:="_eventSystem_GroupAdmin", CallingConvention:=CallingConvention.StdCall)>
372376
Private Shared Function EventSystemGroupAdmin(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal beingOperateQQ As Long) As Integer
373377
Dim args As GroupManageAlterEventArgs = New GroupManageAlterEventArgs()
374-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
378+
args.SendTime = sendTime.ToDateTime()
375379
args.FromGroup = fromGroup
376380
args.BeingOperateQQ = beingOperateQQ
377381
args.Handled = False
@@ -390,7 +394,7 @@ Namespace App.Core
390394
<DllExport(ExportName:="_eventSystem_GroupMemberDecrease", CallingConvention:=CallingConvention.StdCall)>
391395
Private Shared Function EventSystemGroupMemberDecrease(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal beingOperateQQ As Long) As Integer
392396
Dim args As GroupMemberAlterEventArgs = New GroupMemberAlterEventArgs()
393-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
397+
args.SendTime = sendTime.ToDateTime()
394398
args.FromGroup = fromGroup
395399
args.FromQQ = fromQQ
396400
args.BeingOperateQQ = beingOperateQQ
@@ -411,7 +415,7 @@ Namespace App.Core
411415
<DllExport(ExportName:="_eventSystem_GroupMemberIncrease", CallingConvention:=CallingConvention.StdCall)>
412416
Private Shared Function EventSystemGroupMemberIncrease(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal beingOperateQQ As Long) As Integer
413417
Dim args As GroupMemberAlterEventArgs = New GroupMemberAlterEventArgs()
414-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
418+
args.SendTime = sendTime.ToDateTime()
415419
args.FromGroup = fromGroup
416420
args.FromQQ = fromQQ
417421
args.BeingOperateQQ = beingOperateQQ
@@ -431,7 +435,7 @@ Namespace App.Core
431435
<DllExport(ExportName:="_eventFriend_Add", CallingConvention:=CallingConvention.StdCall)>
432436
Private Shared Function EventFriendAdd(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromQQ As Long) As Integer
433437
Dim args As FriendIncreaseEventArgs = New FriendIncreaseEventArgs()
434-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
438+
args.SendTime = sendTime.ToDateTime()
435439
args.FromQQ = fromQQ
436440
args.Handled = False
437441

@@ -447,9 +451,9 @@ Namespace App.Core
447451
<DllExport(ExportName:="_eventRequest_AddFriend", CallingConvention:=CallingConvention.StdCall)>
448452
Private Shared Function EventRequestAddFriend(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromQQ As Long, ByVal msg As IntPtr, ByVal responseFlag As String) As Integer
449453
Dim args As FriendAddRequestEventArgs = New FriendAddRequestEventArgs()
450-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
454+
args.SendTime = sendTime.ToDateTime()
451455
args.FromQQ = fromQQ
452-
args.AppendMsg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
456+
args.AppendMsg = msg.ToString(DefaultEncoding)
453457
args.Tag = responseFlag
454458
args.Handled = False
455459

@@ -465,10 +469,10 @@ Namespace App.Core
465469
<DllExport(ExportName:="_eventRequest_AddGroup", CallingConvention:=CallingConvention.StdCall)>
466470
Private Shared Function EventRequestAddGroup(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal msg As IntPtr, ByVal responseFlag As String) As Integer
467471
Dim args As GroupAddRequestEventArgs = New GroupAddRequestEventArgs()
468-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
472+
args.SendTime = sendTime.ToDateTime()
469473
args.FromGroup = fromGroup
470474
args.FromQQ = fromQQ
471-
args.AppendMsg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
475+
args.AppendMsg = msg.ToString(DefaultEncoding)
472476
args.Tag = responseFlag
473477
args.Handled = False
474478

‎Native.Basic/App/Core/LibExport1.vb‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@ Imports Native.Basic.App.Interface
1010
Imports Native.Basic.Repair
1111
Imports Native.Csharp.Sdk.Cqp
1212
Imports Native.Csharp.Sdk.Cqp.Enum
13-
Imports Native.Csharp.Tool
13+
Imports Native.Csharp.Sdk.Cqp.Other
1414
Imports Unity
1515

1616
Namespace App.Core
1717
Public Class LibExport
18+
19+
Private Shared Property DefaultEncoding As Encoding
1820

19-
''' <summary>
21+
''' <summary>
2022
''' 静态构造函数, 初始化应用基础服务
2123
''' </summary>
2224
Shared Sub New()
25+
DefaultEncoding = Encoding.GetEncoding("GB18030")
26+
2327
' 初始化 Costura
2428
CosturaUtility.Initialize ()
2529

@@ -290,7 +294,7 @@ Namespace App.Core
290294
Dim args As PrivateMessageEventArgs = New PrivateMessageEventArgs()
291295
args.MsgId = msgId
292296
args.FromQQ = fromQQ
293-
args.Msg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
297+
args.Msg = msg.ToString(DefaultEncoding)
294298
args.Handled = False
295299

296300
If subType = 11 Then
@@ -314,7 +318,7 @@ Namespace App.Core
314318
args.MsgId = msgId
315319
args.FromGroup = fromGroup
316320
args.FromQQ = fromQQ
317-
args.Msg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
321+
args.Msg = msg.ToString(DefaultEncoding)
318322
args.FromAnonymous = Nothing
319323
args.IsAnonymousMsg = False
320324
args.Handled = False
@@ -339,7 +343,7 @@ Namespace App.Core
339343
args.MsgId = msgId
340344
args.FromDiscuss = fromDiscuss
341345
args.FromQQ = fromQQ
342-
args.Msg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
346+
args.Msg = msg.ToString(DefaultEncoding)
343347
args.Handled = False
344348

345349
If subType = 1 Then
@@ -354,7 +358,7 @@ Namespace App.Core
354358
<DllExport(ExportName:="_eventGroupUpload", CallingConvention:=CallingConvention.StdCall)>
355359
Private Shared Function EventGroupUpload(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal file As String) As Integer
356360
Dim args As FileUploadMessageEventArgs = New FileUploadMessageEventArgs()
357-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
361+
args.SendTime = sendTime.ToDateTime()
358362
args.FromGroup = fromGroup
359363
args.FromQQ = fromQQ
360364
args.File = Common.CqApi.GetFile(file)
@@ -365,7 +369,7 @@ Namespace App.Core
365369
<DllExport(ExportName:="_eventSystem_GroupAdmin", CallingConvention:=CallingConvention.StdCall)>
366370
Private Shared Function EventSystemGroupAdmin(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal beingOperateQQ As Long) As Integer
367371
Dim args As GroupManageAlterEventArgs = New GroupManageAlterEventArgs()
368-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
372+
args.SendTime = sendTime.ToDateTime()
369373
args.FromGroup = fromGroup
370374
args.BeingOperateQQ = beingOperateQQ
371375
args.Handled = False
@@ -384,7 +388,7 @@ Namespace App.Core
384388
<DllExport(ExportName:="_eventSystem_GroupMemberDecrease", CallingConvention:=CallingConvention.StdCall)>
385389
Private Shared Function EventSystemGroupMemberDecrease(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal beingOperateQQ As Long) As Integer
386390
Dim args As GroupMemberAlterEventArgs = New GroupMemberAlterEventArgs()
387-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
391+
args.SendTime = sendTime.ToDateTime()
388392
args.FromGroup = fromGroup
389393
args.FromQQ = fromQQ
390394
args.BeingOperateQQ = beingOperateQQ
@@ -405,7 +409,7 @@ Namespace App.Core
405409
<DllExport(ExportName:="_eventSystem_GroupMemberIncrease", CallingConvention:=CallingConvention.StdCall)>
406410
Private Shared Function EventSystemGroupMemberIncrease(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal beingOperateQQ As Long) As Integer
407411
Dim args As GroupMemberAlterEventArgs = New GroupMemberAlterEventArgs()
408-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
412+
args.SendTime = sendTime.ToDateTime()
409413
args.FromGroup = fromGroup
410414
args.FromQQ = fromQQ
411415
args.BeingOperateQQ = beingOperateQQ
@@ -425,7 +429,7 @@ Namespace App.Core
425429
<DllExport(ExportName:="_eventFriend_Add", CallingConvention:=CallingConvention.StdCall)>
426430
Private Shared Function EventFriendAdd(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromQQ As Long) As Integer
427431
Dim args As FriendIncreaseEventArgs = New FriendIncreaseEventArgs()
428-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
432+
args.SendTime = sendTime.ToDateTime()
429433
args.FromQQ = fromQQ
430434
args.Handled = False
431435

@@ -441,9 +445,9 @@ Namespace App.Core
441445
<DllExport(ExportName:="_eventRequest_AddFriend", CallingConvention:=CallingConvention.StdCall)>
442446
Private Shared Function EventRequestAddFriend(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromQQ As Long, ByVal msg As IntPtr, ByVal responseFlag As String) As Integer
443447
Dim args As FriendAddRequestEventArgs = New FriendAddRequestEventArgs()
444-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
448+
args.SendTime = sendTime.ToDateTime()
445449
args.FromQQ = fromQQ
446-
args.AppendMsg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
450+
args.AppendMsg = msg.ToString(DefaultEncoding)
447451
args.Tag = responseFlag
448452
args.Handled = False
449453

@@ -459,10 +463,10 @@ Namespace App.Core
459463
<DllExport(ExportName:="_eventRequest_AddGroup", CallingConvention:=CallingConvention.StdCall)>
460464
Private Shared Function EventRequestAddGroup(ByVal subType As Integer, ByVal sendTime As Integer, ByVal fromGroup As Long, ByVal fromQQ As Long, ByVal msg As IntPtr, ByVal responseFlag As String) As Integer
461465
Dim args As GroupAddRequestEventArgs = New GroupAddRequestEventArgs()
462-
args.SendTime = NativeConvert.FotmatUnixTime(sendTime.ToString())
466+
args.SendTime = sendTime.ToDateTime()
463467
args.FromGroup = fromGroup
464468
args.FromQQ = fromQQ
465-
args.AppendMsg = NativeConvert.ToPtrString(msg, Encoding.GetEncoding("GB18030"))
469+
args.AppendMsg = msg.ToString(DefaultEncoding)
466470
args.Tag = responseFlag
467471
args.Handled = False
468472

‎Native.Basic/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' 方法是按如下所示使用“*”: :
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2.0.5.0525")>
35-
<Assembly: AssemblyFileVersion("2.0.5.0525")>
34+
<Assembly: AssemblyVersion("2.0.6.0607")>
35+
<Assembly: AssemblyFileVersion("2.0.6.0607")>

‎Native.Basic/Native.Basic.vbproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@
179179
</None>
180180
</ItemGroup>
181181
<ItemGroup>
182-
<Content Include="App\Core\LibExport.tt">
183-
<Generator>TextTemplatingFileGenerator</Generator>
184-
<LastGenOutput>LibExport1.vb</LastGenOutput>
185-
</Content>
186182
<None Include="FodyWeavers.xml" />
187183
</ItemGroup>
188184
<ItemGroup>
@@ -193,12 +189,13 @@
193189
<Project>{797eaebc-4d5b-4eef-87f4-a508fda2cb6a}</Project>
194190
<Name>Native.Csharp.Sdk</Name>
195191
</ProjectReference>
196-
<ProjectReference Include="..\Native.Csharp.Tool\Native.Csharp.Tool.csproj">
197-
<Project>{9db94cbf-6843-4ea3-9241-769124416fe9}</Project>
198-
<Name>Native.Csharp.Tool</Name>
199-
</ProjectReference>
200192
</ItemGroup>
201-
<ItemGroup />
193+
<ItemGroup>
194+
<Content Include="App\Core\LibExport.tt">
195+
<Generator>TextTemplatingFileGenerator</Generator>
196+
<LastGenOutput>LibExport1.vb</LastGenOutput>
197+
</Content>
198+
</ItemGroup>
202199
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
203200
<ImportGroup Label=".NET DllExport">
204201
<Import Project="$(SolutionDir)packages\DllExport.1.6.1\tools\net.r_eg.DllExport.targets" Condition="Exists('$(SolutionDir)packages\DllExport.1.6.1\tools\net.r_eg.DllExport.targets')" Label="8337224c9ad9e356" />

0 commit comments

Comments
 (0)