ADD History& keys

GWSocketClient/Form1.Designer.cs

@@ -58,6 +58,7 @@
             this.IPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.AddrToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CCIDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SendToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.心跳HToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.StripMenuItemLoSucHb = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItemHbStart = new System.Windows.Forms.ToolStripMenuItem();
@@ -78,7 +79,8 @@
             this.rightMenuCopyCmd = new System.Windows.Forms.ToolStripMenuItem();
             this.rightMenuClearInfo = new System.Windows.Forms.ToolStripMenuItem();
             this.timerHeartBeat = new System.Windows.Forms.Timer(this.components);
-            this.SendToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.ClearAllAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.groupBox1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
             this.statusStrip1.SuspendLayout();
@@ -368,10 +370,12 @@
             this.IPToolStripMenuItem,
             this.AddrToolStripMenuItem,
             this.CCIDToolStripMenuItem,
-            this.SendToolStripMenuItem});
+            this.SendToolStripMenuItem,
+            this.toolStripSeparator4,
+            this.ClearAllAllToolStripMenuItem});
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(44, 21);
-            this.toolStripMenuItem1.Text = "记录";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(60, 21);
+            this.toolStripMenuItem1.Text = "记录(&C)";
             // 
             // IPToolStripMenuItem
             // 
@@ -397,6 +401,14 @@
             this.CCIDToolStripMenuItem.Text = "CCID记录";
             this.CCIDToolStripMenuItem.Click += new System.EventHandler(this.CCIDToolStripMenuItem_Click);
             // 
+            // SendToolStripMenuItem
+            // 
+            this.SendToolStripMenuItem.Name = "SendToolStripMenuItem";
+            this.SendToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.D4)));
+            this.SendToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
+            this.SendToolStripMenuItem.Text = "发送记录";
+            this.SendToolStripMenuItem.Click += new System.EventHandler(this.SendToolStripMenuItem_Click);
+            // 
             // 心跳HToolStripMenuItem
             // 
             this.心跳HToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -564,13 +576,17 @@
             this.timerHeartBeat.Interval = 5000;
             this.timerHeartBeat.Tick += new System.EventHandler(this.timerHeartBeat_Tick);
             // 
-            // SendToolStripMenuItem
+            // toolStripSeparator4
             // 
-            this.SendToolStripMenuItem.Name = "SendToolStripMenuItem";
-            this.SendToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.D4)));
-            this.SendToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-            this.SendToolStripMenuItem.Text = "发送记录";
-            this.SendToolStripMenuItem.Click += new System.EventHandler(this.SendToolStripMenuItem_Click);
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(184, 6);
+            // 
+            // ClearAllAllToolStripMenuItem
+            // 
+            this.ClearAllAllToolStripMenuItem.Name = "ClearAllAllToolStripMenuItem";
+            this.ClearAllAllToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
+            this.ClearAllAllToolStripMenuItem.Text = "清空所有记录";
+            this.ClearAllAllToolStripMenuItem.Click += new System.EventHandler(this.ClearAllAllToolStripMenuItem_Click);
             // 
             // Form1
             // 
@@ -653,6 +669,8 @@
         private System.Windows.Forms.ToolStripMenuItem AddrToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem CCIDToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem SendToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripMenuItem ClearAllAllToolStripMenuItem;
     }
 }
 

GWSocketClient/Form1.cs

@@ -143,13 +143,21 @@ namespace GWSocketClient
             string trim = tfTmpSendData.Text.Trim();
             trim = trim.Replace("\n", "").Replace("\r", "").Replace("\t", "").Replace(" ", "").Replace("-", "");
 
-            if (!trim.Equals(""))
+            try
             {
-                byte[] ts = HexUtil.hexToBytes(trim);
+                if (!trim.Equals(""))
+                {
+                    byte[] ts = HexUtil.hexToBytes(trim);
 
-                addToListboxItem(string.Format("发送到服务端:[{0}]", trim));
+                    AccessDbLoader.getInstance().addToHistory(AccessDbLoader.SEND_HIS, trim);
+                    addToListboxItem(string.Format("发送到服务端:[{0}]", trim));
 
-                sockeTcpClients.SendData(ts);
+                    sockeTcpClients.SendData(ts);
+                }
+            }
+            catch (Exception exception)
+            {
+                MessageBox.Show(exception.Message);
             }
         }
 
