diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt new file mode 100644 index 0000000000..5ed383fa6e --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt @@ -0,0 +1,66 @@ +package com.mogo.och.taxi.passenger.ui + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.mogo.commons.mvp.BaseFragment +import com.mogo.eagle.core.function.overview.view.OverMapView + +class OverviewFragment : BaseFragment() { + + private var overmapview:OverMapView?=null + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + if (overmapview == null) { + overmapview = OverMapView(requireContext()) + } else { + val viewGroup = overmapview?.parent as ViewGroup + viewGroup.removeView(overmapview) + } + overmapview?.onCreateView(savedInstanceState) + return overmapview!! + } + + override fun onResume() { + super.onResume() + overmapview?.onResume() + } + + override fun onPause() { + super.onPause() + overmapview?.onPause() + } + + override fun onDestroy() { + super.onDestroy() + overmapview?.onDestroy() + } + + override fun getLayoutId(): Int { + return 0 + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + + } + + companion object{ + private const val TAG = "OverviewFragment" + @JvmStatic + fun newInstance(): OverviewFragment { + val args = Bundle() + val fragment = OverviewFragment() + fragment.arguments = args + return fragment + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index f30fa8d8c3..9ac0743124 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -61,6 +61,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment mArrivedCheckView; private WeakReference mStartAutopilotView; protected TaxiPassengerServingOrderFragment ochServingOrderFragment = null; + + protected OverviewFragment overviewFragment = null; //消息盒子 private PassengerMsgBoxButtonView viewPassengerMsgBoxButton; private PassengerMsgBoxBubbleView viewPassengerMsgBoxBubble; @@ -149,6 +151,12 @@ public class TaxiPassengerBaseFragment extends MvpFragment { + OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity(),0,true,-1,true); + //showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728"); + //showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480"); + //OCHFloatWindowManager.getInstance().ShowFloatWindow(getContext()); + }); } private void initArrivedView() { @@ -258,10 +266,12 @@ public class TaxiPassengerBaseFragment extends MvpFragment + android:layout_height="match_parent"> @@ -21,7 +20,7 @@ android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" android:layout_gravity="center_horizontal" android:layout_marginLeft="40dp" - android:layout_marginTop="48dp" + android:layout_marginTop="@dimen/dp_120" android:scaleType="fitXY" android:src="@drawable/taxi_p_un_auto_nor" android:visibility="gone" @@ -96,6 +95,7 @@ android:id="@+id/btnAutopilotDisable" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_72" android:text="模拟 不可自动驾驶" android:textSize="20sp" android:visibility="gone" @@ -154,7 +154,7 @@ android:id="@+id/module_mogo_och_navi_panel_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_120" + android:layout_marginTop="@dimen/dp_192" android:layout_marginRight="@dimen/dp_10" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -163,10 +163,15 @@ android:id="@+id/traffic_light_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/taxi_p_traffic_light_layout_margin_top" + android:layout_marginTop="@dimen/dp_95" android:layout_marginRight="@dimen/taxi_p_traffic_light_layout_margin_right" android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ed485f3a03..86e6613133 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,10 +20,10 @@ tools:replace="android:label"> + android:value="2560"/> + android:value="1600"/>