diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt index 97e45b9ac1..e96b8fb287 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt @@ -17,17 +17,6 @@ class OverMapBottomView @JvmOverloads constructor( private fun initView() { LayoutInflater.from(context).inflate(R.layout.common_overmap_bottom, this, true) - // 定义渐变的方向 - // 定义渐变的方向 - val orientation = GradientDrawable.Orientation.LEFT_RIGHT - val temp01 = GradientDrawable(orientation, intArrayOf( - Color.parseColor("#33D7E5FF"), - Color.parseColor("#E6EFFF"), - Color.parseColor("#E6EFFF"), - Color.parseColor("#E6EFFF"), - Color.parseColor("#33D7E5FF"), - )) - background = temp01 } init { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapDialog.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapDialog.kt new file mode 100644 index 0000000000..280dc1e256 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapDialog.kt @@ -0,0 +1,66 @@ +package com.mogo.och.common.module.wigets.map.overmapview + +import android.content.Context +import android.os.Bundle +import android.view.View +import androidx.lifecycle.LifecycleObserver +import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider +import com.mogo.och.common.module.R +import kotlinx.android.synthetic.main.common_overmap_dialog.aciv_close_map +import kotlinx.android.synthetic.main.common_overmap_dialog.repvErrorPointReason +import me.jessyan.autosize.utils.AutoSizeUtils + +class OverMapDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { + + init { + setContentView(R.layout.common_overmap_dialog) + setCanceledOnTouchOutside(true) + aciv_close_map.onClick { + hideDialog() + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + repvErrorPointReason?.let { + it.onCreateView(savedInstanceState) + val radius = AutoSizeUtils.dp2px(context, 16f) + it.outlineProvider = TextureVideoViewOutlineProvider(radius.toFloat()) + it.clipToOutline = true + } + } + + + override fun onStart() { + super.onStart() + repvErrorPointReason.onResume() + } + + override fun onStop() { + super.onStop() + repvErrorPointReason.onResume() + } + + + + fun showDialog() { + if (isShowing) { + return + } + show() + } + + fun hideDialog() { + if (isShowing) { + dismiss() + } + } + + fun destory(){ + repvErrorPointReason.onDestroy() + } + + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapView.kt new file mode 100644 index 0000000000..5b7ab47175 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapView.kt @@ -0,0 +1,46 @@ +package com.mogo.och.common.module.wigets.map.overmapview + +import android.content.Context +import android.os.Bundle +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.RelativeLayout +import com.mogo.och.common.module.R +import kotlinx.android.synthetic.main.common_overmap_view.view.travelRealityView + +class OverMapView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : RelativeLayout(context, attrs, defStyleAttr){ + + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.common_overmap_view, this, true) + } + + fun onCreateView(savedInstanceState: Bundle?) { + travelRealityView.onCreateView(savedInstanceState) + } + + fun onResume() { + travelRealityView.onResume() + } + + fun onPause() { + travelRealityView.onPause() + } + + fun onDestroy() { + travelRealityView.onDestroy() + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_close_100x100.png b/OCH/common/common/src/main/res/drawable-nodpi/common_close_100x100.png new file mode 100755 index 0000000000..24c435a8fb Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_close_100x100.png differ diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car.png b/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car.png similarity index 100% rename from OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car.png rename to OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png b/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png rename to OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png b/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png rename to OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png b/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png rename to OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png b/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png similarity index 100% rename from OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png rename to OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png b/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png similarity index 100% rename from OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png rename to OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png diff --git a/OCH/common/common/src/main/res/layout/common_overmap_dialog.xml b/OCH/common/common/src/main/res/layout/common_overmap_dialog.xml new file mode 100644 index 0000000000..23a73abea6 --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_overmap_dialog.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/layout/common_overmap_view.xml b/OCH/common/common/src/main/res/layout/common_overmap_view.xml new file mode 100644 index 0000000000..209a82def2 --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_overmap_view.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index 35e75072f4..e0ccf73429 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -27,4 +27,5 @@ #A0B3DA #3B4577 + #232A3F \ No newline at end of file diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index bb72a7c676..acf91553a2 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -38,6 +38,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.listener.IMogoMapListener; import com.mogo.och.common.module.utils.ResourcesUtils; import com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView; +import com.mogo.och.common.module.wigets.map.overmapview.OverMapDialog; import com.mogo.och.taxi.R; @@ -73,6 +74,8 @@ public abstract class BaseTaxiTabFragment