Skip to content

刘韬 / IonicContaminationTest

转到一个项目
切换导航栏
切换导航栏固定状态
Commit eb8e4d23 由 刘韬
选项

旧代码归档整理

1 个父辈 2bdddf2a
内嵌 并排
正在显示 37 个修改的文件 包含 111 行增加 和 123 行删除
App/App.csproj
......@@ -175,7 +175,12 @@
<Compile Include="FrmCrystalReprotEN.Designer.cs">
<DependentUpon>FrmCrystalReprotEN.cs</DependentUpon>
</Compile>
<Compile Include="From.cs" />
<Compile Include="FrmStandard.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmStandard.Designer.cs">
<DependentUpon>FrmStandard.cs</DependentUpon>
</Compile>
<Compile Include="InputInfo.cs">
<SubType>Form</SubType>
</Compile>
......@@ -248,34 +253,24 @@
<Compile Include="NewCode\ucCalibration.Designer.cs">
<DependentUpon>ucCalibration.cs</DependentUpon>
</Compile>
<Compile Include="OldCode\FrmCurve.cs">
<Compile Include="FrmCurve.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="OldCode\FrmCurve.Designer.cs">
<Compile Include="FrmCurve.Designer.cs">
<DependentUpon>FrmCurve.cs</DependentUpon>
</Compile>
<Compile Include="OldCode\FrmSPCCurve.cs">
<Compile Include="FrmSPCCurve.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="OldCode\FrmSPCCurve.Designer.cs">
<Compile Include="FrmSPCCurve.Designer.cs">
<DependentUpon>FrmSPCCurve.cs</DependentUpon>
</Compile>
<Compile Include="OldCode\FrmStandard.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="OldCode\FrmStandard.Designer.cs">
<DependentUpon>FrmStandard.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="ReceiveMachineData.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Resources\AppGlobal.cs" />
<Compile Include="CheckVersion.cs" />
<Compile Include="FrmBase.cs">
<SubType>Form</SubType>
</Compile>
......@@ -312,13 +307,9 @@
<Compile Include="FrmTestResult.Designer.cs">
<DependentUpon>FrmTestResult.cs</DependentUpon>
</Compile>
<Compile Include="GetServiceVersion.cs" />
<Compile Include="GlobalConfig.cs" />
<Compile Include="InfoForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Licence.cs" />
<Compile Include="Main.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="CrystalReport\CrystalReportCH.rpt">
......@@ -355,6 +346,9 @@
<DependentUpon>FrmSplash.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FrmStandard.resx">
<DependentUpon>FrmStandard.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmTestManage.resx">
<DependentUpon>FrmTestManage.cs</DependentUpon>
<SubType>Designer</SubType>
......@@ -404,18 +398,14 @@
<EmbeddedResource Include="NewCode\ucCalibration.resx">
<DependentUpon>ucCalibration.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OldCode\FrmCurve.resx">
<EmbeddedResource Include="FrmCurve.resx">
<DependentUpon>FrmCurve.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="OldCode\FrmSPCCurve.resx">
<EmbeddedResource Include="FrmSPCCurve.resx">
<DependentUpon>FrmSPCCurve.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="OldCode\FrmStandard.resx">
<DependentUpon>FrmStandard.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\LResource.ja-JP.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
......@@ -430,9 +420,6 @@
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="ReceiveMachineData.resx">
<DependentUpon>ReceiveMachineData.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="testZedGraph.resx">
<DependentUpon>testZedGraph.cs</DependentUpon>
</EmbeddedResource>
......@@ -603,13 +590,11 @@
<None Include="Resources\picture\uss.png" />
</ItemGroup>
<ItemGroup>
<Content Include="DiskSerialNo.dll" />
<None Include="Resources\ButtonBg.png" />
<None Include="Resources\addCurve.png" />
<None Include="PCB.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="License-LGPL.txt" />
<Content Include="Resources\B_click1.png" />
<Content Include="Resources\B_on1.png" />
<None Include="CrystalReport\DataSet1.xsc">
......@@ -629,9 +614,6 @@
<None Include="Resources\export.png" />
<None Include="Resources\OpenFile.png" />
<None Include="Resources\PCB-min.jpg" />
<Content Include="user32.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\picture\量表.png" />
<None Include="app.config">
<SubType>Designer</SubType>
......@@ -748,6 +730,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="bin\" />
<Folder Include="OldCode\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
......
App/From.cs deleted 100644 → 0

