From 1f8ba19603b19dfd8d37fee8e36f80aed87b0115 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Mar 2023 14:27:34 +0800 Subject: [PATCH 01/25] =?UTF-8?q?[m1]=20[flavors=20=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BAjson=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/flavorfilter/flavors.json | 26 +++++++++++++ app/flavorfilter/flavorsFilterConfig.gradle | 43 +++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 app/flavorfilter/flavors.json create mode 100644 app/flavorfilter/flavorsFilterConfig.gradle diff --git a/app/build.gradle b/app/build.gradle index fac1a5d598..5a97fdd955 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -295,7 +295,7 @@ android { apply from: "./productFlavors/ochDriverM1.gradle" apply from: "./productFlavors/ochPassengerM1.gradle" apply from: "./productFlavors/fMultiDisplaySweeper.gradle" - apply from: "./productFlavors/flavorsFilterConfig.gradle" + apply from: "./flavorfilter/flavorsFilterConfig.gradle" packagingOptions { exclude 'META-INF/io.netty.versions.properties' diff --git a/app/flavorfilter/flavors.json b/app/flavorfilter/flavors.json new file mode 100644 index 0000000000..9b0a90b4a1 --- /dev/null +++ b/app/flavorfilter/flavors.json @@ -0,0 +1,26 @@ +{ + "mogo": { + "noop" :["fPadLenovo"], + "sweeper" :["fOchSweeper"], + "shuttle" :["fOchShuttle","fOchShuttlePassenger"], + "taxi" :["fOchTaxi","fOchTaxiPassenger","fMultiDisplayOchTaxi"], + "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], + "charter" :["ochDriverM1","ochPassengerM1"] + }, + "dali": { + "noop" :[""], + "sweeper" :[""], + "shuttle" :["fOchShuttle","fOchShuttlePassenger"], + "taxi" :[], + "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], + "charter" :["ochDriverM1","ochPassengerM1"] + }, + "yantai": { + "noop" :[""], + "sweeper" :["fOchSweeper"], + "shuttle" :["fOchShuttle","fOchShuttlePassenger"], + "taxi" :[], + "bus" :[], + "charter" :["ochDriverM1","ochPassengerM1"] + } +} \ No newline at end of file diff --git a/app/flavorfilter/flavorsFilterConfig.gradle b/app/flavorfilter/flavorsFilterConfig.gradle new file mode 100644 index 0000000000..508cac8b70 --- /dev/null +++ b/app/flavorfilter/flavorsFilterConfig.gradle @@ -0,0 +1,43 @@ +import groovy.json.JsonSlurper + + +File file = new File("${rootDir}/app/flavorfilter/flavors.json") +def jsonSlurper = new JsonSlurper() +// 解析json +def config = jsonSlurper.parse(file) + +project.android.variantFilter { variant -> + def names = variant.flavors*.name + //要检查特定的构建类型，请使用variant.buildType.name ==“ ” + def projectContain = true + config.each { project,value -> + if(names.contains(project)){ + projectContain = false + def productContain = true + value.each{product,vehicles-> + if(names.contains(product)){ + productContain =false + def vehicleContain = true + vehicles.each{vehicle-> + if (names.contains(vehicle)) { + println "need $names" + vehicleContain = false + } + } + if(vehicleContain){ + setIgnore(true) + } + } + } + if(productContain){ + setIgnore(true) + } + } + } + if(projectContain){ + setIgnore(true) + } +} + + + From 4b0fa8595b6d2e5561d3612428ddbc464bb62e47 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Mar 2023 16:38:48 +0800 Subject: [PATCH 02/25] =?UTF-8?q?[gradle]=20[=E5=B7=A5=E6=8E=A7=E6=9C=BAip?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/productFlavors/fMultiDisplaySweeper.gradle | 2 +- app/productFlavors/fOchBusPassenger.gradle | 2 +- app/productFlavors/fOchBusPassengerM2.gradle | 2 +- app/productFlavors/fOchShuttle.gradle | 2 +- app/productFlavors/fOchShuttlePassenger.gradle | 2 +- app/productFlavors/fOchTaxiPassenger.gradle | 2 +- app/productFlavors/ochPassengerM1.gradle | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/productFlavors/fMultiDisplaySweeper.gradle index 4dddc88a45..654193e687 100644 --- a/app/productFlavors/fMultiDisplaySweeper.gradle +++ b/app/productFlavors/fMultiDisplaySweeper.gradle @@ -38,7 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/productFlavors/fOchBusPassenger.gradle index 5a585b833b..4f57bfe688 100644 --- a/app/productFlavors/fOchBusPassenger.gradle +++ b/app/productFlavors/fOchBusPassenger.gradle @@ -33,7 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_JL\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/fOchBusPassengerM2.gradle b/app/productFlavors/fOchBusPassengerM2.gradle index b298278764..f416a6bbbc 100644 --- a/app/productFlavors/fOchBusPassengerM2.gradle +++ b/app/productFlavors/fOchBusPassengerM2.gradle @@ -33,7 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_M2\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/productFlavors/fOchShuttle.gradle b/app/productFlavors/fOchShuttle.gradle index b3290c6685..8081717b7d 100644 --- a/app/productFlavors/fOchShuttle.gradle +++ b/app/productFlavors/fOchShuttle.gradle @@ -34,7 +34,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_JL\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/productFlavors/fOchShuttlePassenger.gradle index 035eef12a3..b373b06e28 100644 --- a/app/productFlavors/fOchShuttlePassenger.gradle +++ b/app/productFlavors/fOchShuttlePassenger.gradle @@ -34,7 +34,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_JL\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/fOchTaxiPassenger.gradle b/app/productFlavors/fOchTaxiPassenger.gradle index a762c8f8c8..92902d2337 100644 --- a/app/productFlavors/fOchTaxiPassenger.gradle +++ b/app/productFlavors/fOchTaxiPassenger.gradle @@ -38,7 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_DFHQ\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/ochPassengerM1.gradle b/app/productFlavors/ochPassengerM1.gradle index 2121de231e..54795fddfb 100644 --- a/app/productFlavors/ochPassengerM1.gradle +++ b/app/productFlavors/ochPassengerM1.gradle @@ -38,7 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Passenger_M1\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 From 856120c3b291a7d38b46702a56c7413f7768f80b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Mar 2023 14:50:26 +0800 Subject: [PATCH 03/25] =?UTF-8?q?[gradle]=20[=E6=96=87=E4=BB=B6=E6=94=B6?= =?UTF-8?q?=E9=9B=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 32 ++-- app/productFlavors/flavorsFilterConfig.gradle | 167 ------------------ app/{ => script}/flavorfilter/flavors.json | 0 .../flavorfilter/flavorsFilterConfig.gradle | 2 +- app/{ => script}/functions/README.md | 0 app/{ => script}/functions/och.gradle | 0 app/{ => script}/productFlavors/README.md | 0 .../productFlavors/fMultiDisplayOchBus.gradle | 0 .../fMultiDisplayOchTaxi.gradle | 0 .../fMultiDisplaySweeper.gradle | 0 .../productFlavors/fOchBus.gradle | 0 .../productFlavors/fOchBusPassenger.gradle | 0 .../productFlavors/fOchBusPassengerM2.gradle | 0 .../productFlavors/fOchShuttle.gradle | 0 .../fOchShuttlePassenger.gradle | 0 .../productFlavors/fOchSweeper.gradle | 0 .../productFlavors/fOchTaxi.gradle | 0 .../productFlavors/fOchTaxiPassenger.gradle | 0 .../productFlavors/fPadLenovo.gradle | 0 .../productFlavors/ochDriverM1.gradle | 0 .../productFlavors/ochPassengerM1.gradle | 0 21 files changed, 17 insertions(+), 184 deletions(-) delete mode 100644 app/productFlavors/flavorsFilterConfig.gradle rename app/{ => script}/flavorfilter/flavors.json (100%) rename app/{ => script}/flavorfilter/flavorsFilterConfig.gradle (94%) rename app/{ => script}/functions/README.md (100%) rename app/{ => script}/functions/och.gradle (100%) rename app/{ => script}/productFlavors/README.md (100%) rename app/{ => script}/productFlavors/fMultiDisplayOchBus.gradle (100%) rename app/{ => script}/productFlavors/fMultiDisplayOchTaxi.gradle (100%) rename app/{ => script}/productFlavors/fMultiDisplaySweeper.gradle (100%) rename app/{ => script}/productFlavors/fOchBus.gradle (100%) rename app/{ => script}/productFlavors/fOchBusPassenger.gradle (100%) rename app/{ => script}/productFlavors/fOchBusPassengerM2.gradle (100%) rename app/{ => script}/productFlavors/fOchShuttle.gradle (100%) rename app/{ => script}/productFlavors/fOchShuttlePassenger.gradle (100%) rename app/{ => script}/productFlavors/fOchSweeper.gradle (100%) rename app/{ => script}/productFlavors/fOchTaxi.gradle (100%) rename app/{ => script}/productFlavors/fOchTaxiPassenger.gradle (100%) rename app/{ => script}/productFlavors/fPadLenovo.gradle (100%) rename app/{ => script}/productFlavors/ochDriverM1.gradle (100%) rename app/{ => script}/productFlavors/ochPassengerM1.gradle (100%) diff --git a/app/build.gradle b/app/build.gradle index 5a97fdd955..518f0d787f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -280,22 +280,22 @@ android { } // 配置不同渠道参数，直接影响功能完整度 - apply from: "./productFlavors/fPadLenovo.gradle" - apply from: "./productFlavors/fOchBus.gradle" - apply from: "./productFlavors/fOchShuttle.gradle" - apply from: "./productFlavors/fOchTaxi.gradle" - apply from: "./productFlavors/fOchBusPassenger.gradle" - apply from: "./productFlavors/fOchBusPassengerM2.gradle" - apply from: "./productFlavors/fOchShuttlePassenger.gradle" - apply from: "./productFlavors/fOchTaxiPassenger.gradle" - apply from: "./productFlavors/fOchSweeper.gradle" - apply from: "./productFlavors/fMultiDisplayOchBus.gradle" - apply from: "./productFlavors/fMultiDisplayOchTaxi.gradle" + apply from: "./script/productFlavors/fPadLenovo.gradle" + apply from: "./script/productFlavors/fOchBus.gradle" + apply from: "./script/productFlavors/fOchShuttle.gradle" + apply from: "./script/productFlavors/fOchTaxi.gradle" + apply from: "./script/productFlavors/fOchBusPassenger.gradle" + apply from: "./script/productFlavors/fOchBusPassengerM2.gradle" + apply from: "./script/productFlavors/fOchShuttlePassenger.gradle" + apply from: "./script/productFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/productFlavors/fOchSweeper.gradle" + apply from: "./script/productFlavors/fMultiDisplayOchBus.gradle" + apply from: "./script/productFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./productFlavors/ochDriverM1.gradle" - apply from: "./productFlavors/ochPassengerM1.gradle" - apply from: "./productFlavors/fMultiDisplaySweeper.gradle" - apply from: "./flavorfilter/flavorsFilterConfig.gradle" + apply from: "./script/productFlavors/ochDriverM1.gradle" + apply from: "./script/productFlavors/ochPassengerM1.gradle" + apply from: "./script/productFlavors/fMultiDisplaySweeper.gradle" + apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { exclude 'META-INF/io.netty.versions.properties' @@ -346,7 +346,7 @@ dependencies { androidTestImplementation project(':core:mogo-core-res') - apply from: "./functions/och.gradle" + apply from: "./script/functions/och.gradle" androidTestImplementation rootProject.ext.dependencies.androidx_test_core androidTestImplementation rootProject.ext.dependencies.androidx_test_core_ktx diff --git a/app/productFlavors/flavorsFilterConfig.gradle b/app/productFlavors/flavorsFilterConfig.gradle deleted file mode 100644 index e4955fa1a0..0000000000 --- a/app/productFlavors/flavorsFilterConfig.gradle +++ /dev/null @@ -1,167 +0,0 @@ - -project.android.variantFilter { variant -> - def names = variant.flavors*.name - //要检查特定的构建类型，请使用variant.buildType.name ==“ ” - if(names.contains("mogo")) { - // region 过滤noop 的flavors 不带och业务的 - if (names.contains("noop")&&!names.contains("fPadLenovo")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤sweper 的flavors - if (names.contains("sweeper") && !names.contains("fOchSweeper")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤shuttle 的flavors - if (names.contains("shuttle")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchShuttle")) { - } else if (names.contains("fOchShuttlePassenger")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤taxi 的flavors - if (names.contains("taxi")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchTaxi")) { - } else if (names.contains("fOchTaxiPassenger")) { - } else if (names.contains("fPadLenovo")) { - } else if (names.contains("fMultiDisplayOchTaxi")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤bus 的flavors - if (names.contains("bus")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchBus")) { - } else if (names.contains("fOchBusPassenger")) { - } else if (names.contains("fMultiDisplayOchBus")) { - } else if (names.contains("fOchBusPassengerM2")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤charter 包车 的flavors - if (names.contains("charter")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("ochDriverM1")) { - } else if (names.contains("ochPassengerM1")) { - } else if (names.contains("fMultiDisplaySweeper")) { - } else { - setIgnore(true) - } - } - // endregion - } - else if(names.contains("dali")){ - // region 过滤noop 的flavors 不带och业务的 - if (names.contains("noop")&&!names.contains("fPadLenovo")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤sweper 的flavors - if (names.contains("sweeper")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤taxi 的flavors - if (names.contains("taxi")) { - setIgnore(true) - } - // endregion - // region 过滤shuttle 的flavors - if (names.contains("shuttle")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchShuttle")) { - } else if (names.contains("fOchShuttlePassenger")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤bus 的flavors - if (names.contains("bus")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchBus")) { - } else if (names.contains("fOchBusPassenger")) { - } else if (names.contains("fMultiDisplayOchBus")) { - } else if (names.contains("fOchBusPassengerM2")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤charter 包车 的flavors - if (names.contains("charter")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("ochDriverM1")) { - } else if (names.contains("ochPassengerM1")) { - } else { - setIgnore(true) - } - } - // endregion - } - else if(names.contains("yantai")){// - // region 过滤noop 的flavors 不带och业务的 - if (names.contains("noop")&&!names.contains("fPadLenovo")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤sweper 的flavors - if (names.contains("sweeper") && !names.contains("fOchSweeper")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤shuttle 的flavors - if (names.contains("shuttle")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchShuttle")) { - } else if (names.contains("fOchShuttlePassenger")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤taxi 的flavors - if (names.contains("taxi")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤bus 的flavors - if (names.contains("bus")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤charter 包车 的flavors - if (names.contains("charter")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("ochDriverM1")) { - } else if (names.contains("ochPassengerM1")) { - } else { - setIgnore(true) - } - } - // endregion - } - else { - setIgnore(true) - } -} - - - diff --git a/app/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json similarity index 100% rename from app/flavorfilter/flavors.json rename to app/script/flavorfilter/flavors.json diff --git a/app/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle similarity index 94% rename from app/flavorfilter/flavorsFilterConfig.gradle rename to app/script/flavorfilter/flavorsFilterConfig.gradle index 508cac8b70..83539d1a0f 100644 --- a/app/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -1,7 +1,7 @@ import groovy.json.JsonSlurper -File file = new File("${rootDir}/app/flavorfilter/flavors.json") +File file = new File("${rootDir}/app/script/flavorfilter/flavors.json") def jsonSlurper = new JsonSlurper() // 解析json def config = jsonSlurper.parse(file) diff --git a/app/functions/README.md b/app/script/functions/README.md similarity index 100% rename from app/functions/README.md rename to app/script/functions/README.md diff --git a/app/functions/och.gradle b/app/script/functions/och.gradle similarity index 100% rename from app/functions/och.gradle rename to app/script/functions/och.gradle diff --git a/app/productFlavors/README.md b/app/script/productFlavors/README.md similarity index 100% rename from app/productFlavors/README.md rename to app/script/productFlavors/README.md diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/script/productFlavors/fMultiDisplayOchBus.gradle similarity index 100% rename from app/productFlavors/fMultiDisplayOchBus.gradle rename to app/script/productFlavors/fMultiDisplayOchBus.gradle diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/script/productFlavors/fMultiDisplayOchTaxi.gradle similarity index 100% rename from app/productFlavors/fMultiDisplayOchTaxi.gradle rename to app/script/productFlavors/fMultiDisplayOchTaxi.gradle diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/script/productFlavors/fMultiDisplaySweeper.gradle similarity index 100% rename from app/productFlavors/fMultiDisplaySweeper.gradle rename to app/script/productFlavors/fMultiDisplaySweeper.gradle diff --git a/app/productFlavors/fOchBus.gradle b/app/script/productFlavors/fOchBus.gradle similarity index 100% rename from app/productFlavors/fOchBus.gradle rename to app/script/productFlavors/fOchBus.gradle diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/script/productFlavors/fOchBusPassenger.gradle similarity index 100% rename from app/productFlavors/fOchBusPassenger.gradle rename to app/script/productFlavors/fOchBusPassenger.gradle diff --git a/app/productFlavors/fOchBusPassengerM2.gradle b/app/script/productFlavors/fOchBusPassengerM2.gradle similarity index 100% rename from app/productFlavors/fOchBusPassengerM2.gradle rename to app/script/productFlavors/fOchBusPassengerM2.gradle diff --git a/app/productFlavors/fOchShuttle.gradle b/app/script/productFlavors/fOchShuttle.gradle similarity index 100% rename from app/productFlavors/fOchShuttle.gradle rename to app/script/productFlavors/fOchShuttle.gradle diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/script/productFlavors/fOchShuttlePassenger.gradle similarity index 100% rename from app/productFlavors/fOchShuttlePassenger.gradle rename to app/script/productFlavors/fOchShuttlePassenger.gradle diff --git a/app/productFlavors/fOchSweeper.gradle b/app/script/productFlavors/fOchSweeper.gradle similarity index 100% rename from app/productFlavors/fOchSweeper.gradle rename to app/script/productFlavors/fOchSweeper.gradle diff --git a/app/productFlavors/fOchTaxi.gradle b/app/script/productFlavors/fOchTaxi.gradle similarity index 100% rename from app/productFlavors/fOchTaxi.gradle rename to app/script/productFlavors/fOchTaxi.gradle diff --git a/app/productFlavors/fOchTaxiPassenger.gradle b/app/script/productFlavors/fOchTaxiPassenger.gradle similarity index 100% rename from app/productFlavors/fOchTaxiPassenger.gradle rename to app/script/productFlavors/fOchTaxiPassenger.gradle diff --git a/app/productFlavors/fPadLenovo.gradle b/app/script/productFlavors/fPadLenovo.gradle similarity index 100% rename from app/productFlavors/fPadLenovo.gradle rename to app/script/productFlavors/fPadLenovo.gradle diff --git a/app/productFlavors/ochDriverM1.gradle b/app/script/productFlavors/ochDriverM1.gradle similarity index 100% rename from app/productFlavors/ochDriverM1.gradle rename to app/script/productFlavors/ochDriverM1.gradle diff --git a/app/productFlavors/ochPassengerM1.gradle b/app/script/productFlavors/ochPassengerM1.gradle similarity index 100% rename from app/productFlavors/ochPassengerM1.gradle rename to app/script/productFlavors/ochPassengerM1.gradle From 7c54fb20eaab5e2391ffeeda19c8fe0bd7b02d01 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Mar 2023 20:55:13 +0800 Subject: [PATCH 04/25] =?UTF-8?q?[gradle]=20[=E6=B7=BB=E5=8A=A0role=20flav?= =?UTF-8?q?ors]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 63 +++++++------------ app/script/productFlavors/bus.gradle | 9 +++ app/script/productFlavors/charter.gradle | 10 +++ app/script/productFlavors/noop.gradle | 9 +++ app/script/productFlavors/shuttle.gradle | 10 +++ app/script/productFlavors/sweeper.gradle | 10 +++ app/script/productFlavors/taxi.gradle | 10 +++ app/script/roleFlavors/driver.gradle | 6 ++ app/script/roleFlavors/passenger.gradle | 7 +++ .../README.md | 0 .../fMultiDisplayOchBus.gradle | 4 +- .../fMultiDisplayOchTaxi.gradle | 3 +- .../fMultiDisplaySweeper.gradle | 3 +- .../fOchBus.gradle | 2 - .../fOchBusPassenger.gradle | 2 - .../fOchBusPassengerM2.gradle | 2 - .../fOchShuttle.gradle | 3 +- .../fOchShuttlePassenger.gradle | 3 +- .../fOchSweeper.gradle | 2 - .../fOchTaxi.gradle | 3 +- .../fOchTaxiPassenger.gradle | 3 +- .../fPadLenovo.gradle | 3 +- .../ochDriverM1.gradle | 3 +- .../ochPassengerM1.gradle | 3 +- 24 files changed, 105 insertions(+), 68 deletions(-) create mode 100644 app/script/productFlavors/bus.gradle create mode 100644 app/script/productFlavors/charter.gradle create mode 100644 app/script/productFlavors/noop.gradle create mode 100644 app/script/productFlavors/shuttle.gradle create mode 100644 app/script/productFlavors/sweeper.gradle create mode 100644 app/script/productFlavors/taxi.gradle create mode 100644 app/script/roleFlavors/driver.gradle create mode 100644 app/script/roleFlavors/passenger.gradle rename app/script/{productFlavors => vehicleFlavors}/README.md (100%) rename app/script/{productFlavors => vehicleFlavors}/fMultiDisplayOchBus.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fMultiDisplayOchTaxi.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fMultiDisplaySweeper.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchBus.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchBusPassenger.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchBusPassengerM2.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchShuttle.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchShuttlePassenger.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchSweeper.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchTaxi.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchTaxiPassenger.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fPadLenovo.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/ochDriverM1.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/ochPassengerM1.gradle (95%) diff --git a/app/build.gradle b/app/build.gradle index 518f0d787f..79e18bf586 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -210,7 +210,7 @@ android { // 项目 business // 业务线 product // 车型 vehicle - flavorDimensions "project","product","vehicle" ,"basic", "env" + flavorDimensions "project","product","role","vehicle" ,"basic", "env" productFlavors { // launcher app launcher { @@ -239,31 +239,6 @@ android { buildConfigField 'String', 'URLs', "\"${readFileToJson("dali").replace("\"", "\\\"")}\"" } - // 空业务 主要是给鹰眼使用 - noop { - dimension "product" - } - // 小巴车业务 - bus { - dimension "product" - } - // 出租车业务 - taxi { - dimension "product" - } - // 清扫车业务 - sweeper { - dimension "product" - } - // 接驳车业务 - shuttle{ - dimension "product" - } - // 包车业务 - charter{ - dimension "product" - } - // 配置网络环境，QA、线上、演示 qa { dimension "env" @@ -278,23 +253,31 @@ android { buildConfigField 'int', 'NET_ENV', '4' } } + apply from: "./script/roleFlavors/driver.gradle" + apply from: "./script/roleFlavors/passenger.gradle" + apply from: "./script/productFlavors/bus.gradle" + apply from: "./script/productFlavors/charter.gradle" + apply from: "./script/productFlavors/noop.gradle" + apply from: "./script/productFlavors/shuttle.gradle" + apply from: "./script/productFlavors/sweeper.gradle" + apply from: "./script/productFlavors/taxi.gradle" // 配置不同渠道参数，直接影响功能完整度 - apply from: "./script/productFlavors/fPadLenovo.gradle" - apply from: "./script/productFlavors/fOchBus.gradle" - apply from: "./script/productFlavors/fOchShuttle.gradle" - apply from: "./script/productFlavors/fOchTaxi.gradle" - apply from: "./script/productFlavors/fOchBusPassenger.gradle" - apply from: "./script/productFlavors/fOchBusPassengerM2.gradle" - apply from: "./script/productFlavors/fOchShuttlePassenger.gradle" - apply from: "./script/productFlavors/fOchTaxiPassenger.gradle" - apply from: "./script/productFlavors/fOchSweeper.gradle" - apply from: "./script/productFlavors/fMultiDisplayOchBus.gradle" - apply from: "./script/productFlavors/fMultiDisplayOchTaxi.gradle" + apply from: "./script/vehicleFlavors/fPadLenovo.gradle" + apply from: "./script/vehicleFlavors/fOchBus.gradle" + apply from: "./script/vehicleFlavors/fOchShuttle.gradle" + apply from: "./script/vehicleFlavors/fOchTaxi.gradle" + apply from: "./script/vehicleFlavors/fOchBusPassenger.gradle" + apply from: "./script/vehicleFlavors/fOchBusPassengerM2.gradle" + apply from: "./script/vehicleFlavors/fOchShuttlePassenger.gradle" + apply from: "./script/vehicleFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/vehicleFlavors/fOchSweeper.gradle" + apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" + apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./script/productFlavors/ochDriverM1.gradle" - apply from: "./script/productFlavors/ochPassengerM1.gradle" - apply from: "./script/productFlavors/fMultiDisplaySweeper.gradle" + apply from: "./script/vehicleFlavors/ochDriverM1.gradle" + apply from: "./script/vehicleFlavors/ochPassengerM1.gradle" + apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle new file mode 100644 index 0000000000..4be88716bf --- /dev/null +++ b/app/script/productFlavors/bus.gradle @@ -0,0 +1,9 @@ +project.android.productFlavors { + bus { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle new file mode 100644 index 0000000000..5c4afa79cc --- /dev/null +++ b/app/script/productFlavors/charter.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 包车业务 + charter{ + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle new file mode 100644 index 0000000000..7ad6550b65 --- /dev/null +++ b/app/script/productFlavors/noop.gradle @@ -0,0 +1,9 @@ +project.android.productFlavors { + // 空业务 主要是给鹰眼使用 + noop { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\"" + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle new file mode 100644 index 0000000000..5ca041b516 --- /dev/null +++ b/app/script/productFlavors/shuttle.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 接驳车业务 + shuttle{ + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle new file mode 100644 index 0000000000..614e731b57 --- /dev/null +++ b/app/script/productFlavors/sweeper.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 清扫车业务 + sweeper { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle new file mode 100644 index 0000000000..065523cc61 --- /dev/null +++ b/app/script/productFlavors/taxi.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 出租车业务 + taxi { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + } +} \ No newline at end of file diff --git a/app/script/roleFlavors/driver.gradle b/app/script/roleFlavors/driver.gradle new file mode 100644 index 0000000000..277f53f53f --- /dev/null +++ b/app/script/roleFlavors/driver.gradle @@ -0,0 +1,6 @@ +project.android.productFlavors { + driver { + dimension "role" + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + } +} \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle new file mode 100644 index 0000000000..37e4581034 --- /dev/null +++ b/app/script/roleFlavors/passenger.gradle @@ -0,0 +1,7 @@ +project.android.productFlavors { + // 包车业务 + passenger{ + dimension "role" + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/README.md b/app/script/vehicleFlavors/README.md similarity index 100% rename from app/script/productFlavors/README.md rename to app/script/vehicleFlavors/README.md diff --git a/app/script/productFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle similarity index 95% rename from app/script/productFlavors/fMultiDisplayOchBus.gradle rename to app/script/vehicleFlavors/fMultiDisplayOchBus.gradle index 6705e54bc7..43c7d267e6 100644 --- a/app/script/productFlavors/fMultiDisplayOchBus.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle @@ -34,8 +34,8 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JLKV\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle similarity index 95% rename from app/script/productFlavors/fMultiDisplayOchTaxi.gradle rename to app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle index 2e9691dca8..cea46ef0a3 100644 --- a/app/script/productFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle @@ -36,8 +36,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle similarity index 95% rename from app/script/productFlavors/fMultiDisplaySweeper.gradle rename to app/script/vehicleFlavors/fMultiDisplaySweeper.gradle index 654193e687..e583e4a173 100644 --- a/app/script/productFlavors/fMultiDisplaySweeper.gradle +++ b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchBus.gradle b/app/script/vehicleFlavors/fOchBus.gradle similarity index 95% rename from app/script/productFlavors/fOchBus.gradle rename to app/script/vehicleFlavors/fOchBus.gradle index 09683e1c91..ae90dde64a 100644 --- a/app/script/productFlavors/fOchBus.gradle +++ b/app/script/vehicleFlavors/fOchBus.gradle @@ -37,8 +37,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchBusPassenger.gradle b/app/script/vehicleFlavors/fOchBusPassenger.gradle similarity index 95% rename from app/script/productFlavors/fOchBusPassenger.gradle rename to app/script/vehicleFlavors/fOchBusPassenger.gradle index 4f57bfe688..b7ca01c603 100644 --- a/app/script/productFlavors/fOchBusPassenger.gradle +++ b/app/script/vehicleFlavors/fOchBusPassenger.gradle @@ -32,8 +32,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchBusPassengerM2.gradle b/app/script/vehicleFlavors/fOchBusPassengerM2.gradle similarity index 95% rename from app/script/productFlavors/fOchBusPassengerM2.gradle rename to app/script/vehicleFlavors/fOchBusPassengerM2.gradle index f416a6bbbc..6508720305 100644 --- a/app/script/productFlavors/fOchBusPassengerM2.gradle +++ b/app/script/vehicleFlavors/fOchBusPassengerM2.gradle @@ -32,8 +32,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_M2\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/script/productFlavors/fOchShuttle.gradle b/app/script/vehicleFlavors/fOchShuttle.gradle similarity index 95% rename from app/script/productFlavors/fOchShuttle.gradle rename to app/script/vehicleFlavors/fOchShuttle.gradle index 8081717b7d..66572fecc2 100644 --- a/app/script/productFlavors/fOchShuttle.gradle +++ b/app/script/vehicleFlavors/fOchShuttle.gradle @@ -33,8 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/script/productFlavors/fOchShuttlePassenger.gradle b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle similarity index 95% rename from app/script/productFlavors/fOchShuttlePassenger.gradle rename to app/script/vehicleFlavors/fOchShuttlePassenger.gradle index b373b06e28..cb5f444deb 100644 --- a/app/script/productFlavors/fOchShuttlePassenger.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle @@ -33,8 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchSweeper.gradle b/app/script/vehicleFlavors/fOchSweeper.gradle similarity index 95% rename from app/script/productFlavors/fOchSweeper.gradle rename to app/script/vehicleFlavors/fOchSweeper.gradle index 273ff178c0..489de575e9 100644 --- a/app/script/productFlavors/fOchSweeper.gradle +++ b/app/script/vehicleFlavors/fOchSweeper.gradle @@ -37,8 +37,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Sweeper_Driver_FT\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchTaxi.gradle b/app/script/vehicleFlavors/fOchTaxi.gradle similarity index 95% rename from app/script/productFlavors/fOchTaxi.gradle rename to app/script/vehicleFlavors/fOchTaxi.gradle index 424280b7f3..516d1de504 100644 --- a/app/script/productFlavors/fOchTaxi.gradle +++ b/app/script/vehicleFlavors/fOchTaxi.gradle @@ -38,8 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchTaxiPassenger.gradle b/app/script/vehicleFlavors/fOchTaxiPassenger.gradle similarity index 95% rename from app/script/productFlavors/fOchTaxiPassenger.gradle rename to app/script/vehicleFlavors/fOchTaxiPassenger.gradle index 92902d2337..fdfe6b8a44 100644 --- a/app/script/productFlavors/fOchTaxiPassenger.gradle +++ b/app/script/vehicleFlavors/fOchTaxiPassenger.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_DFHQ\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle similarity index 95% rename from app/script/productFlavors/fPadLenovo.gradle rename to app/script/vehicleFlavors/fPadLenovo.gradle index f9cbdfbc63..35ca4212cf 100644 --- a/app/script/productFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -34,8 +34,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"FPad_Noop_Base\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/ochDriverM1.gradle b/app/script/vehicleFlavors/ochDriverM1.gradle similarity index 95% rename from app/script/productFlavors/ochDriverM1.gradle rename to app/script/vehicleFlavors/ochDriverM1.gradle index 667e7af6c6..c74762f57d 100644 --- a/app/script/productFlavors/ochDriverM1.gradle +++ b/app/script/vehicleFlavors/ochDriverM1.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Driver_M1\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/ochPassengerM1.gradle b/app/script/vehicleFlavors/ochPassengerM1.gradle similarity index 95% rename from app/script/productFlavors/ochPassengerM1.gradle rename to app/script/vehicleFlavors/ochPassengerM1.gradle index 54795fddfb..3865f502fd 100644 --- a/app/script/productFlavors/ochPassengerM1.gradle +++ b/app/script/vehicleFlavors/ochPassengerM1.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Passenger_M1\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 From d35ba980766db1b958199998504407f283647f25 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 27 Mar 2023 11:39:03 +0800 Subject: [PATCH 05/25] =?UTF-8?q?[gradle]=20[taxi=E3=80=81charter=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 14 ++-- app/script/flavorfilter/flavors.json | 69 ++++++++++++++----- .../flavorfilter/flavorsFilterConfig.gradle | 30 +++++--- app/script/functions/och.gradle | 8 +-- app/script/productFlavors/bus.gradle | 8 ++- app/script/productFlavors/charter.gradle | 26 +++++++ app/script/productFlavors/noop.gradle | 5 ++ app/script/productFlavors/shuttle.gradle | 5 ++ app/script/productFlavors/sweeper.gradle | 5 ++ app/script/productFlavors/taxi.gradle | 23 +++++++ app/script/roleFlavors/driver.gradle | 28 ++++++++ app/script/roleFlavors/passenger.gradle | 28 +++++++- app/script/utils.gradle | 35 ++++++++++ .../vehicleFlavors/fMultiDisplayOchBus.gradle | 27 +------- .../fMultiDisplayOchTaxi.gradle | 29 +------- .../fMultiDisplaySweeper.gradle | 28 +------- app/script/vehicleFlavors/fOchBus.gradle | 28 +------- .../vehicleFlavors/fOchBusPassenger.gradle | 26 ++----- app/script/vehicleFlavors/fOchShuttle.gradle | 32 ++------- .../fOchShuttlePassenger.gradle | 29 ++------ .../fOchShuttlePassengerM2.gradle | 26 ++----- app/script/vehicleFlavors/fOchSweeper.gradle | 30 +------- app/script/vehicleFlavors/fOchTaxi.gradle | 56 --------------- .../vehicleFlavors/fOchTaxiPassenger.gradle | 55 --------------- app/script/vehicleFlavors/fPadLenovo.gradle | 26 ++----- app/script/vehicleFlavors/ochDFHQ.gradle | 38 ++++++++++ app/script/vehicleFlavors/ochDriverM1.gradle | 54 --------------- app/script/vehicleFlavors/ochM1.gradle | 35 ++++++++++ .../vehicleFlavors/ochPassengerM1.gradle | 54 --------------- app/src/main/AndroidManifest.xml | 2 +- .../mogo/launcher/startup/ConfigStartUp.kt | 2 +- 31 files changed, 352 insertions(+), 509 deletions(-) create mode 100644 app/script/utils.gradle delete mode 100644 app/script/vehicleFlavors/fOchTaxi.gradle delete mode 100644 app/script/vehicleFlavors/fOchTaxiPassenger.gradle create mode 100644 app/script/vehicleFlavors/ochDFHQ.gradle delete mode 100644 app/script/vehicleFlavors/ochDriverM1.gradle create mode 100644 app/script/vehicleFlavors/ochM1.gradle delete mode 100644 app/script/vehicleFlavors/ochPassengerM1.gradle diff --git a/app/build.gradle b/app/build.gradle index 8a3f83c949..be466e31ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,9 @@ android { shrinkResources false signingConfig signingConfigs.release manifestPlaceholders = [ - MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") + MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION"), + // 高德地图鉴权信息 + AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, ] } release { @@ -189,7 +191,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' manifestPlaceholders = [ - MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") + MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION"), + // 高德地图鉴权信息 + AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, ] } } @@ -266,17 +270,15 @@ android { apply from: "./script/vehicleFlavors/fPadLenovo.gradle" apply from: "./script/vehicleFlavors/fOchBus.gradle" apply from: "./script/vehicleFlavors/fOchShuttle.gradle" - apply from: "./script/vehicleFlavors/fOchTaxi.gradle" apply from: "./script/vehicleFlavors/fOchBusPassenger.gradle" apply from: "./script/vehicleFlavors/fOchShuttlePassengerM2.gradle" apply from: "./script/vehicleFlavors/fOchShuttlePassenger.gradle" - apply from: "./script/vehicleFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/vehicleFlavors/ochDFHQ.gradle" apply from: "./script/vehicleFlavors/fOchSweeper.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./script/vehicleFlavors/ochDriverM1.gradle" - apply from: "./script/vehicleFlavors/ochPassengerM1.gradle" + apply from: "./script/vehicleFlavors/ochM1.gradle" apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 9b0a90b4a1..8625c4148c 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -1,26 +1,59 @@ { "mogo": { - "noop" :["fPadLenovo"], - "sweeper" :["fOchSweeper"], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :["fOchTaxi","fOchTaxiPassenger","fMultiDisplayOchTaxi"], - "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" :{ + "driver":["fPadLenovo"] + }, + "sweeper" :{ + "driver": ["fOchSweeper"] + }, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :{ + "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], + "passenger": ["ochDFHQ"] + }, + "bus" :{ + "driver": ["fOchBus","fMultiDisplayOchBus"], + "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + }, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } }, "dali": { - "noop" :[""], - "sweeper" :[""], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :[], - "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" : null, + "sweeper" :null, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :null, + "bus" :{ + "driver": ["fOchBus","fMultiDisplayOchBus"], + "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + }, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } }, "yantai": { - "noop" :[""], - "sweeper" :["fOchSweeper"], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :[], - "bus" :[], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" :null, + "sweeper" :{ + "driver": ["fOchSweeper"] + }, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :null, + "bus" :null, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } } } \ No newline at end of file diff --git a/app/script/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle index 83539d1a0f..87c0a86212 100644 --- a/app/script/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -9,22 +9,32 @@ def config = jsonSlurper.parse(file) project.android.variantFilter { variant -> def names = variant.flavors*.name //要检查特定的构建类型，请使用variant.buildType.name ==“ ” +// println "------$names" def projectContain = true - config.each { project,value -> - if(names.contains(project)){ + config.each { projectKey,projectValue -> + if(names.contains(projectKey)){ projectContain = false def productContain = true - value.each{product,vehicles-> - if(names.contains(product)){ + projectValue.each{productKey,productValue-> + if(names.contains(productKey)){ productContain =false - def vehicleContain = true - vehicles.each{vehicle-> - if (names.contains(vehicle)) { - println "need $names" - vehicleContain = false + def roleContain = true + productValue.each{roleKey,roleValue-> + if(names.contains(roleKey)){ + roleContain =false + def vehicleContain = true + roleValue.each{vehicleValue-> + if (names.contains(vehicleValue)) { + println "need $names" + vehicleContain = false + } + } + if(vehicleContain){ + setIgnore(true) + } } } - if(vehicleContain){ + if(roleContain){ setIgnore(true) } } diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 242f2b6437..91ea6b8756 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -42,13 +42,13 @@ project.dependencies { // 包车 - ochDriverM1Implementation (project(':OCH:mogo-och-charter')) - ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) +// ochDriverM1Implementation (project(':OCH:mogo-och-charter')) +// ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) // taxi司机端 - fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) +// fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) // taxi乘客端 - fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) +// fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) // 多屏幕-Bus司机端 fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 4be88716bf..81167792a5 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -1,9 +1,15 @@ project.android.productFlavors { bus { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Bus", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" } -} \ No newline at end of file +} + diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 5c4afa79cc..8bbfe7d575 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -1,10 +1,36 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { // 包车业务 charter{ dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Charter", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + if(isDriver()){ + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + if(isCurrentFlavors("charter")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) + } + } + if(isPassenger()){ + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' + if(isCurrentFlavors("charter")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) + } + } } } \ No newline at end of file diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index 7ad6550b65..d783019507 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 空业务 主要是给鹰眼使用 noop { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Noop", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 5ca041b516..f71bd4001d 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 接驳车业务 shuttle{ dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Shuttle", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" // 连接的工控机IP地址 diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index 614e731b57..c22cc7fc81 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 清扫车业务 sweeper { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Sweeper", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" // 连接的工控机IP地址 diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 065523cc61..e28d43a682 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -2,9 +2,32 @@ project.android.productFlavors { // 出租车业务 taxi { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Taxi", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + + + if(isDriver()){ + if(isCurrentFlavors("taxi")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + } + } + if(isPassenger()){ + if(isCurrentFlavors("taxi")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + } + } } } \ No newline at end of file diff --git a/app/script/roleFlavors/driver.gradle b/app/script/roleFlavors/driver.gradle index 277f53f53f..575ed25af7 100644 --- a/app/script/roleFlavors/driver.gradle +++ b/app/script/roleFlavors/driver.gradle @@ -1,6 +1,34 @@ project.android.productFlavors { driver { dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Driver", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle index 37e4581034..d44c0c5c28 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -1,7 +1,33 @@ project.android.productFlavors { // 包车业务 - passenger{ + passenger { dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Passenger", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/utils.gradle b/app/script/utils.gradle new file mode 100644 index 0000000000..0f337cc3ff --- /dev/null +++ b/app/script/utils.gradle @@ -0,0 +1,35 @@ +boolean isDriver() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("Driver") | s.contains("driver")) { + return true + } + } + return false +} + +boolean isPassenger() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("Passenger") | s.contains("passenger")) { + return true + } + } + return false +} + +boolean isCurrentFlavors(String flavors){ + for (String s : gradle.startParameter.taskNames) { + + def lowerCase = flavors.toLowerCase() + if (s.toLowerCase().contains(lowerCase)) { + return true + } + } + return false +} + +ext { + isPassenger = this.&isPassenger + isDriver = this.&isDriver + isCurrentFlavors = this.&isCurrentFlavors + +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle index 43c7d267e6..f8a5c5c064 100644 --- a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle @@ -1,43 +1,20 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplayOchBus { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m1对应 matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE : "fMultiDisplayOchBus", + CHANNEL_VALUE_TAIL : "JLKV", ACTIVITY_ROOT : true, SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JLKV\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JLKV\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle index cea46ef0a3..70724d6074 100644 --- a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle @@ -1,50 +1,27 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplayOchTaxi { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fMultiDisplayOchTaxi", + CHANNEL_VALUE_TAIL : "DFHQ", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' diff --git a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle index e583e4a173..1cdc26af8e 100644 --- a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle +++ b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle @@ -1,45 +1,21 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplaySweeper { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fMultiDisplaySweeper", + CHANNEL_VALUE_TAIL : "FT", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' diff --git a/app/script/vehicleFlavors/fOchBus.gradle b/app/script/vehicleFlavors/fOchBus.gradle index ae90dde64a..e8886f42eb 100644 --- a/app/script/vehicleFlavors/fOchBus.gradle +++ b/app/script/vehicleFlavors/fOchBus.gradle @@ -1,44 +1,22 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchBus { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchBus", + CHANNEL_VALUE_TAIL : "JL", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchBusPassenger.gradle b/app/script/vehicleFlavors/fOchBusPassenger.gradle index b7ca01c603..89c0ac0559 100644 --- a/app/script/vehicleFlavors/fOchBusPassenger.gradle +++ b/app/script/vehicleFlavors/fOchBusPassenger.gradle @@ -1,39 +1,21 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 fOchBusPassenger { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应 matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE: "fOchBusPassenger", + CHANNEL_VALUE_TAIL : "JL", ACTIVITY_ROOT:true, SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchShuttle.gradle b/app/script/vehicleFlavors/fOchShuttle.gradle index 4d529374d3..39e37ccbd0 100644 --- a/app/script/vehicleFlavors/fOchShuttle.gradle +++ b/app/script/vehicleFlavors/fOchShuttle.gradle @@ -1,44 +1,20 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchShuttle { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的shuttle对应 matchingFallbacks = ['shuttle'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE : "fOchShuttle", ACTIVITY_ROOT: true, + CHANNEL_VALUE_TAIL : "JL", + ACTIVITY_ROOT: true, SCREEN_ORIENTATION: "landscape" ] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_JL\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' diff --git a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle index 8465694bb4..db2eba2f1e 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle @@ -1,43 +1,22 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 fOchShuttlePassenger { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId + dimension "vehicle" matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE : "fOchShuttlePassenger", + CHANNEL_VALUE_TAIL: "JL", ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_JL\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle b/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle index 980f739d7b..840e3b2050 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle @@ -1,39 +1,21 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 fOchShuttlePassengerM2 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m2对应 matchingFallbacks = ['m2'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE: "fOchBusPassenger", + CHANNEL_VALUE_TAIL : "M2", ACTIVITY_ROOT:true, SCREEN_ORIENTATION: "portrait" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_M2\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M2\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' diff --git a/app/script/vehicleFlavors/fOchSweeper.gradle b/app/script/vehicleFlavors/fOchSweeper.gradle index 489de575e9..3c377ae261 100644 --- a/app/script/vehicleFlavors/fOchSweeper.gradle +++ b/app/script/vehicleFlavors/fOchSweeper.gradle @@ -1,50 +1,26 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchSweeper { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchSweeper", + CHANNEL_VALUE_TAIL: "FT", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Sweeper_Driver_FT\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' diff --git a/app/script/vehicleFlavors/fOchTaxi.gradle b/app/script/vehicleFlavors/fOchTaxi.gradle deleted file mode 100644 index 516d1de504..0000000000 --- a/app/script/vehicleFlavors/fOchTaxi.gradle +++ /dev/null @@ -1,56 +0,0 @@ -project.android.productFlavors { - - // 衡阳-联想Pad-网约车-出租车 - fOchTaxi { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId - dimension "vehicle" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchTaxi", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //Taxi不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchTaxiPassenger.gradle b/app/script/vehicleFlavors/fOchTaxiPassenger.gradle deleted file mode 100644 index fdfe6b8a44..0000000000 --- a/app/script/vehicleFlavors/fOchTaxiPassenger.gradle +++ /dev/null @@ -1,55 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-出租车-乘客端 - fOchTaxiPassenger { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId - dimension "vehicle" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchTaxiPassenger", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : false, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_DFHQ\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //Taxi不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle index 35ca4212cf..3a1ad7c8ed 100644 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -1,42 +1,24 @@ project.android.productFlavors { // 衡阳-联想Pad fPadLenovo { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL CHANNEL_VALUE : "fPadLenovo", + CHANNEL_VALUE_TAIL: "Noop", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"FPad_Noop_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"Noop\"" + - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle new file mode 100644 index 0000000000..45cf58cca2 --- /dev/null +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -0,0 +1,38 @@ +apply from: "./script/utils.gradle" + +project.android.productFlavors { + + // 衡阳-联想Pad-网约车-出租车 + ochDFHQ { + dimension "vehicle" + + // 配置AndroidManifest.xml中用到的参数 + manifestPlaceholders = [ + // BUGLY_APP_CHANNEL + CHANNEL_VALUE_TAIL: "DFHQ", + // Activity的朝向 + SCREEN_ORIENTATION: "landscape" + ] + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" + + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + //Taxi不能启动自驾的档位 + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' + + + if(isDriver()){ + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",true) + } + if(isPassenger()){ + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",false) + } + } + +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDriverM1.gradle b/app/script/vehicleFlavors/ochDriverM1.gradle deleted file mode 100644 index c74762f57d..0000000000 --- a/app/script/vehicleFlavors/ochDriverM1.gradle +++ /dev/null @@ -1,54 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 - ochDriverM1 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - versionCode rootProject.versionCode as int - versionName rootProject.versionName - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId - dimension "vehicle" - matchingFallbacks = ['driverm1'] - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchBus", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Driver_M1\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //M1不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle new file mode 100644 index 0000000000..b443d65735 --- /dev/null +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -0,0 +1,35 @@ +apply from: "./script/utils.gradle" + +project.android.productFlavors { + // 衡阳-联想Pad-网约车-小巴车 + ochM1 { + dimension "vehicle" + + // 配置AndroidManifest.xml中用到的参数 + manifestPlaceholders = [ + // BUGLY_APP_CHANNEL + CHANNEL_VALUE : "Charter_Driver_M1", + CHANNEL_VALUE_TAIL: "M1", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION: "landscape" + ] + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M1\"" + //M1不能启动自驾的档位 + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + if(isDriver()){ + matchingFallbacks = ['driverm1'] + } + if(isPassenger()){ + matchingFallbacks = ['m1'] + } + + } +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochPassengerM1.gradle b/app/script/vehicleFlavors/ochPassengerM1.gradle deleted file mode 100644 index 7d7873aeaa..0000000000 --- a/app/script/vehicleFlavors/ochPassengerM1.gradle +++ /dev/null @@ -1,54 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车-乘客端 - ochPassengerM1 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的m1对应 - matchingFallbacks = ['m1'] - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchBusPassenger", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Passenger_M1\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //M1不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 93042f91d2..c147f4e189 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,7 @@ + android:value="${CHANNEL_VALUE_HEAD}_${CHANNEL_VALUE_BODY}_${CHANNEL_VALUE_TAIL}" /> Date: Wed, 29 Mar 2023 12:00:00 +0800 Subject: [PATCH 06/25] =?UTF-8?q?[gradle]=20[sweeper=E3=80=81bus=E3=80=81s?= =?UTF-8?q?huttle=20=E5=88=86=E7=A6=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/README.md | 6 ++-- app/build.gradle | 10 +++--- app/regroup.gradle | 12 +++---- app/script/flavorfilter/flavors.json | 24 +++++++------- app/script/functions/och.gradle | 18 +++++------ app/script/productFlavors/bus.gradle | 17 ++++++++++ app/script/productFlavors/shuttle.gradle | 17 ++++++++++ app/script/productFlavors/sweeper.gradle | 5 +++ app/script/productFlavors/taxi.gradle | 4 +++ .../vehicleFlavors/fOchBusPassenger.gradle | 31 ------------------ app/script/vehicleFlavors/fOchShuttle.gradle | 31 ------------------ .../fOchShuttlePassenger.gradle | 32 ------------------- app/script/vehicleFlavors/ochDFHQ.gradle | 11 +------ .../{fOchSweeper.gradle => ochFT.gradle} | 4 +-- .../{fOchBus.gradle => ochJL.gradle} | 5 +-- app/script/vehicleFlavors/ochM1.gradle | 2 +- ...ShuttlePassengerM2.gradle => ochM2.gradle} | 6 ++-- 17 files changed, 85 insertions(+), 150 deletions(-) delete mode 100644 app/script/vehicleFlavors/fOchBusPassenger.gradle delete mode 100644 app/script/vehicleFlavors/fOchShuttle.gradle delete mode 100644 app/script/vehicleFlavors/fOchShuttlePassenger.gradle rename app/script/vehicleFlavors/{fOchSweeper.gradle => ochFT.gradle} (94%) rename app/script/vehicleFlavors/{fOchBus.gradle => ochJL.gradle} (90%) rename app/script/vehicleFlavors/{fOchShuttlePassengerM2.gradle => ochM2.gradle} (91%) diff --git a/app/README.md b/app/README.md index 709e801e2f..a9c72cf527 100644 --- a/app/README.md +++ b/app/README.md @@ -45,8 +45,8 @@ | 车型 | 配置所在文件 | 档位 | 配置 | |:-|:-|:-|:-| | 东风、红旗 | fOchTaxi.gradle、fOchTaxiPassenger.gradle | P、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' | -| 金旅小巴 | fOchBus.gradle、fOchBusPassenger.gradle、fOchShuttle.gradle、fOchShuttlePassenger.gradle | N、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' | +| 金旅小巴 | ochJL.gradle、ochJL.gradle、ochJL.gradle、ochJL.gradle | N、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' | | M1 | fOchBusPassengerM1.gradle | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | -| M2 | fOchShuttlePassengerM2.gradle | N、P、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' | -| 清扫车 | fOchSweeper.gradle | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | +| M2 | ochM2.gradle | N、P、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' | +| 清扫车 | ochFT.gradle | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | | 开沃 | 暂无 | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | diff --git a/app/build.gradle b/app/build.gradle index be466e31ea..fd0c229540 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -268,13 +268,11 @@ android { apply from: "./script/productFlavors/taxi.gradle" // 配置不同渠道参数，直接影响功能完整度 apply from: "./script/vehicleFlavors/fPadLenovo.gradle" - apply from: "./script/vehicleFlavors/fOchBus.gradle" - apply from: "./script/vehicleFlavors/fOchShuttle.gradle" - apply from: "./script/vehicleFlavors/fOchBusPassenger.gradle" - apply from: "./script/vehicleFlavors/fOchShuttlePassengerM2.gradle" - apply from: "./script/vehicleFlavors/fOchShuttlePassenger.gradle" + apply from: "./script/vehicleFlavors/ochJL.gradle" + apply from: "./script/vehicleFlavors/ochJL.gradle" + apply from: "./script/vehicleFlavors/ochM2.gradle" apply from: "./script/vehicleFlavors/ochDFHQ.gradle" - apply from: "./script/vehicleFlavors/fOchSweeper.gradle" + apply from: "./script/vehicleFlavors/ochFT.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 diff --git a/app/regroup.gradle b/app/regroup.gradle index d21831358a..8d0fdf84e7 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -3,14 +3,14 @@ afterEvaluate { def launcher = [ "fPadLenovo", - "fOchSweeper", + "ochFT", "fOchTaxi", - "fOchBus", - "fOchBusPassenger", + "ochJL", + "ochJL", "fOchBusPassengerM1", - "fOchShuttlePassengerM2", - "fOchShuttle", - "fOchShuttlePassenger", + "ochM2", + "ochJL", + "ochJL", "fOchTaxiPassenger", "MultiDisplayOchBus", "MultiDisplayOchTaxi"] diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 8625c4148c..341227aa67 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -4,19 +4,19 @@ "driver":["fPadLenovo"] }, "sweeper" :{ - "driver": ["fOchSweeper"] + "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["fOchShuttle"], - "passenger": ["fOchShuttlePassenger"] + "driver": ["ochJL"], + "passenger": ["ochJL","ochM2"] }, "taxi" :{ "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], "passenger": ["ochDFHQ"] }, "bus" :{ - "driver": ["fOchBus","fMultiDisplayOchBus"], - "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + "driver": ["ochJL","fMultiDisplayOchBus"], + "passenger": ["ochJL"] }, "charter" :{ "driver": ["ochM1"], @@ -27,13 +27,13 @@ "noop" : null, "sweeper" :null, "shuttle" :{ - "driver": ["fOchShuttle"], - "passenger": ["fOchShuttlePassenger"] + "driver": ["ochJL"], + "passenger": ["ochJL","ochM2"] }, "taxi" :null, "bus" :{ - "driver": ["fOchBus","fMultiDisplayOchBus"], - "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + "driver": ["ochJL","fMultiDisplayOchBus"], + "passenger": ["ochJL"] }, "charter" :{ "driver": ["ochM1"], @@ -43,11 +43,11 @@ "yantai": { "noop" :null, "sweeper" :{ - "driver": ["fOchSweeper"] + "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["fOchShuttle"], - "passenger": ["fOchShuttlePassenger"] + "driver": ["ochJL"], + "passenger": ["ochJL","ochM2"] }, "taxi" :null, "bus" :null, diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 91ea6b8756..2dac97319d 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -10,7 +10,7 @@ project.dependencies { // Bus乘客端 fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) - fOchShuttlePassengerM2Implementation(rootProject.ext.dependencies.mogoochbus) + ochM2Implementation(rootProject.ext.dependencies.mogoochbus) // taxi司机端 fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) @@ -23,8 +23,8 @@ project.dependencies { fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) //接驳车司乘端 - fOchShuttleImplementation(rootProject.ext.dependencies.mogoochbus) - fOchShuttlePassengerImplementation(rootProject.ext.dependencies.mogoochbus) + ochJLImplementation(rootProject.ext.dependencies.mogoochbus) + ochJLImplementation(rootProject.ext.dependencies.mogoochbus) // taxi司机端 fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) @@ -33,12 +33,12 @@ project.dependencies { } else { fPadLenovoImplementation (project(':OCH:mogo-och-noop')) // sweeper 清扫车 - fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) +// fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) // Bus司机端 - fOchBusImplementation (project(':OCH:mogo-och-bus')) + //fOchBusImplementation (project(':OCH:mogo-och-bus')) // Bus乘客端 - fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) + //fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) // 包车 @@ -57,9 +57,9 @@ project.dependencies { // 多屏幕-taxi司机端 //接驳车司乘端 - fOchShuttleImplementation (project(':OCH:mogo-och-shuttle')) - fOchShuttlePassengerImplementation (project(':OCH:mogo-och-shuttle-passenger')) - fOchShuttlePassengerM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) +// ochJLImplementation (project(':OCH:mogo-och-shuttle')) +// ochJLImplementation (project(':OCH:mogo-och-shuttle-passenger')) +// ochM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) // taxi司机端 fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 81167792a5..8aca69e63c 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -1,3 +1,5 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { bus { dimension "product" @@ -10,6 +12,21 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + if(isDriver()){ + if(isCurrentFlavors("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + } + } + if(isPassenger()){ + if(isCurrentFlavors("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + } + } } } diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index f71bd4001d..36599728c1 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -1,3 +1,5 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { // 接驳车业务 shuttle{ @@ -11,5 +13,20 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + if(isDriver()){ + if(isCurrentFlavors("shuttle")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + } + } + if(isPassenger()){ + if(isCurrentFlavors("shuttle")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + } + } } } \ No newline at end of file diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index c22cc7fc81..722532c4df 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -11,5 +11,10 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + + if(isCurrentFlavors("sweeper")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-sweeper')) + } } } \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index e28d43a682..2359d31cf8 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -22,11 +22,15 @@ project.android.productFlavors { if(isDriver()){ if(isCurrentFlavors("taxi")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",true) } } if(isPassenger()){ if(isCurrentFlavors("taxi")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",false) } } } diff --git a/app/script/vehicleFlavors/fOchBusPassenger.gradle b/app/script/vehicleFlavors/fOchBusPassenger.gradle deleted file mode 100644 index 89c0ac0559..0000000000 --- a/app/script/vehicleFlavors/fOchBusPassenger.gradle +++ /dev/null @@ -1,31 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车-乘客端 - fOchBusPassenger { - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应 - matchingFallbacks = ['jinlvvan'] - - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "JL", - ACTIVITY_ROOT:true, - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //Bus不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchShuttle.gradle b/app/script/vehicleFlavors/fOchShuttle.gradle deleted file mode 100644 index 39e37ccbd0..0000000000 --- a/app/script/vehicleFlavors/fOchShuttle.gradle +++ /dev/null @@ -1,31 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 - fOchShuttle { - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的shuttle对应 - matchingFallbacks = ['shuttle'] - - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "JL", - ACTIVITY_ROOT: true, - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //Bus不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle deleted file mode 100644 index db2eba2f1e..0000000000 --- a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle +++ /dev/null @@ -1,32 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车-乘客端 - fOchShuttlePassenger { - - dimension "vehicle" - matchingFallbacks = ['jinlvvan'] - - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL: "JL", - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //Bus不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index 45cf58cca2..c752255eda 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -2,7 +2,7 @@ apply from: "./script/utils.gradle" project.android.productFlavors { - // 衡阳-联想Pad-网约车-出租车 + // 东风红旗 ochDFHQ { dimension "vehicle" @@ -24,15 +24,6 @@ project.android.productFlavors { //Taxi不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - - if(isDriver()){ - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",true) - } - if(isPassenger()){ - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",false) - } } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchSweeper.gradle b/app/script/vehicleFlavors/ochFT.gradle similarity index 94% rename from app/script/vehicleFlavors/fOchSweeper.gradle rename to app/script/vehicleFlavors/ochFT.gradle index 3c377ae261..f8c3c58d31 100644 --- a/app/script/vehicleFlavors/fOchSweeper.gradle +++ b/app/script/vehicleFlavors/ochFT.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 - fOchSweeper { + // 福田车 + ochFT { dimension "vehicle" // 配置AndroidManifest.xml中用到的参数 diff --git a/app/script/vehicleFlavors/fOchBus.gradle b/app/script/vehicleFlavors/ochJL.gradle similarity index 90% rename from app/script/vehicleFlavors/fOchBus.gradle rename to app/script/vehicleFlavors/ochJL.gradle index e8886f42eb..0ff0a92db6 100644 --- a/app/script/vehicleFlavors/fOchBus.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 - fOchBus { + ochJL { dimension "vehicle" matchingFallbacks = ['jinlvvan'] @@ -22,9 +22,6 @@ project.android.productFlavors { // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - //Bus不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' } diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index b443d65735..12001068e8 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -1,7 +1,7 @@ apply from: "./script/utils.gradle" project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 + // 金旅M1车 ochM1 { dimension "vehicle" diff --git a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle b/app/script/vehicleFlavors/ochM2.gradle similarity index 91% rename from app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle rename to app/script/vehicleFlavors/ochM2.gradle index 840e3b2050..0039042cc2 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 - fOchShuttlePassengerM2 { + ochM2 { dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m2对应 matchingFallbacks = ['m2'] @@ -8,8 +8,8 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "M2", - ACTIVITY_ROOT:true, + CHANNEL_VALUE_TAIL: "M2", + ACTIVITY_ROOT : true, SCREEN_ORIENTATION: "portrait" ] From 2df00c16ad5753ef46832fcd852fb5ed0a5113ac Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 18 Apr 2023 14:14:21 +0800 Subject: [PATCH 07/25] =?UTF-8?q?[gradle]=20[=E5=A4=9A=E5=B1=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-shuttle-passenger/build.gradle | 5 -- app/build.gradle | 4 +- app/script/flavorfilter/flavors.json | 13 ++-- app/script/functions/och.gradle | 78 +++++-------------- app/script/productFlavors/bus.gradle | 20 ++--- app/script/productFlavors/charter.gradle | 12 +-- app/script/productFlavors/shuttle.gradle | 24 +++--- app/script/productFlavors/taxi.gradle | 23 +++--- app/script/roleFlavors/driverpassenger.gradle | 36 +++++++++ app/script/roleFlavors/passenger.gradle | 3 +- app/script/utils.gradle | 16 ++++ .../vehicleFlavors/fMultiDisplayOchBus.gradle | 30 ------- .../fMultiDisplayOchTaxi.gradle | 32 -------- .../fMultiDisplaySweeper.gradle | 29 ------- config.gradle | 2 - 15 files changed, 113 insertions(+), 214 deletions(-) create mode 100644 app/script/roleFlavors/driverpassenger.gradle delete mode 100644 app/script/vehicleFlavors/fMultiDisplayOchBus.gradle delete mode 100644 app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle delete mode 100644 app/script/vehicleFlavors/fMultiDisplaySweeper.gradle diff --git a/OCH/mogo-och-shuttle-passenger/build.gradle b/OCH/mogo-och-shuttle-passenger/build.gradle index 720eb01ca9..3bdddf460d 100644 --- a/OCH/mogo-och-shuttle-passenger/build.gradle +++ b/OCH/mogo-och-shuttle-passenger/build.gradle @@ -52,11 +52,6 @@ android { dimension "vehicle" buildConfigField 'int', 'NEW_TEST', '0' } - // 车型：金旅m1 小巴业务 - m1 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } // 车型：金旅m1 小巴业务 m2 { diff --git a/app/build.gradle b/app/build.gradle index e2bebb3a97..881db2900c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -266,6 +266,7 @@ android { } apply from: "./script/roleFlavors/driver.gradle" apply from: "./script/roleFlavors/passenger.gradle" + apply from: "./script/roleFlavors/driverpassenger.gradle" apply from: "./script/productFlavors/bus.gradle" apply from: "./script/productFlavors/charter.gradle" @@ -280,11 +281,8 @@ android { apply from: "./script/vehicleFlavors/ochM2.gradle" apply from: "./script/vehicleFlavors/ochDFHQ.gradle" apply from: "./script/vehicleFlavors/ochFT.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 apply from: "./script/vehicleFlavors/ochM1.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 341227aa67..6ee8b46ae4 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -11,11 +11,13 @@ "passenger": ["ochJL","ochM2"] }, "taxi" :{ - "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], + "driver": ["ochDFHQ"], + "driverpassenger": ["ochDFHQ"], "passenger": ["ochDFHQ"] }, "bus" :{ - "driver": ["ochJL","fMultiDisplayOchBus"], + "driver": ["ochJL"], + "driverpassenger": ["ochJL"], "passenger": ["ochJL"] }, "charter" :{ @@ -27,12 +29,13 @@ "noop" : null, "sweeper" :null, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :null, "bus" :{ - "driver": ["ochJL","fMultiDisplayOchBus"], + "driver": ["ochJL"], + "driverpassenger": ["ochJL"], "passenger": ["ochJL"] }, "charter" :{ @@ -46,7 +49,7 @@ "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :null, diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 2dac97319d..29d99eae0f 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -2,72 +2,32 @@ project.dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop) - // sweeper清扫车 - fOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper) // Bus司机端 - fOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - // Bus乘客端 - fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) - fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) - ochM2Implementation(rootProject.ext.dependencies.mogoochbus) +// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) +// // Bus乘客端 +// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) +// +// // taxi司机端 +// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) +// // taxi乘客端 +// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi司机端 - fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi乘客端 - fOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi) - - // Bus司机端 - fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - // Bus乘客端 - fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - - //接驳车司乘端 - ochJLImplementation(rootProject.ext.dependencies.mogoochbus) - ochJLImplementation(rootProject.ext.dependencies.mogoochbus) - - // taxi司机端 - fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi乘客端 - fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) } else { fPadLenovoImplementation (project(':OCH:mogo-och-noop')) - // sweeper 清扫车 -// fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) - - // Bus司机端 - //fOchBusImplementation (project(':OCH:mogo-och-bus')) - // Bus乘客端 - //fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) - - - // 包车 -// ochDriverM1Implementation (project(':OCH:mogo-och-charter')) -// ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) - - // taxi司机端 -// fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) - // taxi乘客端 -// fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) // 多屏幕-Bus司机端 - fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) - // 多屏幕-Bus乘客端 - fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) - - // 多屏幕-taxi司机端 - //接驳车司乘端 -// ochJLImplementation (project(':OCH:mogo-och-shuttle')) -// ochJLImplementation (project(':OCH:mogo-och-shuttle-passenger')) -// ochM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) - - // taxi司机端 - fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) - // 多屏幕-taxi乘客端 - fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger')) - - // 清扫车-多屏幕 - fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) +// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) +// // 多屏幕-Bus乘客端 +// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) +// +// // taxi司机端 +// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) +// // 多屏幕-taxi乘客端 +// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger')) +// +// // 清扫车-多屏幕 +// fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) } } diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 8aca69e63c..460df992a1 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -13,19 +13,15 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ - if(isCurrentFlavors("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } + if(isCurrentDriver("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } - if(isPassenger()){ - if(isCurrentFlavors("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } + if(isCurrentPassenger("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 8bbfe7d575..3eb2eeddfb 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -14,23 +14,19 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ + if(isCurrentDriver("charter")){ // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - if(isCurrentFlavors("charter")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) - } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) } - if(isPassenger()){ + if(isCurrentPassenger("charter")){ // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - if(isCurrentFlavors("charter")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) - } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) } } } \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 36599728c1..f901388097 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -2,11 +2,11 @@ apply from: "./script/utils.gradle" project.android.productFlavors { // 接驳车业务 - shuttle{ + shuttle { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Shuttle", + CHANNEL_VALUE_HEAD: "Shuttle", ] buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" @@ -14,19 +14,15 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ - if(isCurrentFlavors("shuttle")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } + if (isCurrentDriver("shuttle")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } - if(isPassenger()){ - if(isCurrentFlavors("shuttle")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } + if (isCurrentPassenger("shuttle")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 2359d31cf8..4133644d33 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Taxi", + CHANNEL_VALUE_HEAD: "Taxi", ] buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" @@ -18,20 +18,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - if(isDriver()){ - if(isCurrentFlavors("taxi")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",true) - } + if (isCurrentDriver("taxi")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT", true) } - if(isPassenger()){ - if(isCurrentFlavors("taxi")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",false) - } + if (isCurrentPassenger("taxi")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT", false) } } } \ No newline at end of file diff --git a/app/script/roleFlavors/driverpassenger.gradle b/app/script/roleFlavors/driverpassenger.gradle new file mode 100644 index 0000000000..93f70b51f4 --- /dev/null +++ b/app/script/roleFlavors/driverpassenger.gradle @@ -0,0 +1,36 @@ +project.android.productFlavors { + driverpassenger { + dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Driver", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + } +} \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle index d44c0c5c28..79cc5f23f8 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -1,5 +1,4 @@ project.android.productFlavors { - // 包车业务 passenger { dimension "role" externalNativeBuild { @@ -19,6 +18,8 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" diff --git a/app/script/utils.gradle b/app/script/utils.gradle index 0f337cc3ff..2e632e3134 100644 --- a/app/script/utils.gradle +++ b/app/script/utils.gradle @@ -1,3 +1,17 @@ +boolean isCurrentDriver(String flavors) { + if(isDriver() && isCurrentFlavors(flavors)){ + return true + } + return false +} + +boolean isCurrentPassenger(String flavors) { + if(isPassenger() && isCurrentFlavors(flavors)){ + return true + } + return false +} + boolean isDriver() { for (String s : gradle.startParameter.taskNames) { if (s.contains("Driver") | s.contains("driver")) { @@ -31,5 +45,7 @@ ext { isPassenger = this.&isPassenger isDriver = this.&isDriver isCurrentFlavors = this.&isCurrentFlavors + isCurrentDriver = this.&isCurrentDriver + isCurrentPassenger = this.&isCurrentPassenger } \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle deleted file mode 100644 index f8a5c5c064..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle +++ /dev/null @@ -1,30 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplayOchBus { - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的m1对应 - matchingFallbacks = ['jinlvvan'] - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "JLKV", - ACTIVITY_ROOT : true, - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JLKV\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle deleted file mode 100644 index 70724d6074..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle +++ /dev/null @@ -1,32 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplayOchTaxi { - dimension "vehicle" - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // BUGLY_APP_CHANNEL - CHANNEL_VALUE_TAIL : "DFHQ", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle deleted file mode 100644 index 1cdc26af8e..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle +++ /dev/null @@ -1,29 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplaySweeper { - dimension "vehicle" - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // BUGLY_APP_CHANNEL - CHANNEL_VALUE_TAIL : "FT", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/config.gradle b/config.gradle index c2c71ebf9c..3bc6477fa7 100644 --- a/config.gradle +++ b/config.gradle @@ -228,8 +228,6 @@ ext { buildToolsVersion : "29.0.2", minSdkVersion : 23, targetSdkVersion : 27, - minSdkVersionPadLenovo : 23, - targetSdkVersionPadLenovo : 27, koomxhook : "com.kuaishou.koom:xhook-static:2.2.0", ] } From 64e0cc8ed4c6cabfec4c385d92285ced5e5043f6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 19 Apr 2023 11:27:05 +0800 Subject: [PATCH 08/25] =?UTF-8?q?[=E5=85=AC=E4=BA=A4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=88=A0=E9=99=A4=E5=8F=8C=E5=B1=8F?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index c931b96c5b..d90ec06928 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -45,10 +45,6 @@ public class MogoOCHBusPassenger implements IMogoOCH { this.mActivity = activity; this.mContainerId = containerId; showFragment(); - - if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { - MultiDisplayUtils.INSTANCE.startActWithSecond(activity, VideoPlayerActivity.class); - } return null; } From 668f8ec84fdd585ab812ba71d6c8b97b15f4cf6a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 19 Apr 2023 15:39:21 +0800 Subject: [PATCH 09/25] =?UTF-8?q?[gradle]=20[gradle=20=E6=95=B4=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/productFlavors/bus.gradle | 18 ++++++++----- app/script/productFlavors/charter.gradle | 19 ++++++------- app/script/productFlavors/noop.gradle | 20 ++++++++++++-- app/script/productFlavors/shuttle.gradle | 27 +++++++++++++++---- app/script/productFlavors/sweeper.gradle | 14 ++++++++-- app/script/productFlavors/taxi.gradle | 10 +++---- app/script/roleFlavors/driver.gradle | 15 ++++++----- app/script/roleFlavors/driverpassenger.gradle | 21 ++++++++------- app/script/roleFlavors/passenger.gradle | 13 ++++----- app/script/utils.gradle | 21 ++++++++++++++- app/script/vehicleFlavors/fPadLenovo.gradle | 15 +++-------- app/script/vehicleFlavors/ochDFHQ.gradle | 14 +++++----- app/script/vehicleFlavors/ochFT.gradle | 14 +++------- app/script/vehicleFlavors/ochJL.gradle | 10 +++---- app/script/vehicleFlavors/ochM1.gradle | 11 +++----- app/script/vehicleFlavors/ochM2.gradle | 14 +++------- 16 files changed, 149 insertions(+), 107 deletions(-) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 460df992a1..16b8f6060f 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -5,23 +5,29 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Bus", + // 标识 + CHANNEL_VALUE_HEAD: "Bus", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + if(isCurrentDriver("bus")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } if(isCurrentPassenger("bus")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 3eb2eeddfb..6d4c97faf4 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -6,25 +6,26 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Charter", + CHANNEL_VALUE_HEAD: "Charter", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] - + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + if(isCurrentDriver("charter")){ - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 + // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) } if(isCurrentPassenger("charter")){ - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 + // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) } diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index d783019507..600ddfbaf5 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -4,11 +4,27 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Noop", + // 标识 + CHANNEL_VALUE_HEAD: "Noop", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\"" - // 连接的工控机IP地址 + + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" + + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + if(isCurrentDriver("noop")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-noop')) + } + } } \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index f901388097..8f39287f35 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -6,23 +6,40 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ + // 标识 CHANNEL_VALUE_HEAD: "Shuttle", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" if (isCurrentDriver("shuttle")) { - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) - // 构建 是否支持多屏异显异交互 + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) } if (isCurrentPassenger("shuttle")) { + if(isM2()){ + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + } + if(isJL()){ + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } \ No newline at end of file diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index 722532c4df..a7f182ee1a 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -4,14 +4,24 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Sweeper", + // 标识 + CHANNEL_VALUE_HEAD: "Sweeper", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + if(isCurrentFlavors("sweeper")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-sweeper')) diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 4133644d33..f30c176a79 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -6,17 +6,17 @@ project.android.productFlavors { manifestPlaceholders = [ CHANNEL_VALUE_HEAD: "Taxi", ] - + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 + // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' if (isCurrentDriver("taxi")) { project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) diff --git a/app/script/roleFlavors/driver.gradle b/app/script/roleFlavors/driver.gradle index 575ed25af7..255863cba2 100644 --- a/app/script/roleFlavors/driver.gradle +++ b/app/script/roleFlavors/driver.gradle @@ -19,16 +19,19 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" - // 是否需要实时上报坐标 + + // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + + // ③是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + + // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的是否是演示（美化）模式 + // ⑤构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/roleFlavors/driverpassenger.gradle b/app/script/roleFlavors/driverpassenger.gradle index 93f70b51f4..16d3557134 100644 --- a/app/script/roleFlavors/driverpassenger.gradle +++ b/app/script/roleFlavors/driverpassenger.gradle @@ -19,18 +19,19 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - // 构建的是否是演示（美化）模式 + // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + + // ③是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + + // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // ⑤构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle index 79cc5f23f8..b2ca2baf59 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -19,16 +19,17 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" - // 是否需要实时上报坐标 + // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + + // ③是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的是否是演示（美化）模式 + // ⑤构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/utils.gradle b/app/script/utils.gradle index 2e632e3134..9db724526c 100644 --- a/app/script/utils.gradle +++ b/app/script/utils.gradle @@ -30,6 +30,24 @@ boolean isPassenger() { return false } +boolean isJL() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("OchJL") | s.contains("ochJL")) { + return true + } + } + return false +} + +boolean isM2() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("OchM2") | s.contains("ochM2")) { + return true + } + } + return false +} + boolean isCurrentFlavors(String flavors){ for (String s : gradle.startParameter.taskNames) { @@ -47,5 +65,6 @@ ext { isCurrentFlavors = this.&isCurrentFlavors isCurrentDriver = this.&isCurrentDriver isCurrentPassenger = this.&isCurrentPassenger - + isJL = this.&isJL + isM2 = this.&isM2 } \ No newline at end of file diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle index 3a1ad7c8ed..9b41beb285 100644 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -7,27 +7,18 @@ project.android.productFlavors { // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fPadLenovo", CHANNEL_VALUE_TAIL: "Noop", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"Noop\"" - - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index c752255eda..d777b309d0 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -1,11 +1,9 @@ -apply from: "./script/utils.gradle" - project.android.productFlavors { - // 东风红旗 ochDFHQ { dimension "vehicle" + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL @@ -14,14 +12,14 @@ project.android.productFlavors { SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" + // ②构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //Taxi不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' } diff --git a/app/script/vehicleFlavors/ochFT.gradle b/app/script/vehicleFlavors/ochFT.gradle index f8c3c58d31..0888e6aad1 100644 --- a/app/script/vehicleFlavors/ochFT.gradle +++ b/app/script/vehicleFlavors/ochFT.gradle @@ -3,28 +3,22 @@ project.android.productFlavors { ochFT { dimension "vehicle" + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "FT", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //清扫车不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochJL.gradle b/app/script/vehicleFlavors/ochJL.gradle index 0ff0a92db6..974a87a1ab 100644 --- a/app/script/vehicleFlavors/ochJL.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -8,21 +8,17 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL : "JL", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - //Bus不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index 12001068e8..07c6827093 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -8,21 +8,18 @@ project.android.productFlavors { // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "Charter_Driver_M1", CHANNEL_VALUE_TAIL: "M1", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M1\"" - //M1不能启动自驾的档位 + // ②构建的是否要动态更换模型 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + // ③不能启动自驾的档位 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' if(isDriver()){ matchingFallbacks = ['driverm1'] diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/ochM2.gradle index 0039042cc2..05dcd0c5c4 100644 --- a/app/script/vehicleFlavors/ochM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -9,24 +9,16 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [ CHANNEL_VALUE_TAIL: "M2", - ACTIVITY_ROOT : true, SCREEN_ORIENTATION: "portrait" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M2\"" - - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //M2不能启动自驾的档位 + // ③M2不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' } } \ No newline at end of file From 6a6c8b61a8d7c21fc3520950dc786900e6b0c9fb Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 19 Apr 2023 16:13:56 +0800 Subject: [PATCH 10/25] =?UTF-8?q?[gradle]=20[=E5=B9=BF=E5=91=8A=E9=85=8D?= =?UTF-8?q?=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/tempConfig.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json index 5fb927ab6d..b4482bbd28 100644 --- a/app/config/tempConfig.json +++ b/app/config/tempConfig.json @@ -1,6 +1,6 @@ { "mogo": { - "shuttlepassenger": { + "shuttlepassengerochjl": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", @@ -64,7 +64,7 @@ } ] }, - "shuttlepassengerm2": { + "shuttlepassengerochm2": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", @@ -82,7 +82,7 @@ } }, "dali": { - "shuttlepassenger": { + "shuttlepassengerochjl": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", @@ -146,7 +146,7 @@ } ] }, - "shuttlepassengerm2": { + "shuttlepassengerochm2": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", @@ -164,7 +164,7 @@ } }, "yantai": { - "shuttlepassenger": { + "shuttlepassengerochjl": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", @@ -180,7 +180,7 @@ } ] }, - "shuttlepassengerm2": { + "shuttlepassengerochm2": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", From 406868604838020754cc26bfc3f9db4bcb52a53a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 20 Apr 2023 15:04:12 +0800 Subject: [PATCH 11/25] =?UTF-8?q?[2.15=E3=80=820]=20[=E5=A4=A7=E7=90=86?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=85=AC=E4=BA=A4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/flavorfilter/flavors.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 6ee8b46ae4..7cd2d89a04 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -34,9 +34,9 @@ }, "taxi" :null, "bus" :{ - "driver": ["ochJL"], - "driverpassenger": ["ochJL"], - "passenger": ["ochJL"] + "driver": null, + "driverpassenger": null, + "passenger": null }, "charter" :{ "driver": ["ochM1"], From bb87768dcca3b25544c9fd206fe698f447830bcf Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 20 Apr 2023 16:31:45 +0800 Subject: [PATCH 12/25] =?UTF-8?q?[gradle]=20[=E6=A8=AA=E7=AB=96=E5=B1=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/productFlavors/bus.gradle | 2 ++ app/script/productFlavors/charter.gradle | 2 ++ app/script/productFlavors/noop.gradle | 2 ++ app/script/productFlavors/shuttle.gradle | 3 +++ app/script/productFlavors/sweeper.gradle | 2 ++ app/script/productFlavors/taxi.gradle | 2 ++ app/script/vehicleFlavors/fPadLenovo.gradle | 2 -- app/script/vehicleFlavors/ochDFHQ.gradle | 2 -- app/script/vehicleFlavors/ochFT.gradle | 2 -- app/script/vehicleFlavors/ochJL.gradle | 2 -- app/script/vehicleFlavors/ochM1.gradle | 2 -- app/script/vehicleFlavors/ochM2.gradle | 1 - 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 16b8f6060f..295d5a7295 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -9,6 +9,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Bus", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 6d4c97faf4..5c4d34e613 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -9,6 +9,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Charter", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index 600ddfbaf5..12de255384 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -8,6 +8,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Noop", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 8f39287f35..2544d9c22c 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -24,6 +24,7 @@ project.android.productFlavors { // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) + manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape") } if (isCurrentPassenger("shuttle")) { if(isM2()){ @@ -31,12 +32,14 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + manifestPlaceholders.put("SCREEN_ORIENTATION", "portrait") } if(isJL()){ // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape") } project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index a7f182ee1a..48a93a6e1e 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -8,6 +8,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Sweeper", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index f30c176a79..963222eb2c 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -5,6 +5,8 @@ project.android.productFlavors { manifestPlaceholders = [ CHANNEL_VALUE_HEAD: "Taxi", + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle index 9b41beb285..2491d98530 100644 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "Noop", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index d777b309d0..1a65b6f110 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "DFHQ", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] diff --git a/app/script/vehicleFlavors/ochFT.gradle b/app/script/vehicleFlavors/ochFT.gradle index 0888e6aad1..1f711ee29f 100644 --- a/app/script/vehicleFlavors/ochFT.gradle +++ b/app/script/vehicleFlavors/ochFT.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "FT", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochJL.gradle b/app/script/vehicleFlavors/ochJL.gradle index 974a87a1ab..831bdd7ecd 100644 --- a/app/script/vehicleFlavors/ochJL.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL : "JL", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index 07c6827093..77bdc5e030 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -9,8 +9,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "M1", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/ochM2.gradle index 05dcd0c5c4..2f016eb3fa 100644 --- a/app/script/vehicleFlavors/ochM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -9,7 +9,6 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [ CHANNEL_VALUE_TAIL: "M2", - SCREEN_ORIENTATION: "portrait" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 From bc272eb63aa6d863ba608f7dd45242ca0cb63aaa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 20 Apr 2023 18:40:41 +0800 Subject: [PATCH 13/25] =?UTF-8?q?[gradle]=20[=E6=A8=AA=E7=AB=96=E5=B1=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/vehicleFlavors/ochDFHQ.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index 1a65b6f110..90e48b667a 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -15,7 +15,7 @@ project.android.productFlavors { buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" // ②构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' From 5ee4f8cd0f35ed6d1ffbc133d819669b60f4f84f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 21 Apr 2023 11:00:23 +0800 Subject: [PATCH 14/25] =?UTF-8?q?[gradle]=20[shuttle=20=E6=B7=BB=E5=8A=A0M?= =?UTF-8?q?2=E5=8F=B8=E6=9C=BA=E5=B1=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/flavorfilter/flavors.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 7cd2d89a04..9fd192a912 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -7,7 +7,7 @@ "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :{ @@ -26,25 +26,16 @@ } }, "dali": { - "noop" : null, - "sweeper" :null, "shuttle" :{ "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, - "taxi" :null, - "bus" :{ - "driver": null, - "driverpassenger": null, - "passenger": null - }, "charter" :{ "driver": ["ochM1"], "passenger": ["ochM1"] } }, "yantai": { - "noop" :null, "sweeper" :{ "driver": ["ochFT"] }, @@ -52,8 +43,6 @@ "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, - "taxi" :null, - "bus" :null, "charter" :{ "driver": ["ochM1"], "passenger": ["ochM1"] From 430fa345d500d998843cf1e5ca08148ced72b6ce Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 21 Apr 2023 11:29:10 +0800 Subject: [PATCH 15/25] =?UTF-8?q?[gradle]=20[=E5=8A=A8=E6=80=81=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E8=AE=BE=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gradle.properties b/gradle.properties index afacfe1894..4552229b4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -146,3 +146,24 @@ ADAS_DATA_LIB_CHILD_VERSION=.0 # 线程优化版本 THREAD_OPT_VERSION=4.0.1 + +# 测试模式司机端版本号 +NOOP_DRIVER_VERSION=3.1.0 +# 公交模式司机端版本号 +BUS_DRIVER_VERSION=3.1.0 +# 公交模式乘客端端版本号 +BUS_PASSENGER_VERSION=2.1.0 +# 接驳模式司机端版本号 +SHUTTLE_DRIVER_VERSION=3.1.0 +# 接驳模式乘客端端版本号 +SHUTTLE_PASSENGER_VERSION=2.1.0 +# 出租车模式司机端版本号 +TAXI_DRIVER_VERSION=3.1.0 +# 出租车模式乘客端端版本号 +TAXI_PASSENGER_VERSION=2.1.0 +# 清扫车模式司机端版本号 +SWEEPER_DRIVER_VERSION=3.1.0 +# 包车模式司机端版本号 +CHARTER_DRIVER_VERSION=3.1.0 +# 包车模式乘客端端版本号 +CHARTER_PASSENGER_VERSION=2.1.0 \ No newline at end of file From 17f425a186513b09d3e451018e230df35e2360d2 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 24 Apr 2023 12:55:05 +0800 Subject: [PATCH 16/25] =?UTF-8?q?[bugfix]=20[recycleview=20=E5=B1=85?= =?UTF-8?q?=E4=B8=AD=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/ui/M1SoftFragment.kt | 5 +- .../ui/layoutmanage/PagerCenterSnapHelper.kt | 81 +++++++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt index 34aff80614..60e3875e57 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt @@ -30,6 +30,7 @@ import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.Temperature import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionSoftPresenter import com.mogo.och.bus.passenger.ui.adapter.TemperatureAdapter +import com.mogo.och.bus.passenger.ui.layoutmanage.PagerCenterSnapHelper import com.mogo.och.bus.passenger.view.HorizontalDecoration import com.mogo.och.bus.passenger.view.PickerLayoutManager import com.mogo.och.common.module.utils.SoundPoolHelper @@ -235,12 +236,12 @@ class M1SoftFragment : val data = getData() val adapter = TemperatureAdapter(requireContext(), data, rv_aircondition_temperature) - val snapHelper: SnapHelper = LinearSnapHelper() + val snapHelper = PagerCenterSnapHelper() snapHelper.attachToRecyclerView(rv_aircondition_temperature) rv_aircondition_temperature.layoutManager = pickerLayoutManager rv_aircondition_temperature.adapter = adapter HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(HorizontalDecoration.distancekey,0) - val space = AutoSizeUtils.dp2px(context, 22f) + val space = AutoSizeUtils.dp2px(context, 15f) rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(space,data.size-1)) pickerLayoutManager.setOnScrollStopListener { view -> diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt new file mode 100644 index 0000000000..f0a3f564db --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt @@ -0,0 +1,81 @@ +package com.mogo.och.bus.passenger.ui.layoutmanage + +import android.view.View +import androidx.recyclerview.widget.OrientationHelper +import androidx.recyclerview.widget.PagerSnapHelper +import androidx.recyclerview.widget.RecyclerView + +class PagerCenterSnapHelper : PagerSnapHelper() { + private var mHorizontalHelper: OrientationHelper? = null + private var pageScollListener: PageScollListener? = null + override fun findSnapView(layoutManager: RecyclerView.LayoutManager): View? { + if (layoutManager.canScrollVertically()) { + return super.findSnapView(layoutManager) + } else if (layoutManager.canScrollHorizontally()) { + return findCenterView(layoutManager, getHorizontalHelper(layoutManager)) + } + return null + } + + private fun findCenterView( + layoutManager: RecyclerView.LayoutManager, + helper: OrientationHelper + ): View? { + val childCount = layoutManager.childCount + if (childCount == 0) { + return null + } + var closestChild: View? = null + val center = helper.startAfterPadding + helper.totalSpace / 2 + var absClosest = Int.MAX_VALUE + for (i in 0 until childCount) { + val child = layoutManager.getChildAt(i) + val params = child!!.layoutParams as RecyclerView.LayoutParams + var childCenter = 0 + childCenter = if (i == 0) { + helper.getDecoratedStart(child) + helper.getDecoratedMeasurement(child) - layoutManager.getDecoratedMeasuredWidth( + child + ) / 2 - params.rightMargin / 2 + } else if (i == childCount - 1) { + (helper.getDecoratedStart(child) + + (helper.getDecoratedMeasurement(child) - layoutManager.getDecoratedMeasuredWidth( + child + ) / 2 - params.leftMargin / 2 - params.rightMargin)) + } else { + helper.getDecoratedStart(child) + helper.getDecoratedMeasurement(child) / 2 + } + val absDistance = Math.abs(childCenter - center) + /* if child center is closer than previous closest, set it as closest */if (absDistance < absClosest) { + absClosest = absDistance + closestChild = child + } + } + if (pageScollListener != null) { + if (closestChild != null) { + pageScollListener!!.onPageSelected(layoutManager.getPosition(closestChild)) + } + } + return closestChild + } + + private fun getHorizontalHelper( + layoutManager: RecyclerView.LayoutManager + ): OrientationHelper { + if (mHorizontalHelper == null || mHorizontalHelper!!.layoutManager !== layoutManager) { + mHorizontalHelper = OrientationHelper.createHorizontalHelper(layoutManager) + } + return mHorizontalHelper!! + } + + fun setPageScollListener(pageScollListener: PageScollListener?) { + this.pageScollListener = pageScollListener + } + + interface PageScollListener { + fun onPageSelected(i: Int) + } + + companion object { + private const val TAG = "PagerSnapHelper " + } +} \ No newline at end of file From cb3f29336dba00a6a3c814427ae132d99afa96dd Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 24 Apr 2023 19:45:10 +0800 Subject: [PATCH 17/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E8=BD=A6=E9=97=A8?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=BB=9F=E4=B8=80=E5=88=B0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=9C=B0=E6=96=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/BusPassengerModelLoopManager.kt | 2 +- ...BusBasePassengerFunctionDevicePresenter.kt | 2 +- .../BusPassengerCarUseAndNoOrderPresenter.kt | 83 +------------------ .../BusPassengerFunctionDevicePresenter.kt | 75 +---------------- .../BusPassengerFunctionSoftPresenter.kt | 58 +++++++------ .../presenter/BusPassengerPresenter.kt | 67 ++++----------- .../passenger/ui/M1CarUserNoOrderFragment.kt | 10 +-- .../och/bus/passenger/ui/M1DeviceFragment.kt | 9 -- .../och/bus/passenger/ui/view/LineSiteView.kt | 2 +- .../passenger/ui/view/door/CloseDoorView.kt | 32 +++++++ .../passenger/ui/view/door/OpenDoorView.kt | 27 ++++++ .../src/m1/res/layout/m1_devices_fragment.xml | 4 +- .../LightAirconditionDoorCallback.kt | 26 ++++++ .../LightAirconditionDoorManager.kt | 48 +++++++++++ .../LightAirconditionDoorStatusManager.kt} | 44 ++-------- .../devicemanage/data/AirconditionStatus.kt | 8 ++ .../manager/devicemanage/data/DoorStatus.kt | 3 + .../manager/devicemanage/data/HeaterStatue.kt | 3 + .../manager/devicemanage/data/LightStatus.kt | 7 ++ .../mogo/och/common/module}/utils/RxUtils.kt | 2 +- 20 files changed, 226 insertions(+), 286 deletions(-) create mode 100644 OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt create mode 100644 OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorCallback.kt create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt rename OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/{OCHM1LightAirconditionDoorStatusManager.kt => devicemanage/LightAirconditionDoorStatusManager.kt} (76%) create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt rename OCH/{mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger => mogo-och-common-module/src/main/java/com/mogo/och/common/module}/utils/RxUtils.kt (95%) diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt index 4c1985ad4e..8b7ce2e2b8 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt @@ -4,7 +4,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.och.bus.passenger.bean.LoopInfo import com.mogo.och.bus.passenger.constant.CharterPassengerConst -import com.mogo.och.bus.passenger.utils.RxUtils +import com.mogo.och.common.module.utils.RxUtils import io.reactivex.Observable import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt index 88290a678d..1596ef34b0 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.LifecycleOwner import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.Presenter import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.utils.RxUtils +import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable abstract class BusBasePassengerFunctionDevicePresenter(view: V) : diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt index fe2279cf13..4061a63b90 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt @@ -5,92 +5,15 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.M1CarUserNoOrderFragment -import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager import io.reactivex.disposables.Disposable class BusPassengerCarUseAndNoOrderPresenter(view: M1CarUserNoOrderFragment?) : - BusBasePassengerFunctionDevicePresenter(view), - OCHM1LightAirconditionDoorStatusManager.OCHM1LightAirconditionDoorCallback { + BusBasePassengerFunctionDevicePresenter(view){ companion object { private const val TAG = "BusPassengerFunctionPresenter" } - private var subscribe: Disposable? = null - private var subscribeDoorStatus: Disposable? = null - private var gnssSpeed = 0.0 - - override fun onCreate(owner: LifecycleOwner) { - super.onCreate(owner) - OCHM1LightAirconditionDoorStatusManager.addListener(TAG, this) - CharterPassengerModel.setControllerStatusCallback(TAG) { location -> - location?.let { - gnssSpeed = it.gnssInfo.vehicleSpeed - } - } - } - - override fun onDestroy(owner: LifecycleOwner) { - super.onDestroy(owner) - OCHM1LightAirconditionDoorStatusManager.removeListener(TAG) - disposeSubscribe(subscribe) - disposeSubscribe(subscribeDoorStatus) - } - - override fun onDoorStatusCallback(isOpen: Boolean, isFirst: Boolean) { - if (!isFirst) { - if (isOpen) { - ToastUtils.showShort("已开启车门") - } else { - ToastUtils.showShort("已关门车门") - } - } - } - - - fun openDoor() { - val canOpenOrCloseDoor = canOpenOrCloseDoor() - if (!canOpenOrCloseDoor.isNullOrEmpty()) { - ToastUtils.showShort(canOpenOrCloseDoor) - return - } - disposeSubscribe(subscribe) - subscribe = createSubscribe(1000) { - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0) - } - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(1) - disposeSubscribe(subscribeDoorStatus) - subscribeDoorStatus = createSubscribe { - if (!OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) { - ToastUtils.showShort("车门无法开启，请使用车内物理按钮") - } - } - } - - fun closeDoor() { - val canOpenOrCloseDoor = canOpenOrCloseDoor() - if (!canOpenOrCloseDoor.isNullOrBlank()) { - ToastUtils.showShort(canOpenOrCloseDoor) - return - } - disposeSubscribe(subscribe) - subscribe = createSubscribe(1000) { - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0) - } - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2) - disposeSubscribe(subscribeDoorStatus) - subscribeDoorStatus = createSubscribe { - if (OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) { - ToastUtils.showShort("车门无法关闭，请使用车内物理按钮") - } - } - } - - private fun canOpenOrCloseDoor(): String? { - if (gnssSpeed < 0.01) { - return null - } else { - return "车辆正在运行、请稍后再试" - } - } } \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt index 98ea80709d..130365e0be 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt @@ -7,16 +7,12 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.M1DeviceFragment -import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager import io.reactivex.disposables.Disposable class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) : - BusBasePassengerFunctionDevicePresenter(view), - OCHM1LightAirconditionDoorStatusManager.OCHM1LightAirconditionDoorCallback { - - private var subscribe: Disposable? = null - private var subscribeDoorStatus: Disposable? = null - private var gnssSpeed =0.0 + BusBasePassengerFunctionDevicePresenter(view) { companion object { private const val TAG = "BusPassengerFunctionDevicePresenter" @@ -24,75 +20,10 @@ class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) : override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) - OCHM1LightAirconditionDoorStatusManager.addListener(TAG, this) - CharterPassengerModel.setControllerStatusCallback(TAG) { location -> - location?.let { - gnssSpeed = it.gnssInfo.vehicleSpeed - } - } } override fun onDestroy(owner: LifecycleOwner) { super.onDestroy(owner) - OCHM1LightAirconditionDoorStatusManager.removeListener(TAG) - disposeSubscribe(subscribe) - disposeSubscribe(subscribeDoorStatus) - } - - override fun onDoorStatusCallback(isOpen: Boolean,isFirst: Boolean) { - if(!isFirst) { - if (isOpen) { - ToastUtils.showShort("已开启车门") - } else { - ToastUtils.showShort("已关门车门") - } - } - } - - fun openDoor() { - val canOpenOrCloseDoor = canOpenOrCloseDoor() - if(!canOpenOrCloseDoor.isNullOrEmpty()){ - ToastUtils.showShort(canOpenOrCloseDoor) - return - } - disposeSubscribe(subscribe) - subscribe = createSubscribe(1000) { - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0) - } - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(1) - disposeSubscribe(subscribeDoorStatus) - subscribeDoorStatus = createSubscribe(6000) { - if (!OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) { - ToastUtils.showShort("车门无法开启，请使用车内物理按钮") - } - } - } - - fun closeDoor() { - val canOpenOrCloseDoor = canOpenOrCloseDoor() - if(!canOpenOrCloseDoor.isNullOrBlank()){ - ToastUtils.showShort(canOpenOrCloseDoor) - return - } - disposeSubscribe(subscribe) - subscribe = createSubscribe(1000) { - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0) - } - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2) - disposeSubscribe(subscribeDoorStatus) - subscribeDoorStatus = createSubscribe(6000) { - if (OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) { - ToastUtils.showShort("车门无法关闭，请使用车内物理按钮") - } - } - } - - private fun canOpenOrCloseDoor():String?{ - if(gnssSpeed<0.01){ - return null - }else{ - return "车辆正在运行、请稍后再试" - } } // 靠边停车 diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt index c5f1600d00..44fbc001b9 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt @@ -7,12 +7,16 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.ui.M1SoftFragment -import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager +import com.mogo.och.common.module.manager.devicemanage.data.AirconditionStatus +import com.mogo.och.common.module.manager.devicemanage.data.HeaterStatue +import com.mogo.och.common.module.manager.devicemanage.data.LightStatus import io.reactivex.disposables.Disposable class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : BusBasePassengerFunctionDevicePresenter(view), - OCHM1LightAirconditionDoorStatusManager.OCHM1LightAirconditionDoorCallback { + LightAirconditionDoorCallback { companion object { private const val TAG = "BusPassengerFunctionSoftPresenter" } @@ -26,23 +30,23 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) - OCHM1LightAirconditionDoorStatusManager.addListener(TAG, this) + LightAirconditionDoorStatusManager.addListener(TAG, this) } override fun onDestroy(owner: LifecycleOwner) { super.onDestroy(owner) - OCHM1LightAirconditionDoorStatusManager.removeListener(TAG) + LightAirconditionDoorStatusManager.removeListener(TAG) } /** * 空调状态变化 */ - override fun onAirconditionStatusCallback(heaterIsOpen: Boolean,airconditionStatus: OCHM1LightAirconditionDoorStatusManager.AirconditionStatus,isFirst: Boolean) { + override fun onAirconditionStatusCallback(heaterIsOpen: Boolean, airconditionStatus: AirconditionStatus, isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, - "回写--空调开关:${OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen}、" + - "空调温度:${OCHM1LightAirconditionDoorStatusManager.airconditionStatus.temperature}" + - "空调模式:${OCHM1LightAirconditionDoorStatusManager.airconditionStatus.pattert}" + - "空调风速:${OCHM1LightAirconditionDoorStatusManager.airconditionStatus.windSpeed}") + "回写--空调开关:${LightAirconditionDoorStatusManager.airconditionStatus.isOpen}、" + + "空调温度:${LightAirconditionDoorStatusManager.airconditionStatus.temperature}" + + "空调模式:${LightAirconditionDoorStatusManager.airconditionStatus.pattert}" + + "空调风速:${LightAirconditionDoorStatusManager.airconditionStatus.windSpeed}") UiThreadHandler.post { if(airconditionStatus.isOpen){ mView?.setAirconditionHeaterView( @@ -66,7 +70,7 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : /** * 暖风机状态变化 */ - override fun onHeaterStatusCallback(airconditionIsOpen:Boolean,heaterStatue: OCHM1LightAirconditionDoorStatusManager.HeaterStatue,isFirst: Boolean) { + override fun onHeaterStatusCallback(airconditionIsOpen:Boolean, heaterStatue: HeaterStatue, isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "回写--暖风机开关:${heaterStatue.isOpen}、" + "风速:${heaterStatue.windSpeed}") @@ -93,7 +97,7 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : /** * 灯状态变化 */ - override fun onLightTop1Callback(lightStatus: OCHM1LightAirconditionDoorStatusManager.LightStatus,isFirst: Boolean) { + override fun onLightTop1Callback(lightStatus: LightStatus, isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "回写--顶灯1开关:${lightStatus.isOpenLight1}、" + "顶灯2开关:${lightStatus.isOpenLight2}、" + @@ -105,7 +109,7 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : /** * 灯状态变化 */ - override fun onLightTop2Callback(lightStatus: OCHM1LightAirconditionDoorStatusManager.LightStatus,isFirst: Boolean) { + override fun onLightTop2Callback(lightStatus: LightStatus, isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "回写--顶灯1开关:${lightStatus.isOpenLight1}、" + "顶灯2开关:${lightStatus.isOpenLight2}、" + @@ -118,7 +122,7 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : /** * 灯状态变化 */ - override fun onLightAtmosphereCallback(lightStatus: OCHM1LightAirconditionDoorStatusManager.LightStatus,isFirst: Boolean) { + override fun onLightAtmosphereCallback(lightStatus: LightStatus, isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "回写--顶灯1开关:${lightStatus.isOpenLight1}、" + "顶灯2开关:${lightStatus.isOpenLight2}、" + @@ -137,10 +141,10 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,temperatureCmd) disposeSubscribe(airconditionDisposable) airconditionDisposable = createSubscribe(10000){ - if (!OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen&& - OCHM1LightAirconditionDoorStatusManager.airconditionStatus.windSpeed!=windSpeedCmd&& - OCHM1LightAirconditionDoorStatusManager.airconditionStatus.temperature!=temperatureCmd&& - OCHM1LightAirconditionDoorStatusManager.airconditionStatus.pattert!=modeCmd) { + if (!LightAirconditionDoorStatusManager.airconditionStatus.isOpen&& + LightAirconditionDoorStatusManager.airconditionStatus.windSpeed!=windSpeedCmd&& + LightAirconditionDoorStatusManager.airconditionStatus.temperature!=temperatureCmd&& + LightAirconditionDoorStatusManager.airconditionStatus.pattert!=modeCmd) { ToastUtils.showShort("空调操作未生效，请稍后重试吧～") } } @@ -150,7 +154,7 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(2,modeCmd,windSpeedCmd,temperatureCmd) disposeSubscribe(airconditionDisposable) airconditionDisposable = createSubscribe(10000){ - if (OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen) { + if (LightAirconditionDoorStatusManager.airconditionStatus.isOpen) { ToastUtils.showShort("空调操作未生效，请稍后重试吧～") } } @@ -163,8 +167,8 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(1,windSpeedCmd) disposeSubscribe(heaterDisposable) heaterDisposable = createSubscribe(10000){ - if (!OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen&& - OCHM1LightAirconditionDoorStatusManager.heaterStatue.windSpeed!=windSpeedCmd) { + if (!LightAirconditionDoorStatusManager.heaterStatue.isOpen&& + LightAirconditionDoorStatusManager.heaterStatue.windSpeed!=windSpeedCmd) { ToastUtils.showShort("暖风机操作未生效，请稍后重试吧～") } } @@ -175,7 +179,7 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(2,0) disposeSubscribe(heaterDisposable) heaterDisposable = createSubscribe(10000){ - if (OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen) { + if (LightAirconditionDoorStatusManager.heaterStatue.isOpen) { ToastUtils.showShort("暖风机操作未生效，请稍后重试吧～")//还是开着的 } } @@ -187,14 +191,14 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : if(leftLight){ CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(1) subscribeLightTop1 = createSubscribe{ - if (!OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { + if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { ToastUtils.showShort("操作未生效，请稍后重试吧～") } } }else{ CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(2) subscribeLightTop1 = createSubscribe{ - if (OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { + if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { ToastUtils.showShort("操作未生效，请稍后重试吧～") } } @@ -206,14 +210,14 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : if(rightLight){ CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(1) subscribeLightTop2 = createSubscribe{ - if (!OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { + if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { ToastUtils.showShort("操作未生效，请稍后重试吧～") } } }else{ CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(2) subscribeLightTop2 = createSubscribe{ - if (OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { + if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { ToastUtils.showShort("操作未生效，请稍后重试吧～") } } @@ -225,14 +229,14 @@ class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : if (atmosphereLight) { CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(1) subscribeLightAtmosphere = createSubscribe{ - if (!OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { + if (!LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { ToastUtils.showShort("操作未生效，请稍后重试吧～") } } } else { CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(2) subscribeLightAtmosphere = createSubscribe{ - if (OCHM1LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { + if (LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { ToastUtils.showShort("操作未生效，请稍后重试吧～") } } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index d6d6538d9d..42d71ccc95 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -24,7 +24,7 @@ import com.mogo.och.bus.passenger.ui.MainFragment import com.mogo.och.common.module.bean.dpmsg.DPMsgType import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager import com.mogo.och.common.module.biz.constant.OchCommonConst -import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil @@ -32,21 +32,20 @@ import com.mogo.och.common.module.utils.SoundPoolHelper import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager import io.reactivex.disposables.Disposable import java.util.* class BusPassengerPresenter(view: MainFragment?) : BusBasePassengerFunctionDevicePresenter(view), - IBusPassengerControllerStatusCallback, IDistanceTimeCallback, IOrderChangeCallback, - IOrderStatusChangeListener, OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback { + IDistanceTimeCallback, IOrderChangeCallback, IOrderStatusChangeListener, + OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback, LightAirconditionDoorCallback { - private var subscribe: Disposable? = null - private var gnssSpeed = 0.0f override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) CharterPassengerModel.init() // 定位监听 - CharterPassengerModel.setControllerStatusCallback(TAG,this) CharterPassengerModel.setiDistanceTimeCallback(this) CharterPassengerModel.setCarTypeChangeListener(this) CharterPassengerModel.setStatusChangeListener(TAG,this) @@ -59,7 +58,6 @@ class BusPassengerPresenter(view: MainFragment?) : override fun onDestroy(owner: LifecycleOwner) { super.onDestroy(owner) - CharterPassengerModel.setControllerStatusCallback(TAG,null) CharterPassengerModel.setiDistanceTimeCallback(null) CharterPassengerModel.setCarTypeChangeListener(null) CallerTelematicListenerManager.removeListener(TAG) @@ -81,12 +79,6 @@ class BusPassengerPresenter(view: MainFragment?) : mView?.setOrderTime(sumTime, arrivedTime) } } - override fun onCarLocationChanged(location: MogoLocation?) { - location?.let { - setSpeed(it.gnssSpeed) - gnssSpeed = it.gnssSpeed - } - } val msgReceived = object : IReceivedMsgListener { override fun onReceivedMsg(type: Int, byteArray: ByteArray) { @@ -98,11 +90,11 @@ class BusPassengerPresenter(view: MainFragment?) : ) as BaseDPMsg when (msg.type) { DPMsgType.TYPE_OPEN_CLOSE_DOOR.type -> { - val doorStatus = OCHM1LightAirconditionDoorStatusManager.doorStatus + val doorStatus = LightAirconditionDoorStatusManager.doorStatus if(doorStatus.isOpen){ - closeDoor() + LightAirconditionDoorManager.go2OpenDoor(false) }else{ - openDoor() + LightAirconditionDoorManager.go2OpenDoor(true) } } DPMsgType.TYPE_COMMON.type -> { @@ -128,40 +120,6 @@ class BusPassengerPresenter(view: MainFragment?) : SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) } - fun openDoor() { - val canOpenOrCloseDoor = canOpenOrCloseDoor() - if(!canOpenOrCloseDoor.isNullOrEmpty()){ - ToastUtils.showShort(canOpenOrCloseDoor) - return - } - disposeSubscribe(subscribe) - subscribe = createSubscribe(1000) { - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0) - } - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(1) - } - - fun closeDoor() { - val canOpenOrCloseDoor = canOpenOrCloseDoor() - if(!canOpenOrCloseDoor.isNullOrBlank()){ - ToastUtils.showShort(canOpenOrCloseDoor) - return - } - disposeSubscribe(subscribe) - subscribe = createSubscribe(1000) { - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0) - } - CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2) - } - - private fun canOpenOrCloseDoor():String?{ - if(gnssSpeed<0.01){ - return null - }else{ - return "车辆正在运行、请稍后再试" - } - } - /** * 计算剩余距离和剩余时间 */ @@ -290,4 +248,13 @@ class BusPassengerPresenter(view: MainFragment?) : } } + override fun onDoorStatusCallback(isOpen: Boolean, isFirst: Boolean) { + if (!isFirst) { + if (isOpen) { + ToastUtils.showShort("已开启车门") + } else { + ToastUtils.showShort("已关门车门") + } + } + } } \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt index 1cffc70857..1535546529 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt @@ -4,9 +4,7 @@ import android.os.Bundle import android.util.Log import android.view.View import android.view.WindowManager -import android.widget.CompoundButton import androidx.fragment.app.DialogFragment -import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import com.mogo.commons.mvp.MvpDialogFragment @@ -14,11 +12,9 @@ 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.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.BarUtils -import com.mogo.eagle.core.utilcode.util.SharedPrefs import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter -import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionPresenter -import kotlinx.android.synthetic.m1.m1_contain_fragment.* +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager import kotlinx.android.synthetic.m1.m1_order_end.* /** @@ -45,10 +41,10 @@ class M1CarUserNoOrderFragment : override fun initViews() { dialog?.setCancelable(false) iv_end_order_opendoor.onClick { - mPresenter?.openDoor() + LightAirconditionDoorManager.go2OpenDoor(true) } iv_end_order_closedoor.onClick { - mPresenter?.closeDoor() + LightAirconditionDoorManager.go2OpenDoor(false) } } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt index 297a1c14c3..0d53a22e6e 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt @@ -36,15 +36,6 @@ class M1DeviceFragment : mPresenter?.startStopSide() SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) } - tv_car_setting_opendoor.onClick { - // 开门 AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(2); - mPresenter?.openDoor() - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) - } - tv_car_setting_closedoor.onClick { - mPresenter?.closeDoor() - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) - } } override fun createPresenter(): BusPassengerFunctionDevicePresenter = diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index f1319e0a7d..b8b5a1e113 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -28,7 +28,7 @@ import com.mogo.och.bus.passenger.net.BusPassengerServiceManager import com.mogo.och.bus.passenger.ui.M1ContainFragment import com.mogo.och.bus.passenger.ui.adapter.OrderLineItemAdapter import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter -import com.mogo.och.bus.passenger.utils.RxUtils +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.bus.passenger.view.BottomDecoration import com.mogo.och.common.module.bean.dpmsg.DPMsgType import com.mogo.och.common.module.biz.constant.OchCommonConst diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt new file mode 100644 index 0000000000..2a40c14a48 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt @@ -0,0 +1,32 @@ +package com.mogo.och.bus.passenger.ui.view.door + +import android.content.Context +import android.util.AttributeSet +import androidx.appcompat.widget.AppCompatTextView +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bus.passenger.R +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager +import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager +import com.mogo.och.common.module.utils.SoundPoolHelper +import io.reactivex.disposables.Disposable + +class CloseDoorView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatTextView(context, attrs, defStyleAttr) { + + init { + setOnClickListener { + go2OpenDoor() + } + } + + private fun go2OpenDoor(){ + LightAirconditionDoorManager.go2OpenDoor(false) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt new file mode 100644 index 0000000000..a9207bc376 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt @@ -0,0 +1,27 @@ +package com.mogo.och.bus.passenger.ui.view.door + +import android.content.Context +import android.util.AttributeSet +import androidx.appcompat.widget.AppCompatTextView +import com.mogo.och.bus.passenger.R +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager +import com.mogo.och.common.module.utils.SoundPoolHelper + +class OpenDoorView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatTextView(context, attrs, defStyleAttr) { + + init { + setOnClickListener { + go2OpenDoor() + } + } + + private fun go2OpenDoor(){ + LightAirconditionDoorManager.go2OpenDoor(true) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + } + +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml index 9712189711..65c1f4571b 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml @@ -47,7 +47,7 @@ app:layout_constraintStart_toEndOf="@+id/tv_car_setting_go" app:layout_constraintTop_toTopOf="parent" /> - - = + val M_LISTENERS: ConcurrentHashMap = ConcurrentHashMap() val airconditionStatus = AirconditionStatus(false, 0, 26, 2) @@ -23,7 +27,7 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen fun addListener( tag: String, - listener: OCHM1LightAirconditionDoorCallback + listener: LightAirconditionDoorCallback ) { if (M_LISTENERS.containsKey(tag)) { return @@ -47,7 +51,7 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen * 删除监听 * @param listener 要删除的监听对象 */ - fun removeListener(listener: OCHM1LightAirconditionDoorCallback) { + fun removeListener(listener: LightAirconditionDoorCallback) { if (!M_LISTENERS.containsValue(listener)) { return } @@ -58,36 +62,6 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen } } - - interface OCHM1LightAirconditionDoorCallback { - - fun onAirconditionStatusCallback(heaterIsOpen:Boolean,airconditionStatus: AirconditionStatus,isFirst: Boolean){} - - fun onHeaterStatusCallback(airconditionIsOpen: Boolean,heaterStatue: HeaterStatue,isFirst: Boolean){} - - fun onDoorStatusCallback(isOpen: Boolean,isFirst: Boolean){} - - fun onLightTop1Callback(lightStatus: LightStatus,isFirst: Boolean){} - fun onLightTop2Callback(lightStatus: LightStatus,isFirst: Boolean){} - fun onLightAtmosphereCallback(lightStatus: LightStatus,isFirst: Boolean){} - - } - - data class AirconditionStatus( - var isOpen: Boolean, - var pattert: Int, - var temperature: Int, - var windSpeed: Int - ) - - data class HeaterStatue(var isOpen: Boolean, var windSpeed: Int) - data class DoorStatus(var isOpen: Boolean) - data class LightStatus( - var isOpenLight1: Boolean, - var isOpenLight2: Boolean, - var isOpenatmosphere: Boolean - ) - override fun onRoboBusJinlvM1States(states: VehicleStateOuterClass.RoboBusJinlvM1State) { val airConditionerState = states.airConditionerState val heaterState = states.heaterState diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt new file mode 100644 index 0000000000..31bc8a474a --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt @@ -0,0 +1,8 @@ +package com.mogo.och.common.module.manager.devicemanage.data + +data class AirconditionStatus( + var isOpen: Boolean, + var pattert: Int, + var temperature: Int, + var windSpeed: Int +) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt new file mode 100644 index 0000000000..370f8a5dac --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt @@ -0,0 +1,3 @@ +package com.mogo.och.common.module.manager.devicemanage.data + +data class DoorStatus(var isOpen: Boolean) \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt new file mode 100644 index 0000000000..80d2ef5690 --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt @@ -0,0 +1,3 @@ +package com.mogo.och.common.module.manager.devicemanage.data + +data class HeaterStatue(var isOpen: Boolean, var windSpeed: Int) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt new file mode 100644 index 0000000000..69f047a7cf --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt @@ -0,0 +1,7 @@ +package com.mogo.och.common.module.manager.devicemanage.data + +data class LightStatus( + var isOpenLight1: Boolean, + var isOpenLight2: Boolean, + var isOpenatmosphere: Boolean +) \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/RxUtils.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/RxUtils.kt similarity index 95% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/RxUtils.kt rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/RxUtils.kt index 9f3e691023..cb6cbd7dbd 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/RxUtils.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/RxUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.utils +package com.mogo.och.common.module.utils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers From 219ffb65b377106dfbdb10c65d2e699b8dd561c9 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 24 Apr 2023 20:41:37 +0800 Subject: [PATCH 18/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-charter-passenger/build.gradle | 8 ----- .../src/{m1 => main}/assets/m1_style.data | Bin .../{m1 => main}/assets/m1_style_extra.data | Bin .../src/main/assets/map_style.data | Bin 68668 -> 0 bytes .../src/main/assets/map_style_extra.data | Bin 15198 -> 0 bytes .../och/bus/passenger/MogoOCHBusPassenger.kt | 0 .../mogo/och/bus/passenger/bean/LoopInfo.kt | 0 .../bean/TaxiPassengerVideoPlay.java | 0 .../och/bus/passenger/bean/Temperature.kt | 0 .../bean/request/ArriveDestRequest.kt | 0 .../request/BusPassengerQueryLineRequest.java | 0 .../passenger/bean/request/EndOrderRequest.kt | 0 .../bean/response/BusinessStatusResponse.kt | 0 .../bean/response/BusinessTimeResponse.kt | 0 .../bean/response/LineInfoListResponse.kt | 0 .../bean/response/LineInfoResponse.kt | 0 .../passenger/bean/response/LocusResponse.kt | 0 .../response/M1DriverLoginStatusResponse.kt | 0 .../bean/response/OrderInfoResponse.kt | 0 .../bean/response/SiteInfoResponse.kt | 0 .../IBusPassengerADASStatusCallback.java | 0 ...IBusPassengerControllerStatusCallback.java | 0 .../callback/IDistanceTimeCallback.kt | 0 .../callback/IOrderChangeCallback.kt | 0 .../passenger/model/CharterPassengerModel.kt | 1 - .../bus/passenger/model/OrderStatusEnum.kt | 0 .../net/BusPassengerModelLoopManager.kt | 0 .../net/BusPassengerServiceManager.kt | 0 .../bus/passenger/net/PassengerServiceApi.kt | 0 ...BusBasePassengerFunctionDevicePresenter.kt | 0 .../BusPassengerCarUseAndNoOrderPresenter.kt | 0 .../BusPassengerFunctionDevicePresenter.kt | 0 ...PassengerFunctionEarlyEndOrderPresenter.kt | 0 .../BusPassengerFunctionOrderPresenter.kt | 0 .../BusPassengerFunctionPresenter.kt | 0 .../BusPassengerFunctionSoftPresenter.kt | 0 .../BusPassengerFunctionVideoPresenter.kt | 0 .../presenter/BusPassengerPresenter.kt | 3 -- .../passenger/provider/StatusViewManager.java | 0 .../passenger/ui/M1CarUserNoOrderFragment.kt | 2 +- .../och/bus/passenger/ui/M1ContainFragment.kt | 2 +- .../och/bus/passenger/ui/M1DeviceFragment.kt | 2 +- .../passenger/ui/M1EarlyEndOrderFragment.kt | 2 +- .../och/bus/passenger/ui/M1OrderFragment.kt | 3 +- .../och/bus/passenger/ui/M1SoftFragment.kt | 29 ++++++++++++------ .../och/bus/passenger/ui/M1VideoFragment.kt | 15 +++++++-- .../mogo/och/bus/passenger/ui/MainFragment.kt | 2 +- .../ui/adapter/OrderLineItemAdapter.kt | 0 .../ui/adapter/OrderSiteItemAdapter.kt | 0 .../ui/adapter/RecyclerItemVideoHolder.java | 0 .../ui/adapter/RecyclerVideoAdapter.java | 0 .../ui/adapter/TemperatureAdapter.java | 0 .../layoutmanage/CarouselLayoutManager.java | 0 .../CarouselZoomPostLayoutListener.java | 0 .../ui/layoutmanage/CenterScrollListener.java | 0 .../ui/layoutmanage/ItemTransformation.java | 0 .../ui/layoutmanage/PagerCenterSnapHelper.kt | 0 .../passenger/ui/view/EarlyEndOrderView.kt | 0 .../och/bus/passenger/ui/view/EndOrderView.kt | 0 .../och/bus/passenger/ui/view/LineSiteView.kt | 14 +++++++-- .../passenger/ui/view/door/CloseDoorView.kt | 0 .../passenger/ui/view/door/OpenDoorView.kt | 0 .../och/bus/passenger/utils/FullVideoUtils.kt | 0 .../bus/passenger/utils/VoiceFocusManager.kt | 0 .../och/bus/passenger/utils/ZoomDrawable.kt | 0 .../bus/passenger/view/BottomDecoration.java | 4 --- .../bus/passenger/view/ConsultVideoPlayer.kt | 0 .../och/bus/passenger/view/DrawBitmapView.kt | 0 .../bus/passenger/view/DrawableCheckBox.java | 0 .../passenger/view/HorizontalDecoration.java | 0 .../passenger/view/PickerLayoutManager.java | 0 .../view/RecyclerViewCornerRadius.java | 0 .../view/drawable/MineGradientDrawable.kt | 0 .../view/statusbar/M1BlueToothView.kt | 2 +- .../passenger/view/statusbar/StatusBarView.kt | 2 +- .../{m1 => main}/res/anim/alpha_hide_show.xml | 0 .../res/color/bus_p_aircondition_enable.xml | 0 ...irconditon_pattern_text_color_selector.xml | 0 .../drawable-nodpi/bg_taxi_p_video_index.png | Bin .../bg_taxi_p_video_thumb_big.png | Bin .../bg_taxi_p_video_thumb_small.png | Bin .../bug_p_overmap_car_model.png | Bin .../res/drawable-nodpi/bus_p_car_speed.png | Bin .../bus_p_function_aircondition_nor.png | Bin ...function_aircondition_pattern_selected.png | Bin .../bus_p_function_aircondition_select.png | Bin .../bus_p_function_aircondition_selected.png | Bin ..._function_aircondition_switch_selected.png | Bin .../bus_p_function_atmosphere_nor.png | Bin .../bus_p_function_atmosphere_select.png | Bin ...p_function_device_closedoor_normal_src.png | Bin ..._p_function_device_closedoor_press_src.png | Bin .../bus_p_function_device_go_normal_src.png | Bin .../bus_p_function_device_go_press_src.png | Bin .../bus_p_function_device_normal.png | Bin ..._p_function_device_opendoor_normal_src.png | Bin ...s_p_function_device_opendoor_press_src.png | Bin .../bus_p_function_device_press.png | Bin ..._p_function_device_stopside_normal_src.png | Bin ...s_p_function_device_stopside_press_src.png | Bin .../bus_p_function_information_normal.png | Bin .../bus_p_function_information_press.png | Bin .../bus_p_function_left_bg_selected.png | Bin .../bus_p_function_light_check_select.png | Bin .../bus_p_function_light_check_selected.png | Bin .../bus_p_function_light_middle_selected.png | Bin .../bus_p_function_light_nor.png | Bin .../bus_p_function_light_select.png | Bin .../bus_p_function_light_select_left.png | Bin .../bus_p_function_light_select_right.png | Bin .../bus_p_function_light_selected.png | Bin ...us_p_function_light_switch_bg_selected.png | Bin .../bus_p_function_order_normal.png | Bin .../bus_p_function_order_press.png | Bin .../bus_p_function_soft_normal.png | Bin .../bus_p_function_soft_press.png | Bin .../bus_p_function_voice_humb.png | Bin .../bus_p_function_voice_left_select_src.png | Bin ...bus_p_function_voice_left_selected_src.png | Bin .../bus_p_function_voice_max.png | Bin .../bus_p_function_voice_middle_select.png | Bin .../bus_p_function_voice_middle_selected.png | Bin .../bus_p_function_voice_min.png | Bin .../res/drawable-nodpi/bus_p_loading.png | Bin .../bus_p_m1_blue_tooth_close.png | Bin .../bus_p_m1_blue_tooth_open.png | Bin .../bus_p_m1_status_bar_logo.png | Bin .../drawable-nodpi/bus_p_overmap_reset.png | Bin .../bus_p_player_change_normal.png | Bin .../bus_pm1_aircondition_wind_high.png | Bin .../bus_pm1_aircondition_wind_low.png | Bin .../bus_pm1_aircondition_wind_middle.png | Bin .../drawable-nodpi/bus_pm1_warm_wind_high.png | Bin .../drawable-nodpi/bus_pm1_warm_wind_lod.png | Bin .../bus_pm1_warm_wind_middle.png | Bin .../res/drawable-nodpi/m1_function_bg.png | Bin .../m1_line_cancle_submit_bg.png | Bin .../m1_order_closedoor_normal.png | Bin .../m1_order_closedoor_press.png | Bin .../res/drawable-nodpi/m1_order_early_end.png | Bin .../res/drawable-nodpi/m1_order_end.png | Bin .../res/drawable-nodpi/m1_order_end_car.png | Bin .../res/drawable-nodpi/m1_order_noorder.png | Bin .../m1_order_opendoor_normal.png | Bin .../m1_order_opendoor_press.png | Bin .../drawable-nodpi/m1_order_site_check.png | Bin .../m1_order_site_check_enable.png | Bin .../drawable-nodpi/m1_order_site_checked.png | Bin .../m1_order_switch_line_enable.png | Bin .../m1_order_switch_line_unenable.png | Bin .../m1_site_cancle_submit_bg.png | Bin .../res/drawable-nodpi/m1_site_submit_bg.png | Bin .../m1_small_map_view_dir_end.png | Bin .../drawable-nodpi/notice_video_pause_big.png | Bin .../notice_video_pause_small.png | Bin .../drawable-nodpi/notice_video_start_big.png | Bin .../notice_video_start_small.png | Bin .../res/drawable-nodpi/taxi_p_change_full.png | Bin .../drawable-nodpi/taxi_p_mogo_video_play.png | Bin .../drawable-nodpi/taxi_p_video_bg_bottom.png | Bin .../drawable-nodpi/taxi_p_video_bg_top.png | Bin .../drawable-nodpi/taxi_p_video_holder.png | Bin .../taxi_power_size_seekbar_style.xml | 0 .../drawable-v29/taxi_video_seekbar_style.xml | 0 .../res/drawable/bg_taxi_p_video_bg.xml | 0 .../res/drawable/bg_taxi_p_video_bg_shape.xml | 0 .../res/drawable/bg_taxi_p_video_bg_top.xml | 0 .../res/drawable/bus_p_distance_info_bg.xml | 0 .../bus_p_function_aircondition_common_bg.xml | 0 ...s_p_function_aircondition_common_bg_01.xml | 0 ...us_p_function_aircondition_left_select.xml | 0 ..._p_function_aircondition_left_selected.xml | 0 ...function_aircondition_pattern_selecotr.xml | 0 ...p_function_aircondition_pattern_select.xml | 0 ..._p_function_aircondition_switch_select.xml | 0 ..._function_aircondition_switch_selector.xml | 0 ...bus_p_function_airconditon_bg_selector.xml | 0 ...s_p_function_airconditon_left_selector.xml | 0 ...nction_airconditon_text_color_selector.xml | 0 ...s_p_function_bottom_device_bg_selector.xml | 0 ...unction_bottom_information_bg_selector.xml | 0 ...us_p_function_bottom_order_bg_selector.xml | 0 ...bus_p_function_bottom_soft_bg_selector.xml | 0 ...bus_p_function_device_closedoor_normal.xml | 0 .../bus_p_function_device_closedoor_press.xml | 0 ...unction_device_closedoor_press_selecor.xml | 0 .../bus_p_function_device_go_normal.xml | 0 .../bus_p_function_device_go_press.xml | 0 ...bus_p_function_device_go_press_selecor.xml | 0 .../bus_p_function_device_opendoor_normal.xml | 0 .../bus_p_function_device_opendoor_press.xml | 0 ...function_device_opendoor_press_selecor.xml | 0 .../bus_p_function_device_stopside_normal.xml | 0 .../bus_p_function_device_stopside_press.xml | 0 ...function_device_stopside_press_selecor.xml | 0 .../bus_p_function_distance_split_bg.xml | 0 .../bus_p_function_left_bg_select.xml | 0 .../bus_p_function_light_left_select.xml | 0 .../bus_p_function_light_left_selected.xml | 0 .../bus_p_function_light_left_selector.xml | 0 .../bus_p_function_light_switch_bg_select.xml | 0 ...us_p_function_light_switch_bg_selector.xml | 0 .../bus_p_function_setting_soft_b_shape.xml | 0 .../bus_p_function_switch_left_select.xml | 0 .../bus_p_function_switch_left_selected.xml | 0 .../bus_p_function_switch_left_selector.xml | 0 ...us_p_function_video_player_change_full.xml | 0 ..._p_function_video_player_change_normal.xml | 0 .../bus_p_function_video_player_pause_big.xml | 0 ...us_p_function_video_player_pause_small.xml | 0 .../bus_p_function_video_player_start_big.xml | 0 ...us_p_function_video_player_start_small.xml | 0 .../bus_p_function_video_player_thumb_big.xml | 0 ...us_p_function_video_player_thumb_samll.xml | 0 .../bus_p_function_voice_left_select.xml | 0 .../bus_p_function_voice_left_selected.xml | 0 .../bus_p_function_voice_left_selector.xml | 0 ...us_p_function_voice_right_process_humb.xml | 0 .../res/drawable/bus_p_overmap_reset_size.xml | 0 .../m1_order_end_closedoor_selecotr.xml | 0 .../m1_order_end_opendoor_selecotr.xml | 0 .../drawable/m1_order_line_checked_shape.xml | 0 .../res/drawable/m1_order_line_shape.xml | 0 .../taxi_power_size_seekbar_style.xml | 0 .../res/drawable/taxi_video_seekbar_style.xml | 0 .../res/layout/m1_contain_fragment.xml | 0 .../res/layout/m1_devices_fragment.xml | 0 .../res/layout/m1_main_fragment.xml | 0 .../res/layout/m1_order_early_end.xml | 0 .../{m1 => main}/res/layout/m1_order_end.xml | 0 .../res/layout/m1_order_fragment.xml | 0 .../res/layout/m1_order_line_item.xml | 0 .../res/layout/m1_order_lineside.xml | 0 .../res/layout/m1_order_noorder.xml | 0 .../res/layout/m1_order_site_item.xml | 0 .../res/layout/m1_soft_fragment.xml | 0 .../res/layout/m1_soft_temperature_item.xml | 0 .../res/layout/m1_statusview_blue_tooth.xml | 0 .../res/layout/m1_statusview_datetime.xml | 0 .../res/layout/m1_video_fragment.xml | 0 .../{m1 => main}/res/layout/m1_video_item.xml | 0 .../{m1 => main}/res/layout/m1_video_view.xml | 0 .../src/{m1 => main}/res/raw/aiqinghao.nt3d | Bin .../src/{m1 => main}/res/raw/jiatinghao.nt3d | Bin .../src/{m1 => main}/res/raw/m1.nt3d | Bin .../src/{m1 => main}/res/raw/m1_voice_di.mp3 | Bin .../src/{m1 => main}/res/raw/pengyouhao.nt3d | Bin .../src/{m1 => main}/res/values/attrs.xml | 0 .../src/{m1 => main}/res/values/color.xml | 0 .../src/{m1 => main}/res/values/strings.xml | 0 .../src/{m1 => main}/res/values/styles.xml | 0 app/script/vehicleFlavors/ochM1.gradle | 5 +-- 252 files changed, 52 insertions(+), 44 deletions(-) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/assets/m1_style.data (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/assets/m1_style_extra.data (100%) delete mode 100644 OCH/mogo-och-charter-passenger/src/main/assets/map_style.data delete mode 100644 OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/Temperature.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt (99%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt (99%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt (96%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt (96%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt (94%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt (97%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt (94%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/MainFragment.kt (99%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/BottomDecoration.java (88%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt (93%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/anim/alpha_hide_show.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/color/bus_p_aircondition_enable.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bg_taxi_p_video_index.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bug_p_overmap_car_model.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_car_speed.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_nor.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_atmosphere_nor.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_atmosphere_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_go_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_go_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_information_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_information_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_left_bg_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_check_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_check_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_middle_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_nor.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_select_left.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_select_right.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_order_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_order_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_soft_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_soft_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_humb.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_left_select_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_max.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_middle_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_middle_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_min.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_loading.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_m1_status_bar_logo.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_overmap_reset.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_player_change_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_warm_wind_high.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_warm_wind_lod.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_warm_wind_middle.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_function_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_line_cancle_submit_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_closedoor_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_closedoor_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_early_end.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_end.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_end_car.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_noorder.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_opendoor_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_opendoor_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_site_check.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_site_check_enable.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_site_checked.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_switch_line_enable.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_switch_line_unenable.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_site_cancle_submit_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_site_submit_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_small_map_view_dir_end.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_pause_big.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_pause_small.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_start_big.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_start_small.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_change_full.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_mogo_video_play.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_video_bg_bottom.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_video_bg_top.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_video_holder.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-v29/taxi_power_size_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-v29/taxi_video_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bg_taxi_p_video_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bg_taxi_p_video_bg_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bg_taxi_p_video_bg_top.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_distance_info_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_common_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_common_bg_01.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_pattern_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_switch_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_switch_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_airconditon_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_airconditon_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_airconditon_text_color_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_device_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_information_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_order_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_soft_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_closedoor_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_closedoor_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_closedoor_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_go_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_go_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_go_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_opendoor_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_opendoor_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_opendoor_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_stopside_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_stopside_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_stopside_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_distance_split_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_left_bg_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_switch_bg_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_switch_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_setting_soft_b_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_switch_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_switch_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_switch_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_change_full.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_change_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_pause_big.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_pause_small.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_start_big.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_start_small.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_thumb_big.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_thumb_samll.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_right_process_humb.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_overmap_reset_size.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_end_closedoor_selecotr.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_end_opendoor_selecotr.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_line_checked_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_line_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/taxi_power_size_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/taxi_video_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_contain_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_devices_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_main_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_early_end.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_end.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_line_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_lineside.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_noorder.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_site_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_soft_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_soft_temperature_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_statusview_blue_tooth.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_statusview_datetime.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_video_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_video_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_video_view.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/aiqinghao.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/jiatinghao.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/m1.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/m1_voice_di.mp3 (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/pengyouhao.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/attrs.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/color.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/strings.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/styles.xml (100%) diff --git a/OCH/mogo-och-charter-passenger/build.gradle b/OCH/mogo-och-charter-passenger/build.gradle index 5df151bed5..c0e8c71d13 100644 --- a/OCH/mogo-och-charter-passenger/build.gradle +++ b/OCH/mogo-och-charter-passenger/build.gradle @@ -45,14 +45,6 @@ android { } } - flavorDimensions "vehicle" - productFlavors { - // 车型：金旅m1 包车业务 - m1 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } - } } dependencies { diff --git a/OCH/mogo-och-charter-passenger/src/m1/assets/m1_style.data b/OCH/mogo-och-charter-passenger/src/main/assets/m1_style.data similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/assets/m1_style.data rename to OCH/mogo-och-charter-passenger/src/main/assets/m1_style.data diff --git a/OCH/mogo-och-charter-passenger/src/m1/assets/m1_style_extra.data b/OCH/mogo-och-charter-passenger/src/main/assets/m1_style_extra.data similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/assets/m1_style_extra.data rename to OCH/mogo-och-charter-passenger/src/main/assets/m1_style_extra.data diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/map_style.data b/OCH/mogo-och-charter-passenger/src/main/assets/map_style.data deleted file mode 100644 index ab077f984974ac9aca03d62b22520bb815b24fdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68668 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 XzkmOJSB~o6|NQMc?)k8PrT+g16}B4e diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data b/OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data deleted file mode 100644 index 01f7f2116ecf898b4b694db6f591728d6361cd46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15198 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 Y?wU5;`4y_WAS+sT`&I=>`_^Vt1It@_mjD0& diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt similarity index 99% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 412c5e52ee..8cb85c1c03 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -3,7 +3,6 @@ package com.mogo.och.bus.passenger.model import android.annotation.SuppressLint import android.content.Context import android.net.ConnectivityManager -import android.os.Build import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 42d71ccc95..0489cbaa8d 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -3,7 +3,6 @@ package com.mogo.och.bus.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.voice.AIAssist -import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager @@ -14,7 +13,6 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse -import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback import com.mogo.och.bus.passenger.callback.IOrderChangeCallback import com.mogo.och.bus.passenger.callback.IDistanceTimeCallback import com.mogo.och.bus.passenger.model.CharterPassengerModel @@ -34,7 +32,6 @@ import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager -import io.reactivex.disposables.Disposable import java.util.* class BusPassengerPresenter(view: MainFragment?) : diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt index 1535546529..e01f63d718 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt @@ -15,7 +15,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager -import kotlinx.android.synthetic.m1.m1_order_end.* +import kotlinx.android.synthetic.main.m1_order_end.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt similarity index 99% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt index 1284e5ac9d..1810e6ae86 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt @@ -16,7 +16,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.SharedPrefs import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionPresenter -import kotlinx.android.synthetic.m1.m1_contain_fragment.* +import kotlinx.android.synthetic.main.m1_contain_fragment.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt similarity index 96% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt index 0d53a22e6e..3a914f1f50 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter import com.mogo.och.common.module.utils.SoundPoolHelper -import kotlinx.android.synthetic.m1.m1_devices_fragment.* +import kotlinx.android.synthetic.main.m1_devices_fragment.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt similarity index 96% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt index ff0c1d92e7..7c46d0c176 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt @@ -5,7 +5,7 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionEarlyEndOrderPresenter -import kotlinx.android.synthetic.m1.m1_order_early_end.* +import kotlinx.android.synthetic.main.m1_order_early_end.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt similarity index 94% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt index 362da620f7..35e1459f48 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt @@ -4,10 +4,9 @@ import android.os.Bundle import android.view.View import com.mogo.commons.mvp.MvpFragment import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay import com.mogo.och.bus.passenger.model.OrderStatusEnum import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter -import kotlinx.android.synthetic.m1.m1_order_fragment.* +import kotlinx.android.synthetic.main.m1_order_fragment.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt similarity index 97% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt index 60e3875e57..7697bf38f0 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt @@ -16,9 +16,6 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import android.widget.TextView import androidx.core.content.ContextCompat -import androidx.core.view.isVisible -import androidx.recyclerview.widget.LinearSnapHelper -import androidx.recyclerview.widget.SnapHelper import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -38,7 +35,7 @@ import com.yangyakun.main.ui.loading.drawable.MineGradientDrawable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.m1.m1_soft_fragment.* +import kotlinx.android.synthetic.main.m1_soft_fragment.* import me.jessyan.autosize.utils.AutoSizeUtils import java.util.concurrent.TimeUnit @@ -229,20 +226,34 @@ class M1SoftFragment : } } val pickerLayoutManager = - PickerLayoutManager(requireContext(), PickerLayoutManager.HORIZONTAL, false) + PickerLayoutManager( + requireContext(), + PickerLayoutManager.HORIZONTAL, + false + ) pickerLayoutManager.isChangeAlpha = true pickerLayoutManager.scaleDownBy = 0.29f pickerLayoutManager.scaleDownDistance = 0.8f val data = getData() - val adapter = TemperatureAdapter(requireContext(), data, rv_aircondition_temperature) + val adapter = TemperatureAdapter( + requireContext(), + data, + rv_aircondition_temperature + ) val snapHelper = PagerCenterSnapHelper() snapHelper.attachToRecyclerView(rv_aircondition_temperature) rv_aircondition_temperature.layoutManager = pickerLayoutManager rv_aircondition_temperature.adapter = adapter - HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(HorizontalDecoration.distancekey,0) + HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt( + HorizontalDecoration.distancekey,0) val space = AutoSizeUtils.dp2px(context, 15f) - rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(space,data.size-1)) + rv_aircondition_temperature.addItemDecoration( + HorizontalDecoration( + space, + data.size - 1 + ) + ) pickerLayoutManager.setOnScrollStopListener { view -> if (view is TextView) { @@ -272,7 +283,7 @@ class M1SoftFragment : } } - private fun setCheckAir(adapter:TemperatureAdapter,tag:Temperature){ + private fun setCheckAir(adapter: TemperatureAdapter, tag:Temperature){ adapter.setCheckIndex(tag.index) currentTemperature = tag if (rv_aircondition_temperature.tag == touchTag) { diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt similarity index 94% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt index bf832a2e49..8def79dab3 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt @@ -13,7 +13,7 @@ import com.mogo.och.bus.passenger.ui.layoutmanage.CarouselZoomPostLayoutListener import com.mogo.och.bus.passenger.ui.layoutmanage.CenterScrollListener import com.mogo.och.bus.passenger.view.ConsultVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoView -import kotlinx.android.synthetic.m1.m1_video_fragment.* +import kotlinx.android.synthetic.main.m1_video_fragment.* import kotlin.math.floor /** @@ -35,7 +35,11 @@ class M1VideoFragment : override fun initViews() { initConsultData() - val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true) + val carouselLayoutManager = + CarouselLayoutManager( + CarouselLayoutManager.HORIZONTAL, + true + ) carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener()) carouselLayoutManager.maxVisibleItems = 1 rvVideoPlaylist.addOnScrollListener(object : CenterScrollListener() { @@ -81,7 +85,12 @@ class M1VideoFragment : } } } - val recyclerVideoAdapter = RecyclerVideoAdapter(requireContext(), arrayListOf, rvVideoPlaylist) + val recyclerVideoAdapter = + RecyclerVideoAdapter( + requireContext(), + arrayListOf, + rvVideoPlaylist + ) recyclerVideoAdapter.setOnThumbImageClilckListener { val (_: kotlin.Int, player) = getPlayer(carouselLayoutManager) if (player is ConsultVideoPlayer) { diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt similarity index 99% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 2323b2e724..8b753876ad 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -27,7 +27,7 @@ import com.mogo.och.common.module.voice.VoiceManager import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter import com.mogo.och.bus.passenger.utils.VoiceFocusManager import com.mogo.och.common.module.biz.constant.LoginStatusManager -import kotlinx.android.synthetic.m1.m1_main_fragment.* +import kotlinx.android.synthetic.main.m1_main_fragment.* import java.lang.ref.WeakReference /** diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index b8b5a1e113..3ebe752a6b 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -36,7 +36,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.m1.m1_order_lineside.view.* +import kotlinx.android.synthetic.main.m1_order_lineside.view.* import me.jessyan.autosize.utils.AutoSizeUtils class LineSiteView @JvmOverloads constructor( @@ -99,12 +99,20 @@ class LineSiteView @JvmOverloads constructor( super.onAttachedToWindow() rlv_line_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) - rlv_line_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context, 60f))) + rlv_line_list.addItemDecoration( + BottomDecoration( + AutoSizeUtils.dp2px(context, 60f) + ) + ) rlv_line_list.adapter = lineAdapter rv_site_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) - rv_site_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context, 60f))) + rv_site_list.addItemDecoration( + BottomDecoration( + AutoSizeUtils.dp2px(context, 60f) + ) + ) rv_site_list.adapter = siteAdapter val hasSetLineAndSite = CharterPassengerModel.hasSetLineAndSite() diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java similarity index 88% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java index 78ec3608db..55c4d28cd1 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java @@ -6,10 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; -import com.mogo.och.bus.passenger.ui.adapter.TemperatureAdapter; - public class BottomDecoration extends RecyclerView.ItemDecoration { /** * 第一个视图和最后一个视图偏移的距离 diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt similarity index 93% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt index 7a7ce0013f..e193fa8785 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.m1.m1_statusview_blue_tooth.view.* +import kotlinx.android.synthetic.main.m1_statusview_blue_tooth.view.* /** * 魔戒蓝牙控件 diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt index 9c9abbefc2..22a782b541 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt @@ -20,7 +20,7 @@ import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.m1.m1_statusview_datetime.view.* +import kotlinx.android.synthetic.main.m1_statusview_datetime.view.* import me.jessyan.autosize.utils.AutoSizeUtils import kotlin.math.roundToInt diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/anim/alpha_hide_show.xml b/OCH/mogo-och-charter-passenger/src/main/res/anim/alpha_hide_show.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/anim/alpha_hide_show.xml rename to OCH/mogo-och-charter-passenger/src/main/res/anim/alpha_hide_show.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_aircondition_enable.xml b/OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_aircondition_enable.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_aircondition_enable.xml rename to OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_aircondition_enable.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_select.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_nor.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_nor.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_left.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_left.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_order_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_order_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_order_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_order_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_humb.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_humb.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_max.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_max.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_min.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_min.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_loading.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_loading.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_loading.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_loading.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_function_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_function_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_function_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_function_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_line_cancle_submit_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_line_cancle_submit_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_early_end.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_early_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_early_end.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_early_end.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end_car.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end_car.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end_car.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end_car.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_noorder.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_noorder.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_noorder.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_noorder.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check_enable.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check_enable.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_checked.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_checked.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_switch_line_enable.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_switch_line_enable.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_switch_line_unenable.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_switch_line_unenable.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_site_cancle_submit_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_site_cancle_submit_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_site_submit_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_site_submit_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_big.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_small.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_top.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_top.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_power_size_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_power_size_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_top.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_distance_info_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_distance_info_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_selected.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_left_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_order_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_order_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_normal.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_normal.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_normal.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_normal.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_left_bg_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_left_bg_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selected.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selected.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_select.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selected.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selector.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_right_process_humb.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_right_process_humb.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_checked_shape.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_checked_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_checked_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_checked_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_shape.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_contain_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_contain_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_early_end.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_early_end.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_line_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_line_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_line_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_line_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_lineside.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_lineside.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_noorder.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_noorder.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_site_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_site_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_site_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_site_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_temperature_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_temperature_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_temperature_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_temperature_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_blue_tooth.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_blue_tooth.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_blue_tooth.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_view.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_view.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_view.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_view.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/aiqinghao.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/aiqinghao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/aiqinghao.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/aiqinghao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/jiatinghao.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/jiatinghao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/jiatinghao.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/jiatinghao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/m1.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/m1.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1_voice_di.mp3 b/OCH/mogo-och-charter-passenger/src/main/res/raw/m1_voice_di.mp3 similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/m1_voice_di.mp3 rename to OCH/mogo-och-charter-passenger/src/main/res/raw/m1_voice_di.mp3 diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/pengyouhao.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/pengyouhao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/pengyouhao.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/pengyouhao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/attrs.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/attrs.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/color.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/color.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/strings.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/styles.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/styles.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/styles.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/styles.xml diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index 77bdc5e030..27dd69aeee 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -22,9 +22,6 @@ project.android.productFlavors { if(isDriver()){ matchingFallbacks = ['driverm1'] } - if(isPassenger()){ - matchingFallbacks = ['m1'] - } - + } } \ No newline at end of file From 23d4e82e2580c5c0cabb285ab2a3ddeafe0fa05d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 24 Apr 2023 20:46:05 +0800 Subject: [PATCH 19/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E6=8A=BD=E5=8F=96?= =?UTF-8?q?go=E5=92=8C=E9=9D=A0=E8=BE=B9=E5=81=9C=E8=BD=A6=E5=88=B0view?= =?UTF-8?q?=E4=B8=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerFunctionDevicePresenter.kt | 44 ---------------- .../och/bus/passenger/ui/M1DeviceFragment.kt | 13 +---- .../bus/passenger/ui/view/stopsite/GoView.kt | 50 +++++++++++++++++++ .../ui/view/stopsite/StopSiteView.kt | 44 ++++++++++++++++ .../main/res/layout/m1_devices_fragment.xml | 4 +- 5 files changed, 97 insertions(+), 58 deletions(-) create mode 100644 OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/GoView.kt create mode 100644 OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/StopSiteView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt index 130365e0be..86dbf5b2f5 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt @@ -26,48 +26,4 @@ class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) : super.onDestroy(owner) } - // 靠边停车 - fun startStopSide() { - when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastUtils.showShort("设备未就绪请稍等，请稍后再试") - } - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - ToastUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请稍后再试") - } - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { - // 靠边停车 - CallerAutoPilotControlManager.sendPlanningCmd(1) - } - IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") - } - else -> {} - } - } - - fun startGo() { - when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastUtils.showShort("设备未就绪请稍等") - } - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - ToastUtils.showShort("启动自动驾驶中") - CallerAutoPilotControlManager.sendPlanningCmd(2) - CharterPassengerModel.startAutopilot() - CharterPassengerModel.leaveStation() - CharterPassengerModel.sendTripInfo() - } - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { - // 重新起步 - CallerAutoPilotControlManager.sendPlanningCmd(2) - CharterPassengerModel.leaveStation() - } - IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") - } - else -> {} - } - } - } \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt index 3a914f1f50..4d3944bcac 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt @@ -24,18 +24,7 @@ class M1DeviceFragment : } private fun initListener() { - tv_car_setting_go.setOnClickListener { - //判断自动驾驶状态 - // 自动驾驶状态中： AdasManager.getInstance().sendPlanningCmd(2); - // 没有在自动驾驶中：启动自动驾驶 CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - mPresenter?.startGo() - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) - } - tv_car_setting_stopside.setOnClickListener { - // 执行靠边停车 AdasManager.getInstance().sendPlanningCmd(1); - mPresenter?.startStopSide() - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) - } + } override fun createPresenter(): BusPassengerFunctionDevicePresenter = diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/GoView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/GoView.kt new file mode 100644 index 0000000000..00c447662d --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/GoView.kt @@ -0,0 +1,50 @@ +package com.mogo.och.bus.passenger.ui.view.stopsite + +import android.content.Context +import android.util.AttributeSet +import androidx.appcompat.widget.AppCompatTextView +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.model.CharterPassengerModel +import com.mogo.och.common.module.utils.SoundPoolHelper + +class GoView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatTextView(context, attrs, defStyleAttr) { + + init { + setOnClickListener { + startGo() + } + } + + private fun startGo(){ + when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 + ToastUtils.showShort("设备未就绪请稍等") + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// + ToastUtils.showShort("启动自动驾驶中") + CallerAutoPilotControlManager.sendPlanningCmd(2) + CharterPassengerModel.startAutopilot() + CharterPassengerModel.leaveStation() + CharterPassengerModel.sendTripInfo() + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { + // 重新起步 + CallerAutoPilotControlManager.sendPlanningCmd(2) + CharterPassengerModel.leaveStation() + } + IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { + ToastUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") + } + else -> {} + } + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/StopSiteView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/StopSiteView.kt new file mode 100644 index 0000000000..7dec48188f --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/stopsite/StopSiteView.kt @@ -0,0 +1,44 @@ +package com.mogo.och.bus.passenger.ui.view.stopsite + +import android.content.Context +import android.util.AttributeSet +import androidx.appcompat.widget.AppCompatTextView +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bus.passenger.R +import com.mogo.och.common.module.utils.SoundPoolHelper + +class StopSiteView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatTextView(context, attrs, defStyleAttr) { + + init { + setOnClickListener { + stopSite() + } + } + + private fun stopSite(){ + when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 + ToastUtils.showShort("设备未就绪请稍等，请稍后再试") + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// + ToastUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请稍后再试") + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { + // 靠边停车 + CallerAutoPilotControlManager.sendPlanningCmd(1) + } + IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { + ToastUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") + } + else -> {} + } + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml index 65c1f4571b..8a66824115 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml @@ -16,7 +16,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_percent="0.4589"> - - Date: Mon, 24 Apr 2023 21:07:22 +0800 Subject: [PATCH 20/25] =?UTF-8?q?[login]=20[3.2.0]=20[=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=8F=E7=BA=AC=E5=BA=A6=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E7=9B=91=E5=90=AC=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=80=BC]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/model/OchCommonLoginModel.kt | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt index 4b48f87c59..27f4b19f7b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt @@ -3,8 +3,6 @@ package com.mogo.och.common.module.biz.model import android.annotation.SuppressLint import android.content.Context import com.mogo.eagle.core.data.BaseData -import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.SharedPrefs @@ -26,17 +24,13 @@ import com.mogo.och.common.module.utils.ToastUtilsOch * 网约车 - 出租车业务逻辑处理 */ @SuppressLint("StaticFieldLeak") -object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener { +object OchCommonLoginModel { private val TAG = "TaxiLoginModel" private var mContext: Context? = null var iTaxiLoginCallback: ITaxiLoginCallback? = null - private var mLongitude = 0.0 - private var mLatitude = 0.0 fun init(context: Context) { mContext = context.applicationContext - // 达到起始站围栏监听 - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this) } fun hasInit(): Boolean { @@ -46,13 +40,6 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener { return true } - override fun onChassisLocationGCJ02(gnssInfo: MogoLocation?) { - gnssInfo?.let { - mLongitude = it.longitude - mLatitude = it.latitude - } - } - fun getiTaxiLoginCallback(): ITaxiLoginCallback? { return iTaxiLoginCallback } @@ -64,8 +51,6 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener { fun release() { mContext = null iTaxiLoginCallback = null - // 注销到达起始站围栏监听 - CallerChassisLocationGCJ02ListenerManager.removeListener(TAG) } /** @@ -105,7 +90,8 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener { fun gotoLogin(phone: String, code: String) { mContext?.let { - val location4Login = TaxiLoginReqBean.Location4Login(mLatitude, mLongitude) + val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() + val location4Login = TaxiLoginReqBean.Location4Login(location.latitude, location.longitude) OchCommonServiceManager.gotoLoginBycode(it, phone, code, location4Login, object : OchCommonServiceCallback { override fun onSuccess(data: TaxiLoginRespBean?) { From f3a45a59615a2b77d88315d507b2df58439e7d22 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 24 Apr 2023 21:08:24 +0800 Subject: [PATCH 21/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E7=94=A8code]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/model/OrderStatusEnum.kt | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt index 38dfbdc426..cda47e3c88 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt @@ -8,24 +8,12 @@ package com.mogo.och.bus.passenger.model * 10 已登录, * 20 已登出, */ -enum class OrderStatusEnum(val code: Int) { - Nothing(0), - NoOrderUnuse( 10 ), //无订单车闲置 m1_order_noorder.xml 无订单页面 - OrderNoLine( 20), //有订单无线路 m1_order_lineside 选择线路页面 - OrdersWithLine( 30), //有订单有线路 m1_order_lineside 选择线路页面隐藏掉确定取消 - NoOrderUse( 40),; //无订单车不闲置 m1_order_end.xml 开门关门页面 - - companion object { - @JvmStatic - fun valueOf(code: Int): OrderStatusEnum? { - for (value in values()) { - if (value.code == code) { - return value - } - } - return NoOrderUnuse - } - } +enum class OrderStatusEnum() { + Nothing(), + NoOrderUnuse(), //无订单车闲置 m1_order_noorder.xml 无订单页面 + OrderNoLine(), //有订单无线路 m1_order_lineside 选择线路页面 + OrdersWithLine(), //有订单有线路 m1_order_lineside 选择线路页面隐藏掉确定取消 + NoOrderUse(),; //无订单车不闲置 m1_order_end.xml 开门关门页面 } interface IOrderStatusChangeListener { From 1795d9162d3ca2b2be502b5863049d39af185bbc Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 25 Apr 2023 17:39:54 +0800 Subject: [PATCH 22/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E4=BB=8Eview=E6=8B=86=E5=88=B0fragment]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerFunctionOrderPresenter.kt | 418 +++++++++++++ .../och/bus/passenger/ui/M1OrderFragment.kt | 191 +++++- .../och/bus/passenger/ui/view/LineSiteView.kt | 572 ------------------ .../src/main/res/layout/m1_order_fragment.xml | 241 +++++++- .../src/main/res/layout/m1_order_lineside.xml | 238 -------- 5 files changed, 843 insertions(+), 817 deletions(-) delete mode 100644 OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt delete mode 100644 OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_lineside.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index cc9cc0739c..e2dbba7242 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -1,21 +1,185 @@ package com.mogo.och.bus.passenger.presenter import androidx.lifecycle.LifecycleOwner +import com.elegant.utils.UiThreadHandler +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager +import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager +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.GsonUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bus.passenger.bean.LoopInfo +import com.mogo.och.bus.passenger.bean.response.LineInfoListResponse +import com.mogo.och.bus.passenger.bean.response.LineInfoResponse +import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener import com.mogo.och.bus.passenger.model.OrderStatusEnum +import com.mogo.och.bus.passenger.net.BusPassengerModelLoopManager +import com.mogo.och.bus.passenger.net.BusPassengerServiceManager import com.mogo.och.bus.passenger.ui.M1OrderFragment +import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg +import com.mogo.och.common.module.bean.dpmsg.DPMsgType +import com.mogo.och.common.module.biz.constant.OchCommonConst +import com.mogo.och.common.module.biz.network.OchCommonServiceCallback +import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager +import com.mogo.och.common.module.utils.RxUtils +import io.reactivex.disposables.Disposable class BusPassengerFunctionOrderPresenter(view: M1OrderFragment?) : BusBasePassengerFunctionDevicePresenter(view), IOrderStatusChangeListener { companion object{ + + const val TAGLINELOOP = "LineSiteViewLineLoop" const val TAG = "BusPassengerFunctionOrderPresenter" } + // 成功提交给后台得线路 + private var checkLine: LineInfoResponse.LineInfo? = null + + // 成功提交给后台得终点站点 + private var checkSite: SiteInfoResponse.SiteInfo? = null + + // 下一个站点 + private var currentSite: SiteInfoResponse.SiteInfo? = null + + // 向司机端端提交的临时线路 + private var tempCheckLine: LineInfoResponse.LineInfo? = null + + // 向司机端临时提交的终点站点 + private var tempCheckSite: SiteInfoResponse.SiteInfo? = null + + private var tempCheckLineIsSubmit = false + private var isChangeIngLineAndSite = false + + + + private var subscribeSelectLine: Disposable? = null + private var subscribeSelectSite: Disposable? = null + override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) CharterPassengerModel.setStatusChangeListener(TAG,this) + CallerTelematicListenerManager.addListener(TAG, msgReceived) + + val hasSetLineAndSite = CharterPassengerModel.hasSetLineAndSite() + if (hasSetLineAndSite != null) {// 已经设置了线路和站点 + checkLine = hasSetLineAndSite.first + checkSite = hasSetLineAndSite.second + resetData() + } else { + queryLineList() + mView?.setEnableLineStatus(true) + mView?.setEnableSiteStatus(false) + mView?.onlyChangeSite(false) + mView?.setSiteAdapterEnable(false) + mView?.setSwitchEnable(false) + isChangeIngLineAndSite = false + } + } + + fun lineReset(){ + resetData() + tempCheckLine = null + } + fun siteReset(){ + resetData() + tempCheckLine = null + tempCheckSite = null + } + + /** + * 重置数据 + */ + fun resetData() { + if(checkLine==null){// 没有提交线路 + queryLineList() + mView?.setEnableLineStatus(true) + mView?.setEnableSiteStatus(false) + mView?.onlyChangeSite(false) + mView?.setSiteAdapterEnable(false) + }else{ + checkLine?.let { + mView?.setEnableLineStatus(false) + mView?.setEnableSiteStatus(false) + mView?.onlyChangeSite(false) + mView?.setSiteAdapterEnable(true) + isChangeIngLineAndSite = true + mView?.lineAdapterSubmit(it) + checkLine?.let { + querySitesByLineId(it.lineId.toString(),false) + } + } + } + } + + private fun querySitesByLineId(lineId: String,isSelect:Boolean) { + BusPassengerServiceManager.queryLineSiteList( + context, + lineId, + object : OchCommonServiceCallback { + override fun onSuccess(data: SiteInfoResponse?) { + if (data?.data == null) return + mView?.siteAdapterSetData(data.data) + if (data.data.isNotEmpty()) { + // 计算当前站点是那个 + val calculateCurrentSite = + CharterPassengerModel.calculateCurrentSite(data.data) + val first = calculateCurrentSite.first// 可用站点 + if(first<0){ + // 所有站点不可用 + currentSite = data.data[data.data.size-1] + currentSite!!.isNear = calculateCurrentSite.second + mView?.siteAdapterEnableIndex(data.data.size-1) + }else{ + // + val index = if(first==0) { + 0 + }else if (first <= data.data.size-1) { + first-1 + } else { + data.data.size - 1 + } + currentSite = data.data[index] + currentSite!!.isNear = calculateCurrentSite.second + mView?.siteAdapterEnableIndex(index) + } + if(isSelect){ + data.data.last().isCheck = true + tempCheckSite = data.data.last() + }else{ + data.data.forEach { + if (it.siteId == checkSite?.siteId) { + it.isCheck = true + } + } + } + } + } + + override fun onFail(code: Int, msg: String?) { + ToastUtils.showShort("查询站点失败") + } + }) + } + + private fun queryLineList() { + BusPassengerServiceManager.queryLineList(context, object : + OchCommonServiceCallback { + override fun onSuccess(data: LineInfoListResponse?) { + if (data?.data == null) return + mView?.lineAdapterSetData(data.data) + } + + override fun onFail(code: Int, msg: String) { + ToastUtils.showShort("查询线路失败") + } + }) } override fun onResume(owner: LifecycleOwner) { @@ -25,10 +189,264 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderFragment?) : override fun onDestroy(owner: LifecycleOwner) { super.onDestroy(owner) + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDestroy") + RxUtils.disposeSubscribe(subscribeSelectLine) + RxUtils.disposeSubscribe(subscribeSelectSite) + BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) CharterPassengerModel.setStatusChangeListener(TAG,null) + CallerTelematicListenerManager.removeListener(TAG) } + + /** + * 接收司机屏反馈信息 + */ + val msgReceived = object : IReceivedMsgListener { + override fun onReceivedMsg(type: Int, byteArray: ByteArray) { + UiThreadHandler.post { + if (type == OchCommonConst.BUSINESS_STRING) { + val msg = GsonUtils.fromJson( + String(byteArray), + ChangeDestMsg::class.java + ) as ChangeDestMsg + if (msg.type == DPMsgType.TYPE_CHANGE_DEST.type) { + if (msg.destSiteId == 0) { + if (msg.isConfirmed) { + ToastUtils.showShort("线路确定") + mView?.setEnableLineStatus(false) + mView?.setEnableSiteStatus(true) + mView?.onlyChangeSite(false) + mView?.setSiteAdapterEnable(true) + mView?.setSwitchEnable(false) + tempCheckLineIsSubmit = true + tempCheckLine?.let { + mView?.lineAdapterSubmit(it) + } + } else { + tempCheckLineIsSubmit = false + ToastUtils.showShort("司机端拒绝请重新选择") + } + RxUtils.disposeSubscribe(subscribeSelectLine) + mView?.endAni() + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "endAni1111") + } else { + if (msg.isConfirmed) { + ToastUtils.showShort("站点确定") + mView?.setEnableLineStatus(false) + mView?.setEnableSiteStatus(true) + mView?.onlyChangeSite(false) + mView?.setSiteAdapterEnable(true) + mView?.setSwitchEnable(true) + checkLine = tempCheckLine + checkSite = tempCheckSite + tempCheckLine = null + tempCheckSite = null + tempCheckLineIsSubmit = false + checkLine?.let { + mView?.lineAdapterSubmit(it) + } + mView?.go2StartCar() + CharterPassengerModel.queryOrder() + CharterPassengerModel.cleanbroadcastListInfo() + } else { + tempCheckLineIsSubmit = true + ToastUtils.showShort("司机端拒绝请重新选择") + } + RxUtils.disposeSubscribe(subscribeSelectSite) + } + BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) + } + } + } + } + } + + fun lineSubmit(){ + if (tempCheckLine == null) { + ToastUtils.showLong("请选择线路") + return + } + if (!CallerTelematicManager.getClientConnStatus()) { + ToastUtils.showLong("乘客屏无法连接司机屏请联系安全员") + return + } + tempCheckLine?.let { + val msg = ChangeDestMsg( + it.lineId!!.toInt(), + it.name!!, + 0, + "", + 0, + "", + false + ) + CallerTelematicManager.sendMsgToServer( + OchCommonConst.BUSINESS_STRING, + GsonUtils.toJson(msg).toByteArray() + ) + mView?.startAni() + // 启动查看和司机端链接 + BusPassengerModelLoopManager.setLoopFunction( + TAGLINELOOP, + LoopInfo(3, ::checkServerStatus) + ) + RxUtils.disposeSubscribe(subscribeSelectLine) + subscribeSelectLine= RxUtils.createSubscribe(120_000){ + ToastUtils.showShort("请联系安全员确认") + mView?.endAni() + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "endAni3333") + } + } + } + + fun siteSubmit(){ + if (!tempCheckLineIsSubmit) { + ToastUtils.showLong("请选择站点") + return + } + if (!CallerTelematicManager.getClientConnStatus()) { + ToastUtils.showLong("乘客屏无法连接司机屏请联系安全员") + return + } + tempCheckSite?.let { lineInfo -> + tempCheckSite?.let { siteInfo -> + val msg = ChangeDestMsg( + lineInfo.lineId!!.toInt(), + lineInfo.lineName!!, + currentSite!!.siteId!!.toInt(), + currentSite!!.siteName!!, + siteInfo.siteId!!.toInt(), + siteInfo.siteName!!, + false + ) + CallerTelematicManager.sendMsgToServer( + OchCommonConst.BUSINESS_STRING, + GsonUtils.toJson(msg).toByteArray() + ) + } + mView?.startAni() + // 启动查看和司机端链接 + BusPassengerModelLoopManager.setLoopFunction( + TAGLINELOOP, + LoopInfo(3, ::checkServerStatus) + ) + RxUtils.disposeSubscribe(subscribeSelectSite) + subscribeSelectSite = RxUtils.createSubscribe(120_000){ + ToastUtils.showShort("请联系安全员确认") + mView?.endAni() + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "endAni444") + } + } + } + + fun onlySiteSubmit(){ + tempCheckSite?.let { siteInfo -> + val msg = ChangeDestMsg( + siteInfo.lineId!!.toInt(), + siteInfo.lineName!!, + currentSite!!.siteId!!.toInt(), + currentSite!!.siteName!!, + siteInfo.siteId!!.toInt(), + siteInfo.siteName!!, + false + ) + CallerTelematicManager.sendMsgToServer( + OchCommonConst.BUSINESS_STRING, + GsonUtils.toJson(msg).toByteArray() + ) + } + mView?.startAni() + // 启动查看和司机端链接 + BusPassengerModelLoopManager.setLoopFunction( + TAGLINELOOP, + LoopInfo(3, ::checkServerStatus) + ) + RxUtils.disposeSubscribe(subscribeSelectSite) + subscribeSelectSite = RxUtils.createSubscribe(120_000){ + ToastUtils.showShort("请联系安全员确认") + mView?.endAni() + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "endAni555") + + } + } + private fun checkServerStatus() { + if (!CallerTelematicManager.getClientConnStatus()) { + ToastUtils.showShort("断开和司机端连接、请联系安全员") + BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) + mView?.endAni() + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "endAni666") + } + } + override fun onStatusChange(currentStatus: OrderStatusEnum) { mView?.setViewByOrderStatus(currentStatus) } + fun switchLine() { + val gnssSpeed = + CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().gnssSpeed + if (gnssSpeed < 0.5) { + // TODO: 自驾中 需要 靠边停车中、到站 + // TODO: 没有自驾中 需要 靠边停车中、到站 + when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 + // 可以切换路径 + isChangeIngLineAndSite = false + mView?.onlyChangeSite(false) + // 可以切换路径 + mView?.setEnableLineStatus(true) + mView?.setSiteAdapterEnable(false) + queryLineList() + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// + isChangeIngLineAndSite = false + mView?.onlyChangeSite(false) + // 可以切换路径 + mView?.setEnableLineStatus(true) + mView?.setSiteAdapterEnable(false) + queryLineList() + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { + // 自动驾驶中 + when (OCHPlanningStopSideStatusManager.stopSiteStatus) { + OCHPlanningStopSideStatusManager.Status.EndingSuccess -> { + isChangeIngLineAndSite = false + mView?.onlyChangeSite(false) + // 可以切换路径 + mView?.setEnableLineStatus(true) + mView?.setSiteAdapterEnable(false) + queryLineList() + } + else ->{ + ToastUtils.showShort("自动驾驶中无法切换线路") + } + } + } + IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { + ToastUtils.showShort("因车辆正在平行驾驶中无法切换线路") + } + else -> {} + } + } else { + ToastUtils.showShort("请停车后再修改目的地～") + } + } + + fun checkLineClick(lineInfo: LineInfoResponse.LineInfo) { + tempCheckLine = lineInfo + querySitesByLineId(lineInfo.lineId.toString(),true) + } + + fun checkSiteClick(siteInfo: SiteInfoResponse.SiteInfo) { + tempCheckSite = siteInfo + if(isChangeIngLineAndSite) { + checkSite?.let { + if (it.siteId == siteInfo.siteId) { + mView?.onlyChangeSite(false) + } else { + mView?.onlyChangeSite(true) + } + } + } + } + } \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt index 35e1459f48..2483279c9a 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt @@ -1,12 +1,27 @@ package com.mogo.och.bus.passenger.ui +import android.animation.ObjectAnimator import android.os.Bundle import android.view.View +import android.view.animation.LinearInterpolator +import androidx.recyclerview.widget.LinearLayoutManager +import com.elegant.utils.UiThreadHandler import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager +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 +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.response.LineInfoResponse +import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse import com.mogo.och.bus.passenger.model.OrderStatusEnum import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter +import com.mogo.och.bus.passenger.ui.adapter.OrderLineItemAdapter +import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter +import com.mogo.och.bus.passenger.view.BottomDecoration import kotlinx.android.synthetic.main.m1_order_fragment.* +import me.jessyan.autosize.utils.AutoSizeUtils /** * @author: yangyakun @@ -15,7 +30,24 @@ import kotlinx.android.synthetic.main.m1_order_fragment.* class M1OrderFragment : MvpFragment() { - private var changeCheck: M1ContainFragment.ChangeCheck?=null + private var changeCheck: M1ContainFragment.ChangeCheck? = null + + + private lateinit var lineAdapter: OrderLineItemAdapter + private lateinit var siteAdapter: OrderSiteItemAdapter + + val lineList = mutableListOf() + val siteList = mutableListOf() + + + + private val loadingAni = + ObjectAnimator.ofFloat(iv_loading_wait_driver, "rotation", 0f, 90f, 180f, 270f, 360f) + .apply { + repeatCount = -1 + interpolator = LinearInterpolator() + duration = 1000 + } override fun getLayoutId(): Int { return R.layout.m1_order_fragment @@ -26,10 +58,136 @@ class M1OrderFragment : } override fun initViews() { - lsv_line_site.setchangeCheck(this.changeCheck) + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "initViews") + lineAdapter = OrderLineItemAdapter(requireContext(), lineList) + siteAdapter = OrderSiteItemAdapter(requireContext(), siteList) + loadingAni.target = iv_loading_wait_driver + rlv_line_list.layoutManager = + LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + rlv_line_list.addItemDecoration( + BottomDecoration( + AutoSizeUtils.dp2px(context, 60f) + ) + ) + rlv_line_list.adapter = lineAdapter + + rv_site_list.layoutManager = + LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + rv_site_list.addItemDecoration( + BottomDecoration( + AutoSizeUtils.dp2px(context, 60f) + ) + ) + rv_site_list.adapter = siteAdapter + + initListener() + } - fun setViewByOrderStatus(currentStatus: OrderStatusEnum){ + private fun initListener() { + lineAdapter.checkChangeListener = object : OrderLineItemAdapter.CheckListener { + override fun onCheckListener(lineInfo: LineInfoResponse.LineInfo) { + mPresenter?.checkLineClick(lineInfo) + siteAdapter.clearCheck() + } + } + siteAdapter.checkChangeListener = object : OrderSiteItemAdapter.CheckListener { + override fun onCheckListener(siteInfo: SiteInfoResponse.SiteInfo) { + // 设置临时选中的 + mPresenter?.checkSiteClick(siteInfo) + } + + } + tv_line_cancle.onClick { + mPresenter?.lineReset() + } + tv_site_cancle.onClick { + mPresenter?.siteReset() + } + tv_line_submit.onClick { + mPresenter?.lineSubmit() + } + tv_site_submit.onClick { + mPresenter?.siteSubmit() + } + tv_site_only_submit.onClick { + // 线路不换只换站点 + if (!CallerTelematicManager.getClientConnStatus()) { + ToastUtils.showLong("乘客屏无法连接司机屏请联系安全员") + return@onClick + } + mPresenter?.onlySiteSubmit() + } + tv_loading_wait_driver_title.onClick { + endAni() + } + + tv_switch_line.onClick { + mPresenter?.switchLine() + } + } + + + /** + * 设置是否可用进行选择线路 + */ + fun setEnableLineStatus(enable: Boolean) { + if (enable) { + g_line_submit_group.visibility = View.VISIBLE + lineAdapter.setEnable(true) + } else { + g_line_submit_group.visibility = View.GONE + lineAdapter.setEnable(false) + } + } + + /** + * 设置是否可用选择站点 + */ + fun setEnableSiteStatus(cancleAndSubmit: Boolean) { + if (cancleAndSubmit) { + g_side_cancle_submit_group.visibility = View.VISIBLE + } else { + g_side_cancle_submit_group.visibility = View.GONE + } + } + + fun onlyChangeSite(submit: Boolean) { + if (submit) { + g_side_submit_group.visibility = View.VISIBLE + } else { + g_side_submit_group.visibility = View.GONE + } + } + + fun setSiteAdapterEnable(enable: Boolean) { + if (enable) { + siteAdapter.setEnable(true) + } else { + siteAdapter.setEnable(false) + } + } + + fun setSwitchEnable(enable: Boolean) { + tv_switch_line.isEnabled = enable + } + + fun startAni() { + g_lines_sites_data.visibility = View.GONE + g_loading_group.visibility = View.VISIBLE + if (!loadingAni.isRunning) { + loadingAni.start() + } + } + + fun endAni() { + UiThreadHandler.post { + g_lines_sites_data.visibility = View.VISIBLE + g_loading_group.visibility = View.GONE + } + } + + fun setViewByOrderStatus(currentStatus: OrderStatusEnum) { when (currentStatus) { OrderStatusEnum.NoOrderUnuse -> { // 无订单页面 @@ -52,13 +210,40 @@ class M1OrderFragment : } } + + fun go2StartCar() { + changeCheck?.changeChange() + } + override fun createPresenter(): BusPassengerFunctionOrderPresenter { + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "createPresenter") return BusPassengerFunctionOrderPresenter(this) } + override fun onDestroyView() { + super.onDestroyView() + loadingAni.cancel() + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDestroyView") + } + + fun lineAdapterSubmit(lineInfo: LineInfoResponse.LineInfo) { + lineAdapter.submitLine(lineInfo) + } + + fun lineAdapterSetData(lineInfo: List) { + lineAdapter.setDataList(lineInfo) + } + + fun siteAdapterSetData(siteInfo: List) { + siteAdapter.setDataList(siteInfo) + } + fun siteAdapterEnableIndex(index: Int) { + siteAdapter.setEnableIndex(index) + } companion object { const val TAG = "BusPassengerFunctionOrderFragment" + @JvmStatic fun newInstance(changeCheck: M1ContainFragment.ChangeCheck): M1OrderFragment { val args = Bundle() diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt deleted file mode 100644 index 3ebe752a6b..0000000000 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ /dev/null @@ -1,572 +0,0 @@ -package com.mogo.och.bus.passenger.ui.view - -import android.animation.ObjectAnimator -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.view.animation.LinearInterpolator -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.recyclerview.widget.LinearLayoutManager -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener -import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager -import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager -import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.eagle.core.utilcode.util.GsonUtils -import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.LoopInfo -import com.mogo.och.bus.passenger.bean.response.LineInfoListResponse -import com.mogo.och.bus.passenger.bean.response.LineInfoResponse -import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.net.BusPassengerModelLoopManager -import com.mogo.och.bus.passenger.net.BusPassengerServiceManager -import com.mogo.och.bus.passenger.ui.M1ContainFragment -import com.mogo.och.bus.passenger.ui.adapter.OrderLineItemAdapter -import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter -import com.mogo.och.common.module.utils.RxUtils -import com.mogo.och.bus.passenger.view.BottomDecoration -import com.mogo.och.common.module.bean.dpmsg.DPMsgType -import com.mogo.och.common.module.biz.constant.OchCommonConst -import com.mogo.och.common.module.biz.network.OchCommonServiceCallback -import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager -import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg -import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.main.m1_order_lineside.view.* -import me.jessyan.autosize.utils.AutoSizeUtils - -class LineSiteView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr) { - - companion object { - const val TAG = "LineSiteView" - const val TAGLINELOOP = "LineSiteViewLineLoop" - } - - // 成功提交给后台得线路 - private var checkLine: LineInfoResponse.LineInfo? = null - - // 成功提交给后台得终点站点 - private var checkSite: SiteInfoResponse.SiteInfo? = null - - // 下一个站点 - private var currentSite: SiteInfoResponse.SiteInfo? = null - - // 向司机端端提交的临时线路 - private var tempCheckLine: LineInfoResponse.LineInfo? = null - - // 向司机端临时提交的终点站点 - private var tempCheckSite: SiteInfoResponse.SiteInfo? = null - - private var tempCheckLineIsSubmit = false - private var isChangeIngLineAndSite = false - - - private val lineList = mutableListOf() - private val siteList = mutableListOf() - - private var lineAdapter: OrderLineItemAdapter - private var siteAdapter: OrderSiteItemAdapter - - private var gnssSpeed = 0.0 - - private val loadingAni = - ObjectAnimator.ofFloat(iv_loading_wait_driver, "rotation", 0f, 90f, 180f, 270f, 360f) - .apply { - repeatCount = -1 - interpolator = LinearInterpolator() - duration = 1000 - } - private var changeCheck: M1ContainFragment.ChangeCheck?=null - private var subscribeSelectLine: Disposable? = null - private var subscribeSelectSite: Disposable? = null - - init { - LayoutInflater.from(context).inflate(R.layout.m1_order_lineside, this, true) - lineAdapter = OrderLineItemAdapter(context, lineList) - siteAdapter = OrderSiteItemAdapter(context, siteList) - loadingAni.target = iv_loading_wait_driver - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - rlv_line_list.layoutManager = - LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) - rlv_line_list.addItemDecoration( - BottomDecoration( - AutoSizeUtils.dp2px(context, 60f) - ) - ) - rlv_line_list.adapter = lineAdapter - - rv_site_list.layoutManager = - LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) - rv_site_list.addItemDecoration( - BottomDecoration( - AutoSizeUtils.dp2px(context, 60f) - ) - ) - rv_site_list.adapter = siteAdapter - - val hasSetLineAndSite = CharterPassengerModel.hasSetLineAndSite() - if (hasSetLineAndSite != null) {// 已经设置了线路和站点 - checkLine = hasSetLineAndSite.first - checkSite = hasSetLineAndSite.second - lineList.clear() - resetData() - } else { - queryLineList() - setEnableLineStatus(true) - setEnableSiteStatus(false) - onlyChangeSite(false) - setSiteAdapterEnable(false) - setSwitchEnable(false) - isChangeIngLineAndSite = false - } - - initListener() - - } - - /** - * 重置数据 - */ - private fun resetData() { - if(checkLine==null){// 没有提交线路 - queryLineList() - setEnableLineStatus(true) - setEnableSiteStatus(false) - onlyChangeSite(false) - setSiteAdapterEnable(false) - }else{ - checkLine?.let { - setEnableLineStatus(false) - setEnableSiteStatus(false) - onlyChangeSite(false) - setSiteAdapterEnable(true) - isChangeIngLineAndSite = true - lineAdapter.submitLine(it) - checkLine?.let { - querySitesByLineId(it.lineId.toString(),false) - } - } - } - } - - /** - * 设置是否可用进行选择线路 - */ - private fun setEnableLineStatus(enable: Boolean) { - if (enable) { - g_line_submit_group.visibility = View.VISIBLE - lineAdapter.setEnable(true) - } else { - g_line_submit_group.visibility = View.GONE - lineAdapter.setEnable(false) - } - } - - /** - * 设置是否可用选择站点 - */ - private fun setEnableSiteStatus(cancleAndSubmit: Boolean) { - if (cancleAndSubmit) { - g_side_cancle_submit_group.visibility = View.VISIBLE - } else { - g_side_cancle_submit_group.visibility = View.GONE - } - } - - fun onlyChangeSite(submit:Boolean){ - if (submit) { - g_side_submit_group.visibility = View.VISIBLE - } else { - g_side_submit_group.visibility = View.GONE - } - } - - fun setSiteAdapterEnable(enable: Boolean){ - if(enable){ - siteAdapter.setEnable(true) - }else{ - siteAdapter.setEnable(false) - } - } - - private fun initListener() { - lineAdapter.checkChangeListener = object : OrderLineItemAdapter.CheckListener { - override fun onCheckListener(lineInfo: LineInfoResponse.LineInfo) { - tempCheckLine = lineInfo - querySitesByLineId(lineInfo.lineId.toString(),true) - siteAdapter.clearCheck() - } - } - siteAdapter.checkChangeListener = object : OrderSiteItemAdapter.CheckListener { - override fun onCheckListener(siteInfo: SiteInfoResponse.SiteInfo) { - // 设置临时选中的 - tempCheckSite = siteInfo - if(isChangeIngLineAndSite) { - checkSite?.let { - if (it.siteId == siteInfo.siteId) { - onlyChangeSite(false) - } else { - onlyChangeSite(true) - } - } - } - } - - } - tv_line_cancle.onClick { - resetData() - tempCheckLine = null - } - tv_site_cancle.onClick { - resetData() - tempCheckLine = null - tempCheckSite = null - } - tv_line_submit.onClick { - if (tempCheckLine == null) { - ToastUtils.showLong("请选择线路") - return@onClick - } - if (!CallerTelematicManager.getClientConnStatus()) { - ToastUtils.showLong("乘客屏无法连接司机屏请联系安全员") - return@onClick - } - tempCheckLine?.let { - val msg = ChangeDestMsg( - it.lineId!!.toInt(), - it.name!!, - 0, - "", - 0, - "", - false - ) - CallerTelematicManager.sendMsgToServer( - OchCommonConst.BUSINESS_STRING, - GsonUtils.toJson(msg).toByteArray() - ) - startAni() - // 启动查看和司机端链接 - BusPassengerModelLoopManager.setLoopFunction( - TAGLINELOOP, - LoopInfo(3, ::checkServerStatus) - ) - RxUtils.disposeSubscribe(subscribeSelectLine) - subscribeSelectLine= RxUtils.createSubscribe(120_000){ - ToastUtils.showShort("请联系安全员确认") - endAni() - } - } - } - tv_site_submit.onClick { - if (!tempCheckLineIsSubmit) { - ToastUtils.showLong("请选择站点") - return@onClick - } - if (!CallerTelematicManager.getClientConnStatus()) { - ToastUtils.showLong("乘客屏无法连接司机屏请联系安全员") - return@onClick - } - tempCheckSite?.let { lineInfo -> - tempCheckSite?.let { siteInfo -> - val msg = ChangeDestMsg( - lineInfo.lineId!!.toInt(), - lineInfo.lineName!!, - currentSite!!.siteId!!.toInt(), - currentSite!!.siteName!!, - siteInfo.siteId!!.toInt(), - siteInfo.siteName!!, - false - ) - CallerTelematicManager.sendMsgToServer( - OchCommonConst.BUSINESS_STRING, - GsonUtils.toJson(msg).toByteArray() - ) - } - startAni() - // 启动查看和司机端链接 - BusPassengerModelLoopManager.setLoopFunction( - TAGLINELOOP, - LoopInfo(3, ::checkServerStatus) - ) - RxUtils.disposeSubscribe(subscribeSelectSite) - subscribeSelectSite = RxUtils.createSubscribe(120_000){ - ToastUtils.showShort("请联系安全员确认") - endAni() - } - } - } - tv_site_only_submit.onClick { - // 线路不换只换站点 - if (!CallerTelematicManager.getClientConnStatus()) { - ToastUtils.showLong("乘客屏无法连接司机屏请联系安全员") - return@onClick - } - tempCheckSite?.let { siteInfo -> - val msg = ChangeDestMsg( - siteInfo.lineId!!.toInt(), - siteInfo.lineName!!, - currentSite!!.siteId!!.toInt(), - currentSite!!.siteName!!, - siteInfo.siteId!!.toInt(), - siteInfo.siteName!!, - false - ) - CallerTelematicManager.sendMsgToServer( - OchCommonConst.BUSINESS_STRING, - GsonUtils.toJson(msg).toByteArray() - ) - } - startAni() - // 启动查看和司机端链接 - BusPassengerModelLoopManager.setLoopFunction( - TAGLINELOOP, - LoopInfo(3, ::checkServerStatus) - ) - RxUtils.disposeSubscribe(subscribeSelectSite) - subscribeSelectSite = RxUtils.createSubscribe(120_000){ - ToastUtils.showShort("请联系安全员确认") - endAni() - } - } - tv_loading_wait_driver_title.onClick { - endAni() - } - - CallerTelematicListenerManager.addListener(TAG, msgReceived) - CharterPassengerModel.setControllerStatusCallback(TAG) { location -> - location?.let { - gnssSpeed = it.gnssInfo.vehicleSpeed - } - } - tv_switch_line.onClick { - if (gnssSpeed < 0.5) { - // TODO: 自驾中 需要 靠边停车中、到站 - // TODO: 没有自驾中 需要 靠边停车中、到站 - when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - // 可以切换路径 - isChangeIngLineAndSite = false - onlyChangeSite(false) - // 可以切换路径 - setEnableLineStatus(true) - setSiteAdapterEnable(false) - queryLineList() - } - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - isChangeIngLineAndSite = false - onlyChangeSite(false) - // 可以切换路径 - setEnableLineStatus(true) - setSiteAdapterEnable(false) - queryLineList() - } - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { - // 自动驾驶中 - when (OCHPlanningStopSideStatusManager.stopSiteStatus) { - OCHPlanningStopSideStatusManager.Status.EndingSuccess -> { - isChangeIngLineAndSite = false - onlyChangeSite(false) - // 可以切换路径 - setEnableLineStatus(true) - setSiteAdapterEnable(false) - queryLineList() - } - else ->{ - ToastUtils.showShort("自动驾驶中无法切换线路") - } - } - } - IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastUtils.showShort("因车辆正在平行驾驶中无法切换线路") - } - else -> {} - } - } else { - ToastUtils.showShort("请停车后再修改目的地～") - } - } - } - private fun setSwitchEnable(enable: Boolean){ - tv_switch_line.isEnabled = enable - } - - /** - * 接收司机屏反馈信息 - */ - val msgReceived = object : IReceivedMsgListener { - override fun onReceivedMsg(type: Int, byteArray: ByteArray) { - UiThreadHandler.post { - if (type == OchCommonConst.BUSINESS_STRING) { - val msg = GsonUtils.fromJson( - String(byteArray), - ChangeDestMsg::class.java - ) as ChangeDestMsg - if (msg.type == DPMsgType.TYPE_CHANGE_DEST.type) { - if (msg.destSiteId == 0) { - if (msg.isConfirmed) { - ToastUtils.showShort("线路确定") - setEnableLineStatus(false) - setEnableSiteStatus(true) - onlyChangeSite(false) - setSiteAdapterEnable(true) - setSwitchEnable(false) - tempCheckLineIsSubmit = true - tempCheckLine?.let { - lineAdapter.submitLine(it) - } - } else { - tempCheckLineIsSubmit = false - ToastUtils.showShort("司机端拒绝请重新选择") - } - RxUtils.disposeSubscribe(subscribeSelectLine) - } else { - if (msg.isConfirmed) { - ToastUtils.showShort("站点确定") - setEnableLineStatus(false) - setEnableSiteStatus(true) - onlyChangeSite(false) - setSiteAdapterEnable(true) - setSwitchEnable(true) - checkLine = tempCheckLine - checkSite = tempCheckSite - tempCheckLine = null - tempCheckSite = null - tempCheckLineIsSubmit = false - checkLine?.let { - lineAdapter.submitLine(it) - } - go2StartCar() - CharterPassengerModel.queryOrder() - CharterPassengerModel.cleanbroadcastListInfo() - } else { - tempCheckLineIsSubmit = true - ToastUtils.showShort("司机端拒绝请重新选择") - } - RxUtils.disposeSubscribe(subscribeSelectSite) - } - BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) - endAni() - } - } - } - } - } - - private fun go2StartCar() { - changeCheck?.changeChange() - } - - fun setchangeCheck(changeCheck: M1ContainFragment.ChangeCheck?){ - this.changeCheck = changeCheck - } - - private fun startAni() { - g_lines_sites_data.visibility = View.GONE - g_loading_group.visibility = View.VISIBLE - if (!loadingAni.isRunning) { - loadingAni.start() - } - } - - private fun endAni() { - UiThreadHandler.post { - g_lines_sites_data.visibility = View.VISIBLE - g_loading_group.visibility = View.GONE - } - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - loadingAni.cancel() - RxUtils.disposeSubscribe(subscribeSelectLine) - RxUtils.disposeSubscribe(subscribeSelectSite) - CallerTelematicListenerManager.removeListener(TAG) - BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) - CharterPassengerModel.setControllerStatusCallback(TAG, null) - - } - - private fun queryLineList() { - BusPassengerServiceManager.queryLineList(context, object : - OchCommonServiceCallback { - override fun onSuccess(data: LineInfoListResponse?) { - if (data?.data == null) return - lineAdapter.setDataList(data.data) - } - - override fun onFail(code: Int, msg: String) { - ToastUtils.showShort("查询线路失败") - } - }) - } - - private fun checkServerStatus() { - if (!CallerTelematicManager.getClientConnStatus()) { - ToastUtils.showShort("断开和司机端连接、请联系安全员") - BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) - endAni() - } - } - - private fun querySitesByLineId(lineId: String,isSelect:Boolean) { - BusPassengerServiceManager.queryLineSiteList( - context, - lineId, - object : OchCommonServiceCallback { - override fun onSuccess(data: SiteInfoResponse?) { - if (data?.data == null) return - siteAdapter.setDataList(data.data) - if (data.data.isNotEmpty()) { - // 计算当前站点是那个 - val calculateCurrentSite = - CharterPassengerModel.calculateCurrentSite(data.data) - val first = calculateCurrentSite.first// 可用站点 - if(first<0){ - // 所有站点不可用 - currentSite = data.data[data.data.size-1] - currentSite!!.isNear = calculateCurrentSite.second - siteAdapter.setEnableIndex(data.data.size-1) - }else{ - // - val index = if(first==0) { - 0 - }else if (first <= data.data.size-1) { - first-1 - } else { - data.data.size - 1 - } - currentSite = data.data[index] - currentSite!!.isNear = calculateCurrentSite.second - siteAdapter.setEnableIndex(index) - } - if(isSelect){ - data.data.last().isCheck = true - tempCheckSite = data.data.last() - }else{ - data.data.forEach { - if (it.siteId == checkSite?.siteId) { - it.isCheck = true - } - } - } - } - } - - override fun onFail(code: Int, msg: String?) { - ToastUtils.showShort("查询站点失败") - } - }) - } -} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml index 4e300c8f82..6a89b97713 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml @@ -1,8 +1,9 @@ + android:layout_height="match_parent"> @@ -17,10 +18,242 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_percent="0.53698"> - + android:layout_height="match_parent" + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 1436df91f0312682a8f182fbc7127a038cdb71f7 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 25 Apr 2023 17:40:18 +0800 Subject: [PATCH 23/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E6=9B=B4=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E7=AE=97=E8=A7=92=E5=BA=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/CoordinateCalculateRouteUtil.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java index df36d2f672..8e6fec362b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java @@ -14,6 +14,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import kotlin.Triple; import mogo.telematics.pad.MessagePad; /** @@ -340,4 +341,56 @@ public class CoordinateCalculateRouteUtil { //弧度转角度制 return (int) (180 * radian / Math.PI); } + + + private static Triple ball2xyz(Double thera,Double fie,Double r){ + double x = r * Math.cos(thera) * Math.cos(fie); + double y = r * Math.cos(thera) * Math.sin(fie); + double z = r * Math.sin(thera); + return new Triple(x,y,z); + } + + /** + * https://blog.csdn.net/reborn_lee/article/details/82497577 + * 将地理经纬度转换成笛卡尔坐标系 + */ + private static Triple geo2xyz(double lat,double lng){ + double thera = (Math.PI * lat) / 180; + double fie = (Math.PI * lng) / 180; + return ball2xyz(thera, fie,6400.0); + } + + /** + * 计算3个地理坐标点之间的夹角 + * @param l1 顶点坐标 + * @param l2 + * @param l3 + * @return l1为顶点的角度 精度没有angleOflocation高 + */ + public static double getDegree(LatLng l2,LatLng l1,LatLng l3) { + Triple p1 = geo2xyz(l1.latitude,l1.longitude); + Triple p2 = geo2xyz(l2.latitude,l2.longitude); + Triple p3 = geo2xyz(l3.latitude,l3.longitude); + + double x1 = p1.getFirst(); + double y1 = p1.getSecond(); + double z1 = p1.getThird(); + + double x2 = p2.getFirst(); + double y2 = p2.getSecond(); + double z2 = p2.getThird(); + + double x3 = p3.getFirst(); + double y3 = p3.getSecond(); + double z3 = p3.getThird(); + + // 计算向量 P2P1 和 P2P3 的夹角 https://www.zybang.com/question/3379a30c0dd3041b3ef966803f0bf758.html + double p1P2 = Math.sqrt(Math.pow(x2 - x1,2.0) + Math.pow(y2 - y1,2.0) + Math.pow(z2 - z1,2.0)); + double p2p3 = Math.sqrt(Math.pow(x3 - x2,2.0) + Math.pow(y3 - y2,2.0) + Math.pow(z3 - z2,2.0)); + + double p = (x1 - x2) * (x3 - x2) + (y1 - y2) * (y3 - y2) + (z1 - z2) * (z3 - z2); //P2P1*P2P3 + + return (Math.acos(p / (p1P2 * p2p3)) / Math.PI) * 180; + } + } From fcb84b69bf4c0fe9b54e102b7d77da5161c47dfa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 26 Apr 2023 11:44:03 +0800 Subject: [PATCH 24/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E5=92=8C=E5=88=B0=E7=AB=99=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=88=86=E5=89=B2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/CharterPassengerModel.kt | 39 +++++++++++-------- .../net/BusPassengerModelLoopManager.kt | 1 + .../presenter/BusPassengerPresenter.kt | 38 +++++++++--------- .../mogo/och/bus/passenger/ui/MainFragment.kt | 7 +++- .../src/main/res/layout/m1_main_fragment.xml | 6 +-- .../src/main/res/values/strings.xml | 6 +++ .../och/common/module/utils/DateTimeUtil.java | 11 ++++++ 7 files changed, 69 insertions(+), 39 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 8cb85c1c03..edcba59b1a 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -564,13 +564,11 @@ object CharterPassengerModel { } } iDistanceTimeCallback?.setOrderTimeCallBack(-1) + iDistanceTimeCallback?.setDistancecAndTime(-1,-1) }else{ iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished) } - CallerLogger.d( - M_BUS_P + TAG, - "倒计时${millisUntilFinished}" - ) + CallerLogger.d(M_BUS_P + TAG, "订单倒计时${millisUntilFinished}") } } } @@ -700,19 +698,28 @@ object CharterPassengerModel { it.latitude ) } - } - val lastTime: Double = lastSumLength / Charter_AVERAGE_SPEED * 3.6 //秒 - CallerLogger.d( - SceneConstant.M_BUS_P + "calculateDistance", - "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime - + " thread = " + Thread.currentThread().name - ) - if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) { - CallerLogger.d(SceneConstant.M_BUS_P + TAG,"小于15米到站2") - arriveDest() + val lastTime: Double = lastSumLength / Charter_AVERAGE_SPEED * 3.6 //秒 + + CallerLogger.d( + SceneConstant.M_BUS_P + "calculateDistance", + "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime + + " thread = " + Thread.currentThread().name + ) + if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) { + CallerLogger.d(SceneConstant.M_BUS_P + TAG,"小于15米到站2") + arriveDest() + return + } + if(order.arriveStatus==OrderInfoResponse.ARRIVING) { + iDistanceTimeCallback?.setDistancecAndTime( + lastSumLength.toLong(), + lastTime.toLong() + ) + }else{ + iDistanceTimeCallback?.setDistancecAndTime(-1, -1) + } } - iDistanceTimeCallback?.setDistancecAndTime(lastSumLength.toLong(), lastTime.toLong()) } } // endregion @@ -869,7 +876,7 @@ object CharterPassengerModel { // 结束路距计算 endCalculateDistanceLoop() // 到站置距离位0 - iDistanceTimeCallback?.setOrderTimeCallBack(-1) + iDistanceTimeCallback?.setDistancecAndTime(-1,-1) } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt index 8b7ce2e2b8..73cf0172f0 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt @@ -71,6 +71,7 @@ object BusPassengerModelLoopManager { loopInfo.function.invoke() CallerLogger.d(TAG, "${aLong}正在执行方法${tag}") }catch (e:Throwable){ + e.printStackTrace() CallerLogger.e(TAG,"$tag:--$e") } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 0489cbaa8d..105ee215ce 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -32,7 +32,7 @@ import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager -import java.util.* +import kotlin.math.ceil class BusPassengerPresenter(view: MainFragment?) : BusBasePassengerFunctionDevicePresenter(view), @@ -66,9 +66,14 @@ class BusPassengerPresenter(view: MainFragment?) : mView?.setSpeed(speedKM.toString()) } } - private fun setDistanceAndTime(distance: String,distanceUnit: String){ + private fun setDistanceAndTime( + distance: String, + distanceUnit: String, + leftTime: String, + arriveTime: String + ) { UiThreadHandler.post { - mView?.setDistanceAndTime(distance, distanceUnit) + mView?.setDistanceAndTime(distance, distanceUnit,leftTime,arriveTime) } } private fun setOrderTime(sumTime:String,arrivedTime:String){ @@ -121,36 +126,33 @@ class BusPassengerPresenter(view: MainFragment?) : * 计算剩余距离和剩余时间 */ override fun setDistancecAndTime(meters: Long, timeInSecond: Long) { + if(meters<0&&timeInSecond<0){ + setDistanceAndTime("--", context.getString(R.string.m1_distance_unit_km), "--", "--") + } var dis: String? = "0" var disUnit = "KM" if (meters > 0) { if (meters / 1000 < 1) { - disUnit = "M" + disUnit = context.getString(R.string.m1_distance_unit_m) dis = Math.round(meters.toFloat()).toString() } else { - disUnit = "KM" + disUnit = context.getString(R.string.m1_distance_unit_km) dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) } } - setDistanceAndTime(dis.toString(),disUnit) + val time = ceil(timeInSecond / 60f).toInt() + val arriveTime = DateTimeUtil.getAfterSecondTime(time) + setDistanceAndTime(dis.toString(),disUnit,time.toString(),arriveTime) } override fun setOrderTimeCallBack(timeInSecond: Long) { if(timeInSecond<0){ - setDistanceAndTime("0", "KM") setOrderTime("--","--") return } - var surplusTime = (timeInSecond / 60).toInt() - if(surplusTime==0){ - surplusTime = 1 - } - - val beforeTime = Calendar.getInstance() - beforeTime.add(Calendar.SECOND, timeInSecond.toInt()) - //到达时间 - val arriveTime = DateTimeUtil.formatCalendarToString(beforeTime, DateTimeUtil.HH_mm) - setOrderTime(surplusTime.toString(),arriveTime) + val time = ceil(timeInSecond / 60f).toInt() + val arriveTime = DateTimeUtil.getAfterSecondTime(timeInSecond.toInt()) + setOrderTime(time.toString(),arriveTime) } companion object{ @@ -206,7 +208,7 @@ class BusPassengerPresenter(view: MainFragment?) : UiThreadHandler.post { mView?.showOpenAndCloseDoor() mView?.cleanEndStation() - setDistanceAndTime("0", "KM") + setDistancecAndTime(-1, -1) setOrderTime("--","--") } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 8b753876ad..855586148d 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -143,16 +143,19 @@ class MainFragment : fun setDistanceAndTime( distance: String, distanceUnit: String, + leftTime:String, + arriveTime:String ) { tv_distance.text = distance tv_distance_unit.text = "距离(${distanceUnit})" + tv_distance_surplus_time.text = leftTime + tv_distance_arrive_time.text = arriveTime } fun setOrderTime( sumTime: String, arrivedTime: String ) { - tv_distance_surplus_time.text = sumTime - tv_distance_arrive_time.text = arrivedTime + } fun setCarModle(rawInfo: Int){ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml index 52c5eeaf30..602eb96beb 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml @@ -118,7 +118,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/v_line_01" - android:text="距离（KM）" + android:text="@string/m1_distance_unit_km" android:textSize="@dimen/dp_17" android:textColor="@color/bus_p_m1_112b57" android:layout_width="wrap_content" @@ -153,7 +153,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/v_line_02" - android:text="剩余（分）" + android:text="@string/m1_arrive_left_time" android:textSize="@dimen/dp_17" android:textColor="@color/bus_p_m1_112b57" android:layout_width="wrap_content" @@ -187,7 +187,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:text="到达" + android:text="@string/m1_reach_time" android:textSize="@dimen/dp_17" android:textColor="@color/bus_p_m1_112b57" android:layout_width="wrap_content" diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml index d2b0ab1abf..723d800b4f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml @@ -29,6 +29,12 @@ 包车将在5分钟后结束，结束后我们将自动为您寻找停车点 + 距离（KM） + 距离（M） + 剩余（分） + 到达 + + diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java index 37550ad892..1330b852ee 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java @@ -110,4 +110,15 @@ public class DateTimeUtil { calendar.set(Calendar.SECOND,0); return calendar.getTimeInMillis(); } + + public static String getAfterSecondTime(int timeInSecond,String formate){ + Calendar beforeTime = Calendar.getInstance(); + beforeTime.add(Calendar.SECOND, timeInSecond); + return formatCalendarToString(beforeTime, formate); + } + public static String getAfterSecondTime(int timeInSecond){ + Calendar beforeTime = Calendar.getInstance(); + beforeTime.add(Calendar.SECOND, timeInSecond); + return formatCalendarToString(beforeTime, DateTimeUtil.HH_mm); + } } From 78b7d3eff32c692af222c1d5382a9c8e4bb8f77b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 26 Apr 2023 14:36:02 +0800 Subject: [PATCH 25/25] =?UTF-8?q?[charter]=20[3.2.0]=20[=E7=B2=BE=E7=A1=AE?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=BD=93=E5=89=8D=E4=BD=8D=E7=BD=AE=E8=B7=9D?= =?UTF-8?q?=E7=A6=BB=E7=AB=99=E7=82=B9=E7=9A=84=E8=B7=9D=E7=A6=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/CharterPassengerModel.kt | 87 ++++------------ .../utils/CoordinateCalculateRouteUtil.java | 98 +++++++++++++++++++ 2 files changed, 117 insertions(+), 68 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index edcba59b1a..ed92ee8407 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -622,92 +622,43 @@ object CharterPassengerModel { private fun calculateDistance() { //mLocation gcj坐标 mLocationGCJ02?.let { - var lastSumLength = 0f orderInfo?.let { order -> // 启动轨迹计算 - //当前站在轨迹中对应的点 - val currentRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew( - 0, mRoutePoints, it.longitude, it.latitude - ) - var nextRouteIndex: Int = mRoutePoints.size - 1 - + var lastSumLength = 0f val orderLonLat = CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj( mContext, order.wgs84Lon!!, order.wgs84Lat!! ) - //要前往的站在轨迹中对应的点 - nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew( - currentRouteIndex, mRoutePoints, + val mogoLocation = MogoLocation() + mogoLocation.longitude = orderLonLat.longitude + mogoLocation.latitude = orderLonLat.latitude + + lastSumLength = CoordinateUtils.calculateLineDistance( orderLonLat.longitude, - orderLonLat.latitude + orderLonLat.latitude, + mogoLocation.longitude, + mogoLocation.latitude ) - // 距离站点最近的轨迹点 - val lastPoints = mRoutePoints.get(nextRouteIndex) - // 站点距离最近点的距离 - val calculateLineDistance = CoordinateUtils.calculateLineDistance( - lastPoints.longitude, lastPoints.latitude, - orderLonLat.longitude, orderLonLat.latitude - ) - if (currentRouteIndex < nextRouteIndex) { - // subList 是[) 需要的是[] - val subList = mRoutePoints.subList(currentRouteIndex, nextRouteIndex + 1) - // 轨迹点所有的距离 - val middlePoingDistancee = - CoordinateCalculateRouteUtil.calculateRouteSumLength(subList) - - // 需要加距离 和下一个轨迹点成钝角 - if (nextRouteIndex + 1 < mRoutePoints.size) { - val lastPointsNext = mRoutePoints.get(nextRouteIndex + 1) - val degree = CoordinateCalculateRouteUtil.getDegree( - orderLonLat.longitude,orderLonLat.latitude, - lastPoints.longitude, lastPoints.latitude, - lastPointsNext.longitude, lastPointsNext.latitude, + if(lastSumLength>100) { + // 计算距离 + lastSumLength = + CoordinateCalculateRouteUtil.calculateRouteSumLength( + mRoutePoints, + it, + mogoLocation ) - if (degree > 90) { - lastSumLength = middlePoingDistancee + calculateLineDistance - } - } - // 需要减距离 和上一个轨迹点成钝角 - if (nextRouteIndex - 1 >= 0) { - val lastPointsPre = mRoutePoints.get(nextRouteIndex - 1) - val degree = CoordinateCalculateRouteUtil.getDegree( - orderLonLat.longitude,orderLonLat.latitude, - lastPoints.longitude, lastPoints.latitude, - lastPointsPre.longitude, lastPointsPre.latitude, - ) - if (degree > 90) { - lastSumLength = middlePoingDistancee - calculateLineDistance - } - } - - } else { - val lastPoints = mRoutePoints.get(nextRouteIndex) - lastSumLength = CoordinateUtils.calculateLineDistance( - lastPoints.longitude, lastPoints.latitude, - it.longitude, it.latitude - ) - } - // 距离小于100m 直接计算当前位置距离站点的距离 - if(lastSumLength<=100){ - lastSumLength = CoordinateUtils.calculateLineDistance( - orderLonLat.longitude, - orderLonLat.latitude, - it.longitude, - it.latitude - ) } - val lastTime: Double = lastSumLength / Charter_AVERAGE_SPEED * 3.6 //秒 + val lastTime: Double = lastSumLength / it.gnssSpeed * 3.6 //秒 - CallerLogger.d( - SceneConstant.M_BUS_P + "calculateDistance", + CallerLogger.d(M_BUS_P + "calculateDistance", "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime + " thread = " + Thread.currentThread().name ) if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) { - CallerLogger.d(SceneConstant.M_BUS_P + TAG,"小于15米到站2") + CallerLogger.d(M_BUS_P + TAG,"小于15米到站2") arriveDest() return } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java index 8e6fec362b..94761923fe 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java @@ -70,6 +70,104 @@ public class CoordinateCalculateRouteUtil { return sumLength; } + public static float calculateRouteSumLength(List mRoutePoints, MogoLocation location, MogoLocation station){ + if (null == mRoutePoints || mRoutePoints.size() == 0) return 0; + + float lastSumLength = 0f; + + //当前位置距离轨迹中最近的点 + int currentRouteIndex = getArrivedPointIndexNew( + 0, mRoutePoints, location.getLongitude(), location.getLatitude() + ); + // 距离当前位置轨迹中最近的轨迹点 + MogoLocation currentPoint = mRoutePoints.get(currentRouteIndex); + // 当前位置距离最近的点的距离 + float calculateCurrentdex = CoordinateUtils.calculateLineDistance( + location.getLongitude(), location.getLatitude(), + currentPoint.getLongitude(), currentPoint.getLatitude() + ); + + + //要前往的站在轨迹中对应的点 + int stationPointInRouteIndex = getArrivedPointIndexNew( + currentRouteIndex, mRoutePoints, + station.getLongitude(), + station.getLatitude() + ); + // 距离站点最近的轨迹点 + MogoLocation stationPointInRoute = mRoutePoints.get(stationPointInRouteIndex); + // 站点距离轨迹中最近点的距离 + float calculateLineDistance = CoordinateUtils.calculateLineDistance( + stationPointInRoute.getLongitude(), stationPointInRoute.getLatitude(), + station.getLongitude(), station.getLatitude() + ); + + if (currentRouteIndex < stationPointInRouteIndex) { + // subList 是[) 需要的是[] + List subList = mRoutePoints.subList(currentRouteIndex, stationPointInRouteIndex + 1); + // 轨迹点所有的距离 + lastSumLength = calculateRouteSumLength(subList); + // region 站点坐标和 站点坐标对应轨迹点的坐标距离 + // 需要加距离 和下一个轨迹点成钝角 + if (stationPointInRouteIndex + 1 < mRoutePoints.size()) { + MogoLocation lastPointsNext = mRoutePoints.get(stationPointInRouteIndex + 1); + double degree = getDegree( + station.getLongitude(),station.getLatitude(), + stationPointInRoute.getLongitude(), stationPointInRoute.getLatitude(), + lastPointsNext.getLongitude(), lastPointsNext.getLatitude()); + if (degree > 90) { + lastSumLength = lastSumLength + calculateLineDistance; + } + } + // 需要减距离 和上一个轨迹点成钝角 + if (stationPointInRouteIndex - 1 >= 0) { + MogoLocation lastPointsPre = mRoutePoints.get(stationPointInRouteIndex - 1); + double degree = getDegree( + station.getLongitude(),station.getLatitude(), + stationPointInRoute.getLongitude(), stationPointInRoute.getLatitude(), + lastPointsPre.getLongitude(), lastPointsPre.getLatitude()); + if (degree > 90) { + lastSumLength = lastSumLength - calculateLineDistance; + } + } + // endregion + + // region 当前位置和 对应轨迹点的坐标距离 + // 需要加距离 和下一个轨迹点成钝角 + if (currentRouteIndex + 1 < stationPointInRouteIndex) { + MogoLocation currentPointsNext = mRoutePoints.get(stationPointInRouteIndex + 1); + double degree = getDegree( + location.getLongitude(),location.getLatitude(), + currentPoint.getLongitude(), currentPoint.getLatitude(), + currentPointsNext.getLongitude(), currentPointsNext.getLatitude()); + if (degree > 90) { + lastSumLength = lastSumLength - calculateCurrentdex; + } + } + + // 需要减距离 和上一个轨迹点成钝角 + if (currentRouteIndex - 1 >= 0) { + MogoLocation lastPointsPre = mRoutePoints.get(stationPointInRouteIndex - 1); + double degree = getDegree( + location.getLongitude(),location.getLatitude(), + currentPoint.getLongitude(), currentPoint.getLatitude(), + lastPointsPre.getLongitude(), lastPointsPre.getLatitude()); + if (degree > 90) { + lastSumLength = lastSumLength + calculateCurrentdex; + } + } + // endregion + + } else { + MogoLocation lastPoints = mRoutePoints.get(stationPointInRouteIndex); + lastSumLength = CoordinateUtils.calculateLineDistance( + lastPoints.getLongitude(), lastPoints.getLatitude(), + location.getLongitude(), location.getLatitude() + ); + } + return lastSumLength; + } + public static List coordinateConverterWgsToGcjListCommon(Context mContext, List models) { //转成MogoLatLng集合 List list = new ArrayList<>();