调整代码

.idea/workspace.xml

@@ -2,25 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9ae72f43-a1a0-4e71-8c9a-da776f48ee97" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/renderer/components/Scan.vue" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/renderer/utils/FunctionSet.js" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/static/server/socketServer.js" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/static/server/protocal/protocal.js" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/static/server/socketClient.js" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package-lock.json" afterPath="$PROJECT_DIR$/package-lock.json" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/index.js" afterPath="$PROJECT_DIR$/src/main/index.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/renderer/App.vue" afterPath="$PROJECT_DIR$/src/renderer/App.vue" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/renderer/components/LandingPage.vue" afterPath="$PROJECT_DIR$/src/renderer/components/LandingPage.vue" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/renderer/main.js" afterPath="$PROJECT_DIR$/src/renderer/main.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/renderer/router/index.js" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/renderer/store/index.js" afterPath="$PROJECT_DIR$/src/renderer/store/index.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/renderer/components/LandingPage/SystemInformation.vue" afterPath="$PROJECT_DIR$/src/renderer/components/LandingPage/SystemInformation.vue" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/renderer/store/modules/socket.js" afterPath="$PROJECT_DIR$/src/renderer/store/modules/socket.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/static/server/app.js" afterPath="$PROJECT_DIR$/static/server/app.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/static/server/bin/www.js" afterPath="$PROJECT_DIR$/static/server/bin/www.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/static/server/protocal/protocal.js" afterPath="$PROJECT_DIR$/static/server/protocal/protocal.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/static/server/protocal/sendProtocal.js" afterPath="$PROJECT_DIR$/static/server/protocal/sendProtocal.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/static/server/socketClient.js" afterPath="$PROJECT_DIR$/static/server/socketClient.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,45 +23,48 @@
     <splitter split-orientation="horizontal" split-proportion="0.53501403">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
+          <file leaf-file-name="LandingPage.vue" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/renderer/components/LandingPage.vue">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="306">
-                  <caret line="18" column="19" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
+                <state relative-caret-position="442">
+                  <caret line="260" column="61" lean-forward="false" selection-start-line="260" selection-start-column="8" selection-end-line="260" selection-end-column="61" />
                   <folding>
-                    <element signature="e#0#21#0" expanded="true" />
+                    <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+                    <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+                    <element signature="n#style#0;n#chart#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+                    <element signature="e#2134#2164#0" expanded="true" />
+                    <element signature="e#3266#9912#0" expanded="false" />
+                    <element signature="e#10353#12901#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+          <file leaf-file-name="SystemInformation.vue" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/renderer/components/LandingPage/SystemInformation.vue">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="335">
-                  <caret line="32" column="27" lean-forward="false" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
-                  <folding>
-                    <element signature="e#0#21#0" expanded="true" />
-                  </folding>
+                <state relative-caret-position="544">
+                  <caret line="41" column="22" lean-forward="false" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="36" />
+                  <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/static/server/app.js">
+          <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/package.json">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="125">
-                  <caret line="82" column="39" lean-forward="false" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" />
+                <state relative-caret-position="323">
+                  <caret line="67" column="18" lean-forward="false" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="18" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="socket.js" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/renderer/store/modules/socket.js">
+          <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-187">
-                  <caret line="4" column="20" lean-forward="false" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
+                <state relative-caret-position="390">
+                  <caret line="32" column="27" lean-forward="false" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
                   <folding>
                     <element signature="e#0#21#0" expanded="true" />
                   </folding>
