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

[Add]

Browse Source 
1、自行车模型、小巴模型还未更换
2、更新AiSDK=升级日志模块

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2021-11-19 21:52:05 +08:00
parent 26d1dfb20a
commit fa86e69213
8 changed files with 373 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/xml/network_security_config.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true" />
</network-security-config>

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -258,12 +258,10 @@ class DebugSettingView @JvmOverloads constructor(
LogUtils.getConfig().isLogSwitch = false
Logger.init(LogLevel.OFF)
com.mogo.utils.logger.Logger.init(com.mogo.utils.logger.LogLevel.OFF)
com.mogo.cloud.utils.logger.Logger.init(com.mogo.cloud.utils.logger.LogLevel.OFF)
} else {
LogUtils.getConfig().isLogSwitch = true
Logger.init(LogLevel.DEBUG)
com.mogo.utils.logger.Logger.init(com.mogo.utils.logger.LogLevel.DEBUG)
com.mogo.cloud.utils.logger.Logger.init(com.mogo.cloud.utils.logger.LogLevel.DEBUG)
}
}
tbADASLog.setOnCheckedChangeListener { buttonView, isChecked ->

BIN
core/mogo-core-res/src/main/res/raw/daba.nt3d
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/tachexiaoche.nt3d
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/zixingche.nt3d
View File

Binary file not shown.

107
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/DevicesUtils.java Normal file
View File

@@ -0,0 +1,107 @@
package com.mogo.eagle.core.utilcode.mogo;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
/**
* 设备信息
*/
public class DevicesUtils {
private static final String PROPERTIES = "android.os.SystemProperties";
private static final String GSM_SERIAL = "gsm.serial";
private static final String GET = "get";
public static String getSn(){
return getSystemProperties(GSM_SERIAL);
}
public static String getSystemProperties(String name ) {
String value = "";
try {
Class< ? > c = Class.forName( PROPERTIES );
Method get = c.getMethod( GET, String.class );
value = (String) get.invoke( c, name );
} catch ( ClassNotFoundException var3 ) {
var3.printStackTrace();
} catch ( NoSuchMethodException var4 ) {
var4.printStackTrace();
} catch ( InvocationTargetException var5 ) {
var5.printStackTrace();
} catch ( IllegalAccessException var6 ) {
var6.printStackTrace();
}
return value;
}
public static String getNetworkTypeName(Context context) {
String typeName = "unknown";
if (context != null) {
ConnectivityManager connectivityManager = (ConnectivityManager) context
.getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivityManager == null) {
return typeName;
}
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
if (networkInfo != null) {
typeName = networkInfo.getTypeName();
}
}
return typeName;
}
public static int getNetworkType(Context context) {
if (context != null) {
ConnectivityManager connectivityManager = (ConnectivityManager) context
.getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivityManager != null) {
NetworkInfo activeNetInfo = connectivityManager.getActiveNetworkInfo();
if (activeNetInfo != null) {
return activeNetInfo.getType();
}
}
}
return -1;
}
public static boolean isSdkHigherThan18() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
}
public static String getVersionName(Context context) {
String appVersion = "";
try {
if (context != null) {
String packageName = context.getApplicationInfo().packageName;
appVersion = context.getPackageManager().getPackageInfo(packageName, 0).versionName;
}
} catch (Exception e) {
e.printStackTrace();
}
return appVersion;
}
public static int getVersionCode(Context context) {
String pkgName = context.getPackageName();
try {
PackageInfo e = context.getPackageManager().getPackageInfo(pkgName, 0);
if (e != null) {
return e.versionCode;
}
} catch (Exception var2) {
var2.printStackTrace();
}
return 1;
}
}

172
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/TelephoneUtil.java Normal file
View File

