From 3ed9a071bc42c054c82993ec16f21f819832865c Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 28 Dec 2021 11:44:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Fix]=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E8=A2=AB=E8=B8=A2=E6=8E=89=E5=87=BA=E6=88=BF=E9=97=B4=E5=90=8E?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BF=9B=E5=85=A5=E9=98=B2=E6=AD=A2web?=
 =?UTF-8?q?=E7=BB=99=E8=B8=A2=E6=8E=89=E4=B9=8B=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            | 26 +++++++++
 .idea/misc.xml                                |  4 ++
 .../cloud/live/manager/MoGoLiveManager.java   | 53 +++++++++++++------
 gradle.properties                             | 22 ++++----
 4 files changed, 77 insertions(+), 28 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..9c7b1e2
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <multipleDevicesSelectedInDropDown value="true" />
+    <runningDeviceTargetsSelectedWithDialog>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="JAM6R20C10001418" />
+          </Key>
+        </deviceKey>
+      </Target>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="HA1DGRAS" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetsSelectedWithDialog>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7c724a3..da4e531 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,10 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
+  <component name="ASMSmaliIdeaPluginConfiguration">
+    <asm skipDebug="true" skipFrames="true" skipCode="false" expandFrames="false" />
+    <groovy codeStyle="LEGACY" />
+  </component>
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
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 8358d5a..6198f98 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
@@ -5,6 +5,7 @@ import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_DEV;
 import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_QA;
 import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE;
 import static im.zego.zegoexpress.constants.ZegoRemoteDeviceState.OPEN;
+import static im.zego.zegoexpress.constants.ZegoRoomState.DISCONNECTED;
 
 import android.app.Application;
 import android.text.TextUtils;
@@ -21,6 +22,7 @@ import com.mogo.cloud.live.listener.IMediaPlayerStateListener;
 import com.mogo.cloud.live.model.LiveStatusModel;
 import com.mogo.cloud.live.server.PushService;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.cloud.utils.logger.Logger;
 
 import org.json.JSONObject;
 
