qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 日常优化

Browse Source
This commit is contained in:
acgist
2023-08-22 07:54:05 +08:00
parent 58d02a3065
commit 37987861f1
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/signal/Taoyao.java
View File

@@ -1205,7 +1205,7 @@ public final class Taoyao implements ITaoyao {
final String sessionId = MapUtils.get(body, "sessionId"); final String sessionId = MapUtils.get(body, "sessionId");
final SessionClient sessionClient = this.sessions.get(sessionId); final SessionClient sessionClient = this.sessions.get(sessionId);
if(sessionClient == null) { if(sessionClient == null) {
Log.w(Taoyao.class.getSimpleName(), "无效会话：" + sessionId); Log.w(Taoyao.class.getSimpleName(), "暂停媒体（无效会话）：" + sessionId);
return; return;
} }
final String type = MapUtils.get(body, "type"); final String type = MapUtils.get(body, "type");
@@ -1222,7 +1222,7 @@ public final class Taoyao implements ITaoyao {
final String sessionId = MapUtils.get(body, "sessionId"); final String sessionId = MapUtils.get(body, "sessionId");
final SessionClient sessionClient = this.sessions.get(sessionId); final SessionClient sessionClient = this.sessions.get(sessionId);
if(sessionClient == null) { if(sessionClient == null) {
Log.w(Taoyao.class.getSimpleName(), "无效会话：" + sessionId); Log.w(Taoyao.class.getSimpleName(), "恢复媒体（无效会话）：" + sessionId);
return; return;
} }
final String type = MapUtils.get(body, "type"); final String type = MapUtils.get(body, "type");

70
taoyao-client-web/src/components/Taoyao.js
View File

@@ -3154,74 +3154,80 @@ class Taoyao extends RemoteClient {
} }
/** /**
* 暂停会话 * 暂停媒体信令
* *
* @param {*} sessionId 会话ID * @param {*} sessionId 会话ID
* @param {*} type 媒体类型 * @param {*} type 媒体类型
*/ */
async sessionPause(sessionId, type) { async sessionPause(sessionId, type) {
const me = this; const session = this.sessionClients.get(sessionId);
const session = me.sessionClients.get(sessionId); if(session) {
if(!session) { console.debug("暂停媒体", type, sessionId);
return; this.push(protocol.buildMessage("session::pause", {
type,
sessionId
}));
session.pauseRemote(type);
} else {
console.debug("暂停媒体（无效会话）", type, sessionId);
} }
me.push(protocol.buildMessage("session::pause", {
type,
sessionId
}));
session.pauseRemote(type);
} }
/** /**
* 暂停会话信令 * 暂停媒体信令
* *
* @param {*} message 信令消息 * @param {*} message 信令消息
*/ */
async defaultSessionPause(message) { async defaultSessionPause(message) {
const me = this; const {
const { type, sessionId } = message.body; type,
const session = me.sessionClients.get(sessionId); sessionId
} = message.body;
const session = this.sessionClients.get(sessionId);
if(session) { if(session) {
console.debug("暂停会话", type, sessionId); console.debug("暂停媒体", type, sessionId);
session.pause(type); session.pause(type);
} else { } else {
console.debug("暂停会话（无效）", type, sessionId); console.debug("暂停媒体（无效会话）", type, sessionId);
} }
} }
/** /**
* 恢复会话 * 恢复媒体信令
* *
* @param {*} sessionId 会话ID * @param {*} sessionId 会话ID
* @param {*} type 媒体类型 * @param {*} type 媒体类型
*/ */
async sessionResume(sessionId, type) { async sessionResume(sessionId, type) {
const me = this; const session = this.sessionClients.get(sessionId);
const session = me.sessionClients.get(sessionId); if(session) {
if(!session) { console.debug("恢复媒体", type, sessionId);
return; this.push(protocol.buildMessage("session::resume", {
type,
sessionId
}));
session.resumeRemote(type);
} else {
console.debug("恢复媒体（无效会话）", type, sessionId);
} }
me.push(protocol.buildMessage("session::resume", {
type,
sessionId
}));
session.resumeRemote(type);
} }
/** /**
* 恢复会话信令 * 恢复媒体信令
* *
* @param {*} message 信令消息 * @param {*} message 信令消息
*/ */
async defaultSessionResume(message) { async defaultSessionResume(message) {
const me = this; const {
const { type, sessionId } = message.body; type,
const session = me.sessionClients.get(sessionId); sessionId
} = message.body;
const session = this.sessionClients.get(sessionId);
if(session) { if(session) {
console.debug("恢复会话", type, sessionId); console.debug("恢复媒体", type, sessionId);
session.resume(type); session.resume(type);
} else { } else {
console.debug("恢复会话（无效）", type, sessionId); console.debug("恢复媒体（无效会话）", type, sessionId);
} }
} }