Merge branch 'dev' of http://192.168.1.123:10080/gaoshipeng/OTS2_0 into dev

OTS/OTSIncAMeasureApp/MeasureCheckReportInfoWindow.cs

@@ -1,5 +1,5 @@
 
-using OTSSysMgrTools;
+//using OTSSysMgrTools;
 using System;
 using System.Collections;
 using System.Collections.Generic;

OTS/OTSIncAMeasureApp/MeasureProgressInfoWindow.cs

@@ -15,14 +15,14 @@ namespace OTSIncAMeasureApp
     public partial class MeasureProgressInfoWindow : Form
     {
         //国际化
-        OTSSysMgrTools.Language lan;
+        Language lan;
         Hashtable table;
         public MeasureProgressInfoWindow()
         {
             InitializeComponent();
             //this.ControlBox = false;
             //国际化
-            lan = new OTSSysMgrTools.Language(this);
+            lan = new Language(this);
             table = lan.GetNameTable(this.Name);
         }
         private void MeasureProgressInfoWindow_Load(object sender, EventArgs e)

OTS/OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -164,7 +164,7 @@ namespace OTSIncAMeasureApp
         public static string m_NoWindowName = "未知工作窗口";
         public static NLog.Logger Nloger = NLog.LogManager.GetCurrentClassLogger();
         //国际化
-        OTSSysMgrTools.Language lan;
+        Language lan;
         Hashtable table;
 
         public  OTSRibbonFun m_RibbonFun = null;
@@ -243,7 +243,7 @@ namespace OTSIncAMeasureApp
             m_RibbonFun = new OTSRibbonFun(this);
 
             //国际化
-            lan = new OTSSysMgrTools.Language(this);
+            lan = new Language(this);
             table = lan.GetNameTable(this.Name);
             m_SamplespaceWindowName = table["m_samplespacewindowname"].ToString();
             m_MeasureStauWindowName = table["m_measurestauwindowname"].ToString();
@@ -258,20 +258,20 @@ namespace OTSIncAMeasureApp
         {
             //判断当前用户是否注册
             string message = string.Empty;
-            if (!OTSSystemManagerForms.IsValidLicense(ref message))
-            {
-                message = table["message1"].ToString();
-                if (MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information) == DialogResult.OK)
-                {
-                    //释放日志指针
-                   // Nloger.EndCSharpLogFile();
-                    this.Close();
-                    Application.Exit();
-                    Application.ExitThread();
-                    System.Environment.Exit(0);
-                }
-                return false;
-            }
+            //if (!OTSSystemManagerForms.IsValidLicense(ref message))
+            //{
+                //message = table["message1"].ToString();
+                //if (MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information) == DialogResult.OK)
+                //{
+                //    //释放日志指针
+                //   // Nloger.EndCSharpLogFile();
+                //    this.Close();
+                //    Application.Exit();
+                //    Application.ExitThread();
+                //    System.Environment.Exit(0);
+                //}
+                //return false;
+            //}
             return true;
         }
         private void OTSIncAMeasureAppForm_Load(object sender, EventArgs e)

OTS/OTSIncAMeasureApp/OTSMeasureResultWindow.cs

@@ -13,6 +13,7 @@ using System.Xml;
 using System.Threading;
 using System.Reflection;
 using System.Collections;
+using OTSDataType;
 
 namespace OTSIncAMeasureApp
 {
@@ -43,15 +44,16 @@ namespace OTSIncAMeasureApp
         //获取XML 路径
         //static string m_XmlFilePath = System.Configuration.ConfigurationManager.ConnectionStrings["XMLFilePath"].ConnectionString;
         //国际化
-        OTSSysMgrTools.Language lan;
+        Language lan;
         Hashtable table;
+        protected static NLog.Logger loger = NLog.LogManager.GetCurrentClassLogger();
         #endregion
         public OTSMeasureResultWindow(OTSIncAMeasureAppForm MeasureAppForm)
         {
             InitializeComponent();
             m_MeasureAppForm = MeasureAppForm;
             //国际化
-            lan = new OTSSysMgrTools.Language(this);
+            lan = new Language(this);
             table = lan.GetNameTable(this.Name);
         }
 
@@ -191,7 +193,7 @@ namespace OTSIncAMeasureApp
             }
             catch (Exception ex)
             {
-                m_MeasureAppForm.Nloger.TraceLog("OTSMeasureResultWindow_SetProgressInfo():" + ex.ToString());
+                loger.Trace("OTSMeasureResultWindow_SetProgressInfo():" + ex.ToString());
             }
         }
         /// <summary>
@@ -293,7 +295,7 @@ namespace OTSIncAMeasureApp
                 int IParticleAmount = 0;
                 //颗粒面积总数量
                 double dAreaAmount = 0;
-                COTSSampleClr WSample = m_MeasureAppForm.m_DataMgrFun.GetWorkSample();
+                COTSSample WSample = m_MeasureAppForm.m_DataMgrFun.GetWorkSample();
                 //list 序列化 DataTable
                 DataTable dt = ListConvertToDT(list);
                 //实力标准库管理类
@@ -338,7 +340,7 @@ namespace OTSIncAMeasureApp
             catch (Exception ex)
             {
                 string str = table["str8"].ToString();
-                m_MeasureAppForm.Nloger.TraceLog(str + ex.ToString());
+                loger.Trace(str + ex.ToString());
             }
         }
         #endregion
