Administrator 2 years ago
parent
commit
df90d50047

+ 175 - 62
.idea/workspace.xml

@@ -2,14 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/evemt.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/evemt.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/sxt.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/sxt.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -27,12 +26,50 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="demo-dsd.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1497">
+              <caret line="209" column="13" selection-start-line="209" selection-start-column="13" selection-end-line="209" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="on_off_switch.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="300">
+              <caret line="69" lean-forward="true" selection-start-line="69" selection-end-line="69" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="demo.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="483">
+              <caret line="129" column="31" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="WebVideoCtrl.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="474">
+              <caret line="622" column="40" selection-start-line="622" selection-start-column="40" selection-end-line="622" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Class" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
@@ -45,10 +82,18 @@
       <find>DataScope</find>
       <find>电视墙</find>
       <find>122.141.177.213</find>
+      <find>console.log</find>
+      <find>handleEvent</find>
+      <find>isLun</find>
+      <find>clickLogin</find>
+      <find>changeWndNum</find>
+      <find>::</find>
+      <find>connectRealVideo</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly</dir>
+      <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\resources\templates\dahua</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -84,6 +129,13 @@
         <option value="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysRoleServiceImpl.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/on_off_switch.js" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" />
       </list>
     </option>
   </component>
@@ -122,9 +174,9 @@
       <path value="$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/superMap/libs/iclient8c/resource/Android/phonegap/bin/package.json" />
     </packageJsonPaths>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="1968" />
-    <option name="y" value="55" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="1912" />
+    <option name="y" value="-8" />
     <option name="width" value="1918" />
     <option name="height" value="1038" />
   </component>
@@ -184,6 +236,38 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+              <item name="css" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+              <item name="module" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -206,6 +290,14 @@
     <property name="project.structure.side.proportion" value="0.0" />
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\resources\templates\dahua\lib" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\resources\templates" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -291,7 +383,8 @@
       <workItem from="1665305906966" duration="1232000" />
       <workItem from="1665308240063" duration="810000" />
       <workItem from="1665318635325" duration="1897000" />
-      <workItem from="1665359355827" duration="5731000" />
+      <workItem from="1665359355827" duration="7320000" />
+      <workItem from="1665370196293" duration="18721000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -321,18 +414,26 @@
       <option name="project" value="LOCAL" />
       <updated>1665319094370</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="http">
+      <created>1665368588260</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1665368588260</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="21588000" />
+    <option name="totallyTimeSpent" value="41898000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1968" y="55" width="1918" height="1038" extended-state="0" />
+    <frame x="1912" y="-8" width="1936" height="1096" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.13832077" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.1369936" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -340,7 +441,7 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.24263039" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.27978724" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.4511111" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
@@ -351,7 +452,7 @@
       <window_info anchor="bottom" id="Run" order="2" weight="0.08555555" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.36847946" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19052745" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1945629" />
       <window_info anchor="right" id="Bean Validation" order="3" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -380,41 +481,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="14" column="104" selection-start-line="14" selection-start-column="104" selection-end-line="14" selection-end-column="104" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/utils/poi/ExcelUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="25440">
-          <caret line="848" column="5" selection-start-line="848" selection-start-column="5" selection-end-line="848" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/core/text/Convert.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16800">
-          <caret line="560" column="24" selection-start-line="560" selection-start-column="16" selection-end-line="560" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/utils/file/MimeTypeUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="42" column="15" selection-start-line="42" selection-start-column="15" selection-end-line="42" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/xss/XssFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2730">
-          <caret line="91" lean-forward="true" selection-start-line="91" selection-end-line="91" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
@@ -668,11 +734,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
           <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#368#369#0" expanded="true" />
-            <element signature="e#417#418#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -723,10 +784,62 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="207">
           <caret line="110" column="9" lean-forward="true" selection-start-line="110" selection-start-column="9" selection-end-line="110" selection-end-column="9" />
-          <folding>
-            <element signature="e#847#848#0" expanded="true" />
-            <element signature="e#926#927#0" expanded="true" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="203">
+          <caret line="102" column="1" selection-start-line="102" selection-start-column="1" selection-end-line="102" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="498">
+          <caret line="79" column="1" selection-start-line="79" selection-start-column="1" selection-end-line="79" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/modifyUI.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="11" column="32" lean-forward="true" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/static/v/camera/module/WebVideoCtrl.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="223">
+          <caret line="603" column="8" selection-start-line="603" selection-start-column="8" selection-end-line="603" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1497">
+          <caret line="209" column="13" selection-start-line="209" selection-start-column="13" selection-end-line="209" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="622" column="40" selection-start-line="622" selection-start-column="40" selection-end-line="622" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="129" column="31" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="69" lean-forward="true" selection-start-line="69" selection-end-line="69" />
         </state>
       </provider>
     </entry>

+ 80 - 0
mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css

