Commit d17a6ab0 by 施晓雨

UP

parent ec4517e4
...@@ -31,16 +31,17 @@ ...@@ -31,16 +31,17 @@
this.btnConnect = new System.Windows.Forms.Button(); this.btnConnect = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.tbxServiceUrl = new System.Windows.Forms.TextBox(); this.tbxServiceUrl = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.tbxUpdateChannel = new System.Windows.Forms.TextBox();
this.rtbMessage = new System.Windows.Forms.RichTextBox();
this.btnSendMessage = new System.Windows.Forms.Button();
this.btnGet = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.tbxUserName = new System.Windows.Forms.TextBox(); this.tbxUserName = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.tbxPassword = new System.Windows.Forms.TextBox(); this.tbxPassword = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.btnGetSubscriptions = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.btnSendMessage = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.rtbMessage = new System.Windows.Forms.RichTextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.btnAddChannel = new System.Windows.Forms.Button(); this.btnAddChannel = new System.Windows.Forms.Button();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
...@@ -54,9 +55,11 @@ ...@@ -54,9 +55,11 @@
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.tbxHeartBeatTime = new System.Windows.Forms.TextBox(); this.tbxHeartBeatTime = new System.Windows.Forms.TextBox();
this.tbxChannels = new System.Windows.Forms.TextBox(); this.tbxChannels = new System.Windows.Forms.TextBox();
this.tbxUpdateChannel = new System.Windows.Forms.TextBox();
this.btnRemoveChannel = new System.Windows.Forms.Button(); this.btnRemoveChannel = new System.Windows.Forms.Button();
this.textBox1 = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.panel1.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -87,51 +90,6 @@ ...@@ -87,51 +90,6 @@
this.tbxServiceUrl.TabIndex = 2; this.tbxServiceUrl.TabIndex = 2;
this.tbxServiceUrl.Text = "http://localhost"; this.tbxServiceUrl.Text = "http://localhost";
// //
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(48, 368);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 1;
this.label2.Text = "发送消息";
//
// tbxUpdateChannel
//
this.tbxUpdateChannel.Location = new System.Drawing.Point(67, 110);
this.tbxUpdateChannel.Name = "tbxUpdateChannel";
this.tbxUpdateChannel.Size = new System.Drawing.Size(86, 21);
this.tbxUpdateChannel.TabIndex = 2;
//
// rtbMessage
//
this.rtbMessage.Dock = System.Windows.Forms.DockStyle.Right;
this.rtbMessage.Location = new System.Drawing.Point(288, 0);
this.rtbMessage.Name = "rtbMessage";
this.rtbMessage.Size = new System.Drawing.Size(714, 680);
this.rtbMessage.TabIndex = 3;
this.rtbMessage.Text = "";
//
// btnSendMessage
//
this.btnSendMessage.Location = new System.Drawing.Point(112, 441);
this.btnSendMessage.Name = "btnSendMessage";
this.btnSendMessage.Size = new System.Drawing.Size(41, 23);
this.btnSendMessage.TabIndex = 0;
this.btnSendMessage.Text = "发送";
this.btnSendMessage.UseVisualStyleBackColor = true;
this.btnSendMessage.Click += new System.EventHandler(this.btnSendMessage_Click);
//
// btnGet
//
this.btnGet.Location = new System.Drawing.Point(48, 313);
this.btnGet.Name = "btnGet";
this.btnGet.Size = new System.Drawing.Size(138, 23);
this.btnGet.TabIndex = 4;
this.btnGet.Text = "获取订阅人";
this.btnGet.UseVisualStyleBackColor = true;
this.btnGet.Click += new System.EventHandler(this.btnGet_Click);
//
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
...@@ -179,11 +137,73 @@ ...@@ -179,11 +137,73 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Location = new System.Drawing.Point(0, 0);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(288, 84); this.groupBox1.Size = new System.Drawing.Size(297, 84);
this.groupBox1.TabIndex = 5; this.groupBox1.TabIndex = 5;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "连接信息"; this.groupBox1.Text = "连接信息";
// //
// panel1
//
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.btnGetSubscriptions);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.btnSendMessage);
this.panel1.Controls.Add(this.groupBox1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(297, 680);
this.panel1.TabIndex = 8;
//
// btnGetSubscriptions
//
this.btnGetSubscriptions.Location = new System.Drawing.Point(14, 233);
this.btnGetSubscriptions.Name = "btnGetSubscriptions";
this.btnGetSubscriptions.Size = new System.Drawing.Size(268, 23);
this.btnGetSubscriptions.TabIndex = 9;
this.btnGetSubscriptions.Text = "获取当前频道的所有订阅人";
this.btnGetSubscriptions.UseVisualStyleBackColor = true;
this.btnGetSubscriptions.Click += new System.EventHandler(this.btnGetSubscriptions_Click);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(48, 442);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 8;
this.label2.Text = "发送消息";
//
// btnSendMessage
//
this.btnSendMessage.Location = new System.Drawing.Point(112, 515);
this.btnSendMessage.Name = "btnSendMessage";
this.btnSendMessage.Size = new System.Drawing.Size(41, 23);
this.btnSendMessage.TabIndex = 7;
this.btnSendMessage.Text = "发送";
this.btnSendMessage.UseVisualStyleBackColor = true;
//
// groupBox3
//
this.groupBox3.Controls.Add(this.rtbMessage);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox3.Location = new System.Drawing.Point(297, 0);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(705, 680);
this.groupBox3.TabIndex = 9;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "调试信息";
//
// rtbMessage
//
this.rtbMessage.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.rtbMessage.Dock = System.Windows.Forms.DockStyle.Fill;
this.rtbMessage.Location = new System.Drawing.Point(3, 17);
this.rtbMessage.Name = "rtbMessage";
this.rtbMessage.Size = new System.Drawing.Size(699, 660);
this.rtbMessage.TabIndex = 4;
this.rtbMessage.Text = "";
//
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.btnAddChannel); this.groupBox2.Controls.Add(this.btnAddChannel);
...@@ -203,8 +223,8 @@ ...@@ -203,8 +223,8 @@
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top; this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox2.Location = new System.Drawing.Point(0, 84); this.groupBox2.Location = new System.Drawing.Point(0, 84);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(288, 143); this.groupBox2.Size = new System.Drawing.Size(297, 143);
this.groupBox2.TabIndex = 6; this.groupBox2.TabIndex = 10;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "状态信息"; this.groupBox2.Text = "状态信息";
// //
...@@ -313,6 +333,13 @@ ...@@ -313,6 +333,13 @@
this.tbxChannels.Size = new System.Drawing.Size(215, 21); this.tbxChannels.Size = new System.Drawing.Size(215, 21);
this.tbxChannels.TabIndex = 2; this.tbxChannels.TabIndex = 2;
// //
// tbxUpdateChannel
//
this.tbxUpdateChannel.Location = new System.Drawing.Point(67, 110);
this.tbxUpdateChannel.Name = "tbxUpdateChannel";
this.tbxUpdateChannel.Size = new System.Drawing.Size(86, 21);
this.tbxUpdateChannel.TabIndex = 2;
//
// btnRemoveChannel // btnRemoveChannel
// //
this.btnRemoveChannel.Location = new System.Drawing.Point(231, 109); this.btnRemoveChannel.Location = new System.Drawing.Point(231, 109);
...@@ -323,34 +350,23 @@ ...@@ -323,34 +350,23 @@
this.btnRemoveChannel.UseVisualStyleBackColor = true; this.btnRemoveChannel.UseVisualStyleBackColor = true;
this.btnRemoveChannel.Click += new System.EventHandler(this.btnRemoveChannel_Click); this.btnRemoveChannel.Click += new System.EventHandler(this.btnRemoveChannel_Click);
// //
// textBox1
//
this.textBox1.Enabled = false;
this.textBox1.Location = new System.Drawing.Point(88, 243);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(159, 21);
this.textBox1.TabIndex = 2;
//
// FrmMain // FrmMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1002, 680); this.ClientSize = new System.Drawing.Size(1002, 680);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox3);
this.Controls.Add(this.textBox1); this.Controls.Add(this.panel1);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnGet);
this.Controls.Add(this.rtbMessage);
this.Controls.Add(this.label2);
this.Controls.Add(this.btnSendMessage);
this.Name = "FrmMain"; this.Name = "FrmMain";
this.Text = "Server Events 测试(服务器端必须安装Kivii.Server.Events组件)"; this.Text = "Server Events 测试(服务器端必须安装Kivii.Server.Events组件)";
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }
...@@ -359,31 +375,32 @@ ...@@ -359,31 +375,32 @@
private System.Windows.Forms.Button btnConnect; private System.Windows.Forms.Button btnConnect;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox tbxServiceUrl; private System.Windows.Forms.TextBox tbxServiceUrl;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox tbxUpdateChannel;
private System.Windows.Forms.RichTextBox rtbMessage;
private System.Windows.Forms.Button btnSendMessage;
private System.Windows.Forms.Button btnGet;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox tbxUserName; private System.Windows.Forms.TextBox tbxUserName;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox tbxPassword; private System.Windows.Forms.TextBox tbxPassword;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button btnGetSubscriptions;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button btnSendMessage;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.RichTextBox rtbMessage;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btnAddChannel;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox tbxSubscriptionId; private System.Windows.Forms.TextBox tbxSubscriptionId;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.TextBox tbxConnectedTime;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox tbxFullName; private System.Windows.Forms.TextBox tbxFullName;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Button btnRemoveChannel;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox tbxHeartBeatTime; private System.Windows.Forms.TextBox tbxHeartBeatTime;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.TextBox tbxConnectedTime;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox tbxChannels; private System.Windows.Forms.TextBox tbxChannels;
private System.Windows.Forms.Button btnAddChannel; private System.Windows.Forms.TextBox tbxUpdateChannel;
private System.Windows.Forms.Button btnRemoveChannel;
} }
} }
...@@ -155,5 +155,22 @@ namespace Test ...@@ -155,5 +155,22 @@ namespace Test
}); });
} }
private void btnGetSubscriptions_Click(object sender, EventArgs e)
{
btnGetSubscriptions.Enabled = false;
var task = _client.GetChannelSubscribersAsync();
task.Success(() => {
btnGetSubscriptions.Enabled = true;
foreach (var item in task.Result)
{
rtbMessage.AppendText($"DisplayName:{item.DisplayName},UserId:{item.UserId},SubscriptionId:{item.SubscriptionId},Channels:{item.Channels.Join()}{Environment.NewLine}");
}
},true);
task.Error((ex) => {
btnGetSubscriptions.Enabled = true;
rtbMessage.AppendText($"{DateTime.Now.ToString("HH:mm:ss")}:onException {ex.Message}{Environment.NewLine}{Environment.NewLine}");
},true);
}
} }
} }
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Kivii.Common.V4.5, Version=5.4.2019.7180, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Kivii.Common.5.4.2019.7180\lib\net45\Kivii.Common.V4.5.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
...@@ -68,7 +65,6 @@ ...@@ -68,7 +65,6 @@
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
...@@ -82,6 +78,12 @@ ...@@ -82,6 +78,12 @@
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\K5\Platform-V5.4\Kivii.Common\Src\Kivii.Common.V4.5.csproj">
<Project>{587a47fe-0ae8-4649-9364-686e8f6c044b}</Project>
<Name>Kivii.Common.V4.5</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
......
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 14
VisualStudioVersion = 15.0.27703.2035 VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kivii.Client.ServerEvent.Test", "Kivii.Client.ServerEvent.Test.csproj", "{C0393150-DEC8-455D-BC38-21A07D207B88}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kivii.Client.ServerEvent.Test", "Kivii.Client.ServerEvent.Test.csproj", "{C0393150-DEC8-455D-BC38-21A07D207B88}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kivii.Common.V4.5", "..\..\K5\Platform-V5.4\Kivii.Common\Src\Kivii.Common.V4.5.csproj", "{587A47FE-0AE8-4649-9364-686E8F6C044B}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -15,6 +17,10 @@ Global ...@@ -15,6 +17,10 @@ Global
{C0393150-DEC8-455D-BC38-21A07D207B88}.Debug|Any CPU.Build.0 = Debug|Any CPU {C0393150-DEC8-455D-BC38-21A07D207B88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0393150-DEC8-455D-BC38-21A07D207B88}.Release|Any CPU.ActiveCfg = Release|Any CPU {C0393150-DEC8-455D-BC38-21A07D207B88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C0393150-DEC8-455D-BC38-21A07D207B88}.Release|Any CPU.Build.0 = Release|Any CPU {C0393150-DEC8-455D-BC38-21A07D207B88}.Release|Any CPU.Build.0 = Release|Any CPU
{587A47FE-0AE8-4649-9364-686E8F6C044B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{587A47FE-0AE8-4649-9364-686E8F6C044B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{587A47FE-0AE8-4649-9364-686E8F6C044B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{587A47FE-0AE8-4649-9364-686E8F6C044B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Kivii.Common" version="5.4.2019.7180" targetFramework="net45" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment