diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 986b1962d3..ba46533d1a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -30,8 +30,7 @@
-
+
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9375f3dd35..733acb1920 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
index caef8fffb8..e4bef5a47e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
@@ -14,7 +14,6 @@ import com.mogo.module.v2x.entity.net.V2XLiveCrossRoad;
import com.mogo.module.v2x.network.V2XRefreshCallback;
import com.mogo.module.v2x.network.V2XRefreshModel;
import com.mogo.module.v2x.utils.ToastUtils;
-import com.mogo.module.v2x.view.V2XCarLiveVideoView;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceManager;
import com.mogo.service.statusmanager.StatusDescriptor;
@@ -29,7 +28,7 @@ import static com.mogo.service.statusmanager.StatusDescriptor.MAIN_PAGE_RESUME;
/**
* author : unknown
- * desc : TODO 演示使用的语音呼叫查看直播车辆 或者 路口实况 业务模块
+ * desc : 语音呼叫查看直播车辆 或者 路口实况 业务模块
*/
public class V2XVoiceCallLiveBiz {
@@ -53,16 +52,16 @@ public class V2XVoiceCallLiveBiz {
}
private Context mContext;
- private V2XVoiceCallLiveScenario mV2XVoiceCallLiveScenario = new V2XVoiceCallLiveScenario();
+ private V2XVoiceCallLiveScenario mV2XVoiceCallLiveScenario;
//语音词指令 查看前车视频回调
- private V2XVoiceCallbackListener v2XVoiceCallbackFrontLiveCarListener = (command, intent) -> {
+ private final V2XVoiceCallbackListener v2XVoiceCallbackFrontLiveCarListener = (command, intent) -> {
Logger.d(MODULE_NAME, "语音词指令 查看前车视频回调");
getFrontCarLive();
};
//语音词指令 查看路口实况回调
- private V2XVoiceCallbackListener v2XVoiceCallbackOpenRoadCameraListener = (command, intent) -> {
+ private final V2XVoiceCallbackListener v2XVoiceCallbackOpenRoadCameraListener = (command, intent) -> {
Logger.d(MODULE_NAME, "语音词指令 查看路口实况回调");
AIAssist.getInstance(mContext).speakTTSVoice(mContext.getString(R.string.v2x_voice_see_crossroad_live));
getOpenRoadCameraLive();
@@ -101,30 +100,29 @@ public class V2XVoiceCallLiveBiz {
}
public void getFrontCarLive() {
- V2XDemoUserInfoRes.ResultBean.UserListBean.UserInfoBean userInfoBean = V2XDemoManager.getInstance().getV2XDemoUserInfoEntity1().getUserInfo();
- String liveCarSn = userInfoBean.getSn();
+// V2XDemoUserInfoRes.ResultBean.UserListBean.UserInfoBean userInfoBean = V2XDemoManager.getInstance().getV2XDemoUserInfoEntity1().getUserInfo();
+ String liveCarSn = "F803EB2046PZD00149";
if (TextUtils.isEmpty(liveCarSn)) {
ToastUtils.showShort("附近没有可直播车机");
Logger.d(MODULE_NAME, "getFrontCarLive : sn is null");
return;
}
V2XMessageEntity v2XMessageEntity = buildCallLiveParams(liveCarSn, null);
+ mV2XVoiceCallLiveScenario = new V2XVoiceCallLiveScenario();
+ mV2XVoiceCallLiveScenario.setV2XWindow(new V2XVoiceCallLiveCarWindow());
mV2XVoiceCallLiveScenario.init(v2XMessageEntity);
}
public void getOpenRoadCameraLive() {
-// String liveUrl = "rtmp://154.8.189.110:19350/live/10_1";
-// V2XMessageEntity v2XMessageEntity = buildCallLiveParams(null, liveUrl);
-// V2XVoiceCallLiveScenario.getInstance().setV2XWindow(new V2XVoiceCrossRoadLiveWindow());
-// V2XVoiceCallLiveScenario.getInstance().init(v2XMessageEntity);
V2XRefreshModel.getInstance(mContext).queryCrossRoadsLive(new V2XRefreshCallback() {
@Override
public void onSuccess(V2XLiveCrossRoad result) {
if (result != null && result.getResult().getUrl() != null) {
String liveUrl = result.getResult().getUrl();
V2XMessageEntity v2XMessageEntity = buildCallLiveParams(null, liveUrl);
-// V2XVoiceCallLiveScenario.getInstance().setV2XWindow(new V2XVoiceCrossRoadLiveWindow());
-// V2XVoiceCallLiveScenario.getInstance().init(v2XMessageEntity);
+ mV2XVoiceCallLiveScenario = new V2XVoiceCallLiveScenario();
+ mV2XVoiceCallLiveScenario.setV2XWindow(new V2XVoiceCrossRoadLiveWindow());
+ mV2XVoiceCallLiveScenario.init(v2XMessageEntity);
} else {
Logger.d(MODULE_NAME, "getOpenRoadCameraLive 路口实况直播地址为空");
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java
index 1908b5bb6b..4fb9dcb7b1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java
@@ -29,7 +29,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow
private boolean isVideoPlay = false;
// 处理道路事件,30秒倒计时
- private Handler handlerV2XEvent = new Handler();
+ private final Handler handlerV2XEvent = new Handler();
private Runnable runnableV2XEvent;
private static final int COUNT_DOWN_TIMER = 1_000;
private static final int ALL_EXPIRE_TIMER = 1_000 * 30;
@@ -50,7 +50,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow
}
private void initView(Context context) {
- Logger.w(MODULE_NAME, "V2X===初始化语音呼叫直播视图");
+ Logger.w(MODULE_NAME, "V2X===初始化语音呼叫直播视图"); //todo 更改样式
LayoutInflater.from(context).inflate(R.layout.window_see_carlive_video, this);
mV2XCarLiveVideoView = findViewById(R.id.videoPlayer);
tvCountDown = findViewById(R.id.tvCountDown);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
index 0f358c70b7..405295e884 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
@@ -12,7 +12,6 @@ import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.module.v2x.view.CarZegoLiveVideoView;
import com.mogo.service.windowview.IMogoTopViewStatusListener;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
@@ -21,14 +20,10 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
* author : unknown
- * desc : TODO 演示使用的语音呼叫查看直播场景,包括车辆直播 或者 路口实况 window,区分不同页面window逻辑实现
+ * desc : 语音呼叫查看直播场景,包括车辆直播 或者 路口实况 window,区分不同页面window逻辑实现
*/
public class V2XVoiceCallLiveScenario extends AbsV2XScenario implements IMogoTopViewStatusListener {
- public V2XVoiceCallLiveScenario() {
- setV2XWindow(new V2XVoiceCallLiveCarWindow());
- }
-
@Override
public void init(@Nullable V2XMessageEntity v2XMessageEntity) {
if (v2XMessageEntity == null) {
@@ -65,14 +60,21 @@ public class V2XVoiceCallLiveScenario extends AbsV2XScenario{
+ mBtnTriggerWarningEvent.setOnClickListener(v -> {
V2XMessageEntity v2XMessageEntity =
TestOnLineCarUtils.getV2XScenarioPushFrontWarningEventData();
@@ -262,6 +263,10 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
V2XVoiceCallLiveBiz.getInstance().getFrontCarLive();
});
+ mBtnbtnXINGLiveEvent.setOnClickListener(v -> {
+ V2XVoiceCallLiveBiz.getInstance().getOpenRoadCameraLive();
+ });
+
mBtnTriggerFatigueDrivingEvent.setOnClickListener(v -> {
V2XMessageEntity v2XMessageEntity =
TestOnLineCarUtils.getV2XScenarioFatigueDrivingData();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java
index 9c054b1159..4cf2b7a50c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java
@@ -94,12 +94,12 @@ public class V2XUtils {
sApplication = app;
}
sApplication.registerActivityLifecycleCallbacks(ACTIVITY_LIFECYCLE);
- UTIL_POOL.execute(new Runnable() {
- @Override
- public void run() {
- //AdaptScreenUtils.preLoad();
- }
- });
+// UTIL_POOL.execute(new Runnable() {
+// @Override
+// public void run() {
+// //AdaptScreenUtils.preLoad();
+// }
+// });
} else {
if (app != null && app.getClass() != sApplication.getClass()) {
sApplication.unregisterActivityLifecycleCallbacks(ACTIVITY_LIFECYCLE);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
index 2527a485fc..6713581655 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
@@ -3,11 +3,9 @@ package com.mogo.module.v2x.view;
import android.content.Context;
import android.content.Intent;
import android.graphics.PorterDuff;
-import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.SurfaceView;
-import android.view.View;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -21,16 +19,11 @@ import com.mogo.commons.voice.AIAssist;
import com.mogo.module.common.entity.MarkerCarInfo;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.entity.net.V2XLivePushVoRes;
-import com.mogo.module.v2x.network.V2XRefreshCallback;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
import com.mogo.utils.logger.Logger;
-import com.tencent.rtmp.ui.TXCloudVideoView;
-
-import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
* @author liujing
@@ -46,7 +39,7 @@ public class CarZegoLiveVideoView extends RoundLayout {
private MarkerCarInfo.CarLiveInfo mCarLiveInfo;
// 重新刷新直播流
- private V2XVoiceCallbackListener v2XVoiceCallbackRefreshListener = new V2XVoiceCallbackListener() {
+ private final V2XVoiceCallbackListener v2XVoiceCallbackRefreshListener = new V2XVoiceCallbackListener() {
@Override
public void onCallback(String command, Intent intent) {
mLoading.setVisibility(VISIBLE);
@@ -80,14 +73,11 @@ public class CarZegoLiveVideoView extends RoundLayout {
mClLoadError = findViewById(R.id.clLoadError);
mTvRefreshButton = findViewById(R.id.tvRefreshButton);
- mTvRefreshButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- mLoading.setVisibility(VISIBLE);
- mClLoadError.setVisibility(GONE);
- if (mCarLiveInfo != null) {
- startLive(mCarLiveInfo);
- }
+ mTvRefreshButton.setOnClickListener(v -> {
+ mLoading.setVisibility(VISIBLE);
+ mClLoadError.setVisibility(GONE);
+ if (mCarLiveInfo != null) {
+ startLive(mCarLiveInfo);
}
});
}
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
index c7bcf65f0c..8f79dc7c1e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -307,6 +307,20 @@
android:textSize="@dimen/dp_22"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
+
+
32px
32px
1060px
+ 583px
390px
410px
670px
+ 366px
147px
60px
40px