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

[*] 提高稳定性

Browse Source 
1. 解决web终端踢人黑屏问题
2. 处理安卓终端会议房间资源释放问题
3. 优化安卓远程终端进入逻辑
This commit is contained in:
acgist
2023-04-29 14:42:24 +08:00
parent f5f19bc4c2
commit 59df04faaf
12 changed files with 188 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/MediaService.java
View File

@@ -78,6 +78,7 @@ public class MediaService extends Service {
super.onCreate();
this.mkdir(R.string.storagePathImage);
this.mkdir(R.string.storagePathVideo);
this.buildNotificationChannel();
}
@Override
@@ -89,6 +90,7 @@ public class MediaService extends Service {
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.i(MediaService.class.getSimpleName(), "onStartCommand：" + intent.getAction());
this.cleanAllNotification();
if (Action.LAUNCH.name().equals(intent.getAction())) {
this.launch(intent);
this.openConnect(intent);
@@ -114,18 +116,13 @@ public class MediaService extends Service {
private void launch(Intent intent) {
final Intent notificationIntent = new Intent(this, MediaService.class);
final PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
final NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, "NOTIFICATION_CHANNEL_ID")
final NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, "TAOYAO")
.setSmallIcon(R.mipmap.ic_launcher_foreground)
.setLargeIcon(BitmapFactory.decodeResource(this.getResources(), R.mipmap.ic_launcher_foreground))
.setTicker("NOTIFICATION_TICKER")
.setContentTitle("屏幕录制")
.setContentText("屏幕录制共享")
.setContentTitle("桃夭后台")
.setContentText("桃夭正在后台运行")
.setContentIntent(pendingIntent);
final Notification notification = notificationBuilder.build();
final NotificationChannel channel = new NotificationChannel("NOTIFICATION_CHANNEL_ID", "NOTIFICATION_CHANNEL_NAME", NotificationManager.IMPORTANCE_DEFAULT);
channel.setDescription("NOTIFICATION_CHANNEL_DESC");
final NotificationManager notificationManager = this.getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel);
this.startForeground((int) System.currentTimeMillis(), notification);
}
@@ -182,18 +179,15 @@ public class MediaService extends Service {
public void screenRecord(Intent intent) {
final Intent notificationIntent = new Intent(this, MediaService.class);
final PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
final NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, "NOTIFICATION_CHANNEL_ID")
final NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, "TAOYAO")
.setSmallIcon(R.mipmap.ic_launcher_foreground)
.setLargeIcon(BitmapFactory.decodeResource(this.getResources(), R.mipmap.ic_launcher_foreground))
.setTicker("NOTIFICATION_TICKER")
.setContentTitle("屏幕录制")
.setContentText("屏幕录制共享")
// 自动清除
// .setAutoCancel(true)
.setContentTitle("录制屏幕")
.setContentText("桃夭正在录制屏幕")
.setContentIntent(pendingIntent);
final Notification notification = notificationBuilder.build();
final NotificationChannel channel = new NotificationChannel("NOTIFICATION_CHANNEL_ID", "NOTIFICATION_CHANNEL_NAME", NotificationManager.IMPORTANCE_DEFAULT);
channel.setDescription("NOTIFICATION_CHANNEL_DESC");
final NotificationManager notificationManager = this.getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel);
this.startForeground((int) System.currentTimeMillis(), notification);
MediaManager.getInstance().initScreen(intent.getParcelableExtra("data"));
}
@@ -209,4 +203,17 @@ public class MediaService extends Service {
}
}
private void buildNotificationChannel() {
final NotificationChannel channel = new NotificationChannel("TAOYAO", "桃夭通知", NotificationManager.IMPORTANCE_DEFAULT);
channel.setShowBadge(false);
channel.setDescription("桃夭系统通知");
final NotificationManager notificationManager = this.getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel);
}
private void cleanAllNotification() {
final NotificationManager notificationManager = this.getSystemService(NotificationManager.class);
notificationManager.cancelAll();
}
}

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

