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/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}; + /** * 默认视频抓取时长 */