diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle index 3f3e62f1ef..1a5c722e44 100644 --- a/OCH/charter/driver/build.gradle +++ b/OCH/charter/driver/build.gradle @@ -23,6 +23,8 @@ android { } } + resourcePrefix "charter" + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -43,14 +45,6 @@ android { } } - flavorDimensions "vehicle" - productFlavors { - // 车型：金旅m1 司机端 - driverm1 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } - } } dependencies { diff --git a/OCH/charter/driver/src/driverm1/res/raw/bus_away_passengers.json b/OCH/charter/driver/src/driverm1/res/raw/bus_away_passengers.json deleted file mode 100644 index e76436f2dc..0000000000 --- a/OCH/charter/driver/src/driverm1/res/raw/bus_away_passengers.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "code": 0, - "msg": "", - "detailMsg": "", - "result": { - "info": [ - { - "_id": "cee57b3ae07c4486b0357319368487d7", - "orderNo": "XB20210422000002", - "orderType": 10, - "userName": "董QAD", - "userPhone": "15631204018", - "startStationId": 1, - "startStation": "万集东门站", - "startStationCoordinate": [ - 116.7354579447, - 40.1974932972 - ], - "endStationId": 2, - "endStation": "顺密路口站", - "endStationCoordinate": [ - 116.721520973, - 40.1940181096 - ], - "orderDispatchType": 7, - "carNum": "京NB010", - "sn": "F803EB2046PZD00149", - "orderStartTime": "2021-04-22 16:31:58", - "orderEndTime": "2021-04-26 10:38:13", - "arrivedStartStationTime": null, - "arrivedEndStationTime": null, - "cityCode": "010", - "areaCode": "1001", - "createTime": "2021-04-22 16:31:58", - "updateTime": "2021-04-26 10:38:13", - "personNum": 1, - "travelDistance": 1.2, - "vehicleColour": null, - "lastBrandName": null, - "headImgUrl": null - }, - { - "_id": "ce69b1bcfb9840c6a4563bc6ef947caf", - "orderNo": "XB20210426000000", - "orderType": 10, - "userName": "董QAD", - "userPhone": "15631204018", - "startStationId": 1, - "startStation": "万集东门站", - "startStationCoordinate": [ - 116.7354579447, - 40.1974932972 - ], - "endStationId": 2, - "endStation": "顺密路口站", - "endStationCoordinate": [ - 116.721520973, - 40.1940181096 - ], - "orderDispatchType": 7, - "carNum": "京NB010", - "sn": "F803EB2046PZD00149", - "orderStartTime": "2021-04-26 10:38:48", - "orderEndTime": "2021-04-26 10:46:16", - "arrivedStartStationTime": null, - "arrivedEndStationTime": null, - "cityCode": "010", - "areaCode": "1001", - "createTime": "2021-04-26 10:38:48", - "updateTime": "2021-04-26 10:46:16", - "personNum": 1, - "travelDistance": 1.2, - "vehicleColour": null, - "lastBrandName": null, - "headImgUrl": null - }, - { - "_id": "cae07b56f41c4e0fa60ab3543ffc258e", - "orderNo": "XB20210426000001", - "orderType": 10, - "userName": "董QAD", - "userPhone": "15631204018", - "startStationId": 1, - "startStation": "万集东门站", - "startStationCoordinate": [ - 116.7354579447, - 40.1974932972 - ], - "endStationId": 2, - "endStation": "顺密路口站", - "endStationCoordinate": [ - 116.721520973, - 40.1940181096 - ], - "orderDispatchType": 7, - "carNum": "京NB010", - "sn": "F803EB2046PZD00149", - "orderStartTime": "2021-04-26 10:47:05", - "orderEndTime": "2021-04-26 10:48:07", - "arrivedStartStationTime": null, - "arrivedEndStationTime": null, - "cityCode": "010", - "areaCode": "1001", - "createTime": "2021-04-26 10:47:05", - "updateTime": "2021-04-26 10:48:07", - "personNum": 1, - "travelDistance": 1.2, - "vehicleColour": null, - "lastBrandName": null, - "headImgUrl": null - }, - { - "_id": "62bc84afbc434d01b644c74ee406e772", - "orderNo": "XB20210426000002", - "orderType": 10, - "userName": "董QAD", - "userPhone": "15631204018", - "startStationId": 1, - "startStation": "万集东门站", - "startStationCoordinate": [ - 116.7354579447, - 40.1974932972 - ], - "endStationId": 2, - "endStation": "顺密路口站", - "endStationCoordinate": [ - 116.721520973, - 40.1940181096 - ], - "orderDispatchType": 7, - "carNum": "京NB010", - "sn": "F803EB2046PZD00149", - "orderStartTime": "2021-04-26 10:48:22", - "orderEndTime": "2021-04-26 10:50:32", - "arrivedStartStationTime": null, - "arrivedEndStationTime": null, - "cityCode": "010", - "areaCode": "1001", - "createTime": "2021-04-26 10:48:22", - "updateTime": "2021-04-26 10:50:32", - "personNum": 1, - "travelDistance": 1.2, - "vehicleColour": null, - "lastBrandName": null, - "headImgUrl": null - }, - { - "_id": "fa3214c7a6ec411bb3d6edbc98907423", - "orderNo": "XB20210426000009", - "orderType": 10, - "userName": "董QAD", - "userPhone": "15631204018", - "startStationId": 1, - "startStation": "万集东门站", - "startStationCoordinate": [ - 116.7354579447, - 40.1974932972 - ], - "endStationId": 2, - "endStation": "顺密路口站", - "endStationCoordinate": [ - 116.721520973, - 40.1940181096 - ], - "orderDispatchType": 7, - "carNum": "京NB010", - "sn": "F803EB2046PZD00149", - "orderStartTime": "2021-04-26 19:26:05", - "orderEndTime": "2021-04-27 14:35:50", - "arrivedStartStationTime": null, - "arrivedEndStationTime": null, - "cityCode": "010", - "areaCode": "1001", - "createTime": "2021-04-26 19:26:05", - "updateTime": "2021-04-27 14:35:50", - "personNum": 1, - "travelDistance": 1.2, - "vehicleColour": null, - "lastBrandName": null, - "headImgUrl": null - } - ] - } -} \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/res/raw/bus_order_1.json b/OCH/charter/driver/src/driverm1/res/raw/bus_order_1.json deleted file mode 100644 index 050b67447d..0000000000 --- a/OCH/charter/driver/src/driverm1/res/raw/bus_order_1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "_id": "62bc84afbc434d01b644c74ee406e772", - "areaCode": "1001", - "carNum": "京NB010", - "cityCode": "010", - "createTime": "Apr 26, 2021 10:48:22 AM", - "endStation": "顺密路口站", - "endStationCoordinate": [ - 116.721520973, - 40.1940181096 - ], - "endStationId": 2, - "orderDispatchType": 1, - "orderNo": "XB20210426000002", - "orderStartTime": "Apr 26, 2021 10:48:22 AM", - "orderType": 10, - "sn": "F803EB2046PZD00149", - "startStation": "万集东门站", - "startStationCoordinate": [ - 116.7354579447, - 40.1974932972 - ], - "startStationId": 1, - "travelDistance": 1.2, - "updateTime": "Apr 26, 2021 10:48:23 AM", - "userName": "董QAD", - "userPhone": "15631204018" -} \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/res/raw/bus_station_list1.json b/OCH/charter/driver/src/driverm1/res/raw/bus_station_list1.json deleted file mode 100644 index c74daa1174..0000000000 --- a/OCH/charter/driver/src/driverm1/res/raw/bus_station_list1.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "code": 0, - "msg": "", - "detailMsg": "", - "result": { - "site": [ - { - "lineId": 1.0, - "siteId": 1.0, - "siteName": "万集东门站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.7354579447, - 40.1974932972 - ], - "lon": 116.7354579447, - "lat": 40.1974932972, - "siteDesc": "万集东门站", - "siteState": 1.0, - "isCurrentSite": 1.0, - "siteColor": 1.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 1.0, - "siteId": 2.0, - "siteName": "市政府前街18号", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.729134342, - 40.1953113732 - ], - "lon": 116.729134342, - "lat": 40.1953113732, - "siteDesc": "市政府前街18号", - "siteState": 1.0, - "isCurrentSite": 3.0, - "siteColor": 2.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 3.0, - "siteName": "顺密路口站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.721520973, - 40.1940181096 - ], - "lon": 116.721520973, - "lat": 40.1940181096, - "siteDesc": "顺密路口站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 1.0 - } - ] - } -} \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/res/raw/bus_station_list2.json b/OCH/charter/driver/src/driverm1/res/raw/bus_station_list2.json deleted file mode 100644 index 48d6782cc3..0000000000 --- a/OCH/charter/driver/src/driverm1/res/raw/bus_station_list2.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "code": 0, - "msg": "", - "detailMsg": "", - "result": { - "site": [ - { - "lineId": 1.0, - "siteId": 1.0, - "siteName": "万集东门站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.7354579447, - 40.1974932972 - ], - "lon": 116.7354579447, - "lat": 40.1974932972, - "siteDesc": "万集东门站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 1.0, - "siteId": 1.0, - "siteName": "万集东门站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.7374429112, - 40.2023987087 - ], - "lon": 116.7374429112, - "lat": 40.2023987087, - "siteDesc": "万集东门站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 1.0, - "siteId": 2.0, - "siteName": "顺密路口站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.721520973, - 40.1940181096 - ], - "lon": 116.721520973, - "lat": 40.1940181096, - "siteDesc": "顺密路口站", - "siteState": 1.0, - "isCurrentSite": 1.0, - "siteColor": 1.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 1.0, - "siteId": 2.0, - "siteName": "顺密路口站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.723146, - 40.179637 - ], - "lon": 116.723146, - "lat": 40.179637, - "siteDesc": "顺密路口站", - "siteState": 1.0, - "isCurrentSite": 1.0, - "siteColor": 1.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 2.0, - "siteId": 2.0, - "siteName": "顺密路口站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.738835502, - 40.2023958306 - ], - "lon": 116.738835502, - "lat": 40.2023958306, - "siteDesc": "顺密路口站", - "siteState": 1.0, - "isCurrentSite": 1.0, - "siteColor": 1.0, - "peoples": "0", - "ifStop": 1.0 - } - ] - } -} \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/res/raw/end_marker.nt3d b/OCH/charter/driver/src/driverm1/res/raw/end_marker.nt3d deleted file mode 100644 index be6057c547..0000000000 Binary files a/OCH/charter/driver/src/driverm1/res/raw/end_marker.nt3d and /dev/null differ diff --git a/OCH/charter/driver/src/driverm1/res/raw/star_marker.nt3d b/OCH/charter/driver/src/driverm1/res/raw/star_marker.nt3d deleted file mode 100644 index c6e546fc31..0000000000 Binary files a/OCH/charter/driver/src/driverm1/res/raw/star_marker.nt3d and /dev/null differ diff --git a/OCH/charter/driver/src/driverm1/res/values/attrs.xml b/OCH/charter/driver/src/driverm1/res/values/attrs.xml deleted file mode 100644 index 396db92f74..0000000000 --- a/OCH/charter/driver/src/driverm1/res/values/attrs.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/res/values/colors.xml b/OCH/charter/driver/src/driverm1/res/values/colors.xml deleted file mode 100644 index f96964af23..0000000000 --- a/OCH/charter/driver/src/driverm1/res/values/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #CAD6FF - \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/res/values/strings.xml b/OCH/charter/driver/src/driverm1/res/values/strings.xml deleted file mode 100644 index c5b7e2ff9c..0000000000 --- a/OCH/charter/driver/src/driverm1/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - 剩余%1$s分钟 - 包车时间：%1$s - 乘客信息：%1$s - 本次行程剩余15分钟，请知晓并通知乘客合理安排游玩时间 - - diff --git a/OCH/charter/driver/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml b/OCH/charter/driver/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml deleted file mode 100644 index 587a6eccbe..0000000000 --- a/OCH/charter/driver/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterProvider.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterProvider.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/Station.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/Station.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt similarity index 100% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt similarity index 89% rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index f965e3f3f7..894b3341e3 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -25,8 +25,16 @@ import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.createQRCodeWithPicture import com.mogo.och.common.module.wigets.BindQRCodeDialog import com.mogo.och.common.module.wigets.OCHCommitDialog -import kotlinx.android.synthetic.driverm1.bus_no_line_view.* -import kotlinx.android.synthetic.driverm1.fragment_driver_m1.* +import kotlinx.android.synthetic.main.bus_no_line_view.no_line_data_view +import kotlinx.android.synthetic.main.bus_no_line_view.no_order_data_tv +import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1StationName1Tv +import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1StationName2Tv +import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1_line_name +import kotlinx.android.synthetic.main.fragment_driver_m1.driverm1_order_count_down +import kotlinx.android.synthetic.main.fragment_driver_m1.during_time +import kotlinx.android.synthetic.main.fragment_driver_m1.group_stations_panel +import kotlinx.android.synthetic.main.fragment_driver_m1.group_stations_panel2 +import kotlinx.android.synthetic.main.fragment_driver_m1.passenger_phone import me.jessyan.autosize.utils.AutoSizeUtils import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -190,15 +198,15 @@ class DriverM1Fragment : CharterBaseFragment#4DFFFFFF #FFFFFF #323C6F + #CAD6FF \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/values/strings.xml b/OCH/charter/driver/src/main/res/values/strings.xml index 4af6f88828..d2ae82a271 100644 --- a/OCH/charter/driver/src/main/res/values/strings.xml +++ b/OCH/charter/driver/src/main/res/values/strings.xml @@ -53,4 +53,10 @@ 距离发车时间还有%1$s分钟 确认还车 + 剩余%1$s分钟 + 包车时间：%1$s + 乘客信息：%1$s + 本次行程剩余15分钟，请知晓并通知乘客合理安排游玩时间 + + diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index cdaf2c79b5..b4c2f4071e 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -4,8 +4,7 @@ project.android.productFlavors { // 金旅M1车 ochM1 { dimension "vehicle" - matchingFallbacks = ['driverm1'] - missingDimensionStrategy "vehicle", "driverm1","m2", "jinlvvan" + missingDimensionStrategy "vehicle","m2", "jinlvvan" // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/ochM2.gradle index 0d1dcf8abf..b7d7988e75 100644 --- a/app/script/vehicleFlavors/ochM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m2对应 matchingFallbacks = ['m2'] - missingDimensionStrategy "vehicle", "m2", "jinlvvan", 'driverm1' + missingDimensionStrategy "vehicle", "m2", "jinlvvan" //高德地图鉴权信息 manifestPlaceholders = [ CHANNEL_VALUE_TAIL: "M2",