@@ -198,7 +206,10 @@ namespace GWSocketClient
                 tbPresureTestCount.Visible = !tbPresureTestCount.Visible;
                 label4.Visible = !label4.Visible;
             }
-
+            else
+            {
+                AccessDbLoader.getInstance().addToHistory(AccessDbLoader.SEND_HIS, "1234567890");
+            }
         }
 
         private void toolStripMenuItemHBtime_Click(object sender, EventArgs e)
@@ -209,7 +220,6 @@ namespace GWSocketClient
                 timerHeartBeat.Interval = int.Parse(topmost) * 1000;
                 //5秒
                 toolStripStatusLabelHbShow.Text = "心跳时间: " + topmost + "秒";
-
             };
             id.ShowDialog();
         }
@@ -221,7 +231,7 @@ namespace GWSocketClient
 
         private void labelHis_Click(object sender, EventArgs e)
         {
-            Label lab= sender as Label;
+            Label lab = sender as Label;
             HistoryDialog hd = new HistoryDialog(lab.Name);
             hd.HistoryHandler += Hd_HistoryHandler;
             hd.ShowDialog();
@@ -241,6 +251,10 @@ namespace GWSocketClient
             {
                 tbIpaddress.Text = result;
             }
+            else if ("labelSendHIS".Equals(type))
+            {
+                tfTmpSendData.Text = result;
+            }
         }
 
         private void IPToolStripMenuItem_Click(object sender, EventArgs e)
@@ -263,6 +277,7 @@ namespace GWSocketClient
             hd.HistoryHandler += Hd_HistoryHandler;
             hd.ShowDialog();
         }
+
         private void SendToolStripMenuItem_Click(object sender, EventArgs e)
         {
             HistoryDialog hd = new HistoryDialog("labelSendHIS");
@@ -396,12 +411,14 @@ namespace GWSocketClient
 
                 if (ToolStripMenuItemLogHb.Checked && hbLen.Equals("0000"))
                 {
-                    addToListboxItem(string.Format("收到服务端{0}发来心跳funCode={2}:[{1}]", sks.Ip, reqData,reqData.Substring(18,2)));
+                    addToListboxItem(string.Format("收到服务端{0}发来心跳funCode={2}:[{1}]", sks.Ip, reqData,
+                        reqData.Substring(18, 2)));
                 }
             }
             else
             {
-                addToListboxItem(string.Format("收到服务端{0}发来消息,funCode={2}:[{1}]", sks.Ip, reqData,reqData.Substring(18,2)));
+                addToListboxItem(string.Format("收到服务端{0}发来消息,funCode={2}:[{1}]", sks.Ip, reqData,
+                    reqData.Substring(18, 2)));
             }
 
             if (!(funcode == 16 || funcode == 32))
@@ -508,13 +525,12 @@ namespace GWSocketClient
             //                string loginCmd = "7e7e7e4442832e833c8200143839383630324231313931353530343739383737f7";
             string loginCmd = vcarecityProtocolBean.ProtocolStartSymbol;
             loginCmd += tbEquipmentAddress.Text.Trim() + "82";
-                        
-            
+
+
             loginCmd += Utils.stringWith0(Utils.tenToHex(tbCCID.Text.Trim().Length / 2), 4);
             loginCmd += tbCCID.Text.Trim();
-            
 
-            
+
             loginCmd = Utils.calcCrcCode(loginCmd);
             //发送登录命令
             byte[] ts = HexUtil.hexToBytes(loginCmd);
@@ -621,7 +637,7 @@ namespace GWSocketClient
                         new SolidBrush(e.ForeColor),
                         e.Bounds);
                 }
-               
+
                 e.DrawFocusRectangle();
             }
         }
@@ -678,6 +694,11 @@ namespace GWSocketClient
                     //如果勾选了登录成功并心跳
                     timerHeartBeat.Enabled = true;
                 }
+
+                //ADD To History
+                AccessDbLoader.getInstance().addToHistory(AccessDbLoader.IP_HIS, tbIpaddress.Text.Trim());
+                AccessDbLoader.getInstance().addToHistory(AccessDbLoader.CCID_HIS, tbCCID.Text.Trim());
+                AccessDbLoader.getInstance().addToHistory(AccessDbLoader.ADDR_HIS, tbEquipmentAddress.Text.Trim());
             }
             else
             {
@@ -690,14 +711,14 @@ namespace GWSocketClient
             }
         }
 