@@ -365,7 +367,7 @@ namespace OTSIncAMeasureApp
 
                 for (int i = 0; i < list.Count; i++)
                 {
-                    CMsrResultItemClr cMsrResultItemClr = (CMsrResultItemClr)list[i];
+                    CMsrResultItem cMsrResultItemClr = (CMsrResultItem)list[i];
                     DataRow dr = result.NewRow();
                     dr[0] = cMsrResultItemClr.GetTypeId();
                     dr[1] = cMsrResultItemClr.GetNumber();
@@ -389,12 +391,12 @@ namespace OTSIncAMeasureApp
         public void GetResultFileInfoBySampleName(string sampleName)
         {
             //显示样品名称信息
-            COTSSampleClr sampleClr = m_MeasureAppForm.m_DataMgrFun.m_ProjDataMgr.GetSampleByName(sampleName);
+            COTSSample sampleClr = m_MeasureAppForm.m_DataMgrFun.m_ProjDataMgr.GetSampleByName(sampleName);
             //设置当前样品名称
             SetSampleName(sampleName);
             //已完成的数量
             int CompleteFieldCount = sampleClr.GetMsrStatus().GetCompletedFields();
-            int MeasureFieldTotalCount = sampleClr.GetMsrStatus().GetStatus();
+            int MeasureFieldTotalCount = (int)sampleClr.GetMsrStatus().GetStatus();
             int ParticleCount = 0;
             if (CompleteFieldCount > 0)
             {
@@ -408,7 +410,7 @@ namespace OTSIncAMeasureApp
                 //获取测量时间
                 SetMeasureTime(usedTimeTS);
                 //获取结果文件 颗粒列表信息
-                List<CMsrResultItemClr> cMsrResultItemClrList = sampleClr.GetMsrResults().GetResultItems();
+                List<CMsrResultItem> cMsrResultItemClrList = sampleClr.GetMsrResults().GetResultItems();
                 //设置测量状态数据列表
                 SetMeasureListInfo(cMsrResultItemClrList);
             }

OTS/OTSIncAMeasureApp/OTSSolutionWindow.cs

@@ -12,6 +12,7 @@ using System.Runtime.InteropServices;
 
 using System.IO;
 using System.Collections;
+using OTSDataType;
 //using OTSIncAMeasureApp.OTSDisplayTreeViewData;
 
 namespace OTSIncAMeasureApp
@@ -36,15 +37,17 @@ namespace OTSIncAMeasureApp
         //工作样品属性参数
         public CTreeSampleParam m_WorkSampleParam = new CTreeSampleParam();
         //国际化
-        OTSSysMgrTools.Language lan;
+        Language lan;
         Hashtable table;
+        protected static NLog.Logger loger = NLog.LogManager.GetCurrentClassLogger();
+
         public OTSSolutionWindow(OTSIncAMeasureAppForm MeasureAppForm)
         {
             InitializeComponent();
             m_MeasureAppForm = MeasureAppForm;
             m_TreeViewBase = new OTSDisplayTreeBase(this);
             //国际化
-            lan = new OTSSysMgrTools.Language(this);
+            lan = new Language(this);
             table = lan.GetNameTable(this.Name);
             m_DefaultSolutionName = table["m_defaultsolutionname"].ToString();
             m_DefaultSampleName = table["m_defaultsamplename"].ToString();
@@ -321,11 +324,11 @@ namespace OTSIncAMeasureApp
                 //获取样品节点的测量参数锁状态
                 if (!m_TreeViewBase.GetSampleNodeLockStatu(ref bLockStatu))
                 {
-                    m_MeasureAppForm.Nloger.TraceErrorLog("(OTSSolutionWindow.treeView1_NodeMouseClick )  m_TreeViewBase.GetSampleNodeLockStatu(m_WorkSampleNode, ref bLockStatu) = false  Failed !");
+                    loger.Error("(OTSSolutionWindow.treeView1_NodeMouseClick )  m_TreeViewBase.GetSampleNodeLockStatu(m_WorkSampleNode, ref bLockStatu) = false  Failed !");
                 }
                 SampleParaLock.Checked = bLockStatu;
                 //显示清除测量数据
-                COTSSampleClr cSample = m_MeasureAppForm.m_DataMgrFun.GetWorkSample();
+                COTSSample cSample = m_MeasureAppForm.m_DataMgrFun.GetWorkSample();
                 if (cSample.GetName() == tn.Text)
                 {
                     //当前工作样品的测量区域 获取帧图信息
@@ -545,13 +548,13 @@ namespace OTSIncAMeasureApp
             string sWSampleName = moveNode.Text;
             if ("" == sWSampleName)
             {
-                m_MeasureAppForm.Nloger.TraceErrorLog("(OTSSolutionWindow.treeView1_DragDrop )  moveNode.Text = null  Failed !");
+                loger.Error("(OTSSolutionWindow.treeView1_DragDrop )  moveNode.Text = null  Failed !");
                 return;
             }
             //将拖动样品设置为工作样品
             if (!m_MeasureAppForm.SetWorkSample(moveNode.Text))
             {
-                m_MeasureAppForm.Nloger.TraceErrorLog("(OTSSolutionWindow.treeView1_DragDrop )  m_MeasureAppForm.SetWorkSample(moveNode.Text) = false  Failed !");
+                loger.Error("(OTSSolutionWindow.treeView1_DragDrop )  m_MeasureAppForm.SetWorkSample(moveNode.Text) = false  Failed !");
                 return;
             }
 

OTS/OTSModelSharp/OTSLicMgr.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using static OTSDataType.otsdataconst;
 
+
 namespace OTSModelSharp
 {
     public class COTSLicMgr
@@ -71,9 +72,12 @@ namespace OTSModelSharp
        public String SUPPORT_EMAIL_TITLE = "License info";
 
         // constructor
-        public void OTSLicenseFile()
+        public COTSLicMgr()
         {
-            Init();
+            m_nPackId = OTS_SOFT_PACKAGE_ID.INVALID;
+            m_nLicStatus = OTS_LICENSE_STATUS.INVALID;
+            m_pOTSLicenseFile = null;
+            MultiLang.GetInstance().LoadStringFromXml();
         }
 
         // initialization

OTS/OTSSysMgrApp/OTSSystemManagerForms.Designer.cs

@@ -30,22 +30,6 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OTSSystemManagerForms));
             this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabLicenseSet = new System.Windows.Forms.TabPage();
-            this.lnklab_about = new System.Windows.Forms.LinkLabel();
-            this.btnRemove = new System.Windows.Forms.Button();
-            this.btnRequest = new System.Windows.Forms.Button();
-            this.btnUpdate = new System.Windows.Forms.Button();
-            this.tbExpireDate = new System.Windows.Forms.TextBox();
-            this.tbPassType = new System.Windows.Forms.TextBox();
-            this.tbOTSProduct = new System.Windows.Forms.TextBox();
-            this.tbLHardwareID = new System.Windows.Forms.TextBox();
-            this.lblExpireDate = new System.Windows.Forms.Label();
-            this.lblOTSProduct = new System.Windows.Forms.Label();
-            this.tbLComupterName = new System.Windows.Forms.TextBox();
-            this.lblLHardwareID = new System.Windows.Forms.Label();
-            this.lblPassType = new System.Windows.Forms.Label();
-            this.lblLComupterName = new System.Windows.Forms.Label();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.tabHardwareSet = new System.Windows.Forms.TabPage();
             this.rbEsprit21 = new System.Windows.Forms.RadioButton();
             this.rbEsprit19 = new System.Windows.Forms.RadioButton();
@@ -60,16 +44,32 @@
             this.button2 = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.tabLanguage = new System.Windows.Forms.TabPage();
-            this.rdb_ch = new System.Windows.Forms.RadioButton();
-            this.rdb_en = new System.Windows.Forms.RadioButton();
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
+            this.rdb_en = new System.Windows.Forms.RadioButton();
+            this.rdb_ch = new System.Windows.Forms.RadioButton();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.lblLComupterName = new System.Windows.Forms.Label();
+            this.lblPassType = new System.Windows.Forms.Label();
+            this.lblLHardwareID = new System.Windows.Forms.Label();
+            this.tbLComupterName = new System.Windows.Forms.TextBox();
+            this.lblOTSProduct = new System.Windows.Forms.Label();
+            this.lblExpireDate = new System.Windows.Forms.Label();
+            this.tbLHardwareID = new System.Windows.Forms.TextBox();
+            this.tbOTSProduct = new System.Windows.Forms.TextBox();
+            this.tbPassType = new System.Windows.Forms.TextBox();
+            this.tbExpireDate = new System.Windows.Forms.TextBox();
+            this.btnUpdate = new System.Windows.Forms.Button();
+            this.btnRequest = new System.Windows.Forms.Button();
+            this.btnRemove = new System.Windows.Forms.Button();
+            this.lnklab_about = new System.Windows.Forms.LinkLabel();
+            this.tabLicenseSet = new System.Windows.Forms.TabPage();
             this.tabControl1.SuspendLayout();
-            this.tabLicenseSet.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.tabHardwareSet.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.tabLanguage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.tabLicenseSet.SuspendLayout();
             this.SuspendLayout();
             // 
             // tabControl1
@@ -79,187 +79,12 @@
             this.tabControl1.Controls.Add(this.tabLanguage);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(830, 326);
+            this.tabControl1.Size = new System.Drawing.Size(557, 229);
             this.tabControl1.TabIndex = 0;
-            // 
-            // tabLicenseSet
-            // 
-            this.tabLicenseSet.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.tabLicenseSet.Controls.Add(this.lnklab_about);
-            this.tabLicenseSet.Controls.Add(this.btnRemove);
-            this.tabLicenseSet.Controls.Add(this.btnRequest);
-            this.tabLicenseSet.Controls.Add(this.btnUpdate);
-            this.tabLicenseSet.Controls.Add(this.tbExpireDate);
-            this.tabLicenseSet.Controls.Add(this.tbPassType);
-            this.tabLicenseSet.Controls.Add(this.tbOTSProduct);
-            this.tabLicenseSet.Controls.Add(this.tbLHardwareID);
-            this.tabLicenseSet.Controls.Add(this.lblExpireDate);
-            this.tabLicenseSet.Controls.Add(this.lblOTSProduct);
-            this.tabLicenseSet.Controls.Add(this.tbLComupterName);
-            this.tabLicenseSet.Controls.Add(this.lblLHardwareID);
-            this.tabLicenseSet.Controls.Add(this.lblPassType);
-            this.tabLicenseSet.Controls.Add(this.lblLComupterName);
-            this.tabLicenseSet.Controls.Add(this.pictureBox1);
-            this.tabLicenseSet.Location = new System.Drawing.Point(4, 28);
-            this.tabLicenseSet.Name = "tabLicenseSet";
-            this.tabLicenseSet.Padding = new System.Windows.Forms.Padding(3);
-            this.tabLicenseSet.Size = new System.Drawing.Size(822, 294);
-            this.tabLicenseSet.TabIndex = 0;
-            this.tabLicenseSet.Text = "通行证";
-            this.tabLicenseSet.UseVisualStyleBackColor = true;
-            // 
-            // lnklab_about
-            // 
-            this.lnklab_about.AutoSize = true;
-            this.lnklab_about.Location = new System.Drawing.Point(701, 264);
-            this.lnklab_about.Name = "lnklab_about";
-            this.lnklab_about.Size = new System.Drawing.Size(71, 18);
-            this.lnklab_about.TabIndex = 22;
-            this.lnklab_about.TabStop = true;
-            this.lnklab_about.Text = "OTS版本";
-            this.lnklab_about.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnklab_about_LinkClicked);
-            // 
-            // btnRemove
-            // 
-            this.btnRemove.Location = new System.Drawing.Point(690, 213);
-            this.btnRemove.Name = "btnRemove";
-            this.btnRemove.Size = new System.Drawing.Size(100, 36);
-            this.btnRemove.TabIndex = 19;
-            this.btnRemove.Text = "移除";
-            this.btnRemove.UseVisualStyleBackColor = true;
-            this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click);
-            // 
-            // btnRequest
-            // 
-            this.btnRequest.Location = new System.Drawing.Point(690, 63);
-            this.btnRequest.Name = "btnRequest";
-            this.btnRequest.Size = new System.Drawing.Size(100, 36);
-            this.btnRequest.TabIndex = 18;
-            this.btnRequest.Text = "请求";
-            this.btnRequest.UseVisualStyleBackColor = true;
-            this.btnRequest.Click += new System.EventHandler(this.btnRequest_Click);
-            // 
-            // btnUpdate
-            // 
-            this.btnUpdate.Location = new System.Drawing.Point(690, 13);
-            this.btnUpdate.Name = "btnUpdate";
-            this.btnUpdate.Size = new System.Drawing.Size(100, 36);
-            this.btnUpdate.TabIndex = 17;
-            this.btnUpdate.Text = "激活";
-            this.btnUpdate.UseVisualStyleBackColor = true;
-            this.btnUpdate.Click += new System.EventHandler(this.btnActive_Click);
-            // 
-            // tbExpireDate
-            // 
-            this.tbExpireDate.Enabled = false;
-            this.tbExpireDate.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbExpireDate.Location = new System.Drawing.Point(300, 215);
-            this.tbExpireDate.Name = "tbExpireDate";
-            this.tbExpireDate.Size = new System.Drawing.Size(379, 31);
-            this.tbExpireDate.TabIndex = 12;
-            // 
-            // tbPassType
-            // 
-            this.tbPassType.Enabled = false;
-            this.tbPassType.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbPassType.Location = new System.Drawing.Point(300, 166);
-            this.tbPassType.Name = "tbPassType";
-            this.tbPassType.Size = new System.Drawing.Size(379, 31);
-            this.tbPassType.TabIndex = 13;
-            // 
-            // tbOTSProduct
-            // 
-            this.tbOTSProduct.Enabled = false;
-            this.tbOTSProduct.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbOTSProduct.Location = new System.Drawing.Point(300, 117);
-            this.tbOTSProduct.Name = "tbOTSProduct";
-            this.tbOTSProduct.Size = new System.Drawing.Size(379, 31);
-            this.tbOTSProduct.TabIndex = 14;
-            // 
-            // tbLHardwareID
-            // 
-            this.tbLHardwareID.Enabled = false;
-            this.tbLHardwareID.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbLHardwareID.Location = new System.Drawing.Point(300, 65);
-            this.tbLHardwareID.Name = "tbLHardwareID";
-            this.tbLHardwareID.Size = new System.Drawing.Size(379, 31);
-            this.tbLHardwareID.TabIndex = 15;
-            // 
-            // lblExpireDate
-            // 
-            this.lblExpireDate.AutoSize = true;
-            this.lblExpireDate.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblExpireDate.Location = new System.Drawing.Point(166, 221);
-            this.lblExpireDate.Name = "lblExpireDate";
-            this.lblExpireDate.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
-            this.lblExpireDate.Size = new System.Drawing.Size(67, 18);
-            this.lblExpireDate.TabIndex = 7;
-            this.lblExpireDate.Text = "有效期";
-            // 
-            // lblOTSProduct
-            // 
-            this.lblOTSProduct.AutoSize = true;
-            this.lblOTSProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblOTSProduct.Location = new System.Drawing.Point(166, 123);
-            this.lblOTSProduct.Name = "lblOTSProduct";
-            this.lblOTSProduct.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
-            this.lblOTSProduct.Size = new System.Drawing.Size(76, 18);
-            this.lblOTSProduct.TabIndex = 8;
-            this.lblOTSProduct.Text = "OTS产品";
-            // 
-            // tbLComupterName
-            // 
-            this.tbLComupterName.Enabled = false;
-            this.tbLComupterName.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbLComupterName.Location = new System.Drawing.Point(300, 16);
-            this.tbLComupterName.Name = "tbLComupterName";
-            this.tbLComupterName.Size = new System.Drawing.Size(379, 31);
-            this.tbLComupterName.TabIndex = 16;
-            // 
-            // lblLHardwareID
-            // 
-            this.lblLHardwareID.AutoSize = true;
-            this.lblLHardwareID.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblLHardwareID.Location = new System.Drawing.Point(166, 71);
-            this.lblLHardwareID.Name = "lblLHardwareID";
-            this.lblLHardwareID.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
-            this.lblLHardwareID.Size = new System.Drawing.Size(67, 18);
-            this.lblLHardwareID.TabIndex = 9;
-            this.lblLHardwareID.Text = "硬件ID";
-            // 
-            // lblPassType
-            // 
-            this.lblPassType.AutoSize = true;
-            this.lblPassType.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblPassType.Location = new System.Drawing.Point(166, 172);
-            this.lblPassType.Name = "lblPassType";
-            this.lblPassType.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
-            this.lblPassType.Size = new System.Drawing.Size(103, 18);
-            this.lblPassType.TabIndex = 10;
-            this.lblPassType.Text = "通行证类型";
-            // 
-            // lblLComupterName
-            // 
-            this.lblLComupterName.AutoSize = true;
-            this.lblLComupterName.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblLComupterName.Location = new System.Drawing.Point(166, 22);
-            this.lblLComupterName.Name = "lblLComupterName";
-            this.lblLComupterName.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
-            this.lblLComupterName.Size = new System.Drawing.Size(103, 18);
-            this.lblLComupterName.TabIndex = 11;
-            this.lblLComupterName.Text = "计算机名称";
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(56, 34);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(100, 100);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.pictureBox1.TabIndex = 6;
-            this.pictureBox1.TabStop = false;
+            this.tabControl1.Visible = false;
             // 
             // tabHardwareSet
             // 
@@ -275,10 +100,11 @@
             this.tabHardwareSet.Controls.Add(this.pictureBox2);
             this.tabHardwareSet.Controls.Add(this.button2);
             this.tabHardwareSet.Controls.Add(this.button1);
-            this.tabHardwareSet.Location = new System.Drawing.Point(4, 28);
+            this.tabHardwareSet.Location = new System.Drawing.Point(4, 22);
+            this.tabHardwareSet.Margin = new System.Windows.Forms.Padding(2);
             this.tabHardwareSet.Name = "tabHardwareSet";
-            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(3);
-            this.tabHardwareSet.Size = new System.Drawing.Size(822, 294);
+            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(2);
+            this.tabHardwareSet.Size = new System.Drawing.Size(549, 203);
             this.tabHardwareSet.TabIndex = 1;
             this.tabHardwareSet.Text = "硬件";
             this.tabHardwareSet.UseVisualStyleBackColor = true;
@@ -286,9 +112,10 @@
             // rbEsprit21
             // 
             this.rbEsprit21.AutoSize = true;
-            this.rbEsprit21.Location = new System.Drawing.Point(297, 214);
+            this.rbEsprit21.Location = new System.Drawing.Point(198, 143);
+            this.rbEsprit21.Margin = new System.Windows.Forms.Padding(2);
             this.rbEsprit21.Name = "rbEsprit21";
-            this.rbEsprit21.Size = new System.Drawing.Size(249, 22);
+            this.rbEsprit21.Size = new System.Drawing.Size(167, 16);
             this.rbEsprit21.TabIndex = 15;
             this.rbEsprit21.Text = "Bruker.API.Esprit2.1.dll";
             this.rbEsprit21.UseVisualStyleBackColor = true;
@@ -298,9 +125,10 @@
             // 
             this.rbEsprit19.AutoSize = true;
             this.rbEsprit19.Checked = true;
-            this.rbEsprit19.Location = new System.Drawing.Point(297, 180);
+            this.rbEsprit19.Location = new System.Drawing.Point(198, 120);
+            this.rbEsprit19.Margin = new System.Windows.Forms.Padding(2);
             this.rbEsprit19.Name = "rbEsprit19";
-            this.rbEsprit19.Size = new System.Drawing.Size(249, 22);
+            this.rbEsprit19.Size = new System.Drawing.Size(167, 16);
             this.rbEsprit19.TabIndex = 15;
             this.rbEsprit19.TabStop = true;
             this.rbEsprit19.Text = "Bruker.API.Esprit1.9.dll";
@@ -317,9 +145,10 @@
             "ESEM",
             "ZEISS",
             "Oxford"});
