diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java index 4ade4c2bda..c4759083bf 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java @@ -14,6 +14,7 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.MapCameraPosition; import com.mogo.map.uicontroller.MapControlResult; import com.mogo.map.uicontroller.VisualAngleMode; +import com.mogo.utils.logger.Logger; import com.zhidaoauto.map.sdk.open.MapAutoApi; import org.json.JSONObject; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java index 628c44963c..312a6e9aea 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java @@ -1,5 +1,6 @@ package com.mogo.map.listener; +import android.util.Log; import android.view.MotionEvent; import com.mogo.map.MogoLatLng; diff --git a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml index 0524f236a8..a4d14f612a 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml +++ b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml @@ -5,7 +5,8 @@ - + + "); mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this); } diff --git 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 index e90c46b68c..b030a55dc1 100644 --- 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 @@ -8,6 +8,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; import android.text.TextUtils; +import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -919,6 +920,7 @@ public class EntranceFragment extends MvpFragment "); +// if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { +// if ( ui == EnumMapUI.Type_VR ) { +// Log.d("liyz", "onMapModeChanged mLastStatusIsVr = " + mLastStatusIsVr + "--ui = " +ui); +// if ( !mLastStatusIsVr ) { +// MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true ); +// MapCenterPointStrategy.resetByChangeMode(); +//// MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); +// if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { +// AIAssist.getInstance( getContext() ).speakTTSVoice( "已开启鹰眼模式" ); +// } +// mLastStatusIsVr = true; +// } +// } else { +// if ( mLastStatusIsVr ) { +// mLastStatusIsVr = false; +// MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, false ); +// MapCenterPointStrategy.resetByChangeMode(); +//// MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); +// if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { +// AIAssist.getInstance( getContext() ).speakTTSVoice( "已退出鹰眼模式" ); +// } +// } +// } +// } + if (mCameraMode == null) { return; } @@ -1115,6 +1145,7 @@ public class EntranceFragment extends MvpFragment implement boolean isAllGranted = true; // 判断是否所有的权限都已经授予了 for (int grant : grantResults) { - Log.d("liyz", "grant =" + grant); if (grant != PackageManager.PERMISSION_GRANTED) { isAllGranted = false; break; } } - Log.d("liyz", "onRequestPermissionsResult isAllGranted = " + isAllGranted); if (isAllGranted) { isFirst = false; } else { diff --git 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 index 7bb3165692..e2dfe02f93 100644 --- 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 @@ -10,6 +10,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import com.mogo.commons.debug.DebugConfig; @@ -937,7 +938,9 @@ public class MogoServices implements IMogoMapListener, @Override public void onMapModeChanged( EnumMapUI ui ) { + Log.d("liyz", "onMapModeChanged ----> ui = " + ui); if ( ui == EnumMapUI.Type_VR ) { + Log.d("liyz", "onMapModeChanged mLastStatusIsVr = " + mLastStatusIsVr + "--ui = " +ui); if ( !mLastStatusIsVr ) { MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true ); MapCenterPointStrategy.resetByChangeMode(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java index 0eefde7372..15769e1c9e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java @@ -12,6 +12,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.v2x.R; /** @@ -39,6 +40,12 @@ public class V2XEventPanelHistoryCountView extends LinearLayout { mLlEventMore = (RelativeLayout) findViewById(R.id.llEventMore); mBtnShowOrHidePanels = (ImageView) findViewById(R.id.btnShowOrHidePanels); mTvEventCount = (TextView) findViewById(R.id.tvEventCount); + + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) { + mLlEventMore.setVisibility(VISIBLE); + } else { + mLlEventMore.setVisibility(GONE); + } } public void changeMsgCount(int count) { diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index 34181e7e32..42aa23f9a3 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -169,6 +169,7 @@ public class MogoStatusManager implements IMogoStatusManager { @Override public void setVrMode(String tag, boolean vrMode) { + Log.d("liyz", "setVrMode --------> "); doSetStatus(tag, StatusDescriptor.VR_MODE, vrMode); }