update db

.gitignore

@@ -1,2 +1,33 @@
-GWSocketClient/obj/
+
+
 GWSocketClient/bin/
+GWSocketClient/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+GWSocketClient/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
+GWSocketClient/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+GWSocketClient/obj/Release/GWSocketClient.pdb
+GWSocketClient/obj/Release/GWSocketClient.exe
+GWSocketClient/obj/Release/GWSocketClient.csprojResolveAssemblyReference.cache
+GWSocketClient/obj/Release/GWSocketClient.csproj.GenerateResource.Cache
+GWSocketClient/obj/Release/GWSocketClient.csproj.FileListAbsolute.txt
+GWSocketClient/obj/Release/GWSocketClient.WebViewForm.resources
+GWSocketClient/obj/Release/GWSocketClient.Properties.Resources.resources
+GWSocketClient/obj/Release/GWSocketClient.Form1.resources
+GWSocketClient/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+GWSocketClient/obj/Release/DesignTimeResolveAssemblyReferences.cache
+GWSocketClient/obj/Release/CoreCompileInputs.cache
+GWSocketClient/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+GWSocketClient/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
+GWSocketClient/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+GWSocketClient/obj/Debug/GWSocketClient.pdb
+GWSocketClient/obj/Debug/GWSocketClient.exe
+GWSocketClient/obj/Debug/GWSocketClient.csprojResolveAssemblyReference.cache
+GWSocketClient/obj/Debug/GWSocketClient.csproj.GenerateResource.Cache
+GWSocketClient/obj/Debug/GWSocketClient.csproj.FileListAbsolute.txt
+GWSocketClient/obj/Debug/GWSocketClient.WebViewForm.resources
+GWSocketClient/obj/Debug/GWSocketClient.Properties.Resources.resources
+GWSocketClient/obj/Debug/GWSocketClient.MyMessageBox.resources
+GWSocketClient/obj/Debug/GWSocketClient.InfoEditor.resources
+GWSocketClient/obj/Debug/GWSocketClient.Form1.resources
+GWSocketClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+GWSocketClient/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+GWSocketClient/obj/Debug/CoreCompileInputs.cache

GWSocketClient/Form1.cs

@@ -363,6 +363,10 @@ namespace GWSocketClient
 
         private void button1_Click(object sender, EventArgs e)
         {
+            InfoEditor ie = new InfoEditor();
+            ie.Show();
+
+
 //            var persons = JsonConvert.DeserializeObject<List<WvBean>>(json);
 //            var ja = JArray.Parse(jsonString);
 

GWSocketClient/GWSocketClient.csproj

@@ -58,12 +58,19 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="db\AccsessDbLoader.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="InfoEditor.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="InfoEditor.Designer.cs">
+      <DependentUpon>InfoEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="model\WvBean.cs" />
     <Compile Include="MyMessageBox.cs">
       <SubType>Form</SubType>
@@ -95,6 +102,9 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="InfoEditor.resx">
+      <DependentUpon>InfoEditor.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MyMessageBox.resx">
       <DependentUpon>MyMessageBox.cs</DependentUpon>
     </EmbeddedResource>

GWSocketClient/InfoEditor.Designer.cs

@@ -0,0 +1,66 @@
+namespace GWSocketClient
+{
+    partial class InfoEditor
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.AllowUserToOrderColumns = true;
+            this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Location = new System.Drawing.Point(12, 190);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(984, 400);
+            this.dataGridView1.TabIndex = 0;
+            // 
+            // InfoEditor
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1008, 602);
+            this.Controls.Add(this.dataGridView1);
+            this.Name = "InfoEditor";
+            this.Text = "InfoEditor";
+            this.Load += new System.EventHandler(this.InfoEditor_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.DataGridView dataGridView1;
+    }
+}

GWSocketClient/InfoEditor.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using GWSocketClient.db;
+
+namespace GWSocketClient
+{
+    public partial class InfoEditor : Form
+    {
+        public InfoEditor()
+        {
+            InitializeComponent();
+        }
+
+        private void InfoEditor_Load(object sender, EventArgs e)
+        {
+            MessageBox.Show(AccsessDbLoader.getInstance().getWebViewJson());
+            dataGridView1.DataSource = AccsessDbLoader.getInstance().getDt();
+        }
+    }
+}

GWSocketClient/InfoEditor.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

GWSocketClient/bin/Debug/html/index.html