-            this.CmbSEMController.Location = new System.Drawing.Point(274, 34);
+            this.CmbSEMController.Location = new System.Drawing.Point(183, 23);
+            this.CmbSEMController.Margin = new System.Windows.Forms.Padding(2);
             this.CmbSEMController.Name = "CmbSEMController";
-            this.CmbSEMController.Size = new System.Drawing.Size(354, 26);
+            this.CmbSEMController.Size = new System.Drawing.Size(237, 20);
             this.CmbSEMController.TabIndex = 13;
             // 
             // CmbEDSController
@@ -330,16 +159,18 @@
             "Bruker",
             "OffLine",
             "Oxford"});
-            this.CmbEDSController.Location = new System.Drawing.Point(274, 110);
+            this.CmbEDSController.Location = new System.Drawing.Point(183, 73);
+            this.CmbEDSController.Margin = new System.Windows.Forms.Padding(2);
             this.CmbEDSController.Name = "CmbEDSController";
-            this.CmbEDSController.Size = new System.Drawing.Size(354, 26);
+            this.CmbEDSController.Size = new System.Drawing.Size(237, 20);
             this.CmbEDSController.TabIndex = 14;
             // 
             // btnEDSTest
             // 
-            this.btnEDSTest.Location = new System.Drawing.Point(644, 104);
+            this.btnEDSTest.Location = new System.Drawing.Point(429, 69);
+            this.btnEDSTest.Margin = new System.Windows.Forms.Padding(2);
             this.btnEDSTest.Name = "btnEDSTest";
-            this.btnEDSTest.Size = new System.Drawing.Size(116, 36);
+            this.btnEDSTest.Size = new System.Drawing.Size(77, 24);
             this.btnEDSTest.TabIndex = 12;
             this.btnEDSTest.Text = "EDS测试";
             this.btnEDSTest.UseVisualStyleBackColor = true;
@@ -347,9 +178,10 @@
             // 
             // btnSEMTest
             // 
-            this.btnSEMTest.Location = new System.Drawing.Point(644, 30);
+            this.btnSEMTest.Location = new System.Drawing.Point(429, 20);
+            this.btnSEMTest.Margin = new System.Windows.Forms.Padding(2);
             this.btnSEMTest.Name = "btnSEMTest";
-            this.btnSEMTest.Size = new System.Drawing.Size(116, 36);
+            this.btnSEMTest.Size = new System.Drawing.Size(77, 24);
             this.btnSEMTest.TabIndex = 10;
             this.btnSEMTest.Text = "SEM测试";
             this.btnSEMTest.UseVisualStyleBackColor = true;
@@ -358,54 +190,60 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(173, 182);
+            this.label1.Location = new System.Drawing.Point(115, 121);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(98, 18);
+            this.label1.Size = new System.Drawing.Size(65, 12);
             this.label1.TabIndex = 8;
             this.label1.Text = "Bruker版本";
             // 
             // lblHEDSController
             // 
             this.lblHEDSController.AutoSize = true;
