diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt
index 29fb9842f2..c830999cca 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt
+++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt
@@ -202,17 +202,17 @@ class PM2ADASPresenter(view: PM2HPMapFragment?) :
mView?.showHDMap_mind()
return@runInMainThread
}else{
- if(havePredictionInfos&&haveTrajectoryInfos){
- updateMapFlag(true)
- // 展示高精地图+展示预测和决策
- mView?.showHDMap_aip_prediction()
- return@runInMainThread
- }else{
+// if(havePredictionInfos&&haveTrajectoryInfos){
+// updateMapFlag(true)
+// // 展示高精地图+展示预测和决策
+// mView?.showHDMap_aip_prediction()
+// return@runInMainThread
+// }else{
updateMapFlag(false)
// 展示高精地图
mView?.showHDMap()
return@runInMainThread
- }
+// }
}
}
@@ -231,12 +231,12 @@ class PM2ADASPresenter(view: PM2HPMapFragment?) :
}
private fun updateMapFlag(open: Boolean) {
- if (open) {
- FunctionBuildConfig.isDrawDecIdentifyData = true
- FunctionBuildConfig.isDrawPreIdentifyData = true
- } else {
- FunctionBuildConfig.isDrawDecIdentifyData = false
- FunctionBuildConfig.isDrawPreIdentifyData = false
- }
+// if (open) {
+// FunctionBuildConfig.isDrawDecIdentifyData = true
+// FunctionBuildConfig.isDrawPreIdentifyData = true
+// } else {
+// FunctionBuildConfig.isDrawDecIdentifyData = false
+// FunctionBuildConfig.isDrawPreIdentifyData = false
+// }
}
}
\ No newline at end of file
diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/map/PM2HPMapFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/map/PM2HPMapFragment.kt
index 11e16c3dd7..c893a45a11 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/map/PM2HPMapFragment.kt
+++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/map/PM2HPMapFragment.kt
@@ -20,8 +20,6 @@ import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.TYPE_MA
import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2ADASPresenter
import com.mogo.och.common.module.utils.OCHThreadPoolManager
import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.aciv_top_shader
-import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.cl_aip_contain
-import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.cl_prediction_contain
import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mHomeView
import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mindView
import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.overMapView
@@ -80,33 +78,39 @@ class PM2HPMapFragment :
it.clipToOutline = true
it.hideResetView()
}
+// cl_prediction_contain.onCreate(savedInstanceState)
}
override fun onResume() {
super.onResume()
mHomeView.onResume()
overMapView?.onResume()
+// cl_prediction_contain.onResume()
}
override fun onLowMemory() {
super.onLowMemory()
mHomeView.onLowMemory()
+// cl_prediction_contain.onLowMemory()
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
mHomeView.onSaveInstanceState(outState)
+// cl_prediction_contain.onSaveInstanceState(outState)
}
override fun onPause() {
super.onPause()
mHomeView.onPause()
overMapView?.onPause()
+// cl_prediction_contain.onPause()
}
override fun onDestroyView() {
mHomeView.onDestroy()
overMapView?.onDestroy()
+// cl_prediction_contain.onDestroy()
super.onDestroyView()
}
@@ -220,8 +224,8 @@ class PM2HPMapFragment :
aciv_top_shader.visibility = View.GONE
- cl_aip_contain.visibility = View.GONE
- cl_prediction_contain.visibility = View.GONE
+// cl_aip_contain.visibility = View.GONE
+// cl_prediction_contain.visibility = View.GONE
mindView.visibility = View.GONE
overMapView.visibility = View.GONE
@@ -231,8 +235,8 @@ class PM2HPMapFragment :
mHomeView.visibility = View.GONE
aciv_top_shader.visibility = View.GONE
- cl_aip_contain.visibility = View.GONE
- cl_prediction_contain.visibility = View.GONE
+// cl_aip_contain.visibility = View.GONE
+// cl_prediction_contain.visibility = View.GONE
mindView.visibility = View.GONE
overMapView.visibility = View.VISIBLE
@@ -250,8 +254,8 @@ class PM2HPMapFragment :
aciv_top_shader.visibility = View.VISIBLE
- cl_aip_contain.visibility = View.GONE
- cl_prediction_contain.visibility = View.GONE
+// cl_aip_contain.visibility = View.GONE
+// cl_prediction_contain.visibility = View.GONE
mindView.visibility = View.VISIBLE
overMapView.visibility = View.GONE
@@ -265,8 +269,8 @@ class PM2HPMapFragment :
aciv_top_shader.visibility = View.VISIBLE
- cl_aip_contain.visibility = View.VISIBLE
- cl_prediction_contain.visibility = View.VISIBLE
+// cl_aip_contain.visibility = View.VISIBLE
+// cl_prediction_contain.visibility = View.VISIBLE
mindView.visibility = View.GONE
overMapView.visibility = View.GONE
@@ -277,8 +281,8 @@ class PM2HPMapFragment :
aciv_top_shader.visibility = View.VISIBLE
- cl_aip_contain.visibility = View.GONE
- cl_prediction_contain.visibility = View.GONE
+// cl_aip_contain.visibility = View.GONE
+// cl_prediction_contain.visibility = View.GONE
mindView.visibility = View.VISIBLE
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml
index 26ddd954ef..40b124faaf 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml
@@ -51,30 +51,30 @@
android:layout_width="@dimen/dp_430"
android:layout_height="@dimen/dp_650"/>
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
= 1000) {
lostFrame(internal.toString())
identify.clearOldMarker()
- preIdentify.clearOldMarker()
}
sendEmptyMessageDelayed(MSG_CHECK, 1000L)
}
MSG_DATA_TRACK -> {
if (msg.obj is List<*>) {
- val objectList = msg.obj as List?
- val mapInstanceList = ArrayList()
- mapInstanceList.add(MogoMap.DEFAULT)
- if (FunctionBuildConfig.isDrawPreIdentifyData) {
- mapInstanceList.add(MogoMap.SMALL_PRED_MAP)
- }
- identify.renderAdasRegResults(objectList, mapInstanceList)
+ identify.renderAdasRecognizedResult(msg.obj as List?)
startTime = System.nanoTime()
}
}
@@ -112,9 +88,6 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf
}
}
- MSG_DATA_PRE_TRACK -> {
- }
-
MSG_DATA_WARNING -> {
if (msg.obj is List<*>) {
identify.renderPlanningWarningObj(msg.obj as List?)
@@ -134,19 +107,12 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf
}
MSG_DATA_CLEAR -> {
- val mapInstanceList = ArrayList()
- mapInstanceList.add(MogoMap.DEFAULT)
- mapInstanceList.add(MogoMap.SMALL_PRED_MAP)
- identify.clearOldMarkers(mapInstanceList)
+ identify.clearOldMarker()
}
MSG_DATA_AI_CLEAR -> {
aiCloudIdentify!!.clearAiMarker(msg.data.getString("mapInstance")!!)
}
-
- MSG_DATA_PRE_CLEAR -> {
- preIdentify.clearPredictionMarker(MogoMap.SMALL_PRED_MAP)
- }
}
}
}
@@ -158,13 +124,6 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf
mDrawerHandler.sendMessage(message)
}
- override fun renderPredictionResult(predictionObjectList: List?) {
- val message = Message.obtain()
- message.what = MSG_DATA_PRE_TRACK
- message.obj = predictionObjectList
- mDrawerHandler.sendMessage(message)
- }
-
override fun renderAiCloudResult(
resultList: List,
mapInstance: String
@@ -196,12 +155,6 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf
mDrawerHandler.sendMessage(message)
}
- override fun clearPredictionMarker(mapInstance: String) {
- val message = Message.obtain()
- message.what = MSG_DATA_PRE_CLEAR
- mDrawerHandler.sendMessage(message)
- }
-
override fun updateTrackerWarningInfo(trafficData: TrafficData) {
super.updateTrackerWarningInfo(trafficData)
val message = Message.obtain()
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt
index cb0ceae443..c9ab295958 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CoordinateAnimationView.kt
@@ -113,13 +113,6 @@ class CoordinateAnimationView @JvmOverloads constructor(
AutoSizeUtils.dp2px(context, 128f),
AutoSizeUtils.dp2px(context, 280f)
)
- if (index == 1) {
- storeWidthsAndHeights()
- }
-// circlePaint = Paint()
-// circlePaint!!.color = Color.RED
-// circlePaint!!.style = Paint.Style.STROKE
-// circlePaint!!.isAntiAlias = true
curvePaint!!.setARGB(102, 48, 163, 255)
// curvePaint!!.shader = LinearGradient(
@@ -162,10 +155,6 @@ class CoordinateAnimationView @JvmOverloads constructor(
setLayerType(LAYER_TYPE_HARDWARE, null)
}
- private fun storeWidthsAndHeights() {
- // TODO:("此时获得的宽高为0")
- }
-
private fun getOriginBitmap(resId: Int, desWidth: Int, desHeight: Int): Bitmap {
val bitmap = BitmapFactory.decodeResource(resources, resId)
val scaleWidth = (bitmap.width * 2)
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt
index 41cfa3db5f..62c1a7a069 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/PredictionLayout.kt
@@ -6,7 +6,6 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.function.map.R
-import kotlinx.android.synthetic.main.layout_prediction_container.view.preDetailView
class PredictionLayout @JvmOverloads constructor(
context: Context,
@@ -14,6 +13,7 @@ class PredictionLayout @JvmOverloads constructor(
) : ConstraintLayout(context, attrs) {
private var carType = 0
+ private var preDetailView: PredictionMapView? = null
init {
initView(attrs)
@@ -24,32 +24,38 @@ class PredictionLayout @JvmOverloads constructor(
carType = typedArray.getInt(R.styleable.CarMapLayout_car_type, 0)
typedArray.recycle()
when (carType) {
- 0 -> LayoutInflater.from(context).inflate(R.layout.layout_prediction_container, this, true)
- else -> LayoutInflater.from(context).inflate(R.layout.layout_b2_prediction_container, this, true)
+ 0 -> {
+ LayoutInflater.from(context).inflate(R.layout.layout_prediction_container, this, true)
+ preDetailView = findViewById(R.id.preDetailView)
+ }
+ else -> {
+ LayoutInflater.from(context).inflate(R.layout.layout_b2_prediction_container, this, true)
+ preDetailView = findViewById(R.id.preDetailView)
+ }
}
}
fun onCreate(savedInstanceState: Bundle?) {
- preDetailView.onCreate(savedInstanceState)
+ preDetailView?.onCreate(savedInstanceState)
}
fun onSaveInstanceState(outState: Bundle) {
- preDetailView.onSaveInstanceState(outState)
+ preDetailView?.onSaveInstanceState(outState)
}
fun onResume() {
- preDetailView.onResume()
+ preDetailView?.onResume()
}
fun onLowMemory() {
- preDetailView.onLowMemory()
+ preDetailView?.onLowMemory()
}
fun onPause() {
- preDetailView.onPause()
+ preDetailView?.onPause()
}
fun onDestroy() {
- preDetailView.onDestroy()
+ preDetailView?.onDestroy()
}
}
\ No newline at end of file