@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <title></title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    
+
+
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+            font-family: "微软雅黑","arial"
+        }
+        h1{
+        	text-align: center;
+        }
+        #content{
+        	background-color: #abc;
+        }
+        .item{
+        	padding:10px;
+        }
+        .input_style{
+        	width: 500px;
+        }
+    </style>
+
+</head>
+
+<body onload="bodyonload()">
+	<input type="hidden" id="all_data" value="">
+	<h1>内容显示</h1>
+	<div id="content">
+		<div class="item">
+			<label>ID码</label>:
+			<input type="text" class="input_style" id="input_1">
+			长度: <label id="cur_len">25.0</label><label>/25.0</label>
+			说明: <label>alkjflajlfjlasjlfkjl</label>
+		</div>
+	</div>
+    
+    <script type="text/javascript">
+		
+		function bodyonload() {
+			// body...
+			// 
+			var data = document.getElementById('all_data').value;
+			alert(data);
+		}
+
+
+
+    </script>
+
+</body>
+
+</html>

GWSocketClient/bin/Release/html/index.html

@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <title></title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    
+
+
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+            font-family: "微软雅黑","arial"
+        }
+        h1{
+        	text-align: center;
+        }
+        #content{
+        	background-color: #abc;
+        }
+        .item{
+        	padding:10px;
+        }
+        .input_style{
+        	width: 500px;
+        }
+    </style>
+
+</head>
+
+<body onload="bodyonload()">
+	<input type="hidden" id="all_data" value="">
+	<h1>内容显示</h1>
+	<div id="content">
+		<div class="item">
+			<label>ID码</label>:
+			<input type="text" class="input_style" id="input_1">
+			长度: <label id="cur_len">25.0</label><label>/25.0</label>
+			说明: <label>alkjflajlfjlasjlfkjl</label>
+		</div>
+	</div>
+    
+    <script type="text/javascript">
+		
+		function bodyonload() {
+			// body...
+			// 
+			var data = document.getElementById('all_data').value;
+			alert(data);
+		}
+
+
+
+    </script>
+
+</body>
+
+</html>

GWSocketClient/db/AccsessDbLoader.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.OleDb;
 using System.Linq;
 using System.Text;
@@ -14,14 +15,21 @@ namespace GWSocketClient.db
     {
         private static AccsessDbLoader INSTANCE = null;
 
-        private static List<WvBean> wvBeans = new List<WvBean>();
-        public static Dictionary<string, string> ID_INFO = new Dictionary<string, string>();
+        private DataTable dt = new DataTable();
+
+        private List<WvBean> wvBeans = new List<WvBean>();
+        public Dictionary<string, string> ID_INFO = new Dictionary<string, string>();
 
         public static AccsessDbLoader getInstance(string dbssPath = "")
         {
             return INSTANCE ?? (INSTANCE = new AccsessDbLoader(dbssPath));
         }
 
+        public DataTable getDt()
+        {
+            return dt;
+        }
+
         public Dictionary<string, string> getUserIdInfo()
         {
             return ID_INFO;
@@ -47,16 +55,23 @@ namespace GWSocketClient.db
             OleDbConnection mycon = null;
             OleDbDataReader myReader = null;
 
+            OleDbCommand sqlcmd = null;
+
+            string strConnection = "Provider = Microsoft.ACE.OLEDB.12.0;" + "Data Source = " + dbPath;
+
             try
             {
-                string strConnection = "Provider = Microsoft.ACE.OLEDB.12.0;";
-                strConnection += "Data Source = " + dbPath;
-                using (OleDbConnection objConnection = new OleDbConnection(strConnection)
-                ) //用using替代objConnection.Close()  
+                using (OleDbConnection objConnection = new OleDbConnection(strConnection))
                 {
-                    objConnection.Open(); //打开连接   
-                    OleDbCommand sqlcmd = new OleDbCommand(@"select * from fw", objConnection); //sql语句     
-                    using (OleDbDataReader reader = sqlcmd.ExecuteReader()) //执行查询，用using替代reader.Close()  
+                    objConnection.Open();
+                    sqlcmd = new OleDbCommand(@"select * from fw", objConnection); //sql语句     
+
+
+                    OleDbDataAdapter da = new OleDbDataAdapter(sqlcmd);
+
+                    da.Fill(dt);
+
+                    using (OleDbDataReader reader = sqlcmd.ExecuteReader())
                     {
                         if (reader.Read()) //这个read调用很重要！不写的话运行时将提示找不到数据  
                         {
@@ -80,9 +95,9 @@ namespace GWSocketClient.db
                                 len = calcNull(reader.GetString(4));
                                 mode = calcNull(reader.GetString(5));
                                 desp = calcNull(reader.GetString(6));
-                                defalutValue = calcNull(reader.GetString(8));
-                                userValue = calcNull(reader.GetString(9));
-                                remark = calcNull(reader.GetString(7));
+                                defalutValue = calcNull(reader.GetString(7));
+                                userValue = calcNull(reader.GetString(8));
+                                remark = calcNull(reader.GetString(9));
                             }
                             catch (Exception exception)
                             {
@@ -115,6 +130,7 @@ namespace GWSocketClient.db
             {
                 MyMessageBox.ShowMessageBox(exception.Message);
             }
+
             return null;
         }