diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/ItemViewTouchListener.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/ItemViewTouchListener.kt index 1aa1e9afa3..f9cd1a55b8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/ItemViewTouchListener.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/ItemViewTouchListener.kt @@ -3,6 +3,8 @@ package com.mogo.och.taxi.passenger.ui.leftmenu import android.annotation.SuppressLint import android.view.MotionEvent import android.view.View +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant class ItemViewTouchListener : View.OnTouchListener { @@ -10,25 +12,34 @@ class ItemViewTouchListener : private var dragTime = 0L @SuppressLint("ClickableViewAccessibility") override fun onTouch(view: View, motionEvent: MotionEvent): Boolean { - when (motionEvent.action) { - MotionEvent.ACTION_DOWN -> { - LeftMenuOpen.dragAndOpen(motionEvent.rawX.toInt(),motionEvent.action) - dragTime = System.currentTimeMillis() - } - MotionEvent.ACTION_MOVE -> { - if (LeftMenuOpen.dragAndOpen(motionEvent.rawX.toInt(),motionEvent.action)) { - return false + try { + when (motionEvent.action) { + MotionEvent.ACTION_DOWN -> { + LeftMenuOpen.dragAndOpen(motionEvent.rawX.toInt(),motionEvent.action) + dragTime = System.currentTimeMillis() } - } - MotionEvent.ACTION_UP -> { - LeftMenuOpen.dragAndOpen(motionEvent.rawX.toInt(),motionEvent.action) - if (System.currentTimeMillis() - dragTime > 500) { - dragTime = 0 - return true + MotionEvent.ACTION_MOVE -> { + if (LeftMenuOpen.dragAndOpen(motionEvent.rawX.toInt(),motionEvent.action)) { + return false + } } + MotionEvent.ACTION_UP -> { + LeftMenuOpen.dragAndOpen(motionEvent.rawX.toInt(),motionEvent.action) + if (System.currentTimeMillis() - dragTime > 500) { + dragTime = 0 + return true + } + } + else -> {} } - else -> {} + } catch (e: Exception) { + CallerLogger.e(SceneConstant.M_TAXI_P + TAG, e.message) + e.printStackTrace() } return false } + + companion object { + const val TAG = "ItemViewTouchListener" + } } \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index 6ce0c58654..95aef7ecdb 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -9,10 +9,13 @@ import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; +import android.view.Display; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.Window; +import android.view.WindowManager; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.GridView; @@ -109,11 +112,22 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi setCancelable(false); setCanceledOnTouchOutside(false); + initWindowView(); + } + + private void initWindowView() { Window window = getWindow(); //dialog padding 去掉 window.getDecorView().setPadding(0,0,0,0); window.setDimAmount(0.5f); window.getDecorView().setBackgroundColor(Color.parseColor("#00FFFFFF"));//设置背景， 不然显示不全 + + WindowManager.LayoutParams params = window.getAttributes(); + window.setGravity(Gravity.CENTER); + WindowManager m = window.getWindowManager(); + Display d = m.getDefaultDisplay(); + params.height = d.getHeight() - 500; + window.setAttributes(params); } @RequiresApi(api = Build.VERSION_CODES.M) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt index c533b958d7..2dbaf16312 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt @@ -177,6 +177,7 @@ class DriverMsgBoxListView @JvmOverloads constructor( } MsgCategory.RECORD_BAG -> { badCaseList?.add(0,msgBoxList) + badCaseList?.let { driverMsgBoxListAdapter?.setData(it) } } } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java index a6c8f73d09..e6d7bb9401 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java @@ -268,9 +268,9 @@ public class AMapCustomView if (center != null) { center.getLon(); MarkerOptions markerOption = new MarkerOptions(); - LatLng latLng = new LatLng(center.getLat(), - center.getLon()); + LatLng latLng = MarkerDrawerManager.INSTANCE.coordinateConverterWgsToGcj(mContext, center.getLat(), center.getLon()); markerOption.position(latLng); + markerOption.anchor(0.13f, 1f); markerOption.icon(BitmapDescriptorFactory.fromBitmap(getV2XBitmap())); markerOptionsList.add(markerOption); } @@ -282,15 +282,6 @@ public class AMapCustomView public void drawV2XMarkers(ArrayList markerOptionsList) { currMarkerList = mAMap.addMarkers(markerOptionsList, false); - mAMap.setOnMarkerClickListener(marker -> { - List infList = posInfMap.get(marker.getPosition()); - // 如果是摄像头 - if (infList != null) { - CallerHmiManager.INSTANCE.showVideoDialog(infList); - return true; - } - return false; - }); } private Bitmap getV2XBitmap() { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt index 0ab43a4063..9ce14cf8ba 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt @@ -161,4 +161,19 @@ object MarkerDrawerManager { mCoordinateConverter.coord(LatLng(mogoLatLng.latitude, mogoLatLng.longitude)) return mCoordinateConverter.convert() } + + /** + * wgs84转高德坐标系 + */ + fun coordinateConverterWgsToGcj( + mContext: Context, + lat: Double, + lon: Double + ): LatLng { + val mCoordinateConverter = + CoordinateConverter(mContext) + mCoordinateConverter.from(CoordinateConverter.CoordType.GPS) + mCoordinateConverter.coord(LatLng(lat, lon)) + return mCoordinateConverter.convert() + } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt index e8c3611806..c01e0b89d7 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt @@ -335,7 +335,7 @@ object CallerVisualAngleManager { } else { Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 5 ---") defaultDelayJob?.safeCancel() - if (displayed == null || displayed.target.priority < target.priority) { + if (displayed == null || displayed.target.priority <= target.priority) { Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 6 ---") displayed?.also { queue -= it