From 9442d66b637513e5ee035d2cc5b10d59d251eaf0 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 19 May 2025 15:25:43 +0800 Subject: [PATCH] =?UTF-8?q?[routing]=20[fea]=20[=E5=88=A0=E9=99=A4bailing]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/facade/script/och.gradle | 18 ++--- .../mogo/och/common/module/ExampleUnitTest.kt | 76 +++++++++---------- OCH/taxi/unmanned-driver/build.gradle | 2 +- app/build.gradle | 2 +- app/script/flavorfilter/flavors.json | 4 +- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle index 7ee8273cea..f4dc67ab14 100644 --- a/OCH/facade/script/och.gradle +++ b/OCH/facade/script/och.gradle @@ -14,15 +14,15 @@ project.dependencies { implementation project.project(':OCH:shuttle:passenger_weaknet') implementation project.project(':OCH:taxi:unmanned-passenger') implementation project.project(':OCH:charter:passenger') - }else if(isBaiLing()){ - implementation project.project(':OCH:offline:driver') - implementation project.project(':OCH:shuttle:driver_weaknet') - implementation project.project(':OCH:shuttle:passenger_weaknet') - implementation project.project(':OCH:charter:driver') - implementation project.project(':OCH:charter:passenger') - implementation project.project(':OCH:sweeper:driver') - implementation project.project(':OCH:taxi:unmanned-driver') - implementation project.project(':OCH:taxi:unmanned-passenger') +// }else if(isBaiLing()){ +// implementation project.project(':OCH:offline:driver') +// implementation project.project(':OCH:shuttle:driver_weaknet') +// implementation project.project(':OCH:shuttle:passenger_weaknet') +// implementation project.project(':OCH:charter:driver') +// implementation project.project(':OCH:charter:passenger') +// implementation project.project(':OCH:sweeper:driver') +// implementation project.project(':OCH:taxi:unmanned-driver') +// implementation project.project(':OCH:taxi:unmanned-passenger') }else { implementation project.project(':OCH:offline:driver') implementation project.project(':OCH:shuttle:driver_weaknet') diff --git a/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index 1872937998..45054e55e3 100644 --- a/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -97,44 +97,44 @@ class ExampleUnitTest { @Test fun testData() { - val waitUpdateEvent= mutableListOf() - val waitUpdateWriteOffEvent = mutableListOf() - - waitUpdateEvent.add(EventDataBean(businessTime = 1)) - waitUpdateEvent.add(EventDataBean(businessTime = 3)) - waitUpdateEvent.add(EventDataBean(businessTime = 5)) - waitUpdateEvent.add(EventDataBean(businessTime = 6)) - waitUpdateEvent.add(EventDataBean(businessTime = 7)) - waitUpdateEvent.add(EventDataBean(businessTime = 9)) - waitUpdateEvent.add(EventDataBean(businessTime = 11)) - - waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 2)) - waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 4)) - waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 5)) - waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 8)) - waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 10)) - waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 12)) - waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 14)) - - - val eventList4Request = mutableListOf() - var tempEvent: Event?=null - waitUpdateEvent?.forEach { - tempEvent = Event(it.eventType, - EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId,it.msgId) - ) - eventList4Request.add(tempEvent!!) - } - - waitUpdateWriteOffEvent?.forEach { - tempEvent = Event("WriteOff", - WriteOffEventData(it.msgId,it.taskId,it.siteId,it.driverId,it.orderNo,it.businessTime,it.businessTime) - ) - eventList4Request.add(tempEvent!!) - } - eventList4Request.sortBy { it.eventData.businessTime } - val md5Hex = DigestUtils.md5Hex(eventList4Request.toString()) - println(eventList4Request) +// val waitUpdateEvent= mutableListOf() +// val waitUpdateWriteOffEvent = mutableListOf() +// +// waitUpdateEvent.add(EventDataBean(businessTime = 1)) +// waitUpdateEvent.add(EventDataBean(businessTime = 3)) +// waitUpdateEvent.add(EventDataBean(businessTime = 5)) +// waitUpdateEvent.add(EventDataBean(businessTime = 6)) +// waitUpdateEvent.add(EventDataBean(businessTime = 7)) +// waitUpdateEvent.add(EventDataBean(businessTime = 9)) +// waitUpdateEvent.add(EventDataBean(businessTime = 11)) +// +// waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 2)) +// waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 4)) +// waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 5)) +// waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 8)) +// waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 10)) +// waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 12)) +// waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 14)) +// +// +// val eventList4Request = mutableListOf() +// var tempEvent: Event?=null +// waitUpdateEvent?.forEach { +// tempEvent = Event(it.eventType, +// EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId,it.msgId) +// ) +// eventList4Request.add(tempEvent!!) +// } +// +// waitUpdateWriteOffEvent?.forEach { +// tempEvent = Event("WriteOff", +// WriteOffEventData(it.msgId,it.taskId,it.siteId,it.driverId,it.orderNo,it.businessTime,it.businessTime) +// ) +// eventList4Request.add(tempEvent!!) +// } +// eventList4Request.sortBy { it.eventData.businessTime } +// val md5Hex = DigestUtils.md5Hex(eventList4Request.toString()) +// println(eventList4Request) } diff --git a/OCH/taxi/unmanned-driver/build.gradle b/OCH/taxi/unmanned-driver/build.gradle index 8d61213d98..5694443d7e 100644 --- a/OCH/taxi/unmanned-driver/build.gradle +++ b/OCH/taxi/unmanned-driver/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation rootProject.ext.dependencies.amapnavi3dmap 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" // kapt"android.arch.lifecycle:compiler:1.1.1" diff --git a/app/build.gradle b/app/build.gradle index 00ee8f07cc..00e01d9d8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -154,7 +154,7 @@ android { apply from: "./script/roleFlavors/driver.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" diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index fe359645e6..bf2c0a56d5 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -2,7 +2,7 @@ "mogo": { "C1":["driver"], "B1":["driver","passenger"], - "B2":["driver","passenger","bailing"], + "B2":["driver","passenger"], "T1T2":["driver","passenger"], "ALL":["driver","passenger"] }, @@ -20,7 +20,7 @@ "saas": { "T1T2":["driver","passenger"], "B1":["driver","passenger"], - "B2":["driver","passenger","bailing"], + "B2":["driver","passenger"], "M1":["driver","passenger"], "ALL":["driver","passenger"] }