diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..528ee8d --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file 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 4f3a92e..961f24d 100644 --- a/app/src/main/java/com/mogo/cloud/MainActivity.java +++ b/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) { diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index 85c0b59..dc2554d 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/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"); // 设置循环检测间隔时间 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 6ec99ea..18ad850 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/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" /> + +