Merge branch 'fix_loginMultiRoom_bug'

# Conflicts:
#	.idea/deploymentTargetDropDown.xml
#	app/src/main/java/com/mogo/cloud/MoGoApplication.java
#	gradle.properties

app/src/main/java/com/mogo/cloud/MainActivity.java

@@ -3,6 +3,7 @@ package com.mogo.cloud;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.SurfaceView;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -11,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.mogo.cloud.network.NetworkActivity;
 import com.mogo.cloud.passport.IMoGoTokenCallback;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
+import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack;
 import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack;
 import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
 import com.mogo.cloud.utils.logger.Logger;
@@ -28,6 +30,8 @@ public class MainActivity extends AppCompatActivity {
     private Button btnJumpLivePush;
     private Button btnJumpLivePlay;
     private Button btnRequestXINGLive;
+    private Button btnRequestCarLive;
+    private SurfaceView surfacePreviewView;
 
     private TextView tvSn;
     private TextView tvToken;
@@ -128,6 +132,44 @@ public class MainActivity extends AppCompatActivity {
 //            });
         });
 
+        btnRequestXINGLive = findViewById(R.id.btnRequestXINGLive);
+        btnRequestXINGLive.setOnClickListener(v -> {
+            MoGoAiCloudTrafficLive.viewDesignativeIntersectionLive("556834859_trafficcamera_100514_89", new ITrafficIntersectionLiveCallBack() {
+                @Override
+                public void liveUrlResult(String liveUrl) {
+                    Logger.i(TAG, "liveUrl : " + liveUrl);
+                }
+
+                @Override
+                public void onError(String errorMsg) {
+                    Logger.e(TAG, "errorMsg : " + errorMsg);
+                }
+            });
+        });
+
+        btnRequestCarLive = findViewById(R.id.btnRequestCarLive);
+        surfacePreviewView = findViewById(R.id.surfacePreviewView);
+        btnRequestCarLive.setOnClickListener(v -> {
+            MoGoAiCloudTrafficLive.viewFrontVehicleLive(40.11547, 116.22544,
+                    60, surfacePreviewView, new ITrafficCarLiveCallBack() {
+
+                        @Override
+                        public void onLive(String liveSn) {
+                            Logger.e(TAG, "liveSn : " + liveSn);
+                        }
+
+                        @Override
+                        public void onDisConnect() {
+                            Logger.e(TAG, "onDisConnect");
+                        }
+
+                        @Override
+                        public void onError(String errorMsg) {
+                            Logger.e(TAG, "errorMsg");
+                        }
+                    });
+        });
+
         MoGoAiCloudClient.getInstance().addTokenCallbacks(new IMoGoTokenCallback() {
             @Override
             public void onTokenGot(String token, String sn) {

app/src/main/java/com/mogo/cloud/MoGoApplication.java

@@ -59,7 +59,7 @@ public class MoGoApplication extends MultiDexApplication {
         // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
         // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备）
         // TODO 这里使用的是测试的sn
-        clientConfig.setThirdPartyDeviceId("89E6886710D22ACC");
+        clientConfig.setThirdPartyDeviceId("B95ACB94DF240C89");
         // 设置应用服务AppId  长链、鉴权   //todo 需要卸载智慧驾驶、行车记录仪
         clientConfig.setServiceAppId("com.mogo.launcher");
         // 设置循环检测间隔时间