Merge remote-tracking branch 'origin/master'

pc/src/components/EZUIKitJs.vue

@@ -41,6 +41,14 @@
 				window.addEventListener('onresize',this.resize);
 			})
 		},
+		unmounted(){
+			if(this.player){
+				window.removeEventListener('onresize',this.resize);
+				this.player.stop();
+				this.player = null;
+
+			}
+		},
 		methods: {
 			play() {
 				const playPromise = this.player.play();

server/config-prod.yaml

@@ -172,7 +172,7 @@ oss:
 # dtu设备配置
 dtuServer:
   addr: 0.0.0.0:9804
-  enable: false
+  enable: true
 
 # 莹石云帐号
 yinShiYun:

server/config-test.yaml

@@ -172,7 +172,7 @@ oss:
 # dtu设备配置
 dtuServer:
   addr: 0.0.0.0:9804
-  enable: true
+  enable: false
 
 # 莹石云帐号
 yinShiYun:

server/server/dtu.go

@@ -70,7 +70,7 @@ func dtuOnMessage(conn net.Conn) {
 		if yeWeiCb != nil {
 			err = yeWeiCb(yeweiData)
 			if err != nil {
-				global.GVA_LOG.Error(fmt.Sprintf("处理液位回调失败 strData: %s", strData))
+				global.GVA_LOG.Error(fmt.Sprintf("处理液位回调失败 strData: %s, err:%s", strData, err.Error()))
 			}
 		}
 	}

server/utils/fn.go

@@ -41,5 +41,5 @@ func GetYinShiAccessToken(userName string) (string, error) {
 
 // GetCameraUrl 获取监控播放地址
 func GetCameraUrl(deviceId string) string {
-	return fmt.Sprintf("ezopen://open.ys7.com/%s/1.hd.live", deviceId)
+	return fmt.Sprintf("ezopen://open.ys7.com/%s/1.live", deviceId)
 }