Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

liuyg

2021-09-06 0397e2fb15fbccc77d6da16196d30ae54114aa2f

 public/carVideo/children.html

@@ -110,10 +110,10 @@
        <textarea id="initParam" type="text" style="width:260px;height:200px;">
                  {
                    "argument": {
                        "appkey": "26589653",
                        "ip": "61.131.136.18",
                        "port": 10443,
                        "secret": "hSzZW0VHfyHgJziMemOx",
                        "appkey": "26864254",
                        "ip": "47.49.21.159",
                        "port": 443,
                        "secret": "oC2JAzu6PH5OqqcbGQCy",
                        "enableHTTPS": 1,
                        "layout": "1x1",
                        "playMode": 0
@@ -136,7 +136,7 @@
        <textarea id="playParam" type="text" style="width:260px;height:200px;">
                  {
                    "argument": {
                        "cameraIndexCode": "1f792961883543c6868cc8b200291962",
                        "cameraIndexCode": "36015602001310925219",
                        "ezvizDirect": 0,
                        "gpuMode": 0,
                        "streamMode": 0,
@@ -386,7 +386,12 @@
    });
  }

  initPlugin();
  function close() {
    if (oWebControl != null) {
      oWebControl.JS_HideWnd(); // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
      oWebControl.JS_Disconnect().then(function () { }, function () { });
    }
  }


  // 获取公钥