Merge branch 'dev2_aiSdk' into qa_yingyan0514

2021-05-26 17:07:17 +08:00
parent aeec57463f d2ee15f0d7
commit a9110bfd95
10 changed files with 91 additions and 48 deletions
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
  <component name="RunConfigurationProducerService">
    <option name="ignoredProducers">
      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -128,6 +128,7 @@ public class MogoApplication extends AbsMogoApplication {
                Intent intent = new Intent();
                intent.setComponent(new ComponentName("com.zhidao.speech.voice.pad",
                        "com.zhidao.speech.MainActivity"));
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                startActivity(intent);
            }
        } catch (Exception e) {
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
        implementation project(':foudations:mogo-commons')
    }

-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.28'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.29'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }

--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
@@ -140,6 +140,9 @@ public class SnapshotLocationController {
                mLastLocationInfo = null;
            }
        }
+        if (list.size() == 0) {
+            return null;
+        }
        //Logger.d( TAG, "upload loc size = %s", list == null ? 0 : list.size() );
        return list;
    }
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -181,6 +181,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente

    private boolean isShowGuide;

+    //远景和中景的切换
    private ImageView mSwitchMapModeImage;
    private FrameLayout mSwitchMapModeLayout;

@@ -377,6 +378,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
        mSwitchMapModeImage = (ImageView) findViewById(R.id.module_switch_model_icon);
        mSwitchMapModeImage.setOnClickListener(clickListener);

+        //TODO
+        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
+            enterVrMode();
+        }
    }

    private int debugPanelClickCount = 0;
@@ -386,7 +391,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
    private Group groupFix;

    private void enterVrMode() {
-        if (!localIsVrMode) {
+//        if (!localIsVrMode) {
            tvEnterVrMode.setVisibility(View.GONE);
            mMove2CurrentLocation.setVisibility(View.GONE);
            mUploadRoadCondition.setVisibility(View.GONE);
@@ -410,7 +415,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
            flSpeed.setVisibility(View.VISIBLE);
            mSwitchMapModeLayout.setVisibility(View.VISIBLE);
          //  clTrafficLight.setVisibility(View.VISIBLE);
-        }
+//        }
    }

    private void exitVrMode() {
@@ -717,6 +722,11 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
        TopViewAnimHelper.getInstance().setIMogoMapUIController(mMApUIController);
        TopViewNoLinkageAnimHelper.getInstance().setIMogoMapUIController(mMApUIController);

+        // 进入vr模式，不可缩放地图
+        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
+            UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_000L );
+        }
+
        mClickShareVoiceStrings =
                getContext().getResources().getStringArray(R.array.click_share_voice_guide_array);
        mInnerGuideVoiceStrings =
@@ -725,6 +735,18 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                getContext().getResources().getStringArray(R.array.search_voice_guide_outer_array);
    }

+    /**
+     * 进入鹰眼模式，设置手势缩放地图失效
+     */
+    private void stepIntoVrMode(){
+        Logger.d( TAG, "进入vr模式" );
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getMapServiceApi()
+                .getMapUIController()
+                .openVrMode(false);
+    }
+
    @Override
    public void onResume() {
        super.onResume();
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -940,7 +940,9 @@ public class MogoServices implements IMogoMapListener,
                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true );
                MapCenterPointStrategy.resetByChangeMode();
                MapMarkerManager.getInstance().redrawMarkerByStyleChanged();
-                AIAssist.getInstance( mContext ).speakTTSVoice( "已开启鹰眼模式" );
+                if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
+                  AIAssist.getInstance( mContext ).speakTTSVoice( "已开启鹰眼模式" );
+                }
                mLastStatusIsVr = true;
            }
        } else {
@@ -949,7 +951,9 @@ public class MogoServices implements IMogoMapListener,
                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, false );
                MapCenterPointStrategy.resetByChangeMode();
                MapMarkerManager.getInstance().redrawMarkerByStyleChanged();
