diff --git a/app/src/e8xx/AndroidManifest.xml b/app/src/e8xx/AndroidManifest.xml
index d755054676..01afff1292 100644
--- a/app/src/e8xx/AndroidManifest.xml
+++ b/app/src/e8xx/AndroidManifest.xml
@@ -1,6 +1,5 @@
\ No newline at end of file
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
index 889aedacc7..cd278e9299 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
@@ -68,6 +68,11 @@ const val UPLOAD_FROM_STRATEGY_CLOUD_CHECK = "4"
*/
const val UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO = "5"
+/**
+ * 策略上报集合
+ */
+val STRATEGY_UPLOAD_TYPE_ARRAY = arrayOf(UPLOAD_FROM_STRATEGY_BLOCK_AUTO,
+ UPLOAD_FROM_STRATEGY_CLOUD_CHECK, UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO)
/**
* 默认视频抓取时长,单位是秒
*/
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
index 7ae76ba6e8..845db90855 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -9,7 +9,6 @@ import com.mogo.utils.NetworkUtils
import com.zhidao.auto.carcorder.callback.TakePhotoCallback
import com.zhidao.auto.carcorder.callback.TakeVideoCallback
import com.zhidao.auto.carcorder.controller.ZdCarCoderController
-import com.zhidao.roadcondition.BuildConfig
import com.zhidao.roadcondition.constant.*
import com.zhidao.roadcondition.event.GetImageSuccessEvent
import com.zhidao.roadcondition.event.LatLngStickyEventBus
@@ -109,7 +108,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
this.mLatitude = latitude
if (DebugConfig.getCarMachineType() == 0) { //自研车机
outputVideoPath = getCompressVideoPath()
- CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id))
+ CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id,fromType))
zdCarCoderController.takeVideo(cameraId, duration)
trackGetVideo(1)
} else { //比亚迪
@@ -118,7 +117,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
// TipToast.shortTip("分享失败,请检查网络")
// } else {
//失败了,传空地址,发起请求
- val entity = TakeEntity(isCustom, id)
+ val entity = TakeEntity(isCustom, id,fromType)
videoAndThumbMap["video"] = ""
videoAndThumbMap["thumb"] = ""
@@ -272,6 +271,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
}
}
+
//获取视频成功
override fun onTakeVideoSuccess(camera: Int, videoPath: String?) {
var thumbnailPath =
@@ -304,6 +304,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
entity?.let {
if (entity.isCustom) {
compressVideo(videoPath, thumbnailPath, entity)
+ }else if (entity.fromType in STRATEGY_UPLOAD_TYPE_ARRAY) {
+ // 属于策略上报
+ compressVideo(videoPath, thumbnailPath, entity)
} else {
Log.d(
TAG,
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
index bd0d63ba14..65955f847b 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
@@ -27,5 +27,5 @@ object CustomStatusHandler {
}
class TakeEntity(
- var isCustom: Boolean, var id: Long
+ var isCustom: Boolean, var id: Long, var fromType: String = "0"
)
\ No newline at end of file
diff --git a/modules/mogo-module-push/build.gradle b/modules/mogo-module-push/build.gradle
index 80fa923f80..82aab1f2be 100644
--- a/modules/mogo-module-push/build.gradle
+++ b/modules/mogo-module-push/build.gradle
@@ -43,11 +43,6 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// 小智语音,免唤醒词等服务
- compileOnly rootProject.ext.dependencies.mogomap
- compileOnly rootProject.ext.dependencies.mogoutils
- compileOnly rootProject.ext.dependencies.mogocommons
- compileOnly rootProject.ext.dependencies.mogoserviceapi
- compileOnly rootProject.ext.dependencies.modulecommon
compileOnly rootProject.ext.dependencies.androidxconstraintlayout
compileOnly rootProject.ext.dependencies.arouter
compileOnly rootProject.ext.dependencies.aiassist
@@ -63,8 +58,18 @@ dependencies {
if( Boolean.valueOf(RELEASE) ){
implementation rootProject.ext.dependencies.modulepushbase
+ compileOnly rootProject.ext.dependencies.mogomap
+ compileOnly rootProject.ext.dependencies.mogoutils
+ compileOnly rootProject.ext.dependencies.mogocommons
+ compileOnly rootProject.ext.dependencies.mogoserviceapi
+ compileOnly rootProject.ext.dependencies.modulecommon
} else {
implementation project(":modules:mogo-module-push-base")
+ compileOnly project(':libraries:mogo-map')
+ compileOnly project(':foudations:mogo-utils')
+ compileOnly project(':foudations:mogo-commons')
+ compileOnly project(':services:mogo-service-api')
+ compileOnly project(':modules:mogo-module-common')
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
index c966d01ef4..4fdf2ba1f5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
@@ -270,6 +270,7 @@ public class V2XModuleProvider implements
* 刷新自车求助状态
*/
private void initCarForHelpStatus() {
+ Logger.d(MODULE_NAME, "刷新自车求助状态……");
//本地查询是否超时
V2XServiceManager.getV2XRefreshModel().getHelpSignal(new V2XRefreshCallback() {
@Override
@@ -277,18 +278,15 @@ public class V2XModuleProvider implements
if (result != null) {
V2XSeekHelpRes.ResultBean resultBean = result.getResult();
if (resultBean != null) {
+ Logger.d(MODULE_NAME, "刷新自车求助状态 resultBean:"+resultBean);
int vehicleType = resultBean.getVehicleType();
//故障车
if (vehicleType == 4) {
- if (!V2XServiceManager.getMoGoStatusManager().isSeekHelping()) {
- refreshMeSeekHelp(true);
- V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, true);
- }
+ refreshMeSeekHelp(true);
+ V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, true);
} else {
- if (V2XServiceManager.getMoGoStatusManager().isSeekHelping()) {
- refreshMeSeekHelp(false);
- V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, false);
- }
+ refreshMeSeekHelp(false);
+ V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, false);
}
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
index 5cc1180a9a..eaee87ac30 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
@@ -11,7 +11,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.scenario.scene.seek.V2XSeekHelpButton;
-import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpDialog;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
similarity index 99%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
index e88c985170..a4d8161609 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.scenario.scene.seek;
+package com.mogo.module.v2x.scenario.scene.help;
import android.content.Context;
import android.content.Intent;
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java
index 6fd2b2af19..2ea236564c 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java
@@ -66,6 +66,12 @@ public interface IMogoTanluProvider extends IProvider {
*/
String UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO = "5";
+ /**
+ * 策略上报集合
+ */
+ String[] STRATEGY_UPLOAD_TYPE_ARRAY = new String[]{UPLOAD_FROM_STRATEGY_BLOCK_AUTO,
+ UPLOAD_FROM_STRATEGY_CLOUD_CHECK, UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO};
+
/**
* 默认视频抓取时长
*/