From ef446d84d53083746d234cbd20e959654e684967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 7 Feb 2021 13:37:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 - .../live/listener/BizMessageListener.java | 10 ---- .../cloud/live/socket/IotMessageType.java | 46 ------------------- 3 files changed, 57 deletions(-) delete mode 100644 foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/BizMessageListener.java delete mode 100644 foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/IotMessageType.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5674e0c..1f8e3ef 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -26,7 +26,6 @@ diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/BizMessageListener.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/BizMessageListener.java deleted file mode 100644 index 10b3371..0000000 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/BizMessageListener.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.mogo.cloud.live.listener; - -import com.mogo.cloud.live.socket.IotMessageType; - -/** - * 常连接消息回调用 - */ -public interface BizMessageListener { - void onMessageReceived(IotMessageType type, String content); -} diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/IotMessageType.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/IotMessageType.java deleted file mode 100644 index b09f7fa..0000000 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/IotMessageType.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mogo.cloud.live.socket; - -public enum IotMessageType { - - //Push 推流消息 - MSG_LIVE_PUSH_STATUS(0), - - //Cancel car alarm 消息 - MSG_CANCEL_CAR_ALARM(1), - - //单个文件上传 - MSG_UPLOAD_SINGLE_FILE(2), - - //切换摄像头 - MSG_SWITCH_CAMERA(3), - - //组文件上传 - MSG_UPLOAD_MULTI_FILE(4), - - //抓拍图片上传 - MSG_UPLOAD_CAPTURE_PIC(5), - - //未知消息 - UNKNOWN(-1), - ; - - private int type; - - private IotMessageType(int type) { - this.type = type; - } - - public int getType() { - return type; - } - - public static IotMessageType getMsgType(int type){ - final IotMessageType[] messageTypes = IotMessageType.values(); - for(IotMessageType messageType : messageTypes){ - if (messageType.getType() == type){ - return messageType; - } - } - return UNKNOWN; - } -} From b6e0acb9c18d51cf5427ebd660c1298def3fd8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 7 Feb 2021 14:16:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_live_play.xml | 2 +- .../java/com/mogo/cloud/live/manager/RequestLiveManager.java | 2 +- .../com/mogo/cloud/trafficlive/core/TrafficLiveManager.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml index 277ca9a..56cca6a 100644 --- a/app/src/main/res/layout/activity_live_play.xml +++ b/app/src/main/res/layout/activity_live_play.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="请输入要查看的车机SN" - android:text="F803EB2046PZD00273" + android:text="X1020210128F803EB2046PZD00149" android:textColor="#FFFF" app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn" app:layout_constraintEnd_toEndOf="parent" diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java index 0d029cc..09053f5 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java @@ -49,7 +49,7 @@ public class RequestLiveManager { public void requestVehicleHeadLive(Application application, String liveSn, IRequestLiveListener requestLiveListener) { Gson gson = new Gson(); - LivePush livePush = new LivePush(liveSn, "1", "C_1"); + LivePush livePush = new LivePush(liveSn, "0", "C_1"); String sn = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn(); Map map = new HashMap<>(); map.put("sn", sn); diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java index e392000..d167490 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java @@ -63,6 +63,7 @@ public class TrafficLiveManager implements ILiveProgressListener { requestLiveManager.requestVehicleHeadLive(application, liveSn, new IRequestLiveListener() { @Override public void onSuccess() { + Logger.i(TAG, "主播开始直播了"); String sn = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn(); mStreamId = MoGoLiveManager.STREAM_ID_PREFIX + liveSn; MoGoLiveManager.getInstance().init(application, null);