Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/qdtlui

# Conflicts:
#	public/index.html

public/index.html

@@ -339,11 +339,11 @@
                     })
                     .then(function(oData) {
                         oWebControl.JS_Resize(b_width, b_height); // 初始化后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
-                        if(window.videoresiz==="1x1"){
-                            window.startPreview(window.cameraid,-1);
+                        if (window.videoresiz === "1x1") {
+                            window.startPreview(window.cameraid, -1);
 
                         }
-                       
+
                     });
             });
         }
@@ -378,7 +378,7 @@
             videoresiz();
         });
 
-        function videoresiz(){
+        function videoresiz() {
             if (oWebControl != null) {
                 getsize();
                 oWebControl.JS_Resize(b_width, b_height);
@@ -442,7 +442,7 @@
 
         //视频预览功能
         $("#startPreview").click(function() {
-            startPreview(window.cameraid,-1);
+            startPreview(window.cameraid, -1);
         });
 
         //停止全部预览
@@ -473,6 +473,16 @@
             });
         }
 
+        // windexlist   [{wndId: 1},{wndId: 2}]
+        function stoppreview(windexlist = []) {
+            oWebControl.JS_RequestInterface({
+                funcName: "stopMultiPlay",
+                argument: {
+                    list: windexlist
+                }
+            });
+        }
+
 
         function startPreview(cameraIndexCode=window.cameraid,index=-1) {