From ef19b4f85ff6442fbf87ae5c447575b0852fe463 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 09:52:23 +0800
Subject: [PATCH] Merge pull request #2 from lawrencehj/master
---
.gitignore | 2 +-
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 4 ++--
web_src/src/components/channelList.vue | 3 ++-
libs/jain-sip-ri-1.3.0-91.jar | 0
web_src/src/components/gb28181/devicePlayer.vue | 2 +-
pom.xml | 2 ++
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java | 7 +++++++
7 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index d76c026..0c96aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@
.mtj.tmp/
# Package Files #
-*.jar
+#*.jar
*.war
*.nar
*.ear
diff --git a/libs/jain-sip-ri-1.3.0-91.jar b/libs/jain-sip-ri-1.3.0-91.jar
new file mode 100644
index 0000000..18e4f3b
--- /dev/null
+++ b/libs/jain-sip-ri-1.3.0-91.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index 62b9d92..51db777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,8 @@
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
<version>1.3.0-91</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/libs/jain-sip-ri-1.3.0-91.jar</systemPath>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
index d46c357..10f3815 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
@@ -155,6 +155,13 @@
"_" + "*";
// List<Object> deviceChannelList = redis.keys(queryStr);
List<Object> deviceChannelList = redis.scan(queryStr);
+ //瀵规煡璇㈢粨鏋滄帓搴忥紝閬垮厤鍑虹幇閫氶亾鎺掑垪椤哄簭涔卞簭鐨勬儏鍐�
+ Collections.sort(deviceChannelList,new Comparator<Object>(){
+ @Override
+ public int compare(Object o1, Object o2) {
+ return o1.toString().compareToIgnoreCase(o2.toString());
+ }
+ });
pageResult.setPage(page);
pageResult.setCount(count);
pageResult.setTotal(deviceChannelList.size());
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index 3827fc7..134e692 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -58,13 +58,13 @@
}
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
- // 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂15s
+ // 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂30s
boolean lockFlag = true;
long startTime = System.currentTimeMillis();
while (lockFlag) {
try {
- if (System.currentTimeMillis() - startTime > 15 * 1000) {
+ if (System.currentTimeMillis() - startTime > 30 * 1000) {
storager.stopPlay(streamInfo);
return new ResponseEntity<String>("timeout",HttpStatus.OK);
}else {
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index c478e6e..4bcbe31 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -54,7 +54,8 @@
<el-table-column label="鎿嶄綔" width="280" align="center" fixed="right">
<template slot-scope="scope">
<el-button-group>
- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">鎾斁</el-button>
+ <!-- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">鎾斁</el-button> -->
+ <el-button size="mini" icon="el-icon-video-play" @click="sendDevicePush(scope.row)">鎾斁</el-button>
<el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="scope.row.play" @click="stopDevicePush(scope.row)">鍋滄</el-button>
<el-button size="mini" icon="el-icon-s-open" type="primary" v-if="scope.row.parental == 1" @click="changeSubchannel(scope.row)">鏌ョ湅</el-button>
<!-- <el-button size="mini" icon="el-icon-video-camera" type="primary" >璁惧褰曡薄</el-button>-->
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index 97fb762..a86455c 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/gb28181/devicePlayer.vue
@@ -127,7 +127,7 @@
realHasAudio = true;
}
}
- this.hasaudio = realHasAudio; //&& this.hasaudio;
+ this.hasaudio = realHasAudio && this.hasaudio;
}
this.ssrc = streamInfo.ssrc;
this.deviceId = deviceId;
--
Gitblit v1.8.0