-            this.lblHEDSController.Location = new System.Drawing.Point(183, 112);
+            this.lblHEDSController.Location = new System.Drawing.Point(122, 75);
+            this.lblHEDSController.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblHEDSController.Name = "lblHEDSController";
-            this.lblHEDSController.Size = new System.Drawing.Size(89, 18);
+            this.lblHEDSController.Size = new System.Drawing.Size(59, 12);
             this.lblHEDSController.TabIndex = 8;
             this.lblHEDSController.Text = "EDS控制器";
             // 
             // lblHSEMController
             // 
             this.lblHSEMController.AutoSize = true;
-            this.lblHSEMController.Location = new System.Drawing.Point(183, 39);
+            this.lblHSEMController.Location = new System.Drawing.Point(122, 26);
+            this.lblHSEMController.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblHSEMController.Name = "lblHSEMController";
-            this.lblHSEMController.Size = new System.Drawing.Size(89, 18);
+            this.lblHSEMController.Size = new System.Drawing.Size(59, 12);
             this.lblHSEMController.TabIndex = 9;
             this.lblHSEMController.Text = "SEM控制器";
             // 
             // pictureBox2
             // 
             this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
-            this.pictureBox2.Location = new System.Drawing.Point(56, 34);
+            this.pictureBox2.Location = new System.Drawing.Point(37, 23);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(100, 100);
+            this.pictureBox2.Size = new System.Drawing.Size(67, 67);
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pictureBox2.TabIndex = 7;
             this.pictureBox2.TabStop = false;
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(722, 548);
+            this.button2.Location = new System.Drawing.Point(481, 365);
+            this.button2.Margin = new System.Windows.Forms.Padding(2);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(100, 34);
+            this.button2.Size = new System.Drawing.Size(67, 23);
             this.button2.TabIndex = 2;
             this.button2.Text = "button1";
             this.button2.UseVisualStyleBackColor = true;
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(614, 548);
+            this.button1.Location = new System.Drawing.Point(409, 365);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(100, 34);
+            this.button1.Size = new System.Drawing.Size(67, 23);
             this.button1.TabIndex = 2;
             this.button1.Text = "button1";
             this.button1.UseVisualStyleBackColor = true;
@@ -415,72 +253,260 @@
             this.tabLanguage.Controls.Add(this.pictureBox3);
             this.tabLanguage.Controls.Add(this.rdb_en);
             this.tabLanguage.Controls.Add(this.rdb_ch);
-            this.tabLanguage.Location = new System.Drawing.Point(4, 28);
+            this.tabLanguage.Location = new System.Drawing.Point(4, 22);
+            this.tabLanguage.Margin = new System.Windows.Forms.Padding(2);
             this.tabLanguage.Name = "tabLanguage";
-            this.tabLanguage.Size = new System.Drawing.Size(822, 294);
+            this.tabLanguage.Size = new System.Drawing.Size(549, 203);
             this.tabLanguage.TabIndex = 2;
             this.tabLanguage.Text = "语言";
             this.tabLanguage.UseVisualStyleBackColor = true;
             // 
-            // rdb_ch
+            // pictureBox3
             // 
-            this.rdb_ch.AutoSize = true;
-            this.rdb_ch.Location = new System.Drawing.Point(221, 37);
-            this.rdb_ch.Name = "rdb_ch";
-            this.rdb_ch.Size = new System.Drawing.Size(105, 22);
-            this.rdb_ch.TabIndex = 0;
-            this.rdb_ch.TabStop = true;
-            this.rdb_ch.Text = "中文[ZH]";
-            this.rdb_ch.UseVisualStyleBackColor = true;
-            this.rdb_ch.CheckedChanged += new System.EventHandler(this.rdb_ch_CheckedChanged);
+            this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
+            this.pictureBox3.Location = new System.Drawing.Point(37, 23);
+            this.pictureBox3.Margin = new System.Windows.Forms.Padding(2);
+            this.pictureBox3.Name = "pictureBox3";
+            this.pictureBox3.Size = new System.Drawing.Size(67, 67);
+            this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pictureBox3.TabIndex = 8;
+            this.pictureBox3.TabStop = false;
             // 
             // rdb_en
             // 
             this.rdb_en.AutoSize = true;
-            this.rdb_en.Location = new System.Drawing.Point(221, 88);
+            this.rdb_en.Location = new System.Drawing.Point(147, 59);
+            this.rdb_en.Margin = new System.Windows.Forms.Padding(2);
             this.rdb_en.Name = "rdb_en";
-            this.rdb_en.Size = new System.Drawing.Size(105, 22);
+            this.rdb_en.Size = new System.Drawing.Size(71, 16);
             this.rdb_en.TabIndex = 0;
             this.rdb_en.TabStop = true;
             this.rdb_en.Text = "英文[EN]";
             this.rdb_en.UseVisualStyleBackColor = true;
             this.rdb_en.CheckedChanged += new System.EventHandler(this.rdb_en_CheckedChanged);
             // 
-            // pictureBox3
+            // rdb_ch
             // 
