From 625f246bc9c91670e4e4a1395ccba6dd086eb863 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 28 Sep 2022 15:38:27 +0800
Subject: [PATCH] =?UTF-8?q?[2110]=20=E5=9C=B0=E5=9B=BE=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92=E7=AD=89=E5=BE=85=E9=AB=98=E7=B2=BE=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/module/biz/model/OchCommonLoginModel.kt   |  5 +++--
 gradle.properties                                    |  2 +-
 .../src/main/java/com/mogo/map/AMapWrapper.java      | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
index b9874084bc..d945f03a1f 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
@@ -16,6 +16,7 @@ import com.mogo.och.common.module.biz.constant.TaxiLoginStatusEnum
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.biz.network.OchCommonServiceManager
+import com.mogo.och.common.module.utils.ToastUtilsOch
 
 /**
  * Created by pangfan on 2021/8/19
@@ -93,7 +94,7 @@ object OchCommonLoginModel{
                 }
 
                 override fun onFail(code: Int, msg: String) {
-                    ToastUtils.showShort("$code,$msg")
+                    ToastUtilsOch.showWithCodeMessage(code,msg)
                 }
             })
     }
@@ -127,7 +128,7 @@ object OchCommonLoginModel{
                 }
 
                 override fun onFail(code: Int, msg: String) {
-                    ToastUtils.showShort("$code,$msg")
+                    ToastUtilsOch.showWithCodeMessage(code,msg)
                 }
             })
     }
diff --git a/gradle.properties b/gradle.properties
index b703926da5..d8d7879729 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.26
 MOGO_TELEMATIC_VERSION=1.4.3.26
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.6.0.3
+MAP_SDK_VERSION=2.5.1.9
 MAP_SDK_OPERATION_VERSION=1.1.2.4
 # websocket
 WEBSOCKET_VERSION=1.1.7
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
index 734b2f0474..62b68b7e55 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
@@ -337,12 +337,12 @@ public class AMapWrapper implements IMogoMap {
 
     @Override
     public RoadNameInfo getRoadName(double lon, double lat, float angle) {
-        com.zhidaoauto.map.sdk.open.road.RoadNameInfo info = MapDataApi.INSTANCE.getRoadName(lon, lat, angle);
-        RoadNameInfo ret = null;
-        if (info != null) {
-            ret = new RoadNameInfo(info.tile_id, info.road_id, info.road_name);
-        }
-        return ret;
+//        com.zhidaoauto.map.sdk.open.road.RoadNameInfo info = MapDataApi.INSTANCE.getRoadName(lon, lat, angle);
+//        RoadNameInfo ret = null;
+//        if (info != null) {
+//            ret = new RoadNameInfo(info.tile_id, info.road_id, info.road_name);
+//        }
+        return null;
     }
 
     private List<Pair<Double, Double>> convert(List<LonLatPoint> points) {