张泳健 пре 7 година
родитељ
комит
fdc4e5f7c4

+ 6 - 0
DotNettyFrom.sln Прегледај датотеку

@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNettyFrom", "DotNettyFro
7 7
 EndProject
8 8
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}"
9 9
 EndProject
10
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNettyFromTests", "DotNettyFromTests\DotNettyFromTests.csproj", "{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}"
11
+EndProject
10 12
 Global
11 13
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
12 14
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
21 23
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Debug|Any CPU.Build.0 = Debug|Any CPU
22 24
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Release|Any CPU.ActiveCfg = Release|Any CPU
23 25
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Release|Any CPU.Build.0 = Release|Any CPU
26
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Debug|Any CPU.Build.0 = Debug|Any CPU
28
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Release|Any CPU.ActiveCfg = Release|Any CPU
29
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Release|Any CPU.Build.0 = Release|Any CPU
24 30
 	EndGlobalSection
25 31
 	GlobalSection(SolutionProperties) = preSolution
26 32
 		HideSolutionNode = FALSE

+ 2 - 2
DotNettyFrom/Form1.cs Прегледај датотеку

@@ -52,8 +52,8 @@ namespace DotNettyFrom
52 52
 
53 53
         private void BtnDisConn_Click(object sender, EventArgs e)
54 54
         {
55
-            nc.StopNetty();
56
-            t.Abort();
55
+            nc?.StopNetty();
56
+            t?.Abort();
57 57
         }
58 58
 
59 59
         private void BtnSendData_Click(object sender, EventArgs e)

+ 2 - 2
DotNettyFrom/netty/NettyClient.cs Прегледај датотеку

@@ -49,6 +49,7 @@ namespace DotNettyFrom.netty
49 49
             }
50 50
             catch (Exception e)
51 51
             {
52
+                //连接出错,服务器没开启....
52 53
                 Console.WriteLine(e);
53 54
                 await _group.ShutdownGracefullyAsync(TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(1));
54 55
             }
@@ -74,10 +75,9 @@ namespace DotNettyFrom.netty
74 75
 
75 76
         public void StopNetty()
76 77
         {
77
-            Context.Channel.CloseAsync();
78
+            Context?.Channel.CloseAsync();
78 79
             _group?.ShutdownGracefullyAsync(TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(1));
79 80
             _group = null;
80
-            Context.CloseAsync();
81 81
             Context = null;
82 82
             _clientHandler = null;
83 83
         }

+ 8 - 5
DotNettyFromTests/DotNettyFromTests.csproj Прегледај датотеку

@@ -53,18 +53,21 @@
53 53
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
54 54
       </ItemGroup>
55 55
     </When>
56
-    <Otherwise>
57
-      <ItemGroup>
58
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
59
-      </ItemGroup>
60
-    </Otherwise>
56
+    <Otherwise />
61 57
   </Choose>
62 58
   <ItemGroup>
59
+    <Compile Include="common\UIInfoModelTests.cs" />
63 60
     <Compile Include="Properties\AssemblyInfo.cs" />
64 61
   </ItemGroup>
65 62
   <ItemGroup>
66 63
     <None Include="packages.config" />
67 64
   </ItemGroup>
65
+  <ItemGroup>
66
+    <ProjectReference Include="..\DotNettyFrom\DotNettyFrom.csproj">
67
+      <Project>{2348CBA6-AD06-457D-9F0C-06BFB0F432CE}</Project>
68
+      <Name>DotNettyFrom</Name>
69
+    </ProjectReference>
70
+  </ItemGroup>
68 71
   <Choose>
69 72
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
70 73
       <ItemGroup>