\ No newline at end of file
App/Program.cs
......@@ -247,100 +247,100 @@ namespace App
/// <summary>
/// 检测App.exe.config文件并且获取WebService的Url
/// </summary>
public bool CheckAppConfigWebService()
{
FileInfo fi = new FileInfo(GlobalConfig.CLIENTCONFIGNAME);
//public bool CheckAppConfigWebService()
//{
// FileInfo fi = new FileInfo(GlobalConfig.CLIENTCONFIGNAME);
if (!fi.Exists)
return false;
// if (!fi.Exists)
// return false;
GlobalConfig globalconfig = new GlobalConfig();
// GlobalConfig globalconfig = new GlobalConfig();
if (String.IsNullOrEmpty(globalconfig.WebServiceUrl.Trim()))
{
//todo 多语言
MessageBox.Show("客户端设置文件已损坏!\n请联系系统管理员!\n是否继续运行程序?", "软件测试 信息");
return false;
}
// if (String.IsNullOrEmpty(globalconfig.WebServiceUrl.Trim()))
// {
// //todo 多语言
// MessageBox.Show("客户端设置文件已损坏!\n请联系系统管理员!\n是否继续运行程序?", "软件测试 信息");
// return false;
// }
return true;
}
// return true;
//}
//检测本地客户端的主版本并与升级服务器端的最新客户端进行比较
public bool CheckNewVersion()
{
Cursor.Current = Cursors.WaitCursor;
CheckVersion checkversion = new App.CheckVersion();
if (checkversion.SkipCheck)
{
try
{
checkversion.StartCheck();
switch (checkversion.CompareVersion())
{
case 0:
break;
case 1:
if (MessageBox.Show("已检测到存在更新的版本,您是否要现在进行更新?", "MyCMMI 客户端自动更新", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.Yes)
{
checkversion.CallUpdateFile();
return false;
}
break;
case 2:
if (MessageBox.Show("已检测到存在一个比当前更旧的版本,您是否要现在进行更新?", "MyCMMI 客户端自动更新", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
{
checkversion.CallUpdateFile();
return false;
}
break;
default:
{
break;
}
}
}
catch (Exception e)
{
if (MessageBox.Show("无法连接到升级服务器!请联系系统管理员!\n是否继续运行程序?", "自动更新失败", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1) == DialogResult.No)
{
return false;
}
}
}
return true;
}
//public bool CheckNewVersion()
//{
// Cursor.Current = Cursors.WaitCursor;
// CheckVersion checkversion = new App.CheckVersion();
// if (checkversion.SkipCheck)
// {
// try
// {
// checkversion.StartCheck();
// switch (checkversion.CompareVersion())
// {
// case 0:
// break;
// case 1:
// if (MessageBox.Show("已检测到存在更新的版本,您是否要现在进行更新?", "MyCMMI 客户端自动更新", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.Yes)
// {
// checkversion.CallUpdateFile();
// return false;
// }
// break;
// case 2:
// if (MessageBox.Show("已检测到存在一个比当前更旧的版本,您是否要现在进行更新?", "MyCMMI 客户端自动更新", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
// {
// checkversion.CallUpdateFile();
// return false;
// }
// break;
// default:
// {
// break;
// }
// }
// }
// catch (Exception e)
// {
// if (MessageBox.Show("无法连接到升级服务器!请联系系统管理员!\n是否继续运行程序?", "自动更新失败", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1) == DialogResult.No)
// {
// return false;
// }
// }
// }
// return true;
//}
//检测当前用户所用的网络服务器是否在当前客户端支持的范围内
public bool CheckCurrWebService()
{
Cursor.Current = Cursors.WaitCursor;
GetServiceVersion f_GetServiceVerion = new GetServiceVersion();
if (f_GetServiceVerion.CanCheckWebServiceVersion)
{
//f_GetServiceVerion.GetCurrentWebServiceVersion();
if (string.IsNullOrEmpty(f_GetServiceVerion.CurrentWebServiceVersion))
{
if (MessageBox.Show("无法连接到网络服务器,请联系系统管理员!\n是否继续运行程序?", "MyCMMI Client启动故障", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.No)
{
return false;
}
//else
//{
// f_GetServiceVerion.CanCheckWebServiceVersion = false;
//}
}
}
if (!f_GetServiceVerion.CompareWebServiceVersion() && f_GetServiceVerion.CanCheckWebServiceVersion)
{
if (MessageBox.Show("已检测到您选用的网络服务器无法支持您当前的客户端版本!" + "\n" + "请联系系统管理员!\n是否继续运行程序?", "MyCMMI Client启动提示", MessageBoxButtons.YesNo, MessageBoxIcon.Information, MessageBoxDefaultButton.Button2) == DialogResult.No)
{
return false;
}
}
return true;
}
//public bool CheckCurrWebService()
//{
// Cursor.Current = Cursors.WaitCursor;
// GetServiceVersion f_GetServiceVerion = new GetServiceVersion();
// if (f_GetServiceVerion.CanCheckWebServiceVersion)
// {
// //f_GetServiceVerion.GetCurrentWebServiceVersion();
// if (string.IsNullOrEmpty(f_GetServiceVerion.CurrentWebServiceVersion))
// {
// if (MessageBox.Show("无法连接到网络服务器,请联系系统管理员!\n是否继续运行程序?", "MyCMMI Client启动故障", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.No)
// {
// return false;
// }
// //else
// //{
// // f_GetServiceVerion.CanCheckWebServiceVersion = false;
// //}
// }
// }
// if (!f_GetServiceVerion.CompareWebServiceVersion() && f_GetServiceVerion.CanCheckWebServiceVersion)
// {
// if (MessageBox.Show("已检测到您选用的网络服务器无法支持您当前的客户端版本!" + "\n" + "请联系系统管理员!\n是否继续运行程序?", "MyCMMI Client启动提示", MessageBoxButtons.YesNo, MessageBoxIcon.Information, MessageBoxDefaultButton.Button2) == DialogResult.No)
// {
// return false;
// }
// }
// return true;
//}
}
}
\ No newline at end of file
IonicContaminationTest.sln
......@@ -49,7 +49,6 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "WebService", "WebService\",
Release.AspNetCompiler.Debug = "False"
VWDPort = "59831"
VWDDynamicPort = "false"
SlnRelativePath = "WebService\"
DefaultWebSiteLanguage = "Visual C#"
EndProjectSection
EndProject
......@@ -63,6 +62,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "授权升级", "授权升
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "loadingControl", "loadingControl\loadingControl.csproj", "{ED2F12BD-DB28-42B8-8177-18395A10AFA6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "旧项目", "旧项目", "{92B907A3-84AF-4683-9F2D-2E011B875E82}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
......@@ -246,12 +247,17 @@ Global
GlobalSection(NestedProjects) = preSolution
{FB89F830-9695-466E-B495-6D7E1E3AD198} = {EB7075CD-8FB0-4FE5-92D0-67D0F878BB64}
{7DC9A638-7BE8-4CF7-AC2E-57C77F1BF9BC} = {EB7075CD-8FB0-4FE5-92D0-67D0F878BB64}
{6C382361-BBE2-4F1F-A5BE-084C7457EE3E} = {92B907A3-84AF-4683-9F2D-2E011B875E82}
{F63A0939-5ADD-4931-8066-6901B5FBEF67} = {EB7075CD-8FB0-4FE5-92D0-67D0F878BB64}
{2541686B-1673-43BF-AF89-3163945DB009} = {EB7075CD-8FB0-4FE5-92D0-67D0F878BB64}
{88402163-A455-4C86-8F1E-DAA8C3EEF56E} = {92B907A3-84AF-4683-9F2D-2E011B875E82}
{70F73B3C-62BB-4338-A0C6-370528D8FABE} = {92B907A3-84AF-4683-9F2D-2E011B875E82}
{0AD4235A-D1F6-4A47-AB08-5C96CBABC864} = {5FDFF49A-D457-4CB1-9DE0-227A9E7256F0}
{26016A3B-AB63-477E-80E2-9F2B317F528E} = {5FDFF49A-D457-4CB1-9DE0-227A9E7256F0}
{C1EE4B7B-9313-4C5D-B0A8-5A890CDD4B8A} = {5FDFF49A-D457-4CB1-9DE0-227A9E7256F0}
{006FC019-FB8D-4038-9F63-2CC1C2D63388} = {5FDFF49A-D457-4CB1-9DE0-227A9E7256F0}
{F3178C9E-E0A1-4488-94DF-96CC535DFA29} = {92B907A3-84AF-4683-9F2D-2E011B875E82}
{5FDFF49A-D457-4CB1-9DE0-227A9E7256F0} = {92B907A3-84AF-4683-9F2D-2E011B875E82}
{ED2F12BD-DB28-42B8-8177-18395A10AFA6} = {EB7075CD-8FB0-4FE5-92D0-67D0F878BB64}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!