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:
董宏宇
17
.idea/deploymentTargetDropDown.xml
generated
Normal file
17
.idea/deploymentTargetDropDown.xml
generated
Normal file
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<runningDeviceTargetSelectedWithDropDown>
|
||||
<Target>
|
||||
<type value="RUNNING_DEVICE_TARGET" />
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="SERIAL_NUMBER" />
|
||||
<value value="JAM6R20C10001418" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</runningDeviceTargetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2021-11-04T08:38:51.555303Z" />
|
||||
</component>
|
||||
</project>
|
||||
1
.idea/misc.xml
generated
1
.idea/misc.xml
generated
@@ -13,6 +13,7 @@
|
||||
<map>
|
||||
<entry key="app/src/main/res/layout/activity_live_play_and_push.xml" value="0.2703125" />
|
||||
<entry key="app/src/main/res/layout/activity_live_push.xml" value="0.3640625" />
|
||||
<entry key="app/src/main/res/layout/activity_main.xml" value="0.3640625" />
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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");
|
||||
// 设置循环检测间隔时间
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="请输入要查看的车机SN"
|
||||
android:text="X2020210706B95ACB94DF240C88"
|
||||
android:text="F803EB2046PZD00188"
|
||||
android:textColor="#FFFF"
|
||||
app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -98,6 +98,19 @@
|
||||
android:layout_height="match_parent"
|
||||
android:text="查看路口直播Url请求"
|
||||
android:visibility="visible" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnRequestCarLive"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="查看周边可直播车"
|
||||
android:visibility="visible" />
|
||||
|
||||
<SurfaceView
|
||||
android:id="@+id/surfacePreviewView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
@@ -526,8 +526,8 @@ public class MoGoLiveManager {
|
||||
if (!mLiveStatusModel.isLoginCurrentRoom()) {
|
||||
loginRoom();
|
||||
}
|
||||
mLiveStatusModel.setMultiRoomId(ROOM_ID_PREFIX +"Audience_"+ otherRoomId);
|
||||
mLiveStatusModel.setMultiStreamId(STREAM_ID_PREFIX +"Audience_"+ otherRoomId);
|
||||
mLiveStatusModel.setMultiRoomId(ROOM_ID_PREFIX + otherRoomId);
|
||||
mLiveStatusModel.setMultiStreamId(STREAM_ID_PREFIX + otherRoomId);
|
||||
Logger.i(TAG,
|
||||
"尝试进入多房间 loginMultiRoom multiRoomId : " + mLiveStatusModel.getMultiRoomId()
|
||||
+ " currentStreamId : " + mLiveStatusModel.getMultiStreamId());
|
||||
|
||||
@@ -33,25 +33,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.46
|
||||
MOGO_UTILS_VERSION=1.1.49-live
|
||||
# 网络请求
|
||||
MOGO_NETWORK_VERSION=1.1.46
|
||||
MOGO_NETWORK_VERSION=1.1.49-live
|
||||
# 网络DNS
|
||||
MOGO_HTTPDNS_VERSION=1.1.46
|
||||
MOGO_HTTPDNS_VERSION=1.1.49-live
|
||||
# 鉴权
|
||||
MOGO_PASSPORT_VERSION=1.1.46
|
||||
MOGO_PASSPORT_VERSION=1.1.49-live
|
||||
# 常链接
|
||||
MOGO_SOCKET_VERSION=1.1.46
|
||||
MOGO_SOCKET_VERSION=1.1.49-live
|
||||
# 数据采集
|
||||
MOGO_REALTIME_VERSION=1.1.46
|
||||
MOGO_REALTIME_VERSION=1.1.49-live
|
||||
# 探路，道路事件发布，获取
|
||||
MOGO_TANLU_VERSION=1.1.46
|
||||
MOGO_TANLU_VERSION=1.1.49-live
|
||||
# 直播推流
|
||||
MOGO_LIVE_VERSION=1.1.46
|
||||
MOGO_LIVE_VERSION=1.1.49-live
|
||||
# 直播拉流
|
||||
MOGO_TRAFFICLIVE_VERSION=1.1.46
|
||||
MOGO_TRAFFICLIVE_VERSION=1.1.49-live
|
||||
# 定位服务
|
||||
MOGO_LOCATION_VERSION=1.1.46
|
||||
MOGO_LOCATION_VERSION=1.1.49-live
|
||||
|
||||
Reference in New Issue
Block a user