@@ -13,7 +13,6 @@ import android.os.Handler;
import android.os.HandlerThread;
import android.os.PowerManager;
import android.os.Process;
import android.se.omapi.Session;
import android.util.Log;
import com.acgist.taoyao.boot.model.Header;
@@ -338,7 +337,6 @@ public final class Taoyao implements ITaoyao {
buffer.compact();
final String content = new String(this.decrypt.doFinal(message));
try {
Log.d(Taoyao.class.getSimpleName(), "处理信令：" + content);
Taoyao.this.on(content);
} catch (Exception e) {
Log.e(Taoyao.class.getSimpleName(), "处理信令异常：" + content, e);
@@ -513,6 +511,7 @@ public final class Taoyao implements ITaoyao {
final Long id = header.getId();
final Message request = this.requestMessage.get(id);
if (request != null) {
Log.d(Taoyao.class.getSimpleName(), "处理信令响应：" + content);
// 同步处理：重新设置响应消息
this.requestMessage.put(id, message);
// 唤醒等待线程
@@ -520,6 +519,7 @@ public final class Taoyao implements ITaoyao {
request.notifyAll();
}
} else {
Log.d(Taoyao.class.getSimpleName(), "处理信令异步：" + content);
this.executeHandler.post(() -> {
try {
this.dispatch(content, header, message);
@@ -542,17 +542,18 @@ public final class Taoyao implements ITaoyao {
case "client::reboot" -> this.clientReboot(message, message.body());
case "client::shutdown" -> this.clientShutdown(message, message.body());
case "media::consume" -> this.mediaConsume(message, message.body());
// case "media::audio::volume" -> this.mediaAudioVolume(message, message.body());
case "media::audio::volume" -> this.mediaAudioVolume(message, message.body());
case "media::consumer::close" -> this.mediaConsumerClose(message, message.body());
case "media::consumer::pause" -> this.mediaConsumerPause(message, message.body());
// case "media::consumer::request::key::frame" -> this.mediaConsumerRequestKeyFrame(message, message.body());
case "media::consumer::request::key::frame" -> this.mediaConsumerRequestKeyFrame(message, message.body());
case "media::consumer::resume" -> this.mediaConsumerResume(message, message.body());
// case "media::consumer::set::preferred::layers" -> this.mediaConsumerSetPreferredLayers(message, message.body());
// case "media::consumer::status" -> this.mediaConsumerStatus(message, message.body());
case "media::consumer::set::preferred::layers" -> this.mediaConsumerSetPreferredLayers(message, message.body());
case "media::consumer::status" -> this.mediaConsumerStatus(message, message.body());
case "media::producer::close" -> this.mediaProducerClose(message, message.body());
case "media::producer::pause" -> this.mediaProducerPause(message, message.body());
case "media::producer::resume" -> this.mediaProducerResume(message, message.body());
// case "media::producer::video::orientation:change" -> this.mediaVideoOrientationChange(message, message.body());
case "media::producer::video::orientation:change" -> this.mediaVideoOrientationChange(message, message.body());
case "room::client::list" -> this.roomClientList(message, message.body());
case "room::close" -> this.roomClose(message, message.body());
case "room::enter" -> this.roomEnter(message, message.body());
case "room::expel" -> this.roomExpel(message, message.body());
@@ -645,6 +646,10 @@ public final class Taoyao implements ITaoyao {
room.mediaConsume(message, body);
}
private void mediaAudioVolume(Message message, Map<String, Object> body) {
}
private void mediaConsumerClose(Message message, Map<String, Object> body) {
final String roomId = MapUtils.get(body, "roomId");
final Room room = this.rooms.get(roomId);
@@ -663,6 +668,10 @@ public final class Taoyao implements ITaoyao {
room.mediaConsumerPause(body);
}
private void mediaConsumerRequestKeyFrame(Message message, Map<String, Object> body) {
}
private void mediaConsumerResume(Message message, Map<String, Object> body) {
final String roomId = MapUtils.get(body, "roomId");
final Room room = this.rooms.get(roomId);
@@ -672,6 +681,14 @@ public final class Taoyao implements ITaoyao {
room.mediaConsumerResume(body);
}
private void mediaConsumerSetPreferredLayers(Message message, Map<String, Object> body) {
}
private void mediaConsumerStatus(Message message, Map<String, Object> body) {
}
private void mediaProducerClose(Message message, Map<String, Object> body) {
final String roomId = MapUtils.get(body, "roomId");
final Room room = this.rooms.get(roomId);
@@ -690,6 +707,10 @@ public final class Taoyao implements ITaoyao {
room.mediaProducerPause(body);
}
private void mediaVideoOrientationChange(Message message, Map<String, Object> body) {
}
private void mediaProducerResume(Message message, Map<String, Object> body) {
final String roomId = MapUtils.get(body, "roomId");
final Room room = this.rooms.get(roomId);
@@ -699,6 +720,15 @@ public final class Taoyao implements ITaoyao {
room.mediaProducerResume(body);
}
private void roomClientList(Message message, Map<String, Object> body) {
final String roomId = MapUtils.get(body, "roomId");
final Room room = this.rooms.get(roomId);
if(room == null) {
return;
}
room.newRemoteClientFromRoomClientList(body);
}
private void roomClose(Message message, Map<String, Object> body) {
final String roomId = MapUtils.get(body, "roomId");
final Room room = this.rooms.remove(roomId);
@@ -714,7 +744,7 @@ public final class Taoyao implements ITaoyao {
if(room == null) {
return;
}
room.newRemoteClient(body);
room.newRemoteClientFromRoomEnter(body);
}
public Room roomEnter(String roomId, String password) {