diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index 37d89fbac1..16ff649e03 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -25,6 +25,7 @@ import com.amap.api.navi.model.NaviLatLng; import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; +import com.mogo.och.common.module.utils.DateTimeUtil; import com.mogo.och.common.module.utils.PermissionUtil; import com.mogo.och.common.module.wigets.toast.ToastCharterUtils; @@ -195,6 +196,11 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { @Override public void onLocationChange(AMapNaviLocation location) { //当前位置回调 +// CallerLogger.i( TAG, "AMapNaviLocation = NaviLatLng = "+ +// location.getCoord().getLatitude()+ ", "+ location.getCoord().getLongitude() +// + ", bearing = " +location.getBearing() +// +", time = " + DateTimeUtil.formatLongToString(location.getTime(),DateTimeUtil.HH_mm) +// + ", locationType = "+ location.getLocationType()); } @Override diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt index 0a34893090..3067e5ee9b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt @@ -162,10 +162,6 @@ class CommonAmapNaviVIew @JvmOverloads constructor( override fun onNaviViewLoaded() { d(SceneConstant.M_TAXI + TAG, "导航页面加载成功") - d( - SceneConstant.M_TAXI + TAG, - "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑" - ) } override fun onMapTypeChanged(p0: Int) { @@ -191,58 +187,4 @@ class CommonAmapNaviVIew @JvmOverloads constructor( fun onDestroy(){ amapNaviView.onDestroy() } - -// var array = arrayOf( -// "直行车道", -// "左转车道", -// "左转或直行车道", -// "右转车道", -// "右转或直行车道", -// "左掉头车道", -// "左转或者右转车道", -// " 左转或右转或直行车道", -// "右转掉头车道", -// "直行或左转掉头车道", -// "直行或右转掉头车道", -// "左转或左掉头车道", -// "右转或右掉头车道", -// "直行并且车道扩展", -// "左转+左掉头+扩展", -// "不可以选择该车道", -// "直行+左转+左掉头车道", -// "右转+左掉头", -// "左转+右转+左掉头", -// "直行+右转+左掉头", -// "左转+右掉头", -// "公交车道", -// "空车道", -// "可变车道" -// ) - -// var actions = arrayOf( -// "直行", -// "左转", -// "左转或直行", -// "右转", -// "右转或这行", -// "左掉头", -// "左转或者右转", -// " 左转或右转或直行", -// "右转掉头", -// "直行或左转掉头", -// "直行或右转掉头", -// "左转或左掉头", -// "右转或右掉头", -// "直行并且车道扩展", -// "左转+左掉头+扩展", -// "不可以选择", -// "直行+左转+左掉头", -// "右转+左掉头", -// "左转+右转+左掉头", -// "直行+右转+左掉头", -// "左转+右掉头", -// "公交车道", -// "空车道", -// "可变车道" -// ) } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt index 7483bb67cc..d3768cf887 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt @@ -14,8 +14,7 @@ import kotlinx.android.synthetic.main.taxi_amap_navi_view.navi_view * @author: wangmingjun * @date: 2023/7/24 */ -class TaxiAmapNaviFragment : BaseFragment(), - AMapNaviViewListener { +class TaxiAmapNaviFragment : BaseFragment(){ companion object { fun newInstance(): TaxiAmapNaviFragment { val args = Bundle() @@ -25,7 +24,6 @@ class TaxiAmapNaviFragment : BaseFragment(), } } - private var mNaviToStartInfoCallback: ICommonNaviChangedCallback? = null override fun getLayoutId(): Int { return R.layout.taxi_amap_navi_view } @@ -58,130 +56,5 @@ class TaxiAmapNaviFragment : BaseFragment(), if (navi_view != null) { navi_view.onDestroy() } - if (mNaviToStartInfoCallback != null) { - mNaviToStartInfoCallback = null - } } - - override fun onNaviSetting() { - //底部导航设置点击回调 - } - - override fun onNaviCancel() {} - override fun onNaviMapMode(naviMode: Int) { - //导航态车头模式，0:车头朝上状态；1:正北朝上模式。 - } - - override fun onNaviTurnClick() { - //转弯view的点击回调 - } - - override fun onNextRoadClick() { - //下一个道路View点击回调 - } - - override fun onScanViewButtonClick() { - //全览按钮点击回调 - } - - override fun onLockMap(isLock: Boolean) { - //锁地图状态发生变化时回调 - } - - override fun onNaviViewLoaded() { - d(SceneConstant.M_TAXI + "wlx", "导航页面加载成功") - d( - SceneConstant.M_TAXI + "wlx", - "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑" - ) - } - - override fun onMapTypeChanged(i: Int) {} - override fun onNaviViewShowMode(i: Int) {} - override fun onNaviBackClick(): Boolean { - return false - } - - /** - * 车道信息说明： - * - * - * 0xFF, 无对应车道 - * 0, 直行 - * 1, 左转 - * 2, 直行+左转 - * 3, 右转 - * 4, 直行+右转 - * 5, 左掉头 - * 6, 左转+右转 - * 7, 直行+左转+右转 - * 8, 右掉头 - * 9, 直行+左掉头 - * 10, 直行+右掉头 - * 11, 左转+左掉头 - * 12, 右转+右掉头 - * 13, 直行+扩展 - * 14, 左转+左掉头+扩展 - * 15, 保留 - * 16, 直行+左转+左掉头 - * 17, 右转+左掉头 - * 18, 左转+右转+左掉头 - * 19, 直行+右转+左掉头 - * 20, 左转+右掉头 - * 21, 公交车道 - * 22, 空车道 - * 23 可变车道 - */ - var array = arrayOf( - "直行车道", - "左转车道", - "左转或直行车道", - "右转车道", - "右转或直行车道", - "左掉头车道", - "左转或者右转车道", - " 左转或右转或直行车道", - "右转掉头车道", - "直行或左转掉头车道", - "直行或右转掉头车道", - "左转或左掉头车道", - "右转或右掉头车道", - "直行并且车道扩展", - "左转+左掉头+扩展", - "不可以选择该车道", - "直行+左转+左掉头车道", - "右转+左掉头", - "左转+右转+左掉头", - "直行+右转+左掉头", - "左转+右掉头", - "公交车道", - "空车道", - "可变车道" - ) - var actions = arrayOf( - "直行", - "左转", - "左转或直行", - "右转", - "右转或这行", - "左掉头", - "左转或者右转", - " 左转或右转或直行", - "右转掉头", - "直行或左转掉头", - "直行或右转掉头", - "左转或左掉头", - "右转或右掉头", - "直行并且车道扩展", - "左转+左掉头+扩展", - "不可以选择", - "直行+左转+左掉头", - "右转+左掉头", - "左转+右转+左掉头", - "直行+右转+左掉头", - "左转+右掉头", - "公交车道", - "空车道", - "可变车道" - ) } diff --git a/gradle.properties b/gradle.properties index d122d31f49..6101bac0ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.17 MOGO_TELEMATIC_VERSION=1.4.7.17 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.2.0.15 +MAP_SDK_VERSION=3.2.0.17 MAP_SDK_DATA_VERSION=1.0.0.3 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket