diff --git a/app/build.gradle b/app/build.gradle index 865656f..f043f3b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.15" + versionName "V2.0.8.16" // 2.0.8.2 修改网络连接证书设置、定时开关机设置 // 2.0.8.3 获取mac修改 // V2.0.8.5 同屏优化 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 d56d7ee..b67b1e7 100644 --- a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java +++ b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java @@ -2843,7 +2843,7 @@ public class ViewScreenSaver extends ViewBase { vView.setOnInfoListener(new CustomerVideoView.OnInfoListener() { @Override public void onInfo() { - //vView.clearBackground(); + vView.clearBackground(); imgView.setVisibility(View.GONE); } }); @@ -2907,6 +2907,7 @@ public class ViewScreenSaver extends ViewBase { if(materials0.getDuration()>0){ try { if (videoView.isPlaying()) { + videoView.pause(); videoView.stopPlayback(); } new Handler(Looper.getMainLooper()).postDelayed(() -> { diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 92b254a..709729e 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -20,7 +20,6 @@ public class Constant { public static boolean tywx = false; // 是否为太原万象 mqtt密码修改 public static int rotate = 0; // T982截屏是否旋转角度 public static String screenType = "HDMI"; // 欣威视通3399设备为假关机 HDMI连接:可以用来判断是否为关机状态 LVDS连接:只能用定时关机时间来判断 - public static boolean newGuide = false; // 指路机类型,true:新版指路机 false:老板指路机(流花) public static String mqttState = ""; // 屏幕连接方式 public static String TTSHome="sbc"; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置) //public static String androidBoardType = ""; //设备板子型号 无固定版 @@ -61,10 +60,8 @@ public class Constant { public static final String ACTION_EXIT = "cation_exit"; // 退出程序 public static final String ACTION_CAPTURE_SCREEN = "action_capture_screen"; // 截屏 public static final String UPDATE_DEVICE_IP = "action_update_device_ip"; // 更新设备ip - public static final String ACTION_SHOW_MAIN = "action_show_main"; // 跳转主界面 public static final String ACTION_SHOW_SPLASH = "action_show_splash"; // 跳转屏保界面 public static final String ACTION_START_INTER_CUT = "action_start_inter_cut"; // 开始插播 - public static final String ACTION_STOP_INTER_CUT = "action_stop_inter_cut"; // 停止插播 public static final String ACTION_PLAY_PROGRAM_BY_INDEX = "action_play_program_by_index"; // 立即播放指定下标的节目 public static final String ACTION_PLAY_CUT_PROGRAM_BY_INDEX = "action_play_cut_program_by_index";// 立即播放指定下标的插播节目 public static final String ACTION_PLAY_VIDEO_PROGRAM_BY_INDEX = "action_play_video_program_by_index";// 立即播放指定下标的插播节目