@@ -79,48 +72,41 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="FunctionSet.js" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/renderer/utils/FunctionSet.js">
+          <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/static/server/app.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="782">
-                  <caret line="46" column="22" lean-forward="false" selection-start-line="46" selection-start-column="22" selection-end-line="46" selection-end-column="22" />
+                <state relative-caret-position="363">
+                  <caret line="90" column="45" lean-forward="false" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="45" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="www.js" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/static/server/bin/www.js">
+          <file leaf-file-name="socket.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/renderer/store/modules/socket.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="204">
-                  <caret line="12" column="25" lean-forward="false" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+                <state relative-caret-position="1383">
+                  <caret line="85" column="50" lean-forward="false" selection-start-line="85" selection-start-column="50" selection-end-line="85" selection-end-column="50" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="LandingPage.vue" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/renderer/components/LandingPage.vue">
+          <file leaf-file-name="socketServer.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/static/server/socketServer.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="306">
-                  <caret line="39" column="10" lean-forward="true" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
-                  <folding>
-                    <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#chart#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                    <element signature="e#2134#2164#0" expanded="true" />
-                    <element signature="e#3266#9912#0" expanded="false" />
-                    <element signature="e#10290#12838#0" expanded="false" />
-                  </folding>
+                <state relative-caret-position="34">
+                  <caret line="2" column="16" lean-forward="false" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
+                  <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="App.vue" pinned="false" current-in-tab="false">
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="App.vue" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="153">
@@ -140,6 +126,16 @@
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="checksum.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/static/server/protocal/checksum.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="0">
+                  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -157,6 +153,8 @@
       <find>hasConnectCount</find>
       <find>socketServer</find>
       <find>asiciiToString</find>
+      <find>log4js</find>
+      <find>socket.io</find>
       <find>wrapper</find>
     </findStrings>
     <dirStrings>
@@ -169,7 +167,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/renderer/components/LandingPage/SystemInformation.vue" />
         <option value="$PROJECT_DIR$/static/socketClient.js" />
         <option value="$PROJECT_DIR$/static/server/bin/www.js" />
         <option value="$PROJECT_DIR$/static/server/socketClient.js" />
@@ -184,8 +181,10 @@
         <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/src/renderer/utils/commonFunction.js" />
         <option value="$PROJECT_DIR$/src/renderer/utils/FunctionSet.js" />
+        <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/static/server/app.js" />
         <option value="$PROJECT_DIR$/src/renderer/store/modules/socket.js" />
+        <option value="$PROJECT_DIR$/src/renderer/components/LandingPage/SystemInformation.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/LandingPage.vue" />
       </list>
     </option>
@@ -259,6 +258,14 @@
               <item name="renderer" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="components" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="electronVueDemo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electronVueDemo" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="renderer" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="components" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="LandingPage" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
             <path>
               <item name="electronVueDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="electronVueDemo" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -273,6 +280,14 @@
               <item name="renderer" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="store" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="electronVueDemo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electronVueDemo" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="renderer" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="store" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="modules" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
             <path>
               <item name="electronVueDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="electronVueDemo" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -364,12 +379,12 @@
       <updated>1587454790583</updated>
       <workItem from="1587454791924" duration="6275000" />
       <workItem from="1587463147171" duration="23027000" />
-      <workItem from="1587557912413" duration="25147000" />
+      <workItem from="1587557912413" duration="32543000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="54449000" />
+    <option name="totallyTimeSpent" value="61845000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -378,11 +393,12 @@
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28944504" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24047878" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32861805" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4352557" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -390,7 +406,6 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -412,7 +427,7 @@
         <state relative-caret-position="289">
           <caret line="18" column="19" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
           <folding>
-            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#0#21#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -463,7 +478,7 @@
             <element signature="n#style#0;n#chart#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
             <element signature="e#2134#2164#0" expanded="true" />
             <element signature="e#3266#9912#0" expanded="false" />
-            <element signature="e#10290#12838#0" expanded="false" />
+            <element signature="e#10353#12901#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -488,10 +503,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1785">
           <caret line="202" column="29" lean-forward="false" selection-start-line="202" selection-start-column="12" selection-end-line="202" selection-end-column="29" />
-          <folding>
-            <element signature="e#2946#4872#0" expanded="false" />
-            <element signature="e#4906#6642#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -499,9 +511,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="612">
           <caret line="36" column="33" lean-forward="false" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
-          <folding>
-            <marker date="1587622818807" expanded="true" signature="1638:1974" ph="{&quot;axios&quot;: &quot;^0.18.0&quot;...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -510,7 +520,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#0#21#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -519,6 +529,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="561">
           <caret line="33" column="27" lean-forward="false" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -544,9 +555,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1734">
           <caret line="102" column="41" lean-forward="true" selection-start-line="102" selection-start-column="41" selection-end-line="102" selection-end-column="41" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -554,6 +563,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -561,9 +571,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="578">
           <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
