From af89e4d656ee4ec205973ae5b9146fd30c929899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 3 Nov 2021 16:46:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC=201.1.?= =?UTF-8?q?48-live=20=20=E6=8F=90=E4=BE=9B=E7=BB=99=E8=A1=8C=E8=BD=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=AA=20F80X=20=E5=81=9A=E8=A1=A1?= =?UTF-8?q?=E9=98=B3=E4=BA=A4=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 4 ++-- gradle.properties | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 4116d78..0aef461 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ec7b70c..b7406b2 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.42 +MOGO_UTILS_VERSION=1.1.48-live # 网络请求 -MOGO_NETWORK_VERSION=1.1.42 +MOGO_NETWORK_VERSION=1.1.48-live # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.42 +MOGO_HTTPDNS_VERSION=1.1.48-live # 鉴权 -MOGO_PASSPORT_VERSION=1.1.42 +MOGO_PASSPORT_VERSION=1.1.48-live # 常链接 -MOGO_SOCKET_VERSION=1.1.42 +MOGO_SOCKET_VERSION=1.1.48-live # 数据采集 -MOGO_REALTIME_VERSION=1.1.42 +MOGO_REALTIME_VERSION=1.1.48-live # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.1.42 +MOGO_TANLU_VERSION=1.1.48-live # 直播推流 -MOGO_LIVE_VERSION=1.1.42 +MOGO_LIVE_VERSION=1.1.48-live # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.42 +MOGO_TRAFFICLIVE_VERSION=1.1.48-live # 定位服务 -MOGO_LOCATION_VERSION=1.1.42 +MOGO_LOCATION_VERSION=1.1.48-live From 6ff9dd977a7356b0c40ca3d047375f8293f2582d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 4 Nov 2021 17:25:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?//=20=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E7=9B=B4=E6=92=AD=E6=8E=A8=E6=B5=81=E7=9A=84=E4=B8=BB?= =?UTF-8?q?=E6=92=AD=EF=BC=8Ctrue=20=E6=98=AF=E8=A7=82=E4=BC=97=EF=BC=8Cfa?= =?UTF-8?q?lse-=E6=98=AF=E4=B8=BB=E6=92=AD=20clientConfig.setAnchor(false)?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 鹰眼为观看端，设置为 true 行车记录仪或推流服务，为主播设置为false --- .idea/deploymentTargetDropDown.xml | 4 ++-- .../java/com/mogo/cloud/MoGoApplication.java | 2 +- .../layout/activity_live_play_and_push.xml | 2 +- .../cloud/live/manager/MoGoLiveManager.java | 4 ++-- gradle.properties | 20 +++++++++---------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0aef461..528ee8d 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ 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 979a2ce..18b5124 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("B95ACB94DF240C88"); + clientConfig.setThirdPartyDeviceId("B95ACB94DF240C89"); // 设置应用服务AppId 长链、鉴权 //todo 需要卸载智慧驾驶、行车记录仪 clientConfig.setServiceAppId("com.mogo.launcher"); // 设置循环检测间隔时间 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 17d186f..a01bac8 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 @@ -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" 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 b922f8b..674ba85 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 @@ -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()); diff --git a/gradle.properties b/gradle.properties index b7406b2..0880dae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,22 +30,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.48-live +MOGO_UTILS_VERSION=1.1.49-live # 网络请求 -MOGO_NETWORK_VERSION=1.1.48-live +MOGO_NETWORK_VERSION=1.1.49-live # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.48-live +MOGO_HTTPDNS_VERSION=1.1.49-live # 鉴权 -MOGO_PASSPORT_VERSION=1.1.48-live +MOGO_PASSPORT_VERSION=1.1.49-live # 常链接 -MOGO_SOCKET_VERSION=1.1.48-live +MOGO_SOCKET_VERSION=1.1.49-live # 数据采集 -MOGO_REALTIME_VERSION=1.1.48-live +MOGO_REALTIME_VERSION=1.1.49-live # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.1.48-live +MOGO_TANLU_VERSION=1.1.49-live # 直播推流 -MOGO_LIVE_VERSION=1.1.48-live +MOGO_LIVE_VERSION=1.1.49-live # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.48-live +MOGO_TRAFFICLIVE_VERSION=1.1.49-live # 定位服务 -MOGO_LOCATION_VERSION=1.1.48-live +MOGO_LOCATION_VERSION=1.1.49-live From 36148acf8a1fa160d40fbe263807c04a2e337551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 4 Nov 2021 20:59:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=89=8D=E6=96=B9=E8=BD=A6=E8=BE=86=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 1 + .../java/com/mogo/cloud/MainActivity.java | 42 +++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 13 ++++++ 3 files changed, 56 insertions(+) diff --git a/.idea/misc.xml b/.idea/misc.xml index 7605932..5332346 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,6 +13,7 @@ + diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java index 04e349f..61ef037 100644 --- a/app/src/main/java/com/mogo/cloud/MainActivity.java +++ b/app/src/main/java/com/mogo/cloud/MainActivity.java @@ -4,12 +4,14 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; +import android.view.SurfaceView; import android.widget.Button; import android.widget.TextView; 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; @@ -27,6 +29,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; @@ -127,6 +131,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) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f8ddde4..d098581 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -98,6 +98,19 @@ android:layout_height="match_parent" android:text="查看路口直播Url请求" android:visibility="visible" /> + +