-            this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
-            this.pictureBox3.Location = new System.Drawing.Point(56, 34);
-            this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(100, 100);
-            this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
-            this.pictureBox3.TabIndex = 8;
-            this.pictureBox3.TabStop = false;
+            this.rdb_ch.AutoSize = true;
+            this.rdb_ch.Location = new System.Drawing.Point(147, 25);
+            this.rdb_ch.Margin = new System.Windows.Forms.Padding(2);
+            this.rdb_ch.Name = "rdb_ch";
+            this.rdb_ch.Size = new System.Drawing.Size(71, 16);
+            this.rdb_ch.TabIndex = 0;
+            this.rdb_ch.TabStop = true;
+            this.rdb_ch.Text = "中文[ZH]";
+            this.rdb_ch.UseVisualStyleBackColor = true;
+            this.rdb_ch.CheckedChanged += new System.EventHandler(this.rdb_ch_CheckedChanged);
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Location = new System.Drawing.Point(37, 23);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(67, 67);
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox1.TabIndex = 6;
+            this.pictureBox1.TabStop = false;
+            // 
+            // lblLComupterName
+            // 
+            this.lblLComupterName.AutoSize = true;
+            this.lblLComupterName.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLComupterName.Location = new System.Drawing.Point(111, 15);
+            this.lblLComupterName.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblLComupterName.Name = "lblLComupterName";
+            this.lblLComupterName.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.lblLComupterName.Size = new System.Drawing.Size(3, 12);
+            this.lblLComupterName.TabIndex = 11;
+            // 
+            // lblPassType
+            // 
+            this.lblPassType.AutoSize = true;
+            this.lblPassType.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblPassType.Location = new System.Drawing.Point(111, 115);
+            this.lblPassType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblPassType.Name = "lblPassType";
+            this.lblPassType.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.lblPassType.Size = new System.Drawing.Size(3, 12);
+            this.lblPassType.TabIndex = 10;
+            // 
+            // lblLHardwareID
+            // 
+            this.lblLHardwareID.AutoSize = true;
+            this.lblLHardwareID.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLHardwareID.Location = new System.Drawing.Point(111, 47);
+            this.lblLHardwareID.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblLHardwareID.Name = "lblLHardwareID";
+            this.lblLHardwareID.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.lblLHardwareID.Size = new System.Drawing.Size(3, 12);
+            this.lblLHardwareID.TabIndex = 9;
+            // 
+            // tbLComupterName
+            // 
+            this.tbLComupterName.Enabled = false;
+            this.tbLComupterName.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbLComupterName.Location = new System.Drawing.Point(200, 11);
+            this.tbLComupterName.Margin = new System.Windows.Forms.Padding(2);
+            this.tbLComupterName.Name = "tbLComupterName";
+            this.tbLComupterName.Size = new System.Drawing.Size(254, 23);
+            this.tbLComupterName.TabIndex = 16;
+            // 
+            // lblOTSProduct
+            // 
+            this.lblOTSProduct.AutoSize = true;
+            this.lblOTSProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblOTSProduct.Location = new System.Drawing.Point(111, 82);
+            this.lblOTSProduct.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblOTSProduct.Name = "lblOTSProduct";
+            this.lblOTSProduct.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.lblOTSProduct.Size = new System.Drawing.Size(3, 12);
+            this.lblOTSProduct.TabIndex = 8;
+            // 
+            // lblExpireDate
+            // 
+            this.lblExpireDate.AutoSize = true;
+            this.lblExpireDate.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblExpireDate.Location = new System.Drawing.Point(111, 147);
+            this.lblExpireDate.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblExpireDate.Name = "lblExpireDate";
+            this.lblExpireDate.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.lblExpireDate.Size = new System.Drawing.Size(3, 12);
+            this.lblExpireDate.TabIndex = 7;
+            // 
+            // tbLHardwareID
+            // 
+            this.tbLHardwareID.Enabled = false;
+            this.tbLHardwareID.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbLHardwareID.Location = new System.Drawing.Point(200, 43);
+            this.tbLHardwareID.Margin = new System.Windows.Forms.Padding(2);
+            this.tbLHardwareID.Name = "tbLHardwareID";
+            this.tbLHardwareID.Size = new System.Drawing.Size(254, 23);
+            this.tbLHardwareID.TabIndex = 15;
+            // 
+            // tbOTSProduct
+            // 
+            this.tbOTSProduct.Enabled = false;
+            this.tbOTSProduct.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbOTSProduct.Location = new System.Drawing.Point(200, 78);
+            this.tbOTSProduct.Margin = new System.Windows.Forms.Padding(2);
+            this.tbOTSProduct.Name = "tbOTSProduct";
+            this.tbOTSProduct.Size = new System.Drawing.Size(254, 23);
+            this.tbOTSProduct.TabIndex = 14;
+            // 
+            // tbPassType
+            // 
+            this.tbPassType.Enabled = false;
+            this.tbPassType.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbPassType.Location = new System.Drawing.Point(200, 111);
+            this.tbPassType.Margin = new System.Windows.Forms.Padding(2);
+            this.tbPassType.Name = "tbPassType";
+            this.tbPassType.Size = new System.Drawing.Size(254, 23);
+            this.tbPassType.TabIndex = 13;
+            // 
+            // tbExpireDate
+            // 
+            this.tbExpireDate.Enabled = false;
+            this.tbExpireDate.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbExpireDate.Location = new System.Drawing.Point(200, 143);
+            this.tbExpireDate.Margin = new System.Windows.Forms.Padding(2);
+            this.tbExpireDate.Name = "tbExpireDate";
+            this.tbExpireDate.Size = new System.Drawing.Size(254, 23);
+            this.tbExpireDate.TabIndex = 12;
+            // 
+            // btnUpdate
+            // 
+            this.btnUpdate.Location = new System.Drawing.Point(460, 9);
+            this.btnUpdate.Margin = new System.Windows.Forms.Padding(2);
+            this.btnUpdate.Name = "btnUpdate";
+            this.btnUpdate.Size = new System.Drawing.Size(67, 24);
+            this.btnUpdate.TabIndex = 17;
+            this.btnUpdate.Text = "激活";
+            this.btnUpdate.UseVisualStyleBackColor = true;
+            // 
+            // btnRequest
+            // 
+            this.btnRequest.Location = new System.Drawing.Point(460, 42);
+            this.btnRequest.Margin = new System.Windows.Forms.Padding(2);
+            this.btnRequest.Name = "btnRequest";
+            this.btnRequest.Size = new System.Drawing.Size(67, 24);
+            this.btnRequest.TabIndex = 18;
+            this.btnRequest.Text = "请求";
+            this.btnRequest.UseVisualStyleBackColor = true;
+            // 
+            // btnRemove
+            // 
+            this.btnRemove.Location = new System.Drawing.Point(460, 142);
+            this.btnRemove.Margin = new System.Windows.Forms.Padding(2);
+            this.btnRemove.Name = "btnRemove";
+            this.btnRemove.Size = new System.Drawing.Size(67, 24);
+            this.btnRemove.TabIndex = 19;
+            this.btnRemove.Text = "移除";
+            this.btnRemove.UseVisualStyleBackColor = true;
+            // 
+            // lnklab_about
+            // 
+            this.lnklab_about.AutoSize = true;
+            this.lnklab_about.Location = new System.Drawing.Point(467, 176);
+            this.lnklab_about.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lnklab_about.Name = "lnklab_about";
+            this.lnklab_about.Size = new System.Drawing.Size(0, 12);
+            this.lnklab_about.TabIndex = 22;
+            this.lnklab_about.TabStop = true;
+            this.lnklab_about.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnklab_about_LinkClicked);
+            // 
+            // tabLicenseSet
+            // 
+            this.tabLicenseSet.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.tabLicenseSet.Controls.Add(this.lnklab_about);
+            this.tabLicenseSet.Controls.Add(this.btnRemove);
+            this.tabLicenseSet.Controls.Add(this.btnRequest);
+            this.tabLicenseSet.Controls.Add(this.btnUpdate);
+            this.tabLicenseSet.Controls.Add(this.tbExpireDate);
+            this.tabLicenseSet.Controls.Add(this.tbPassType);
+            this.tabLicenseSet.Controls.Add(this.tbOTSProduct);
+            this.tabLicenseSet.Controls.Add(this.tbLHardwareID);
+            this.tabLicenseSet.Controls.Add(this.lblExpireDate);
+            this.tabLicenseSet.Controls.Add(this.lblOTSProduct);
+            this.tabLicenseSet.Controls.Add(this.tbLComupterName);
+            this.tabLicenseSet.Controls.Add(this.lblLHardwareID);
+            this.tabLicenseSet.Controls.Add(this.lblPassType);
+            this.tabLicenseSet.Controls.Add(this.lblLComupterName);
+            this.tabLicenseSet.Controls.Add(this.pictureBox1);
+            this.tabLicenseSet.Location = new System.Drawing.Point(4, 22);
+            this.tabLicenseSet.Margin = new System.Windows.Forms.Padding(2);
+            this.tabLicenseSet.Name = "tabLicenseSet";
+            this.tabLicenseSet.Padding = new System.Windows.Forms.Padding(2);
+            this.tabLicenseSet.Size = new System.Drawing.Size(549, 203);
+            this.tabLicenseSet.TabIndex = 0;
+            this.tabLicenseSet.Text = "通行证";
+            this.tabLicenseSet.UseVisualStyleBackColor = true;
             // 
             // OTSSystemManagerForms
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(830, 326);
+            this.ClientSize = new System.Drawing.Size(557, 229);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(852, 382);
-            this.MinimumSize = new System.Drawing.Size(852, 382);
+            this.MaximumSize = new System.Drawing.Size(573, 268);
+            this.MinimumSize = new System.Drawing.Size(573, 268);
             this.Name = "OTSSystemManagerForms";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OTSSystemManagerForms_FormClosing);
             this.Load += new System.EventHandler(this.OTSSystemManagerForms_Load);
             this.tabControl1.ResumeLayout(false);
-            this.tabLicenseSet.ResumeLayout(false);
-            this.tabLicenseSet.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.tabHardwareSet.ResumeLayout(false);
             this.tabHardwareSet.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             this.tabLanguage.ResumeLayout(false);
             this.tabLanguage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.tabLicenseSet.ResumeLayout(false);
+            this.tabLicenseSet.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -491,7 +517,22 @@
         private System.Windows.Forms.TabPage tabHardwareSet;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.ComboBox CmbSEMController;
+        private System.Windows.Forms.ComboBox CmbEDSController;
+        private System.Windows.Forms.Button btnEDSTest;
+        private System.Windows.Forms.Button btnSEMTest;
+        private System.Windows.Forms.Label lblHEDSController;
+        private System.Windows.Forms.Label lblHSEMController;
+        private System.Windows.Forms.PictureBox pictureBox2;
+        private System.Windows.Forms.RadioButton rbEsprit21;
+        private System.Windows.Forms.RadioButton rbEsprit19;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TabPage tabLanguage;
+        private System.Windows.Forms.PictureBox pictureBox3;
+        private System.Windows.Forms.RadioButton rdb_en;
+        private System.Windows.Forms.RadioButton rdb_ch;
         private System.Windows.Forms.TabPage tabLicenseSet;
+        private System.Windows.Forms.LinkLabel lnklab_about;
         private System.Windows.Forms.Button btnRemove;
         private System.Windows.Forms.Button btnRequest;
         private System.Windows.Forms.Button btnUpdate;
@@ -506,20 +547,5 @@
         private System.Windows.Forms.Label lblPassType;
         private System.Windows.Forms.Label lblLComupterName;
         private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.ComboBox CmbSEMController;
-        private System.Windows.Forms.ComboBox CmbEDSController;
-        private System.Windows.Forms.Button btnEDSTest;
-        private System.Windows.Forms.Button btnSEMTest;
-        private System.Windows.Forms.Label lblHEDSController;
-        private System.Windows.Forms.Label lblHSEMController;
-        private System.Windows.Forms.PictureBox pictureBox2;
-        private System.Windows.Forms.RadioButton rbEsprit21;
-        private System.Windows.Forms.RadioButton rbEsprit19;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.LinkLabel lnklab_about;
-        private System.Windows.Forms.TabPage tabLanguage;
-        private System.Windows.Forms.PictureBox pictureBox3;
-        private System.Windows.Forms.RadioButton rdb_en;
-        private System.Windows.Forms.RadioButton rdb_ch;
     }
 }

OTS/OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -52,6 +52,7 @@ namespace OTSSysMgrApp
         static OTS_SOFT_PACKAGE_ID oTS_SOFT_PACKAGE_ID;
 
         static OTS_LICENSE_TYPE oTS_LICENSE_TYPE;
+
         #endregion
 
         #region 构造函数
@@ -182,30 +183,32 @@ namespace OTSSysMgrApp
             string message = string.Empty;
             SaveSEMAndEDSController();
             SaveSelectVersionInfo();
-            try
-            {
+            //try
+            //{
 
+            //    //判断是否注册与日期是否有效
+            //    if (!IsValidLicense(ref message))
+            //    {
+            //        tabHardwareSet.Parent = null;
+            //    }
+            //    else
+            //    {
+            //        //获取已存在的注册信息
+            //        tbLComupterName.Text = GetLicenseInfo("ComupterName");
+            //        tbLHardwareID.Text = GetLicenseInfo("HardwareID");
+            //        tbOTSProduct.Text = GetLicenseInfo("OTSProduct");
+            //        tbPassType.Text = GetLicenseInfo("PassType");
+            //        tbExpireDate.Text = Convert.ToDateTime(GetLicenseInfo("ExpireDate")).ToString("yyyy-MM-dd");
+            //        //显示硬件Tab菜单
+            //        tabHardwareSet.Parent = tabControl1;
+            //    }
+            //}
+            //catch (Exception)
+            //{
+            //}
+
+            tabHardwareSet.Parent = tabControl1;
 
-                //判断是否注册与日期是否有效
-                if (!IsValidLicense(ref message))
-                {
-                    tabHardwareSet.Parent = null;
-                }
-                else
-                {
-                    //获取已存在的注册信息
-                    tbLComupterName.Text = GetLicenseInfo("ComupterName");
-                    tbLHardwareID.Text = GetLicenseInfo("HardwareID");
-                    tbOTSProduct.Text = GetLicenseInfo("OTSProduct");
-                    tbPassType.Text = GetLicenseInfo("PassType");
-                    tbExpireDate.Text = Convert.ToDateTime(GetLicenseInfo("ExpireDate")).ToString("yyyy-MM-dd");
-                    //显示硬件Tab菜单
-                    tabHardwareSet.Parent = tabControl1;
-                }
-            }
-            catch (Exception)
-            {
-            }
             ImageDispose SysMgrTools = new ImageDispose();
             string str = SysMgrTools.ReadDefaultLanguage();
             //for (int i = 0; i < cbbLanguage.Items.Count; i++)
