diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
index 47b41207e9..f4f2a8558c 100644
--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -5,14 +5,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72">
-
+
-
+
-
+
-
+
-
+
-
+
+
-
+
-
+
+
+
-
+
-
+
trajectoryList.size) {
minIndex = 0
}
@@ -331,12 +337,13 @@ class BusPassengerPresenter(view: MainFragment?) :
}
- fun drawStationInfo(sites: List) {
+ fun drawStationInfo(sites: List): List{
val stationsList: MutableList = mutableListOf()
val stationsNameList: MutableList = mutableListOf()
val stationIcon =
BitmapFactory.decodeResource(context.resources, R.drawable.charter_p_map_staton_icon)
var checkMarkView: SiteMarkerBean? = null
+ val includePoint = mutableListOf()
sites.forEach {
stationsList.add(
SiteMarkerBean(
@@ -346,6 +353,7 @@ class BusPassengerPresenter(view: MainFragment?) :
1f
)
)
+ includePoint.add(LatLng(it.GcjLat,it.GcjLon))
val bitmap = getBitmap(it.siteId!!, it.siteName ?: "", it.isCheck)
val siteMarkerBean = SiteMarkerBean(
LatLng(it.GcjLat, it.GcjLon),
@@ -365,6 +373,7 @@ class BusPassengerPresenter(view: MainFragment?) :
stationsNameList.add(checkMarkView!!)
}
mView?.drawOverMapViewStation(stationsList, stationsNameList)
+ return includePoint
}
private fun getBitmap(siteId: Long, siteName: String, isCheck: Boolean): Bitmap {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
index 59f1c998f1..07f7e1bb5c 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
@@ -29,6 +29,7 @@ import com.mogo.och.charter.passenger.ui.bottom.BottomBar
import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
import com.mogo.och.charter.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment
+import com.mogo.och.charter.passenger.ui.lockview.LockManager
import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView
import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
import com.mogo.och.common.module.biz.constant.LoginStatusManager
@@ -283,6 +284,10 @@ class MainFragment : MvpFragment(), IMogo
)
}
+ fun showOvermapPoint(){
+ omvOverMap.setDebugMode(true)
+ }
+
fun showNoviceGuidanceFragment() {
if (noviceGuidanceFragment?.get() == null) {
noviceGuidanceFragment = WeakReference(NoviceGuidanceFragment.newInstance())
@@ -293,6 +298,7 @@ class MainFragment : MvpFragment(), IMogo
parentFragmentManager,
noviceGuidanceFragmentWeak
)
+ LockManager.setLock(LockManager.LockStatus.UNLOCK)
}
fun closeOpenAndCloseDoor() {
@@ -335,6 +341,9 @@ class MainFragment : MvpFragment(), IMogo
fun drawOverMapViewTrajectory(coordinates: List) {
omvOverMap?.drawSitePolyline(coordinates, lineTrajectory)
+ }
+
+ fun includePoint(coordinates: List){
omvOverMap?.includeSitePointsAndUpdateCamera(coordinates)
}
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
index 6b74d9e613..7d9088f5ed 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
@@ -103,6 +103,9 @@ open class BottomOrderInfoView @JvmOverloads constructor(
actv_order_end_time.text =
AbsMogoApplication.getApp().getString(R.string.charter_p_bottom_reach_time)
leftTime = -1
+ if(viewState!=ViewState.NormalWithOutOrder){
+ viewState = ViewState.NormalWithOutOrder
+ }
notifiBackageView()
}
@@ -120,6 +123,23 @@ open class BottomOrderInfoView @JvmOverloads constructor(
val arriveTime = DateTimeUtil.second2Time(timeInSecond)
actv_order_end_time.text = arriveTime
leftTime = timeInSecond
+ when (leftTime) {
+ in 1..300 -> {
+ if(viewState!=ViewState.Near300){
+ viewState = ViewState.Near300
+ }
+ }
+ in 301..899 -> {
+ if(viewState!=ViewState.Near900){
+ viewState = ViewState.Near900
+ }
+ }
+ else -> {
+ if(viewState!=ViewState.Normal){
+ viewState = ViewState.Normal
+ }
+ }
+ }
notifiBackageView()
}
setViewByOrderStatus(CharterPassengerModel.getCurrentOrderStatus())
@@ -130,57 +150,43 @@ open class BottomOrderInfoView @JvmOverloads constructor(
if (isCheck) {
backageView?.visibility = View.VISIBLE
actv_order_null.setTextColor(context.getColor(android.R.color.white))
- actv_order_end_time_title.setTextColor(context.getColor(android.R.color.white))
- if(leftTime<900){
- actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_ff6d2c))
- if(viewState!=ViewState.Near900){
- viewState = ViewState.Near900
- updateState()
+ actv_order_end_time_title.setTextColor(context.getColor(R.color.charter_p_090f28))
+ actv_order_end_time.setTextColor(context.getColor(android.R.color.white))
+ when (viewState) {
+ ViewState.Normal -> {
+ backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_bg)
}
- }else{
- actv_order_end_time.setTextColor(context.getColor(android.R.color.white))
- if(viewState!=ViewState.Normal){
- viewState = ViewState.Normal
- updateState()
+ ViewState.Near300 -> {
+ backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_near900s_bg)
}
+ ViewState.Near900 -> {
+ backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_near900s_bg)
+ }
+ ViewState.NormalWithOutOrder -> backageView?.visibility = View.GONE
}
} else {
actv_order_null.setTextColor(context.getColor(R.color.charter_p_090f28))
actv_order_end_time_title.setTextColor(context.getColor(R.color.charter_p_090f28))
- if(leftTime<900){
- actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_ff6d2c))
- if(leftTime<300){//0-300s
- if(leftTime>0) {
- backageView?.visibility = View.VISIBLE
- if (viewState != ViewState.Near300) {
- viewState = ViewState.Near300
- updateState()
- }
- }else{
- backageView?.visibility = View.VISIBLE
- if (viewState != ViewState.Normal) {
- viewState = ViewState.Normal
- updateState()
- }
- }
- }else{//300s-900s
- backageView?.visibility = View.GONE
+ backageView?.visibility = View.GONE
+ when (viewState) {
+ ViewState.Normal -> {
+ actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_0050E1))
+ }
+ ViewState.Near300 -> {
+ backageView?.visibility = View.VISIBLE
+ backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_near300s_bg)
+ actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_ff6d2c))
+ }
+ ViewState.Near900 -> {
+ actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_ff6d2c))
+ }
+ ViewState.NormalWithOutOrder -> {
+ actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_0050E1))
}
- }else{
- backageView?.visibility = View.GONE
- actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_0050E1))
}
}
}
- private fun updateState(){
- when (viewState) {
- ViewState.Normal -> backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_bg)
- ViewState.Near300 -> backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_near300s_bg)
- ViewState.Near900 -> backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_near900s_bg)
- }
- }
-
override fun onStatusChange(currentStatus: OrderStatusEnum) {
UiThreadHandler.post {
@@ -190,6 +196,6 @@ open class BottomOrderInfoView @JvmOverloads constructor(
}
enum class ViewState{
- Normal,Near300,Near900
+ Normal,Near300,Near900,NormalWithOutOrder
}
}
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
index 275268f28b..17f208ca5d 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentActivity
import com.mogo.eagle.core.data.config.HdMapBuildConfig
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
+import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.util.ActivityUtils
import com.mogo.och.charter.passenger.R
import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse
@@ -21,6 +22,7 @@ import kotlinx.android.synthetic.main.charter_p_debug.view.debug_arrive_dest
import kotlinx.android.synthetic.main.charter_p_debug.view.debug_change_modle
import kotlinx.android.synthetic.main.charter_p_debug.view.debug_show_endview
import kotlinx.android.synthetic.main.charter_p_debug.view.debug_show_noviceGuidance
+import kotlinx.android.synthetic.main.charter_p_debug.view.debug_show_overmap_point
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -86,6 +88,10 @@ class DebugView @JvmOverloads constructor(
debug_show_endview.setOnClickListener {
fragment?.showOpenAndCloseDoor()
}
+
+ debug_show_overmap_point.onClick {
+ fragment?.showOvermapPoint()
+ }
}
@Subscribe(threadMode = ThreadMode.MAIN)
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_debug.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_debug.xml
index f78213de3d..7fbb022e61 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_debug.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_debug.xml
@@ -29,6 +29,11 @@
android:id="@+id/debug_show_endview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
+
\ No newline at end of file