guzijian / wvp-GB28181-pro · Commits

Commit 5b8ffd5b61666f399d1a46a403bfc8c5bf054ba5

Authored by 648540858
1 parent f4960b26

修复前端空指针异常 #831

Inline Side-by-side
Showing 3 changed files with 94 additions and 229 deletions
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
  View file @5b8ffd5
@@ -596,18 +596,13 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @@ -596,18 +596,13 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
596 @Override 596 @Override
597 public void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online) { 597 public void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online) {
598 String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_DEVICE_STATUS; 598 String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_DEVICE_STATUS;
599 - if (channelId == null) {  
600 - logger.info("[redis通知] 推送设备状态， {}-{}", deviceId, online);  
601 - }else {  
602 - logger.info("[redis通知] 推送通道状态， {}/{}-{}", deviceId, channelId, online);  
603 - }  
604 -  
605 StringBuilder msg = new StringBuilder(); 599 StringBuilder msg = new StringBuilder();
606 msg.append(deviceId); 600 msg.append(deviceId);
607 if (channelId != null) { 601 if (channelId != null) {
608 msg.append(":").append(channelId); 602 msg.append(":").append(channelId);
609 } 603 }
610 msg.append(" ").append(online? "ON":"OFF"); 604 msg.append(" ").append(online? "ON":"OFF");
  605 + logger.info("[redis通知] 推送状态-> {} ", msg);
611 // 使用 RedisTemplate<Object, Object> 发送字符串消息会导致发送的消息多带了双引号 606 // 使用 RedisTemplate<Object, Object> 发送字符串消息会导致发送的消息多带了双引号
612 stringRedisTemplate.convertAndSend(key, msg.toString()); 607 stringRedisTemplate.convertAndSend(key, msg.toString());
613 } 608 }
@@ -615,7 +610,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @@ -615,7 +610,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
615 @Override 610 @Override
616 public void sendChannelAddOrDelete(String deviceId, String channelId, boolean add) { 611 public void sendChannelAddOrDelete(String deviceId, String channelId, boolean add) {
617 String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_DEVICE_STATUS; 612 String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_DEVICE_STATUS;
618 - logger.info("[redis通知] 推送通道{}， {}/{}", add?"增加":"移除", deviceId, channelId); 613 +
619 614
620 StringBuilder msg = new StringBuilder(); 615 StringBuilder msg = new StringBuilder();
621 msg.append(deviceId); 616 msg.append(deviceId);
@@ -623,6 +618,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @@ -623,6 +618,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
623 msg.append(":").append(channelId); 618 msg.append(":").append(channelId);
624 } 619 }
625 msg.append(" ").append(add? "ADD":"DELETE"); 620 msg.append(" ").append(add? "ADD":"DELETE");
  621 + logger.info("[redis通知] 推送通道-> {}", msg);
626 // 使用 RedisTemplate<Object, Object> 发送字符串消息会导致发送的消息多带了双引号 622 // 使用 RedisTemplate<Object, Object> 发送字符串消息会导致发送的消息多带了双引号
627 stringRedisTemplate.convertAndSend(key, msg.toString()); 623 stringRedisTemplate.convertAndSend(key, msg.toString());
628 } 624 }
web_src/package-lock.json
  View file @5b8ffd5
