Merge remote-tracking branch 'origin/qa_1.1.7' into qa_1.1.7

modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt

@@ -136,7 +136,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService
             if (current - startRecordDistanceTime >= DISTANCE_RECORD_TIME) {
                 // 超过阈值，准备判断是否拥堵
                 startRecordDistanceTime = 0L
-                if (tripDistance < 1000 && isClose() && currentSpeed < 40) {
+                if (tripDistance in 30..1000 && isClose() && currentSpeed < 40) {
                     Logger.d(TAG, "根据距离，判定为拥堵，准备上报, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed")
                     val p = TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO)
                     val latLon = MogoLatLng(lat, lon)

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java

@@ -72,7 +72,7 @@ public class V2XRoadVideoWindow extends RelativeLayout implements
         thumbnailImage = this.findViewById(R.id.thumbnail_image);
         simpleCoverVideoPlayer = this.findViewById(R.id.roadVideoView);
         GSYVideoType.setShowType(SCREEN_MATCH_FULL);
-
+        gsyVideoOptionBuilder.setCacheWithPlay(false);
         closeImage = this.findViewById(R.id.roadVideoClose);
         closeImage.setOnClickListener(v -> {
             close();