@@ -223,62 +226,62 @@ namespace OTSSysMgrApp
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnDone_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                //节点名称与节点参数值
-                string Name = string.Empty;
-                string Value = string.Empty;
-                //判断本地中是否存在文件路径
-                if (ExistsFile(xmlFilePath))
-                {
-                    //遍历tabHardwareSet标签中所有的ComboBox控件 
-                    foreach (Control control in this.tabHardwareSet.Controls)
-                    {
-                        //判断类型名称
-                        if (control is ComboBox)
-                        {
-                            //获取节点名称与节点参数值
-                            Name = (control as ComboBox).Name.Substring(2);
-                            Value = (control as ComboBox).Text;
-                            SaveSetting(Name, Value);
-                        }
-                    }
-                    //遍历tabHardwareSet标签中所有的ComboBox控件 
-                    foreach (Control control in this.tabLicenseSet.Controls)
-                    {
-                        //判断类型名称
-                        if (control is ComboBox)
-                        {
-                            //获取节点名称与节点参数值
-                            Name = (control as ComboBox).Name.Substring(2);
-                            Value = (control as ComboBox).Text;
-                            SaveSetting(Name, Value);
-                        }
-                        if (control is TextBox)
-                        {
-                            //获取节点名称与节点参数值
-                            Name = (control as TextBox).Name.Substring(2);
-                            Value = (control as TextBox).Text;
-                            SaveSetting(Name, Value);
-                        }
-                    }
-                }
-                else
-                {
-                    //如果文件不存在，则创建文件
-                    CreateFile(xmlFilePath);
-                }
-                //关闭窗口
-                this.Close();
-            }
-            catch (Exception ex)
-            {
-                cfunClass.TraceErrorLog(ex.Message.ToString());
+        //private void btnDone_Click(object sender, EventArgs e)
+        //{
+        //    try
+        //    {
+        //        //节点名称与节点参数值
+        //        string Name = string.Empty;
+        //        string Value = string.Empty;
+        //        //判断本地中是否存在文件路径
+        //        if (ExistsFile(xmlFilePath))
+        //        {
+        //            //遍历tabHardwareSet标签中所有的ComboBox控件 
+        //            foreach (Control control in this.tabHardwareSet.Controls)
+        //            {
+        //                //判断类型名称
+        //                if (control is ComboBox)
+        //                {
+        //                    //获取节点名称与节点参数值
+        //                    Name = (control as ComboBox).Name.Substring(2);
+        //                    Value = (control as ComboBox).Text;
+        //                    SaveSetting(Name, Value);
+        //                }
+        //            }
+        //            //遍历tabHardwareSet标签中所有的ComboBox控件 
+        //            foreach (Control control in this.tabLicenseSet.Controls)
+        //            {
+        //                //判断类型名称
+        //                if (control is ComboBox)
+        //                {
+        //                    //获取节点名称与节点参数值
+        //                    Name = (control as ComboBox).Name.Substring(2);
+        //                    Value = (control as ComboBox).Text;
+        //                    SaveSetting(Name, Value);
+        //                }
+        //                if (control is TextBox)
+        //                {
+        //                    //获取节点名称与节点参数值
+        //                    Name = (control as TextBox).Name.Substring(2);
+        //                    Value = (control as TextBox).Text;
+        //                    SaveSetting(Name, Value);
+        //                }
+        //            }
+        //        }
+        //        else
+        //        {
+        //            //如果文件不存在，则创建文件
+        //            CreateFile(xmlFilePath);
+        //        }
+        //        //关闭窗口
+        //        this.Close();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        cfunClass.TraceErrorLog(ex.Message.ToString());
 
-            }
-        }
+        //    }
+        //}
 
         private void btnEDSTest_Click(object sender, EventArgs e)
         {
@@ -468,53 +471,53 @@ namespace OTSSysMgrApp
 
             }
         }
-        private void GetRegistData()
-        {
-            try
-            {
-                string SEMRegistData = string.Empty;
-                string EDSRegistData = string.Empty;
-                RegistryKey hkml = Registry.LocalMachine;
-                RegistryKey software = hkml.OpenSubKey("SOFTWARE", true);
-                RegistryKey aimdir = software.OpenSubKey(SubKey, true);
-                if (aimdir != null)
-                {
-                    if (IsRegeditExit("SEMName"))
-                    {
-                        SEMRegistData = aimdir.GetValue("SEMName").ToString();
-                        CmbSEMController.SelectedItem = SEMRegistData.ToString();
-                    }
-                    if (IsRegeditExit("EDSName"))
-                    {
-                        EDSRegistData = aimdir.GetValue("EDSName").ToString();
-                        CmbEDSController.SelectedItem = EDSRegistData.ToString();
-                    }
+        //private void GetRegistData()
+        //{
+        //    try
+        //    {
+        //        string SEMRegistData = string.Empty;
+        //        string EDSRegistData = string.Empty;
+        //        RegistryKey hkml = Registry.LocalMachine;
+        //        RegistryKey software = hkml.OpenSubKey("SOFTWARE", true);
+        //        RegistryKey aimdir = software.OpenSubKey(SubKey, true);
+        //        if (aimdir != null)
+        //        {
+        //            if (IsRegeditExit("SEMName"))
+        //            {
+        //                SEMRegistData = aimdir.GetValue("SEMName").ToString();
+        //                CmbSEMController.SelectedItem = SEMRegistData.ToString();
+        //            }
+        //            if (IsRegeditExit("EDSName"))
+        //            {
+        //                EDSRegistData = aimdir.GetValue("EDSName").ToString();
+        //                CmbEDSController.SelectedItem = EDSRegistData.ToString();
+        //            }
 
-                }
-            }
-            catch (Exception)
-            {
-                //MessageBox.Show("读取失败，请以管理员身份运行！");
-                return;
-            }
+        //        }
+        //    }
+        //    catch (Exception)
+        //    {
+        //        //MessageBox.Show("读取失败，请以管理员身份运行！");
+        //        return;
+        //    }
 
-        }
-        private bool WTRegedit(string name, string tovalue)
-        {
-            try
-            {
-                RegistryKey hklm = Registry.LocalMachine;
-                RegistryKey software = hklm.OpenSubKey("SOFTWARE", true);
-                RegistryKey aimdir = software.CreateSubKey(SubKey);
-                aimdir.SetValue(name, tovalue);
-                return true;
-            }
-            catch (Exception)
-            {
-                //MessageBox.Show("写入失败，请以管理员身份运行！");
-                return false;
-            }
-        }
+        //}
+        //private bool WTRegedit(string name, string tovalue)
+        //{
+        //    try
+        //    {
+        //        RegistryKey hklm = Registry.LocalMachine;
+        //        RegistryKey software = hklm.OpenSubKey("SOFTWARE", true);
+        //        RegistryKey aimdir = software.CreateSubKey(SubKey);
+        //        aimdir.SetValue(name, tovalue);
+        //        return true;
+        //    }
+        //    catch (Exception)
+        //    {
+        //        //MessageBox.Show("写入失败，请以管理员身份运行！");
+        //        return false;
+        //    }
+        //}
         private bool IsRegeditExit(string name)
         {
             try
@@ -562,23 +565,23 @@ namespace OTSSysMgrApp
         /// </summary>
         /// <param name="path">文件路径</param>
         /// <returns></returns>
-        public bool ExistsFile(string path)
-        {
-            try
-            {
-                if (File.Exists(path))
-                {
-                    return true;
-                }
-                return false;
-            }
-            catch (Exception ex)
-            {
-                //记录日志文件
-                cfunClass.TraceErrorLog(ex.Message.ToString());
-                return false;
-            }
-        }
+        //public bool ExistsFile(string path)
+        //{
+        //    try
+        //    {
+        //        if (File.Exists(path))
+        //        {
+        //            return true;
+        //        }
+        //        return false;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        //记录日志文件
+        //        cfunClass.TraceErrorLog(ex.Message.ToString());
+        //        return false;
+        //    }
+        //}
         #endregion
 
         #region 获取窗体中所有参数
@@ -651,226 +654,231 @@ namespace OTSSysMgrApp
         }
         #endregion
 
-        private void btnRequest_Click(object sender, EventArgs e)
-        {
-            //打开注册License通行证信息
-            OpenLicenseDialog();
-        }
+        //private void btnRequest_Click(object sender, EventArgs e)
+        //{
+        //    //打开注册License通行证信息
+        //    OpenLicenseDialog();
+        //}
+
         static COTSLicMgr fun = null;
         static  COTSLicenseInfo otsInfoClr = null;
