Merge branch 'fix_loginMultiRoom_bug'

# Conflicts:
#	.idea/deploymentTargetDropDown.xml
#	app/src/main/java/com/mogo/cloud/MoGoApplication.java
#	gradle.properties
This commit is contained in:
董宏宇
2021-11-04 21:03:35 +08:00
8 changed files with 88 additions and 15 deletions

View File

@@ -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) {