diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0fb00b335a..118c2006ee 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -21,10 +21,8 @@
-
-
@@ -38,12 +36,14 @@
+
+
@@ -51,6 +51,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c62e9cf758..5a82268997 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,7 +11,34 @@
-
+
\ No newline at end of file
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
index da13f0e807..e26fb1055e 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
@@ -80,25 +80,6 @@ public class AppUtils {
}
}
- private static final String MOGO_MAP_SDK_VERSION = "MAP_SDK_VERSION";
-
- public static String getCustomMapSDKVersion(Context context){
- return getApplicationMetaValue(context,MOGO_MAP_SDK_VERSION);
- }
-
- private static String getApplicationMetaValue(Context context,String metaName){
- try {
- ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(),PackageManager.GET_META_DATA);
- Bundle bundle = applicationInfo.metaData;
- if (bundle != null){
- return bundle.getString(metaName);
- }
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- }
- return "";
- }
-
public static boolean isAppForeground( Context context ) {
if ( context != null ) {
ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE );
diff --git a/gradle.properties b/gradle.properties
index b05b2d616a..226ed7e26c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -158,21 +158,21 @@ LOGLIB_VERSION = 1.0.4
######## MogoAiCloudSDK Version
# 网络请求
-MOGO_NETWORK_VERSION=1.1.34
+MOGO_NETWORK_VERSION=1.1.36
# 鉴权
-MOGO_PASSPORT_VERSION=1.1.34
+MOGO_PASSPORT_VERSION=1.1.36
# 常链接
-MOGO_SOCKET_VERSION=1.1.34
+MOGO_SOCKET_VERSION=1.1.36
# 数据采集
-MOGO_REALTIME_VERSION=1.1.34
+MOGO_REALTIME_VERSION=1.1.36
# 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.1.34
+MOGO_TANLU_VERSION=1.1.36
# 直播推流
-MOGO_LIVE_VERSION=1.1.34
+MOGO_LIVE_VERSION=1.1.36
# 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.1.34
+MOGO_TRAFFICLIVE_VERSION=1.1.36
# 定位服务
-MOGO_LOCATION_VERSION=1.1.34
+MOGO_LOCATION_VERSION=1.1.36
######## Foundation MogoAiCloud Module
# mogoAiCloud apk services
diff --git a/modules/mogo-module-common/src/main/res/raw/daba.n3d b/modules/mogo-module-common/src/main/res/raw/daba.n3d
deleted file mode 100644
index 58dc21fbc1..0000000000
Binary files a/modules/mogo-module-common/src/main/res/raw/daba.n3d and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/raw/tache.n3d b/modules/mogo-module-common/src/main/res/raw/tache.n3d
deleted file mode 100644
index 166f262aa6..0000000000
Binary files a/modules/mogo-module-common/src/main/res/raw/tache.n3d and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/raw/tachexiaoche.n3d b/modules/mogo-module-common/src/main/res/raw/tachexiaoche.n3d
deleted file mode 100644
index 69b521719f..0000000000
Binary files a/modules/mogo-module-common/src/main/res/raw/tachexiaoche.n3d and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/raw/zixingche.n3d b/modules/mogo-module-common/src/main/res/raw/zixingche.n3d
deleted file mode 100644
index afee072bf7..0000000000
Binary files a/modules/mogo-module-common/src/main/res/raw/zixingche.n3d and /dev/null differ
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index af8775eb45..9a0c29cecb 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -49,6 +49,7 @@ import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode;
import com.zhidao.adasconfig.common.config.EnumCarHeading;
import com.zhidao.adasconfig.common.config.EnumSkinStyle;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel;
+import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarRectModel;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import com.zhidao.support.adas.high.bean.AutopilotStatus;
import com.zhidao.support.adas.high.bean.RectInfo;
@@ -403,9 +404,9 @@ public class MogoADASController implements IMogoADASController {
public void notifyAutopilotState(AutopilotStatus autopilotStatus) {
Logger.d(TAG, "notifyAutopilotState: " + autopilotStatus);
DebugConfig.setAutoPilotStatus(autopilotStatus.getValues().getState() + "");
- if (mAdasOCHCallback != null) {
+ if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
- cb.onStateChanged(autopilotStateModel.getState(), autopilotStateModel.getReason());
+ cb.onStateChanged(autopilotStatus.getValues().getState(), autopilotStatus.getValues().getReason());
}
}
}