From 70227447fce1dacc34b9dbd018537ccba917d78a Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Fri, 9 Jun 2023 08:17:29 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=BD=95?= =?UTF-8?q?=E5=83=8F=E8=B5=84=E6=BA=90=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taoyao/boot/build.gradle | 2 -- taoyao-client-android/taoyao/build.gradle | 4 +-- .../taoyao/client/build.gradle | 1 - .../taoyao/gradle.properties | 2 ++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../taoyao/media/build.gradle | 2 -- taoyao-client-media/src/Taoyao.js | 2 +- .../control/ControlServerRecordProtocol.java | 29 ++++++++++--------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/taoyao-client-android/taoyao/boot/build.gradle b/taoyao-client-android/taoyao/boot/build.gradle index 4e533e4..2ead92d 100644 --- a/taoyao-client-android/taoyao/boot/build.gradle +++ b/taoyao-client-android/taoyao/boot/build.gradle @@ -8,8 +8,6 @@ android { defaultConfig { minSdk rootProject.ext.taoyao.minSdk targetSdk rootProject.ext.taoyao.targetSdk - versionCode rootProject.ext.taoyao.versionCode - versionName rootProject.ext.taoyao.versionName consumerProguardFiles "consumer-rules.pro" } buildTypes { diff --git a/taoyao-client-android/taoyao/build.gradle b/taoyao-client-android/taoyao/build.gradle index 01da903..c5fda8a 100644 --- a/taoyao-client-android/taoyao/build.gradle +++ b/taoyao-client-android/taoyao/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.android.library' version '7.4.2' apply false - id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '8.0.1' apply false + id 'com.android.application' version '8.0.1' apply false } ext { taoyao = [ diff --git a/taoyao-client-android/taoyao/client/build.gradle b/taoyao-client-android/taoyao/client/build.gradle index 89f3c42..d92109c 100644 --- a/taoyao-client-android/taoyao/client/build.gradle +++ b/taoyao-client-android/taoyao/client/build.gradle @@ -10,7 +10,6 @@ android { targetSdk rootProject.ext.taoyao.targetSdk versionCode rootProject.ext.taoyao.versionCode versionName rootProject.ext.taoyao.versionName - consumerProguardFiles "consumer-rules.pro" applicationId "com.acgist.taoyao.client" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/taoyao-client-android/taoyao/gradle.properties b/taoyao-client-android/taoyao/gradle.properties index 6012122..468dc27 100644 --- a/taoyao-client-android/taoyao/gradle.properties +++ b/taoyao-client-android/taoyao/gradle.properties @@ -1,3 +1,5 @@ org.gradle.jvmargs=-Xmx512m -Dfile.encoding=UTF-8 android.useAndroidX=true +android.nonFinalResIds=false android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true diff --git a/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties b/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties index f3074cb..e4b801f 100644 --- a/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties +++ b/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Mar 20 09:51:37 CST 2023 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists diff --git a/taoyao-client-android/taoyao/media/build.gradle b/taoyao-client-android/taoyao/media/build.gradle index 1fdb934..489eb97 100644 --- a/taoyao-client-android/taoyao/media/build.gradle +++ b/taoyao-client-android/taoyao/media/build.gradle @@ -12,8 +12,6 @@ android { defaultConfig { minSdk rootProject.ext.taoyao.minSdk targetSdk rootProject.ext.taoyao.targetSdk - versionCode rootProject.ext.taoyao.versionCode - versionName rootProject.ext.taoyao.versionName consumerProguardFiles "consumer-rules.pro" externalNativeBuild { cmake { diff --git a/taoyao-client-media/src/Taoyao.js b/taoyao-client-media/src/Taoyao.js index f13fe8e..dd79deb 100644 --- a/taoyao-client-media/src/Taoyao.js +++ b/taoyao-client-media/src/Taoyao.js @@ -900,7 +900,7 @@ class Taoyao { if(!filepath || !videoConsumer) { return; } - if(++index >= 10) { + if(++index > 10) { console.warn("请求录像关键帧次数超限", filepath, index); return; } diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java index 352f5cd..c1a8d0e 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java @@ -31,16 +31,17 @@ import com.acgist.taoyao.signal.protocol.ProtocolControlAdapter; body = { """ { - "to": "目标终端ID", - "roomId": "房间ID", + "to" : "目标终端ID", + "roomId" : "房间ID", "enabled": 是否录像（true|false） } """, """ { - "roomId": "房间ID", - "enabled": 是否录像（true|false）, - "filepath": "视频文件路径" + "roomId" : "房间ID", + "enabled" : 是否录像（true|false）, + "filepath": "视频文件路径", + "clientId": "录像终端ID" } """ }, @@ -66,7 +67,7 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen @Override public void execute(String clientId, ClientType clientType, Client client, Client targetClient, Message message, Map body) { String filepath; - final String roomId = MapUtils.get(body, Constant.ROOM_ID); + final String roomId = MapUtils.get(body, Constant.ROOM_ID); final Boolean enabled = MapUtils.get(body, Constant.ENABLED, Boolean.TRUE); final Room room = this.roomManager.room(roomId); if(enabled) { @@ -75,6 +76,7 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen filepath = this.stop(room, room.clientWrapper(client)); } body.put(Constant.FILEPATH, filepath); + body.put(Constant.CLIENT_ID, clientId); client.push(message); } @@ -87,7 +89,7 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen */ public Message execute(String roomId, String clientId, Boolean enabled) { String filepath; - final Room room = this.roomManager.room(roomId); + final Room room = this.roomManager.room(roomId); final Client client = this.clientManager.clients(clientId); if(enabled) { filepath = this.start(room, room.clientWrapper(client)); @@ -95,9 +97,10 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen filepath = this.stop(room, room.clientWrapper(client)); } return Message.success(Map.of( - Constant.ROOM_ID, roomId, - Constant.ENABLED, enabled, - Constant.FILEPATH, filepath + Constant.ROOM_ID, roomId, + Constant.ENABLED, enabled, + Constant.FILEPATH, filepath, + Constant.CLIENT_ID, clientId )); } @@ -181,14 +184,14 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen // 关闭媒体录像 final Message message = this.build(); final Map body = new HashMap<>(); + body.put(Constant.ROOM_ID, room.getRoomId()); + body.put(Constant.ENABLED, false); body.put(Constant.AUDIO_STREAM_ID, recorder.getAudioStreamId()); body.put(Constant.VIDEO_STREAM_ID, recorder.getVideoStreamId()); body.put(Constant.AUDIO_CONSUMER_ID, recorder.getAudioConsumerId()); body.put(Constant.VIDEO_CONSUMER_ID, recorder.getVideoConsumerId()); body.put(Constant.AUDIO_TRANSPORT_ID, recorder.getAudioTransportId()); - body.put(Constant.VIDEO_TRANSPORT_ID, recorder.getVideoConsumerId()); - body.put(Constant.ROOM_ID, room.getRoomId()); - body.put(Constant.ENABLED, false); + body.put(Constant.VIDEO_TRANSPORT_ID, recorder.getVideoTransportId()); message.setBody(body); final Client mediaClient = room.getMediaClient(); mediaClient.request(message);