@@ -0,0 +1,172 @@
package com.mogo.eagle.core.utilcode.mogo;
import android.content.Context;
import android.net.ConnectivityManager;
import android.os.Build;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
/**
* @author wangzhiyuan
* @since 2018/2/7
*/
public class TelephoneUtil {
public static String sn = "";
public static String fotaVersion = "";
public static String fotaDevice = "";
public static String imei = "";
public static String iccid = "";
public static String vin = "";
public static String getFotaDevice() {
if (TextUtils.isEmpty(fotaDevice)) {
String device = "";
try {
Class<?> c = Class.forName("android.os.SystemProperties");
Method get = c.getMethod("get", String.class);
device = (String) get.invoke(c, "ro.fota.device");
if (!TextUtils.isEmpty(device)) {
device = device.trim();
}
} catch (Exception e) {
e.printStackTrace();
}
fotaDevice = device;
}
return fotaDevice;
}
public static String getFotaVersion() {
if (TextUtils.isEmpty(fotaVersion)) {
String version = "";
try {
Class<?> c = Class.forName("android.os.SystemProperties");
Method get = c.getMethod("get", String.class);
version = (String) get.invoke(c, "ro.fota.version");
if (!TextUtils.isEmpty(version)) {
version = version.trim();
}
} catch (Exception e) {
e.printStackTrace();
}
fotaVersion = version;
}
return fotaVersion;
}
public static boolean getMobileDataState(Context context) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// Android 5.0之前
ConnectivityManager conMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Class<?> conMgrClass = null;
Object iConMgr = null;
try {
conMgrClass = Class.forName(conMgr.getClass().getName());//ConnectivityManager
Field iConMgrField = conMgrClass.getDeclaredField("mService");//IConnectivityManager
iConMgrField.setAccessible(true);
iConMgr = iConMgrField.get(conMgr);//获得ConnectivityManager的IConnectivityManager实例
Class<?> iConMgrClass = Class.forName(iConMgr.getClass().getName());
Method getMobileDataEnabledMethod = iConMgrClass.getDeclaredMethod("getMobileDataEnabled");
if (getMobileDataEnabledMethod != null) {
getMobileDataEnabledMethod.setAccessible(true);
boolean result = (Boolean) getMobileDataEnabledMethod.invoke(iConMgr);
Logger.d("TelephoneUtil", "getMobileDataEnabled = " + result);
return result;
}
} catch (Exception e) {
e.printStackTrace();
}
} else {
// Android 5.0之后（包含）
TelephonyManager telephonyService = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
try {
Method getDataEnabled = telephonyService.getClass().getDeclaredMethod("getDataEnabled");
if (null != getDataEnabled) {
boolean result = (Boolean) getDataEnabled.invoke(telephonyService);
Logger.d("TelephoneUtil", "getDataEnabled = " + result);
return result;
}
} catch (Exception e) {
e.printStackTrace();
}
}
return false;
}
public static void setMobileDataState(Context context, boolean enable) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// Android 5.0之前
ConnectivityManager conMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Class<?> conMgrClass = null;
Object iConMgr = null;
try {
conMgrClass = Class.forName(conMgr.getClass().getName());//ConnectivityManager
Field iConMgrField = conMgrClass.getDeclaredField("mService");//IConnectivityManager
iConMgrField.setAccessible(true);
iConMgr = iConMgrField.get(conMgr);//获得ConnectivityManager的IConnectivityManager实例
Class<?> iConMgrClass = Class.forName(iConMgr.getClass().getName());
Method setMobileDataEnabledMethod = iConMgrClass.getDeclaredMethod("setMobileDataEnabled", boolean.class);
if (setMobileDataEnabledMethod != null) {
setMobileDataEnabledMethod.setAccessible(true);
setMobileDataEnabledMethod.invoke(iConMgr, enable);
Logger.d("TelephoneUtil", "setMobileDataEnabled = " + enable);
}
} catch (Exception e) {
e.printStackTrace();
}
} else {
// Android 5.0之后（包含）
try {
TelephonyManager telephonyService = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
Method setDataEnabledMethod = telephonyService.getClass().getDeclaredMethod("setDataEnabled", boolean.class);
if (null != setDataEnabledMethod) {
setDataEnabledMethod.invoke(telephonyService, enable);
Logger.d("TelephoneUtil", "setDataEnabled = " + enable);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
public static String getSerialNumber() {
if (TextUtils.isEmpty(sn)) {
String serial = "";
try {
Class<?> c = Class.forName("android.os.SystemProperties");
Method get = c.getMethod("get", String.class);
serial = (String) get.invoke(c, "zhidao.serial");
if (TextUtils.isEmpty(serial)) {
serial = (String) get.invoke(c, "gsm.serial");
}
if (TextUtils.isEmpty(serial)) {
serial = (String) get.invoke(c, "ro.serialno");
}
} catch (Exception e) {
e.printStackTrace();
}
try {
if (serial.startsWith("ZD") || serial.startsWith("XT")) {
sn = serial;
} else {
return serial;
}
} catch (Exception e) {
e.printStackTrace();
}
}
return sn;
}
}

180
gradle.properties
View File

@@ -23,7 +23,7 @@ kotlin.parallel.tasks.in.project=true
#优化kapt
#并行运行kapt1.2.60版本以上支持
kapt.use.worker.api=true
#增量编译 kapt1.3.40版本以上支持
#增量编译 kapt1.3.60版本以上支持
kapt.incremental.apt=true
#kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉app:kaptGenerateStubsDebugKotlin的时间
kapt.include.compile.classpath=false
@@ -37,14 +37,14 @@ kapt.include.compile.classpath=false
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.jetifier.blacklist=module-service-2.0.81.aar
android.jetifier.blacklist=module-service-2.0.82.aar
## maven 配置
RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
USERNAME=xintai
PASSWORD=xintai2018
# 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
USE_MAVEN_PACKAGE=false
USE_MAVEN_PACKAGE=true
##plugin 插件
#android.enableR8.libraries=false
#android.enableR8=false
@@ -62,21 +62,21 @@ SERVICE_CHAIN_VERSION=1.0.22
LOGLIB_VERSION=1.0.4
######## MogoAiCloudSDK Version ########
# 网络请求
MOGO_NETWORK_VERSION=1.3.4
MOGO_NETWORK_VERSION=1.3.6
# 鉴权
MOGO_PASSPORT_VERSION=1.3.4
MOGO_PASSPORT_VERSION=1.3.6
# 常链接
MOGO_SOCKET_VERSION=1.3.4
MOGO_SOCKET_VERSION=1.3.6
# 数据采集
MOGO_REALTIME_VERSION=1.3.4
MOGO_REALTIME_VERSION=1.3.6
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.3.4
MOGO_TANLU_VERSION=1.3.6
# 直播推流
MOGO_LIVE_VERSION=1.3.4
MOGO_LIVE_VERSION=1.3.6
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.3.4
MOGO_TRAFFICLIVE_VERSION=1.3.6
# 定位服务
MOGO_LOCATION_VERSION=1.3.4
MOGO_LOCATION_VERSION=1.3.6
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=V2.0.0.4
@@ -88,102 +88,102 @@ applicationName=IntelligentPilot
versionCode=80007
versionName=8.0.14
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.23
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.23
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.23
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.23
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.23
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.23
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.23
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.23
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.23
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.23
MOGO_CORE_DATA_VERSION=0.0.23
MOGO_CORE_FUNCTION_API_VERSION=0.0.23
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.23
MOGO_CORE_RES_VERSION=0.0.23
MOGO_CORE_UTILS_VERSION=0.0.23
MOGO_CORE_NETWORK_VERSION=0.0.23
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.25
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.25
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.25
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.25
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.25
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.25
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.25
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.25
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.25
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.25
MOGO_CORE_DATA_VERSION=0.0.25
MOGO_CORE_FUNCTION_API_VERSION=0.0.25
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.25
MOGO_CORE_RES_VERSION=0.0.25
MOGO_CORE_UTILS_VERSION=0.0.25
MOGO_CORE_NETWORK_VERSION=0.0.25
################# 旧版本架构模块版本 #################
## 工程内模块
MOGO_COMMONS_VERSION=2.0.81
MOGO_UTILS_VERSION=2.0.81
MAP_AMAP_VERSION=2.0.81
MAP_AUTONAVI_VERSION=2.0.81
MOGO_MAP_VERSION=2.0.81
MOGO_MAP_API_VERSION=2.0.81
MOGO_SERVICE_VERSION=2.0.81
MOGO_SERVICE_API_VERSION=2.0.81
MOGO_CONNECTION_VERSION=2.0.81
MOGO_MODULE_APPS_VERSION=2.0.81
MOGO_MODULE_NAVI_VERSION=2.0.81
MOGO_MODULE_SHARE_VERSION=2.0.81
MOGO_MODULE_COMMON_VERSION=2.0.81
MOGO_MODULE_MAIN_VERSION=2.0.81
MOGO_MODULE_MAP_VERSION=2.0.81
MOGO_MODULE_SERVICE_VERSION=2.0.81
MOGO_MODULE_EXTENSIONS_VERSION=2.0.81
MOGO_MODULE_SEARCH_VERSION=2.0.81
MOGO_MODULE_BACK_VERSION=2.0.81
MOGO_MODULE_V2X_VERSION=2.0.81
MOGO_COMMONS_VERSION=2.0.82
MOGO_UTILS_VERSION=2.0.82
MAP_AMAP_VERSION=2.0.82
MAP_AUTONAVI_VERSION=2.0.82
MOGO_MAP_VERSION=2.0.82
MOGO_MAP_API_VERSION=2.0.82
MOGO_SERVICE_VERSION=2.0.82
MOGO_SERVICE_API_VERSION=2.0.82
MOGO_CONNECTION_VERSION=2.0.82
MOGO_MODULE_APPS_VERSION=2.0.82
MOGO_MODULE_NAVI_VERSION=2.0.82
MOGO_MODULE_SHARE_VERSION=2.0.82
MOGO_MODULE_COMMON_VERSION=2.0.82
MOGO_MODULE_MAIN_VERSION=2.0.82
MOGO_MODULE_MAP_VERSION=2.0.82
MOGO_MODULE_SERVICE_VERSION=2.0.82
MOGO_MODULE_EXTENSIONS_VERSION=2.0.82
MOGO_MODULE_SEARCH_VERSION=2.0.82
MOGO_MODULE_BACK_VERSION=2.0.82
MOGO_MODULE_V2X_VERSION=2.0.82
# 探路
MOGO_MODULE_TANLU_VERSION=2.0.81
MOGO_MODULE_TANLU_VERSION=2.0.82
# 推送
MOGO_MODULE_PUSH_VERSION=2.0.81
MOGO_MODULE_PUSH_BASE_VERSION=2.0.81
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.81
MOGO_MODULE_PUSH_VERSION=2.0.82
MOGO_MODULE_PUSH_BASE_VERSION=2.0.82
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.82
# 探路上报和分享模块
TANLULIB_VERSION=2.0.81
MOGO_TANLU_API_VERSION=2.0.81
TANLULIB_VERSION=2.0.82
MOGO_TANLU_API_VERSION=2.0.82
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.81
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.81
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.82
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.82
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.0.81
MOGO_MODULE_WIDGETS_VERSION=2.0.82
# obu
MOGO_MODULE_OBU_VERSION=2.0.81
MOGO_MODULE_OBU_MOGO_VERSION=2.0.81
MOGO_MODULE_OBU_VERSION=2.0.82
MOGO_MODULE_OBU_MOGO_VERSION=2.0.82
# monitor
MOGO_MODULE_MONITOR_VERSION=2.0.81
MOGO_MODULE_MONITOR_VERSION=2.0.82
# bugly
CRASHREPORT_VERSION=2.0.81
CRASHREPORT_BUGLY_VERSION=2.0.81
CRASHREPORT_NOOP_VERSION=2.0.81
CRASHREPORT_UPGRADE_VERSION=2.0.81
CRASHREPORT_VERSION=2.0.82
CRASHREPORT_BUGLY_VERSION=2.0.82
CRASHREPORT_NOOP_VERSION=2.0.82
CRASHREPORT_UPGRADE_VERSION=2.0.82
## tts
TTS_BASE_VERSION=2.0.81
TTS_DI_VERSION=2.0.81
TTS_ZHI_VERSION=2.0.81
TTS_PAD_VERSION=2.0.81
TTS_NOOP_VERSION=2.0.81
TTS_BASE_VERSION=2.0.82
TTS_DI_VERSION=2.0.82
TTS_ZHI_VERSION=2.0.82
TTS_PAD_VERSION=2.0.82
TTS_NOOP_VERSION=2.0.82
# 自研地图
MAP_CUSTOM_VERSION=2.0.81
MOGO_MODULE_ADAS_VERSION=2.0.81
MAP_CUSTOM_VERSION=2.0.82
MOGO_MODULE_ADAS_VERSION=2.0.82
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.81
MOGO_BASE_SERVICES_APK_VERSION=2.0.81
MOGO_BASE_SERVICES_SDK_VERSION=2.0.81
MOGO_MODULE_CHAT_VERSION=2.0.81
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.82
MOGO_BASE_SERVICES_APK_VERSION=2.0.82
MOGO_BASE_SERVICES_SDK_VERSION=2.0.82
MOGO_MODULE_CHAT_VERSION=2.0.82
# 车聊聊
MOGO_MODULE_CARCHATTING_VERSION=2.0.81
MOGO_MODULE_CARCHATTING_VERSION=2.0.82
# 车聊聊接口
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.81
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.82
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.0.81
MOGO_SKIN_LIGHT_VERSION=2.0.81
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.81
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.81
SKIN_SUPPORT_VERSION=2.0.81
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.81
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.81
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.81
SKIN_SUPPORT_DESIGN_VERSION=2.0.81
MOGO_SKIN_SUPPORT_VERSION=2.0.82
MOGO_SKIN_LIGHT_VERSION=2.0.82
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.82
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.82
SKIN_SUPPORT_VERSION=2.0.82
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.82
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.82
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.82
SKIN_SUPPORT_DESIGN_VERSION=2.0.82
# OCH
MOGO_OCH_VERSION=2.0.81-test
MOGO_OCH_BUS_VERSION=2.0.81-test
MOGO_OCH_NOOP_VERSION=2.0.81-test
MOGO_OCH_TAXI_VERSION=2.0.81-test
MOGO_OCH_VERSION=2.0.82-test
MOGO_OCH_BUS_VERSION=2.0.82-test
MOGO_OCH_NOOP_VERSION=2.0.82-test
MOGO_OCH_TAXI_VERSION=2.0.82-test
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.81
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.82
################# 旧版本架构模块版本 #################