-
-
-
-
-
-
         #endregion
 
-       
+        private void ClearAllAllToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            AccessDbLoader.getInstance().deleteAllData(AccessDbLoader.IP_HIS);
+            AccessDbLoader.getInstance().deleteAllData(AccessDbLoader.ADDR_HIS);
+            AccessDbLoader.getInstance().deleteAllData(AccessDbLoader.SEND_HIS);
+            AccessDbLoader.getInstance().deleteAllData(AccessDbLoader.CCID_HIS);
+        }
     }
 }

GWSocketClient/GWSocketClient.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <RootNamespace>GWSocketClient</RootNamespace>
     <AssemblyName>GWSocketClient</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

GWSocketClient/HistoryDialog.Designer.cs

@@ -30,16 +30,16 @@
         {
             this.components = new System.ComponentModel.Container();
             this.listBoxHistory = new System.Windows.Forms.ListBox();
-            this.buttonRandom = new System.Windows.Forms.Button();
-            this.buttonCancle = new System.Windows.Forms.Button();
-            this.textBoxSourceCCID = new System.Windows.Forms.TextBox();
-            this.buttonTransalteCCID = new System.Windows.Forms.Button();
-            this.labelCCIDLEN = new System.Windows.Forms.Label();
             this.rightCTXHIS = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.DelteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.AllClearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.CopyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.buttonRandom = new System.Windows.Forms.Button();
+            this.buttonCancle = new System.Windows.Forms.Button();
+            this.textBoxSourceCCID = new System.Windows.Forms.TextBox();
+            this.buttonTransalteCCID = new System.Windows.Forms.Button();
+            this.labelCCIDLEN = new System.Windows.Forms.Label();
             this.rightCTXHIS.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -47,16 +47,53 @@
             // 
             this.listBoxHistory.ContextMenuStrip = this.rightCTXHIS;
             this.listBoxHistory.FormattingEnabled = true;
+            this.listBoxHistory.HorizontalScrollbar = true;
             this.listBoxHistory.ItemHeight = 20;
             this.listBoxHistory.Location = new System.Drawing.Point(12, 7);
             this.listBoxHistory.Name = "listBoxHistory";
-            this.listBoxHistory.Size = new System.Drawing.Size(422, 364);
+            this.listBoxHistory.Size = new System.Drawing.Size(633, 364);
             this.listBoxHistory.TabIndex = 0;
             this.listBoxHistory.DoubleClick += new System.EventHandler(this.listBoxHistory_DoubleClick);
             // 
+            // rightCTXHIS
+            // 
+            this.rightCTXHIS.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.DelteToolStripMenuItem,
+            this.AllClearToolStripMenuItem,
+            this.toolStripSeparator1,
+            this.CopyToolStripMenuItem});
+            this.rightCTXHIS.Name = "rightCTXHIS";
+            this.rightCTXHIS.Size = new System.Drawing.Size(166, 76);
+            // 
+            // DelteToolStripMenuItem
+            // 
+            this.DelteToolStripMenuItem.Name = "DelteToolStripMenuItem";
+            this.DelteToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
+            this.DelteToolStripMenuItem.Text = "删除选中记录(&D)";
+            this.DelteToolStripMenuItem.Click += new System.EventHandler(this.DelteToolStripMenuItem_Click);
+            // 
+            // AllClearToolStripMenuItem
+            // 
+            this.AllClearToolStripMenuItem.Name = "AllClearToolStripMenuItem";
+            this.AllClearToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
+            this.AllClearToolStripMenuItem.Text = "清空所有记录(&A)";
+            this.AllClearToolStripMenuItem.Click += new System.EventHandler(this.AllClearToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(162, 6);
+            // 
+            // CopyToolStripMenuItem
+            // 
+            this.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem";
+            this.CopyToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
+            this.CopyToolStripMenuItem.Text = "复制选中记录(&C)";
+            this.CopyToolStripMenuItem.Click += new System.EventHandler(this.CopyToolStripMenuItem_Click);
+            // 
             // buttonRandom
             // 
-            this.buttonRandom.Location = new System.Drawing.Point(190, 433);
+            this.buttonRandom.Location = new System.Drawing.Point(401, 433);
             this.buttonRandom.Name = "buttonRandom";
             this.buttonRandom.Size = new System.Drawing.Size(119, 39);
             this.buttonRandom.TabIndex = 1;
@@ -68,7 +105,7 @@
             // buttonCancle
             // 
             this.buttonCancle.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancle.Location = new System.Drawing.Point(315, 433);
+            this.buttonCancle.Location = new System.Drawing.Point(526, 433);
             this.buttonCancle.Name = "buttonCancle";
             this.buttonCancle.Size = new System.Drawing.Size(119, 39);
             this.buttonCancle.TabIndex = 2;
@@ -79,7 +116,7 @@
             // 
             this.textBoxSourceCCID.Location = new System.Drawing.Point(12, 401);
             this.textBoxSourceCCID.Name = "textBoxSourceCCID";
-            this.textBoxSourceCCID.Size = new System.Drawing.Size(376, 26);
+            this.textBoxSourceCCID.Size = new System.Drawing.Size(610, 26);
             this.textBoxSourceCCID.TabIndex = 3;
             this.textBoxSourceCCID.Visible = false;
             this.textBoxSourceCCID.TextChanged += new System.EventHandler(this.textBoxSourceCCID_TextChanged);
@@ -87,7 +124,7 @@
             // buttonTransalteCCID
             // 
             this.buttonTransalteCCID.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonTransalteCCID.Location = new System.Drawing.Point(65, 433);
+            this.buttonTransalteCCID.Location = new System.Drawing.Point(276, 433);
             this.buttonTransalteCCID.Name = "buttonTransalteCCID";
             this.buttonTransalteCCID.Size = new System.Drawing.Size(119, 39);
             this.buttonTransalteCCID.TabIndex = 4;
@@ -99,55 +136,19 @@
             // labelCCIDLEN
             // 
             this.labelCCIDLEN.AutoSize = true;
-            this.labelCCIDLEN.Location = new System.Drawing.Point(394, 404);
+            this.labelCCIDLEN.Location = new System.Drawing.Point(628, 404);
             this.labelCCIDLEN.Name = "labelCCIDLEN";
             this.labelCCIDLEN.Size = new System.Drawing.Size(17, 20);
             this.labelCCIDLEN.TabIndex = 5;
             this.labelCCIDLEN.Text = "0";
             this.labelCCIDLEN.Visible = false;
             // 
-            // rightCTXHIS
-            // 
-            this.rightCTXHIS.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.DelteToolStripMenuItem,
-            this.AllClearToolStripMenuItem,
-            this.toolStripSeparator1,
-            this.CopyToolStripMenuItem});
-            this.rightCTXHIS.Name = "rightCTXHIS";
-            this.rightCTXHIS.Size = new System.Drawing.Size(166, 76);
-            // 
-            // DelteToolStripMenuItem
-            // 
-            this.DelteToolStripMenuItem.Name = "DelteToolStripMenuItem";
-            this.DelteToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.DelteToolStripMenuItem.Text = "删除选中记录(&D)";
-            this.DelteToolStripMenuItem.Click += new System.EventHandler(this.DelteToolStripMenuItem_Click);
-            // 
-            // AllClearToolStripMenuItem
-            // 
-            this.AllClearToolStripMenuItem.Name = "AllClearToolStripMenuItem";
-            this.AllClearToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.AllClearToolStripMenuItem.Text = "清空所有记录(&A)";
-            this.AllClearToolStripMenuItem.Click += new System.EventHandler(this.AllClearToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(162, 6);
-            // 
-            // CopyToolStripMenuItem
-            // 
-            this.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem";
-            this.CopyToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.CopyToolStripMenuItem.Text = "复制选中记录(&C)";
-            this.CopyToolStripMenuItem.Click += new System.EventHandler(this.CopyToolStripMenuItem_Click);
-            // 
             // HistoryDialog
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.buttonCancle;
-            this.ClientSize = new System.Drawing.Size(446, 484);
+            this.ClientSize = new System.Drawing.Size(657, 484);
             this.Controls.Add(this.labelCCIDLEN);
             this.Controls.Add(this.buttonTransalteCCID);
             this.Controls.Add(this.textBoxSourceCCID);

GWSocketClient/HistoryDialog.cs

@@ -13,11 +13,10 @@ using System.Windows.Forms;
 
 namespace GWSocketClient
 {
-    public delegate void OnHistoryResult(string type,string result);
+    public delegate void OnHistoryResult(string type, string result);
 
     public partial class HistoryDialog : Form
     {
-        
         public event OnHistoryResult HistoryHandler;
         private string type;
         private string tableName;
@@ -30,11 +29,8 @@ namespace GWSocketClient
         }
 
 
-    
-
         private void HistoryDialog_Load(object sender, EventArgs e)
         {
-
             if ("labelCCIDHIS".Equals(type))
             {
                 textBoxSourceCCID.Visible = true;
@@ -70,7 +66,6 @@ namespace GWSocketClient
 
         private void buttonRandom_Click(object sender, EventArgs e)
         {
-
             if ("labelCCIDHIS".Equals(type))
             {
                 HistoryHandler(type, randomCCID());
@@ -80,7 +75,7 @@ namespace GWSocketClient
             {
                 string add = "00000";
                 Random rd = new Random();
-                for(int i = 0; i < 7; i++)
+                for (int i = 0; i < 7; i++)
                 {
                     add += Utils.tenToHex(rd.Next(0, 16));
                 }
@@ -92,9 +87,9 @@ namespace GWSocketClient
         private void textBoxSourceCCID_TextChanged(object sender, EventArgs e)
         {
             string tt = textBoxSourceCCID.Text.Trim();
-            if(tt.Length>0)
+            if (tt.Length > 0)
             {
-                labelCCIDLEN.Text = tt.Length+"";
+                labelCCIDLEN.Text = tt.Length + "";
             }
             else
             {
@@ -112,11 +107,11 @@ namespace GWSocketClient
                 {
                     result = Utils.transateCCID(tt);
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message);
                     this.DialogResult = DialogResult.None;
-                    return; 
+                    return;
                 }
             }
             else
@@ -124,15 +119,14 @@ namespace GWSocketClient
                 result = randomCCID();
             }
             HistoryHandler(this.type, result);
-
         }
 
         private string randomCCID()
         {
             string res = "";
             Random rd = new Random();
-          
-            for (int i=0; i < 20; i++)
+
+            for (int i = 0; i < 20; i++)
             {
                 res += rd.Next(30, 40);
             }
@@ -158,7 +152,7 @@ namespace GWSocketClient
             if (index >= 0 && index < listBoxHistory.Items.Count)
             {
                 HisBean hb = listBoxHistory.SelectedItem as HisBean;
-                AccessDbLoader.getInstance().deleteByID(tableName,hb.ID);
+                AccessDbLoader.getInstance().deleteByID(tableName, hb.ID);
                 his.Clear();
                 his = AccessDbLoader.getInstance().getInputHistory(AccessDbLoader.CCID_HIS);
                 listBoxHistory.Items.Clear();
@@ -168,13 +162,8 @@ namespace GWSocketClient
 
         private void AllClearToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            int index = listBoxHistory.SelectedIndex;
-            if (index >= 0 && index < listBoxHistory.Items.Count)
-            {
-                AccessDbLoader.getInstance().deleteAllData(tableName);
-                listBoxHistory.Items.Clear();
-            }
-
+            AccessDbLoader.getInstance().deleteAllData(tableName);
+            listBoxHistory.Items.Clear();
         }
 
         private void CopyToolStripMenuItem_Click(object sender, EventArgs e)
@@ -187,4 +176,4 @@ namespace GWSocketClient
             }
         }
     }
-}
+}

GWSocketClient/db/AccessDbLoader.cs

@@ -269,7 +269,7 @@ namespace GWSocketClient.db
 
         public int deleteAllData(string tableName = "fw")
         {
-            string sql = "delete from "+ tableName;
+            string sql = "delete from " + tableName;
             Console.WriteLine(sql);
             OleDbCommand inst = new OleDbCommand(sql, objConnection);
             return inst.ExecuteNonQuery();
@@ -289,16 +289,26 @@ namespace GWSocketClient.db
         public int getHistoryCount(string tableName)
         {
             string sql = "select COUNT(*),MIN(ID) from " + tableName;
+
             OleDbCommand inst = new OleDbCommand(sql, objConnection);
             int count = 0;
             int minId = 0;
             using (OleDbDataReader reader = inst.ExecuteReader())
             {
-                reader.Read();
-                count = reader.GetInt32(0);
-                minId = reader.GetInt32(1);
+                if (reader != null)
+                {
+                    reader.Read();
+                    try
+                    {
+                        count = reader.GetInt32(0);
+                        minId = reader.GetInt32(1);
+                    }
+                    catch (Exception e)
+                    {
+                        // 当数据库中没有记录的时候,MIN ID 就会出错.
+                    }
+                }
             }
-
             if (count > 30)
             {
                 sql = "delete from " + tableName + "  where ID=" + minId;
@@ -309,10 +319,57 @@ namespace GWSocketClient.db
         }
 
 
+        public int checkHistoryExits(string tableName, string his)
+        {
+            his = his.Trim().ToUpper();
+            string sql = "select COUNT(*) from " + tableName + " ";
+
+            switch (tableName)
+            {
+                case IP_HIS:
+                    sql += "where ip ='" + his + "'";
+                    break;
+                case SEND_HIS:
+                    sql += "where s_data ='" + his + "'";
+                    break;
+                case CCID_HIS:
+                    sql += "where CCID ='" + his + "'";
+                    break;
+                case ADDR_HIS:
+                    sql += "where addr ='" + his + "'";
+                    break;
+                default:
+                    break;
+            }
+
+            Console.WriteLine("检查是否存在SQL=" + sql);
+
+            int count;
+            using (OleDbCommand inst = new OleDbCommand(sql, objConnection))
+            {
+                count = 0;
+                using (OleDbDataReader reader = inst.ExecuteReader())
+                {
+                    if (reader != null)
+                    {
+                        reader.Read();
+                        count = reader.GetInt32(0);
+                    }
+                }
+            }
+            return count;
+        }
+
         public int addToHistory(string tableName, string his)
         {
-            int rowCount = getHistoryCount(tableName);          
+            his = his.ToUpper();
+            Console.WriteLine(tableName + "; " + his);
+
+            int exits = checkHistoryExits(tableName, his);
+            if (exits != 0)
+                return -1;
 
+            int rowCount = getHistoryCount(tableName);
             OleDbCommand inst = null;
 
             string sql = "INSERT INTO " + tableName + "(";
@@ -331,16 +388,20 @@ namespace GWSocketClient.db
                 sql += "CCID) VALUES('" + his + "')";
                 Console.WriteLine(sql);
             }
+            else if (tableName.Equals(ADDR_HIS))
+            {
+                sql += "addr) VALUES('" + his + "')";
+                Console.WriteLine(sql);
+            }
             inst = new OleDbCommand(sql, objConnection);
             return inst.ExecuteNonQuery();
         }
 
 
-
         public int deleteByID(string tablename, int id)
         {
-            string  sql = "delete from " + tablename + "  where ID=" + id;
-            OleDbCommand  inst = new OleDbCommand(sql, objConnection);
+            string sql = "delete from " + tablename + "  where ID=" + id;
+            OleDbCommand inst = new OleDbCommand(sql, objConnection);
             return inst.ExecuteNonQuery();
         }
 
@@ -363,7 +424,5 @@ namespace GWSocketClient.db
             }
             return hsiList;
         }
