yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.1.0]

Browse Source 
[charter_p]
[重命名]
This commit is contained in:
yangyakun
2023-09-21 15:09:05 +08:00
parent b24b45d005
commit 02c032f8fb
308 changed files with 751 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/charter/passenger/build.gradle
View File

@@ -24,6 +24,8 @@ android {
}
}
resourcePrefix "charter_p"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8

4
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
View File

@@ -568,7 +568,7 @@ object CharterPassengerModel {
OCHSocketMessageManager.pushAppOperationalMsgBox(
DateTimeUtil.getCurrentTimeStamp(),
AbsMogoApplication.getApp()
.getString(R.string.m1_end_order_5min), 2
.getString(R.string.charter_p_end_order_5min), 2
)
VoiceManager.surplus5min(VoiceFocusManager.getVoiceCmdCallBack())
d(M_BUS_P + TAG, "倒计时5分钟${it.orderNo}")
@@ -1000,7 +1000,7 @@ object CharterPassengerModel {
if (order.arriveStatus == OrderInfoResponse.ARRIVING) {
if (isSuccess("${siteId}$ending100Key")) {
val string =
mContext.getString(R.string.arrived_station_left_100, order.siteName)
mContext.getString(R.string.charter_p_arrived_station_left_100, order.siteName)
VoiceNotice.showNotice(string)
broadcastList["${siteId}$ending100Key"] = true
}

6
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
View File

@@ -194,7 +194,7 @@ class BusPassengerPresenter(view: MainFragment?) :
StopSideStatusManager.Status.START -> {
VoiceNotice.showNotice(
context.getString(R.string.m1_stop_site_zh),
context.getString(R.string.charter_p_stop_site_zh),
AIAssist.LEVEL0
)
}
@@ -206,7 +206,7 @@ class BusPassengerPresenter(view: MainFragment?) :
StopSideStatusManager.Status.EndingSuccess -> {
ToastCharterUtils.showToastShort("靠边停车成功")
VoiceNotice.showNotice(
context.getString(R.string.m1_stop_site_success),
context.getString(R.string.charter_p_stop_site_success),
AIAssist.LEVEL0
)
}
@@ -261,7 +261,7 @@ class BusPassengerPresenter(view: MainFragment?) :
fun drawStationInfo(sites: List<SiteInfoResponse.SiteInfo>) {
val stationsList: MutableList<SiteMarkerBean> = mutableListOf()
val stationsNameList: MutableList<SiteMarkerBean> = mutableListOf()
val stationIcon = BitmapFactory.decodeResource(context.resources, R.drawable.map_staton_icon)
val stationIcon = BitmapFactory.decodeResource(context.resources, R.drawable.charter_p_map_staton_icon)
var checkMarkView:SiteMarkerBean?=null
sites.forEach {
stationsList.add(

2
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
View File

@@ -50,7 +50,7 @@ object DriverMessage: IReceivedMsgListener {
if(msg.isPlay){
VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1)
if(msg.msg.contains("核销成功")){
val string = AbsMogoApplication.getApp().getString(R.string.m1_welcome_tts)
val string = AbsMogoApplication.getApp().getString(R.string.charter_p_welcome_tts)
VoiceNotice.showNotice(string, AIAssist.LEVEL1,4_000)
}
}

29
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
View File

@@ -32,7 +32,18 @@ import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment
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
import kotlinx.android.synthetic.main.m1_main_fragment.*
import kotlinx.android.synthetic.main.charter_p_main_fragment.aciv_enter_video
import kotlinx.android.synthetic.main.charter_p_main_fragment.aciv_map_2_default
import kotlinx.android.synthetic.main.charter_p_main_fragment.bb_boorombar
import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_orderinfo
import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_selectline
import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_softcontrol
import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_video
import kotlinx.android.synthetic.main.charter_p_main_fragment.mapBizView
import kotlinx.android.synthetic.main.charter_p_main_fragment.omvOverMap
import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxBubble
import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxButton
import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxList
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -50,7 +61,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
private val endStation =
BitmapFactory.decodeResource(
AbsMogoApplication.getApp().resources,
R.drawable.m1_small_map_view_dir_end
R.drawable.charter_p_small_map_view_dir_end
)
private val lineTrajectory =
BitmapFactory.decodeResource(
@@ -74,7 +85,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
statusBarView = statusView
}
}
return R.layout.m1_main_fragment
return R.layout.charter_p_main_fragment
}
override fun getTagName(): String {
@@ -120,7 +131,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
}
} else {
mPresenter?.querLogin()
ToastCharterUtils.showToastShort(requireContext().getString(R.string.m1_please_login_driver))
ToastCharterUtils.showToastShort(requireContext().getString(R.string.charter_p_please_login_driver))
return true
}
showBizView(orderinfo = true)
@@ -130,7 +141,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
BottomBar.SelectView.VIDEO -> showBizView(showVideo = true)
else -> {
showBizView()
statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
statusBarView?.setBackgroudColor(R.color.charter_p_80ffffff)
}
}
return false
@@ -174,25 +185,25 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
) {
if (orderinfo) {
biz_orderinfo.visibility = View.VISIBLE
statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
statusBarView?.setBackgroudColor(R.color.charter_p_80ffffff)
} else {
biz_orderinfo.visibility = View.GONE
}
if (softControl) {
biz_softcontrol.visibility = View.VISIBLE
statusBarView?.setBackgroudColor(R.color.bus_p_m1_40ffffff)
statusBarView?.setBackgroudColor(R.color.charter_p_40ffffff)
} else {
biz_softcontrol.visibility = View.GONE
}
if (selectLine) {
biz_selectline.visibility = View.VISIBLE
statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
statusBarView?.setBackgroudColor(R.color.charter_p_80ffffff)
} else {
biz_selectline.visibility = View.GONE
}
if (showVideo) {
biz_video.visibility = View.VISIBLE
statusBarView?.setBackgroudColor(R.color.bus_p_m1_40ffffff)
statusBarView?.setBackgroudColor(R.color.charter_p_40ffffff)
} else {
biz_video.visibility = View.GONE
}

11
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt
View File

@@ -6,7 +6,14 @@ import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.och.charter.passenger.R
import kotlinx.android.synthetic.main.m1_bottom_bar.view.*
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.aciv_center_image
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_close_door
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_line
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_open_door
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_setting
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_stop_site
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.cl_order_time
import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.cl_order_time_press
class BottomBar @JvmOverloads constructor(
context: Context,
@@ -15,7 +22,7 @@ class BottomBar @JvmOverloads constructor(
) : ConstraintLayout(context, attrs, defStyleAttr) {
init {
isClickable = true
LayoutInflater.from(context).inflate(R.layout.m1_bottom_bar, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_bar, this, true)
setBackgroundResource(R.drawable.charter_p_bottom_bar_bg)
}

17
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt
View File

@@ -6,7 +6,8 @@ import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.och.charter.passenger.R
import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.*
import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.aciv_center_image
import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.actv_title
open class BottomCheckView @JvmOverloads constructor(
context: Context,
@@ -27,13 +28,13 @@ open class BottomCheckView @JvmOverloads constructor(
private var isCheck = false
init {
LayoutInflater.from(context).inflate(R.layout.m1_bottom_stop_site, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_stop_site, this, true)
try {
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BottomSelectView)
backageViewId = typedArray.getResourceId(R.styleable.BottomSelectView_backageViewId, -1)
bottomTitle = typedArray.getString(R.styleable.BottomSelectView_bottomTitle) ?: ""
selectedDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_selectedDrawable, -1)
normalDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_normalDrawable, -1)
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CharterPBottomSelectView)
backageViewId = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPBackageViewId, -1)
bottomTitle = typedArray.getString(R.styleable.CharterPBottomSelectView_charterPBottomTitle) ?: ""
selectedDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPselectedDrawable, -1)
normalDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPnormalDrawable, -1)
typedArray.recycle()
initView(context)
} catch (e: Exception) {
@@ -64,7 +65,7 @@ open class BottomCheckView @JvmOverloads constructor(
} else {
backageView?.visibility = View.GONE
aciv_center_image.setImageResource(normalDrawable)
actv_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
actv_title.setTextColor(context.getColor(R.color.charter_p_090f28))
}
}

