yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qa_aiSdk_datalink' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_aiSdk_datalink

Browse Source
This commit is contained in:
zhongchao
2021-05-31 16:26:57 +08:00
parent 47fec5307f 1c001e84c9
commit afd98da64b
10 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
View File

@@ -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;

1
libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java
View File

@@ -1,5 +1,6 @@
package com.mogo.map.listener;
import android.util.Log;
import android.view.MotionEvent;
import com.mogo.map.MogoLatLng;

3
main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
View File

@@ -5,7 +5,8 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application>
<activity
android:name=".MainLauncherActivity"

1
main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
View File

@@ -59,7 +59,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
super.onCreate(savedInstanceState);
DebugConfig.setNeedRequestUserInfo(true);
Log.d(TAG, "onCreate");
Log.d("liyz", "MainLauncherActivity onCreate ------->");
mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this);
}

32
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -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<EntranceView, EntrancePresente
}
} else if (descriptor == StatusDescriptor.VR_MODE) {
try {
Log.d("liyz", "vr isTrue = " + isTrue);
if (isTrue) {
enterVrMode();
} else {
@@ -1102,8 +1104,36 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
});
}
private boolean mLastStatusIsVr = false;
@Override
public void onMapModeChanged(EnumMapUI ui) {
Log.d("liyz", "fragment onMapModeChanged -----> ");
// 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<EntranceView, EntrancePresente
// } else if( ui == EnumMapUI.NorthUP_2D ){
// mMove2CurrentLocation.setImageResource( R.drawable.icon_car_up );
// }
}
@Override
@@ -1331,6 +1362,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
} else if (v.getId() == R.id.module_ext_enter_vr_mode) {
// 进入vr模式
Log.d("liyz", "enter --vr--");
mMApUIController.changeMapMode(EnumMapUI.Type_VR);
} else if (v.getId() == R.id.module_ext_exit_vr_mode) {
// 退出vr模式

1
modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
View File

@@ -1,6 +1,7 @@
package com.mogo.module.main;
import android.location.Location;
import android.util.Log;
import android.view.MotionEvent;
import com.mogo.map.MogoLatLng;

2
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -445,14 +445,12 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> 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 {

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -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();

7
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java
View File

@@ -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) {

1
services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
View File

@@ -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);
}