-          <folding>
-            <element signature="e#1268#2358#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -583,51 +591,74 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Scan.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/server/bin/www.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="25" lean-forward="false" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/utils/rsa.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="36" column="33" lean-forward="false" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
-          <folding>
-            <marker date="1587622818807" expanded="true" signature="1638:1974" ph="{&quot;axios&quot;: &quot;^0.18.0&quot;...}" />
-          </folding>
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/server/protocal/global.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/utils/commonFunction.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="29" lean-forward="true" selection-start-line="5" selection-start-column="29" selection-end-line="5" selection-end-column="29" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Scan.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/utils/FunctionSet.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+        <state relative-caret-position="782">
+          <caret line="46" column="22" lean-forward="false" selection-start-line="46" selection-start-column="22" selection-end-line="46" selection-end-column="22" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/LandingPage/SystemInformation.vue">
+    <entry file="file://$PROJECT_DIR$/static/server/protocal/protocal.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="33" column="27" lean-forward="false" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
+        <state relative-caret-position="2193">
+          <caret line="226" column="2" lean-forward="false" selection-start-line="226" selection-start-column="2" selection-end-line="242" selection-end-column="5" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/server/socketClient.js">
+    <entry file="file://$PROJECT_DIR$/static/server/protocal/command.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1071">
-          <caret line="97" column="0" lean-forward="false" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="24" />
-          <folding>
-            <element signature="e#1268#2358#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="221">
+          <caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/index.js">
+    <entry file="file://$PROJECT_DIR$/static/server/protocal/global.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
+        <state relative-caret-position="85">
+          <caret line="5" column="29" lean-forward="false" selection-start-line="5" selection-start-column="29" selection-end-line="5" selection-end-column="29" />
           <folding />
         </state>
       </provider>
@@ -640,17 +671,20 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/server/socketServer.js">
+    <entry file="file://$PROJECT_DIR$/src/main/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="16" lean-forward="true" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
+        <state relative-caret-position="391">
+          <caret line="23" column="4" lean-forward="false" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#45#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/server/bin/www.js">
+    <entry file="file://$PROJECT_DIR$/static/server/protocal/checksum.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="25" lean-forward="false" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -665,27 +699,17 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" column="19" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="16" column="5" lean-forward="false" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        <state relative-caret-position="255">
+          <caret line="15" column="6" lean-forward="true" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
           <folding>
-            <element signature="e#0#45#0" expanded="false" />
+            <element signature="e#0#21#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="335">
+        <state relative-caret-position="390">
           <caret line="32" column="27" lean-forward="false" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
           <folding>
             <element signature="e#0#21#0" expanded="true" />
@@ -693,78 +717,65 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/utils/rsa.js">
+    <entry file="file://$PROJECT_DIR$/static/server/socketClient.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="1071">
+          <caret line="97" column="0" lean-forward="false" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/utils/commonFunction.js">
+    <entry file="file://$PROJECT_DIR$/static/server/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="363">
+          <caret line="90" column="45" lean-forward="false" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="45" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/server/protocal/protocal.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="226" column="2" lean-forward="false" selection-start-line="226" selection-start-column="2" selection-end-line="242" selection-end-column="5" />
-          <folding>
-            <element signature="e#2946#4872#0" expanded="false" />
-            <element signature="e#4906#6642#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/utils/FunctionSet.js">
+    <entry file="file://$PROJECT_DIR$/static/server/socketServer.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="782">
-          <caret line="46" column="22" lean-forward="false" selection-start-line="46" selection-start-column="22" selection-end-line="46" selection-end-column="22" />
+        <state relative-caret-position="34">
+          <caret line="2" column="16" lean-forward="false" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/server/app.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/modules/socket.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="82" column="39" lean-forward="false" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" />
+        <state relative-caret-position="1383">
+          <caret line="85" column="50" lean-forward="false" selection-start-line="85" selection-start-column="50" selection-end-line="85" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/server/protocal/command.js">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
+        <state relative-caret-position="323">
+          <caret line="67" column="18" lean-forward="false" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/modules/socket.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/LandingPage/SystemInformation.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-187">
-          <caret line="4" column="20" lean-forward="false" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="544">
+          <caret line="41" column="22" lean-forward="false" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/LandingPage.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="39" column="10" lean-forward="true" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
+        <state relative-caret-position="442">
+          <caret line="260" column="61" lean-forward="false" selection-start-line="260" selection-start-column="8" selection-end-line="260" selection-end-column="61" />
           <folding>
             <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#chart#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
             <element signature="e#2134#2164#0" expanded="true" />
             <element signature="e#3266#9912#0" expanded="false" />
