Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2
# Conflicts: # OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml # OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt # OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml # OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml # OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml # app/src/main/java/com/mogo/launcher/MogoApplication.java # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt # core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml # core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml # gradle.properties
This commit is contained in:
yangyakun
0
app/bugly/BuglySymtabLog.txt
Normal file
0
app/bugly/BuglySymtabLog.txt
Normal file
0
app/bugly/BuglyUploadLog.txt
Normal file
0
app/bugly/BuglyUploadLog.txt
Normal file
@@ -24,7 +24,7 @@ if (!isAndroidTestBuild()) {
|
||||
|
||||
if (!isAndroidTestBuild()) {
|
||||
apply plugin: 'chain.log.hook'
|
||||
hooklog{
|
||||
hooklog {
|
||||
enableTraceToServer false
|
||||
enableLoggerToLocal true
|
||||
}
|
||||
@@ -36,6 +36,15 @@ if (!isAndroidTestBuild()) {
|
||||
apply plugin: 'apm-plugin'
|
||||
}
|
||||
|
||||
if (!isAndroidTestBuild()) {
|
||||
apply plugin: 'bytex.threadOpt'
|
||||
thread_opt {
|
||||
enable !isReleaseBuild
|
||||
enableInDebug !isReleaseBuild
|
||||
logLevel "DEBUG"
|
||||
}
|
||||
}
|
||||
|
||||
if (!isAndroidTestBuild()) {
|
||||
apply plugin: 'LancetX'
|
||||
LancetX {
|
||||
@@ -218,6 +227,7 @@ android {
|
||||
apply from: "./productFlavors/fPadLenovoOchTaxi.gradle"
|
||||
apply from: "./productFlavors/fPadLenovoOchBusPassenger.gradle"
|
||||
apply from: "./productFlavors/fPadLenovoOchTaxiPassenger.gradle"
|
||||
apply from: "./productFlavors/fPadLenovoOchSweeper.gradle"
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/io.netty.versions.properties'
|
||||
@@ -264,7 +274,7 @@ dependencies {
|
||||
} else {
|
||||
implementation project(':tts:tts-pad')
|
||||
implementation project(':core:function-impl:mogo-core-function-hmi')
|
||||
|
||||
|
||||
androidTestImplementation project(':core:mogo-core-function-call')
|
||||
androidTestImplementation project(':core:mogo-core-res')
|
||||
androidTestImplementation project(':core:function-impl:mogo-core-function-notice')
|
||||
@@ -281,6 +291,10 @@ dependencies {
|
||||
androidTestImplementation rootProject.ext.dependencies.androidx_espresso_core
|
||||
androidTestImplementation rootProject.ext.dependencies.localbroadcastmanager
|
||||
androidTestImplementation rootProject.ext.dependencies.mogo_v2x
|
||||
|
||||
if (isAndroidTestBuild()) {
|
||||
implementation "com.mogo.thread.opt:lib:${THREAD_OPT_VERSION}"
|
||||
}
|
||||
}
|
||||
|
||||
if (!isAndroidTestBuild()) {
|
||||
@@ -353,7 +367,7 @@ def getWorkingBranchHash() {
|
||||
}
|
||||
|
||||
static def getBuildTime() {
|
||||
def buildTimeFormat = "yyyy-MM-dd HH:mm:ss"
|
||||
def buildTimeFormat = "yyyy-MM-dd HH:mm:ss"
|
||||
//设置时间格式
|
||||
SimpleDateFormat formatter = new SimpleDateFormat(buildTimeFormat, Locale.getDefault())
|
||||
//获取当前时间
|
||||
|
||||
@@ -8,6 +8,15 @@ project.dependencies {
|
||||
exclude group: 'com.mogo.eagle.core.function' //by group
|
||||
}
|
||||
|
||||
// sweeper清扫车
|
||||
fPadLenovoOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper) {
|
||||
exclude group: 'com.mogo.commons' //by group
|
||||
exclude group: 'com.mogo.module' //by group
|
||||
exclude group: 'com.mogo.map' //by group
|
||||
exclude group: 'com.mogo.eagle.core' //by group
|
||||
exclude group: 'com.mogo.eagle.core.function' //by group
|
||||
}
|
||||
|
||||
// Bus司机端
|
||||
fPadLenovoOchBusImplementation(rootProject.ext.dependencies.mogoochbus) {
|
||||
exclude group: 'com.mogo.commons' //by group
|
||||
@@ -50,6 +59,14 @@ project.dependencies {
|
||||
exclude group: 'com.mogo.eagle.core' //by group
|
||||
exclude group: 'com.mogo.eagle.core.function' //by group
|
||||
}
|
||||
// sweeper 清扫车
|
||||
fPadLenovoOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) {
|
||||
exclude group: 'com.mogo.commons' //by group
|
||||
exclude group: 'com.mogo.module' //by group
|
||||
exclude group: 'com.mogo.map' //by group
|
||||
exclude group: 'com.mogo.eagle.core' //by group
|
||||
exclude group: 'com.mogo.eagle.core.function' //by group
|
||||
}
|
||||
|
||||
// Bus司机端
|
||||
fPadLenovoOchBusImplementation (project(':OCH:mogo-och-bus')) {
|
||||
|
||||
38
app/productFlavors/fPadLenovoOchSweeper.gradle
Normal file
38
app/productFlavors/fPadLenovoOchSweeper.gradle
Normal file
@@ -0,0 +1,38 @@
|
||||
project.android.productFlavors {
|
||||
// 衡阳-联想Pad-网约车-小巴车
|
||||
fPadLenovoOchSweeper {
|
||||
externalNativeBuild {
|
||||
ndk {
|
||||
// 设置支持的SO库架构
|
||||
abiFilters "arm64-v8a"
|
||||
}
|
||||
}
|
||||
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
|
||||
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
|
||||
versionCode rootProject.versionCode as int
|
||||
versionName rootProject.versionName
|
||||
// 应用包名
|
||||
applicationId rootProject.ext.android.fLauncherApplicationId
|
||||
dimension "product"
|
||||
|
||||
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
|
||||
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
|
||||
//高德地图鉴权信息
|
||||
manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchSweeper",ACTIVITY_ROOT:true]
|
||||
|
||||
// 是否基于地图
|
||||
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
|
||||
|
||||
// 是否需要实时上报坐标
|
||||
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
|
||||
// GPS数据提供源： 0-Android系统，1-工控机，2-OBU
|
||||
buildConfigField 'int', 'GPS_PROVIDER', "1"
|
||||
|
||||
// 构建的应用身份类型，出租车0|小巴A-司机｜乘客
|
||||
buildConfigField 'int', 'APP_IDENTITY_MODE', "0xA0"
|
||||
// 连接的工控机IP地址
|
||||
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
|
||||
// 构建的是否是演示（美化）模式
|
||||
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
// 将 install 和 assemble 任务按功能分组
|
||||
afterEvaluate {
|
||||
|
||||
def launcher = [ "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus", "fPadLenovoOchBusPassenger", "fPadLenovoOchTaxiPassenger"]
|
||||
def launcher = [ "fPadLenovo","fPadLenovoOchSweeper", "fPadLenovoOchTaxi", "fPadLenovoOchBus", "fPadLenovoOchBusPassenger", "fPadLenovoOchTaxiPassenger"]
|
||||
|
||||
it.getTasks().iterator().forEachRemaining {
|
||||
def task = it
|
||||
|
||||
@@ -7,6 +7,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel;
|
||||
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
|
||||
import com.mogo.launcher.crash.CrashSystem;
|
||||
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
|
||||
/**
|
||||
* @author congtaowang
|
||||
* @since 2019-12-18
|
||||
|
||||
@@ -68,7 +68,10 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
|
||||
// 配置BuglyAppID：MoGoEagleEye
|
||||
CrashReportConstants.buglyAppID = "ac71228f85"
|
||||
|
||||
if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchBus" || DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger" || DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger") {
|
||||
if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchBus"
|
||||
|| DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger"
|
||||
|| DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger"
|
||||
|| DebugConfig.getProductFlavor() == "fPadLenovoOchSweeper") {
|
||||
//控制HMI展示元素 将不用手动调用setXXXXXViewVisibility
|
||||
HmiBuildConfig.isShowSpeedView = false
|
||||
HmiBuildConfig.isShowAutopilotStatusView = false
|
||||
@@ -80,7 +83,8 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
|
||||
|
||||
if (DebugConfig.getProductFlavor() == "fPadLenovoOchTaxi" || DebugConfig.getProductFlavor() == "fPadLenovoOchTaxiPassenger") {
|
||||
HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
|
||||
} else if (DebugConfig.getProductFlavor() == "fPadLenovoOchBus" || DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger") {
|
||||
} else if (DebugConfig.getProductFlavor() == "fPadLenovoOchBus" || DebugConfig.getProductFlavor() == "fPadLenovoOchBusPassenger"
|
||||
|| DebugConfig.getProductFlavor() == "fPadLenovoOchSweeper") {
|
||||
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
|
||||
HmiBuildConfig.isShowBrakeLightView = false
|
||||
HmiBuildConfig.isShowTurnLightView = false
|
||||
|
||||
Reference in New Issue
Block a user