Browse Source

fix: ci

master
高志龙 7 months ago
parent
commit
bc8d978085
  1. 2
      app/build.gradle
  2. 2
      app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java
  3. 1
      app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java
  4. 1
      app/src/main/java/qianmu/container/socket/manager/LocSocCliManager.java
  5. 1
      app/src/main/java/qianmu/container/socket/manager/SocketServerManager.java

2
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'

2
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())) {

1
app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java

@ -643,7 +643,6 @@ public class ViewScreenSaver extends ViewBase<ViewScreenSaverBinding> {
break;
case TYPE_UPDATE_VIDEO1: //视频切换
updateVideo(videoComponents1,videoPlayCount1,binding.videoView1,TYPE_UPDATE_VIDEO1);
break;

1
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())) {

1
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));
}

Loading…
Cancel
Save