@@ -61,6 +63,8 @@ import im.zego.zegoexpress.entity.ZegoVideoFrameParam;
 public class MoGoLiveManager {
     public static final String TAG = "MoGoLiveManager";
 
+    //这个只是根据业务需求进行设置的变量，具体应用需根据开发者自定义安排。仅供参考
+    public static boolean isFirstLogin = true;
     /**
      * 即构平台分配 APP_ID
      */
@@ -217,10 +221,11 @@ public class MoGoLiveManager {
             if (mLiveStatusModel.getCurrentRoomId().equals(roomID)) {
                 Log.i(TAG, "房间状态变化通知 onRoomStateUpdate currentRoomId : " + roomID +
                         " state:" + state +
-                        " errorCode:" + errorCode);
+                        " errorCode:" + errorCode +
+                        " extendedData:" + extendedData.toString());
 
                 // 设置当前登录状态
-                mLiveStatusModel.setLoginCurrentRoom(state != ZegoRoomState.DISCONNECTED);
+                mLiveStatusModel.setLoginCurrentRoom(state != DISCONNECTED);
                 //房间状态更新
                 if (state == ZegoRoomState.CONNECTING) {
                     for (ILiveCurrentRoomStatusListener iLiveRoomStatusListener : mRoomStatusListener) {
@@ -231,19 +236,40 @@ public class MoGoLiveManager {
                         iLiveRoomStatusListener.onCurrentRoomConnected();
                     }
                 } else {
+                    mLiveStatusModel.setLoginCurrentRoom(false);
                     for (ILiveCurrentRoomStatusListener iLiveRoomStatusListener : mRoomStatusListener) {
                         iLiveRoomStatusListener.onCurrentRoomDisconnected();
                     }
-                }
+                    //errorCode 不为 0 时，房间状态异常，完整错误状态可参考错误码说明 https://doc-zh.zego.im/article/4378
+                    // 处理被踢掉的情况
+                    if (errorCode != 0) {
+                        Logger.w(TAG, "用户被踢出房间，尝试再次登录……");
+                        if (errorCode == 1002053) {
+                            //房间连接断开并且重试超时
+                            //此时可以在业务中退出房间/直播间/课堂，或者手动调用接口再次登录
+                            loginRoom();
+                        } else if (errorCode == 1002050) {
+                            //用户被踢出房间（由于 userID 相同的用户在其他地方登录）
+                            // 再次登录
+                            loginRoom();
+                        } else if (errorCode == 1002055) {
+                            //用户被踢出房间（开发者主动调用后台的踢人接口）
 
+                        } else if (errorCode == 1002033) {
+                            //当使用登录房间鉴权的功能时，传入的 token 出错导
+
+                        }
+                    }
+                }
             }
             // 这里回调的是登录的他人房间的状态
             if (mLiveStatusModel.getMultiRoomId().equals(roomID)) {
                 Log.i(TAG, "这里回调的是登录的他人房间的状态 onRoomStateUpdate multiRoomId : " + roomID +
                         " state:" + state +
-                        " errorCode:" + errorCode);
+                        " errorCode:" + errorCode +
+                        " extendedData:" + extendedData.toString());
                 // 设置第二个房间登录状态
-                mLiveStatusModel.setLoginMultiRoom(state != ZegoRoomState.DISCONNECTED);
+                mLiveStatusModel.setLoginMultiRoom(state != DISCONNECTED);
                 //房间状态更新
                 if (state == ZegoRoomState.CONNECTING) {
                     for (ILiveMultiRoomStatusListener iLiveMultiRoomStatusListener : mMultiRoomStatusListener) {
@@ -319,7 +345,8 @@ public class MoGoLiveManager {
                 Log.i(TAG, "推流状态回调 onPublisherStateUpdate streamID : " + streamID +
                         " , isPushing : " + mLiveStatusModel.isPushing() +
                         " , state : " + state.name() +
-                        " , errorCode : " + errorCode);
+                        " , errorCode : " + errorCode +
+                        " , extendedData : " + extendedData.toString());
 
 //                // 判断如果处于非播放和非推流状态则进行登出操作,并释放引擎
 //                if (!mLiveStatusModel.isPlaying()
@@ -377,7 +404,9 @@ public class MoGoLiveManager {
         public void onPlayerRecvVideoFirstFrame(String streamID) {
             super.onPlayerRecvVideoFirstFrame(streamID);
             Log.d(TAG, "onPlayerRecvVideoFirstFrame");
-            if (mMediaPlayerStateListener != null) mMediaPlayerStateListener.onVideoFirstFrame();
+            if (mMediaPlayerStateListener != null) {
+                mMediaPlayerStateListener.onVideoFirstFrame();
+            }
         }
 
         @Override
@@ -493,16 +522,6 @@ public class MoGoLiveManager {
         profile.application = mApplication;
         /* 创建引擎 */
         mExpressEngine = ZegoExpressEngine.createEngine(profile, mEventHandler);
-
-//        mExpressEngine = ZegoExpressEngine.createEngine(
-//                appId,
-//                appKey,
-//                isTestEnv,
-//                ZegoScenario.GENERAL,
-//                mApplication,
-//                mEventHandler);
-        // 关闭日志
-        //mExpressEngine.setDebugVerbose(MoGoAiCloudClientConfig.getInstance().isShowDebugLog(), ZegoLanguage.CHINESE);
         // true 表示静音（关闭）
         mExpressEngine.muteMicrophone(true);
         if (mLivePushConfig != null) {
diff --git a/gradle.properties b/gradle.properties
index a185a0b..7bc76e5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,25 +27,25 @@ 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.1.62-live
+MOGO_UTILS_VERSION=1.1.63
 # 网络请求
-MOGO_NETWORK_VERSION=1.1.62-live
+MOGO_NETWORK_VERSION=1.1.63
 # 网络DNS
-MOGO_HTTPDNS_VERSION=1.1.62-live
+MOGO_HTTPDNS_VERSION=1.1.63
 # 鉴权
-MOGO_PASSPORT_VERSION=1.1.62-live
+MOGO_PASSPORT_VERSION=1.1.63
 # 常链接
-MOGO_SOCKET_VERSION=1.1.62-live
+MOGO_SOCKET_VERSION=1.1.63
 # 数据采集
-MOGO_REALTIME_VERSION=1.1.62-live
+MOGO_REALTIME_VERSION=1.1.63
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.1.62-live
+MOGO_TANLU_VERSION=1.1.63
 # 直播推流
-MOGO_LIVE_VERSION=1.1.62-live
+MOGO_LIVE_VERSION=1.1.63
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.1.62-live
+MOGO_TRAFFICLIVE_VERSION=1.1.63
 # 定位服务
-MOGO_LOCATION_VERSION=1.1.62-live
+MOGO_LOCATION_VERSION=1.1.63

From e4808667d5fc0b19512fa7a93dd152f40ee19b91 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 28 Dec 2021 14:12:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=20=E5=A4=84=E7=90=86=201003070=20=09?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E6=8E=A8=E6=B5=81=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=A4=B1=E8=B4=A5=E3=80=82=20=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=8E=9F=E5=9B=A0=EF=BC=9A=E5=A4=9A=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E8=B0=83=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A8=E6=B5=81=E5=87=BD=E6=95=B0=E6=9C=89=E8=AF=AF=E3=80=82?=
 =?UTF-8?q?=20=E5=A4=84=E7=90=86=E5=BB=BA=E8=AE=AE=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E5=B8=A6=E6=9C=89=E5=8F=82=E6=95=B0=20[ZegoPublisherC?=
 =?UTF-8?q?onfig]=20=E7=9A=84=E6=8E=A8=E6=B5=81=E5=87=BD=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            | 26 -------------------
 .../java/com/mogo/cloud/MoGoApplication.java  |  2 +-
 .../main/res/layout/activity_live_play.xml    |  2 +-
 .../cloud/live/manager/MoGoLiveManager.java   |  5 +++-
 gradle.properties                             | 20 +++++++-------
 5 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 9c7b1e2..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <multipleDevicesSelectedInDropDown value="true" />
-    <runningDeviceTargetsSelectedWithDialog>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="JAM6R20C10001418" />
-          </Key>
-        </deviceKey>
-      </Target>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="HA1DGRAS" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetsSelectedWithDialog>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
index 1a4060a..c56e082 100644
--- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java
+++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
@@ -58,7 +58,7 @@ public class MoGoApplication extends MultiDexApplication {
         // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
         // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备）
         // TODO 这里使用的是测试的sn
-        clientConfig.setThirdPartyDeviceId("1234567899876543214");
+        clientConfig.setThirdPartyDeviceId("123456789987654321");
         // 设置应用服务AppId  长链、鉴权   //todo 需要卸载智慧驾驶、行车记录仪
         clientConfig.setServiceAppId("com.mogo.launcher");
         // 设置循环检测间隔时间
diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml
index dbb3a24..3fbfdde 100644
--- a/app/src/main/res/layout/activity_live_play.xml
+++ b/app/src/main/res/layout/activity_live_play.xml
@@ -34,7 +34,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="请输入要查看的车机SN"
-                android:text="F803EB2046PZD00274"
+                android:text="F803EB2046PZD00212"
                 android:textColor="#000"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
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 6198f98..e4fb5e6 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
@@ -52,6 +52,7 @@ import im.zego.zegoexpress.entity.ZegoCustomVideoCaptureConfig;
 import im.zego.zegoexpress.entity.ZegoEngineConfig;
 import im.zego.zegoexpress.entity.ZegoEngineProfile;
 import im.zego.zegoexpress.entity.ZegoPlayerConfig;
+import im.zego.zegoexpress.entity.ZegoPublisherConfig;
 import im.zego.zegoexpress.entity.ZegoRoomConfig;
 import im.zego.zegoexpress.entity.ZegoUser;
 import im.zego.zegoexpress.entity.ZegoVideoConfig;
@@ -666,7 +667,9 @@ public class MoGoLiveManager {
      */
     public void startPublish() {
         Log.i(TAG, "开始推流到ZeGo startPublish currentStreamId : " + mLiveStatusModel.getCurrentStreamId());
-        mExpressEngine.startPublishingStream(mLiveStatusModel.getCurrentStreamId());
+        ZegoPublisherConfig config = new ZegoPublisherConfig();
+        config.roomID = mLiveStatusModel.getCurrentRoomId();
+        mExpressEngine.startPublishingStream(mLiveStatusModel.getCurrentStreamId(), config, ZegoPublishChannel.MAIN);
     }
 
     /**
diff --git a/gradle.properties b/gradle.properties
index 7bc76e5..d6884f4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,22 +30,22 @@ PASSWORD=xintai2018
 RELEASE=true
 # AI CLOUD 云平台
 # 工具类
-MOGO_UTILS_VERSION=1.1.63
+MOGO_UTILS_VERSION=1.1.64
 # 网络请求
-MOGO_NETWORK_VERSION=1.1.63
+MOGO_NETWORK_VERSION=1.1.64
 # 网络DNS
-MOGO_HTTPDNS_VERSION=1.1.63
+MOGO_HTTPDNS_VERSION=1.1.64
 # 鉴权
-MOGO_PASSPORT_VERSION=1.1.63
+MOGO_PASSPORT_VERSION=1.1.64
 # 常链接
-MOGO_SOCKET_VERSION=1.1.63
+MOGO_SOCKET_VERSION=1.1.64
 # 数据采集
-MOGO_REALTIME_VERSION=1.1.63
+MOGO_REALTIME_VERSION=1.1.64
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.1.63
+MOGO_TANLU_VERSION=1.1.64
 # 直播推流
-MOGO_LIVE_VERSION=1.1.63
+MOGO_LIVE_VERSION=1.1.64
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.1.63
+MOGO_TRAFFICLIVE_VERSION=1.1.64
 # 定位服务
-MOGO_LOCATION_VERSION=1.1.63
+MOGO_LOCATION_VERSION=1.1.64