-        private void btnActive_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                //１.获取License通行证信息
-                bool result = fun.LoadLicenseInfoFromFile(ref otsInfoClr);
-                if (result)
-                {
-                    //1.写入XML
-                    SaveSetting("ComupterName", fun.m_ComputerNicName);
-                    SaveSetting("HardwareID", fun.m_MachineId);
-                    SaveSetting("OTSProduct", fun.m_PackId == 0 ? "OTSIncA" : "OtsPartA");
-                    SaveSetting("PassType", fun.m_LicType == 0 ? "Online" : "Offline");
-                    SaveSetting("ExpireDate", fun.m_oExpireDate.ToString());
-
-                    string MessageInfo = string.Empty;
-                    if (!IsValidLicense(ref MessageInfo))
-                    {
-                        MessageBox.Show(MessageInfo);
-                    }
-                    else
-                    {
-                        //获取XML中的注册信息
-                        tbLComupterName.Text = GetLicenseInfo("ComupterName");
-                        tbLHardwareID.Text = GetLicenseInfo("HardwareID");
-                        tbOTSProduct.Text = GetLicenseInfo("OTSProduct");
-                        tbPassType.Text = GetLicenseInfo("PassType");
-                        tbExpireDate.Text = Convert.ToDateTime(GetLicenseInfo("ExpireDate")).ToString("yyyy-MM-dd");
-                        //显示硬件Tab菜单
-                        tabHardwareSet.Parent = tabControl1;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                cfunClass.TraceErrorLog("OTSSystemManagerForms_btnActive_Click_Exception：" + ex.Message.ToString() + "");
-            }
-            finally
-            {
-                fun.FreePointer();
-                otsInfoClr.FreePointer();
-            }
-        }
+        //private void btnActive_Click(object sender, EventArgs e)
+        //{
+        //    try
+        //    {
+        //        //１.获取License通行证信息
+        //        bool result = fun.LoadLicenseInfoFromFile(ref otsInfoClr);
+                
+
+
+        //        if (result)
+        //        {
+        //            //1.写入XML
+        //            SaveSetting("ComupterName", fun.m_ComputerNicName);
+        //            SaveSetting("HardwareID", fun.m_MachineId);
+        //            SaveSetting("OTSProduct", fun.m_PackId == 0 ? "OTSIncA" : "OtsPartA");
+        //            SaveSetting("PassType", fun.m_LicType == 0 ? "Online" : "Offline");
+        //            SaveSetting("ExpireDate", fun.m_oExpireDate.ToString());
+
+        //            string MessageInfo = string.Empty;
+        //            if (!IsValidLicense(ref MessageInfo))
+        //            {
+        //                MessageBox.Show(MessageInfo);
+        //            }
+        //            else
+        //            {
+        //                //获取XML中的注册信息
+        //                tbLComupterName.Text = GetLicenseInfo("ComupterName");
+        //                tbLHardwareID.Text = GetLicenseInfo("HardwareID");
+        //                tbOTSProduct.Text = GetLicenseInfo("OTSProduct");
+        //                tbPassType.Text = GetLicenseInfo("PassType");
+        //                tbExpireDate.Text = Convert.ToDateTime(GetLicenseInfo("ExpireDate")).ToString("yyyy-MM-dd");
+        //                //显示硬件Tab菜单
+        //                tabHardwareSet.Parent = tabControl1;
+        //            }
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        cfunClass.TraceErrorLog("OTSSystemManagerForms_btnActive_Click_Exception：" + ex.Message.ToString() + "");
+        //    }
+        //    finally
+        //    {
+        //        fun.FreePointer();
+        //        otsInfoClr.FreePointer();
+        //    }
+        //}
 
         #region 判断当前License信息是否正确
-        public static bool IsValidLicense(ref string MessageInfo)
-        {
-            if (fun == null)
-            {
-                fun = new COTSLicMgr();
-            }
-            if (otsInfoClr == null)
-            {
-                otsInfoClr = new COTSLicenseInfo();
-            }
-            if (cfunClass == null)
-            {
-                cfunClass = new NSLogFunExport.CFunExportClass();
-            }
-            //实例化C++对象 从选择文件对话框中 选择Lsk文件
-            //1.检查通行证是否合法
-            //计算机名称
-            string ComupterName = GetLicenseInfo("ComupterName");
-            //硬件ID
-            string HardwareID = GetLicenseInfo("HardwareID");
-            //OTS产品
-            int OTSProduct = Convert.ToInt32(GetLicenseInfo("OTSProduct") == "OTSIncA" ? 0 : 1);
-            //通行证类型
-            int PassType = Convert.ToInt32(GetLicenseInfo("PassType") == "Online" ? 0 : 1);
-            //有效期
-            DateTime ExpireDate = Convert.ToDateTime(GetLicenseInfo("ExpireDate") != "" ? GetLicenseInfo("ExpireDate") : DateTime.Now.ToString());
-            //判断查询参数
-            otsInfoClr.SetComputerNickName(ComupterName);
-            otsInfoClr.SetMachineId(HardwareID);
-          //  otsInfoClr.SetPackId(oTS_SOFT_PACKAGE_ID);
-           // otsInfoClr.SetLicType(PassType);
-            otsInfoClr.SetExpireDate(ExpireDate);
-            int nResult = 0;
-            bool bResult = fun.IsValidLicense(OTSProduct, otsInfoClr, ref nResult, true, true);
-            if (bResult)
-            {
-                //2.将通行证写入指定的路径
-                bool CreateResult = fun.CreateLicenseFile(otsInfoClr);
-                if (CreateResult)
-                {
-                    return true;
-                }
-                return false;
-            }
-            else
-            {
+        //public static bool IsValidLicense(ref string MessageInfo)
+        //{
+        //    if (fun == null)
+        //    {
+        //        fun = new COTSLicMgr();
+        //    }
+        //    if (otsInfoClr == null)
+        //    {
+        //        otsInfoClr = new COTSLicenseInfo();
+        //    }
+        //    if (cfunClass == null)
+        //    {
+        //        cfunClass = new NSLogFunExport.CFunExportClass();
+        //    }
+        //    //实例化C++对象 从选择文件对话框中 选择Lsk文件
+        //    //1.检查通行证是否合法
+        //    //计算机名称
+        //    string ComupterName = GetLicenseInfo("ComupterName");
+        //    //硬件ID
+        //    string HardwareID = GetLicenseInfo("HardwareID");
+        //    //OTS产品
+        //    int OTSProduct = Convert.ToInt32(GetLicenseInfo("OTSProduct") == "OTSIncA" ? 0 : 1);
+        //    //通行证类型
+        //    int PassType = Convert.ToInt32(GetLicenseInfo("PassType") == "Online" ? 0 : 1);
+        //    //有效期
+        //    DateTime ExpireDate = Convert.ToDateTime(GetLicenseInfo("ExpireDate") != "" ? GetLicenseInfo("ExpireDate") : DateTime.Now.ToString());
+        //    //判断查询参数
+        //    otsInfoClr.SetComputerNickName(ComupterName);
+        //    otsInfoClr.SetMachineId(HardwareID);
+        //  //  otsInfoClr.SetPackId(oTS_SOFT_PACKAGE_ID);
+        //   // otsInfoClr.SetLicType(PassType);
+        //    otsInfoClr.SetExpireDate(ExpireDate);
+        //    int nResult = 0;
+        //    bool bResult = fun.IsValidLicense(OTSProduct, otsInfoClr, ref nResult, true, true);
+        //    if (bResult)
+        //    {
+        //        //2.将通行证写入指定的路径
+        //        bool CreateResult = fun.CreateLicenseFile(otsInfoClr);
+        //        if (CreateResult)
+        //        {
+        //            return true;
+        //        }
+        //        return false;
+        //    }
+        //    else
+        //    {
                
-                MessageInfo = message1;
-                switch (nResult)
-                {
-                    case 0:
-                        MessageInfo += message2;
-                        break;
-                    case 1:
-                        MessageInfo += message3;
-                        break;
-                    case 2:
-                        MessageInfo += message4;
-                        break;
-                    case 3:
-                        MessageInfo += message5;
-                        break;
-                    case 4:
-                        MessageInfo += message6;
-                        break;
-                    case 5:
-                        MessageInfo += message7;
-                        break;
-                    case 6:
-                        MessageInfo += message8;
-                        break;
-                }
-                return false;
-            }
-        }
+        //        MessageInfo = message1;
+        //        switch (nResult)
+        //        {
+        //            case 0:
+        //                MessageInfo += message2;
+        //                break;
+        //            case 1:
+        //                MessageInfo += message3;
+        //                break;
+        //            case 2:
+        //                MessageInfo += message4;
+        //                break;
+        //            case 3:
+        //                MessageInfo += message5;
+        //                break;
+        //            case 4:
+        //                MessageInfo += message6;
+        //                break;
+        //            case 5:
+        //                MessageInfo += message7;
+        //                break;
+        //            case 6:
+        //                MessageInfo += message8;
+        //                break;
+        //        }
+        //        return false;
+        //    }
+        //}
         #endregion
 
         #region 获取License参数
         /// <summary>
         /// 获取并显示 Licanse参数
         /// </summary>
