diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index 25ea8436f6..0969ca9ad4 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -1,6 +1,7 @@ package com.mogo.och.bus.passenger; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; import android.content.Context; diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png new file mode 100644 index 0000000000..405d2cddaa Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png differ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png new file mode 100644 index 0000000000..a0b2ab93d9 Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png differ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml new file mode 100644 index 0000000000..191ec2e51f --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index b01c1ffe3d..cc60b4b8d0 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -31,6 +31,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> + + ) \ No newline at end of file +data class EventLineSites(val lineInfo: LineInfoResponse.LineInfo?, val sites: List?, val clear:Boolean=false) \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index dfd9e84c32..6a1a100b31 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -102,7 +102,7 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : override fun onSuccess(data: SiteInfoResponse?) { if (data?.data == null) return val siteInfos = data.data - EventBus.getDefault().post(EventLineSites(checkLine,data.data)) + EventBus.getDefault().post(EventLineSites(checkLine,siteInfos,false)) if (siteInfos.isNotEmpty()) { // 计算当前站点是那个 val calculateCurrentSite = diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 9159d7a2d8..2a5a454db6 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -1,6 +1,9 @@ package com.mogo.och.bus.passenger.presenter +import android.graphics.Bitmap import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.view.View import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.voice.AIAssist @@ -26,20 +29,25 @@ import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener import com.mogo.och.bus.passenger.model.OrderStatusEnum import com.mogo.och.bus.passenger.ui.MainFragment +import com.mogo.och.bus.passenger.view.MakerWithSiteName +import com.mogo.och.bus.passenger.view.MakerWithSiteNamewithCheck +import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg +import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg import com.mogo.och.common.module.bean.dpmsg.DPMsgType import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager import com.mogo.och.common.module.biz.constant.OchCommonConst -import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager +import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager +import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.common.module.utils.SoundPoolHelper import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg -import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg -import com.mogo.och.common.module.biz.network.OchCommonServiceCallback -import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback -import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager +import me.jessyan.autosize.utils.AutoSizeUtils +import java.util.concurrent.ConcurrentHashMap import kotlin.math.ceil class BusPassengerPresenter(view: MainFragment?) : @@ -47,6 +55,8 @@ class BusPassengerPresenter(view: MainFragment?) : IDistanceCallback, IOrderChangeCallback, IOrderStatusChangeListener, OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback, LightAirconditionDoorCallback { + private val lindIdAndView = ConcurrentHashMap() + override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) CharterPassengerModel.init() @@ -273,7 +283,7 @@ class BusPassengerPresenter(view: MainFragment?) : it.forEach {latLngMain -> trajectoryList.add(latLngMain.exchangeData()) } - drawStations(sites) + drawStationInfo(sites) mView?.drawOverMapViewTrajectory(trajectoryList) } } @@ -286,12 +296,67 @@ class BusPassengerPresenter(view: MainFragment?) : } - fun drawStations(sites: List){ + fun drawStationInfo(sites: List){ val stationsList: MutableList = mutableListOf() + val stationsNameList: MutableList = mutableListOf() val stationIcon = BitmapFactory.decodeResource(context.resources, R.drawable.map_staton_icon) sites.forEach { stationsList.add(SiteMarkerBean(LatLng(it.GcjLat!!,it.GcjLon!!),stationIcon,0.5f,0.5f)) + val bitmap = getBitmap(it.siteId!!,it.siteName ?: "", it.isCheck) + stationsNameList.add(SiteMarkerBean(LatLng(it.GcjLat,it.GcjLon),bitmap,0.0f,0.2f)) } - mView?.drawOverMapViewStation(stationsList) + mView?.drawOverMapViewStation(stationsList,stationsNameList) + } + + private fun getBitmap(siteId:Long,siteName: String,isCheck:Boolean): Bitmap { + var siteView = lindIdAndView[siteId] + if(siteView==null){ + val marker = MakerWithSiteName(context) + marker.setTextAndCheck(siteName,isCheck) + marker.measure( + View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 145f), View.MeasureSpec.UNSPECIFIED), + View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 34f), View.MeasureSpec.EXACTLY) + ) + marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight) + val bitmap = Bitmap.createBitmap(marker.width, marker.height, Bitmap.Config.ARGB_8888) + marker.draw(Canvas(bitmap)) + siteView = MakerWithSiteNamewithCheck(isCheck,marker,bitmap) + lindIdAndView[siteId] = siteView + }else{ + CallerLogger.d(M_BUS_P + TAG, "缓存View:$siteName---${siteView.isCheck}-----$isCheck") + if (siteView.isCheck != isCheck) { + val marker = siteView.makerWithSiteName + marker.setTextAndCheck(siteName,isCheck) + marker.measure( + View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 145f), View.MeasureSpec.UNSPECIFIED), + View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 34f), View.MeasureSpec.UNSPECIFIED) + ) + marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight) + val bitmap = Bitmap.createBitmap(marker.width, marker.height, Bitmap.Config.ARGB_8888) + marker.draw(Canvas(bitmap)) + siteView.isCheck = isCheck + siteView.bitmapView = bitmap + } + } + return siteView.bitmapView + } + + fun drawEndStation() { + val currentOrderInfo = CharterPassengerModel.getCurrentOrderInfo() + currentOrderInfo?.let { + if (it.wgs84Lon != null && it.wgs84Lat != null && it.siteId != null && it.siteName != null) { + val coordinateConverterWgsToGcj = + CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj( + context, + it.wgs84Lon!!, + it.wgs84Lat!! + ) + setEndStationCallBack( + it.siteId, it.siteName, + coordinateConverterWgsToGcj.longitude, coordinateConverterWgsToGcj.latitude + ) + } + } + } } \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 2e777e9c3e..487b6e5472 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -13,6 +13,7 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.function.view.SiteMarkerBean import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -28,6 +29,7 @@ import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment +import com.mogo.och.bus.passenger.view.statusbar.StatusBarView import com.mogo.och.common.module.biz.constant.LoginStatusManager import com.mogo.och.common.module.voice.VoiceManager import kotlinx.android.synthetic.main.m1_main_fragment.* @@ -46,8 +48,12 @@ class MainFragment : private var bpFunctionGroupDialogFragment: WeakReference? = null private var m1CarUserNoOrderFragment: WeakReference? = null - val endStation = - BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.m1_small_map_view_dir_end) + private val endStation = + BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, + R.drawable.m1_small_map_view_dir_end) + private val lineTrajectory = + BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, + com.mogo.eagle.core.function.map.R.drawable.taxi_map_arrow_arrived) override fun getLayoutId(): Int { return R.layout.m1_main_fragment @@ -265,26 +271,57 @@ class MainFragment : @Subscribe(threadMode = ThreadMode.MAIN) fun changeOverview(eventLineSites: EventLineSites) { - CallerLogger.d(M_BUS_P + TAG, "eventLineSites:${eventLineSites.lineInfo.lineId}-----${eventLineSites.sites.size}") - mPresenter?.getLineTrajectory(eventLineSites.lineInfo,eventLineSites.sites) + CallerLogger.d(M_BUS_P + TAG, "eventLineSites:${eventLineSites.lineInfo?.lineId}") + if(eventLineSites.clear){ + UiThreadHandler.post( + { + omvOverMap?.clearSitePolyline() + omvOverMap?.includeSitePointsAndUpdateCamera(mutableListOf()) + omvOverMap?.clearSiteMarkers() + omvOverMap?.clearSiteNameViews() + mPresenter?.drawEndStation() + }, + UiThreadHandler.MODE.QUEUE + ) + } else { + if(eventLineSites.lineInfo==null){//更新站点 + mPresenter?.drawStationInfo(eventLineSites.sites!!) + }else{// 更新轨迹和站点 + mPresenter?.getLineTrajectory(eventLineSites.lineInfo,eventLineSites.sites!!) + } + } } @Subscribe(threadMode = ThreadMode.MAIN) fun changeDebugView(debugView: DebugView) { - if(debug_arrive_dest.visibility==View.GONE||debug_arrive_dest.visibility==View.INVISIBLE){ - debug_arrive_dest.visibility = View.VISIBLE - }else{ - debug_arrive_dest.visibility = View.GONE - } + when (debugView.type) { + StatusBarView.bizz -> { + if(debug_arrive_dest.visibility==View.GONE|| + debug_arrive_dest.visibility==View.INVISIBLE){ + debug_arrive_dest.visibility = View.VISIBLE + }else{ + debug_arrive_dest.visibility = View.GONE + } + } + else -> { + ToggleDebugView.toggleDebugView.toggle(requireContext()) + } + } + } - fun drawOverMapViewStation(stationsList: MutableList){ + fun drawOverMapViewStation(stationsList: MutableList,siteMarkers: List?){ + omvOverMap?.clearSiteMarkers() + omvOverMap?.clearSiteNameViews() omvOverMap?.drawSiteMarkers(stationsList) + omvOverMap?.drawSiteNameViews(siteMarkers) } - fun drawOverMapViewTrajectory(coordinates: List){ - UiThreadHandler.post({ - omvOverMap?.drawPolyline(coordinates, 0) + fun drawOverMapViewTrajectory(coordinates: List) { + UiThreadHandler.post( + { + omvOverMap?.drawSitePolyline(coordinates, lineTrajectory) + omvOverMap?.includeSitePointsAndUpdateCamera(coordinates) }, UiThreadHandler.MODE.QUEUE ) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt index 6e2b4ae5e5..5090eb95e0 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt @@ -10,8 +10,10 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.event.EventLineSites import com.mogo.och.bus.passenger.bean.response.LineInfoResponse import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse +import org.greenrobot.eventbus.EventBus /** * Created by adityagohad on 06/06/17. @@ -90,6 +92,7 @@ class OrderSiteItemAdapter( } } notifyDataSetChanged() + EventBus.getDefault().post(EventLineSites(null,dataList,false)) checkChangeListener?.onCheckListener(tempInfo) } else { if (siteInfo.isNear) { diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt index 2ad6356784..97e7cf572a 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.SharedPrefs import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.event.EventLineSites import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionPresenter import com.mogo.och.bus.passenger.ui.dialogfragment.fragment.M1OrderLineFragment import com.mogo.och.bus.passenger.ui.dialogfragment.fragment.M1SoftFragment @@ -24,6 +25,7 @@ import com.mogo.och.bus.passenger.ui.dialogfragment.fragment.OrderInfoFragment import com.mogo.och.bus.passenger.ui.view.bottom.BottomBar import com.mogo.och.bus.passenger.ui.view.bottom.BottomClickView import kotlinx.android.synthetic.main.m1_contain_fragment.* +import org.greenrobot.eventbus.EventBus /** * @author: yangyakun @@ -160,7 +162,7 @@ class M1ContainFragment : override fun onDismiss(dialog: DialogInterface) { super.onDismiss(dialog) - ToastUtils.showShort("消失了") + EventBus.getDefault().post(EventLineSites(null,null,true)) } override fun onSaveInstanceState(outState: Bundle) { diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt index df639fdab8..cd2916dfa8 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt @@ -76,7 +76,7 @@ class M1OrderLineFragment : LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) rv_site_list.addItemDecoration( BottomDecoration( - AutoSizeUtils.dp2px(context, 60f) + AutoSizeUtils.dp2px(context, 90f) ) ) rv_site_list.adapter = siteAdapter diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt new file mode 100644 index 0000000000..3e978b0448 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt @@ -0,0 +1,31 @@ +package com.mogo.och.bus.passenger.view + +import android.content.Context +import android.graphics.Bitmap +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.och.bus.passenger.R +import kotlinx.android.synthetic.main.view_maker_sitename.view.* + +class MakerWithSiteName @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout ( + context, + attrs, + defStyleAttr +) { + + init { + LayoutInflater.from(context).inflate(R.layout.view_maker_sitename, this, true) + } + + fun setTextAndCheck(siteName: String,isCheck:Boolean) { + tv_site_name.text = siteName + tv_site_name.isChecked = isCheck + } +} + +data class MakerWithSiteNamewithCheck(var isCheck: Boolean,val makerWithSiteName:MakerWithSiteName,var bitmapView: Bitmap) \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt index 053622a980..b8539ff1da 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt @@ -37,18 +37,20 @@ class StatusBarView @JvmOverloads constructor( const val TAG = "StatusBarView" private const val COUNTS = 4 // 点击次数 private const val DURATION: Long = 1000 // 规定有效时间 + const val bizz = "bizz" // 业务debug + const val debugView = "debugView" // 业务debug } private var mHits = LongArray(COUNTS) - private fun continuousClick() { + private fun continuousClick(type:String) { //每次点击时，数组向前移动一位 System.arraycopy(mHits, 1, mHits, 0, mHits.size - 1) //为数组最后一位赋值 mHits[mHits.size - 1] = SystemClock.uptimeMillis() if (mHits[0] >= (SystemClock.uptimeMillis() - DURATION)) { mHits = LongArray(COUNTS) //重新初始化数组 - EventBus.getDefault().post(DebugView("show")) + EventBus.getDefault().post(DebugView(type)) } } @@ -76,9 +78,9 @@ class StatusBarView @JvmOverloads constructor( updateStatusBarRightView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(this.context)) - bizz_view.setOnClickListener { - continuousClick() - } + bizz_view.setOnClickListener { continuousClick(bizz) } + + iv_biz_icon.setOnClickListener { continuousClick(debugView) } progress.progress = 50 tv_power_cos.text = "50%" diff --git a/OCH/mogo-och-charter-passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml b/OCH/mogo-och-charter-passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml new file mode 100644 index 0000000000..51e58f87a5 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml new file mode 100644 index 0000000000..a779ceb4e3 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml new file mode 100644 index 0000000000..415076833e --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml new file mode 100644 index 0000000000..d8844581c8 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml new file mode 100644 index 0000000000..87564e9bd4 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml index 4817c92f25..3bd70b705d 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml @@ -25,6 +25,8 @@ app:startPointDrawable="@null" app:resetDrawableMarginRight="34dp" app:resetDrawableMarginBottom="54dp" + app:bottomPadding="200" + app:topPadding="100" app:isClearArrived="true" android:layout_width="0dp" android:layout_height="match_parent"/> diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml index b580fdf09b..9b63d84b6a 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml @@ -57,58 +57,69 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="@dimen/dp_20" /> - - - - - - - - + android:background="@drawable/charter_p_selct_site_bottom_corner" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_90"/> + + + + + + + + + + + + + + android:layout_height="@dimen/dp_47"/> + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/color.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/color.xml index 0680b9efba..ece45c5727 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/values/color.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/values/color.xml @@ -31,6 +31,7 @@ #090F28 #5F7096 #9AABD2 + #D7E5F5 #662C2D31 #332C2D31