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

[6.4.0]

Browse Source 
[sweeper 不配置支持的类型]
This commit is contained in:
yangyakun
2024-04-15 14:06:44 +08:00
parent 65c72a816c
commit 32b48c1dfa
5 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
View File

@@ -32,21 +32,21 @@ class LoginProvider : LoginService {
private lateinit var loginFragment: Fragment
private var loginStatus: LoginStatusEnum = LoginStatusEnum.None
private var businessEnum: BusinessEnum = BusinessEnum.None
private var loginInfo: LoginInfo?=null
private var loginInfo: LoginInfo? = null
override fun init(context: Context) {
CallerLogger.d(tag,"LoginProvider init")
loginFragment= if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
CallerLogger.d(tag, "LoginProvider init")
loginFragment = if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
LoginFragment()
}else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
} else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
LoginPassengerFragment()
}else{
} else {
LoginFragment()
}
}
override fun getFragment(): Fragment {
CallerLogger.d(tag,"getFragment:${loginFragment}")
CallerLogger.d(tag, "getFragment:${loginFragment}")
return loginFragment
}
@@ -55,14 +55,16 @@ class LoginProvider : LoginService {
}
override fun setLoginStatus(status: Int) {
CallerLogger.d(tag,"setLoginStatus:${status}")
CallerLogger.d(tag, "setLoginStatus:${status}")
when (status) {
0 -> {
setLoginStatus(LoginStatusEnum.Logout)
}
1 -> {
setLoginStatus(LoginStatusEnum.Login)
}
else -> {
setLoginStatus(LoginStatusEnum.None)
}
@@ -70,12 +72,12 @@ class LoginProvider : LoginService {
}
override fun queryLoginStatusByNet() {
CallerLogger.d(tag,"queryLoginStatusByNet")
CallerLogger.d(tag, "queryLoginStatusByNet")
LoginStatusDefaultModel.queryCarStatus()
}
override fun loginOut(mLatitude: Double, mLongitude: Double) {
CallerLogger.d(tag,"loginOut mLatitude:${mLatitude}--mLongitude:${mLongitude}")
CallerLogger.d(tag, "loginOut mLatitude:${mLatitude}--mLongitude:${mLongitude}")
LoginStatusDefaultModel.logout(mLatitude, mLongitude)
}
@@ -84,66 +86,71 @@ class LoginProvider : LoginService {
FunctionBuildConfig.supportBusiness.forEach {
when (it) {
"shuttle" -> {
return checkBusiness(businessEnum==BusinessEnum.Shuttle)
val isSupply = businessEnum == BusinessEnum.Shuttle
if (isSupply) {
return isSupply
}
}
"bus" -> {
return checkBusiness(businessEnum==BusinessEnum.Bus)
val isSupply = businessEnum == BusinessEnum.Bus
if (isSupply) {
return isSupply
}
}
"taxi" -> {
return checkBusiness(businessEnum==BusinessEnum.Taxi)
val isSupply = businessEnum == BusinessEnum.Taxi
if (isSupply) {
return isSupply
}
}
"charter" -> {
return checkBusiness(businessEnum==BusinessEnum.Charter)
val isSupply = businessEnum == BusinessEnum.Charter
if (isSupply) {
return isSupply
}
}
else -> {}
}
}
if(loginFragment is ILoginViewCallback){
if (loginFragment is ILoginViewCallback) {
(loginFragment as ILoginViewCallback).showErrorInfo("业务模式不支持")
}
return false
}
private fun checkBusiness(isSupply:Boolean):Boolean{
return if(isSupply){
true
}else{
if(loginFragment is ILoginViewCallback){
(loginFragment as ILoginViewCallback).showErrorInfo("业务模式不支持")
}
false
}
}
override fun setLoginInfo(loginInfo: LoginInfo) {
CallerLogger.d(tag,"setLoginInfo:${loginInfo}")
CallerLogger.d(tag, "setLoginInfo:${loginInfo}")
this.loginInfo = loginInfo
}
override fun getLoginInfo(): LoginInfo? {
CallerLogger.d(tag,"getLoginInfo")
CallerLogger.d(tag, "getLoginInfo")
return loginInfo
}
override fun getPurpose(): RoleEnum {
CallerLogger.d(tag,"getPurpose")
CallerLogger.d(tag, "getPurpose")
return RoleEnum.valueOf(loginInfo?.purpose)
}
override fun isLogin(): Boolean {
CallerLogger.d(tag,"isLogin:${loginStatus == LoginStatusEnum.Login}")
CallerLogger.d(tag, "isLogin:${loginStatus == LoginStatusEnum.Login}")
return loginStatus == LoginStatusEnum.Login
}
override fun getLoginStatus(): LoginStatusEnum {
CallerLogger.d(tag,"getLoginStatus:${loginStatus}")
CallerLogger.d(tag, "getLoginStatus:${loginStatus}")
return loginStatus
}
override fun setLoginStatus(loginStatus: LoginStatusEnum) {
CallerLogger.d(tag,"setLoginStatus:${loginStatus}----old${this.loginStatus}")
if(loginStatus!=this.loginStatus){
CallerLogger.d(tag, "setLoginStatus:${loginStatus}----old${this.loginStatus}")
if (loginStatus != this.loginStatus) {
this.loginStatus = loginStatus
LoginStatusManager.invokeLoginStatusChange(loginStatus)
}
@@ -151,15 +158,15 @@ class LoginProvider : LoginService {
override fun setBusinessType(type: Int) {
CallerLogger.d(tag,"setBusinessType:${type}")
if (businessEnum.code!=type) {
CallerLogger.d(tag, "setBusinessType:${type}")
if (businessEnum.code != type) {
this.businessEnum = BusinessEnum.valueOf(type)
LoginStatusManager.invokeLBusinessTypeChange(this.businessEnum)
}
}
override fun getBusinessType(): BusinessEnum {
CallerLogger.d(tag,"getBusinessType")
CallerLogger.d(tag, "getBusinessType")
return businessEnum
}

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

@@ -79,6 +79,7 @@ public class LoginInfo {
public String toString() {
return "LoginInfo{" +
"driverStatus=" + driverStatus +
", businessType=" + businessType +
", orderNo='" + orderNo + '\'' +
", purpose=" + purpose +
", sn='" + sn + '\'' +

6
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/trajectory/TrajectoryManager.kt
View File

@@ -88,10 +88,14 @@ object TrajectoryManager : IMoGoPlanningRottingListener {
}
}
fun addTrajectoryListListenerr(tag: String, listener: ITrajectoryListListener) {
fun addTrajectoryListListenerr(tag: String, listener: ITrajectoryListListener?) {
if (distanceListeners.containsKey(tag)) {
return
}
if(listener==null){
distanceListeners.remove(tag)
return
}
distanceListeners[tag] = listener
}

2
app/script/vehicleFlavors/T1T2.gradle
View File

@@ -1,6 +1,6 @@
project.android.productFlavors {
// 东风红旗
ochT1T2 {
T1T2 {
dimension "vehicle"
missingDimensionStrategy "vehicle","dfhq","jinlvvan"

5
app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
View File

@@ -11,6 +11,7 @@ import com.mogo.eagle.core.data.app.UrlConfig
import com.mogo.eagle.core.data.config.JunkConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.launcher.BuildConfig
import com.mogo.launcher.R
import com.shuyu.gsyvideoplayer.player.IjkPlayerManager
@@ -44,7 +45,9 @@ object ConfigStartUp {
// app安装的身份信息
FunctionBuildConfig.appIdentityMode = "Product_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
// 支持的业务类型
FunctionBuildConfig.supportBusiness = GsonUtils.fromJson(BuildConfig.supportBusiness, object : TypeToken<MutableList<String>>() {}.type)
if(!StringUtils.isEmpty(BuildConfig.supportBusiness)&&BuildConfig.supportBusiness!="null"){
FunctionBuildConfig.supportBusiness = GsonUtils.fromJson(BuildConfig.supportBusiness, object : TypeToken<MutableList<String>>() {}.type)
}
// 各个module需要的url
FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java)
//不能启动自动驾驶的档位