This commit is contained in:
lixiaopeng
2020-07-21 15:40:05 +08:00
parent 15848a07d0
commit 7237fab8ca
28 changed files with 3087 additions and 3 deletions

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

View File

@@ -0,0 +1,18 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.mogo.connection;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.connection";
/**
* @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.connection";
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 = "1.2.1.13";
}

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.connection"
android:versionCode="1"
android:versionName="1.2.1.13" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="22" />
</manifest>

View File

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

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}

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/mogo-connection/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/mogo-connection/src/debug/jniLibs"/></dataSet></merger>

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/mogo-connection/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/mogo-connection/src/debug/shaders"/></dataSet></merger>

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/mogo-connection/src/main/assets"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/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/mogo-connection/src/debug/assets"/></dataSet></merger>

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">mogo-connection</string>
</resources>

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/mogo-connection/src/main/res"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/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/mogo-connection/src/main/res"><file path="/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">mogo-connection</string></file></source><source path="/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/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/mogo-connection/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/mogo-connection/src/debug/res"/></dataSet><mergedItems/></merger>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.connection"
android:versionCode="1"
android:versionName="1.2.1.13" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="22" />
</manifest>

View File

@@ -0,0 +1,3 @@
R_DEF: Internal format may change without notice
local
string app_name

View File

@@ -0,0 +1,13 @@
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.mogo.connection"
4 android:versionCode="1"
5 android:versionName="1.2.1.13" >
6
7 <uses-sdk
8 android:minSdkVersion="19"
8-->/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
9 android:targetSdkVersion="22" />
9-->/Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
10
11</manifest>

View File

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

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">mogo-connection</string>
</resources>

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,37 @@
-- Merging decision tree log ---
manifest
ADDED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
package
ADDED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:2:5-34
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:versionName
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:versionCode
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
xmlns:android
ADDED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:11-69
uses-sdk
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/foudations/mogo-connection/src/main/AndroidManifest.xml

View File

@@ -60,7 +60,7 @@ MOGO_MODULE_V2X_VERSION=1.2.1.20
## 工程外部模块
# 探路
MOGO_MODULE_TANLU_VERSION=1.3.0.10
MOGO_MODULE_TANLU_VERSION=1.3.0.19
# 车聊聊
CARCHATTING_VERSION=1.4.5
# 车聊聊接口
@@ -79,7 +79,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
# 广告资源位
MOGO_MODULE_AD_CARD_VERSION=1.0.1
# 探路上报和分享模块
TANLULIB_VERSION=1.3.0.10
TANLULIB_VERSION=1.3.0.19
MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
#左侧面板模块