@@ -0,0 +1,80 @@
+.testswitch {
+    position: relative;
+    float: left;
+    width: 90px;
+    margin: 0;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+}
+
+.testswitch-checkbox {
+    display: none;
+}
+
+.testswitch-label {
+    display: block;
+    overflow: hidden;
+    cursor: pointer;
+    border: 2px solid #999999;
+    border-radius: 20px;
+}
+
+.testswitch-inner {
+    display: block;
+    width: 200%;
+    margin-left: -100%;
+    transition: margin 0.3s ease-in 0s;
+}
+
+.testswitch-inner::before, .testswitch-inner::after {
+    display: block;
+    float: right;
+    width: 50%;
+    height: 30px;
+    padding: 0;
+    line-height: 30px;
+    font-size: 14px;
+    color: white;
+    font-family: Trebuchet, Arial, sans-serif;
+    font-weight: bold;
+    box-sizing: border-box;
+}
+
+.testswitch-inner::after {
+    content: attr(data-on);
+    padding-left: 10px;
+    background-color: #00e500;
+    color: #FFFFFF;
+}
+
+.testswitch-inner::before {
+    content: attr(data-off);
+    padding-right: 10px;
+    background-color: #EEEEEE;
+    color: #999999;
+    text-align: right;
+}
+
+.testswitch-switch {
+    position: absolute;
+    display: block;
+    width: 22px;
+    height: 22px;
+    margin: 4px;
+    background: #FFFFFF;
+    top: 0;
+    bottom: 0;
+    right: 56px;
+    border: 2px solid #999999;
+    border-radius: 20px;
+    transition: all 0.3s ease-in 0s;
+}
+
+.testswitch-checkbox:checked + .testswitch-label .testswitch-inner {
+    margin-left: 0;
+}
+
+.testswitch-checkbox:checked + .testswitch-label .testswitch-switch {
+    right: 0px;
+}

+ 238 - 198
mybusiness/src/main/resources/templates/dahua/demo-dsd.html

@@ -2,145 +2,191 @@
 <html>
 <head>
     <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
-    <meta http-equiv="Expires" content="0" />
-	<link href="css/jquery-ui.css" rel="stylesheet">
-	<link href="images/ja_ja.css" rel="stylesheet">
-	<script src="images/jquery-1.7.1.min.js"></script>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Pragma" content="no-cache"/>
+    <meta http-equiv="Cache-Control" content="no-cache, must-revalidate"/>
+    <meta http-equiv="Expires" content="0"/>
+    <link href="css/jquery-ui.css" rel="stylesheet">
+    <link href="css/on_off_switch.css" rel="stylesheet">
+    <link href="images/ja_ja.css" rel="stylesheet">
+    <script src="images/jquery-1.7.1.min.js"></script>
     <script>
         document.write("<link type='text/css' href='css/demo.css?version=" + new Date().getTime() + "' rel='stylesheet' />");
     </script>
 </head>
-		<script src="lib/jquery.js"></script>
-	<script src="lib/jquery-ui.js"></script>
-	<script src="lib/json2.js"></script>
+<script>
+    var video_list;
+
+</script>
+
 
+<script src="lib/jquery.js"></script>
+<script src="lib/jquery-ui.js"></script>
+<script src="lib/json2.js"></script>
+<script src="lib/on_off_switch.js"></script>
 
-	<style>
 
-	</style>
+<style>
+
+</style>
 <body>
 
-<input type="hidden" id="ptzspeed" name="云台控制速度" value="4" />
+<input type="hidden" id="ptzspeed" name="云台控制速度" value="4"/>
 <div class="con_list">
-		<h1><i>--</i>摄像头列表<i>--</i></h1>
-	<ul class="list_ul" id="list">
-		<li><a>暂无可用摄像头</a></li>
-	</ul>
+    <h1><i>--</i>摄像头列表<i>--</i></h1>
+    <ul class="list_ul" id="list">
+        <li><a>暂无可用摄像头</a></li>
+    </ul>
 
 
 </div>
 <div class="con_tent">
-     <div id="divPlugin" class="plugin">
-	</div>
-
+    <div id="divPlugin" class="plugin">
+    </div>
 
 
 </div>
 