-                AIAssist.getInstance( mContext ).speakTTSVoice( "已退出鹰眼模式" );
+                if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
+                   AIAssist.getInstance( mContext ).speakTTSVoice( "已退出鹰眼模式" );
+                }
            }
        }
    }
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -19,6 +19,7 @@ import com.amap.api.maps.UiSettings;
 import com.amap.api.navi.AMapNaviView;
 import com.amap.api.navi.AMapNaviViewOptions;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.view.RoundLayout;
 import com.mogo.utils.FileUtils;
@@ -215,15 +216,17 @@ public class SmallMapDirectionView extends RelativeLayout {


        setOnClickListener(view -> {
-            MogoApisHandler.getInstance().getApis()
-                    .getMapServiceApi()
-                    .getMapUIController()
-                    .changeMapMode(
-                            MogoApisHandler.getInstance()
-                                    .getApis()
-                                    .getAdasControllerApi()
-                                    .getCurrentSkinMode()
-                    );
+            if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
+                MogoApisHandler.getInstance().getApis()
+                        .getMapServiceApi()
+                        .getMapUIController()
+                        .changeMapMode(
+                                MogoApisHandler.getInstance()
+                                        .getApis()
+                                        .getAdasControllerApi()
+                                        .getCurrentSkinMode()
+                        );
+            }
        });
    }

--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -570,8 +570,8 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                }
                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
                    mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, clickListener);
-                    mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
-                    mAlarmInfoMarker.showInfoWindow();
+//                    mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
+//                    mAlarmInfoMarker.showInfoWindow();
                } else {
                    optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity));
                    mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
--- a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
@@ -5,6 +5,7 @@
    android:id="@+id/llEventMore"
    android:layout_width="@dimen/module_v2x_panel_width"
    android:layout_height="@dimen/module_v2x_panel_width"
+    android:visibility="gone"
    android:background="@drawable/module_ext_drawable_shadow_bg"
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toTopOf="parent">
--- a/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
@@ -1,44 +1,52 @@
 {
-  "current_lane_id": "1903",
+  "current_lane_id": "010",
  "current_lane_num": -2,
-  "most_lane_num": -3,
-  "most_speed": 8.0,
-  "road_id": "400139",
-  "sn": "F803EB2046PZD00149",
-  "locus_list": [
-    {
-      "lat": 39.974323417486,
-      "lon": 116.411520335961
-    },
-    {
-      "lat": 39.974407914698,
-      "lon": 116.411515520661
-    },
-    {
-      "lat": 39.974658553869,
-      "lon": 116.411505432781
-    },
-    {
-      "lat": 39.974881303401,
-      "lon": 116.411499467848
-    }
-  ],
  "gd_locus_list": [
    {
-      "lat": 39.975728,
-      "lon": 116.41777
+      "lat": 39.976285,
+      "lon": 116.417649
    },
    {
-      "lat": 39.975813,
-      "lon": 116.417765
+      "lat": 39.976341,
+      "lon": 116.417642
    },
    {
-      "lat": 39.976064,
-      "lon": 116.417755
+      "lat": 39.97637,
+      "lon": 116.417639
    },
    {
-      "lat": 39.976286,
-      "lon": 116.417749
+      "lat": 39.976397,
+      "lon": 116.417638
+    },
+    {
+      "lat": 39.976428,
+      "lon": 116.417637
    }
-  ]
+  ],
+  "locus_list": [
+    {
+      "lat": 39.974879535063,
+      "lon": 116.411399349271
+    },
+    {
+      "lat": 39.974936309753,
+      "lon": 116.411392282881
+    },
+    {
+      "lat": 39.974965397592,
+      "lon": 116.411389554398
+    },
+    {
+      "lat": 39.974992457492,
+      "lon": 116.411388118996
+    },
+    {
+      "lat": 39.975023263289,
+      "lon": 116.41138715302
+    }
+  ],
+  "most_lane_num": -1,
+  "most_speed": 9.0,
+  "road_id": "400140",
+  "sn": "F803EB2046PZD00207"
 }