Skip to content

刘韬 / PrintLabel

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ded2484b 由 贾鹏旭
选项

1

1 个父辈 ef20a532
全部展开
内嵌 并排
正在显示 17 个修改的文件 包含 143 行增加 和 60 行删除
PrintLabel/FrmLabel.cs
......@@ -7,9 +7,11 @@ using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using static System.Net.Mime.MediaTypeNames;
namespace PrintLabel
{
......@@ -304,7 +306,6 @@ namespace PrintLabel
private void NumLabelH_ValueChanged(object sender, EventArgs e)
{
Common.LabelPrint.SetLabelSize(Convert.ToSingle(Common.Label[Common.LabelPrint.LabelIndex].Size_mm.Width),Convert.ToSingle(NumLabelH.Value));
}
}
}
PrintLabel/PrintLabel.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa</RootNamespace>
<AssemblyName>Asa.PrintLabel</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
......
PrintLabel/packages.config
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ZXing.Net" version="0.16.9" targetFramework="net462" />
<package id="ZXing.Net" version="0.16.9" targetFramework="net462" requireReinstallation="true" />
</packages>
\ No newline at end of file
PrintLabel_Test/App.config
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
PrintLabel_Test/Form1.Designer.cs
......@@ -39,14 +39,17 @@
this.btn_tsc = new System.Windows.Forms.Button();
this.cb_labelname = new System.Windows.Forms.ComboBox();
this.advanceConfigEdit1 = new ConfigHelper.AdvanceConfigEdit();
this.button7 = new System.Windows.Forms.Button();
this.button10 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// button1
//
this.button1.Location = new System.Drawing.Point(142, 68);
this.button1.Location = new System.Drawing.Point(13, 13);
this.button1.Margin = new System.Windows.Forms.Padding(4);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(123, 49);
this.button1.Size = new System.Drawing.Size(184, 74);
this.button1.TabIndex = 0;
this.button1.Text = "编辑";
this.button1.UseVisualStyleBackColor = true;
......@@ -54,17 +57,19 @@
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(362, 68);
this.textBox1.Location = new System.Drawing.Point(205, 14);
this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(162, 21);
this.textBox1.Size = new System.Drawing.Size(241, 28);
this.textBox1.TabIndex = 1;
this.textBox1.Text = "test2";
//
// button2
//
this.button2.Location = new System.Drawing.Point(362, 122);
this.button2.Location = new System.Drawing.Point(205, 102);
this.button2.Margin = new System.Windows.Forms.Padding(4);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(100, 23);
this.button2.Size = new System.Drawing.Size(150, 34);
this.button2.TabIndex = 2;
this.button2.Text = "加载";
this.button2.UseVisualStyleBackColor = true;
......@@ -72,9 +77,10 @@
//
// button3
//
this.button3.Location = new System.Drawing.Point(142, 123);
this.button3.Location = new System.Drawing.Point(13, 102);
this.button3.Margin = new System.Windows.Forms.Padding(4);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(123, 49);
this.button3.Size = new System.Drawing.Size(184, 74);
this.button3.TabIndex = 3;
this.button3.Text = "打印";
this.button3.UseVisualStyleBackColor = true;
......@@ -82,17 +88,19 @@
//
// textBox2
//
this.textBox2.Location = new System.Drawing.Point(362, 95);
this.textBox2.Location = new System.Drawing.Point(205, 59);
this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(162, 21);
this.textBox2.Size = new System.Drawing.Size(241, 28);
this.textBox2.TabIndex = 4;
this.textBox2.Text = "ZDesigner GT800 (EPL)";
//
// button4
//
this.button4.Location = new System.Drawing.Point(362, 217);
this.button4.Location = new System.Drawing.Point(205, 144);
this.button4.Margin = new System.Windows.Forms.Padding(4);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(100, 23);
this.button4.Size = new System.Drawing.Size(150, 34);
this.button4.TabIndex = 5;
this.button4.Text = "获取状态";
this.button4.UseVisualStyleBackColor = true;
......@@ -100,17 +108,19 @@
//
// pictureBox1
//
this.pictureBox1.Location = new System.Drawing.Point(509, 123);
this.pictureBox1.Location = new System.Drawing.Point(456, 426);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(251, 163);
this.pictureBox1.Size = new System.Drawing.Size(376, 244);
this.pictureBox1.TabIndex = 6;
this.pictureBox1.TabStop = false;
//
// button5
//
this.button5.Location = new System.Drawing.Point(142, 178);
this.button5.Location = new System.Drawing.Point(13, 188);
this.button5.Margin = new System.Windows.Forms.Padding(4);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(123, 47);
this.button5.Size = new System.Drawing.Size(184, 70);
this.button5.TabIndex = 7;
this.button5.Text = "button5";
this.button5.UseVisualStyleBackColor = true;
......@@ -118,9 +128,10 @@
//
// btn_tsc
//
this.btn_tsc.Location = new System.Drawing.Point(82, 377);
this.btn_tsc.Location = new System.Drawing.Point(24, 437);
this.btn_tsc.Margin = new System.Windows.Forms.Padding(4);
this.btn_tsc.Name = "btn_tsc";
this.btn_tsc.Size = new System.Drawing.Size(123, 42);
this.btn_tsc.Size = new System.Drawing.Size(184, 63);
this.btn_tsc.TabIndex = 8;
this.btn_tsc.Text = "TSC Print";
this.btn_tsc.UseVisualStyleBackColor = true;
......@@ -129,23 +140,49 @@
// cb_labelname
//
this.cb_labelname.FormattingEnabled = true;
this.cb_labelname.Location = new System.Drawing.Point(82, 351);
this.cb_labelname.Location = new System.Drawing.Point(24, 378);
this.cb_labelname.Margin = new System.Windows.Forms.Padding(4);
this.cb_labelname.Name = "cb_labelname";
this.cb_labelname.Size = new System.Drawing.Size(160, 20);
this.cb_labelname.Size = new System.Drawing.Size(238, 26);
this.cb_labelname.TabIndex = 9;
//
// advanceConfigEdit1
//
this.advanceConfigEdit1.Location = new System.Drawing.Point(283, 303);
this.advanceConfigEdit1.Location = new System.Drawing.Point(456, 13);
this.advanceConfigEdit1.Margin = new System.Windows.Forms.Padding(6);
this.advanceConfigEdit1.Name = "advanceConfigEdit1";
this.advanceConfigEdit1.Size = new System.Drawing.Size(404, 273);
this.advanceConfigEdit1.Size = new System.Drawing.Size(655, 391);
this.advanceConfigEdit1.TabIndex = 10;
//
// button7
//
this.button7.Location = new System.Drawing.Point(24, 508);
this.button7.Margin = new System.Windows.Forms.Padding(4);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(184, 63);
this.button7.TabIndex = 12;
this.button7.Text = "X400";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
// button10
//
this.button10.Location = new System.Drawing.Point(24, 588);
this.button10.Margin = new System.Windows.Forms.Padding(4);
this.button10.Name = "button10";
this.button10.Size = new System.Drawing.Size(184, 63);
this.button10.TabIndex = 15;
this.button10.Text = "X6";
this.button10.UseVisualStyleBackColor = true;
this.button10.Click += new System.EventHandler(this.button10_Click);
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(885, 588);
this.ClientSize = new System.Drawing.Size(1366, 911);
this.Controls.Add(this.button10);
this.Controls.Add(this.button7);
this.Controls.Add(this.advanceConfigEdit1);
this.Controls.Add(this.cb_labelname);
this.Controls.Add(this.btn_tsc);
......@@ -157,6 +194,7 @@
this.Controls.Add(this.button2);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.button1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Form1";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Form1";
......@@ -180,6 +218,8 @@
private System.Windows.Forms.Button btn_tsc;
private System.Windows.Forms.ComboBox cb_labelname;
private ConfigHelper.AdvanceConfigEdit advanceConfigEdit1;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button button10;
}
}
PrintLabel_Test/Form1.cs
......@@ -81,7 +81,11 @@ namespace PrintLabel_Test
tscConfig.Offset = ConfigHelper.Config.Get("Tsc_Offset", -17D);
tscConfig.Speed = ConfigHelper.Config.Get("Tsc_Speed", 9);
tscConfig.Density = ConfigHelper.Config.Get("Tsc_Density", 12);
print.PrintToTsc1(text, tscConfig, out TscStauts tscStauts);
tscConfig.x = ConfigHelper.Config.Get("Tsc_x", 9);
tscConfig.y = ConfigHelper.Config.Get("Tsc_y", 12);
tscConfig.Gap = ConfigHelper.Config.Get("Tsc_Gap", 3);
tscConfig.GapOffset = ConfigHelper.Config.Get("Tsc_GapOffset", 0.3);
print.PrintToTsc_New(text, tscConfig, out TscStauts tscStauts,out Bitmap bmp);
return;
}
......@@ -92,5 +96,43 @@ namespace PrintLabel_Test
if (cb_labelname.Items.Count>0)
cb_labelname.SelectedIndex = 0;
}
private void button7_Click(object sender, EventArgs e)
{
Dictionary<string, string> text = new Dictionary<string, string>();
text.Add("ri", "123123123123123");
text.Add("pn", "yumtr3123123j");
Dictionary<string, string> keys = new Dictionary<string, string>();
//TSCLIB_DLL.sendcommand("HOME");
print.SetResolution(300);
print.GetLabelName();
print.LoadLabel(cb_labelname.SelectedItem.ToString());
TscConfig tscConfig = new TscConfig();
tscConfig.Offset = ConfigHelper.Config.Get("Tsc_Offset", -17D);
tscConfig.Speed = ConfigHelper.Config.Get("Tsc_Speed", 9);
tscConfig.Density = ConfigHelper.Config.Get("Tsc_Density", 12);
tscConfig.GapOffset = ConfigHelper.Config.Get("Tsc_GapOffset", 0);
tscConfig.Gap = ConfigHelper.Config.Get("Tsc_Gap", 0);
print.PrintToTsc_X400(keys, tscConfig, out TscStauts tscStauts);
}
private void button10_Click(object sender, EventArgs e)
{
Dictionary<string, string> text = new Dictionary<string, string>();
text.Add("ri", "666");
text.Add("pn", "777");
Dictionary<string, string> keys = new Dictionary<string, string>();
//TSCLIB_DLL.sendcommand("HOME");
print.SetResolution(300);
print.GetLabelName();
print.LoadLabel(cb_labelname.SelectedItem.ToString());
TscConfig tscConfig = new TscConfig();
tscConfig.Offset = ConfigHelper.Config.Get("Tsc_Offset", -17D);
tscConfig.Speed = ConfigHelper.Config.Get("Tsc_Speed", 9);
tscConfig.Density = ConfigHelper.Config.Get("Tsc_Density", 12);
tscConfig.GapOffset = ConfigHelper.Config.Get("Tsc_GapOffset", 0);
tscConfig.Directions = ConfigHelper.Config.Get("Tsc_Directions", 1);
print.PrintToTsc_X6(keys, tscConfig, out TscStauts tscStauts);
}
}
}
PrintLabel_Test/PrintLabel_Test.csproj
......@@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>PrintLabel_Test</RootNamespace>
<AssemblyName>PrintLabel_Test</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
......@@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ConfigHelper">
<HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
<HintPath>..\..\..\类库\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="SdkApi.Desktop, Version=2.15.2634.0, Culture=neutral, processorArchitecture=MSIL">
......@@ -54,6 +54,10 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="ZebraPrinterHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\ZebraPrinterHelper.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Form1.cs">
......@@ -104,10 +108,6 @@
<Project>{b8f25ece-dee6-41d6-8ef0-8afbf2577c17}</Project>
<Name>PrintLabel</Name>
</ProjectReference>
<ProjectReference Include="..\ZebraPrinterHelper\ZebraPrinterHelper.csproj">
<Project>{e4f7afc7-2f6d-4685-8350-3c05697428ea}</Project>
<Name>ZebraPrinterHelper</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
PrintLabel_Test/Properties/Resources.Designer.cs
......@@ -19,7 +19,7 @@ namespace PrintLabel_Test.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
......
PrintLabel_Test/Properties/Settings.Designer.cs
......@@ -12,7 +12,7 @@ namespace PrintLabel_Test.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
ZebraDemoSource/App.config
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
ZebraDemoSource/DeveloperDemo_Windows.csproj
......@@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>Zebra.Windows.DevDemo</RootNamespace>
<AssemblyName>DeveloperDemo.Windows</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
......
ZebraDemoSource/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
......@@ -13,13 +13,13 @@ namespace Zebra.Windows.DevDemo.Properties {
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
......@@ -33,7 +33,7 @@ namespace Zebra.Windows.DevDemo.Properties {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
......@@ -47,8 +47,8 @@ namespace Zebra.Windows.DevDemo.Properties {
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
......
ZebraDemoSource/Properties/Settings.Designer.cs
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
......@@ -12,7 +12,7 @@ namespace Zebra.Windows.DevDemo.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
ZebraPrinterHelper/App.config
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
ZebraPrinterHelper/ZebraPrinterHelper.csproj
......@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ZebraPrinterHelper</RootNamespace>
<AssemblyName>ZebraPrinterHelper</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!