Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # gradle.properties # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt # modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt # modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
2020-11-10 17:48:45 +08:00
parent 204ac49977 f19b12f06d
commit 1f766eb906
83 changed files with 1903 additions and 403 deletions
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
@@ -30,6 +30,7 @@ import com.mogo.service.module.IMogoMarkerService;
 import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.share.IMogoShareManager;
+import com.mogo.service.share.IMogoTrafficUploadProvider;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
@@ -72,6 +73,7 @@ public class V2XServiceManager {
    private static IMogoMarkerService mIMogoMarkerService;
    private static IMogoShareManager mIMogoShareManager;
    private static IMogoTanluProvider mIMogoTanluProvider;
+    private static IMogoTrafficUploadProvider mIMogoTrafficUploadProvider;
    //事件面板
    private static IEventPanelProvider mIEventPanelProvider;

@@ -120,6 +122,7 @@ public class V2XServiceManager {
            mIMogoMarkerService = mMogoServiceApis.getMarkerService();
            mIMogoShareManager = mMogoServiceApis.getShareManager();
            mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
+            mIMogoTrafficUploadProvider = mMogoServiceApis.getTrafficUploadApi();
            mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi();
            //事件面板
            mIEventPanelProvider  = mMogoServiceApis.getEventPanelManager();
@@ -274,6 +277,9 @@ public class V2XServiceManager {
        return mIMogoTanluProvider;
    }

+    public static IMogoTrafficUploadProvider getIMogoTrafficUploadProvider(){
+        return mIMogoTrafficUploadProvider;
+    }

    public static IMogoOnlineCarListPanelProvider getMogoOnlineCarListPanelProvider() {
        return mMogoOnlineCarListPanelProvider;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -71,7 +71,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
    }

    // 打开出行动态TAB
-    private val mCheckHistoryEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+    private val mCheckHistoryEventCb = V2XVoiceCallbackListener { _: String?, _: Intent? ->
        try {
            mRbScenarioHistory?.isChecked = true
        } catch (e: java.lang.Exception) {
@@ -80,7 +80,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
    }

    // 打开周边事件TAB
-    private val mCheckSurroundingCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+    private val mCheckSurroundingCb = V2XVoiceCallbackListener { _: String?, _: Intent? ->
        try {
            mRbSurroundingEvent?.isChecked = true
        } catch (e: java.lang.Exception) {
@@ -89,7 +89,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
    }

    // 打开我的分享TAB
-    private val mCheckShearEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+    private val mCheckShearEventCb = V2XVoiceCallbackListener { _: String?, _: Intent? ->
        try {
            mRbShareEvents?.isChecked = true
        } catch (e: java.lang.Exception) {
@@ -98,7 +98,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
    }

    // 打关闭事件面板
-    private val mCloeEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+    private val mCloeEventCb = V2XVoiceCallbackListener { _: String?, _: Intent? ->
        try {
            TrackUtils.trackV2xHistoryEvent(5)
            hidePanel()
@@ -132,7 +132,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
            mVpEventPanel?.adapter = V2XEventPagerAdapter(this, fragments!!)
            mVpEventPanel?.isUserInputEnabled = false; //true:滑动，false：禁止滑动

-            mRgTabSelect?.setOnCheckedChangeListener { group, checkedId ->
+            mRgTabSelect?.setOnCheckedChangeListener { _, checkedId ->
                when (checkedId) {
                    R.id.rbScenarioHistory -> {
                        // 更改选中是否加粗
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
@@ -84,7 +84,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp

                boolean onlyShow = getV2XMessageEntity().isOnlyShow();

-                if (onlyShow == false){
+                if (onlyShow == false) {
                    // 设置TTS
                    getV2XMessageEntity().getContent().getTts(false);
                    // 广播给ADASzzz
@@ -198,7 +198,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
    public void onViewAdded(View view) {
        Logger.d(MODULE_NAME, "展示 Window 动画结束");
        if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
-            if (getV2XMessageEntity() != null && getV2XMessageEntity().isNeedAddLine() == true){
+            if (getV2XMessageEntity() != null && getV2XMessageEntity().isNeedAddLine() == true) {
                drawPOI();
            }
        }
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
@@ -33,6 +33,7 @@ import com.mogo.utils.logger.Logger;
 import java.util.ArrayList;
 import java.util.List;

+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;

 /**
@@ -168,12 +169,19 @@ public class V2XRoadEventWindow extends RelativeLayout
        if (v2XRoadEventEntity != null) {
            // 道路事件行驶到了50米附近，弹出事件纠错框给用户
            //Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity);
+
+            //如果poiType是道路拥堵，则调用接口查询拥堵状态
+            String poiType = v2XRoadEventEntity.getPoiType();
+            if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
+                V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
+            }
+
            //  进行类型分发
            switch (v2XRoadEventEntity.getPoiType()) {
                case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查
                case V2XPoiTypeEnum.ROAD_CLOSED://封路
                case V2XPoiTypeEnum.FOURS_ROAD_WORK://施工
-                case V2XPoiTypeEnum.FOURS_BLOCK_UP://拥堵
+                case FOURS_BLOCK_UP://拥堵
                case V2XPoiTypeEnum.FOURS_PONDING://积水
                case V2XPoiTypeEnum.FOURS_FOG://浓雾
                case V2XPoiTypeEnum.FOURS_ICE://结冰
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
@@ -54,6 +54,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
    private Button mBtnTriggerParkEvent;
    private Button mBtnTriggerCallUserInfo;
    private Button mBtnTriggerEventUgc;
+    private Button mBtnTriggerTrafficSearch;

    public static V2XTestConsoleWindow getInstance(Context context, int showType) {
        if (mV2XTestConsoleWindow == null) {
@@ -101,6 +102,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
        mBtnTriggerParkEvent = findViewById(R.id.btnTriggerParkEvent);
        mBtnTriggerEventUgc = findViewById(R.id.btnTriggerEventUgc);
        mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo);
+        mBtnTriggerTrafficSearch = findViewById(R.id.btnTriggerTrafficSearch);

        switch (showType) {
            case 0:
@@ -214,6 +216,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
        });

+        mBtnTriggerTrafficSearch.setOnClickListener(v-> V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus());
    }

 }
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
@@ -149,6 +149,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
        mFullPauseBitmap = null
        if (mAudioManager != null) {
            try {
+                @Suppress("DEPRECATION")
                mAudioManager.abandonAudioFocus(onAudioFocusChangeListener)
            } catch (e: Exception) {
                Logger.e(TAG, e, "onDetachedFromWindow - abandonAudioFocus")