-	<div class="con_right con_right2">
-		<ul class="top_ul">
-	<li class="on"><a>电视墙</a></li>
-	<!--<li id="jkd"><a>监控端</a></li>-->
-	<!--<li id="gld"><a>管理端</a></li>-->
-	<!--<li id="dsj"><a>大数据端</a></li>-->
-</ul>
-		<table class="ja_table2" cellpadding="0" cellspacing="0" border="0">
-
-			<tr>
-						<td class="left_btn">
-							<div class="zs_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn zs_btn" value="左上" onmousedown="mouseUPLeftPTZControl(true);" onmouseup="mouseUPLeftPTZControl(false);" title="左上"  />
-							</div>
-							<div class="s_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn " value="上" onmousedown="mouseUpPTZControl(true);" onmouseup="mouseUpPTZControl(false);"  title="上"  />
-								</div>
-							<div class="ys_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn " value="右上" onmousedown="mouseUPRightPTZControl(true);" onmouseup="mouseUPRightPTZControl(false);"  title="右上"  />
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td class="con_btn">
-
-							<div class="z_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn " value="左" onmousedown="mouseLefPTZControl(true);" onmouseup="mouseLefPTZControl(false);"  title="左"  />
-								</div>
-							<div class="zsc_btn">
-							<input type="button" class="center" value=""  />
-								</div>
-							<div class="y_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn " value="右" onmousedown="mouseRightPTZControl(true);" onmouseup="mouseRightPTZControl(false);"  title="右"  />
-					</div>
-						</td>
-					</tr>
-					<tr>
-						<td class="right_btn">
-
-							<div class="zx_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn " value="左下" onmousedown="mouseDownLeftPTZControl(true);" onmouseup="mouseDownLeftPTZControl(false);"  title="左上"  />
-								</div>
-							<div class="x_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn " value="下" onmousedown="mouseDownPTZControl(true);" onmouseup="mouseDownPTZControl(false);"  title="下"  />
-								</div>
-							<div class="yx_btn">
-								<span><img src="images/ja_jiao.png"/></span>
-							<input type="button" class="btn " value="右下" onmousedown="mouseDownRightPTZControl(true);" onmouseup="mouseDownRightPTZControl(false);"  title="右下"  />
-			              </div>
-						</td>
-					</tr>
-		</table>
-		<table class="ja_table3" cellpadding="0" cellspacing="0" border="0">
-			  <tr>
-                <td  class="ja_bb1"><span><img src="images/d_icon.png"/></span><input type="button" class="btn2" value="变倍+" onmousedown="PTZZoomIn(true)" title="变倍+" onmouseup="PTZZoomIn(false)">
-				  </td>
-				  <td>变倍</td>
-                <td class="ja_bb2"><span><img src="images/x_icon.png"/></span><input type="button" class="btn2" value="变倍-" onmousedown="PTZZoomout(true)"  title="变倍-"onmouseup="PTZZoomout(false)"></td>
-            </tr>
-            <tr>
-                <td class="ja_bj1" ><span><img src="images/d_icon2.png"/></span><input type="button" class="btn2" value="变焦+" onmousedown="PTZFocusIn(true)"  title="变焦+"onmouseup="PTZFocusIn(false)"></td>
-				  <td>变焦</td>
-                <td class="ja_bj2"><span><img src="images/x_icon2.png"/></span><input type="button" class="btn2" value="变焦-" onmousedown="PTZFoucusOut(true)"  title="变焦-"onmouseup="PTZFoucusOut(false)"></td>
-            </tr>
-            <tr class="ja_gq">
-                <td class="ja_gq1" ><span><img src="images/d_icon3.png"/></span><input type="button" class="btn2" value="光圈+" onmousedown="PTZIrisIn(true)" title="光圈+" onmouseup="PTZIrisIn(false)"></td>
-				  <td>光圈</td>
-                <td class="ja_gq2"><span><img src="images/x_icon3.png"/></span><input type="button" class="btn2" value="光圈-" onmousedown="PTZIrisOut(true)" onmouseup="PTZIrisOut(false) " title="光圈-"></td>
-            </tr>
-
-		</table>
-
-		<!--	<div class="ja_zt"> <input type="button" class="btn" value="抓图" onclick="clickCapturePic();" /></div>-->
-	<table class="ja_table1" cellpadding="0" cellspacing="0" border="0">
-			 <tr>
-                <td>
-                    <select id="wndNum" class="sel2" onchange="changeWndNum(this.value);">
-                        <option value="1">1x1</option>
-                        <option value="2" selected>2x2</option>
-                        <option value="3">3x3</option>
-                    </select>
-                </td>
-            </tr>
-		</table>
-
-<!--
-		<div class="ja_div">
-			<p>预览抓图保存路径</p>
-			<div class="ja_inp">
-				<input id="LiveSnapshot" type="text"  class="ja_txt txt" />
-				<input type="button"  value="浏览" onclick="clickOpenFileDlg('LiveSnapshot');"  class="ja_btn btn"/>
-			</div>
-		</div>
--->
+<div class="con_right con_right2">
+    <ul class="top_ul">
+        <li class="on"><a>电视墙1</a></li>
+        <!--<li id="jkd"><a>监控端</a></li>-->
+        <!--<li id="gld"><a>管理端</a></li>-->
+        <!--<li id="dsj"><a>大数据端</a></li>-->
+        <li>
+            <div class="testswitch">
+                <input class="testswitch-checkbox" id="onoffswitch" type="checkbox">
+                <label class="testswitch-label" for="onoffswitch">
+                    视频轮播:<span class="testswitch-inner" data-on="ON" data-off="OFF"></span>
+                    <span class="testswitch-switch"></span>
+                </label>
+            </div>
+        </li>
+        <li>
+            <button onclick="clickLogin('111.26.114.144','2021','admin','Admin12345')">播放测试</button>
+        </li>
+    </ul>
+
+    <table class="ja_table2" cellpadding="0" cellspacing="0" border="0">
+
+        <tr>
+            <td class="left_btn">
+                <div class="zs_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn zs_btn" value="左上" onmousedown="mouseUPLeftPTZControl(true);"
+                           onmouseup="mouseUPLeftPTZControl(false);" title="左上"/>
+                </div>
+                <div class="s_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn " value="上" onmousedown="mouseUpPTZControl(true);"
+                           onmouseup="mouseUpPTZControl(false);" title="上"/>
+                </div>
+                <div class="ys_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn " value="右上" onmousedown="mouseUPRightPTZControl(true);"
+                           onmouseup="mouseUPRightPTZControl(false);" title="右上"/>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td class="con_btn">
+
+                <div class="z_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn " value="左" onmousedown="mouseLefPTZControl(true);"
+                           onmouseup="mouseLefPTZControl(false);" title="左"/>
+                </div>
+                <div class="zsc_btn">
+                    <input type="button" class="center" value=""/>
+                </div>
+                <div class="y_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn " value="右" onmousedown="mouseRightPTZControl(true);"
+                           onmouseup="mouseRightPTZControl(false);" title="右"/>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td class="right_btn">
+
+                <div class="zx_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn " value="左下" onmousedown="mouseDownLeftPTZControl(true);"
+                           onmouseup="mouseDownLeftPTZControl(false);" title="左上"/>
+                </div>
+                <div class="x_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn " value="下" onmousedown="mouseDownPTZControl(true);"
+                           onmouseup="mouseDownPTZControl(false);" title="下"/>
+                </div>
+                <div class="yx_btn">
+                    <span><img src="images/ja_jiao.png"/></span>
+                    <input type="button" class="btn " value="右下" onmousedown="mouseDownRightPTZControl(true);"
+                           onmouseup="mouseDownRightPTZControl(false);" title="右下"/>
+                </div>
+            </td>
+        </tr>
+    </table>
+    <table class="ja_table3" cellpadding="0" cellspacing="0" border="0">
+        <tr>
+            <td class="ja_bb1"><span><img src="images/d_icon.png"/></span><input type="button" class="btn2" value="变倍+"
+                                                                                 onmousedown="PTZZoomIn(true)"
+                                                                                 title="变倍+"
+                                                                                 onmouseup="PTZZoomIn(false)">
+            </td>
+            <td>变倍</td>
+            <td class="ja_bb2"><span><img src="images/x_icon.png"/></span><input type="button" class="btn2" value="变倍-"
+                                                                                 onmousedown="PTZZoomout(true)"
+                                                                                 title="变倍-"
+                                                                                 onmouseup="PTZZoomout(false)"></td>
+        </tr>
+        <tr>
+            <td class="ja_bj1"><span><img src="images/d_icon2.png"/></span><input type="button" class="btn2" value="变焦+"
+                                                                                  onmousedown="PTZFocusIn(true)"
+                                                                                  title="变焦+"
+                                                                                  onmouseup="PTZFocusIn(false)"></td>
+            <td>变焦</td>
+            <td class="ja_bj2"><span><img src="images/x_icon2.png"/></span><input type="button" class="btn2" value="变焦-"
+                                                                                  onmousedown="PTZFoucusOut(true)"
+                                                                                  title="变焦-"
+                                                                                  onmouseup="PTZFoucusOut(false)"></td>
+        </tr>
+        <tr class="ja_gq">
+            <td class="ja_gq1"><span><img src="images/d_icon3.png"/></span><input type="button" class="btn2" value="光圈+"
+                                                                                  onmousedown="PTZIrisIn(true)"
+                                                                                  title="光圈+"
+                                                                                  onmouseup="PTZIrisIn(false)"></td>
+            <td>光圈</td>
+            <td class="ja_gq2"><span><img src="images/x_icon3.png"/></span><input type="button" class="btn2" value="光圈-"
+                                                                                  onmousedown="PTZIrisOut(true)"
+                                                                                  onmouseup="PTZIrisOut(false) "
+                                                                                  title="光圈-"></td>
+        </tr>
+
+    </table>
+
+    <!--	<div class="ja_zt"> <input type="button" class="btn" value="抓图" onclick="clickCapturePic();" /></div>-->
+    <table class="ja_table1" cellpadding="0" cellspacing="0" border="0">
+        <tr>
+            <td>
+                <select id="wndNum" class="sel2" onchange="changeWndNum(this.value);">
+                    <option value="1">1x1</option>
+                    <option value="2" selected>2x2</option>
+                    <option value="3">3x3</option>
+                </select>
+            </td>
+        </tr>
+    </table>
+
+    <!--
+            <div class="ja_div">
+                <p>预览抓图保存路径</p>
+                <div class="ja_inp">
+                    <input id="LiveSnapshot" type="text"  class="ja_txt txt" />
+                    <input type="button"  value="浏览" onclick="clickOpenFileDlg('LiveSnapshot');"  class="ja_btn btn"/>
+                </div>
+            </div>
+    -->
 
 </div>
 
