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

[6.1.0]

Browse Source 
[charter]
[代码搬移]
This commit is contained in:
yangyakun
2023-10-07 11:23:50 +08:00
parent 79564c73df
commit 853bc0cadd
41 changed files with 29 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OCH/charter/driver/build.gradle
View File

@@ -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 {

184
OCH/charter/driver/src/driverm1/res/raw/bus_away_passengers.json
View File

@@ -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
}
]
}
}

28
OCH/charter/driver/src/driverm1/res/raw/bus_order_1.json
View File

@@ -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"
}

69
OCH/charter/driver/src/driverm1/res/raw/bus_station_list1.json
View File

@@ -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
}
]
}
}

109
OCH/charter/driver/src/driverm1/res/raw/bus_station_list2.json
View File

@@ -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
}
]
}
}

BIN
OCH/charter/driver/src/driverm1/res/raw/end_marker.nt3d
View File

Binary file not shown.

BIN
OCH/charter/driver/src/driverm1/res/raw/star_marker.nt3d
View File

Binary file not shown.

13
OCH/charter/driver/src/driverm1/res/values/attrs.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="SlidePanelView">
<attr name="textSize" format="dimension" />
<attr name="NORMAL_TEXT_MARGIN_LEFT" format="dimension" />
<attr name="NORMAL_TEXT_MARGIN_RIGHT" format="dimension" />
<attr name="SHORT_TEXT_MARGIN_LEFT" format="dimension" />
<attr name="SHORT_TEXT_MARGIN_RIGHT" format="dimension" />
<attr name="BLOCK_START_X" format="dimension" />
<attr name="BLOCK_START_Y" format="dimension" />
</declare-styleable>
</resources>

4
OCH/charter/driver/src/driverm1/res/values/colors.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="station_title_color">#CAD6FF</color>
</resources>

7
OCH/charter/driver/src/driverm1/res/values/strings.xml
View File

@@ -1,7 +0,0 @@
<resources>
<string name="count_down_txt">剩余%1$s分钟</string>
<string name="during_time_tv">包车时间：%1$s</string>
<string name="passenger_phone">乘客信息：%1$s</string>
<string name="last_15_minutes">本次行程剩余15分钟，请知晓并通知乘客合理安排游玩时间</string>
</resources>

53
OCH/charter/driver/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml
View File

@@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
<Transition
motion:constraintSetEnd="@+id/end"
motion:constraintSetStart="@id/start"
motion:motionInterpolator="easeInOut"
motion:duration="300">
<KeyFrameSet>
</KeyFrameSet>
<OnClick motion:targetId="@+id/switch_line_item_select_iv" motion:clickAction="toggle" />
</Transition>
<ConstraintSet android:id="@+id/start">
</ConstraintSet>
<ConstraintSet android:id="@+id/end">
<Constraint
android:id="@+id/switch_line_end_station"
android:layout_width="0dp"
android:layout_height="wrap_content"
motion:layout_constraintBottom_toTopOf="@id/v_line_task"
android:layout_marginBottom="@dimen/dp_40"
motion:layout_constraintTop_toBottomOf="@+id/switch_line_name"
motion:layout_constraintStart_toStartOf="@+id/switch_line_name"
android:layout_marginTop="@dimen/dp_20" />
<Constraint
android:id="@+id/v_line_task"
android:visibility="visible"
android:background="@android:color/white"
android:layout_marginStart="@dimen/dp_80"
android:layout_marginEnd="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_40"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toBottomOf="@+id/switch_line_end_station"
android:layout_width="match_parent"
android:layout_height="1dp"/>
<Constraint
android:id="@+id/rv_line_task_list"
android:visibility="visible"
android:layout_marginStart="@dimen/dp_80"
android:layout_marginEnd="@dimen/dp_80"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toBottomOf="@+id/v_line_task"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</ConstraintSet>
</MotionScene>

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterProvider.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/Station.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt
View File

28
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
View File

@@ -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<DriverM1Fragment?, DriverM1Presente
.cancelStr(getString(R.string.bus_dialog_cancel))
.countdownValue(120)
.build(requireContext())
ochCommitDialog?.setClickListener(object : OCHCommitDialog.ClickListener {
override fun confirm() { //同意
mPresenter?.changeDest()
}
ochCommitDialog?.setClickListener(object : OCHCommitDialog.ClickListener {
override fun confirm() { //同意
mPresenter?.changeDest()
}
override fun cancel() { //取消
mPresenter?.sendCommitMsgToClient(false)
}
})
override fun cancel() { //取消
mPresenter?.sendCommitMsgToClient(false)
}
})
ochCommitDialog?.show()
}

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
View File

0
OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt → OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
View File

0
OCH/charter/driver/src/driverm1/res/layout/bus_no_line_view.xml → OCH/charter/driver/src/main/res/layout/bus_no_line_view.xml
View File

0
OCH/charter/driver/src/driverm1/res/layout/fragment_driver_m1.xml → OCH/charter/driver/src/main/res/layout/fragment_driver_m1.xml
View File

0
OCH/charter/driver/src/driverm1/res/raw/m1_voice_di.mp3 → OCH/charter/driver/src/main/res/raw/m1_voice_di.mp3
View File

1
OCH/charter/driver/src/main/res/values/colors.xml
View File

@@ -57,4 +57,5 @@
<color name="sweeper_mogo_autopilot_status_disable">#4DFFFFFF</color>
<color name="sweeper_mogo_autopilot_status_enable">#FFFFFF</color>
<color name="sweeper_switch_map_bg">#323C6F</color>
<color name="station_title_color">#CAD6FF</color>
</resources>

6
OCH/charter/driver/src/main/res/values/strings.xml
View File

@@ -53,4 +53,10 @@
<string name="bus_before_tips_s">距离发车时间还有%1$s分钟</string>
<string name="back_car">确认还车</string>
<string name="count_down_txt">剩余%1$s分钟</string>
<string name="during_time_tv">包车时间：%1$s</string>
<string name="passenger_phone">乘客信息：%1$s</string>
<string name="last_15_minutes">本次行程剩余15分钟，请知晓并通知乘客合理安排游玩时间</string>
</resources>

3
app/script/vehicleFlavors/ochM1.gradle
View File

@@ -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 = [

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

@@ -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",