-            <element signature="e#10290#12838#0" expanded="false" />
+            <element signature="e#10353#12901#0" expanded="false" />
           </folding>
         </state>
       </provider>

package.json

@@ -55,9 +55,11 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "bufferutil": "^4.0.1",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
     "koa": "^2.2.0",
+    "socket.io": "^2.3.0",
     "vue": "^2.5.16",
     "vue-echarts": "^5.0.0-beta.0",
     "vue-electron": "^1.0.6",
@@ -119,5 +121,8 @@
     "webpack-dev-server": "^3.1.4",
     "webpack-hot-middleware": "^2.22.2",
     "webpack-merge": "^4.1.3"
+  },
+  "optionalDependencies": {
+    "utf-8-validate": "^5.0.2"
   }
 }

src/renderer/components/LandingPage.vue

@@ -258,6 +258,8 @@
             });
             this.h337 = heatmap;
         },1000)
+        console.log(require('../../../package.json').version)
+
 
     },
     computed:{

src/renderer/components/LandingPage/SystemInformation.vue

@@ -31,7 +31,6 @@
 </template>
 
 <script>
-  var net = require('net');
   export default {
     data () {
       return {
@@ -40,7 +39,7 @@
         node: process.versions.node,
         path: this.$route.path,
         platform: require('os').platform(),
-        vue: require('vue/package.json').version
+        vue: require('vue-socket.io/package.json').version
       }
     }
   }

src/renderer/store/modules/socket.js

@@ -23,13 +23,13 @@ const mutations = {
     SOCKET_disConnectOneClient:(state) =>{
          state.hasConnectCount--
     },
-    // 断开一个客户端
-    SOCKET_pressureData:(state,json) =>{
+    // 接收客户端发送过来的数据
+    SOCKET_validateData:(state,json) =>{
         // 先判断列数
         let validNumByteArray = new Uint8Array(json);
         let allCommond = func.buf2hex(validNumByteArray);
         let commond = allCommond.substring(0,2)
-        // 判断 帧头 229 足压扫描
+        // 判断 帧头 e5 足压扫描
         if(commond == 'e5') {
             footPressure(state,validNumByteArray)
         }
@@ -65,17 +65,9 @@ function footPressure(state,validNumByteArray) {
 
 }
 
+// 足压数据补齐点位为60*60 并进行点扩散
 function setPressureData(data) {
     let dataAll = []
-    // for (let j =0;j<data.length;j++) {
-    //     for (let k =0;k<data[j].length;k++) {
-    //          let temp = {}
-    //          temp.x = j
-    //          temp.y = k
-    //          temp.value = data[j][k]
-    //          dataAll.push(temp)
-    //     }
-    // }
     // 补到之前  60*60 个点位
     for (let j =0;j<60;j++) {
         dataAll[j] = []
@@ -92,13 +84,8 @@ function setPressureData(data) {
         }
     }
     return func.pressureDataProcess(dataAll,2.5,4)
-
 }
 
-
-
-
-
 export default {
     state,
     actions,

static/server/app.js

@@ -6,7 +6,6 @@ var http = require('http');
 var server = http.createServer(app.callback());
 
 io = require('socket.io').listen(server);
-var protocal = require('./protocal/protocal')
 var sendProtocal = require('./protocal/sendProtocal')
 var command = require('./protocal/command')
 
@@ -82,14 +81,14 @@ socketServer.on('connection',(socket)=>{
             let validNum = validNumByteArray[0]
             if(data.length >validNum) {
                 let validateData = data.slice(0, 1 + 2 +validNum);
-                io.sockets.emit('pressureData',validateData);
+                io.sockets.emit('validateData',validateData);
                 lastBuffer = data.slice(1+2+validNum)
                 if(lastBuffer.length >=1+2+validNum) {
                     data = lastBuffer
                     continue;
                 }
             } else if(data.length == 1+2+validNum) {
-                io.sockets.emit('pressureData',data);
+                io.sockets.emit('validateData',data);
                 lastBuffer = null;
             } else {
                 lastBuffer = data;

static/server/protocal/protocal.js

@@ -1,291 +0,0 @@
-var log4js = require('log4js');
-var machineInfo = require('./global');
-
-function validate(data) {
-    // 公用协议校验
-    // HEADER部分
-    //TODO 待完善
-}
-function asiciiToString (arr) {
-    let str = ''
-    if(arr.length >0) {
-        for(var i of arr) {
-            str += String.fromCharCode(i)
-        }
-    }
-    return str
-}
-
-Buffer.prototype.toByteArray = function () {
-    return Array.prototype.slice.call(this, 0)
-}
-const logger = log4js.getLogger('protocal');
-
-module.exports = {
-    reconTest: function (data) {
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        //console.log(asiciiToString(sn))
-        json.device = asiciiToString(sn);
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    rePressReset:function(data){
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        json.device = sn;
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    reStopScan:function(data) {
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        json.device = sn;
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    reSocketPressReStart:function (data) {
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        json.device = asiciiToString(sn);
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    pressScanAbnormal:function(data) {
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        json.device = sn;
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    reCheckCamera:function (data) {
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        json.device = sn;
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    equipmentFault:function (data) {
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        json.device = sn;
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    faultRepaired:function (data) {
-        let json = {};
-        let snLength = data[5] - 1
-        let sn = data.slice(6, 6 + snLength).toByteArray();
-        json.device = sn;
-        machineInfo.sn = sn;
-        json.status = data[6 + snLength];
-        return json;
-    },
-    standArea: function (data) {
-        let json = {};
-        json.standArea = data[5 + data[5]];
-        return json;
-    },
-    pressCop: function (data) {
-        let json = {};
-        json.pressCop = {};
-        json.pressCop.leftFoot = {};
-        let temp = []
-        for (let index = 0; index < 2; index++) {
-            let dataArray = [];
-            for (let i = 0; i < 8; i++) {
-                dataArray.push(data[10 + index * 8 + i]);
-            }
-            let ratio = new Float64Array(new Uint8Array(dataArray).buffer)[0];
-            temp.push(ratio);
-        }
-        json.pressCop.leftFoot.x = temp[0];
-        json.pressCop.leftFoot.y = temp[1];
-        json.pressCop.rightFoot = {};
-        let temp2 = []
-        for (let index = 0; index < 2; index++) {
-            let dataArray = [];
-            for (let i = 0; i < 8; i++) {
-                dataArray.push(data[26 + index * 8 + i]);
-            }
-            let ratio2 = new Float64Array(new Uint8Array(dataArray).buffer)[0];
-            temp2.push(ratio2);
-        }
-        json.pressCop.rightFoot.x = temp2[0];
-        json.pressCop.rightFoot.y = temp2[1];
-        json.pressCop.body = {};
-        let temp3 = []
-        for (let index = 0; index < 2; index++) {
-            let dataArray = [];
-            for (let i = 0; i < 8; i++) {
-                dataArray.push(data[42 + index * 8 + i]);
-            }
-            let ratio3 = new Float64Array(new Uint8Array(dataArray).buffer)[0];
-            temp3.push(ratio3);
-        }
-        json.pressCop.body.x = temp3[0];
-        json.pressCop.body.y = temp3[1];
-        json.pressCop.bbody = {}
-        let temp4 = []
-        for (let index = 0; index < 2; index++) {
-            let dataArray = [];
-            for (let i = 0; i < 8; i++) {
-                dataArray.push(data[58 + index * 8 + i]);
-            }
-            let ratio4 = new Float64Array(new Uint8Array(dataArray).buffer)[0];
-            temp4.push(ratio4);
-        }
-        json.pressCop.bbody.x = temp4[0];
-        json.pressCop.bbody.y = temp4[1];
-        return json;
-    },
-    pressRatio: function (data) {
-        let json = {};
-        json.line = {};
-        json.line.leftLine = [];
-        for (let index = 11; index < 19; index = index + 4) {
-            let line = [];
-            line.push({ "x": data[index], "y": data[index + 1] });
-            line.push({ "x": data[index + 2], "y": data[index + 3] });
-            json.line.leftLine.push(line);
-        }
-        json.line.rightLine = [];
-        for (let index = 19; index < 27; index = index + 4) {
-            json.line.rightLine.push([{ "x": data[index], "y": data[index + 1] }, {
-                "x": data[index + 2],
-                "y": data[index + 3]
-            }]);
-        }
-        json.pressRatio = {};
-        json.pressRatio.area = {};
-        json.pressRatio.area.left = [];
-        for (let index = 0; index < 3; index++) {
-            let dataArray = [];
-            for (let i = 0; i < 8; i++) {
-                dataArray.push(data[27 + index * 8 + i]);
-            }
-            let ratio = new Float64Array(new Uint8Array(dataArray).buffer)[0];
-            json.pressRatio.area.left.push(ratio);
-        }
-        json.pressRatio.area.right = [];
-        for (let index = 0; index < 3; index++) {
-            let dataArray = [];
-            for (let i = 0; i < 8; i++) {
-                dataArray.push(data[51 + index * 8 + i]);
-            }
-            let ratio = new Float64Array(new Uint8Array(dataArray).buffer)[0];
-            json.pressRatio.area.right.push(ratio);
-        }
-        {
-            let dataArray = [];
-            for (let i = 0; i < 8; i++) {
-                dataArray.push(data[75 + i]);
-            }
-            json.pressRatio.general = new Float64Array(new Uint8Array(dataArray).buffer)[0];
-        }
-        return json;
-    },
-    pressure: function (data) {
-        let validNumByteArray = new Uint8Array(data.slice(10, 14));
-        let validNum = new DataView(validNumByteArray.buffer).getInt32();
-        let json = {};
-        var offset = 14;
-        json.pressureData = [];
-        //json.temp = [];
-        for (let j =0;j<60;j++) {
-            json.pressureData[j] = []
-            for (let k =0;k<60;k++) {
-               json.pressureData[j][k] = 0
-            }
-        }
-        for (let i = 0; i < validNum; i++) {
-            json.pressureData[data[offset + i * 3 + 1]][data[offset + i * 3]] = data[offset + i * 3 + 2]
-            //let press = { x: data[offset + i * 3 + 1]*11, y: data[offset + i * 3]*10, value: data[offset + i * 3 + 2]};
-            //json.temp.push(press);
-            //json.pressureData.push(press)
-        }
-        // 点数放大1.2倍 横坐标值放大9倍 纵坐标值放大8倍
-       // json.pressureData = pressureDataProcess(json.pressureData,1.2,9)
-        return json;
-    },
-
-
-    buf2hex:function(buffer) {
-        // create a byte array (Uint8Array) that we can use to read the array buffer
-        const byteArray = new Uint8Array(buffer);
-        // for each element, we want to get its two-digit hexadecimal representation
-        const hexParts = [];
-        for(let i = 0; i < byteArray.length; i++) {
-            // convert value to hexadecimal
-            const hex = byteArray[i].toString(16);
-            // pad with zeros to length 2
-            const paddedHex = ('00' + hex).slice(-2);
-            // push to array
-            hexParts.push(paddedHex);
-        }
-
-        // join all the hex values of the elements into a single string
-        return hexParts.join('');
-    }
-
-}
-// 压力值扩散方法
-function pressureDataProcess(a,scale,size) {
-    var height = 60;
-    var width = 60;
-    var newHeight = 60*scale;
-    var newWidth = 60*scale;
-    var u =0.0;
-    var v = 0.0;
-    var x = 0.0;
-    var y = 0.0;
-    var m = 0;
-    var n = 0;
-    let temp = new Array()
-    let rearr = []
-    for(let i = 0;i<newHeight;++i) {
-        temp[i] = new Array()
-        for(let j=0;j<newWidth;++j) {
-            y = i/scale;
-            x = j/scale;
-            m = parseInt(y);
-            n = parseInt(x);
-            v = y-m;
-            u = x-n;
-            let tt = {}
-            if(m<height-1 &&n<width-1){
-                temp[i][j] = parseInt((1.0-v)*((1.0-u)*a[m][n]+u*a[m][n+1])
-                    + v*((1.0-u)*a[m+1][n] + u*a[m+1][n+1])
-                )
-            } else {
-                temp[i][j] = a[m][n]
-            }
-            tt.x = i*size
-            tt.y = j*size
-            if(temp[i][j]>0) {
-                tt.value = temp[i][j]
-                rearr.push(tt)
-            }
-        }
-    }
-    return rearr
-
-}
-function randomFrom(lowerValue = 180,upperValue = 250)
-{
-    return Math.floor(Math.random() * (upperValue - lowerValue + 1) + lowerValue);
-}

static/server/socketClient.js

@@ -1,98 +0,0 @@
-var net = require('net');
-var fs = require('fs'); // 载入fs模块
-
-
-var HOST = '0.0.0.0';
-var PORT = 6800;
-
-// var HOST = '192.168.2.109';
-// var PORT = 43212;
-
-
-
-var client = new net.Socket();
-
-//const log = require('simple-node-logger').createSimpleFileLogger('./server.log');
-
-var lastBuffer = null;
-// 连接状态码首次连接没连接上 一直等待 等接上了再发送连通性测试
-var connectFlag = 1
-
-client.connect(PORT, HOST, function () {
-    connectFlag = 2
-    console.log('connected')
-    //一开始就连接上 发送连通性测试
-    client.emit('initConnect','1');
-});
-
-var flag = 0
-var time = 0
-
-
-client.on('error', function (ex) {
-    console.log("Socket Client Connect error");
-    console.log(ex);
-
-});
-// 为这个socket实例添加一个"close"事件处理函数
-client.on('close', function () {
-    if(flag == 0){
-        client.emit('disconnect','0');
-        time = new Date();
-    }
-    flag = 1;
-    connectFlag = 1
-    if(connectFlag == 1) {
-        // 有连接过才能进行等待重连操作
-        console.log('Socket CLOSED,1 seconds retry connect');
-        setTimeout(function () {
-            client.connect(PORT, HOST,function () {
-                if(flag == 1){
-                    flag = 2;
-                }
-            });
-        }, 1000);
-    }
-    // client.emit('reconnectClose','3');
-
-});
-
-let start = new Date().getTime()
-
-client.on('data', function (data) {
-    //console.log("data",new Date().getTime()-start);
-    //log.info("data",new Date().getTime()-start);
-    start = new Date().getTime();
-    if (lastBuffer !== null) {
-        data = Buffer.concat([lastBuffer, data]);
-    }
-    let flag = 1;
-    while(flag){
-        // 上一条数据流正常
-        // 先读取长度
-        //log.info('demo')
-        let validNumByteArray = new Uint8Array(data.slice(2, 6));
-        let validNum = new DataView(validNumByteArray.buffer).getInt32();
-        // 接收到的数据长度大于有效数据长度，说明后面有新的协议
-        if (data.length > 6 + validNum + 1) {
-            let validData = data.slice(0, 6 + validNum + 1);
-            client.emit('validData', validData);
-            // 将多余部分存起来
-            lastBuffer = data.slice(6 + validNum + 1);
-            if(lastBuffer.length >6){
-                data = lastBuffer;
-                continue;
-            }
-        } else if (data.length === 6 + validNum + 1) {
-            client.emit('validData', data);
-            lastBuffer = null;
-        } else {
-            // 存起来下次拼接
-            lastBuffer = data;
-        }
-        flag = 0;
-    }
-
-});
-
-module.exports = client;