From cc57519fe6bda8a277395f9a0c85b06425d2b91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 9 Mar 2021 15:32:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84zego=E7=9B=B4=E6=92=AD=E6=97=A5=E5=BF=97=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/cloud/live/manager/MoGoLiveManager.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java index 959e6d5..1ed1875 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java @@ -1,7 +1,6 @@ package com.mogo.cloud.live.manager; import android.app.Application; -import android.os.Environment; import android.text.TextUtils; import android.view.SurfaceView; @@ -35,7 +34,6 @@ import im.zego.zegoexpress.constants.ZegoViewMode; import im.zego.zegoexpress.entity.ZegoCanvas; import im.zego.zegoexpress.entity.ZegoCustomVideoCaptureConfig; import im.zego.zegoexpress.entity.ZegoEngineConfig; -import im.zego.zegoexpress.entity.ZegoLogConfig; import im.zego.zegoexpress.entity.ZegoRoomConfig; import im.zego.zegoexpress.entity.ZegoRoomExtraInfo; import im.zego.zegoexpress.entity.ZegoUser; @@ -64,7 +62,6 @@ public class MoGoLiveManager { /** * 存储即构的日志路径 */ - private static final String ZEGO_LOG_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/ZegoLog"; private Application mApplication; /** * 直播推送配置对象 @@ -188,12 +185,6 @@ public class MoGoLiveManager { mLivePushConfig = livePushConfig; // 通过 advancedConfig 设置 uuid 过滤字段，设置之后 SDK 只会抛出前 12 个字节为开发者所设置 uuid 的 SEI ZegoEngineConfig zegoEngineConfig = new ZegoEngineConfig(); - // 设置即构的直播日志配置 - ZegoLogConfig zegoLogConfig = new ZegoLogConfig(); - // 存储日志路径 - zegoLogConfig.logPath = ZEGO_LOG_PATH; - // 配置日志到引擎中 - zegoEngineConfig.logConfig = zegoLogConfig; // 设置配置到引擎中 ZegoExpressEngine.setEngineConfig(zegoEngineConfig); From 3a2154495763b4690638c28584bc89eab016365a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 9 Mar 2021 16:28:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8B=86=E5=88=86=E4=BA=86=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E7=8A=B6=E6=80=81=E8=B0=83=E7=94=A8=E5=87=BD=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=80=80=E5=87=BA=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=94=80=E6=AF=81handle=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 - .../layout/activity_live_play_and_push.xml | 1 + .../live/listener/ILiveProgressListener.java | 17 ---- .../listener/ILiveRoomStatusListener.java | 41 ++++++++ .../live/manager/LiveStreamManagerImpl.java | 2 + .../cloud/live/manager/MoGoLiveManager.java | 58 +++++++++--- .../live/manager/RequestLiveManager.java | 7 ++ gradle.properties | 2 +- .../trafficlive/core/TrafficLiveManager.java | 94 +++++++++++-------- 9 files changed, 152 insertions(+), 71 deletions(-) create mode 100644 foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveRoomStatusListener.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8116b81..1563bc1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -26,7 +26,6 @@ diff --git a/app/src/main/res/layout/activity_live_play_and_push.xml b/app/src/main/res/layout/activity_live_play_and_push.xml index 99cc68f..e4be5d2 100644 --- a/app/src/main/res/layout/activity_live_play_and_push.xml +++ b/app/src/main/res/layout/activity_live_play_and_push.xml @@ -116,6 +116,7 @@ android:layout_height="wrap_content" android:textOff="登录第二个房间" android:textOn="退出第二个房间" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@+id/etLookRoomId" /> diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java index 034b70e..c3cf302 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveProgressListener.java @@ -17,23 +17,6 @@ public interface ILiveProgressListener { default void onEngineStop() { } - /** - * 正在连接 - */ - void onConnecting(); - - /** - * 连接成功 - * - * @param roomId 房间ID - */ - void onConnected(String roomId); - - /** - * 断开连接 - */ - void onDisConnect(); - /** * 调试错误信息回调 * diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveRoomStatusListener.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveRoomStatusListener.java new file mode 100644 index 0000000..376d154 --- /dev/null +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/ILiveRoomStatusListener.java @@ -0,0 +1,41 @@ +package com.mogo.cloud.live.listener; + +/** + * 直播房间的状态回调 + */ +public interface ILiveRoomStatusListener { + + /** + * 自己的房间连接中回调 + */ + void onCurrentRoomConnecting(); + + /** + * 自己的房间连接成功回调 + */ + void onCurrentRoomConnected(); + + /** + * 自己的房间断开连接回调 + */ + void onCurrentRoomDisconnected(); + + + //////////////////////////////////////// + + /** + * 与他人房间连接中回调 + */ + void onMultiRoomConnecting(); + + /** + * 与他人房间连接成功回调 + */ + void onMultiRoomConnected(); + + /** + * 与他人房间断开连接回调 + */ + void onMultiRoomDisconnected(); + +} diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java index 762f236..e534593 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java @@ -145,6 +145,8 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { @Override public void release() { try { + mHandler.removeCallbacks(mCamStatusRun); + mHandler = null; mSocketMsgUtils.release(); sCam1LiveStatus = 0; sCam2LiveStatus = 0; diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java index 1ed1875..86e003c 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java @@ -6,6 +6,7 @@ import android.view.SurfaceView; import com.mogo.cloud.live.listener.ILiveProgressListener; import com.mogo.cloud.live.listener.ILiveRoomPersonListener; +import com.mogo.cloud.live.listener.ILiveRoomStatusListener; import com.mogo.cloud.live.listener.ILiveStatusListener; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.utils.logger.Logger; @@ -92,9 +93,13 @@ public class MoGoLiveManager { */ private ILiveProgressListener mProgressListener; /** - * 直播房间状态 + * 直播房间连接状态 */ - private ILiveRoomPersonListener mRoomStatusListener; + private ILiveRoomStatusListener mRoomStatusListener; + /** + * 直播房间人员状态 + */ + private ILiveRoomPersonListener mRoomPersonListener; /** * 直播状态回调 */ @@ -229,19 +234,35 @@ public class MoGoLiveManager { @Override public void onRoomStateUpdate(String roomID, ZegoRoomState state, int errorCode, JSONObject extendedData) { super.onRoomStateUpdate(roomID, state, errorCode, extendedData); - // 这里只处理当前设备登录的房间中的用户总数 + // 这里回调的是当前用户的房间状态 if (currentRoomId.equals(roomID)) { Logger.i(TAG, "onRoomStateUpdate roomID : " + roomID + " state:" + state + " errorCode:" + errorCode); //房间状态更新 - if (mProgressListener != null) { + if (mRoomStatusListener != null) { if (state == ZegoRoomState.CONNECTING) { - mProgressListener.onConnecting(); + mRoomStatusListener.onCurrentRoomConnecting(); } else if (state == ZegoRoomState.CONNECTED) { - mProgressListener.onConnected(roomID); + mRoomStatusListener.onCurrentRoomConnected(); } else { - mProgressListener.onDisConnect(); + mRoomStatusListener.onCurrentRoomDisconnected(); + } + } + } + // 这里回调的是登录的他人房间的状态 + if (multiRoomId.equals(roomID)) { + Logger.i(TAG, "onRoomStateUpdate multiRoomId : " + roomID + + " state:" + state + + " errorCode:" + errorCode); + //房间状态更新 + if (mRoomStatusListener != null) { + if (state == ZegoRoomState.CONNECTING) { + mRoomStatusListener.onMultiRoomConnecting(); + } else if (state == ZegoRoomState.CONNECTED) { + mRoomStatusListener.onMultiRoomConnected(); + } else { + mRoomStatusListener.onMultiRoomDisconnected(); } } } @@ -256,8 +277,8 @@ public class MoGoLiveManager { onlineNumber = count; Logger.i(TAG, "onRoomOnlineUserCountUpdate roomID : " + roomID + " , online user number : " + onlineNumber); - if (mRoomStatusListener != null) { - mRoomStatusListener.onRoomOnlineUserCountUpdate(count); + if (mRoomPersonListener != null) { + mRoomPersonListener.onRoomOnlineUserCountUpdate(count); } } } @@ -271,8 +292,8 @@ public class MoGoLiveManager { Logger.i(TAG, "onRoomUserUpdate roomId : " + roomID + " , updateType : " + updateType.name() + " , online user number : " + onlineNumber); - if (mRoomStatusListener != null) { - mRoomStatusListener.onRoomUserUpdate(updateType, userList); + if (mRoomPersonListener != null) { + mRoomPersonListener.onRoomUserUpdate(updateType, userList); } } } @@ -330,13 +351,22 @@ public class MoGoLiveManager { this.mProgressListener = liveProgressListener; } + /** + * 设置直播间连接状态监听 + * + * @param roomStatusListener 监听回调用 + */ + public void setLiveRoomPersonListener(ILiveRoomStatusListener roomStatusListener) { + this.mRoomStatusListener = roomStatusListener; + } + /** * 设置直播间的人员监听 * * @param roomPersonListener 监听回调用 */ public void setLiveRoomPersonListener(ILiveRoomPersonListener roomPersonListener) { - this.mRoomStatusListener = roomPersonListener; + this.mRoomPersonListener = roomPersonListener; } /** @@ -470,6 +500,7 @@ public class MoGoLiveManager { * 退出房间 */ public void logoutRoom() { + Logger.i(TAG, "logoutRoom: " + currentRoomId); if (mExpressEngine == null) { return; } @@ -490,6 +521,7 @@ public class MoGoLiveManager { * 退出多房间 */ public void logoutMultiRoom() { + Logger.i(TAG, "logoutMultiRoom: " + multiRoomId); if (mExpressEngine == null) { return; } @@ -502,7 +534,7 @@ public class MoGoLiveManager { * 开始推送 */ public void startPush() { - Logger.d(TAG, "startPush currentStreamId: " + currentStreamId); + Logger.i(TAG, "startPush currentStreamId: " + currentStreamId); mExpressEngine.startPublishingStream(currentStreamId); } 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 453c659..df34be9 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 @@ -47,6 +47,13 @@ public class RequestLiveManager { return requestLiveManager; } + /** + * 请求服务器查看指定车机开启或关闭直播 + * + * @param type + * @param liveSn + * @param requestLiveListener + */ public void requestVehicleHeadLive(String type, String liveSn, IRequestLiveListener requestLiveListener) { Gson gson = new Gson(); LivePush livePush = new LivePush(liveSn, type, FRONT_CAMERA); diff --git a/gradle.properties b/gradle.properties index e55b411..40d186c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # AI CLOUD 云平台 # 工具类 MOGO_UTILS_VERSION=1.0.51 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 909a58c..95d17c2 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 @@ -6,6 +6,7 @@ import android.text.TextUtils; import android.view.SurfaceView; import com.mogo.cloud.live.listener.ILiveProgressListener; +import com.mogo.cloud.live.listener.ILiveRoomStatusListener; import com.mogo.cloud.live.listener.IRequestLiveListener; import com.mogo.cloud.live.manager.MoGoLiveManager; import com.mogo.cloud.live.manager.MoGoLivePushConfig; @@ -18,11 +19,11 @@ import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_CLOSE; import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_OPEN; import static com.mogo.cloud.trafficlive.constant.TrafficLiveConstant.TAG; -public class TrafficLiveManager implements ILiveProgressListener { +public class TrafficLiveManager implements ILiveProgressListener, ILiveRoomStatusListener { private static volatile TrafficLiveManager mInstance; private final RequestLiveManager requestLiveManager; - private ITrafficLiveCallBack callBack; + private ITrafficLiveCallBack trafficLiveCallBack; private SurfaceView surfaceView; private String mStreamId; private boolean isLoginSuccess = false; @@ -57,7 +58,7 @@ public class TrafficLiveManager implements ILiveProgressListener { throw new Exception("liveSn can not be null"); } - this.callBack = trafficLiveCallBack; + this.trafficLiveCallBack = trafficLiveCallBack; this.surfaceView = surfaceView; Logger.i(TAG, "申请拉流 systemClock :" + SystemClock.elapsedRealtime() + " SystemTime : " + System.currentTimeMillis()); requestLiveManager.requestVehicleHeadLive(LIVE_TYPE_OPEN, liveSn, new IRequestLiveListener() { @@ -77,15 +78,15 @@ public class TrafficLiveManager implements ILiveProgressListener { // 直接 查看对应SN的直播 MoGoLiveManager.getInstance().startLive(surfaceView); - if (callBack != null) { - callBack.onLive(); + if (TrafficLiveManager.this.trafficLiveCallBack != null) { + TrafficLiveManager.this.trafficLiveCallBack.onLive(); } } @Override public void onError(Throwable e) { - if (callBack != null) { - callBack.onError(e.getMessage()); + if (TrafficLiveManager.this.trafficLiveCallBack != null) { + TrafficLiveManager.this.trafficLiveCallBack.onError(e.getMessage()); } } }); @@ -103,14 +104,14 @@ public class TrafficLiveManager implements ILiveProgressListener { @Override public void onError(Throwable e) { - if (callBack != null) { - callBack.onError(e.getMessage()); + if (trafficLiveCallBack != null) { + trafficLiveCallBack.onError(e.getMessage()); } } }); MoGoLiveManager.getInstance().stopLive(); surfaceView = null; - callBack = null; + trafficLiveCallBack = null; isLoginSuccess = false; mStreamId = null; } @@ -121,46 +122,61 @@ public class TrafficLiveManager implements ILiveProgressListener { @Override public void onEngineStart() { - if (callBack != null) { - callBack.onLiveStart(); + if (trafficLiveCallBack != null) { + trafficLiveCallBack.onLiveStart(); } } @Override public void onEngineStop() { - if (callBack != null) { - callBack.onLiveStop(); - } - } - - @Override - public void onConnecting() { - if (callBack != null) { - callBack.onLiveConnecting(); - } - } - - @Override - public void onConnected(String roomId) { - isLoginSuccess = true; - if (callBack != null) { - callBack.onLiveConnected(); - } - } - - @Override - public void onDisConnect() { - isLoginSuccess = false; - if (callBack != null) { - callBack.onDisConnect(); + if (trafficLiveCallBack != null) { + trafficLiveCallBack.onLiveStop(); } } @Override public void onDebugError(int errorCode, String funcName, String errorInfo) { Logger.e(TAG, "onDebugError errorCode : " + errorCode + " funcName : " + funcName + " errorInfo : " + errorInfo); - if (callBack != null) { - callBack.onError(errorInfo); + if (trafficLiveCallBack != null) { + trafficLiveCallBack.onError(errorInfo); + } + } + + @Override + public void onCurrentRoomConnecting() { + + } + + @Override + public void onCurrentRoomConnected() { + + } + + @Override + public void onCurrentRoomDisconnected() { + + } + + @Override + public void onMultiRoomConnecting() { + if (trafficLiveCallBack != null) { + trafficLiveCallBack.onLiveConnecting(); + } + } + + @Override + public void onMultiRoomConnected() { + isLoginSuccess = true; + if (trafficLiveCallBack != null) { + trafficLiveCallBack.onLiveConnected(); + } + } + + @Override + public void onMultiRoomDisconnected() { + isLoginSuccess = false; + if (trafficLiveCallBack != null) { + trafficLiveCallBack.onDisConnect(); } } } From 6119c899034b9b4ea6e2e7582cf46324679f7802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 9 Mar 2021 16:52:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E9=94=80?= =?UTF-8?q?=E6=AF=81=E5=BC=95=E6=93=8E=EF=BC=8C=E5=9B=A0=E4=B8=BA=E8=A6=81?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E4=B8=80?= =?UTF-8?q?=E7=9B=B4=E5=9C=A8=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/cloud/live/manager/MoGoLiveManager.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java index 86e003c..028e776 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java @@ -378,15 +378,6 @@ public class MoGoLiveManager { this.mLiveStatusListener = mLiveStatusListener; } - /** - * 销毁即构引擎 - */ - private void destroyEngine() { - ZegoExpressEngine.destroyEngine(() -> { - Logger.i(TAG, "销毁ZeGo引擎"); - }); - } - /** * 进入房间 * @@ -591,7 +582,6 @@ public class MoGoLiveManager { */ public void onDestroyPublish() { stopPublish(); - destroyEngine(); } /** @@ -639,7 +629,7 @@ public class MoGoLiveManager { * 停止观看直播 */ public void onDestroyLive() { - destroyEngine(); + } } From 002d94c33277a9512178f6addf1aa40c6cda1caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 9 Mar 2021 17:04:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=99=BB=E5=87=BA=20=E5=8D=87=E7=BA=A7sdk?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/live/manager/MoGoLiveManager.java | 2 ++ gradle.properties | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java index 028e776..4b95145 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java @@ -497,6 +497,7 @@ public class MoGoLiveManager { } if (!TextUtils.isEmpty(currentRoomId)) { mExpressEngine.logoutRoom(currentRoomId); + currentRoomId = ""; } if (customVideoCaptureConfig == null) { // 创建自定义视频采集对象 @@ -518,6 +519,7 @@ public class MoGoLiveManager { } if (!TextUtils.isEmpty(multiRoomId)) { mExpressEngine.logoutRoom(multiRoomId); + multiRoomId = ""; } } diff --git a/gradle.properties b/gradle.properties index 40d186c..e1d30e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=false # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.51 +MOGO_UTILS_VERSION=1.0.52 # 网络请求 -MOGO_NETWORK_VERSION=1.0.51 +MOGO_NETWORK_VERSION=1.0.52 # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.51 +MOGO_HTTPDNS_VERSION=1.0.52 # 鉴权 -MOGO_PASSPORT_VERSION=1.0.51 +MOGO_PASSPORT_VERSION=1.0.52 # 常链接 -MOGO_SOCKET_VERSION=1.0.51 +MOGO_SOCKET_VERSION=1.0.52 # 数据采集 -MOGO_REALTIME_VERSION=1.0.53 +MOGO_REALTIME_VERSION=1.0.52 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.0.51 +MOGO_TANLU_VERSION=1.0.52 # 直播推流 -MOGO_LIVE_VERSION=1.0.51 +MOGO_LIVE_VERSION=1.0.52 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.51 +MOGO_TRAFFICLIVE_VERSION=1.0.52 From a45f2aecf611688a5b37f62dfdd6360800c00951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 9 Mar 2021 17:11:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7sdk=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index e1d30e9..ea30c21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,23 +27,23 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=false +RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.52 +MOGO_UTILS_VERSION=1.0.54 # 网络请求 -MOGO_NETWORK_VERSION=1.0.52 +MOGO_NETWORK_VERSION=1.0.54 # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.52 +MOGO_HTTPDNS_VERSION=1.0.54 # 鉴权 -MOGO_PASSPORT_VERSION=1.0.52 +MOGO_PASSPORT_VERSION=1.0.54 # 常链接 -MOGO_SOCKET_VERSION=1.0.52 +MOGO_SOCKET_VERSION=1.0.54 # 数据采集 -MOGO_REALTIME_VERSION=1.0.52 +MOGO_REALTIME_VERSION=1.0.54 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.0.52 +MOGO_TANLU_VERSION=1.0.54 # 直播推流 -MOGO_LIVE_VERSION=1.0.52 +MOGO_LIVE_VERSION=1.0.54 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.52 +MOGO_TRAFFICLIVE_VERSION=1.0.54