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

merge och

Browse Source
This commit is contained in:
suyong
2021-06-10 14:28:38 +08:00
parent 8a16b15c58 99f8f951bf
commit 9ce50a799c
48 changed files with 6558 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/runConfigurations.xml generated
View File

@@ -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" />

18
app/build.gradle
View File

@@ -224,6 +224,12 @@ android {
}
// 衡阳-联想Pad
fPadLenovo {
android{
defaultConfig {
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
}
}
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
@@ -253,6 +259,12 @@ android {
}
// f系列-网约车-出租车
fPadLenovoOchTaxi {
android{
defaultConfig {
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
}
}
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
@@ -282,6 +294,12 @@ android {
}
// f系列-网约车-小巴车
fPadLenovoOchBus {
android{
defaultConfig {
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
}
}
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"

6
config.gradle
View File

@@ -12,8 +12,10 @@ ext {
commonIndependentAmapApiValue : "1c3fbc5f5e183619ffb1e7bc01e6751f",
compileSdkVersion : 28,
buildToolsVersion : "29.0.2",
minSdkVersion : 23,
targetSdkVersion : 23,
minSdkVersion : 19,
targetSdkVersion : 19,
minSdkVersionPadLenovo : 23,
targetSdkVersionPadLenovo : 23,
]
dependencies = [
// androidx

4
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -1054,4 +1054,8 @@ public class AMapNaviViewWrapper implements IMogoMapView,
return getMap().getUIController().getTileId(lon, lat);
}
@Override
public void setAdasRecognizedResult(int drawlevel) {
}
}

4
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
View File

@@ -825,4 +825,8 @@ public class AMapViewWrapper implements IMogoMapView,
return getMap().getUIController().getTileId(lon,lat);
}
@Override
public void setAdasRecognizedResult(int drawlevel) {
}
}

13
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java
View File

@@ -304,9 +304,16 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public void changeBearing(float bearing) {
if (mClient != null) {
mClient.changeBearing(bearing);
public void changeBearing( float bearing ) {
if ( mClient != null ) {
mClient.changeBearing( bearing );
}
}
@Override
public void setAdasRecognizedResult(int drawlevel) {
if ( mClient != null ) {
mClient.setAdasRecognizedResult(drawlevel);
}
}

2
libraries/map-custom/build.gradle
View File

@@ -67,7 +67,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.33'
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.35'
// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
}

37
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -794,34 +794,37 @@ public class AMapViewWrapper implements IMogoMapView,
}
} else {
// 通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型
// if (mAdasResult != null) {
// Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel);
// if (mAdasResult.drawlevel == 1 && isShowWarn) {
// mSelfMarker.marker3DIcon(R.raw.car);
// isShowWarn = false;
// } else if (mAdasResult.drawlevel == 2) { //不处理
// Logger.d("liyz", " mDrawlevel = " + mDrawlevel);
// if (mDrawlevel == 1 && isShowWarn) {
// mSelfMarker.marker3DIcon(R.raw.car);
// isShowWarn = false;
// } else if (mDrawlevel == 2) { //不处理
//
// } else if (mAdasResult.drawlevel == 3 && !isShowWarn) {
// //继续判断相应的方位，目前是只有 前方 TODO
// mSelfMarker.marker3DIcon(R.raw.qfpz);
// isShowWarn = true;
// }
// } else {
//// mSelfMarker.marker3DIcon(R.raw.car);
// } else if (mDrawlevel == 3 && !isShowWarn) {
// //继续判断相应的方位，目前是只有 前方 TODO
// mSelfMarker.marker3DIcon(R.raw.qfpz);
// isShowWarn = true;
// }
// UiThreadHandler.postDelayed( () -> {
//
// UiThreadHandler.postDelayed(() -> {
// if (!isShowWarn) {
// mSelfMarker.marker3DIcon(R.raw.qfpz);
// isShowWarn = true;
// }
// }, 6_000L );
// }, 6_000L);
}
showSelfSpeed(location.getSpeed());
}
private int mDrawlevel;
@Override
public void setAdasRecognizedResult(int drawlevel) {
mDrawlevel = drawlevel;
}
private TextView mSpeedView = null;
private int mLastYOffset = 20;

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

@@ -374,4 +374,10 @@ public class AMapUIController implements IMogoMapUIController {
}
}
@Override
public void setAdasRecognizedResult(int drawlevel) {
if (mClient != null) {
mClient.setAdasRecognizedResult(drawlevel);
}
}
}

2
libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
View File