-        public void OpenLicenseDialog()
-        {
-            try
-            {
-                fun = new COTSLicMgr();
-                string str = fun.GetMachineId();
-                //获取电脑ID
-                string MachineId = fun.GetMachineId();
-                //实例化C++对象
-                otsInfoClr = new COTSLicenseInfo();
-                //设置电脑ID
-                otsInfoClr.SetMachineId(MachineId);
-                bool a_bAdd = false;
-                bool a_bRequest = true;
-                //弹出通行证窗体
-                bool result = fun.ShowEditDialogExport(otsInfoClr, a_bAdd, a_bRequest);
-                if (result)
-                {
-                    return;
-                }
-            }
-            catch (Exception)
-            {
+        //public void OpenLicenseDialog()
+        //{
+        //    try
+        //    {
+        //        fun = new COTSLicMgr();
+        //        string str = fun.GetMachineId();
+        //        //获取电脑ID
+        //        string MachineId = fun.GetMachineId();
+        //        //实例化C++对象
+        //        otsInfoClr = new COTSLicenseInfo();
+        //        //设置电脑ID
+        //        otsInfoClr.SetMachineId(MachineId);
+        //        bool a_bAdd = false;
+        //        bool a_bRequest = true;
+        //        //弹出通行证窗体
+        //        bool result = fun.ShowEditDialogExport(otsInfoClr, a_bAdd, a_bRequest);
+        //        if (result)
+        //        {
+        //            return;
+        //        }
+        //    }
+        //    catch (Exception)
+        //    {
 
-            }
-            finally
-            {
-                fun.FreePointer();
-                otsInfoClr.FreePointer();
-            }
-        }
+        //    }
+        //    finally
+        //    {
+        //        fun.FreePointer();
+        //        otsInfoClr.FreePointer();
+        //    }
+        //}
 
         /// <summary>
         /// 获取电脑名称
         /// </summary>
-        public string GetComupterName()
-        {
-            return "";
-        }
+        //public string GetComupterName()
+        //{
+        //    return "";
+        //}
+
         /// <summary>
         /// 获取硬件ID
         /// </summary>
-        public string GetHardwareID()
-        {
-            return "";
-        }
+        //public string GetHardwareID()
+        //{
+        //    return "";
+        //}
 
         /// <summary>
         /// 项目
         /// </summary>
-        public string GetOTSProduct()
-        {
-            //OTSIncA=0
-            //OtsPartA=1
-            return "";
-        }
+        //public string GetOTSProduct()
+        //{
+        //    //OTSIncA=0
+        //    //OtsPartA=1
+        //    return "";
+        //}
         /// <summary>
         /// 通行证种类
         /// </summary>
-        public string GetPassType()
-        {
-            //Online = 0,
-            //Offline = 1,
-            return "";
-        }
+        //public string GetPassType()
+        //{
+        //    //Online = 0,
+        //    //Offline = 1,
+        //    return "";
+        //}
         /// <summary>
         /// 时间
         /// </summary>
-        public string GetExpireDate()
-        {
-            return "";
-        }
+        //public string GetExpireDate()
+        //{
+        //    return "";
+        //}
         /// <summary>
         /// 显示通行证信息
         /// </summary>
-        public void ShowLicenseInfo()
-        {
+        //public void ShowLicenseInfo()
+        //{
 
-        }
+        //}
         #endregion
 
         private void OTSSystemManagerForms_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (fun != null)
-            {
-                fun.FreePointer();
-            }
+            //if (fun != null)
+            //{
+            //////    fun.FreePointer();
+            //}
             if (otsInfoClr != null)
             {
                 otsInfoClr.FreePointer();
@@ -959,91 +967,93 @@ namespace OTSSysMgrApp
                 SaveSelectVersionInfo();
             }
         }
+
         /// <summary>
         /// 判断是否注册与日期是否有效
         /// </summary>
         /// <returns></returns>
-        public static bool ExistsLicenseInfo(ref string message)
-        {
-            try
-            {
-                //计算机名称
-                string tbLComupterName = GetLicenseInfo("ComupterName");
-                //硬件ID
-                string tbLHardwareID = GetLicenseInfo("HardwareID");
-                //OTS产品
-                string tbOTSProduct = GetLicenseInfo("OTSProduct");
-                //通行证类型
-                string tbPassType = GetLicenseInfo("PassType");
-                //有效期
-                string tbExpireDate = GetLicenseInfo("ExpireDate");
-
-                if (string.IsNullOrEmpty(tbLComupterName) || string.IsNullOrEmpty(tbLHardwareID) || string.IsNullOrEmpty(tbOTSProduct) || string.IsNullOrEmpty(tbPassType) || string.IsNullOrEmpty(tbExpireDate))
-                {
+        //public static bool ExistsLicenseInfo(ref string message)
+        //{
+        //    try
+        //    {
+        //        //计算机名称
+        //        string tbLComupterName = GetLicenseInfo("ComupterName");
+        //        //硬件ID
+        //        string tbLHardwareID = GetLicenseInfo("HardwareID");
+        //        //OTS产品
+        //        string tbOTSProduct = GetLicenseInfo("OTSProduct");
+        //        //通行证类型
+        //        string tbPassType = GetLicenseInfo("PassType");
+        //        //有效期
+        //        string tbExpireDate = GetLicenseInfo("ExpireDate");
+
+        //        if (string.IsNullOrEmpty(tbLComupterName) || string.IsNullOrEmpty(tbLHardwareID) || string.IsNullOrEmpty(tbOTSProduct) || string.IsNullOrEmpty(tbPassType) || string.IsNullOrEmpty(tbExpireDate))
+        //        {
                    
-                    message = message9;
-                    return false;
-                }
-                else
-                {
-                    try
-                    {
-                        string ExpireDate = Convert.ToDateTime(tbExpireDate).ToString("yyyy-MM-dd 23:59:59");
-                        DateTime dtExpireDate = Convert.ToDateTime(ExpireDate);
-                        DateTime dtCurrent = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                        if (dtCurrent > dtExpireDate)
-                        {
-                            message = message10;
-                            return false;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        cfunClass.TraceErrorLog("OTSSystemManagerForms_ExistsLicenseInfo:" + ex.ToString() + "");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                cfunClass.TraceErrorLog("OTSSystemManagerForms_ExistsLicenseInfo:" + ex.ToString() + "");
-            }
-            return true;
-        }
-        public static string GetLicenseInfo(string NodeName)
-        {
-            try
-            {
-                return XMLOperationClass.GetXMLInformations(NodeName);
-            }
-            catch (Exception ex)
-            {
-                cfunClass.TraceErrorLog("OTSSystemManagerForms_GetLicenseInfo:" + ex.ToString() + "");
-                return "";
-            }
-        }
+        //            message = message9;
+        //            return false;
+        //        }
+        //        else
+        //        {
+        //            try
+        //            {
+        //                string ExpireDate = Convert.ToDateTime(tbExpireDate).ToString("yyyy-MM-dd 23:59:59");
+        //                DateTime dtExpireDate = Convert.ToDateTime(ExpireDate);
+        //                DateTime dtCurrent = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+        //                if (dtCurrent > dtExpireDate)
+        //                {
+        //                    message = message10;
+        //                    return false;
+        //                }
+        //            }
+        //            catch (Exception ex)
+        //            {
+        //                cfunClass.TraceErrorLog("OTSSystemManagerForms_ExistsLicenseInfo:" + ex.ToString() + "");
+        //            }
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        cfunClass.TraceErrorLog("OTSSystemManagerForms_ExistsLicenseInfo:" + ex.ToString() + "");
+        //    }
+        //    return true;
+        //}
 
-        private void btnRemove_Click(object sender, EventArgs e)
-        {
-            string message11 = table["message11"].ToString();
-            //1.删除License文件
-            if (MessageBox.Show(message11, "Tip",MessageBoxButtons.YesNo,MessageBoxIcon.Information)== DialogResult.Yes)
-            {
-                //设置XML节点信息
-                SaveSetting("ComupterName", "");
-                SaveSetting("HardwareID", "");
-                SaveSetting("OTSProduct", "");
-                SaveSetting("PassType", "");
-                SaveSetting("ExpireDate", "");
-                //清空文本框信息
-                tbLComupterName.Text = string.Empty;
-                tbLHardwareID.Text = string.Empty;
-                tbOTSProduct.Text = string.Empty;
-                tbPassType.Text = string.Empty;
-                tbExpireDate.Text = string.Empty;
-                //显示硬件Tab菜单
-                tabHardwareSet.Parent = null;
-            }
-        }
+        //public static string GetLicenseInfo(string NodeName)
+        //{
+        //    try
+        //    {
+        //        return XMLOperationClass.GetXMLInformations(NodeName);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        cfunClass.TraceErrorLog("OTSSystemManagerForms_GetLicenseInfo:" + ex.ToString() + "");
+        //        return "";
+        //    }
+        //}
+
+        //private void btnRemove_Click(object sender, EventArgs e)
+        //{
+        //    string message11 = table["message11"].ToString();
+        //    //1.删除License文件
+        //    if (MessageBox.Show(message11, "Tip",MessageBoxButtons.YesNo,MessageBoxIcon.Information)== DialogResult.Yes)
+        //    {
+        //        //设置XML节点信息
+        //        SaveSetting("ComupterName", "");
+        //        SaveSetting("HardwareID", "");
+        //        SaveSetting("OTSProduct", "");
+        //        SaveSetting("PassType", "");
+        //        SaveSetting("ExpireDate", "");
+        //        //清空文本框信息
+        //        tbLComupterName.Text = string.Empty;
+        //        tbLHardwareID.Text = string.Empty;
+        //        tbOTSProduct.Text = string.Empty;
+        //        tbPassType.Text = string.Empty;
+        //        tbExpireDate.Text = string.Empty;
+        //        //显示硬件Tab菜单
+        //        tabHardwareSet.Parent = null;
+        //    }
+        //}
 
         //private void cbbLanguage_SelectedIndexChanged(object sender, EventArgs e)
         //{
@@ -1067,6 +1077,7 @@ namespace OTSSysMgrApp
         //}
 
         //修改默认语言 
+
         public static void WriteDefaultLanguage(string lang)
         {
             DataSet ds = new DataSet();

OTS/OTSSysMgrApp/OTSSystemManagerForms.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="pictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -279,101 +279,7 @@
         yHhO36Ubt/4X1wSr+KCdTCMAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="pictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="pictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp