Skip to content

顾剑亮 / AIOBOX

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8dcc919c 由 顾剑亮
选项

bug修改

1 个父辈 9a25cf6f
内嵌 并排
正在显示 43 个修改的文件 包含 131 行增加 和 619 行删除
.vs/AIOBOX/v16/.suo
此文件类型无法预览
AIOBOX.sln
...@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIOBOX_Debug_old", "AIOBOX_ ...@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIOBOX_Debug_old", "AIOBOX_
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApp1", "WindowsFormsApp1\WindowsFormsApp1.csproj", "{7F7C9D6D-D088-410E-8340-3FB5EEA78B37}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApp1", "WindowsFormsApp1\WindowsFormsApp1.csproj", "{7F7C9D6D-D088-410E-8340-3FB5EEA78B37}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIOBOX_Debug", "AIOBOX_Debug\AIOBOX_Debug.csproj", "{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -53,14 +51,6 @@ Global ...@@ -53,14 +51,6 @@ Global
{7F7C9D6D-D088-410E-8340-3FB5EEA78B37}.Release|Any CPU.Build.0 = Release|Any CPU {7F7C9D6D-D088-410E-8340-3FB5EEA78B37}.Release|Any CPU.Build.0 = Release|Any CPU
{7F7C9D6D-D088-410E-8340-3FB5EEA78B37}.Release|x86.ActiveCfg = Release|Any CPU {7F7C9D6D-D088-410E-8340-3FB5EEA78B37}.Release|x86.ActiveCfg = Release|Any CPU
{7F7C9D6D-D088-410E-8340-3FB5EEA78B37}.Release|x86.Build.0 = Release|Any CPU {7F7C9D6D-D088-410E-8340-3FB5EEA78B37}.Release|x86.Build.0 = Release|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Debug|x86.ActiveCfg = Debug|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Debug|x86.Build.0 = Debug|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Release|Any CPU.Build.0 = Release|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Release|x86.ActiveCfg = Release|Any CPU
{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
AIOBOX/AIOBOX.cs
...@@ -34,7 +34,6 @@ namespace Asa.IOModule ...@@ -34,7 +34,6 @@ namespace Asa.IOModule
private int[] _valueAI; //AI模拟量 private int[] _valueAI; //AI模拟量
private int[] _valueAO; //AO模拟量 private int[] _valueAO; //AO模拟量
private List<byte> _receive; private List<byte> _receive;
//private System.Collections.Concurrent.ConcurrentQueue<byte[]> _writeDO;
private log4net.ILog log; private log4net.ILog log;
private Box_Type _typeInput; //输入类型 private Box_Type _typeInput; //输入类型
...@@ -43,7 +42,7 @@ namespace Asa.IOModule ...@@ -43,7 +42,7 @@ namespace Asa.IOModule
private byte[] _addressOutput; //输出地址 private byte[] _addressOutput; //输出地址
private const int SEND_SLEEP = 50; //每条命令发送的间隔 private const int SEND_SLEEP = 50; //每条命令发送的间隔
private const int PORT = 502; //端口 private const int PORT = 502; //端口
private const int UPLOAD_TIME = 5000; //5秒 private const int UPLOAD_TIME = 3000; //5秒
private Thread tRecon; //重连线程 private Thread tRecon; //重连线程
private Thread tSend; //发送命令处理 private Thread tSend; //发送命令处理
...@@ -345,6 +344,44 @@ namespace Asa.IOModule ...@@ -345,6 +344,44 @@ namespace Asa.IOModule
} }
} }
private bool WriteDO(int add, Box_Sta[] sta)
{
try
{
log.Debug("Enter WriteDO[" + IP + "] add=" + add);
int dataLen = Convert.ToByte(Math.Ceiling(sta.Length / 8f));
byte[] data = Command();
byte[] buff = new byte[13 + dataLen];
Array.Copy(data, 0, buff, 0, data.Length);
buff[5] = Convert.ToByte(7 + dataLen); //后面字节数
buff[7] = 15; //功能码
buff[9] = _addressOutput[add]; //起始地址
buff[11] = Convert.ToByte(sta.Length); //寄存器个数
buff[12] = Convert.ToByte(dataLen); //数据长度
for (int i = 0; i < dataLen; i++)
{
for (int j = 0; j < 8; j++)
{
int len = i * 8 + j;
if (len >= sta.Length) break;
if (sta[len] == Box_Sta.On)
buff[buff.Length - i - 1] |= Convert.ToByte(Math.Pow(2, j));
}
}
_client.Send(buff);
log.Debug("WriteDO[" + IP + "]: " + HexBuff(buff));
return true;
}
catch (Exception ex)
{
log.Error("WriteDO", ex);
return false;
}
}
/// <summary> /// <summary>
/// 获取本地IPv4地址 /// 获取本地IPv4地址
/// </summary> /// </summary>
...@@ -371,17 +408,18 @@ namespace Asa.IOModule ...@@ -371,17 +408,18 @@ namespace Asa.IOModule
/// </summary> /// </summary>
private void Send() private void Send()
{ {
bool shift = true; //切换
int time = UPLOAD_TIME; //上传时间 int time = UPLOAD_TIME; //上传时间
while (_loop) while (_loop)
{ {
Thread.Sleep(SEND_SLEEP);
if (!IsConn) continue; if (!IsConn) continue;
byte[] buff; byte[] buff = null;
if (Upload) //主动上传 if (Upload) //主动上传
{ {
time += SEND_SLEEP;
if (time >= UPLOAD_TIME) if (time >= UPLOAD_TIME)
{ {
buff = GetReadDI_Command(); buff = GetReadDI_Command();
...@@ -389,13 +427,20 @@ namespace Asa.IOModule ...@@ -389,13 +427,20 @@ namespace Asa.IOModule
} }
else else
{ {
time += SEND_SLEEP; //2020年6月11日
//buff = GetReadDO_Command();
Thread.Sleep(SEND_SLEEP);
continue; continue;
} }
} }
else else
{ {
buff = GetReadDI_Command(); if (shift)
buff = GetReadDI_Command();
else
buff = GetReadDO_Command();
shift = !shift;
} }
try try
...@@ -408,6 +453,8 @@ namespace Asa.IOModule ...@@ -408,6 +453,8 @@ namespace Asa.IOModule
log.Error("Send", ex); log.Error("Send", ex);
IsConn = false; IsConn = false;
} }
Thread.Sleep(SEND_SLEEP);
} }
} }
...@@ -505,21 +552,18 @@ namespace Asa.IOModule ...@@ -505,21 +552,18 @@ namespace Asa.IOModule
if (cmd[7] == 1) //ReadDO if (cmd[7] == 1) //ReadDO
{ {
Box_Sta[] staDO = new Box_Sta[_stateDO.Length]; Box_Sta[] staDO = new Box_Sta[_stateDO.Length];
lock (_stateDO) for (int i = 1; i <= count; i++)
{ {
for (int i = 1; i <= count; i++) int move = 0;
byte val = cmd[8 + i];
for (int j = 0; j < 8; j++) //字节的0-7位
{ {
int move = 0; int n = (val & Convert.ToInt32(Math.Pow(2, move))) >> move;
byte val = cmd[8 + i]; staDO[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
for (int j = 0; j < 8; j++) //字节的0-7位 move++;
{
int n = (val & Convert.ToInt32(Math.Pow(2, move))) >> move;
_stateDO[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
move++;
}
} }
Array.Copy(_stateDO, 0, staDO, 0, staDO.Length);
} }
Array.Copy(staDO, 0, _stateDO, 0, staDO.Length);
DO_Changed_Event?.Invoke(this, staDO); DO_Changed_Event?.Invoke(this, staDO);
//System.Threading.Tasks.Task.Run(() => DO_Changed_Event?.Invoke(this, staDO)); //System.Threading.Tasks.Task.Run(() => DO_Changed_Event?.Invoke(this, staDO));
...@@ -527,41 +571,38 @@ namespace Asa.IOModule ...@@ -527,41 +571,38 @@ namespace Asa.IOModule
else if (cmd[7] == 2) //ReadDI else if (cmd[7] == 2) //ReadDI
{ {
Box_Sta[] staDI = new Box_Sta[_stateDI.Length]; Box_Sta[] staDI = new Box_Sta[_stateDI.Length];
lock (_stateDI) for (int i = 1; i <= count; i++)
{ {
for (int i = 1; i <= count; i++) int move = 0;
byte val = cmd[8 + i];
for (int j = 0; j < 8; j++) //字节的0-7位
{ {
int move = 0; int n = (val & Convert.ToInt32(Math.Pow(2, move))) >> move;
byte val = cmd[8 + i]; staDI[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
for (int j = 0; j < 8; j++) //字节的0-7位 move++;
{
int n = (val & Convert.ToInt32(Math.Pow(2, move))) >> move;
_stateDI[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
move++;
}
} }
Array.Copy(_stateDI, 0, staDI, 0, staDI.Length);
} }
Array.Copy(staDI, 0, _stateDI, 0, staDI.Length);
DI_Changed_Event?.Invoke(this, staDI); DI_Changed_Event?.Invoke(this, staDI);
//System.Threading.Tasks.Task.Run(() => DI_Changed_Event?.Invoke(this, staDI)); //System.Threading.Tasks.Task.Run(() => DI_Changed_Event?.Invoke(this, staDI));
} }
else if (cmd[7] == 5) else if (cmd[7] == 5) //WriteDO Single
{ {
idx = Array.FindIndex(_addressOutput, s => s == cmd[9]); idx = Array.FindIndex(_addressOutput, s => s == cmd[9]);
if (idx != -1) if (idx != -1)
{ {
Box_Sta[] staDO = new Box_Sta[_stateDO.Length]; Box_Sta[] staDO = new Box_Sta[_stateDO.Length];
lock (_stateDO) _stateDO[idx] = cmd[10] == 0xFF ? Box_Sta.On : Box_Sta.Off;
{ Array.Copy(_stateDO, staDO, staDO.Length);
_stateDO[idx] = cmd[10] == 0xFF ? Box_Sta.On : Box_Sta.Off;
Array.Copy(_stateDO, staDO, staDO.Length);
}
DO_Changed_Event?.Invoke(this, staDO); DO_Changed_Event?.Invoke(this, staDO);
//System.Threading.Tasks.Task.Run(() => DO_Changed_Event?.Invoke(this, staDO)); //System.Threading.Tasks.Task.Run(() => DO_Changed_Event?.Invoke(this, staDO));
} }
} }
else if (cmd[7] == 15) //WriteDO Multiple
{
//没有返回具体数值，只有寄存器个数，需要主动读取
}
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -609,6 +650,12 @@ namespace Asa.IOModule ...@@ -609,6 +650,12 @@ namespace Asa.IOModule
Thread.Sleep(100); //需要等待一会才能获取连接状态 Thread.Sleep(100); //需要等待一会才能获取连接状态
IsConn = true; IsConn = true;
log.Info("Socket[" + IP + "] Connect"); log.Info("Socket[" + IP + "] Connect");
byte[] buff = GetReadDI_Command();
_client.Send(buff);
Thread.Sleep(50);
buff = GetReadDO_Command();
_client.Send(buff);
} }
catch (Exception ex) catch (Exception ex)
{ {
......
AIOBOX/AIOBOX.csproj
...@@ -53,8 +53,9 @@ ...@@ -53,8 +53,9 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\..\DLL\log4net.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\DLL\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
...@@ -71,7 +72,7 @@ ...@@ -71,7 +72,7 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>copy "$(TargetPath)" "D:\OneDrive - 上海挚锦科技有限公司\DLL\AIOBOX\$(TargetFileName)" <PostBuildEvent>
copy "$(TargetDir)$(TargetName).xml" "D:\OneDrive - 上海挚锦科技有限公司\DLL\AIOBOX\$(TargetName).xml"</PostBuildEvent> </PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
\ No newline at end of file \ No newline at end of file
AIOBOX/Properties/AssemblyInfo.cs
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.4.0.3")] [assembly: AssemblyVersion("2.4.0.8")]
[assembly: AssemblyFileVersion("2.4.0.3")] [assembly: AssemblyFileVersion("2.4.0.8")]
AIOBOX/obj/Debug/.NETFramework,Version=v4.6.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
AIOBOX/obj/Debug/AIOBOX.csproj.CoreCompileInputs.cache
358d828b90f36df54ba6bbeca64bf737465fc549 0a95f12e4efa3549d49a4fd2fd1f9eb7c247ad36
AIOBOX/obj/Debug/AIOBOX.csproj.FileListAbsolute.txt
...@@ -7,3 +7,10 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\obj\Debug\Asa.IOM ...@@ -7,3 +7,10 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\obj\Debug\Asa.IOM
D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\bin\Debug\log4net.dll D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\bin\Debug\log4net.dll
D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\obj\Debug\AIOBOX.csproj.CopyComplete D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\obj\Debug\AIOBOX.csproj.CopyComplete
D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\obj\Debug\AIOBOX.csprojAssemblyReference.cache D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX\obj\Debug\AIOBOX.csprojAssemblyReference.cache
C:\Neotel\Program\AIOBOX\AIOBOX\bin\Debug\Asa.IOModule.AIOBOX.xml
C:\Neotel\Program\AIOBOX\AIOBOX\bin\Debug\Asa.IOModule.AIOBOX.dll
C:\Neotel\Program\AIOBOX\AIOBOX\bin\Debug\Asa.IOModule.AIOBOX.pdb
C:\Neotel\Program\AIOBOX\AIOBOX\obj\Debug\AIOBOX.csproj.CoreCompileInputs.cache
C:\Neotel\Program\AIOBOX\AIOBOX\obj\Debug\AIOBOX.csproj.CopyComplete
C:\Neotel\Program\AIOBOX\AIOBOX\obj\Debug\Asa.IOModule.AIOBOX.dll
C:\Neotel\Program\AIOBOX\AIOBOX\obj\Debug\Asa.IOModule.AIOBOX.pdb
AIOBOX_Debug/AIOBOX_Debug.csproj deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E48F1646-79E1-43A3-93A1-6F8ECDCE7843}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>AIOBOX_Debug</RootNamespace>
<AssemblyName>AIOBOX_Debug</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file \ No newline at end of file
AIOBOX_Debug/App.config deleted 100644 → 0
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
</configuration>
\ No newline at end of file \ No newline at end of file
AIOBOX_Debug/Form1.Designer.cs deleted 100644 → 0
namespace AIOBOX_Debug
{
partial class Form1
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows 窗体设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Name = "Form1";
this.Text = "Form1";
this.Load += new System.EventHandler(this.Form1_Load);
this.ResumeLayout(false);
}
#endregion
}
}
AIOBOX_Debug/Form1.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace AIOBOX_Debug
{
public partial class Form1 : Form
{
public Form1()
{
InitializeComponent();
}
private void Form1_Load(object sender, EventArgs e)
{
}
}
}
AIOBOX_Debug/Form1.resx deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file \ No newline at end of file
AIOBOX_Debug/Program.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace AIOBOX_Debug
{
static class Program
{
/// <summary>
/// 应用程序的主入口点。
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1());
}
}
}
AIOBOX_Debug/Properties/AssemblyInfo.cs deleted 100644 → 0
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("AIOBOX_Debug")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("AIOBOX_Debug")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("e48f1646-79e1-43a3-93a1-6f8ecdce7843")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
AIOBOX_Debug/Properties/Resources.Designer.cs deleted 100644 → 0
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: 4.0.30319.42000
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace AIOBOX_Debug.Properties
{
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AIOBOX_Debug.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// 覆盖当前线程的 CurrentUICulture 属性
/// 使用此强类型的资源类的资源查找。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}
AIOBOX_Debug/Properties/Resources.resx deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file \ No newline at end of file
AIOBOX_Debug/Properties/Settings.Designer.cs deleted 100644 → 0
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace AIOBOX_Debug.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}
AIOBOX_Debug/Properties/Settings.settings deleted 100644 → 0
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
AIOBOX_Debug_old/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
AIOBOX_Debug_old/obj/Debug/AIOBOX_Debug_old.csproj.CoreCompileInputs.cache
ecacc4f6f8c94371b8970d4f613e33846da4701f 706071d7fe3a131d51f49015bc26bb1d6becc015
AIOBOX_Debug_old/obj/Debug/AIOBOX_Debug_old.csproj.FileListAbsolute.txt
...@@ -15,3 +15,19 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\bin\Deb ...@@ -15,3 +15,19 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\bin\Deb
D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\bin\Debug\Asa.IOModule.AIOBOX.xml D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\bin\Debug\Asa.IOModule.AIOBOX.xml
D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug_old.csproj.CopyComplete D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug_old.csproj.CopyComplete
D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\bin\Debug\log4net.dll D:\OneDrive - 上海挚锦科技有限公司\SMD\AIOBOX\AIOBOX_Debug_old\bin\Debug\log4net.dll
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\bin\Debug\AIOBOX_Debug.exe.config
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\bin\Debug\AIOBOX_Debug.exe
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\bin\Debug\AIOBOX_Debug.pdb
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\bin\Debug\Asa.IOModule.AIOBOX.dll
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\bin\Debug\Asa.IOModule.AIOBOX.pdb
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\bin\Debug\Asa.IOModule.AIOBOX.xml
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug_old.csprojAssemblyReference.cache
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug.FrmIO.resources
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug.FrmIP.resources
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug.FrmMain.resources
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug.Properties.Resources.resources
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug_old.csproj.GenerateResource.cache
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug_old.csproj.CoreCompileInputs.cache
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug_old.csproj.CopyComplete
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug.exe
C:\Neotel\Program\AIOBOX\AIOBOX_Debug_old\obj\Debug\AIOBOX_Debug.pdb
AIOBOX_old/obj/Debug/.NETFramework,Version=v4.6.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
WindowsFormsApp1/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!