@@ -184,15 +184,19 @@ @@ -184,15 +184,19 @@
184 } 184 }
185 }, 185 },
186 "node_modules/ajv": { 186 "node_modules/ajv": {
187 - "version": "5.5.2",  
188 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-5.5.2.tgz",  
189 - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", 187 + "version": "6.12.6",
  188 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
  189 + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
190 "dev": true, 190 "dev": true,
191 "dependencies": { 191 "dependencies": {
192 - "co": "^4.6.0",  
193 - "fast-deep-equal": "^1.0.0", 192 + "fast-deep-equal": "^3.1.1",
194 "fast-json-stable-stringify": "^2.0.0", 193 "fast-json-stable-stringify": "^2.0.0",
195 - "json-schema-traverse": "^0.3.0" 194 + "json-schema-traverse": "^0.4.1",
  195 + "uri-js": "^4.2.2"
  196 + },
  197 + "funding": {
  198 + "type": "github",
  199 + "url": "https://github.com/sponsors/epoberezkin"
196 } 200 }
197 }, 201 },
198 "node_modules/ajv-keywords": { 202 "node_modules/ajv-keywords": {
@@ -2111,8 +2115,8 @@ @@ -2111,8 +2115,8 @@
2111 }, 2115 },
2112 "node_modules/co": { 2116 "node_modules/co": {
2113 "version": "4.6.0", 2117 "version": "4.6.0",
2114 - "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz",  
2115 - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", 2118 + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
  2119 + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
2116 "dev": true, 2120 "dev": true,
2117 "engines": { 2121 "engines": {
2118 "iojs": ">= 1.0.0", 2122 "iojs": ">= 1.0.0",
@@ -4620,9 +4624,9 @@ @@ -4620,9 +4624,9 @@
4620 } 4624 }
4621 }, 4625 },
4622 "node_modules/fast-deep-equal": { 4626 "node_modules/fast-deep-equal": {
4623 - "version": "1.1.0",  
4624 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz",  
4625 - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", 4627 + "version": "3.1.3",
  4628 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
  4629 + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
4626 "dev": true 4630 "dev": true
4627 }, 4631 },
4628 "node_modules/fast-json-stable-stringify": { 4632 "node_modules/fast-json-stable-stringify": {
@@ -4665,30 +4669,6 @@ @@ -4665,30 +4669,6 @@
4665 "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0" 4669 "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
4666 } 4670 }
4667 }, 4671 },
4668 - "node_modules/file-loader/node_modules/ajv": {  
4669 - "version": "6.12.5",  
4670 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
4671 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
4672 - "dev": true,  
4673 - "dependencies": {  
4674 - "fast-deep-equal": "^3.1.1",  
4675 - "fast-json-stable-stringify": "^2.0.0",  
4676 - "json-schema-traverse": "^0.4.1",  
4677 - "uri-js": "^4.2.2"  
4678 - }  
4679 - },  
4680 - "node_modules/file-loader/node_modules/fast-deep-equal": {  
4681 - "version": "3.1.3",  
4682 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
4683 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
4684 - "dev": true  
4685 - },  
4686 - "node_modules/file-loader/node_modules/json-schema-traverse": {  
4687 - "version": "0.4.1",  
4688 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
4689 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
4690 - "dev": true  
4691 - },  
4692 "node_modules/file-loader/node_modules/schema-utils": { 4672 "node_modules/file-loader/node_modules/schema-utils": {
4693 "version": "0.4.7", 4673 "version": "0.4.7",
4694 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz", 4674 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz",
@@ -6126,9 +6106,9 @@ @@ -6126,9 +6106,9 @@
6126 "dev": true 6106 "dev": true
6127 }, 6107 },
6128 "node_modules/json-schema-traverse": { 6108 "node_modules/json-schema-traverse": {
6129 - "version": "0.3.1",  
6130 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.3.1.tgz",  
6131 - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", 6109 + "version": "0.4.1",
  6110 + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
  6111 + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
6132 "dev": true 6112 "dev": true
6133 }, 6113 },
6134 "node_modules/json-stringify-pretty-compact": { 6114 "node_modules/json-stringify-pretty-compact": {
@@ -8770,30 +8750,6 @@ @@ -8770,30 +8750,6 @@
8770 "node": ">= 4" 8750 "node": ">= 4"
8771 } 8751 }
8772 }, 8752 },
8773 - "node_modules/postcss-loader/node_modules/ajv": {  
8774 - "version": "6.12.5",  
8775 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
8776 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
8777 - "dev": true,  
8778 - "dependencies": {  
8779 - "fast-deep-equal": "^3.1.1",  
8780 - "fast-json-stable-stringify": "^2.0.0",  
8781 - "json-schema-traverse": "^0.4.1",  
8782 - "uri-js": "^4.2.2"  
8783 - }  
8784 - },  
8785 - "node_modules/postcss-loader/node_modules/fast-deep-equal": {  
8786 - "version": "3.1.3",  
8787 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
8788 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
8789 - "dev": true  
8790 - },  
8791 - "node_modules/postcss-loader/node_modules/json-schema-traverse": {  
8792 - "version": "0.4.1",  
8793 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
8794 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
8795 - "dev": true  
8796 - },  
8797 "node_modules/postcss-loader/node_modules/schema-utils": { 8753 "node_modules/postcss-loader/node_modules/schema-utils": {
8798 "version": "0.4.7", 8754 "version": "0.4.7",
8799 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz", 8755 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz",
@@ -11500,6 +11456,30 @@ @@ -11500,6 +11456,30 @@
11500 "node": ">= 4.3 < 5.0.0 || >= 5.10" 11456 "node": ">= 4.3 < 5.0.0 || >= 5.10"
11501 } 11457 }
11502 }, 11458 },
  11459 + "node_modules/schema-utils/node_modules/ajv": {
  11460 + "version": "5.5.2",
  11461 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
  11462 + "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
  11463 + "dev": true,
  11464 + "dependencies": {
  11465 + "co": "^4.6.0",
  11466 + "fast-deep-equal": "^1.0.0",
  11467 + "fast-json-stable-stringify": "^2.0.0",
  11468 + "json-schema-traverse": "^0.3.0"
  11469 + }
  11470 + },
  11471 + "node_modules/schema-utils/node_modules/fast-deep-equal": {
  11472 + "version": "1.1.0",
  11473 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
  11474 + "integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
  11475 + "dev": true
  11476 + },
  11477 + "node_modules/schema-utils/node_modules/json-schema-traverse": {
  11478 + "version": "0.3.1",
  11479 + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
  11480 + "integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
  11481 + "dev": true
  11482 + },
