Sfoglia il codice sorgente

删除加密狗代码,添加加密狗dll

CXS 3 anni fa
parent
commit
860c165260

+ 2 - 2
OTS.sln

@@ -325,8 +325,8 @@ Global
 		{BFD11203-CDF9-47D8-B00B-0743A8BE1212}.Release|x86.Build.0 = Release|x86
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|x64.ActiveCfg = Debug|x64
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|x64.Build.0 = Debug|x64
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|x86.Build.0 = Debug|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release_oxford50|Any CPU.ActiveCfg = Release|Any CPU

+ 26 - 24
OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageMgr.Designer.cs

@@ -29,6 +29,8 @@
         private void InitializeComponent()
         {
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.button_New = new System.Windows.Forms.Button();
+            this.button_edit = new System.Windows.Forms.Button();
             this.m_ctrlBtnExport = new System.Windows.Forms.Button();
             this.IDC_BTN_IMPORT = new System.Windows.Forms.Button();
             this.m_ctrlBtnRename = new System.Windows.Forms.Button();
@@ -36,8 +38,6 @@
             this.m_ctrlBtnApply = new System.Windows.Forms.Button();
             this.m_ctrlStagePicture = new System.Windows.Forms.PictureBox();
             this.m_ctrlListBoxStageList = new System.Windows.Forms.ListBox();
-            this.button_edit = new System.Windows.Forms.Button();
-            this.button_New = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.m_ctrlStagePicture)).BeginInit();
             this.SuspendLayout();
@@ -61,6 +61,30 @@
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
+            // button_New
+            // 
+            this.button_New.Location = new System.Drawing.Point(654, 436);
+            this.button_New.Margin = new System.Windows.Forms.Padding(4);
+            this.button_New.Name = "button_New";
+            this.button_New.Size = new System.Drawing.Size(112, 34);
+            this.button_New.TabIndex = 8;
+            this.button_New.Text = "新建";
+            this.button_New.UseVisualStyleBackColor = true;
+            this.button_New.Visible = false;
+            this.button_New.Click += new System.EventHandler(this.button_New_Click);
+            // 
+            // button_edit
+            // 
+            this.button_edit.Location = new System.Drawing.Point(129, 436);
+            this.button_edit.Margin = new System.Windows.Forms.Padding(4);
+            this.button_edit.Name = "button_edit";
+            this.button_edit.Size = new System.Drawing.Size(99, 34);
+            this.button_edit.TabIndex = 7;
+            this.button_edit.Text = "编辑";
+            this.button_edit.UseVisualStyleBackColor = true;
+            this.button_edit.Visible = false;
+            this.button_edit.Click += new System.EventHandler(this.button_edit_Click);
+            // 
             // m_ctrlBtnExport
             // 
             this.m_ctrlBtnExport.Location = new System.Drawing.Point(928, 436);
@@ -137,28 +161,6 @@
             this.m_ctrlListBoxStageList.TabIndex = 0;
             this.m_ctrlListBoxStageList.SelectedValueChanged += new System.EventHandler(this.OnSelchangeListStage);
             // 
-            // button_edit
-            // 
-            this.button_edit.Location = new System.Drawing.Point(129, 436);
-            this.button_edit.Margin = new System.Windows.Forms.Padding(4);
-            this.button_edit.Name = "button_edit";
-            this.button_edit.Size = new System.Drawing.Size(99, 34);
-            this.button_edit.TabIndex = 7;
-            this.button_edit.Text = "编辑";
-            this.button_edit.UseVisualStyleBackColor = true;
-            this.button_edit.Click += new System.EventHandler(this.button_edit_Click);
-            // 
-            // button_New
-            // 
-            this.button_New.Location = new System.Drawing.Point(654, 436);
-            this.button_New.Margin = new System.Windows.Forms.Padding(4);
-            this.button_New.Name = "button_New";
-            this.button_New.Size = new System.Drawing.Size(112, 34);
-            this.button_New.TabIndex = 8;
-            this.button_New.Text = "新建";
-            this.button_New.UseVisualStyleBackColor = true;
-            this.button_New.Click += new System.EventHandler(this.button_New_Click);
-            // 
             // DlgStageMgr
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);

+ 4 - 0
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -138,6 +138,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\WordApiDll\OTS.WinFormsUI.Docking.dll</HintPath>
     </Reference>
+    <Reference Include="SlmRuntimeCSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin\x64\Release_oxford50\SlmRuntimeCSharp.dll</HintPath>
+    </Reference>
     <Reference Include="SourceGrid, Version=4.40.7083.30975, Culture=neutral, PublicKeyToken=df6f5e538749e85d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\WordApiDll\SourceGrid.dll</HintPath>

+ 11 - 12
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -143,18 +143,17 @@ namespace OTSMeasureApp
             try
             {
 
-/*
-                try
-                {
-                    SenseShield.DogDecrypting.decrypting(101);//参数为许可号
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message, "错误:", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    System.Environment.Exit(0);
-                    return;
-                }
-*/
+                //try
+                //{
+                //    SenseShield.DogDecrypting.decrypting(101);//参数为许可号
+                //}
+                //catch (Exception ex)
+                //{
+                //    MessageBox.Show(ex.Message, "错误:", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                //    System.Environment.Exit(0);
+                //    return;
+                //}
+
                 ArrangWorkspaceWindow();
 
                 log = NLog.LogManager.GetCurrentClassLogger();