From bc8d978085f4ba2230f4ab7a9b4dfc34ad7a755f Mon Sep 17 00:00:00 2001 From: gaozl Date: Thu, 13 Nov 2025 15:08:23 +0800 Subject: [PATCH] fix: ci --- app/build.gradle | 2 +- .../qianmu/container/activity/program/ScreenSaverActivity.java | 2 +- .../java/qianmu/container/activity/program/ViewScreenSaver.java | 1 - .../java/qianmu/container/socket/manager/LocSocCliManager.java | 1 + .../qianmu/container/socket/manager/SocketServerManager.java | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ffa3c01..fde8d6b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.0" + versionName "V2.0.8.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java b/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java index c7a08f5..19512b7 100644 --- a/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java +++ b/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java @@ -298,7 +298,7 @@ public class ScreenSaverActivity extends BaseActivity { } else if (Constant.ACTION_PLAY_VIDEO_PROGRAM_BY_INDEX.equals(message.getCode())) { // 视频下标 int index = Integer.valueOf(message.getData()); - Log.e("TAG", "收到视频下标" + index); + LoggerUtil.e("TAG","收到视频下标" + index); screenSaver.videoProgramByIndex(index); } else if (Constant.ACTION_PLAY_IMG_PROGRAM_BY_INDEX.equals(message.getCode())) { diff --git a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java index b0e806a..3f307a5 100644 --- a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java +++ b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java @@ -643,7 +643,6 @@ public class ViewScreenSaver extends ViewBase { break; case TYPE_UPDATE_VIDEO1: //视频切换 - updateVideo(videoComponents1,videoPlayCount1,binding.videoView1,TYPE_UPDATE_VIDEO1); break; diff --git a/app/src/main/java/qianmu/container/socket/manager/LocSocCliManager.java b/app/src/main/java/qianmu/container/socket/manager/LocSocCliManager.java index 0f6a1ef..b280a8d 100644 --- a/app/src/main/java/qianmu/container/socket/manager/LocSocCliManager.java +++ b/app/src/main/java/qianmu/container/socket/manager/LocSocCliManager.java @@ -135,6 +135,7 @@ public class LocSocCliManager { SocketMessage messageBean = new Gson().fromJson(message, SocketMessage.class); SocketMessage.Content content = messageBean.getContent(); if (content == null) return; + LoggerUtil.e("同步消息：",content.getParameter()); if (PROGRAM_INDEX.equals(content.getType())) {//同步播放节目 EventBus.getDefault().post(new MessageEvent(Constant.ACTION_PLAY_PROGRAM_BY_INDEX, content.getParameter())); } else if (CUT_PROGRAM_INDEX.equals(content.getType())) { diff --git a/app/src/main/java/qianmu/container/socket/manager/SocketServerManager.java b/app/src/main/java/qianmu/container/socket/manager/SocketServerManager.java index b978c30..bb5de54 100644 --- a/app/src/main/java/qianmu/container/socket/manager/SocketServerManager.java +++ b/app/src/main/java/qianmu/container/socket/manager/SocketServerManager.java @@ -74,6 +74,7 @@ public class SocketServerManager { content.setType(type);//类型 content.setParameter(message);//值 socketMessage.setContent(content); + LoggerUtil.e("同屏消息：",new Gson().toJson(socketMessage)); //循环列表发送消息 for (WebSocket webSocket : webSockets) webSocket.send(new Gson().toJson(socketMessage)); }