-
-
     }
 }

GWSocketClientTests/GWSocketClientTests.csproj

@@ -39,6 +39,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="dotMemory.Unit, Version=103.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.dotMemoryUnit.2.3.20160517.113140\lib\dotMemory.Unit.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
@@ -56,6 +59,7 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
+    <Compile Include="db\AccessDbLoaderTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="util\UtilsTests.cs" />
   </ItemGroup>

GWSocketClientTests/db/AccessDbLoaderTests.cs

@@ -0,0 +1,24 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using GWSocketClient.db;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GWSocketClient.db.Tests
+{
+    [TestClass()]
+    public class AccessDbLoaderTests
+    {
+        [TestMethod()]
+        public void getHistoryCountTest()
+        {
+
+//            int count = AccessDbLoader.getInstance().getHistoryCount(AccessDbLoader.ADDR_HIS);
+//            Console.WriteLine(count);
+
+            Console.WriteLine("abc");
+        }
+    }
+}

GWSocketClientTests/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="JetBrains.dotMemoryUnit" version="2.3.20160517.113140" targetFramework="net452" />
   <package id="MSTest.TestAdapter" version="1.1.11" targetFramework="net452" />
   <package id="MSTest.TestFramework" version="1.1.11" targetFramework="net452" />
 </packages>