XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化播放器以及部分日志

Browse Source
This commit is contained in:
panlinlin
2021-04-21 18:14:45 +08:00
parent ab13017117
commit c566d4d7cf
11 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
View File

@@ -70,6 +70,7 @@ public class SIPRequestHeaderProvider {
//via
ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getIp(), device.getPort(), device.getTransport(), viaTag);
// ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
viaHeader.setRPort();
viaHeaders.add(viaHeader);

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@@ -376,7 +376,7 @@ public class SIPCommander implements ISIPCommander {
//
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
// content.append("o="+channelId+" 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n");
// content.append("o=" + sipConfig.getSipId() + " 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n");
content.append("o="+"00000"+" 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n");
content.append("s=Play\r\n");
content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n");

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java
View File

@@ -27,7 +27,7 @@ import javax.sip.message.Response;
@Component
public class RegisterResponseProcessor implements ISIPResponseProcessor {
private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
private Logger logger = LoggerFactory.getLogger(RegisterResponseProcessor.class);
@Autowired
private ISIPCommanderForPlatform sipCommanderForPlatform;

15
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
View File

@@ -13,6 +13,7 @@ import java.io.IOException;
import java.net.ConnectException;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@Component
public class ZLMRESTfulUtils {
@@ -40,7 +41,7 @@ public class ZLMRESTfulUtils {
FormBody.Builder builder = new FormBody.Builder();
builder.add("secret",mediaSecret);
if (param != null) {
if (param != null && param.keySet().size() > 0) {
for (String key : param.keySet()){
builder.add(key, param.get(key).toString());
}
@@ -65,7 +66,7 @@ public class ZLMRESTfulUtils {
logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage()));
logger.info("请检查media配置并确认ZLM已启动...");
}catch (IOException e) {
e.printStackTrace();
logger.error(String.format("[ %s ]请求失败: %s", url, e.getMessage()));
}
}else {
client.newCall(request).enqueue(new Callback(){
@@ -74,14 +75,10 @@ public class ZLMRESTfulUtils {
public void onResponse(@NotNull Call call, @NotNull Response response){
if (response.isSuccessful()) {
try {
String responseStr = response.body().string();
if (responseStr != null) {
callback.run(JSON.parseObject(responseStr));
}else {
callback.run(null);
}
String responseStr = Objects.requireNonNull(response.body()).string();
callback.run(JSON.parseObject(responseStr));
} catch (IOException e) {
e.printStackTrace();
logger.error(String.format("[ %s ]请求失败: %s", url, e.getMessage()));
}
}
}