diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java index d092b4fb48..25d15d2e59 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java @@ -20,6 +20,7 @@ import com.mogo.och.bus.passenger.R; import com.mogo.och.bus.passenger.bean.BusPassengerStation; import com.mogo.och.common.module.utils.BlinkAnimationUtil; import com.mogo.och.common.module.wigets.MarqueeTextView; +import com.mogo.och.data.bean.BusStationBean; import java.util.List; @@ -52,9 +53,6 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml index de49ef21bc..df17efbd02 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml @@ -8,7 +8,7 @@ 终 已到站： 前方到站： - 始发站： + 请按秩序下车 - 欢迎乘坐蘑菇车联自动驾驶车。 + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java index 95b13cb89a..3464e4412b 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java @@ -52,9 +52,6 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml index 9d4a5bb7e8..cf8142edc1 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml @@ -8,7 +8,7 @@ 终 已到站： 前方到站： - 始发站： + 请按秩序下车 - 欢迎乘坐蘑菇车联自动驾驶车。 + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index 7bf873fb68..bc3d66fdc5 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -207,7 +207,6 @@ internal object V2NIdentifyDrawer { } catch (t: Throwable) { t.printStackTrace() } - Logger.d(TAG, "--- onAutopilotIdentifyDataUpdate -- : trafficData: ${ trafficData?.joinToString(",") }") val shiGong = trafficData?.filter { it.type == 501 || it.type == 502 } if (shiGong != null && shiGong.isNotEmpty()) { drawShiGong(shiGong) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt index 600873ca23..eafb44af42 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt @@ -78,7 +78,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { fun getBindingCarInfo(macAddress: String, widevineIDWithMd5: String) { CallerLogger.d( "$M_DEVA$TAG", - "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5" + "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType" ) SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress) @@ -169,10 +169,11 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { * 查询app是否需要升级 */ fun queryAppUpgrade() { -// UpgradeAppNetWorkManager.instance -// ?.getAppUpgradeInfo(mContext, mAddress ?: "", role.toString() + "") - - (if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC))?.let { + CallerLogger.d("${SceneConstant.M_BINDING}${TAG}" + "---role.toString() = ${role.toString()} ---mAddress = $mAddress ---spMac = ${SharedPrefsMgr.getInstance(mContext!!) + .getString(SharedPrefsConstants.APP_MAC)}") + (if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!) + .getString(SharedPrefsConstants.APP_MAC))?.let { + CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "---mAddress = $mAddress") UpgradeAppNetWorkManager.instance ?.getAppUpgradeInfo(mContext, it, role.toString() + "") } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt index b39d7745e6..0007077814 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt @@ -140,8 +140,6 @@ class SmallMapView @JvmOverloads constructor( @UiThread fun clearPolyline() { - CallerLogger.d( - SceneConstant.M_MAP + TAG, "SmallMapView clearPolyline mPolyline -----> ") if (mPolyline != null) { mPolyline!!.remove() mPolyline = null @@ -325,8 +323,6 @@ class SmallMapView @JvmOverloads constructor( val tempStatus = autoPilotStatusInfo.pilotmode if (tempStatus != 1) { UiThreadHandler.post { - CallerLogger.d( - SceneConstant.M_MAP + TAG, "onAutopilotStatusResponse tempStatus = $tempStatus ---clearPolyline() ") clearPolyline() } } else if (tempStatus == 1 && autoPilotStatus == 0) { 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 67bb311df4..c47ac7f319 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 @@ -142,12 +142,12 @@ public class AMapWrapper implements IMogoMap { batchMarkerOptions.delayStrategy = false; batchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f; batchMarkerOptions.controlIcon = 1; - batchMarkerOptions.duration = (int) time; + batchMarkerOptions.satelliteTime = time; batchMarkerOptions.deleteRule = 1; MarkerHelper.INSTANCE.updateBatchMarkerPositon(batchMarkerOptions); } - + BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions(); @SuppressLint("NewApi") @Override @@ -169,13 +169,12 @@ public class AMapWrapper implements IMogoMap { return; } long time = markerOptionsArrayList.get(0).getTime(); - BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions(); // 最后一个参数，是否管理锚点的删除 aiBatchMarkerOptions.list = markerOptionsArrayList; aiBatchMarkerOptions.delayStrategy = false; aiBatchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f; aiBatchMarkerOptions.controlIcon = 1; - aiBatchMarkerOptions.duration = (int) time; + aiBatchMarkerOptions.satelliteTime = time; aiBatchMarkerOptions.deleteRule = 0; MarkerHelper.INSTANCE.updateBatchMarkerPositon(aiBatchMarkerOptions); }