@@ -156,13 +202,12 @@
 <script src="module/demo.js"></script>
 
 
-
-
 <script>
 
 
-var deptId;
-   function GetRequest() {
+    var deptId;
+
+    function GetRequest() {
         var url = location.search; //获取url中"?"符后的字串
         var theRequest = new Object();
         if (url.indexOf("?") != -1) {
@@ -179,79 +224,74 @@ var deptId;
     }
 
 
-
-	$(function(){
-		$(".ja_table2 div").hover(function(){
-			$(this).find('img').attr("src","images/ja_jiao2.png");
-		},function(){
-			$(this).find('img').attr("src","images/ja_jiao.png");
-		});
-
-		$(".ja_table3 .ja_bb1").hover(function(){
-			$(this).find('img').attr("src","images/d_icon_2.png");
-		},function(){
-			$(this).find('img').attr("src","images/d_icon.png");
-		});
-		$(".ja_table3 .ja_bb2").hover(function(){
-			$(this).find('img').attr("src","images/x_icon_2.png");
-		},function(){
-			$(this).find('img').attr("src","images/x_icon.png");
-		});
-		$(".ja_table3 .ja_bj1").hover(function(){
-			$(this).find('img').attr("src","images/d_icon2_2.png");
-		},function(){
-			$(this).find('img').attr("src","images/d_icon2.png");
-		});
-		$(".ja_table3 .ja_bj2").hover(function(){
-			$(this).find('img').attr("src","images/x_icon2_2.png");
-		},function(){
-			$(this).find('img').attr("src","images/x_icon2.png");
-		});
-		$(".ja_table3 .ja_gq1").hover(function(){
-			$(this).find('img').attr("src","images/d_icon3_2.png");
-		},function(){
-			$(this).find('img').attr("src","images/d_icon3.png");
-		});
-		$(".ja_table3 .ja_gq2").hover(function(){
-			$(this).find('img').attr("src","images/x_icon3_2.png");
-		},function(){
-			$(this).find('img').attr("src","images/x_icon3.png");
-		});
-
-
-
-		var hei = $(window).height();
-		$("#my_video_1").height(hei - 180);
-
-		$(".con_list").height(hei);
-		$(".con_right2").height(hei);
-
-
- 
-
-
-
-GetRequest();
-
-		$.ajax({
-			//请求方式
-			type:"post",
-			//文件位置
-			url:"http://117.78.49.164:9091/business/app/Dahua_Controller/queryAllCameras?deptId="+deptId,
-			//返回数据格式为json,也可以是其他格式如
-			dataType: "json",
-			async:true,
-			//请求成功后要执行的函数,拼接html
-			success: function(data){
-			   console.log(data);
-				$('#list').html('');
-				for(var i=0;i<data.length;i++){
-					var o = data[i];
-					$('#list').append('<li onclick="clickLogin(\''+o.hikIp+'\',\''+o.hikPort+'\',\''+o.hikUsername+'\',\''+o.hikPassword+'\')"><a>'+o.name+'</a></li>');
-				}
-			}
-		});
-	});
+    $(function () {
+        $(".ja_table2 div").hover(function () {
+            $(this).find('img').attr("src", "images/ja_jiao2.png");
+        }, function () {
+            $(this).find('img').attr("src", "images/ja_jiao.png");
+        });
+
+        $(".ja_table3 .ja_bb1").hover(function () {
+            $(this).find('img').attr("src", "images/d_icon_2.png");
+        }, function () {
+            $(this).find('img').attr("src", "images/d_icon.png");
+        });
+        $(".ja_table3 .ja_bb2").hover(function () {
+            $(this).find('img').attr("src", "images/x_icon_2.png");
+        }, function () {
+            $(this).find('img').attr("src", "images/x_icon.png");
+        });
+        $(".ja_table3 .ja_bj1").hover(function () {
+            $(this).find('img').attr("src", "images/d_icon2_2.png");
+        }, function () {
+            $(this).find('img').attr("src", "images/d_icon2.png");
+        });
+        $(".ja_table3 .ja_bj2").hover(function () {
+            $(this).find('img').attr("src", "images/x_icon2_2.png");
+        }, function () {
+            $(this).find('img').attr("src", "images/x_icon2.png");
+        });
+        $(".ja_table3 .ja_gq1").hover(function () {
+            $(this).find('img').attr("src", "images/d_icon3_2.png");
+        }, function () {
+            $(this).find('img').attr("src", "images/d_icon3.png");
+        });
+        $(".ja_table3 .ja_gq2").hover(function () {
+            $(this).find('img').attr("src", "images/x_icon3_2.png");
+        }, function () {
+            $(this).find('img').attr("src", "images/x_icon3.png");
+        });
+
+
+        var hei = $(window).height();
+        $("#my_video_1").height(hei - 180);
+
+        $(".con_list").height(hei);
+        $(".con_right2").height(hei);
+
+
+        GetRequest();
+
+        $.ajax({
+            //请求方式
+            type: "post",
+            //文件位置
+            url: "http://117.78.49.164:9091/business/app/Dahua_Controller/queryAllCameras?deptId=" + deptId,
+            //返回数据格式为json,也可以是其他格式如
+            dataType: "json",
+            async: true,
+            //请求成功后要执行的函数,拼接html
+            success: function (data) {
+                video_list = data;
+                console.log("+++++",video_list);
+                $('#list').html('');
+                for (var i = 0; i < data.length; i++) {
+                    var o = data[i];
+                    $('#list').append('<li onclick="clickLogin(\'' + o.hikIp + '\',\'' + o.hikPort + '\',\'' + o.hikUsername + '\',\'' + o.hikPassword + '\')"><a>' + o.name + '</a></li>');
+                }
+            }
+        });
+    });
 
 </script>
 

+ 108 - 0
mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js

@@ -0,0 +1,108 @@
+var video_team = [];
+var intercalHanler;
+var team_index = 0;
+var count;
+var team_num;
+$(document).ready(function () {
+    $("#onoffswitch").on('click', function () {
+        clickSwitch()
+    });
+
+    var clickSwitch = function () {
+        if ($("#onoffswitch").is(':checked')) {
+            isLunBo = true
+            console.log("在ON的状态下", isLunBo);
+            lunbo();
+        } else {
+            isLunBo = false
+            console.log("在OFF的状态下", isLunBo);
+            window.clearInterval(intercalHanler)
+        }
+    };
+});
+
+
+function lunbo() {
+    //先取到几x几的屏幕
+    var num = parseInt($("#wndNum").find("option:selected").val());
+    count = num * num;
+    team_num = 0;
+    if (video_list.length % count == 0) {
+        team_num = parseInt(video_list.length / count);
+    } else {
+        team_num = parseInt(video_list.length / count) + 1;
+    }
+    console.log("num:", num, "count:", count)
+    console.log("team_num:" + team_num)
+    video_team = [];
+    for (var i = 0; i < team_num; i++) {
+        var team = [];
+        for (var j = i * count; j < (i + 1) * (count) && j < video_list.length; j++) {
+            team.push(video_list[j])
+        }
+        video_team.push(team)
+    }
+    console.log("video_team:", video_team)
+    team_index = 0;
+    startPlayVideo()
+    // intercalHanler = window.setInterval(startPlayVideo, 100000)
+}
+
+function sleep1(ms, callback) {
+    setTimeout(callback, ms)
+}
+
+
+var play_index = 0;
+var hikIp;
+var hikPort;
+var hikUsername;
+var hikPassword;
+
+
+function startPlayVideo() {
+    var play_list;
+    if (team_index >= video_team.length) {
+        team_index = 0
+    }
+    play_list = video_team[team_index++]
+
+
+    if (play_index >= play_list.length) {
+        play_index = 0
+    }
+    var o = play_list[play_index];
+    window.setTimeout(clickLogin, 5000, o.hikIp, o.hikPort, o.hikUsername, o.hikPassword)
+
+// for (var k = 0; k < play_list.length; k++) {
+//     play_index = k;
+//     var o = play_list[play_index];
+//
+//     // window.setTimeout(clickLogin,10000,o.hikIp, o.hikPort, o.hikUsername, o.hikPassword)
+//     // sleep(5000)
+//     console.log(play_index,"wwwwww:",k)
+//     clickLogin(o.hikIp, o.hikPort, o.hikUsername, o.hikPassword)
+//     //
+//     // console.log(play_index, o.hikIp, o.hikPort, o.hikUsername, o.hikPassword)
+// }
+//
+//
+// // play_index = 0;
+// if (team_index >= team_num) {
+//     team_index = 0;
+// }
+
+}
+
+function sleep(n) { //n表示的毫秒数
+    var start = new Date().getTime();
+    while (true) if (new Date().getTime() - start > n) break;
+}
+
+
+function awautPlay(hikIp, hikPort, hikUsername, hikPassword) {
+    clickLogin(hikIp, hikPort, hikUsername, hikPassword)
+}
+
+
+

File diff suppressed because it is too large
+ 524 - 513
mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js


File diff suppressed because it is too large
+ 613 - 625
mybusiness/src/main/resources/templates/dahua/module/demo.js


+ 33 - 33
mybusiness/src/main/resources/templates/dahua/module/demo_jk.js

@@ -10,11 +10,11 @@ $(function () {
 				var top = $("#divPlugin").offset().top + window.outerHeight - window.innerHeight;
 				var width = $("#divPlugin").width()*3;
 			    var h = $(window).height()-60;
-				var height = $("#divPlugin").height();						
-										
-				WebVideoCtrl.resizeVideo(left, top, width, h);		
+				var height = $("#divPlugin").height();
+
+				WebVideoCtrl.resizeVideo(left, top, width, h);
 				//创建视频窗口
-				WebVideoCtrl.createMultiNodeDisplay(36);				
+				WebVideoCtrl.createMultiNodeDisplay(36);
 				//设置视频窗口的显示
 				var num = parseInt($("#wndNum").find("option:selected").val());
 				//设置窗口分割数
@@ -23,15 +23,15 @@ $(function () {
 				WebVideoCtrl.registerEvent("SelectedView",responseSelectedViewSignal);
 				//初始化路径
 				WebVideoCtrl.getUserDirectory().done(function(szDir){
-							clickLogin();	
+							clickLogin();
 				});
 		});
 		$("#tabs_ptz").tabs();
 		$("#tabs_playback").tabs();
 		$("#tabs_control").tabs();
 		$("#closePtzLocate").hide();
-		$("#openPtzLocate").show();	
-	}).fail(function(){	
+		$("#openPtzLocate").show();
+	}).fail(function(){
         alert("您还未安装过插件,双击开发包目录里下的Package里的webplugin.exe进行安装!");
 	});
 });
@@ -61,7 +61,7 @@ function responseSelectedViewSignal(iNodeIndex,iViewIndex,iWinID){
 //显示操作信息
 function showOPInfo(szInfo, status, error) {
     var szTip = "<div>" + Foundation.dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss") + " " + szInfo;
-	if (typeof status != "undefined") 
+	if (typeof status != "undefined")
 	{
 		szTip += "(" + status.toString() + ", " + error.toString() + ")";
     }
@@ -83,7 +83,7 @@ function changeWndRow(row)
 {
 	//设置视频窗口的显示
 	var row = parseInt($("#wndRow").find("option:selected").val());
-	var col = parseInt($("#wndCol").find("option:selected").val());	
+	var col = parseInt($("#wndCol").find("option:selected").val());
 	WebVideoCtrl.setSplitRowAndCol(row, col);
 	DemoUI.setWinIndex(row*col);
 }
@@ -92,7 +92,7 @@ function changeWndRow(row)
 function changeWndCol(col)
 {
 	//设置视频窗口的显示
-	var row = parseInt($("#wndRow").find("option:selected").val());	
+	var row = parseInt($("#wndRow").find("option:selected").val());
 	var col = parseInt($("#wndCol").find("option:selected").val());
 	WebVideoCtrl.setSplitRowAndCol(row, col);
 	DemoUI.setWinIndex(row*col);
@@ -105,7 +105,7 @@ function clickLogin()
 	// var szUserLang = navigator.userLanguage.toLowerCase();
 	// var szLanguage = (navigator.browserLanguage || navigator.language ).toLowerCase();
 	// szLanguage = szLanguage.substring(0, 2);
-	
+
 	var szIP = $("#szIP").val();
     szPort = $("#szPort").val() - 0;
     szUsername = $("#szUsername").val();
@@ -201,7 +201,7 @@ function clickStartRealPlay(){
 	//获得通道号
 	var iChannel = $("#channels").val() - 0;
 	//获得码流类型
-	var iStreamType = parseInt($("#streamtype").val(), 10); 
+	var iStreamType = parseInt($("#streamtype").val(), 10);
 	//窗口选择模式
 	var iMode = parseInt($("#winMode").val(), 10);
 	if(0 == iMode){
@@ -250,7 +250,7 @@ function clickStartVoiceTalk(){
 			}
 		}
 	)
-	
+
 }
 
 //关闭对讲
@@ -338,12 +338,12 @@ function clickCloseSound(){
 		showOPInfo("Close Sound Succeed");
 	}else{
 		showOPInfo( "Close Sound Fail");
-	}	
+	}
 }
 
 function clickCapturePic(){
 	var path = $("#LiveSnapshot").val();
-	var format = $("#captureFileFormat").val() - 0;                 
+	var format = $("#captureFileFormat").val() - 0;
 	WebVideoCtrl.crabOnePicture(format,path,false).done(function(ret){
 		if (ret){
 			showOPInfo("Snapshot Succeed,Path:"+ path);
@@ -354,7 +354,7 @@ function clickCapturePic(){
 }
 
 function clickStartRecord(){
-	var path = $("#LiveRecord").val();     
+	var path = $("#LiveRecord").val();
 	var format = parseInt($("#recordFormat").val(), 10);
 	WebVideoCtrl.startRecordingVideo(format,path).done(function(ret){
 		if(ret){
@@ -365,7 +365,7 @@ function clickStartRecord(){
 	})
 }
 
-function clickStopRecord(){                
+function clickStopRecord(){
 	WebVideoCtrl.stopRecordingVideo().done(function(ret){
 		if (ret){
 			showOPInfo("Stop Record Succeed");
@@ -480,10 +480,10 @@ function GetPresets(){
 function GotoPreset(){
 	//获得预置点序号
 	var index = parseInt($("#presetList").val(), 10);
-	var speed = parseInt($("#ptzspeed").val(), 10)	
+	var speed = parseInt($("#ptzspeed").val(), 10)
 	WebVideoCtrl.gotoPreset(index, speed);
-		
-	
+
+
 }
 
 function RemovePreset(){
@@ -494,7 +494,7 @@ function RemovePreset(){
 		$("#presetList" + " option[value='" + index.toString() + "']").remove();
 		$("#presetList option:last").attr("selected","selected");
 	}
-		
+
 }
 
 function SetPreset(){
@@ -513,11 +513,11 @@ function clickStartTrafficDataQuery(){
 	var endTime = $("#humanFlowEndtime").val();
 	var ruleType = parseInt($("#humanFlowRule").val(), 10);
 	var span = parseInt($("#humanFlowGranularity").val(), 10);
-	var minStayTime = parseInt($("#humanFlowMinStayTime").val(), 10); 
+	var minStayTime = parseInt($("#humanFlowMinStayTime").val(), 10);
 	WebVideoCtrl.startTrafficDataQuery(sIP,0,startTime,endTime,ruleType,span,minStayTime).done(function(handle){
 		if(handle > 0){
 			$("#humanFlowQueryHandle").val(handle.toString());
-		}	
+		}
 	})
 }
 
@@ -526,7 +526,7 @@ function clickGetTrafficDataTotalCount(){
 	WebVideoCtrl.getTrafficDataTotalCount(handle).done(function(ret){
 		if(ret >= 0){
 			$("#humanFlowInfoCount").val(ret.toString());
-		}	
+		}
 	});
 }
 
@@ -545,7 +545,7 @@ function clickStopTrafficDataQuery(){
 }
 
 function clickRecordSearch(){
-	
+
 }
 
 function changeWinMode(){
@@ -571,7 +571,7 @@ function clickStartAllRealPlay(){
 		//获得通道号
 		var iChannel = $("#channels").val() - 0;
 		//获得码流类型
-		var iStreamType = parseInt($("#streamtype").val(), 10); 
+		var iStreamType = parseInt($("#streamtype").val(), 10);
 		//窗口数目
 		var iWndNum = parseInt($("#wndNum").val(), 10);
 		if(iIndex > (iWndNum * iWndNum - 1)){
@@ -583,7 +583,7 @@ function clickStartAllRealPlay(){
 					function(status,error){
 						showOPInfo(sIP + " Channel:"+ iChannel.toString() + " Live Fail", status, error);
 					});
-				
+
 	});
 }
 
@@ -592,8 +592,8 @@ function clickStopAllRealPlay(){
 }
 
 //开启注册监听
-function startRegisterListen() 
-{	
+function startRegisterListen()
+{
 	//注册事件
 	WebVideoCtrl.registerEvent("DetectedDeviceInfo", function(ip, port, state){
 			DemoUI.setLoginDeviceIP(ip)
@@ -619,13 +619,13 @@ function clickStartRecordSearch(){
 				showOPInfo(sIP + " Channel:"+ iChannel.toString() + "start query succeed");
 			}else{
 				showOPInfo(sIP + " Channel:"+ iChannel.toString() + "start query fail");
-			}		
+			}
 		})
 }
 
 function findNextRecordInfoCb(fileInfor){
 	var sIP = DemoUI.getCurDeviceIP();
-	var iChannel = $("#channels").val() - 0;	
+	var iChannel = $("#channels").val() - 0;
 	if(fileInfor.length == 0)
 	{
 		showOPInfo(sIP + " Channel:"+ iChannel.toString() + "no info");
@@ -701,13 +701,13 @@ function disableIVS(){
 }
 
 function clickSearchRecordStatus()
-{	
+{
 	var sIP = DemoUI.getCurDeviceIP();
 	var iChannel = $("#channels").val() - 0;
 	var year = parseInt($("#recordStatus_year").find("option:selected").text());
 	var month = parseInt($("#recordStatus_month").find("option:selected").text());
 	WebVideoCtrl.queryRecordFileBitmap(sIP,iChannel,year,month,0).done(function(sStatus){
-		DemoUI.setRecordStatus(sStatus); 
+		DemoUI.setRecordStatus(sStatus);
 	});
 }