@@ -250,6 +250,8 @@ public interface IMogoMapUIController {
*/
void changeBearing(float bearing);
void setAdasRecognizedResult(int drawlevel);
/**
* 获取瓦片id
*

7
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
View File

@@ -420,4 +420,11 @@ public class MogoMapUIController implements IMogoMapUIController {
}
}
@Override
public void setAdasRecognizedResult(int drawlevel) {
initDelegate();
if (mDelegate != null) {
mDelegate.setAdasRecognizedResult(drawlevel);
}
}
}

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

18
modules/mogo-module-adas/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$adas.java Normal file
View File

@@ -0,0 +1,18 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.mogo.module.adas.AdasProvider;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Group$$adas implements IRouteGroup {
@Override
public void loadInto(Map<String, RouteMeta> atlas) {
atlas.put("/adas/api", RouteMeta.build(RouteType.PROVIDER, AdasProvider.class, "/adas/api", "adas", null, -1, -2147483648));
}
}

18
modules/mogo-module-adas/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduleadas.java Normal file
View File

@@ -0,0 +1,18 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IProviderGroup;
import com.mogo.module.adas.AdasProvider;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Providers$$mogomoduleadas implements IProviderGroup {
@Override
public void loadInto(Map<String, RouteMeta> providers) {
providers.put("com.mogo.module.adas.AdasProvider", RouteMeta.build(RouteType.PROVIDER, AdasProvider.class, "/adas/api", "adas", null, -1, -2147483648));
}
}

17
modules/mogo-module-adas/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduleadas.java Normal file
View File

@@ -0,0 +1,17 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.alibaba.android.arouter.facade.template.IRouteRoot;
import java.lang.Class;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Root$$mogomoduleadas implements IRouteRoot {
@Override
public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
routes.put("adas", ARouter$$Group$$adas.class);
}
}

18
modules/mogo-module-adas/build/generated/source/buildConfig/debug/com/mogo/module/adas/BuildConfig.java Normal file
View File

@@ -0,0 +1,18 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.mogo.module.adas;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.module.adas";
/**
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
*/
@Deprecated
public static final String APPLICATION_ID = "com.mogo.module.adas";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "";
}

10
modules/mogo-module-adas/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.module.adas"
android:versionCode="1" >
<uses-sdk
android:minSdkVersion="23"
android:targetSdkVersion="23" />
</manifest>

1
modules/mogo-module-adas/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"","enabled":true,"outputFile":"mogo-module-adas-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.module.adas","split":""}}]

1
modules/mogo-module-adas/build/intermediates/annotation_processor_list/debug/annotationProcessors.json Normal file
View File

@@ -0,0 +1 @@
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}

BIN
modules/mogo-module-adas/build/intermediates/compile_library_classes/debug/classes.jar Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar Normal file
View File

Binary file not shown.

2
modules/mogo-module-adas/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/debug/jniLibs"/></dataSet></merger>

2
modules/mogo-module-adas/build/intermediates/incremental/mergeDebugShaders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/debug/shaders"/></dataSet></merger>

2
modules/mogo-module-adas/build/intermediates/incremental/packageDebugAssets/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/main/assets"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/debug/assets"/></dataSet></merger>

1
modules/mogo-module-adas/build/intermediates/incremental/packageDebugResources/compile-file-map.properties Normal file
View File

@@ -0,0 +1 @@
#Thu May 27 17:09:38 CST 2021

2
modules/mogo-module-adas/build/intermediates/incremental/packageDebugResources/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/main/res"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/main/res"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/foudations/httpdns-base/src/debug/res"/></dataSet><mergedItems/></merger>

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$adas.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduleadas.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduleadas.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/mogo/module/adas/AdasDataListener.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/mogo/module/adas/AdasEventManager.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/mogo/module/adas/AdasProvider.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/mogo/module/adas/AdasStatusListener.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/mogo/module/adas/BuildConfig.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/mogo/module/adas/WarnMessageModel.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/javac/debug/classes/com/mogo/module/adas/占位文件可删除.class Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-adas/build/intermediates/library_java_res/debug/res.jar Normal file
View File

Binary file not shown.

10
modules/mogo-module-adas/build/intermediates/library_manifest/debug/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.module.adas"
android:versionCode="1" >
<uses-sdk
android:minSdkVersion="23"
android:targetSdkVersion="23" />
</manifest>

2
modules/mogo-module-adas/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt Normal file
View File

@@ -0,0 +1,2 @@
R_DEF: Internal format may change without notice
local

12
modules/mogo-module-adas/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt Normal file
View File

@@ -0,0 +1,12 @@
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.mogo.module.adas"
4 android:versionCode="1" >
5
6 <uses-sdk
7 android:minSdkVersion="23"
7-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
8 android:targetSdkVersion="23" />
8-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
9
10</manifest>

1
modules/mogo-module-adas/build/intermediates/merged_manifests/debug/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"","enabled":true,"outputFile":"mogo-module-adas-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.mogo.module.adas","split":""}}]

2814
modules/mogo-module-adas/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
modules/mogo-module-adas/build/intermediates/runtime_library_classes/debug/classes.jar Normal file
View File

Binary file not shown.

3516
modules/mogo-module-adas/build/intermediates/symbols/debug/R.txt Normal file
View File

File diff suppressed because it is too large Load Diff

31
modules/mogo-module-adas/build/outputs/logs/manifest-merger-debug-report.txt Normal file
View File

@@ -0,0 +1,31 @@
-- Merging decision tree log ---
manifest
ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:2:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:2:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:2:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:2:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:2:1-5:12
package
ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:3:5-35
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
android:versionCode
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:2:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
xmlns:android
ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml:2:11-69
uses-sdk
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-adas/src/main/AndroidManifest.xml

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

@@ -393,7 +393,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);
@@ -417,7 +417,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
flSpeed.setVisibility(View.VISIBLE);
mSwitchMapModeLayout.setVisibility(View.VISIBLE);
// clTrafficLight.setVisibility(View.VISIBLE);
// }
}
}
private void exitVrMode() {

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 {

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -172,7 +172,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
//// 绘制碰撞的他车指引线，需要实时给数据更新 TODO
// drawLimberCollisionPolyline(result);
// //通过这个传值到 AMapViewWrapper，根据数据更新自车的模型数据
// MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().setAdasRecognizedResult(result); todo setAdasRecognizedResult 需要拆分细粒度
// MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().setAdasRecognizedResult(result.drawlevel);
// }
// }