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

[6.4.0]

Browse Source 
[bus driver shuttle 合并]
This commit is contained in:
yangyakun
2024-04-12 18:52:09 +08:00
parent 93bb71e37e
commit 65c72a816c
99 changed files with 532 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/bus/driver/build.gradle
View File

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "bus"+project.getName())
}
}
}

3
OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
View File

@@ -15,7 +15,6 @@ import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.temp.EventLogout;
@@ -399,7 +398,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
@Override
public int getStationPanelViewId() {
return R.layout.fragment_och_bus;
return R.layout.bug_fragment_och;
}
@Override

2
OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt
View File

@@ -42,7 +42,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
private lateinit var linearLayoutManager:LinearLayoutManager
private val mData: MutableList<BusQueryLinesResponse.Result> = ArrayList()
override fun getLayoutId(): Int {
return R.layout.activity_bus_switch_line
return R.layout.bus_switch_line
}
override fun createPresenter(): BusLinePresenter {

0
OCH/bus/driver/src/main/res/layout/fragment_och_bus.xml → OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml
View File

0
OCH/bus/driver/src/main/res/layout/activity_bus_switch_line.xml → OCH/bus/driver/src/main/res/layout/bus_switch_line.xml
View File

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

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "bus"+project.getName())
}
}
}

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

@@ -18,7 +18,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "charter"+project.getName())
}
}
}

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

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "charter"+project.getName())
}
}
}

2
OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt
View File

@@ -3,6 +3,7 @@ package com.mogo.och.biz.login.presenter
import androidx.lifecycle.LifecycleOwner
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.mvp.Presenter
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.RegexUtils
@@ -11,6 +12,7 @@ import com.mogo.och.biz.login.callback.ITaxiLoginCallback
import com.mogo.och.biz.login.ui.LoginFragment
import com.mogo.och.biz.login.model.LoginModel
import com.mogo.och.biz.login.model.LoginStatusDefaultModel
import com.mogo.och.common.module.biz.login.BusinessEnum
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
import io.reactivex.Observable

7
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
View File

@@ -8,6 +8,7 @@ import androidx.core.content.ContextCompat
import androidx.core.widget.addTextChangedListener
import com.mogo.commons.mvp.MvpFragment
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -17,6 +18,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.biz.R
import com.mogo.och.biz.login.callback.ILoginViewCallback
import com.mogo.och.biz.login.presenter.LoginPresenter
import com.mogo.och.common.module.biz.login.BusinessEnum
import com.mogo.och.common.module.utils.RxUtils
import kotlinx.android.synthetic.main.biz_login_view.biz_acbtn_login
import kotlinx.android.synthetic.main.biz_login_view.biz_ace_login_phone_value
@@ -25,6 +27,7 @@ import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_get_code
import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_show_sn
import kotlinx.android.synthetic.main.biz_login_view.biz_actv_welcome_login_title
import kotlinx.android.synthetic.main.biz_login_view.biz_cl_driver_main
import kotlinx.android.synthetic.main.biz_login_view.bv_switch_business
import kotlinx.android.synthetic.main.biz_login_view.eiv_Info
@@ -107,6 +110,10 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), ILoginView
}
}
biz_actv_login_show_sn.text = SharedPrefsMgr.getInstance().sn
biz_actv_login_show_sn.setOnLongClickListener {
bv_switch_business.selectBusniess()
true
}
RxUtils.createSubscribe(10_000) {
CallerLogger.d(TAG,"宽度${biz_cl_driver_main.width}----${biz_cl_driver_main.height}----${biz_cl_driver_main.visibility}")
}

8
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
View File

