From bdbb2d0b9aa57c6e45df709550c8841ab2939f77 Mon Sep 17 00:00:00 2001 From: gaozl Date: Tue, 2 Dec 2025 10:05:04 +0800 Subject: [PATCH] fix: ci --- app/build.gradle | 4 ++-- .../activity/program/ViewScreenSaver.java | 17 +++++++++++------ .../java/qianmu/container/app/Constant.java | 4 ++-- .../qianmu/container/app/MyApplication.java | 4 ++-- .../container/service/ContainerService.java | 1 + .../qianmu/container/socket/SocketServer.java | 1 - .../socket/manager/LocSocCliManager.java | 14 +++++++++++++- .../socket/manager/SocketServerManager.java | 1 - .../java/qianmu/container/util/SignWayUtil.java | 4 +++- 9 files changed, 34 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 460528b..6ecdfb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,10 +12,10 @@ android { minSdkVersion 24 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.4" + versionName "V2.0.8.5" // 2.0.8.2 修改网络连接证书设置、定时开关机设置 // 2.0.8.3 获取mac修改 - + // V2.0.8.5 同屏优化 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' 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 3f307a5..0e97a01 100644 --- a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java +++ b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java @@ -635,7 +635,7 @@ public class ViewScreenSaver extends ViewBase { } if (Constant.isMain) { - Log.e("TAG","主设备向其他设备发送视频下标"+videoPlayCount0); + LoggerUtil.e("TAG","主设备向其他设备发送视频下标"+videoPlayCount0); SocketServerManager.sendMessageToClient(LocSocCliManager.PROGRAM_VIDEO_INDEX, String.valueOf(videoPlayCount0)); } updateVideo(videoComponents0,videoPlayCount0,binding.videoView0,TYPE_UPDATE_VIDEO0); @@ -1867,6 +1867,7 @@ public class ViewScreenSaver extends ViewBase { return; } videoPlayCount0=index; + LoggerUtil.e("同屏：", "视频下标："+ String.valueOf(videoPlayCount0)); handler.removeMessages(TYPE_UPDATE_VIDEO0); handler.sendEmptyMessage(TYPE_UPDATE_VIDEO0); } @@ -2800,8 +2801,11 @@ public class ViewScreenSaver extends ViewBase { binding.videoView0.setOnCompletionListener(new MediaPlayer.OnCompletionListener() { @Override public void onCompletion(MediaPlayer mp) { - // 视频播放完成时的操作 - handler.sendEmptyMessage(TYPE_UPDATE_VIDEO0); + if(!LocSocCliManager.getLocalSocketState()){ + LoggerUtil.e("TAG:: ","socket未连接，播放下一个"); + // 视频播放完成时的操作 + handler.sendEmptyMessage(TYPE_UPDATE_VIDEO0); + } } }); @@ -2875,8 +2879,10 @@ public class ViewScreenSaver extends ViewBase { binding.videoView1.setOnCompletionListener(new MediaPlayer.OnCompletionListener() { @Override public void onCompletion(MediaPlayer mp) { - // 视频播放完成时的操作 - handler.sendEmptyMessage(TYPE_UPDATE_VIDEO1); + if(!LocSocCliManager.getLocalSocketState()){ + // 视频播放完成时的操作 + handler.sendEmptyMessage(TYPE_UPDATE_VIDEO1); + } } }); //视频播放发送错误时回调 @@ -2884,7 +2890,6 @@ public class ViewScreenSaver extends ViewBase { @Override public boolean onError(MediaPlayer mp, int what, int extra) { //视频播放失败 - return true; } }); diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 3e436a5..7b2dba6 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -24,10 +24,10 @@ public class Constant { public static String mqttState = ""; // 屏幕连接方式 public static String TTSHome=""; // sbc-思必驰 kdxf-科大讯飞 //public static String androidBoardType = ""; //设备板子型号 无固定版 - // public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch + public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch // public static String androidBoardType = "xwst"; //设备板子型号 xwst（欣威视通3399） // public static String androidBoardType = "xwst2"; //设备板子型号 xwst2（欣威视通3588、T982、3576） - public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） + // public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） // public static String androidBoardType = "sx"; //设备板子型号 sx（视想） // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index 196faa5..8d57b09 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -148,8 +148,8 @@ public class MyApplication extends Application { .setProductKey("ab73065d16e11bcfac026eee3db9f6cb") .setProductSecret("85d9490c438099acc33be7676799399f").create(); - //config.setExtraParameter("DEVICE_ID", "888888888"); - //config.setExtraParameter("DEVICE_NAME", "888888888"); + //config.setExtraParameter("DEVICE_ID", "qm00001"); + // config.setExtraParameter("DEVICE_NAME", "qm00001"); DUILiteSDK.init(getApplicationContext()); // SDK 授权 diff --git a/app/src/main/java/qianmu/container/service/ContainerService.java b/app/src/main/java/qianmu/container/service/ContainerService.java index 0041f9a..0417d07 100644 --- a/app/src/main/java/qianmu/container/service/ContainerService.java +++ b/app/src/main/java/qianmu/container/service/ContainerService.java @@ -89,6 +89,7 @@ public class ContainerService extends Service { initFirstTime(); initTempTime(); EventBus.getDefault().register(this); + LoggerUtil.e(TAG,"启动ContainerService"); handler = new ContainerHandler(this); } diff --git a/app/src/main/java/qianmu/container/socket/SocketServer.java b/app/src/main/java/qianmu/container/socket/SocketServer.java index 7c06752..0c88c8e 100644 --- a/app/src/main/java/qianmu/container/socket/SocketServer.java +++ b/app/src/main/java/qianmu/container/socket/SocketServer.java @@ -20,7 +20,6 @@ import qianmu.container.util.StringUtil; */ public class SocketServer extends WebSocketServer { - OnServerOpenListener serverOpenListener; OnMessageListener messageListener; OnCloseListener closeListener; 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 b280a8d..f5c8410 100644 --- a/app/src/main/java/qianmu/container/socket/manager/LocSocCliManager.java +++ b/app/src/main/java/qianmu/container/socket/manager/LocSocCliManager.java @@ -96,6 +96,18 @@ public class LocSocCliManager { localSocketClient = null; } + public static Boolean getLocalSocketState(){ + try { + if (localSocketClient == null) return false; + //获取客户端当前的连接状态 + ReadyState state = localSocketClient.getReadyState(); + if (state.equals(ReadyState.OPEN)) return true; + } catch (Throwable t) { + LoggerUtil.e("sendMessageToClient", StringUtil.getThrowableStr(t)); + } + return false; + } + //发送心跳包给服务端 public static void sendHeartBeatToServer() { try { @@ -135,7 +147,6 @@ 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())) { @@ -164,6 +175,7 @@ public class LocSocCliManager { heartBeatResult = 0; EventBus.getDefault().post(new MessageEvent(Constant.ACTION_PLAY_PROGRAM_BY_INDEX, "0")); } + EventBus.getDefault().post(new MessageEvent(Constant.ACTION_CONNECT_LOCAL_SOCKET)); }); localSocketClient.setOnErrorListener((ex) -> EventBus.getDefault().post(new MessageEvent(Constant.ACTION_CLOSE_LOCAL_SOCKET))); } 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 bb5de54..b978c30 100644 --- a/app/src/main/java/qianmu/container/socket/manager/SocketServerManager.java +++ b/app/src/main/java/qianmu/container/socket/manager/SocketServerManager.java @@ -74,7 +74,6 @@ 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)); } diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java index 38bcae3..8373823 100644 --- a/app/src/main/java/qianmu/container/util/SignWayUtil.java +++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java @@ -543,7 +543,9 @@ public class SignWayUtil { HuiduTech helper = new HuiduTech(MyApplication.getInstance()); helper.setSystemTime(date.getTime()); } - }catch (Exception e){} + }catch (Exception e){ + LoggerUtil.e("setDeviceTime:","无法设置系统时间"+e.getMessage()); + } }