Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/CK_UI/LandIn.cs

@@ -14,12 +14,15 @@ namespace GcDevicePc.CK_UI
         private string user = "admin";
         public static bool Island = false;
         CKVocAnalyzer.NumForm form;
-        public LandIn()
+        public LandIn(string userstr)
         {
             InitializeComponent();
             this.ControlBox = false;
+            this.user = userstr;
         }
        
+
+
         private void button1_Click(object sender, EventArgs e)  //登录系统
         {
             string strpw = DateTime.Now.ToString("HHmm");

GcDevicePc/FormUser.Designer.cs

@@ -42,7 +42,7 @@
             this.userCtl1.Location = new System.Drawing.Point(0, 16);
             this.userCtl1.Name = "userCtl1";
             this.userCtl1.Size = new System.Drawing.Size(758, 468);
-            this.userCtl1.Systemtype = 2;
+            this.userCtl1.Systemtype = 1;
             this.userCtl1.TabIndex = 0;
             // 
             // buttonFID

GcDevicePc/FormUser.cs

@@ -55,7 +55,7 @@ namespace GcDevicePc
                
             }
 
-            DialogResult dr = new CK_UI.LandIn().ShowDialog();
+            DialogResult dr = new CK_UI.LandIn("calibration").ShowDialog();
 
             if (dr == DialogResult.OK)
             {
@@ -63,6 +63,7 @@ namespace GcDevicePc
                 {
                     CKVocAnalyzer.AutoAdjust auto = new CKVocAnalyzer.AutoAdjust();
                     auto.Show();
+                    Trace.WriteLine(string.Format("用户{0}，进入自动校准模式", "calibration"), "sys");
                 }else
                 {
                     MessageBox.Show("无权限操作！！！！");

GcDevicePc/MDIBase.cs

@@ -1308,7 +1308,7 @@ namespace GcDevicePc
 
         private void UserLoginMenu_Click(object sender, EventArgs e)
         {
-            DialogResult dr = new LandIn().ShowDialog();
+            DialogResult dr = new LandIn("admin").ShowDialog();
 
             if (dr == DialogResult.OK)
             {
@@ -1320,6 +1320,7 @@ namespace GcDevicePc
                         _debugForm.Activate();
                     }
                     SetMenu(LandIn.Island);
+                    Trace.WriteLine(string.Format("用户{0}，进入调试模式","admin"),"sys");
                 }
             }
 
@@ -1341,6 +1342,7 @@ namespace GcDevicePc
                 Formstr = "用户窗口";
                 _userForm.Activate();
                 //userForm.Show();
+                Trace.WriteLine("注销登录，进入用户模式", "sys");
             }
             LandIn.Island = false;
             SetMenu(LandIn.Island);

SharedSpace/Data.cs

@@ -27,6 +27,9 @@ namespace SharedSpace
        /// </summary>
 
        public static int typesint = 0;
-
+       /// <summary>
+       /// 二次校准系数
+       /// </summary>
+       public static List<AdjustCoef> listCoef = new List<AdjustCoef>();
     }
 }

说明/RM.txt

@@ -5,3 +5,5 @@
 4.王工更新文件传输库，解决开机容易传文件崩的
 2.18-6-7
 1.更新现有组件库
+2018 6-14
+1，调整目录