@@ -1,13 +1,16 @@
package com.mogo.och.biz.login.ui
import com.mogo.commons.mvp.MvpFragment
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.och.biz.R
import com.mogo.och.biz.login.callback.ILoginViewCallback
import com.mogo.och.biz.login.presenter.LoginPassengerPresenter
import kotlinx.android.synthetic.main.biz_login_passenger_view.biz_actv_login_show_sn
import kotlinx.android.synthetic.main.biz_login_passenger_view.biz_cl_passenger_main
import kotlinx.android.synthetic.main.biz_login_passenger_view.bv_switch_business
/**
@@ -33,6 +36,11 @@ class LoginPassengerFragment : MvpFragment<LoginPassengerFragment?, LoginPasseng
} else {
biz_cl_passenger_main.setBackgroundResource(R.drawable.biz_login_passenger_2560x1600)
}
biz_actv_login_show_sn.text = SharedPrefsMgr.getInstance().sn
biz_actv_login_show_sn.setOnLongClickListener {
bv_switch_business.selectBusniess()
true
}
CallerLogger.d(TAG,"init")
}

130
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt Normal file
View File

@@ -0,0 +1,130 @@
package com.mogo.och.biz.login.ui.debugview
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.och.biz.R
import com.mogo.och.common.module.biz.login.BusinessEnum
import com.mogo.och.common.module.biz.login.LoginStatusManager
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_bus
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_charter
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_shuttle
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_taxi
import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_countdown
class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback {
private val TAG = "ItineraryView"
constructor(context: Context) : super(context)
constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
private var viewModel: BusinessViewModel? = null
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.biz_login_business_view, this, true)
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
viewModel = findViewTreeViewModelStoreOwner()?.let {
ViewModelProvider(it).get(BusinessViewModel::class.java)
}
viewModel?.setDistanceCallback(this)
actv_business_shuttle.onClick { swtichBusiness(BusinessEnum.Shuttle) }
actv_business_bus.onClick { swtichBusiness(BusinessEnum.Bus) }
actv_business_taxi.onClick { swtichBusiness(BusinessEnum.Taxi) }
actv_business_charter.onClick { swtichBusiness(BusinessEnum.Charter) }
}
private fun swtichBusiness(businessEnum: BusinessEnum){
LoginStatusManager.invokeLBusinessTypeChangeDebug(businessEnum)
visibility = GONE
}
override fun onVisibilityAggregated(isVisible: Boolean) {
super.onVisibilityAggregated(isVisible)
if(isVisible){
}else{
}
}
fun selectBusniess(){
if(FunctionBuildConfig.supportBusiness.size==1){
FunctionBuildConfig.supportBusiness.forEach {
when (it) {
"shuttle" -> {
swtichBusiness(BusinessEnum.Shuttle)
}
"bus" -> {
swtichBusiness(BusinessEnum.Bus)
}
"taxi" -> {
swtichBusiness(BusinessEnum.Taxi)
}
"charter" -> {
swtichBusiness(BusinessEnum.Charter)
}
else -> {}
}
}
}else {
visibility = VISIBLE
actv_business_shuttle.visibility = GONE
actv_business_bus.visibility = GONE
actv_business_taxi.visibility = GONE
actv_business_charter.visibility = GONE
FunctionBuildConfig.supportBusiness.forEach {
when (it) {
"shuttle" -> {
actv_business_shuttle.visibility = VISIBLE
}
"bus" -> {
actv_business_bus.visibility = VISIBLE
}
"taxi" -> {
actv_business_taxi.visibility = VISIBLE
}
"charter" -> {
actv_business_charter.visibility = VISIBLE
}
else -> {}
}
}
}
}
init {
try {
initView()
} catch (e: Exception) {
e.printStackTrace()
}
}
}

42
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessViewModel.kt Normal file
View File

@@ -0,0 +1,42 @@
package com.mogo.och.biz.login.ui.debugview
import androidx.lifecycle.ViewModel
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.biz.R
import com.mogo.och.common.module.utils.RxUtils
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import java.util.concurrent.TimeUnit
class BusinessViewModel : ViewModel() {
private val TAG = BusinessViewModel::class.java.simpleName
private var viewCallback: IErrorInfoViewCallback? = null
init {
}
fun setDistanceCallback(viewCallback: IErrorInfoViewCallback) {
this.viewCallback = viewCallback
}
override fun onCleared() {
super.onCleared()
this.viewCallback = null
}
interface IErrorInfoViewCallback {
}
}

1
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt
View File

@@ -7,6 +7,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.och.biz.R
import com.mogo.och.biz.login.ui.debugview.BusinessViewModel
import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_countdown

3
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoViewModel.kt
View File

@@ -5,6 +5,7 @@ import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.biz.R
import com.mogo.och.biz.login.ui.debugview.BusinessViewModel
import com.mogo.och.common.module.utils.RxUtils
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -14,7 +15,7 @@ import java.util.concurrent.TimeUnit
class ErrorInfoViewModel : ViewModel() {
private val TAG = ErrorInfoViewModel::class.java.simpleName
private val TAG = BusinessViewModel::class.java.simpleName
private var viewCallback: IErrorInfoViewCallback? = null

66
OCH/common/biz/src/main/res/layout/biz_login_business_view.xml Normal file
View File

@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_300"
android:background="@drawable/biz_login_error_info">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_business_bus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:text="小巴"
android:textColor="@color/white"
app:layout_constraintBottom_toTopOf="@+id/actv_business_charter"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_business_charter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:gravity="center"
android:text="包车"
android:textColor="@color/white"
app:layout_constraintBottom_toTopOf="@+id/actv_business_shuttle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_business_bus" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_business_shuttle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:gravity="center"
android:text="接驳"
android:textColor="@color/white"
app:layout_constraintBottom_toTopOf="@+id/actv_business_taxi"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_business_charter" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_business_taxi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:gravity="center"
android:text="出租车"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_business_shuttle" />
</androidx.constraintlayout.widget.ConstraintLayout>

22
OCH/common/biz/src/main/res/layout/biz_login_passenger_view.xml
View File

@@ -6,4 +6,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.mogo.och.biz.login.ui.debugview.BusinessView
android:id="@+id/bv_switch_business"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/biz_actv_login_show_sn"
android:textSize="@dimen/dp_30"
android:textColor="@android:color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_50"
android:layout_marginBottom="@dimen/dp_40"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>

10
OCH/common/biz/src/main/res/layout/biz_login_view.xml
View File

@@ -138,5 +138,15 @@
android:layout_width="@dimen/dp_939"
android:layout_height="@dimen/dp_710"/>
<com.mogo.och.biz.login.ui.debugview.BusinessView
android:id="@+id/bv_switch_business"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>

22
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt
View File

@@ -30,22 +30,22 @@ class OchCommonConst {
const val BIZ_LOGIN = "/ochbiz/common/login"
const val BUS_DRIVER = "/bus/driver"
const val BUS_PASSENGER = "/bus/passenger"
const val BUS_DRIVER = "/bus/busdriver"
const val BUS_PASSENGER = "/bus/buspassenger"
const val CHARTER_DRIVER = "/charter/driver"
const val CHARTER_PASSENGER = "/charter/passenger"
const val CHARTER_DRIVER = "/charter/charterdriver"
const val CHARTER_PASSENGER = "/charter/charterpassenger"
const val SHUTTLE_DRIVER = "/shuttle/driver"
const val SHUTTLE_PASSENGER = "/shuttle/passenger"
const val SHUTTLE_DRIVER = "/shuttle/shuttledriver"
const val SHUTTLE_PASSENGER = "/shuttle/shuttlepassenger"
const val SWEEPER_DRIVER = "/sweeper/driver"
const val SWEEPER_DRIVER = "/sweeper/sweeperdriver"
const val TAXI_DRIVER = "/taxi/driver"
const val TAXI_PASSENGER = "/taxi/passenger"
const val TAXI_DRIVER = "/taxi/taxidriver"
const val TAXI_PASSENGER = "/taxi/taxipassenger"
const val TAXI_UNMANNED_DRIVER = "/taxiunman/driver"
const val TAXI_UNMANNED_PASSENGER = "/taxiunman/passenger"
const val TAXI_UNMANNED_DRIVER = "/taxiunman/taxiunmandriver"
const val TAXI_UNMANNED_PASSENGER = "/taxiunman/taxiunmanpassenger"
const val BUSINESS_STRING = 100

1
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/ILoginCallback.java
View File

@@ -8,5 +8,6 @@ public interface ILoginCallback {
default void onStatusChange(LoginStatusEnum currentStatus){}
default void onBusinessChange(BusinessEnum businessEnum){}
default void onBusinessChangeDebug(BusinessEnum businessEnum){}
}

6
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt
View File

@@ -95,6 +95,12 @@ object LoginStatusManager : CallerBase<ILoginCallback>() {
listener.onBusinessChange(currentStatus)
}
}
fun invokeLBusinessTypeChangeDebug(currentStatus: BusinessEnum) {
M_LISTENERS.forEach {
val listener = it.value
listener.onBusinessChangeDebug(currentStatus)
}
}
@JvmStatic
fun checkBusiness(businessType: Int):Boolean {

7
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt
View File

@@ -1,7 +1,10 @@
package com.mogo.och.common.module.biz.network.interceptor
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseData
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.biz.login.LoginStatusEnum
import io.reactivex.Observable
@@ -16,7 +19,9 @@ class FRetryWithTime<T : BaseData> : Function<T, ObservableSource<T>> {
MoGoAiCloudClient.getInstance().refreshToken()
return Observable.error(OchCommonRetryException())
}else if(it.code == 1003){
LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout)
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout)
}
}
}
return Observable.just(baseData)

19
OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
View File

@@ -21,12 +21,10 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst
import com.mogo.och.common.module.biz.login.BusinessEnum
import com.mogo.och.common.module.biz.login.ILoginCallback
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.biz.login.LoginStatusManager.queryLoginStatusByNet
import com.mogo.och.common.module.biz.login.LoginStatusEnum
import com.mogo.och.common.module.biz.provider.CommonService
import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager
import com.mogo.och.common.module.utils.ProjectUtils
import org.greenrobot.eventbus.EventBus
/**
* 网约车小巴业务实现入口
@@ -40,9 +38,9 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
private var commonService: CommonService? = null
override fun init(context: Context) {
d(TAG, "FacadeProvider:init")
LoginStatusManager.addListener(TAG, this)
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
LoginStatusManager.addListener(TAG, this)
queryLoginStatusByNet()
LoginStatusManager.queryLoginStatusByNet()
}
}
@@ -149,6 +147,19 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
}
}
override fun onBusinessChangeDebug(businessEnum: BusinessEnum) {
onBusinessChange(businessEnum)
val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
val fragment = getFragment()
d(TAG, "切换 fragment:${fragment}")
if (supportFragmentManager != null) {
val back = supportFragmentManager.beginTransaction()
back.replace(containerId, fragment, fragment.tag)
back.commit()
}
}
private fun injectStatusBar() {
activity?.let {

2
OCH/shuttle/driver/build.gradle
View File

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "shuttle"+project.getName())
}
}
}

6
OCH/shuttle/driver/src/main/AndroidManifest.xml
View File

@@ -1,16 +1,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.och.bus">
package="com.mogo.och.shuttle">
<application>
<!--这里是为了测试增加的广播-->
<receiver android:name=".receiver.TestBusBroadcastReceiver">
<receiver android:name="com.mogo.och.shuttle.receiver.TestBusBroadcastReceiver">
<intent-filter>
<action android:name="com.bus.test_control" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</receiver>
<activity android:name=".ui.BusSwitchLineActivity"
<activity android:name="com.mogo.och.shuttle.ui.BusSwitchLineActivity"
android:theme="@style/SwitchLineDialogStyle"
android:launchMode="singleTask"
android:screenOrientation="landscape" />

5
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ShuttleDriverProvider.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt
View File

@@ -1,13 +1,12 @@
package com.mogo.och.bus
package com.mogo.och.shuttle
import android.content.Context
import androidx.fragment.app.Fragment
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.bus.fragment.ShuttleFragment
import com.mogo.och.shuttle.fragment.ShuttleFragment
import com.mogo.och.common.module.biz.constant.OchCommonConst
import com.mogo.och.common.module.biz.provider.CommonService
import com.mogo.och.common.module.biz.provider.CommonServiceImpl
/**

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.och.common.module.utils.DateTimeUtil;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOperationStatusRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
/**
* @author congtaowang

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryWriteOffPassengersResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.och.common.module.utils.DateTimeUtil;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetLineStatusRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutePlanningUpdateReqBean.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import java.util.List;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.och.data.bean.BusRoutesResult;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusWriteOffPassengersQueryRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

5
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/CarHeartbeatReqBean.java
View File

@@ -1,6 +1,7 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.och.bus.constant.BusConst;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.constant.BusConst;
import java.util.UUID;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffCountResponse.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.bean;
package com.mogo.och.shuttle.bean;
import java.io.Serializable;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.callback;
package com.mogo.och.shuttle.callback;
/**
* Created on 2021/9/8

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.callback;
package com.mogo.och.shuttle.callback;
import com.mogo.eagle.core.data.map.MogoLocation;

6
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java
View File

@@ -1,7 +1,7 @@
package com.mogo.och.bus.callback;
package com.mogo.och.shuttle.callback;
import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
/**
* @author: wangmingjun

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.callback;
package com.mogo.och.shuttle.callback;
import com.mogo.och.data.bean.BusStationBean;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.callback;
package com.mogo.och.shuttle.callback;
/**
* @author: wangmingjun

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.constant
package com.mogo.och.shuttle.constant
import com.mogo.commons.debug.DebugConfig

14
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseShuttleTabFragment.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
View File

@@ -1,6 +1,6 @@
package com.mogo.och.bus.fragment;
package com.mogo.och.shuttle.fragment;
import static com.mogo.och.bus.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL;
import static com.mogo.och.shuttle.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL;
import android.animation.ObjectAnimator;
import android.os.Bundle;
@@ -41,12 +41,12 @@ import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.listener.MogoMapListenerHandler;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.och.bus.R;
import com.mogo.och.bus.ui.ShuttleTrafficDataView;
import com.mogo.och.bus.view.BizMapView;
import com.mogo.och.shuttle.R;
import com.mogo.och.shuttle.ui.ShuttleTrafficDataView;
import com.mogo.och.shuttle.view.BizMapView;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.bus.model.OrderModel;
import com.mogo.och.bus.view.SlidePanelView;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.shuttle.view.SlidePanelView;
import com.mogo.och.common.module.utils.SoundPoolHelper;
import org.greenrobot.eventbus.EventBus;

17
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/ShuttleFragment.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.fragment;
package com.mogo.och.shuttle.fragment;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import static com.mogo.map.MogoMap.DEFAULT;
@@ -15,7 +15,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import androidx.annotation.Nullable;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.temp.EventLogout;
@@ -29,13 +28,13 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.map.overlay.IMoGoOverlayManager;
import com.mogo.map.overlay.core.Level;
import com.mogo.map.overlay.point.Point;
import com.mogo.och.bus.R;
import com.mogo.och.shuttle.R;
import com.mogo.och.data.bean.BusStationBean;
import com.mogo.och.bus.constant.BusConst;
import com.mogo.och.bus.presenter.BusPresenter;
import com.mogo.och.bus.ui.BusStationCommonItem;
import com.mogo.och.bus.ui.BusSwitchLineActivity;
import com.mogo.och.bus.view.SlidePanelView;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.presenter.BusPresenter;
import com.mogo.och.shuttle.ui.BusStationCommonItem;
import com.mogo.och.shuttle.ui.BusSwitchLineActivity;
import com.mogo.och.shuttle.view.SlidePanelView;
import com.mogo.och.common.module.utils.BlinkAnimationUtil;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.common.module.utils.QRUtilsKt;
@@ -406,7 +405,7 @@ public class ShuttleFragment extends BaseShuttleTabFragment<ShuttleFragment, Bus
@Override
public int getStationPanelViewId() {
return R.layout.fragment_och_bus;
return R.layout.shuttle_fragment_och;
}
@Override

16
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/BusLineModel.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.model;
package com.mogo.och.shuttle.model;
import android.content.Context;
@@ -6,13 +6,13 @@ import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.bus.R;
import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.bus.bean.BusRoutesResponse;
import com.mogo.och.bus.callback.IBusLinesCallback;
import com.mogo.och.bus.net.OrderServiceManager;
import com.mogo.och.bus.ui.BusSwitchLineActivity;
import com.mogo.och.shuttle.R;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.callback.IBusLinesCallback;
import com.mogo.och.shuttle.net.OrderServiceManager;
import com.mogo.och.shuttle.ui.BusSwitchLineActivity;
import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
/**

34
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
View File

@@ -1,16 +1,15 @@
package com.mogo.och.bus.model;
package com.mogo.och.shuttle.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import static com.mogo.och.bus.constant.BusConst.DELAY_10S;
import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_ARRIVING;
import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_STOPPED;
import static com.mogo.och.shuttle.constant.BusConst.DELAY_10S;
import static com.mogo.och.shuttle.constant.BusConst.STATION_STATUS_ARRIVING;
import static com.mogo.och.shuttle.constant.BusConst.STATION_STATUS_STOPPED;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.alibaba.android.arouter.launcher.ARouter;
import com.elegant.network.utils.GsonUtil;
import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
@@ -21,8 +20,8 @@ import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.och.bus.bean.BusRoutesResponse;
import com.mogo.och.bus.util.ShuttleVoiceManager;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.util.ShuttleVoiceManager;
import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg;
import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg;
import com.mogo.och.common.module.bean.dpmsg.DPMsgType;
@@ -47,17 +46,17 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.bus.R;
import com.mogo.och.shuttle.R;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.bus.callback.IBusADASStatusCallback;
import com.mogo.och.bus.callback.IBusControllerStatusCallback;
import com.mogo.och.bus.callback.IRefreshBusStationsCallback;
import com.mogo.och.bus.callback.ISlidePannelHideCallback;
import com.mogo.och.bus.constant.BusConst;
import com.mogo.och.bus.net.OrderServiceManager;
import com.mogo.och.bus.util.BusAnalyticsManager;
import com.mogo.och.bus.util.BusSendTripInfoManager;
import com.mogo.och.bus.util.BusTrajectoryManager;
import com.mogo.och.shuttle.callback.IBusADASStatusCallback;
import com.mogo.och.shuttle.callback.IBusControllerStatusCallback;
import com.mogo.och.shuttle.callback.IRefreshBusStationsCallback;
import com.mogo.och.shuttle.callback.ISlidePannelHideCallback;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.net.OrderServiceManager;
import com.mogo.och.shuttle.util.BusAnalyticsManager;
import com.mogo.och.shuttle.util.BusSendTripInfoManager;
import com.mogo.och.shuttle.util.BusTrajectoryManager;
import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager;
import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
@@ -79,7 +78,6 @@ import java.util.List;
import io.reactivex.exceptions.UndeliverableException;
import io.reactivex.functions.Consumer;
import io.reactivex.plugins.RxJavaPlugins;
import mogo.telematics.pad.MessagePad;
/**
* @author congtaowang

15
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/TicketModel.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt
View File

@@ -1,9 +1,8 @@
package com.mogo.och.bus.model
package com.mogo.och.shuttle.model
import com.elegant.network.utils.GsonUtil
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.msgbox.MsgBoxBean
import com.mogo.eagle.core.data.msgbox.MsgBoxType
@@ -15,10 +14,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.och.bus.bean.WriteOffCountResponse
import com.mogo.och.bus.bean.WriteOffPassenger
import com.mogo.och.bus.net.OrderServiceManager
import com.mogo.och.bus.util.ShuttleVoiceManager
import com.mogo.och.shuttle.bean.WriteOffCountResponse
import com.mogo.och.shuttle.bean.WriteOffPassenger
import com.mogo.och.shuttle.net.OrderServiceManager
import com.mogo.och.shuttle.util.ShuttleVoiceManager
import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
import com.mogo.och.common.module.bean.dpmsg.DPMsgType
import com.mogo.och.common.module.bean.dpmsg.WriteOffDevicesMsg
@@ -54,7 +53,9 @@ object TicketModel : IReceivedMsgListener, IMogoOnMessageListener<WriteOffPassen
}
fun load(){
BizLoopManager.setLoopFunction(SELECTWRITEOFFCOUNT, LoopInfo(3,::selectWriteOffCount,scheduler = Schedulers.io()))
BizLoopManager.setLoopFunction(
SELECTWRITEOFFCOUNT, LoopInfo(3,
TicketModel::selectWriteOffCount,scheduler = Schedulers.io()))
}
// 收到局域网的核验信息

24
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java
View File

@@ -1,16 +1,16 @@
package com.mogo.och.bus.net;
package com.mogo.och.shuttle.net;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.och.bus.bean.BusCloseTaskRequest;
import com.mogo.och.bus.bean.BusOrdersResponse;
import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.bus.bean.BusQueryLineStationsRequest;
import com.mogo.och.bus.bean.BusRoutesResponse;
import com.mogo.och.bus.bean.QueryLeaveAwayPassengersRequest;
import com.mogo.och.bus.bean.QueryLeaveAwayPassengersResponse;
import com.mogo.och.bus.bean.BusResetDrivingLineRequest;
import com.mogo.och.bus.bean.BusUpdateSiteStatusRequest;
import com.mogo.och.bus.bean.WriteOffCountResponse;
import com.mogo.och.shuttle.bean.BusCloseTaskRequest;
import com.mogo.och.shuttle.bean.BusOrdersResponse;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.bean.BusQueryLineStationsRequest;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersRequest;
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersResponse;
import com.mogo.och.shuttle.bean.BusResetDrivingLineRequest;
import com.mogo.och.shuttle.bean.BusUpdateSiteStatusRequest;
import com.mogo.och.shuttle.bean.WriteOffCountResponse;
import io.reactivex.Observable;
import retrofit2.http.Body;

14
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt
View File

@@ -1,16 +1,26 @@
package com.mogo.och.bus.net
package com.mogo.och.shuttle.net
import android.content.Context
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.eagle.core.data.BaseData
import com.mogo.eagle.core.network.MoGoRetrofitFactory
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.och.bus.bean.*
import com.mogo.och.common.module.biz.constant.OchCommonConst
import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
import com.mogo.och.common.module.biz.network.interceptor.transformIoTry
import com.mogo.och.common.module.biz.network.interceptor.transformTry
import com.mogo.och.shuttle.bean.BusCloseTaskRequest
import com.mogo.och.shuttle.bean.BusOrdersResponse
import com.mogo.och.shuttle.bean.BusQueryLineStationsRequest
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse
import com.mogo.och.shuttle.bean.BusQueryLinesResponse
import com.mogo.och.shuttle.bean.BusResetDrivingLineRequest
import com.mogo.och.shuttle.bean.BusRoutesResponse
import com.mogo.och.shuttle.bean.BusUpdateSiteStatusRequest
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersRequest
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersResponse
import com.mogo.och.shuttle.bean.WriteOffCountResponse
/**
* @author: wangmingjun

14
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.presenter;
package com.mogo.och.shuttle.presenter;
import android.os.Looper;
@@ -7,12 +7,12 @@ import androidx.lifecycle.LifecycleOwner;
import com.mogo.commons.mvp.Presenter;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.bus.callback.IBusLinesCallback;
import com.mogo.och.bus.model.BusLineModel;
import com.mogo.och.bus.model.OrderModel;
import com.mogo.och.bus.ui.BusSwitchLineView;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.callback.IBusLinesCallback;
import com.mogo.och.shuttle.model.BusLineModel;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.shuttle.ui.BusSwitchLineView;
import java.util.concurrent.TimeUnit;

13
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusModelLoopManager.java
View File

@@ -1,17 +1,6 @@
package com.mogo.och.bus.presenter;
package com.mogo.och.shuttle.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.bus.constant.BusConst;
import com.mogo.och.bus.model.OrderModel;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
/**
* Created on 2021/11/22

16
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.presenter;
package com.mogo.och.shuttle.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
@@ -20,13 +20,13 @@ import com.mogo.och.common.module.manager.autopilotmanager.autopilot.ArrivedStat
import com.mogo.och.common.module.manager.autopilotmanager.autopilot.IOchAutopilotStatusListener;
import com.mogo.och.common.module.manager.autopilotmanager.autopilot.OchAutoPilotStatusListenerManager;
import com.mogo.och.data.bean.BusStationBean;
import com.mogo.och.bus.callback.IBusADASStatusCallback;
import com.mogo.och.bus.callback.IBusControllerStatusCallback;
import com.mogo.och.bus.callback.IRefreshBusStationsCallback;
import com.mogo.och.bus.callback.ISlidePannelHideCallback;
import com.mogo.och.bus.fragment.ShuttleFragment;
import com.mogo.och.bus.model.OrderModel;
import com.mogo.och.bus.util.BusTrajectoryManager;
import com.mogo.och.shuttle.callback.IBusADASStatusCallback;
import com.mogo.och.shuttle.callback.IBusControllerStatusCallback;
import com.mogo.och.shuttle.callback.IRefreshBusStationsCallback;
import com.mogo.och.shuttle.callback.ISlidePannelHideCallback;
import com.mogo.och.shuttle.fragment.ShuttleFragment;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.shuttle.util.BusTrajectoryManager;
import com.mogo.och.common.module.biz.login.ILoginCallback;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/receiver/TestBusBroadcastReceiver.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.receiver;
package com.mogo.och.shuttle.receiver;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
@@ -7,7 +7,7 @@ import android.content.Context;
import android.content.Intent;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.bus.constant.BusConst;
import com.mogo.och.shuttle.constant.BusConst;
/**
* 测试小巴车的场景

8
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/BusStationCommonItem.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui
package com.mogo.och.shuttle.ui
import android.content.Context
import android.util.AttributeSet
@@ -6,9 +6,9 @@ import android.view.LayoutInflater
import android.widget.ImageView
import android.widget.LinearLayout
import androidx.core.content.ContextCompat
import com.mogo.och.bus.R
import com.mogo.och.shuttle.R
import com.mogo.och.common.module.utils.BlinkAnimationUtil
import kotlinx.android.synthetic.main.bus_stations_common_item.view.*
import kotlinx.android.synthetic.main.shuttle_stations_common_item.view.*
/**
* @author: wangmingjun
@@ -21,7 +21,7 @@ class BusStationCommonItem @JvmOverloads constructor(
) : LinearLayout(context, attrs, defStyleAttr){
init {
LayoutInflater.from(context).inflate(R.layout.bus_stations_common_item,this,true)
LayoutInflater.from(context).inflate(R.layout.shuttle_stations_common_item,this,true)
}
fun setStationName(name: String){

20
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineActivity.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui
package com.mogo.och.shuttle.ui
import android.graphics.Point
import android.os.Bundle
@@ -13,14 +13,14 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.commons.mvp.MvpActivity
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.och.bus.presenter.BusLinePresenter
import com.mogo.och.bus.ui.adapter.SwitchLineAdapter
import com.mogo.och.bus.bean.BusQueryLinesResponse
import com.mogo.och.bus.ui.adapter.OpenItemAnimator
import com.mogo.och.shuttle.presenter.BusLinePresenter
import com.mogo.och.shuttle.ui.adapter.SwitchLineAdapter
import com.mogo.och.shuttle.bean.BusQueryLinesResponse
import com.mogo.och.shuttle.ui.adapter.OpenItemAnimator
import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.bus.R
import com.mogo.och.bus.bean.BusQueryLineTaskResponse
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse
import java.util.ArrayList
/**
@@ -42,7 +42,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
private lateinit var linearLayoutManager:LinearLayoutManager
private val mData: MutableList<BusQueryLinesResponse.Result> = ArrayList()
override fun getLayoutId(): Int {
return R.layout.activity_bus_switch_line
return R.layout.shuttle_switch_line
}
override fun createPresenter(): BusLinePresenter {
@@ -80,7 +80,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
)
mLinesListView.setAdapter(mAdapter)
//设置item 点击事件
mAdapter.setOnLineItemClickListener(object :SwitchLineAdapter.LineItemClickListener{
mAdapter.setOnLineItemClickListener(object : SwitchLineAdapter.LineItemClickListener{
override fun onItemClick(position: Int, close: Boolean) {
mPresenter?.queryBusLineTasks(mData[position].lineId, position, close)
}
@@ -146,7 +146,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
finish()
}
override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int,autoRefresh:Boolean) {
override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int, autoRefresh:Boolean) {
val result = mData[position]
if (result.taskList == null) {
result.taskList = ArrayList()

6
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java
View File

@@ -1,8 +1,8 @@
package com.mogo.och.bus.ui;
package com.mogo.och.shuttle.ui;
import com.mogo.commons.mvp.IView;
import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
/**
* @author: wangmingjun

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTapPositionView.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTapPositionView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui;
package com.mogo.och.shuttle.ui;
import android.content.Context;
import android.content.res.TypedArray;
@@ -12,7 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.och.bus.R;
import com.mogo.och.shuttle.R;
import org.jetbrains.annotations.NotNull;

5
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTrafficDataView.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTrafficDataView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui;
package com.mogo.och.shuttle.ui;
import static com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING;
@@ -24,9 +24,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisBrakeStateListen
import com.mogo.eagle.core.function.call.autopilot.CallerChassisGearStateListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerChassisThrottleStateListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager;
import com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.och.bus.R;
import com.mogo.och.shuttle.R;
import org.jetbrains.annotations.NotNull;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui.adapter;
package com.mogo.och.shuttle.ui.adapter;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;

10
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui.adapter
package com.mogo.och.shuttle.ui.adapter
import android.content.Context
import android.view.LayoutInflater
@@ -9,9 +9,9 @@ import androidx.appcompat.widget.AppCompatTextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.och.bus.R
import com.mogo.och.bus.bean.BusQueryLinesResponse
import com.mogo.och.bus.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.bean.BusQueryLinesResponse
import com.mogo.och.shuttle.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder
import kotlin.text.StringBuilder
/**
@@ -33,7 +33,7 @@ class SwitchLineAdapter(
viewType: Int
): SwitchLineViewHolder {
val view = LayoutInflater.from(mContext).inflate(
R.layout.bus_switch_line_list_item, parent, false
R.layout.shuttle_switch_line_list_item, parent, false
)
return SwitchLineViewHolder(view)
}

10
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui.adapter
package com.mogo.och.shuttle.ui.adapter
import android.content.Context
import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.och.bus.R
import com.mogo.och.bus.bean.BusQueryLineTaskResponse
import com.mogo.och.bus.ui.adapter.SwitchLineTaskAdapter.SwitchLineTaskViewHolder
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse
import com.mogo.och.shuttle.ui.adapter.SwitchLineTaskAdapter.SwitchLineTaskViewHolder
/**
* 路线列表adapter
@@ -22,7 +22,7 @@ class SwitchLineTaskAdapter(
) : RecyclerView.Adapter<SwitchLineTaskViewHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SwitchLineTaskViewHolder {
val view = LayoutInflater.from(mContext).inflate(
R.layout.bus_switch_line_list_task_item, parent, false
R.layout.shuttle_switch_line_list_task_item, parent, false
)
return SwitchLineTaskViewHolder(view)
}

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffView.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.ui.writeoff
package com.mogo.och.shuttle.ui.writeoff
import android.content.Context
import android.util.AttributeSet
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.och.bus.R
import com.mogo.och.shuttle.R
import kotlinx.android.synthetic.main.shuttle_wirte_off_view.view.tv_write_off_count
class WriteOffView : ConstraintLayout, WriteOffViewModel.IwriteOffViewCallback {

6
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffViewModel.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt
View File

@@ -1,11 +1,11 @@
package com.mogo.och.bus.ui.writeoff
package com.mogo.och.shuttle.ui.writeoff
import androidx.lifecycle.ViewModel
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.bus.R
import com.mogo.och.bus.model.TicketModel
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.model.TicketModel
import com.mogo.och.common.module.utils.RxUtils
import io.reactivex.Observable
import io.reactivex.Observer

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.util;
package com.mogo.och.shuttle.util;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
@@ -13,7 +13,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.bus.constant.BusConst;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
import java.util.HashMap;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.util
package com.mogo.och.shuttle.util
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d

6
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.util;
package com.mogo.och.shuttle.util;
import androidx.annotation.Nullable;
@@ -8,8 +8,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.GsonUtils;
import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.bus.constant.BusConst;
import com.mogo.och.bus.model.OrderModel;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import java.util.concurrent.TimeUnit;

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/ShuttleVoiceManager.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt
View File

@@ -1,10 +1,10 @@
package com.mogo.och.bus.util
package com.mogo.och.shuttle.util
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.och.bus.R
import com.mogo.och.shuttle.R
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.tts.base.LangTtsEntity
import com.mogo.tts.base.LanguageType

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.view
package com.mogo.och.shuttle.view
import android.content.Context
import android.os.Bundle
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.view.MapBizView
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.map.uicontroller.IMogoMapUIController
import com.mogo.och.bus.R
import com.mogo.och.shuttle.R
/**
* 魔戒蓝牙控件

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BusArcView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.view;
package com.mogo.och.shuttle.view;
import android.animation.ValueAnimator;
import android.content.Context;
@@ -15,7 +15,7 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.mogo.och.bus.R;
import com.mogo.och.shuttle.R;
/**
* created by wujifei on 2021/3/24 16:20

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/NoTouchConstraintLayout.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.view;
package com.mogo.och.shuttle.view;
import android.content.Context;
import android.util.AttributeSet;

4
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.view;
package com.mogo.och.shuttle.view;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
@@ -26,7 +26,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.ConvertUtils;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.bus.R;
import com.mogo.och.shuttle.R;
import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager;
import me.jessyan.autosize.AutoSizeConfig;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java → OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.view;
package com.mogo.och.shuttle.view;
import android.content.Context;
import android.graphics.Canvas;

10
OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72">
<com.mogo.och.bus.view.BizMapView
<com.mogo.och.shuttle.view.BizMapView
android:id="@+id/mapBizView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
@@ -29,7 +29,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.mogo.och.bus.ui.ShuttleTrafficDataView
<com.mogo.och.shuttle.ui.ShuttleTrafficDataView
android:id="@+id/bus_arc"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -206,7 +206,7 @@
<include
android:id="@+id/module_mogo_och_bus_test_bar"
layout="@layout/bus_test_bar_view"
layout="@layout/shuttle_test_bar_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
@@ -215,7 +215,7 @@
tools:visibility="visible" />
<com.mogo.och.bus.ui.writeoff.WriteOffView
<com.mogo.och.shuttle.ui.writeoff.WriteOffView
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/module_mogo_och_arrived_tv"
android:layout_marginStart="@dimen/dp_15"
@@ -307,7 +307,7 @@
android:src="@drawable/icon_ai_collect" />
</RelativeLayout>
<com.mogo.och.bus.view.SlidePanelView
<com.mogo.och.shuttle.view.SlidePanelView
android:id="@+id/module_mogo_och_slide_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

8
OCH/shuttle/driver/src/main/res/layout/fragment_och_bus.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_fragment_och.xml
View File

@@ -66,7 +66,7 @@
app:layout_constraintRight_toRightOf="@+id/line1"
app:layout_constraintTop_toBottomOf="@+id/line1" />
<com.mogo.och.bus.ui.BusStationCommonItem
<com.mogo.och.shuttle.ui.BusStationCommonItem
android:id="@+id/bus_panel_first_station"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
app:layout_constraintRight_toRightOf="@+id/bus_task_time_tv"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line2"/>
<com.mogo.och.bus.ui.BusStationCommonItem
<com.mogo.och.shuttle.ui.BusStationCommonItem
android:id="@+id/bus_panel_second_station"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
app:layout_constraintRight_toRightOf="@+id/bus_task_time_tv"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bus_panel_first_station"/>
<com.mogo.och.bus.ui.BusStationCommonItem
<com.mogo.och.shuttle.ui.BusStationCommonItem
android:id="@+id/bus_panel_third_station"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<include layout="@layout/bus_no_line_view"
<include layout="@layout/shuttle_no_line_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_160"

0
OCH/shuttle/driver/src/main/res/layout/bus_no_data_common_view.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_no_data_common_view.xml
View File

0
OCH/shuttle/driver/src/main/res/layout/bus_no_line_view.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_no_line_view.xml
View File

0
OCH/shuttle/driver/src/main/res/layout/bus_stations_common_item.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_stations_common_item.xml
View File

2
OCH/shuttle/driver/src/main/res/layout/activity_bus_switch_line.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_switch_line.xml
View File

@@ -66,7 +66,7 @@
<include
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/bus_no_data_common_view"
layout="@layout/shuttle_no_data_common_view"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

0
OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_item.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_switch_line_list_item.xml
View File

0
OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_task_item.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_switch_line_list_task_item.xml
View File

0
OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml → OCH/shuttle/driver/src/main/res/layout/shuttle_test_bar_view.xml
View File

2
OCH/shuttle/driver/src/main/res/layout/shuttle_traffic_data.xml
View File

@@ -45,7 +45,7 @@
app:layout_constraintRight_toRightOf="@+id/speedImage"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.och.bus.ui.ShuttleTapPositionView
<com.mogo.och.shuttle.ui.ShuttleTapPositionView
android:id="@+id/traffic_position"
android:layout_width="@dimen/dp_220"
android:layout_height="wrap_content"

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

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "shuttle"+project.getName())
}
}
}

2
OCH/sweeper/driver/build.gradle
View File

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "sweeper"+project.getName())
arg("room.schemaLocation", "$projectDir/schemas".toString())
}
}

2
OCH/taxi/driver/build.gradle
View File

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "taxi"+project.getName())
}
}
}

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

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "taxi"+project.getName())
}
}
}

4
OCH/taxi/unmanned-driver/build.gradle
View File

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion rootProject.ext.android.compileSdkVersion
// buildToolsVersion rootProject.ext.android.buildToolsVersion
// buildToolsVersion rootProject.ext.androiwd.buildToolsVersion
defaultConfig {
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
arg("AROUTER_MODULE_NAME", "taxiunmanned"+project.getName())
}
}
}

2
OCH/taxi/unmanned-passenger/build.gradle
View File

@@ -17,7 +17,7 @@ android {
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
arguments = [AROUTER_MODULE_NAME: "taxiunmanned"+project.getName()]
}
}
}

2
app/script/projectFlavors/project.gradle
View File

@@ -8,7 +8,7 @@ project.android.productFlavors {
buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'musicUrlConfig', "\"${readMusicUrlConfigFromJsonFile("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'supportProduct', "\"${readProductWithVehicleConfigFromJsonFile("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'supportBusiness', "\"${readProductWithVehicleConfigFromJsonFile("mogo").replace("\"", "\\\"")}\""
}
yantai {
dimension "project"

2
app/script/utils.gradle
View File

@@ -47,7 +47,7 @@ Object readProductWithVehicleConfigFromJsonFile(env){
def getKey = flavorNames
config.get(env).each {key, value ->
// 匹配flavor对应的 json
println "对比${flavorNames.toLowerCase()}---------${key}---${value}"
println "${env}____ 对比${flavorNames.toLowerCase()}---------${key}---${value}"
if(flavorNames.toLowerCase().contains("${env}${key.toLowerCase()}")){
getKey = key
println "对比结果${flavorNames.toLowerCase()}---------${key}"