11503 "node_modules/select": { 11483 "node_modules/select": {
11504 "version": "1.1.2", 11484 "version": "1.1.2",
11505 "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz", 11485 "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
@@ -12721,36 +12701,12 @@ @@ -12721,36 +12701,12 @@
12721 "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0" 12701 "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
12722 } 12702 }
12723 }, 12703 },
12724 - "node_modules/uglifyjs-webpack-plugin/node_modules/ajv": {  
12725 - "version": "6.12.5",  
12726 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
12727 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
12728 - "dev": true,  
12729 - "dependencies": {  
12730 - "fast-deep-equal": "^3.1.1",  
12731 - "fast-json-stable-stringify": "^2.0.0",  
12732 - "json-schema-traverse": "^0.4.1",  
12733 - "uri-js": "^4.2.2"  
12734 - }  
12735 - },  
12736 "node_modules/uglifyjs-webpack-plugin/node_modules/commander": { 12704 "node_modules/uglifyjs-webpack-plugin/node_modules/commander": {
12737 "version": "2.13.0", 12705 "version": "2.13.0",
12738 "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.13.0.tgz?cache=0&sync_timestamp=1598576136669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.13.0.tgz", 12706 "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.13.0.tgz?cache=0&sync_timestamp=1598576136669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.13.0.tgz",
12739 "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", 12707 "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=",
12740 "dev": true 12708 "dev": true
12741 }, 12709 },
12742 - "node_modules/uglifyjs-webpack-plugin/node_modules/fast-deep-equal": {  
12743 - "version": "3.1.3",  
12744 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
12745 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
12746 - "dev": true  
12747 - },  
12748 - "node_modules/uglifyjs-webpack-plugin/node_modules/json-schema-traverse": {  
12749 - "version": "0.4.1",  
12750 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
12751 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
12752 - "dev": true  
12753 - },  
12754 "node_modules/uglifyjs-webpack-plugin/node_modules/schema-utils": { 12710 "node_modules/uglifyjs-webpack-plugin/node_modules/schema-utils": {
12755 "version": "0.4.7", 12711 "version": "0.4.7",
12756 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz", 12712 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz",
@@ -14082,24 +14038,6 @@ @@ -14082,24 +14038,6 @@
14082 "source-map": "~0.6.1" 14038 "source-map": "~0.6.1"
14083 } 14039 }
14084 }, 14040 },
14085 - "node_modules/webpack/node_modules/ajv": {  
14086 - "version": "6.12.5",  
14087 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
14088 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
14089 - "dev": true,  
14090 - "dependencies": {  
14091 - "fast-deep-equal": "^3.1.1",  
14092 - "fast-json-stable-stringify": "^2.0.0",  
14093 - "json-schema-traverse": "^0.4.1",  
14094 - "uri-js": "^4.2.2"  
14095 - }  
14096 - },  
14097 - "node_modules/webpack/node_modules/fast-deep-equal": {  
14098 - "version": "3.1.3",  
14099 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
14100 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
14101 - "dev": true  
14102 - },  
14103 "node_modules/webpack/node_modules/has-flag": { 14041 "node_modules/webpack/node_modules/has-flag": {
14104 "version": "2.0.0", 14042 "version": "2.0.0",
14105 "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz", 14043 "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz",
@@ -14109,12 +14047,6 @@ @@ -14109,12 +14047,6 @@
14109 "node": ">=0.10.0" 14047 "node": ">=0.10.0"
14110 } 14048 }
14111 }, 14049 },
14112 - "node_modules/webpack/node_modules/json-schema-traverse": {  
14113 - "version": "0.4.1",  
14114 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
14115 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
14116 - "dev": true  
14117 - },  
14118 "node_modules/webpack/node_modules/source-map": { 14050 "node_modules/webpack/node_modules/source-map": {
14119 "version": "0.5.7", 14051 "version": "0.5.7",
14120 "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", 14052 "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
@@ -14551,15 +14483,15 @@ @@ -14551,15 +14483,15 @@
14551 } 14483 }
14552 }, 14484 },
14553 "ajv": { 14485 "ajv": {
14554 - "version": "5.5.2",  
14555 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-5.5.2.tgz",  
14556 - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", 14486 + "version": "6.12.6",
  14487 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
  14488 + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
14557 "dev": true, 14489 "dev": true,
14558 "requires": { 14490 "requires": {
14559 - "co": "^4.6.0",  
14560 - "fast-deep-equal": "^1.0.0", 14491 + "fast-deep-equal": "^3.1.1",
14561 "fast-json-stable-stringify": "^2.0.0", 14492 "fast-json-stable-stringify": "^2.0.0",
14562 - "json-schema-traverse": "^0.3.0" 14493 + "json-schema-traverse": "^0.4.1",
  14494 + "uri-js": "^4.2.2"
14563 } 14495 }
14564 }, 14496 },
14565 "ajv-keywords": { 14497 "ajv-keywords": {
@@ -16303,8 +16235,8 @@ @@ -16303,8 +16235,8 @@
16303 }, 16235 },
16304 "co": { 16236 "co": {
16305 "version": "4.6.0", 16237 "version": "4.6.0",
16306 - "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz",  
16307 - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", 16238 + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
  16239 + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
16308 "dev": true 16240 "dev": true
16309 }, 16241 },
16310 "coa": { 16242 "coa": {
@@ -18423,9 +18355,9 @@ @@ -18423,9 +18355,9 @@
18423 } 18355 }
18424 }, 18356 },
18425 "fast-deep-equal": { 18357 "fast-deep-equal": {
18426 - "version": "1.1.0",  
18427 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz",  
18428 - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", 18358 + "version": "3.1.3",
  18359 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
  18360 + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
18429 "dev": true 18361 "dev": true
18430 }, 18362 },
18431 "fast-json-stable-stringify": { 18363 "fast-json-stable-stringify": {
@@ -18459,30 +18391,6 @@ @@ -18459,30 +18391,6 @@
18459 "schema-utils": "^0.4.5" 18391 "schema-utils": "^0.4.5"
18460 }, 18392 },
18461 "dependencies": { 18393 "dependencies": {
18462 - "ajv": {  
18463 - "version": "6.12.5",  
18464 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
18465 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
18466 - "dev": true,  
18467 - "requires": {  
18468 - "fast-deep-equal": "^3.1.1",  
18469 - "fast-json-stable-stringify": "^2.0.0",  
18470 - "json-schema-traverse": "^0.4.1",  
18471 - "uri-js": "^4.2.2"  
18472 - }  
18473 - },  
18474 - "fast-deep-equal": {  
18475 - "version": "3.1.3",  
18476 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
18477 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
18478 - "dev": true  
18479 - },  
18480 - "json-schema-traverse": {  
18481 - "version": "0.4.1",  
18482 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
18483 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
18484 - "dev": true  
18485 - },  
18486 "schema-utils": { 18394 "schema-utils": {
18487 "version": "0.4.7", 18395 "version": "0.4.7",
18488 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz", 18396 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz",
@@ -19648,9 +19556,9 @@ @@ -19648,9 +19556,9 @@
19648 "dev": true 19556 "dev": true
19649 }, 19557 },
19650 "json-schema-traverse": { 19558 "json-schema-traverse": {
19651 - "version": "0.3.1",  
19652 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.3.1.tgz",  
19653 - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", 19559 + "version": "0.4.1",
  19560 + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
  19561 + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
19654 "dev": true 19562 "dev": true
19655 }, 19563 },
19656 "json-stringify-pretty-compact": { 19564 "json-stringify-pretty-compact": {
@@ -21822,30 +21730,6 @@ @@ -21822,30 +21730,6 @@
21822 "schema-utils": "^0.4.0" 21730 "schema-utils": "^0.4.0"
21823 }, 21731 },
21824 "dependencies": { 21732 "dependencies": {
21825 - "ajv": {  
21826 - "version": "6.12.5",  
21827 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
21828 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
21829 - "dev": true,  
21830 - "requires": {  
21831 - "fast-deep-equal": "^3.1.1",  
21832 - "fast-json-stable-stringify": "^2.0.0",  
21833 - "json-schema-traverse": "^0.4.1",  
21834 - "uri-js": "^4.2.2"  
21835 - }  
21836 - },  
21837 - "fast-deep-equal": {  
21838 - "version": "3.1.3",  
21839 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
21840 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
21841 - "dev": true  
21842 - },  
21843 - "json-schema-traverse": {  
21844 - "version": "0.4.1",  
21845 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
21846 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
21847 - "dev": true  
21848 - },  
21849 "schema-utils": { 21733 "schema-utils": {
21850 "version": "0.4.7", 21734 "version": "0.4.7",
21851 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz", 21735 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz",
@@ -24097,6 +23981,32 @@ @@ -24097,6 +23981,32 @@
24097 "dev": true, 23981 "dev": true,
24098 "requires": { 23982 "requires": {
24099 "ajv": "^5.0.0" 23983 "ajv": "^5.0.0"
  23984 + },
  23985 + "dependencies": {
  23986 + "ajv": {
  23987 + "version": "5.5.2",
  23988 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
  23989 + "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
  23990 + "dev": true,
  23991 + "requires": {
  23992 + "co": "^4.6.0",
  23993 + "fast-deep-equal": "^1.0.0",
  23994 + "fast-json-stable-stringify": "^2.0.0",
  23995 + "json-schema-traverse": "^0.3.0"
  23996 + }
  23997 + },
  23998 + "fast-deep-equal": {
  23999 + "version": "1.1.0",
  24000 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
  24001 + "integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
  24002 + "dev": true
  24003 + },
  24004 + "json-schema-traverse": {
  24005 + "version": "0.3.1",
  24006 + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
  24007 + "integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
  24008 + "dev": true
  24009 + }
24100 } 24010 }
24101 }, 24011 },
24102 "select": { 24012 "select": {
@@ -25116,36 +25026,12 @@ @@ -25116,36 +25026,12 @@
25116 "worker-farm": "^1.5.2" 25026 "worker-farm": "^1.5.2"
25117 }, 25027 },
25118 "dependencies": { 25028 "dependencies": {
25119 - "ajv": {  
25120 - "version": "6.12.5",  
25121 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
25122 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
25123 - "dev": true,  
25124 - "requires": {  
25125 - "fast-deep-equal": "^3.1.1",  
25126 - "fast-json-stable-stringify": "^2.0.0",  
25127 - "json-schema-traverse": "^0.4.1",  
25128 - "uri-js": "^4.2.2"  
25129 - }  
25130 - },  
25131 "commander": { 25029 "commander": {
25132 "version": "2.13.0", 25030 "version": "2.13.0",
25133 "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.13.0.tgz?cache=0&sync_timestamp=1598576136669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.13.0.tgz", 25031 "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.13.0.tgz?cache=0&sync_timestamp=1598576136669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.13.0.tgz",
25134 "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", 25032 "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=",
25135 "dev": true 25033 "dev": true
25136 }, 25034 },
25137 - "fast-deep-equal": {  
25138 - "version": "3.1.3",  
25139 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
25140 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
25141 - "dev": true  
25142 - },  
25143 - "json-schema-traverse": {  
25144 - "version": "0.4.1",  
25145 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
25146 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
25147 - "dev": true  
25148 - },  
25149 "schema-utils": { 25035 "schema-utils": {
25150 "version": "0.4.7", 25036 "version": "0.4.7",
25151 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz", 25037 "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz",
@@ -25846,36 +25732,12 @@ @@ -25846,36 +25732,12 @@
25846 "yargs": "^8.0.2" 25732 "yargs": "^8.0.2"
25847 }, 25733 },
25848 "dependencies": { 25734 "dependencies": {
25849 - "ajv": {  
25850 - "version": "6.12.5",  
25851 - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz",  
25852 - "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=",  
25853 - "dev": true,  
25854 - "requires": {  
25855 - "fast-deep-equal": "^3.1.1",  
25856 - "fast-json-stable-stringify": "^2.0.0",  
25857 - "json-schema-traverse": "^0.4.1",  
25858 - "uri-js": "^4.2.2"  
25859 - }  
25860 - },  
25861 - "fast-deep-equal": {  
25862 - "version": "3.1.3",  
25863 - "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz",  
25864 - "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",  
25865 - "dev": true  
25866 - },  
25867 "has-flag": { 25735 "has-flag": {
25868 "version": "2.0.0", 25736 "version": "2.0.0",
25869 "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz", 25737 "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz",
25870 "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", 25738 "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
25871 "dev": true 25739 "dev": true
25872 }, 25740 },
25873 - "json-schema-traverse": {  
25874 - "version": "0.4.1",  
25875 - "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599334207614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",  
25876 - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",  
25877 - "dev": true  
25878 - },  
25879 "source-map": { 25741 "source-map": {
25880 "version": "0.5.7", 25742 "version": "0.5.7",
25881 "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", 25743 "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
web_src/src/components/dialog/devicePlayer.vue
  View file @5b8ffd5
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 <rtc-player v-if="activePlayer === 'webRTC'" ref="webRTC" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player> 14 <rtc-player v-if="activePlayer === 'webRTC'" ref="webRTC" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
15 </el-tab-pane> 15 </el-tab-pane>
16 <el-tab-pane label="h265web">h265web敬请期待</el-tab-pane> 16 <el-tab-pane label="h265web">h265web敬请期待</el-tab-pane>
17 - <el-tab-pane label="wsPlayer">wsPlayer 敬请期待</el-tab-pane>  
18 </el-tabs> 17 </el-tabs>
19 <jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer> 18 <jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
20 <rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player> 19 <rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
@@ -451,7 +450,15 @@ export default { @@ -451,7 +450,15 @@ export default {
451 playFromStreamInfo: function (realHasAudio, streamInfo) { 450 playFromStreamInfo: function (realHasAudio, streamInfo) {
452 this.showVideoDialog = true; 451 this.showVideoDialog = true;
453 this.hasaudio = realHasAudio && this.hasaudio; 452 this.hasaudio = realHasAudio && this.hasaudio;
454 - this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo)) 453 + if (this.$refs[this.activePlayer]) {
  454 + this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
  455 + }else {
  456 + this.$nextTick(() => {
  457 + this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
  458 + });
  459 + }
  460 +
  461 +
455 }, 462 },
456 close: function () { 463 close: function () {
457 console.log('关闭视频'); 464 console.log('关闭视频');