19
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt
View File

@@ -10,7 +10,8 @@ import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.charter.passenger.R
import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.*
import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.aciv_center_image
import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.actv_title
open class BottomClickView @JvmOverloads constructor(
context: Context,
@@ -31,13 +32,13 @@ open class BottomClickView @JvmOverloads constructor(
var applyClickListener: ApplyClickLintener?=null
init {
LayoutInflater.from(context).inflate(R.layout.m1_bottom_stop_site, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_stop_site, this, true)
try {
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BottomSelectView)
backageViewId = typedArray.getResourceId(R.styleable.BottomSelectView_backageViewId, -1)
bottomTitle = typedArray.getString(R.styleable.BottomSelectView_bottomTitle) ?: ""
selectedDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_selectedDrawable, -1)
normalDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_normalDrawable, -1)
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CharterPBottomSelectView)
backageViewId = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPBackageViewId, -1)
bottomTitle = typedArray.getString(R.styleable.CharterPBottomSelectView_charterPBottomTitle) ?: ""
selectedDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPselectedDrawable, -1)
normalDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPnormalDrawable, -1)
typedArray.recycle()
initView(context)
} catch (e: Exception) {
@@ -67,7 +68,7 @@ open class BottomClickView @JvmOverloads constructor(
CallerLogger.d(SceneConstant.M_BUS_P + TAG, "ACTION_UP")
if (selectedDrawable > 0) {
aciv_center_image.setImageResource(normalDrawable)
actv_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
actv_title.setTextColor(context.getColor(R.color.charter_p_090f28))
backageView?.visibility = View.GONE
}
}
@@ -75,7 +76,7 @@ open class BottomClickView @JvmOverloads constructor(
CallerLogger.d(SceneConstant.M_BUS_P + TAG, "ACTION_CANCEL")
if (selectedDrawable > 0) {
aciv_center_image.setImageResource(normalDrawable)
actv_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
actv_title.setTextColor(context.getColor(R.color.charter_p_090f28))
backageView?.visibility = View.GONE
}
}

15
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
View File

@@ -14,7 +14,10 @@ import com.mogo.och.charter.passenger.model.CharterPassengerModel
import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener
import com.mogo.och.charter.passenger.model.OrderStatusEnum
import com.mogo.och.common.module.utils.DateTimeUtil
import kotlinx.android.synthetic.main.m1_bottom_orderinfo.view.*
import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.actv_order_end_time
import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.actv_order_end_time_title
import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.actv_order_null
import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.clg_order_info
import java.util.UUID
/**
@@ -31,7 +34,7 @@ open class BottomOrderInfoView @JvmOverloads constructor(
}
init {
LayoutInflater.from(context).inflate(R.layout.m1_bottom_orderinfo, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_orderinfo, this, true)
try {
initView(context)
} catch (e: Exception) {
@@ -46,9 +49,9 @@ open class BottomOrderInfoView @JvmOverloads constructor(
actv_order_null.setTextColor(context.getColor(android.R.color.white))
actv_order_end_time_title.setTextColor(context.getColor(android.R.color.white))
}else{
actv_order_end_time.setTextColor(context.getColor(R.color.bus_p_m1_0050E1))
actv_order_null.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
actv_order_end_time_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_0050E1))
actv_order_null.setTextColor(context.getColor(R.color.charter_p_090f28))
actv_order_end_time_title.setTextColor(context.getColor(R.color.charter_p_090f28))
}
}
@@ -77,7 +80,7 @@ open class BottomOrderInfoView @JvmOverloads constructor(
OrderStatusEnum.NoOrderUnuse ->{
actv_order_null.visibility = VISIBLE
clg_order_info.visibility = GONE
actv_order_end_time.text = AbsMogoApplication.getApp().getString(R.string.m1_bottom_reach_time)
actv_order_end_time.text = AbsMogoApplication.getApp().getString(R.string.charter_p_bottom_reach_time)
}
OrderStatusEnum.OrderNoLine,
OrderStatusEnum.OrdersWithLine -> {

7
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
View File

@@ -24,7 +24,6 @@ import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStat
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.common.module.utils.SoundPoolHelper
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.m1_bottom_bar.view.*
class GoViewWithArrive @JvmOverloads constructor(
context: Context,
@@ -41,7 +40,7 @@ class GoViewWithArrive @JvmOverloads constructor(
}
init {
LayoutInflater.from(context).inflate(R.layout.m1_bottom_go, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_go, this, true)
setBackgroundResource(R.drawable.charter_p_bottom_center_normal)
setOnTouchListener(object :OnTouchListener{
@SuppressLint("ClickableViewAccessibility")
@@ -77,7 +76,7 @@ class GoViewWithArrive @JvmOverloads constructor(
private fun startGo(){
if (LightAirconditionDoorStatusManager.doorStatus.isOpen) {
val string = AbsMogoApplication.getApp().getString(R.string.m1_close_door_and_startauto)
val string = AbsMogoApplication.getApp().getString(R.string.charter_p_close_door_and_startauto)
ToastCharterUtils.showToastShort(string)
return
}
@@ -122,7 +121,7 @@ class GoViewWithArrive @JvmOverloads constructor(
RxUtils.disposeSubscribe(startAutoTimeOut)
startAutoTimeOut = RxUtils.createSubscribe(20_000) {
if (CallerAutoPilotStatusListenerManager.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
val string = AbsMogoApplication.getApp().getString(R.string.m1_start_auto_fail)
val string = AbsMogoApplication.getApp().getString(R.string.charter_p_start_auto_fail)
ToastCharterUtils.showToastLong(string)
}
CharterPassengerModel.setAutoStatusCallback(TAG, null)

10
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
View File

@@ -17,10 +17,10 @@ import com.mogo.och.charter.passenger.ui.MainFragment
import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView
import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
import kotlinx.android.synthetic.main.m1_p_debug.view.debug_arrive_dest
import kotlinx.android.synthetic.main.m1_p_debug.view.debug_change_modle
import kotlinx.android.synthetic.main.m1_p_debug.view.debug_show_endview
import kotlinx.android.synthetic.main.m1_p_debug.view.debug_show_noviceGuidance
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 org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -37,7 +37,7 @@ class DebugView @JvmOverloads constructor(
}
init {
LayoutInflater.from(context).inflate(R.layout.m1_p_debug, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_debug, this, true)
visibility = GONE
}

7
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
View File

@@ -19,7 +19,8 @@ import com.mogo.och.charter.passenger.R
import com.mogo.och.charter.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter
import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
import com.mogo.och.common.module.voice.VoiceManager
import kotlinx.android.synthetic.main.m1_order_end.*
import kotlinx.android.synthetic.main.charter_p_order_end.iv_end_order_closedoor
import kotlinx.android.synthetic.main.charter_p_order_end.iv_end_order_opendoor
/**
* @author: yangyakun
@@ -31,14 +32,14 @@ class M1CarUserNoOrderFragment :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setStyle(STYLE_NO_TITLE, R.style.DialogFullScreen) //dialog全屏
setStyle(STYLE_NO_TITLE, R.style.CharterPDialogFullScreen) //dialog全屏
}
private fun initFragment() {
}
override fun getLayoutId(): Int = R.layout.m1_order_end
override fun getLayoutId(): Int = R.layout.charter_p_order_end
override fun getTagName(): String = TAG

43
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
View File

@@ -19,14 +19,29 @@ import com.mogo.och.charter.passenger.R
import com.mogo.och.charter.passenger.model.CharterPassengerModel
import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter
import com.mogo.och.charter.passenger.presenter.CharterPassengerNoviceGuidancePresenter
import com.mogo.och.charter.passenger.ui.MainFragment
import com.mogo.och.common.module.voice.VoiceNotice
import kotlinx.android.synthetic.main.m1_novice_guidance_fragment.*
import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_1_fragment.*
import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_2_fragment.*
import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_3_fragment.*
import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_4_fragment.*
import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_fragment.*
import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome
import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_01
import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_02
import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_03
import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_04
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_1_fragment.v_next_page_select_line
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_1_fragment.v_welcome_close_01
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_2_fragment.v_next_page_go_auto
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_2_fragment.v_pre_page_go_auto
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_2_fragment.v_welcome_close_02
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_3_fragment.v_next_page_stop_site
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_3_fragment.v_pre_page_stop_site
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_3_fragment.v_welcome_close_03
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_4_fragment.v_next_page_notice
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_4_fragment.v_pre_page_notice
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_4_fragment.v_welcome_close_04
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_click_go_explore
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_order_time
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_start_guildance
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_userinfo
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.group_complete_guidance
import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.v_clikc_go_explore_bg
/**
* 新手引导
@@ -59,10 +74,10 @@ class NoviceGuidanceFragment :
savedInstanceState?.let {
//tab = it.getString(SELECTTAB, tab)
}
setStyle(STYLE_NO_TITLE, R.style.DialogFullScreen) //dialog全屏
setStyle(STYLE_NO_TITLE, R.style.CharterPDialogFullScreen) //dialog全屏
}
override fun getLayoutId(): Int = R.layout.m1_novice_guidance_fragment
override fun getLayoutId(): Int = R.layout.charter_p_novice_guidance_fragment
override fun getTagName(): String = TAG
@@ -76,7 +91,7 @@ class NoviceGuidanceFragment :
setTargetVisable(welcome01 = true)
if (m1_novice_guidance_tts) {
val m1NoviceGuidanceTts =
AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_tts)
AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_tts)
VoiceNotice.showNotice(m1NoviceGuidanceTts, AIAssist.LEVEL1)
m1_novice_guidance_tts = false
}
@@ -88,7 +103,7 @@ class NoviceGuidanceFragment :
setTargetVisable(welcome02 = true)
if (m1_novice_guidance_door_tts) {
val m1NoviceGuidanceDoorTts =
AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_door_tts)
AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_door_tts)
VoiceNotice.showNotice(m1NoviceGuidanceDoorTts, AIAssist.LEVEL1)
m1_novice_guidance_door_tts = false
}
@@ -101,7 +116,7 @@ class NoviceGuidanceFragment :
setTargetVisable(welcome03 = true)
if (m1_novice_guidance_stop_site_tts) {
val m1NoviceGuidanceStopSiteTts =
AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_stop_site_tts)
AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_stop_site_tts)
VoiceNotice.showNotice(m1NoviceGuidanceStopSiteTts, AIAssist.LEVEL1)
m1_novice_guidance_stop_site_tts = false
}
@@ -114,7 +129,7 @@ class NoviceGuidanceFragment :
setTargetVisable(welcome04 = true)
if (m1_novice_guidance_notice_tts) {
val m1NoviceGuidanceStopSiteTts =
AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_notice_tts)
AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_notice_tts)
VoiceNotice.showNotice(m1NoviceGuidanceStopSiteTts, AIAssist.LEVEL1)
m1_novice_guidance_notice_tts = false
}
@@ -128,7 +143,7 @@ class NoviceGuidanceFragment :
saveOrderInfo()
if (m1_novice_guidance_complier_tts) {
val m1NoviceGuidanceStopSiteTts =
AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_complier_tts)
AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_complier_tts)
VoiceNotice.showNotice(m1NoviceGuidanceStopSiteTts, AIAssist.LEVEL1)
m1_novice_guidance_complier_tts = false
}

12
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt
View File

@@ -7,11 +7,11 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.och.charter.passenger.R
import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance
import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_arrive_time
import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_surplus_time
import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_unit
import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_speed
import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance
import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance_arrive_time
import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance_surplus_time
import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance_unit
import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_speed
/**
* 速度、剩余时间、剩余距离和到达时间
@@ -29,7 +29,7 @@ class ItineraryView : ConstraintLayout, ItineraryViewModel.ItineraryViewCallback
constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.m1_itinerary_info, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_itinerary_info, this, true)
}
override fun onAttachedToWindow() {

4
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
View File

@@ -52,7 +52,7 @@ class ItineraryViewModel : ViewModel(), IMoGoChassisLocationGCJ02Listener, IDist
}
override fun setDistancecAndTime(meters: Long, timeInSecond: Long) {
val unitKm = AbsMogoApplication.getApp().getString(R.string.m1_distance_unit_km)
val unitKm = AbsMogoApplication.getApp().getString(R.string.charter_p_distance_unit_km)
if (meters < 0 && timeInSecond < 0) {
setDistanceAndTime("--", unitKm, "--", "--")
return
@@ -61,7 +61,7 @@ class ItineraryViewModel : ViewModel(), IMoGoChassisLocationGCJ02Listener, IDist
var disUnit = "KM"
if (meters > 0) {
if (meters / 1000 < 1) {
disUnit = AbsMogoApplication.getApp().getString(R.string.m1_distance_unit_m)
disUnit = AbsMogoApplication.getApp().getString(R.string.charter_p_distance_unit_m)
dis = Math.round(meters.toFloat()).toString()
} else {
disUnit = unitKm

14
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
View File

@@ -12,9 +12,9 @@ import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.och.charter.passenger.R
import com.mogo.och.common.module.utils.FrameAnimatorContainer
import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock
import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock_bg
import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_unlock_ani
import kotlinx.android.synthetic.main.charter_p_devices_lock_unlock.view.aciv_screen_lock
import kotlinx.android.synthetic.main.charter_p_devices_lock_unlock.view.aciv_screen_lock_bg
import kotlinx.android.synthetic.main.charter_p_devices_lock_unlock.view.aciv_screen_unlock_ani
class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
@@ -36,7 +36,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
private var handler: Handler?=null
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.m1_devices_lock_unlock, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_devices_lock_unlock, this, true)
handler = object : Handler(Looper.myLooper()!!) {
override fun handleMessage(msg: Message) {
super.handleMessage(msg)
@@ -55,7 +55,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
super.onAttachedToWindow()
LockManager.setAutoStatusCallback(TAG, this)
aciv_screen_unlock_ani?.let {
animations = FrameAnimatorContainer(R.array.openlock, 24, it,initFirstFrame = false)
animations = FrameAnimatorContainer(R.array.charter_p_openlock, 24, it,initFirstFrame = false)
animations!!.setOnAnimStopListener(object :
FrameAnimatorContainer.OnAnimationStoppedListener {
override fun AnimationStopped() {
@@ -143,7 +143,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
aciv_screen_lock.setImageResource(R.drawable.charter_p_unlock)
}
}
aciv_screen_lock_bg?.setImageResource(R.drawable.charger_p_normal)
aciv_screen_lock_bg?.setImageResource(R.drawable.charter_p_normal)
}
View.VISIBLE -> {
when (lockStatus) {
@@ -159,7 +159,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
}
LockManager.LockStatus.UNLOCK -> {
aciv_screen_lock.setImageResource(R.drawable.charter_p_unlock)
aciv_screen_lock_bg?.setImageResource(R.drawable.charger_p_normal)
aciv_screen_lock_bg?.setImageResource(R.drawable.charter_p_normal)
animations?.stop()
}
}

6
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt
View File

@@ -12,8 +12,8 @@ import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.charter.passenger.R
import kotlinx.android.synthetic.main.m1_devices_unlock.view.aciv_only_unlock
import kotlinx.android.synthetic.main.m1_devices_unlock.view.actv_lock_status
import kotlinx.android.synthetic.main.charter_p_devices_unlock.view.aciv_only_unlock
import kotlinx.android.synthetic.main.charter_p_devices_unlock.view.actv_lock_status
class UnlockView : ConstraintLayout, LockManager.LockStatusCallback {
@@ -32,7 +32,7 @@ class UnlockView : ConstraintLayout, LockManager.LockStatusCallback {
private var handler: Handler?=null
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.m1_devices_unlock, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_devices_unlock, this, true)
handler = object : Handler(Looper.myLooper()!!) {
override fun handleMessage(msg: Message) {
super.handleMessage(msg)

18
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt
View File

@@ -10,14 +10,14 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.och.charter.passenger.R
import com.mogo.och.charter.passenger.callback.IClearViewCallback
import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_contain_order
import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order
import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order_submit
import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_left_time
import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_order_phone
import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_order_times
import kotlinx.android.synthetic.main.m1_devices_fragment.view.cl_order_info
import kotlinx.android.synthetic.main.m1_devices_fragment.view.cl_order_info_endorder_comfit
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_contain_order
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_end_order
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_end_order_submit
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_left_time
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_order_phone
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_order_times
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.cl_order_info
import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.cl_order_info_endorder_comfit
/**
* 剩余时间和结束订单入口
@@ -41,7 +41,7 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
var viewModel:OrderInfoViewModel?=null
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.m1_devices_fragment, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_devices_fragment, this, true)
onClick {
setViewGone()
}

4
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt
View File

@@ -6,7 +6,7 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.och.charter.passenger.R
import kotlinx.android.synthetic.main.view_maker_sitename.view.*
import kotlinx.android.synthetic.main.charter_p_view_maker_sitename.view.tv_site_name
/**
* 全览地图中使用的view
@@ -22,7 +22,7 @@ class MakerWithSiteName @JvmOverloads constructor(
) {
init {
LayoutInflater.from(context).inflate(R.layout.view_maker_sitename, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_view_maker_sitename, this, true)
}
fun setTextAndCheck(siteName: String,isCheck:Boolean) {

33
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt
View File

@@ -20,24 +20,23 @@ import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse
import com.mogo.och.charter.passenger.callback.IClearViewCallback
import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderLineItemAdapter
import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderSiteItemAdapter
import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration
import com.mogo.och.common.module.utils.RxUtils
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.m1_order_fragment.view.aciv_driver_refuse_group
import kotlinx.android.synthetic.main.m1_order_fragment.view.g_lines_sites_data
import kotlinx.android.synthetic.main.m1_order_fragment.view.g_loading_group
import kotlinx.android.synthetic.main.m1_order_fragment.view.g_side_cancle_submit_group
import kotlinx.android.synthetic.main.m1_order_fragment.view.group_driver_agrenn_line
import kotlinx.android.synthetic.main.m1_order_fragment.view.iv_loading_wait_driver
import kotlinx.android.synthetic.main.m1_order_fragment.view.lsv_line_site
import kotlinx.android.synthetic.main.m1_order_fragment.view.m1_order_loading
import kotlinx.android.synthetic.main.m1_order_fragment.view.m1_order_neterror
import kotlinx.android.synthetic.main.m1_order_fragment.view.m1_order_noorder
import kotlinx.android.synthetic.main.m1_order_fragment.view.rlv_line_list
import kotlinx.android.synthetic.main.m1_order_fragment.view.rv_site_list
import kotlinx.android.synthetic.main.m1_order_fragment.view.tv_site_cancle
import kotlinx.android.synthetic.main.m1_order_fragment.view.tv_site_submit
import kotlinx.android.synthetic.main.m1_order_loading.view.iv_loading_wait_ent
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.aciv_driver_refuse_group
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.g_lines_sites_data
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.g_loading_group
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.g_side_cancle_submit_group
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.group_driver_agrenn_line
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.iv_loading_wait_driver
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.lsv_line_site
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.m1_order_loading
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.m1_order_neterror
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.m1_order_noorder
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.rlv_line_list
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.rv_site_list
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.tv_site_cancle
import kotlinx.android.synthetic.main.charter_p_order_fragment.view.tv_site_submit
import kotlinx.android.synthetic.main.charter_p_order_loading.view.iv_loading_wait_ent
import me.jessyan.autosize.utils.AutoSizeUtils
import org.greenrobot.eventbus.EventBus
@@ -89,7 +88,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.m1_order_fragment, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_order_fragment, this, true)
onClick {
setViewGone()

8
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
View File

@@ -49,18 +49,18 @@ class OrderLineItemAdapter(
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH {
val view: View
val inflater = LayoutInflater.from(context)
view = inflater.inflate(R.layout.m1_order_line_item, parent, false)
view = inflater.inflate(R.layout.charter_p_order_line_item, parent, false)
return TextVH(view)
}
override fun onBindViewHolder(holder: TextVH, position: Int) {
val lineInfo = dataList[holder.bindingAdapterPosition]
if(lineInfo.isCheck){
holder.lineNameTextView.setBackgroundResource(R.drawable.m1_order_line_checked_shape)
holder.lineNameTextView.setTextColor(context.getColor(R.color.bus_p_m1_1466FB))
holder.lineNameTextView.setBackgroundResource(R.drawable.charter_p_order_line_checked_shape)
holder.lineNameTextView.setTextColor(context.getColor(R.color.charter_p_1466FB))
}else{
holder.lineNameTextView.setBackgroundResource(android.R.color.transparent)
holder.lineNameTextView.setTextColor(context.getColor(R.color.bus_p_m1_292c39))
holder.lineNameTextView.setTextColor(context.getColor(R.color.charter_p_292c39))
}
holder.lineNameTextView.text = lineInfo.name
holder.lineNameTextView.setOnClickListener {

12
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
View File

@@ -41,7 +41,7 @@ class OrderSiteItemAdapter(
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH {
val view: View
val inflater = LayoutInflater.from(context)
view = inflater.inflate(R.layout.m1_order_site_item, parent, false)
view = inflater.inflate(R.layout.charter_p_order_site_item, parent, false)
return TextVH(view)
}
@@ -49,22 +49,22 @@ class OrderSiteItemAdapter(
val siteInfo = dataList[holder.bindingAdapterPosition]
if (holder.bindingAdapterPosition > enableIndex) {
if (siteInfo.isCheck) {
holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_checked)
holder.iv_site_checked.setImageResource(R.drawable.charter_p_order_site_checked)
} else {
holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check)
holder.iv_site_checked.setImageResource(R.drawable.charter_p_order_site_check)
}
holder.tv_site_site_name.setTextColor(
ContextCompat.getColor(
context,
R.color.bus_p_m1_222222
R.color.charter_p_222222
)
)
} else {
holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check_enable)
holder.iv_site_checked.setImageResource(R.drawable.charter_p_order_site_check_enable)
holder.tv_site_site_name.setTextColor(
ContextCompat.getColor(
context,
R.color.bus_p_m1_332C2D31
R.color.charter_p_332C2D31
)
)
}

2
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
View File

@@ -106,7 +106,7 @@ public class PickerLayoutManager extends LinearLayoutManager {
for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i);
if (child instanceof TextView) {
((TextView) child).setTextColor(ContextCompat.getColor(child.getContext(), R.color.bus_p_m1_47576e));
((TextView) child).setTextColor(ContextCompat.getColor(child.getContext(), R.color.charter_p_47576e));
}
}
}

115
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt
View File

@@ -29,9 +29,6 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.charter.passenger.R
import com.mogo.och.charter.passenger.bean.Temperature
import com.mogo.och.charter.passenger.callback.IClearViewCallback
import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager
import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter
import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration
import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.PagerCenterSnapHelper
import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
import com.mogo.och.common.module.utils.RxUtils
@@ -40,35 +37,35 @@ import com.mogo.och.common.module.wigets.MineGradientDrawable
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.m1_soft_fragment.view.dbv_wind
import kotlinx.android.synthetic.main.m1_soft_fragment.view.g_aircondition_setting
import kotlinx.android.synthetic.main.m1_soft_fragment.view.g_light_setting
import kotlinx.android.synthetic.main.m1_soft_fragment.view.g_voice_setting
import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_bottom_light_setting
import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_end_voice
import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_loading
import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_temperature_select
import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_top_light_setting
import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_voice
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_automatic
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_heating
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_refrigeration
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_ventilate
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_wind_speed_high
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_wind_speed_low
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_wind_speed_middle
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rg_select_function
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rg_setting_pattern
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rg_setting_windspeed
import kotlinx.android.synthetic.main.m1_soft_fragment.view.rv_aircondition_temperature
import kotlinx.android.synthetic.main.m1_soft_fragment.view.sb_voice_bar
import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_aircondition_switch
import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_current_voice_value
import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_light_atmosphere
import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_light_top_01
import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_light_top_02
import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_setting_aircondition
import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_temperature_title
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.dbv_wind
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.g_aircondition_setting
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.g_light_setting
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.g_voice_setting
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_bottom_light_setting
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_end_voice
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_loading
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_temperature_select
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_top_light_setting
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_voice
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_automatic
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_heating
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_refrigeration
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_ventilate
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_wind_speed_high
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_wind_speed_low
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_wind_speed_middle
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rg_select_function
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rg_setting_pattern
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rg_setting_windspeed
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rv_aircondition_temperature
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.sb_voice_bar
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_aircondition_switch
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_current_voice_value
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_light_atmosphere
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_light_top_01
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_light_top_02
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_setting_aircondition
import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_temperature_title
import me.jessyan.autosize.utils.AutoSizeUtils
import java.util.concurrent.TimeUnit
@@ -116,7 +113,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.m1_soft_fragment, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_soft_fragment, this, true)
onClick {
setViewGone()
}
@@ -205,7 +202,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
rb_wind_speed_low.setTextColor(
ContextCompat.getColorStateList(
context,
R.color.bus_p_function_airconditon_pattern_text_color_selector
R.color.charter_p_function_airconditon_pattern_text_color_selector
)
)
} else {
@@ -214,7 +211,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
rb_wind_speed_low.setTextColor(
ContextCompat.getColor(
context,
R.color.bus_p_m1_6647576e
R.color.charter_p_6647576e
)
)
}
@@ -386,11 +383,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
override fun setLightTop1View(leftLight: Boolean, isFirst: Boolean) {
tv_light_top_01?.let {
if (leftLight) {
tv_light_top_01.text = context.getString(R.string.bus_p_m1_close_light1)
tv_light_top_01.text = context.getString(R.string.charter_p_close_light1)
tv_light_top_01.isChecked = true
if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯1")
} else {
tv_light_top_01.text = context.getString(R.string.bus_p_m1_open_light1)
tv_light_top_01.text = context.getString(R.string.charter_p_open_light1)
tv_light_top_01.isChecked = false
if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯1")
}
@@ -400,11 +397,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
override fun setLightTop2View(rightLight: Boolean, isFirst: Boolean) {
tv_light_top_02?.let {
if (rightLight) {
tv_light_top_02.text = context.getString(R.string.bus_p_m1_close_light2)
tv_light_top_02.text = context.getString(R.string.charter_p__close_light2)
tv_light_top_02.isChecked = true
if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯2")
} else {
tv_light_top_02.text = context.getString(R.string.bus_p_m1_open_light2)
tv_light_top_02.text = context.getString(R.string.charter_p_open_light2)
tv_light_top_02.isChecked = false
if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯2")
}
@@ -414,14 +411,14 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
override fun setLightAtmosphereView(atmosphereLight: Boolean, isFirst: Boolean) {
tv_light_atmosphere?.let {
if (atmosphereLight) {
tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_close_atmosphere)
tv_light_atmosphere.text = context.getString(R.string.charter_p_close_atmosphere)
tv_light_atmosphere.isChecked = true
iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_select)
iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_select)
if (!isFirst) ToastCharterUtils.showToastShort("打开氛围灯")
} else {
tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_open_atmosphere)
tv_light_atmosphere.text = context.getString(R.string.charter_p_open_atmosphere)
tv_light_atmosphere.isChecked = false
iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_nor)
iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_nor)
if (!isFirst) ToastCharterUtils.showToastShort("关闭氛围灯")
}
}
@@ -433,15 +430,15 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
override fun setLightView(leftLight: Boolean, rightLight: Boolean) {
iv_top_light_setting?.let {
if (leftLight && rightLight) {
iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_middle_selected)// 都打开
iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_middle_selected)// 都打开
} else if (!leftLight && !rightLight) {
iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_nor)// 都关闭
iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_nor)// 都关闭
} else {
if (leftLight) {
iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_select_left)// 左面开
iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_select_left)// 左面开
}
if (rightLight) {
iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_select_right)// 左面开
iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_select_right)// 左面开
}
}
}
@@ -456,9 +453,9 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
@SuppressLint("NewApi")
private fun setVoiceInfo() {
val dp2px = AutoSizeUtils.dp2px(context, 26f)//进度条高度
val color2CBFFC = ContextCompat.getColor(context, R.color.bus_p_m1_2cbffc)
val color1060FF = ContextCompat.getColor(context, R.color.bus_p_m1_1060ff)
val color96A5C2 = ContextCompat.getColor(context, R.color.bus_p_m1_96a5c2)
val color2CBFFC = ContextCompat.getColor(context, R.color.charter_p_2cbffc)
val color1060FF = ContextCompat.getColor(context, R.color.charter_p_1060ff)
val color96A5C2 = ContextCompat.getColor(context, R.color.charter_p_96a5c2)
val temp03 = MineGradientDrawable(color2CBFFC, color1060FF, dp2px)
val scaleDrawable3 = ClipDrawable(temp03, Gravity.START, ClipDrawable.HORIZONTAL)
val temp01 = MineGradientDrawable(color96A5C2, color96A5C2, dp2px)
@@ -486,11 +483,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
}
}
if (progress == 0) {
iv_voice.setImageResource(R.drawable.bus_p_function_voice_middle_select)
iv_end_voice.setImageResource(R.drawable.bus_p_function_voice_min)
iv_voice.setImageResource(R.drawable.charter_p_function_voice_middle_select)
iv_end_voice.setImageResource(R.drawable.charter_p_function_voice_min)
} else {
iv_voice.setImageResource(R.drawable.bus_p_function_voice_middle_selected)
iv_end_voice.setImageResource(R.drawable.bus_p_function_voice_max)
iv_voice.setImageResource(R.drawable.charter_p_function_voice_middle_selected)
iv_end_voice.setImageResource(R.drawable.charter_p_function_voice_max)
}
}
@@ -760,15 +757,15 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
heaterAirEnable(true)
when (windSpeed) {//1: 1档，2: 2档，3:3档
1 -> {
setWind(rb_wind_speed_low, R.drawable.bus_pm1_aircondition_wind_low)
setWind(rb_wind_speed_low, R.drawable.charter_p_aircondition_wind_low)
}
2 -> {
setWind(rb_wind_speed_middle, R.drawable.bus_pm1_aircondition_wind_middle)
setWind(rb_wind_speed_middle, R.drawable.charter_p_aircondition_wind_middle)
}
3 -> {
setWind(rb_wind_speed_high, R.drawable.bus_pm1_aircondition_wind_high)
setWind(rb_wind_speed_high, R.drawable.charter_p_aircondition_wind_high)
}
else -> {}
@@ -779,11 +776,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
heaterAirEnable(false)
when (windSpeed) {//1: 1档，2: 2档
1 -> {
setWind(rb_wind_speed_middle, R.drawable.bus_pm1_warm_wind_middle)
setWind(rb_wind_speed_middle, R.drawable.charter_p_warm_wind_middle)
}
2 -> {
setWind(rb_wind_speed_high, R.drawable.bus_pm1_warm_wind_high)
setWind(rb_wind_speed_high, R.drawable.charter_p_warm_wind_high)
}
else -> {}

7
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
View File

@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.och.charter.passenger.R;
import com.mogo.och.charter.passenger.bean.Temperature;
import com.mogo.och.charter.passenger.bean.Temperature;
import java.util.List;
@@ -38,7 +37,7 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
public TextVH onCreateViewHolder(ViewGroup parent, int viewType) {
View view;
LayoutInflater inflater = LayoutInflater.from(context);
view = inflater.inflate(R.layout.m1_soft_temperature_item, parent, false);
view = inflater.inflate(R.layout.charter_p_soft_temperature_item, parent, false);
return new TextVH(view);
}
@@ -50,10 +49,10 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
if(position==checkIndex){
holder.pickerTxt.setTextColor(Color.WHITE);
}else {
holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_47576e));
holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.charter_p_47576e));
}
}else {
holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_6647576e));
holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.charter_p_6647576e));
}
holder.pickerTxt.setTag(temperature);
holder.pickerTxt.setOnClickListener(v -> {

8
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt
View File

@@ -17,7 +17,7 @@ class DrawBitmapView @JvmOverloads constructor(
) : View(context, attrs, defStyleAttr) {
private lateinit var mBitmap: Bitmap
private lateinit var mBitPaint: Paint
private var drawBitmapViewResource = R.drawable.bus_pm1_aircondition_wind_high
private var drawBitmapViewResource = R.drawable.charter_p_aircondition_wind_high
private var mBitWidth = 0
private var showHeight = 0
set(value) {
@@ -26,10 +26,10 @@ class DrawBitmapView @JvmOverloads constructor(
}
init {
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.MainWindStatus)
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CharterPMainWindStatus)
drawBitmapViewResource = typedArray.getResourceId(
R.styleable.MainWindStatus_main_wind_drawable,
R.drawable.bus_pm1_aircondition_wind_high
R.styleable.CharterPMainWindStatus_charter_p_main_wind_drawable,
R.drawable.charter_p_aircondition_wind_high
)
typedArray.recycle()
initBitmap()

8
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt
View File

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
import com.mogo.och.charter.passenger.R
import kotlinx.android.synthetic.main.m1_statusview_blue_tooth.view.*
import kotlinx.android.synthetic.main.charter_p_statusview_blue_tooth.view.mofangView
/**
* 魔戒蓝牙控件
@@ -20,14 +20,14 @@ class M1BlueToothView @JvmOverloads constructor(
) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
init {
LayoutInflater.from(context).inflate(R.layout.m1_statusview_blue_tooth, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_statusview_blue_tooth, this, true)
}
override fun mofangStatus(status: Boolean) {
if (status) {
mofangView.setImageResource(R.drawable.bus_p_m1_blue_tooth_close)
mofangView.setImageResource(R.drawable.charter_p_blue_tooth_close)
} else {
mofangView.setImageResource(R.drawable.bus_p_m1_blue_tooth_open)
mofangView.setImageResource(R.drawable.charter_p_blue_tooth_open)
}
}

12
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
View File

@@ -11,7 +11,6 @@ import androidx.annotation.ColorRes
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import chassis.ChassisStatesOuterClass
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener
@@ -31,7 +30,12 @@ import com.mogo.och.charter.passenger.R
import com.mogo.och.charter.passenger.ui.debugview.DebugEvent
import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
import com.mogo.och.common.module.manager.loopmanager.LoopInfo
import kotlinx.android.synthetic.main.m1_statusview_datetime.view.*
import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.aciv_connect_driver_status
import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.actv_auto_status
import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.bizz_view
import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.iv_biz_icon
import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.progress
import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.tv_power_cos
import me.jessyan.autosize.utils.AutoSizeUtils
import org.greenrobot.eventbus.EventBus
import kotlin.math.roundToInt
@@ -64,8 +68,8 @@ class StatusBarView @JvmOverloads constructor(
}
init {
LayoutInflater.from(context).inflate(R.layout.m1_statusview_datetime, this, true)
setBackgroundColor(ContextCompat.getColor(context,R.color.bus_p_m1_80ffffff))
LayoutInflater.from(context).inflate(R.layout.charter_p_statusview_datetime, this, true)
setBackgroundColor(ContextCompat.getColor(context,R.color.charter_p_80ffffff))
isClickable = true
isFocusable = true
}

24
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
View File

@@ -57,7 +57,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
constructor(context: Context?, fullFlag: Boolean?) : super(context, fullFlag)
override fun init(context: Context) {
mEnlargeImageRes = R.drawable.bus_p_function_video_player_change_full
mEnlargeImageRes = R.drawable.charter_p_function_video_player_change_full
super.init(context)
start = findViewById(R.id.start)
coverImage = findViewById(R.id.thumbImage)
@@ -77,7 +77,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
aivStartPlay.scaleX = 0.8f
aivStartPlay.scaleY = 0.8f
mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_samll)
mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.charter_p_function_video_player_thumb_samll)
}
private fun addDrageAnchor(){
@@ -104,7 +104,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
titleTextView.layoutParams = layoutParams1
aivStartPlay.scaleX = 1f
aivStartPlay.scaleY = 1f
mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_big)
mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.charter_p_function_video_player_thumb_big)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
mProgressBar.maxHeight = 6
mProgressBar.minHeight = 6
@@ -114,24 +114,24 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
}
override fun getLayoutId(): Int {
return R.layout.m1_video_view
return R.layout.charter_p_video_view
}
override fun updateStartImage() {
when (mCurrentState) {
GSYVideoView.CURRENT_STATE_PLAYING ->{
if(isIfCurrentIsFullscreen){
start.setImageResource(R.drawable.bus_p_function_video_player_pause_big)
start.setImageResource(R.drawable.charter_p_function_video_player_pause_big)
}else {
start.setImageResource(R.drawable.bus_p_function_video_player_pause_small)
start.setImageResource(R.drawable.charter_p_function_video_player_pause_small)
}
aivStartPlay.visibility = View.GONE
}
else -> {
if(isIfCurrentIsFullscreen){
start.setImageResource(R.drawable.bus_p_function_video_player_start_big)
start.setImageResource(R.drawable.charter_p_function_video_player_start_big)
}else {
start.setImageResource(R.drawable.bus_p_function_video_player_start_small)
start.setImageResource(R.drawable.charter_p_function_video_player_start_small)
}
aivStartPlay.visibility = View.VISIBLE
}
@@ -245,7 +245,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
}
override fun onCompletion() {
start.setImageResource(R.drawable.bus_p_function_video_player_start_small)
start.setImageResource(R.drawable.charter_p_function_video_player_start_small)
}
override fun onSurfaceUpdated(surface: Surface) {
@@ -383,8 +383,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
cloneParams(this, gsyVideoPlayer)
val frameLayout = FrameLayout(context)
if (gsyVideoPlayer.fullscreenButton != null) {
gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.bus_p_function_video_player_change_normal)
gsyVideoPlayer.start.setImageResource(R.drawable.bus_p_function_video_player_pause_big)
gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.charter_p_function_video_player_change_normal)
gsyVideoPlayer.start.setImageResource(R.drawable.charter_p_function_video_player_pause_big)
gsyVideoPlayer.fullscreenButton.setOnClickListener { v ->
if (mBackFromFullScreenListener == null) {
clearFullscreenLayout(gsyVideoPlayer)
@@ -400,7 +400,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
frameLayout.setBackgroundColor(Color.BLACK)
val lp = LayoutParams(width, height)
frameLayout.addView(gsyVideoPlayer, lp)
FullVideoUtils.showOverlayView(context as Activity,frameLayout,R.style.och_window_anim_alpha)
FullVideoUtils.showOverlayView(context as Activity,frameLayout,R.style.charter_p_window_anim_alpha)
gsyVideoPlayer.visibility = INVISIBLE
frameLayout.visibility = INVISIBLE
resolveFullVideoShow(context, gsyVideoPlayer, frameLayout)

8
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt
View File

@@ -9,14 +9,10 @@ import androidx.recyclerview.widget.RecyclerView
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.och.charter.passenger.R
import com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay
import com.mogo.och.charter.passenger.callback.IClearViewCallback
import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager
import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener
import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CenterScrollListener
import com.mogo.och.charter.passenger.ui.video.adapter.RecyclerVideoAdapter
import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
import kotlinx.android.synthetic.main.m1_video_fragment.view.rvVideoPlaylist
import kotlinx.android.synthetic.main.charter_p_video_fragment.view.rvVideoPlaylist
import kotlin.math.floor
class VideoView @JvmOverloads constructor(
@@ -34,7 +30,7 @@ class VideoView @JvmOverloads constructor(
var goneViewListener: IClearViewCallback? = null
init {
LayoutInflater.from(context).inflate(R.layout.m1_video_fragment, this, true)
LayoutInflater.from(context).inflate(R.layout.charter_p_video_fragment, this, true)
onClick {
goneViewListener?.goneAllView()
}

6
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java
View File

@@ -51,7 +51,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
@NonNull
@Override
public RecyclerItemVideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View v = LayoutInflater.from(context).inflate(R.layout.m1_video_item, parent, false);
View v = LayoutInflater.from(context).inflate(R.layout.charter_p_video_item, parent, false);
RecyclerItemVideoHolder recyclerItemVideoHolder = new RecyclerItemVideoHolder(context, v);
recyclerItemVideoHolder.setIsRecyclable(false);
return recyclerItemVideoHolder;
@@ -64,7 +64,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
final TaxiPassengerVideoPlay taxiPassengerVideoPlay = itemDataList.get(position);
AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.getResources());
holder.gsyVideoOptionBuilder
.setEnlargeImageRes(R.drawable.taxi_p_change_full)
.setEnlargeImageRes(R.drawable.charter_p_change_full)
.setUrl(taxiPassengerVideoPlay.getUrl())
.setCacheWithPlay(true)
.setPlayTag(taxiPassengerVideoPlay.getImageUrl()+position)
@@ -73,7 +73,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
holder.gsyVideoPlayer.getTitleTextView().setText(taxiPassengerVideoPlay.getTitle());
Glide.with(context)
.load(taxiPassengerVideoPlay.getImageUrl())
.apply(new RequestOptions().placeholder(R.drawable.taxi_p_video_holder).centerCrop())
.apply(new RequestOptions().placeholder(R.drawable.charter_p_video_holder).centerCrop())
.into(holder.gsyVideoPlayer.coverImage);
holder.gsyVideoPlayer.getThumbImageViewLayout().setOnClickListener(new View.OnClickListener() {
@Override

0
OCH/charter/passenger/src/main/res/anim/alpha_hide_show.xml → OCH/charter/passenger/src/main/res/anim/charter_p_alpha_hide_show.xml
View File

5
OCH/charter/passenger/src/main/res/color/bus_p_aircondition_enable.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/bus_p_m1_47576e" android:state_enabled="true"/>
<item android:color="@color/bus_p_m1_6647576e" android:state_enabled="false"/>
</selector>

5
OCH/charter/passenger/src/main/res/color/charter_p_aircondition_enable.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/charter_p_47576e" android:state_enabled="true"/>
<item android:color="@color/charter_p_6647576e" android:state_enabled="false"/>
</selector>

4
OCH/charter/passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml → OCH/charter/passenger/src/main/res/color/charter_p_function_airconditon_pattern_text_color_selector.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" android:state_checked="true"/>
<item android:color="@color/bus_p_m1_47576e" android:state_checked="false"/>
<item android:color="@color/bus_p_m1_47576e" />
<item android:color="@color/charter_p_47576e" android:state_checked="false"/>
<item android:color="@color/charter_p_47576e" />
</selector>

4
OCH/charter/passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" android:state_checked="true" />
<item android:color="@color/bus_p_m1_112b57" android:state_checked="false" />
<item android:color="@color/bus_p_m1_112b57"/>
<item android:color="@color/charter_p_112b57" android:state_checked="false" />
<item android:color="@color/charter_p_112b57"/>
</selector>

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_high.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 KiB

After

Width:  |  Height:  |  Size: 260 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_low.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 90 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_middle.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 192 KiB

After

Width:  |  Height:  |  Size: 192 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_blue_tooth_close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 930 B

After

Width:  |  Height:  |  Size: 930 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_blue_tooth_open.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 925 B

After

Width:  |  Height:  |  Size: 925 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_speed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_change_full.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 859 B

After

Width:  |  Height:  |  Size: 859 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_distance_info_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_end_order_openclosedoor.webp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/charter_endorder_head.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_endorder_head.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_nor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 506 KiB

After

Width:  |  Height:  |  Size: 506 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_pattern_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 443 B

After

Width:  |  Height:  |  Size: 443 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_switch_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_atmosphere_nor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 KiB

After

Width:  |  Height:  |  Size: 226 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_atmosphere_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 KiB

After

Width:  |  Height:  |  Size: 251 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/m1_function_bg.webp → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_bg.webp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_closedoor_normal_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_closedoor_press_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_go_normal_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_go_press_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_normal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_opendoor_normal_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_opendoor_press_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_press.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_stopside_normal_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_stopside_press_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_information_normal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_information_press.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_left_bg_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 760 B

After

Width:  |  Height:  |  Size: 760 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_middle_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 200 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_nor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 KiB

After

Width:  |  Height:  |  Size: 212 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 725 B

After

Width:  |  Height:  |  Size: 725 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select_left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 208 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select_right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 205 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 517 B

After

Width:  |  Height:  |  Size: 517 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_switch_bg_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_order_normal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_order_press.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_soft_normal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_soft_press.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_humb.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_left_select_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 617 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_left_selected_src.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 450 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_max.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_middle_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 KiB

After

Width:  |  Height:  |  Size: 311 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_middle_selected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 KiB

After

Width:  |  Height:  |  Size: 384 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_min.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 943 B

After

Width:  |  Height:  |  Size: 943 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_line_cancle_submit_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_loading.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_loading.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/map_staton_icon.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_map_staton_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_mogo_video_play.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/charger_p_normal.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_normal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_pause_big.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 426 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_pause_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 412 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_big.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_start_big.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 814 B

After

Width:  |  Height:  |  Size: 814 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_small.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_start_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 595 B

0
OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_early_end.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_early_end.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_end.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end_car.png → OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_end_car.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

Some files were not shown because too many files have changed in this diff Show More