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

[routing]

Browse Source 
[fea]
[删除bailing]
This commit is contained in:
yangyakun
2025-05-19 15:25:43 +08:00
parent b5f5303cee
commit 9442d66b63
5 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OCH/facade/script/och.gradle
View File

@@ -14,15 +14,15 @@ project.dependencies {
implementation project.project(':OCH:shuttle:passenger_weaknet') implementation project.project(':OCH:shuttle:passenger_weaknet')
implementation project.project(':OCH:taxi:unmanned-passenger') implementation project.project(':OCH:taxi:unmanned-passenger')
implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:charter:passenger')
}else if(isBaiLing()){ // }else if(isBaiLing()){
implementation project.project(':OCH:offline:driver') // implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:shuttle:driver_weaknet') // implementation project.project(':OCH:shuttle:driver_weaknet')
implementation project.project(':OCH:shuttle:passenger_weaknet') // implementation project.project(':OCH:shuttle:passenger_weaknet')
implementation project.project(':OCH:charter:driver') // implementation project.project(':OCH:charter:driver')
implementation project.project(':OCH:charter:passenger') // implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:sweeper:driver') // implementation project.project(':OCH:sweeper:driver')
implementation project.project(':OCH:taxi:unmanned-driver') // implementation project.project(':OCH:taxi:unmanned-driver')
implementation project.project(':OCH:taxi:unmanned-passenger') // implementation project.project(':OCH:taxi:unmanned-passenger')
}else { }else {
implementation project.project(':OCH:offline:driver') implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:shuttle:driver_weaknet') implementation project.project(':OCH:shuttle:driver_weaknet')

76
OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt
View File

@@ -97,44 +97,44 @@ class ExampleUnitTest {
@Test @Test
fun testData() { fun testData() {
val waitUpdateEvent= mutableListOf<EventDataBean>() // val waitUpdateEvent= mutableListOf<EventDataBean>()
val waitUpdateWriteOffEvent = mutableListOf<WriteOffDataBean>() // val waitUpdateWriteOffEvent = mutableListOf<WriteOffDataBean>()
//
waitUpdateEvent.add(EventDataBean(businessTime = 1)) // waitUpdateEvent.add(EventDataBean(businessTime = 1))
waitUpdateEvent.add(EventDataBean(businessTime = 3)) // waitUpdateEvent.add(EventDataBean(businessTime = 3))
waitUpdateEvent.add(EventDataBean(businessTime = 5)) // waitUpdateEvent.add(EventDataBean(businessTime = 5))
waitUpdateEvent.add(EventDataBean(businessTime = 6)) // waitUpdateEvent.add(EventDataBean(businessTime = 6))
waitUpdateEvent.add(EventDataBean(businessTime = 7)) // waitUpdateEvent.add(EventDataBean(businessTime = 7))
waitUpdateEvent.add(EventDataBean(businessTime = 9)) // waitUpdateEvent.add(EventDataBean(businessTime = 9))
waitUpdateEvent.add(EventDataBean(businessTime = 11)) // waitUpdateEvent.add(EventDataBean(businessTime = 11))
//
waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 2)) // waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 2))
waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 4)) // waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 4))
waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 5)) // waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 5))
waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 8)) // waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 8))
waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 10)) // waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 10))
waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 12)) // waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 12))
waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 14)) // waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 14))
//
//
val eventList4Request = mutableListOf<Event>() // val eventList4Request = mutableListOf<Event>()
var tempEvent: Event?=null // var tempEvent: Event?=null
waitUpdateEvent?.forEach { // waitUpdateEvent?.forEach {
tempEvent = Event(it.eventType, // tempEvent = Event(it.eventType,
EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId,it.msgId) // EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId,it.msgId)
) // )
eventList4Request.add(tempEvent!!) // eventList4Request.add(tempEvent!!)
} // }
//
waitUpdateWriteOffEvent?.forEach { // waitUpdateWriteOffEvent?.forEach {
tempEvent = Event("WriteOff", // tempEvent = Event("WriteOff",
WriteOffEventData(it.msgId,it.taskId,it.siteId,it.driverId,it.orderNo,it.businessTime,it.businessTime) // WriteOffEventData(it.msgId,it.taskId,it.siteId,it.driverId,it.orderNo,it.businessTime,it.businessTime)
) // )
eventList4Request.add(tempEvent!!) // eventList4Request.add(tempEvent!!)
} // }
eventList4Request.sortBy { it.eventData.businessTime } // eventList4Request.sortBy { it.eventData.businessTime }
val md5Hex = DigestUtils.md5Hex(eventList4Request.toString()) // val md5Hex = DigestUtils.md5Hex(eventList4Request.toString())
println(eventList4Request) // println(eventList4Request)
} }

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

@@ -60,7 +60,7 @@ dependencies {
implementation rootProject.ext.dependencies.amapnavi3dmap implementation rootProject.ext.dependencies.amapnavi3dmap
implementation rootProject.ext.dependencies.flexbox implementation rootProject.ext.dependencies.flexbox
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" implementation rootProject.ext.dependencies.view_model_scope
// annotationProcessor"android.arch.lifecycle:compiler:1.1.1" // annotationProcessor"android.arch.lifecycle:compiler:1.1.1"
// kapt"android.arch.lifecycle:compiler:1.1.1" // kapt"android.arch.lifecycle:compiler:1.1.1"

2
app/build.gradle
View File

@@ -154,7 +154,7 @@ android {
apply from: "./script/roleFlavors/driver.gradle" apply from: "./script/roleFlavors/driver.gradle"
apply from: "./script/roleFlavors/passenger.gradle" apply from: "./script/roleFlavors/passenger.gradle"
apply from: "./script/roleFlavors/driverpassenger.gradle" // apply from: "./script/roleFlavors/driverpassenger.gradle"
// apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" // apply from: "./script/flavorfilter/flavorsFilterConfig.gradle"

4
app/script/flavorfilter/flavors.json
View File

@@ -2,7 +2,7 @@
"mogo": { "mogo": {
"C1":["driver"], "C1":["driver"],
"B1":["driver","passenger"], "B1":["driver","passenger"],
"B2":["driver","passenger","bailing"], "B2":["driver","passenger"],
"T1T2":["driver","passenger"], "T1T2":["driver","passenger"],
"ALL":["driver","passenger"] "ALL":["driver","passenger"]
}, },
@@ -20,7 +20,7 @@
"saas": { "saas": {
"T1T2":["driver","passenger"], "T1T2":["driver","passenger"],
"B1":["driver","passenger"], "B1":["driver","passenger"],
"B2":["driver","passenger","bailing"], "B2":["driver","passenger"],
"M1":["driver","passenger"], "M1":["driver","passenger"],
"ALL":["driver","passenger"] "ALL":["driver","passenger"]
} }