diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle
index 3f3e62f1ef..92631f28d4 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 {
@@ -69,6 +63,8 @@ dependencies {
implementation project(":OCH:mogo-och-common-module")
compileOnly project(":libraries:mogo-map")
+
+ testImplementation 'junit:junit:4.12'
}
apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
\ No newline at end of file
diff --git a/OCH/charter/driver/src/driverm1/AndroidManifest.xml b/OCH/charter/driver/src/driverm1/AndroidManifest.xml
deleted file mode 100644
index f9cccd9894..0000000000
--- a/OCH/charter/driver/src/driverm1/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
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 c1d15e20b4..0000000000
--- a/OCH/charter/driver/src/driverm1/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
- 剩余%1$s分钟
- 包车时间：%1$s
- 乘客信息：%1$s
- 本次行程剩余5分钟，请知晓并通知乘客合理安排游玩时间
-
-
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 94%
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
index 10dea5a459..6c915054a7 100644
--- 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
@@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentActivity
import com.alibaba.android.arouter.facade.annotation.Route
import com.magic.mogo.och.charter.constant.CharterConst
import com.magic.mogo.och.charter.fragment.DriverM1Fragment
+import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
@@ -14,14 +15,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
* @date: 2023/2/22
*/
@Route(path = CharterConst.PATH)
-class CharterProvider: ICharterOCH{
+class CharterProvider: IMoGoFunctionProvider{
private var mActivity: FragmentActivity? = null
private var mContainerId: Int? = 0
private var driverM1Fragment: Fragment? = null
- override fun createCoverage(activity: FragmentActivity?, containerId: Int) {}
-
override fun createCoverage(fragmentActivity: FragmentActivity?, integer: Int?): Fragment? {
this.mContainerId = integer
this.mActivity = fragmentActivity
diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java
deleted file mode 100644
index 2f8ecd62bb..0000000000
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.magic.mogo.och.charter;
-
-import androidx.annotation.IdRes;
-import androidx.fragment.app.FragmentActivity;
-
-import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
-
-/**
- * @author congtaowang
- * @since 2021/1/15
- *
- * 网约车抽象接口
- */
-public interface ICharterOCH extends IMoGoFunctionProvider {
-
- /**
- * 初始化网约车容器
- *
- * @param activity
- * @param containerId 容器ID
- */
- void createCoverage(FragmentActivity activity, @IdRes int containerId);
-}
diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
index 2953cd6fe3..04355d8e1d 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
@@ -93,7 +93,7 @@ abstract class CharterBaseFragment?>() :
flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container)
slidePanelView = findViewById(R.id.charter_slide_panel)
- slidePanelView?.setText(resources.getString(R.string.back_car))
+ slidePanelView?.setText(resources.getString(R.string.charter_back_car))
slidePanelView?.setOnSlidePanelMoveToEndListener(onSlideToEndListener)
mTrafficDataView = findViewById(R.id.bus_arc) as TrafficDataView?
@@ -108,14 +108,14 @@ abstract class CharterBaseFragment?>() :
if (ui.currentMapVisualAngle.isLongSight) {
ui.setLockMode(true)
ui.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
- mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium)
+ mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium)
} else if (ui.currentMapVisualAngle.isMediumSight) {
ui.setLockMode(false)
ui.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null)
- mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_long)
+ mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_long)
} else {
ui.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
- mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium)
+ mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium)
}
}
}
@@ -248,9 +248,9 @@ abstract class CharterBaseFragment?>() :
requireActivity().runOnUiThread {
module_mogo_och_arrived_tv.isEnabled = isClickable
if (isClickable) {
- module_mogo_och_arrived_tv.setTextColor(resources.getColor(R.color.bus_white))
+ module_mogo_och_arrived_tv.setTextColor(resources.getColor(android.R.color.white))
} else {
- module_mogo_och_arrived_tv.setTextColor(resources.getColor(R.color.bus_arrived_btn_un_clickable_color))
+ module_mogo_och_arrived_tv.setTextColor(resources.getColor(R.color.charter_arrived_btn_un_clickable_color))
}
}
}
@@ -266,11 +266,11 @@ abstract class CharterBaseFragment?>() :
mapBizView?.let {
it.getUI()?.let { ui ->
if (ui.currentMapVisualAngle.isLongSight) {
- mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_long)
+ mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_long)
} else if (ui.currentMapVisualAngle.isMediumSight) {
- mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium)
+ mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium)
} else {
- mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium)
+ mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium)
}
}
}
@@ -326,29 +326,29 @@ abstract class CharterBaseFragment?>() :
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE
== autopilotStatus
) { //0不可用
- ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_disable))
+ ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_disable))
ctvAutopilotStatusTv!!.text =
- resources.getString(R.string.bus_loading_autopilot_runnig_tv)
- ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_disable_autopilot_icon)
+ resources.getString(R.string.charter_loading_autopilot_runnig_tv)
+ ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_disable_autopilot_icon)
// ctvAutopilotStatus!!.isSelected = false
ctvAutopilotStatus!!.isClickable = true
- ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_0_1_status_bg)
+ ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_autopilot_0_1_status_bg)
}else{
- ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal))
- ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_ic_autopilot)
+ ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal))
+ ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_ic_autopilot)
ctvAutopilotStatusTv!!.text =
- resources.getString(R.string.bus_loading_autopilot_runnig_tv)
+ resources.getString(R.string.charter_loading_autopilot_runnig_tv)
ctvAutopilotStatus!!.isClickable = true
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == autopilotStatus) { //1可用
- ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_0_1_status_bg)
+ ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_autopilot_0_1_status_bg)
} else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus) {
- ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_2_status_bg)
+ ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_autopilot_2_status_bg)
} else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING
== autopilotStatus){
ctvAutopilotStatusTv!!.text =
- resources.getString(R.string.bus_loading_autopilot_pingxing_tv)
+ resources.getString(R.string.charter_loading_autopilot_pingxing_tv)
ctvAutopilotStatus!!.isClickable = false
- ctvAutopilotStatus!!.background = getDrawable(R.drawable.pingxingjiashi)
+ ctvAutopilotStatus!!.background = getDrawable(R.drawable.charter_pingxingjiashi)
}
}
}
@@ -357,17 +357,17 @@ abstract class CharterBaseFragment?>() :
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING
== autopilotStatus
) { //2 running
- ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_right_autopilot_icon)
- ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal))
+ ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_right_autopilot_icon)
+ ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal))
ctvAutopilotStatusTv!!.text =
- resources.getString(R.string.bus_loading_autopilot_success_tv)
+ resources.getString(R.string.charter_loading_autopilot_success_tv)
// ctvAutopilotStatus!!.isSelected = false
ctvAutopilotStatus!!.isClickable = false
} else {
- ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_wrong_autopilot_icon)
- ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal))
+ ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_wrong_autopilot_icon)
+ ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal))
ctvAutopilotStatusTv!!.text =
- resources.getString(R.string.bus_loading_autopilot_failure_tv)
+ resources.getString(R.string.charter_loading_autopilot_failure_tv)
ctvAutopilotStatus!!.isClickable = false
// ctvAutopilotStatus!!.isSelected = false
}
@@ -427,11 +427,11 @@ abstract class CharterBaseFragment?>() :
@SuppressLint("ObjectAnimatorBinding")
open fun startAutopilotAnimation() {
isAnimateRunning = true
- ctvAutopilotStatusTv!!.text = resources.getString(R.string.bus_loading_autopilot_tv)
- ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal))
+ ctvAutopilotStatusTv!!.text = resources.getString(R.string.charter_loading_autopilot_tv)
+ ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.charter_autopilot_text_color_normal))
// ctvAutopilotStatus!!.isSelected = false
ctvAutopilotStatus!!.isClickable = true
- ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_loading_autopilot_icon)
+ ctvAutopilotStatusIv!!.setImageResource(R.drawable.charter_loading_autopilot_icon)
if (autopilotLoadingAnimator == null) {
autopilotLoadingAnimator =
ObjectAnimator.ofFloat(ctvAutopilotStatusIv, "rotation", 0f, 360f)
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 82%
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 47b7067866..ecf8215f7a 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
@@ -9,7 +9,6 @@ import com.alibaba.android.arouter.launcher.ARouter
import com.magic.mogo.och.charter.R
import com.magic.mogo.och.charter.base.CharterBaseFragment
import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse
-import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVED
import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVING
import com.magic.mogo.och.charter.constant.CharterConst.Companion.LOOP_PERIOD_60S
import com.magic.mogo.och.charter.net.login.LoginDriverM1Impl
@@ -26,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.charter_fragment_driver_m1.driverm1StationName1Tv
+import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1StationName2Tv
+import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1_line_name
+import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1_order_count_down
+import kotlinx.android.synthetic.main.charter_fragment_driver_m1.during_time
+import kotlinx.android.synthetic.main.charter_fragment_driver_m1.group_stations_panel
+import kotlinx.android.synthetic.main.charter_fragment_driver_m1.group_stations_panel2
+import kotlinx.android.synthetic.main.charter_fragment_driver_m1.passenger_phone
+import kotlinx.android.synthetic.main.charter_no_line_view.no_line_data_view
+import kotlinx.android.synthetic.main.charter_no_line_view.no_order_data_tv
import me.jessyan.autosize.utils.AutoSizeUtils
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -73,13 +80,13 @@ class DriverM1Fragment : CharterBaseFragment= 0){
startCountDownTimer(minutes,LOOP_PERIOD_60S)
}else{
- isReturn5MTip = false
+ isReturn15MTip = false
clearCountDownTimer()
}
}
@@ -158,7 +165,7 @@ class DriverM1Fragment : CharterBaseFragment {
override fun onMsgReceived(obj: OperateDoorMsg) {
d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.message)
-
- sendMsgToClient(DPOperateDoorMsg(true))
-
+ val doorStatus = LightAirconditionDoorStatusManager.doorStatus
+ if (doorStatus.isOpen) {
+ LightAirconditionDoorManager.go2OpenDoor(false)
+ } else {
+ LightAirconditionDoorManager.go2OpenDoor(true)
+ }
}
override fun target(): Class {
@@ -500,7 +506,7 @@ class DriverM1Model {
*/
fun restartAutopilot() {
d(SceneConstant.M_CHARTER_D + TAG, "司机端-启动自动驾驶===")
- CallerAutoPilotControlManager.sendPlanningCmd(2)
+ StopSideManager.resetStopSide()
//只去启动自动驾驶
startAutopilot()
}
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt
similarity index 100%
rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt
similarity index 100%
rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt
similarity index 100%
rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt
similarity index 100%
rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java
similarity index 100%
rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
similarity index 85%
rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
index 9b1a7c84b2..ab5996a55f 100644
--- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -23,7 +23,9 @@ import com.mogo.och.common.module.biz.callback.ILoginCallback
import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.OPERATION_ROAD_SIDE_TYPE
import com.mogo.och.common.module.biz.constant.LoginStatusManager.isLogin
import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
-import com.mogo.och.common.module.manager.StopSideStatusManager
+import com.mogo.och.common.module.manager.stopsidemanager.OCHPlanningActionsCallback
+import com.mogo.och.common.module.manager.stopsidemanager.StopSideStatus
+import com.mogo.och.common.module.manager.stopsidemanager.StopSideManager
import com.mogo.och.common.module.utils.DateTimeUtil
import mogo.telematics.pad.MessagePad
import mogo_msg.MogoReportMsg
@@ -34,7 +36,7 @@ import mogo_msg.MogoReportMsg
*/
class DriverM1Presenter(view: DriverM1Fragment?) :
Presenter(view),ILoginCallback, DriverM1OrderCallback, ChangeDestCallback,
- IMoGoAutopilotStatusListener, StopSideStatusManager.OCHPlanningActionsCallback,
+ IMoGoAutopilotStatusListener, OCHPlanningActionsCallback,
IDriverM1ControllerStatusCallback {
companion object{
@@ -50,14 +52,14 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
private fun registerListener() {
//2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口
CallerAutoPilotStatusListenerManager.addListener(TAG, this)
- StopSideStatusManager.addListener(TAG,this)
+ StopSideManager.addListener(TAG,this)
DriverM1Model.get().setDriverM1OrderCallback(this)
DriverM1Model.get().setChangeDestCallback(this)
DriverM1Model.get().setControllerStatusCallback(this)
}
private fun releaseListener() {
- StopSideStatusManager.removeListener(TAG)
+ StopSideManager.removeListener(TAG)
CallerAutoPilotStatusListenerManager.removeListener(TAG)
DriverM1Model.get().setDriverM1OrderCallback(null)
DriverM1Model.get().setChangeDestCallback(null)
@@ -129,9 +131,9 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
DriverM1Model.get().changeDest()
}
- fun carReturnTip(){ //提前 5分钟 提醒
+ fun carReturnTip(){ //提前 15分钟 提醒
DriverM1Model.get().pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp()
- ,context.getString(R.string.last_5_minutes))
+ ,context.getString(R.string.charter_last_15_minutes))
}
override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
@@ -161,23 +163,30 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
}
override fun onStartAutopilotFailure(
- actionStatus: StopSideStatusManager.Status,
+ actionStatus: StopSideStatus,
stopSideStatus: Boolean?,
errorInfo: String?
) {
when (actionStatus) {
- StopSideStatusManager.Status.START -> { // 靠边停车 to 消息盒子
+ StopSideStatus.NOSTART -> {
DriverM1Model.get().pushOperationalToMsgBox(
DateTimeUtil.getCurrentTimeStamp(),
- "靠边停车",
+ "靠边停车无响应，注意随时接管",
OPERATION_ROAD_SIDE_TYPE
)
}
- StopSideStatusManager.Status.EndingFaile,
- StopSideStatusManager.Status.NOSTART-> {
+ StopSideStatus.START -> { // 靠边停车 to 消息盒子
DriverM1Model.get().pushOperationalToMsgBox(
DateTimeUtil.getCurrentTimeStamp(),
- "靠边停车失败",
+ "开始靠边停车",
+ OPERATION_ROAD_SIDE_TYPE
+ )
+ }
+ StopSideStatus.EndingFaile,
+ StopSideStatus.NOSTART-> {
+ DriverM1Model.get().pushOperationalToMsgBox(
+ DateTimeUtil.getCurrentTimeStamp(),
+ "靠边停车失败，注意随时接管",
OPERATION_ROAD_SIDE_TYPE
)
}
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt
similarity index 65%
rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt
index 788f31e491..aed4ea1646 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt
@@ -1,12 +1,15 @@
-package com.mogo.och.common.module.wigets
+package com.magic.mogo.och.charter.view
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
+import com.magic.mogo.och.charter.R
import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.och.common.module.R
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
import com.mogo.och.common.module.manager.DriverMoFangFunctionManager
+import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
+import com.mogo.och.common.module.utils.SoundPoolHelper
import kotlinx.android.synthetic.main.driver_mofang_function_view.view.*
/**
@@ -43,6 +46,14 @@ class DriverMoFangFunctionView @JvmOverloads constructor(
DriverMoFangFunctionManager.driverMoFangFunctionManager.sendOperatorSetHornByDriver()
true
}
+ openDoorIv.onClick {
+ LightAirconditionDoorManager.go2OpenDoor(true)
+ SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di)
+ }
+ closeDoorIv.onClick {
+ LightAirconditionDoorManager.go2OpenDoor(false)
+ SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di)
+ }
}
}
\ No newline at end of file
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
similarity index 99%
rename from OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
index 651e857ef5..03047a13b5 100644
--- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
@@ -85,7 +85,7 @@ class SlidePanelView @JvmOverloads constructor(
val size = AutoSizeUtils.dp2px(context, 120f)
val opts = BitmapFactory.Options()
opts.inDensity = AutoSizeConfig.getInstance().initDensity.toInt()
- bmBlock = BitmapFactory.decodeResource(resources, R.drawable.bus_base_slide_block, opts) as Bitmap
+ bmBlock = BitmapFactory.decodeResource(resources, R.drawable.charter_base_slide_block, opts) as Bitmap
bmBlock = Bitmap.createScaledBitmap(bmBlock!!, size, size, true) as Bitmap
blockWidth = bmBlock!!.width
}
diff --git a/OCH/charter/driver/src/main/res/color/bus_autopilot_text_color_selector.xml b/OCH/charter/driver/src/main/res/color/charter_autopilot_text_color_selector.xml
similarity index 62%
rename from OCH/charter/driver/src/main/res/color/bus_autopilot_text_color_selector.xml
rename to OCH/charter/driver/src/main/res/color/charter_autopilot_text_color_selector.xml
index 15f6897792..7d1b073784 100644
--- a/OCH/charter/driver/src/main/res/color/bus_autopilot_text_color_selector.xml
+++ b/OCH/charter/driver/src/main/res/color/charter_autopilot_text_color_selector.xml
@@ -1,4 +1,4 @@
- -
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png
deleted file mode 100644
index cc2b18083d..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png b/OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png
deleted file mode 100644
index 3f05565483..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png b/OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png
deleted file mode 100644
index ba41bf3a53..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml
deleted file mode 100644
index 203971340e..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml
deleted file mode 100644
index 272e718cce..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml
deleted file mode 100644
index e5faafb27b..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml
deleted file mode 100644
index ee8088637c..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml
deleted file mode 100644
index e2b482ee5f..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml b/OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml
deleted file mode 100644
index fe46ef2228..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml b/OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml
deleted file mode 100644
index 376e0a472c..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- -
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml
deleted file mode 100644
index 8b066b0ce8..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml
deleted file mode 100644
index e94992d507..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png
deleted file mode 100644
index 370b61de38..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml
deleted file mode 100644
index b34021d977..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png
deleted file mode 100755
index cf3e5a3778..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png
deleted file mode 100755
index bdc2725468..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png b/OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png
deleted file mode 100644
index 0114bb4f2b..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png
deleted file mode 100644
index 0c8988acb3..0000000000
Binary files a/OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png and /dev/null differ
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml b/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml
deleted file mode 100644
index 2ef90e60f7..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml b/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml
deleted file mode 100644
index dea7a88bb6..0000000000
--- a/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml
similarity index 69%
rename from OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml
rename to OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml
index 1b95919363..62d3a1173a 100644
--- a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml
+++ b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml
@@ -1,8 +1,8 @@
- -
+
-
- -
+
-
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml
similarity index 69%
rename from OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
rename to OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml
index 21c3611ffe..fda939cf28 100644
--- a/OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
+++ b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml
@@ -1,8 +1,8 @@
- -
+
-
- -
+
-
diff --git a/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml
new file mode 100644
index 0000000000..6bfd144f39
--- /dev/null
+++ b/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml
@@ -0,0 +1,5 @@
+
+
+ -
+
+
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_panel_bkg.xml b/OCH/charter/driver/src/main/res/drawable/charter_panel_bkg.xml
similarity index 100%
rename from OCH/charter/driver/src/main/res/drawable/bus_panel_bkg.xml
rename to OCH/charter/driver/src/main/res/drawable/charter_panel_bkg.xml
diff --git a/OCH/charter/driver/src/main/res/drawable/charter_reset_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_reset_selector.xml
new file mode 100644
index 0000000000..5e6486b087
--- /dev/null
+++ b/OCH/charter/driver/src/main/res/drawable/charter_reset_selector.xml
@@ -0,0 +1,5 @@
+
+
+ -
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
-
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
index 0ea8182fc7..0597410f26 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
@@ -4,6 +4,6 @@
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml
index 6c01b69413..4e62bb9e8a 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml
index 18e583918f..b9b818b96d 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml
index 803c55d451..6d51c1957b 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml
index 18e583918f..b9b818b96d 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml
index c786db4c18..eace4c7781 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml
index 1cc7325f05..7cf1977d59 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_shape.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_shape.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_top.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_top.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_video_seekbar_style.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/taxi_video_seekbar_style.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_video_seekbar_style.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit01.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit01.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit02.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit02.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit03.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit03.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit04.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit04.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit05.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit05.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit06.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit06.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit07.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit07.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit08.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit08.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit09.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit09.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit10.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit10.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit11.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit11.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit12.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit12.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit13.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit13.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit14.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit14.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit15.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit15.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit16.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit16.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit17.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit17.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit18.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit18.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit19.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit19.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit20.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit20.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit21.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit21.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit22.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit22.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit23.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit23.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit24.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit24.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit25.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit25.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit26.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit26.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit27.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit27.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit28.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit28.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit29.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit29.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit30.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit30.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml
index 374e3a007f..56b3e74477 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml
deleted file mode 100644
index 3b80ea24a5..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- - @drawable/open_lock_000
- - @drawable/open_lock_001
- - @drawable/open_lock_002
- - @drawable/open_lock_003
- - @drawable/open_lock_004
- - @drawable/open_lock_005
- - @drawable/open_lock_006
- - @drawable/open_lock_007
- - @drawable/open_lock_008
- - @drawable/open_lock_009
+
+ - @drawable/charter_p_open_lock_000
+ - @drawable/charter_p_open_lock_001
+ - @drawable/charter_p_open_lock_002
+ - @drawable/charter_p_open_lock_003
+ - @drawable/charter_p_open_lock_004
+ - @drawable/charter_p_open_lock_005
+ - @drawable/charter_p_open_lock_006
+ - @drawable/charter_p_open_lock_007
+ - @drawable/charter_p_open_lock_008
+ - @drawable/charter_p_open_lock_009
- - @drawable/open_lock_010
- - @drawable/open_lock_011
- - @drawable/open_lock_012
- - @drawable/open_lock_013
- - @drawable/open_lock_014
- - @drawable/open_lock_015
- - @drawable/open_lock_016
- - @drawable/open_lock_017
- - @drawable/open_lock_018
- - @drawable/open_lock_019
+ - @drawable/charter_p_open_lock_010
+ - @drawable/charter_p_open_lock_011
+ - @drawable/charter_p_open_lock_012
+ - @drawable/charter_p_open_lock_013
+ - @drawable/charter_p_open_lock_014
+ - @drawable/charter_p_open_lock_015
+ - @drawable/charter_p_open_lock_016
+ - @drawable/charter_p_open_lock_017
+ - @drawable/charter_p_open_lock_018
+ - @drawable/charter_p_open_lock_019
- - @drawable/open_lock_020
- - @drawable/open_lock_021
- - @drawable/open_lock_022
- - @drawable/open_lock_023
+ - @drawable/charter_p_open_lock_020
+ - @drawable/charter_p_open_lock_021
+ - @drawable/charter_p_open_lock_022
+ - @drawable/charter_p_open_lock_023
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/values/attrs.xml b/OCH/charter/passenger/src/main/res/values/attrs.xml
index 2b68f358f0..13afa3244e 100644
--- a/OCH/charter/passenger/src/main/res/values/attrs.xml
+++ b/OCH/charter/passenger/src/main/res/values/attrs.xml
@@ -1,20 +1,20 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/values/color.xml b/OCH/charter/passenger/src/main/res/values/color.xml
index cbf9937b31..031e97bb88 100644
--- a/OCH/charter/passenger/src/main/res/values/color.xml
+++ b/OCH/charter/passenger/src/main/res/values/color.xml
@@ -1,56 +1,57 @@
- #212831
- #203555
- #47576E
- #6647576E
- #374968
- #2CBFFC
- #1060FF
- #96A5C2
- #F5FBFF
- #112B57
- #1B2546
- #A3BDF2
- #56C59C
- #56EFA0
- #6EDBDC
- #4A5375
- #0F1E57
- #225EFF
- #0050E1
- #1466FB
- #331466FB
- #43CEFE
- #3B4056
- #23293B
- #485173
- #292C39
- #2C2D31
- #222222
- #090F28
- #5F7096
- #9AABD2
- #B8C2D7
- #B8C2D8
- #D7E5F5
- #E0EFFF
- #101C35
- #20418D
- #662C2D31
- #332C2D31
+ #203555
+ #212831
+ #374968
+ #47576E
+ #6647576E
+ #2CBFFC
+ #1060FF
+ #96A5C2
+ #F5FBFF
+ #112B57
+ #1B2546
+ #A3BDF2
+ #56C59C
+ #56EFA0
+ #6EDBDC
+ #4A5375
+ #0F1E57
+ #225EFF
+ #0050E1
+ #1466FB
+ #331466FB
+ #43CEFE
+ #3B4056
+ #23293B
+ #485173
+ #292C39
+ #2C2D31
+ #222222
+ #090F28
+ #5F7096
+ #9AABD2
+ #B8C2D7
+ #B8C2D8
+ #D7E5F5
+ #E0EFFF
+ #101C35
+ #20418D
+ #662C2D31
+ #332C2D31
- #80000000
- #80288DFC
- #3060ABFE
- #0060ABFE
- #00EFF6FF
- #B3EFF6FF
- #91EFF6FF
- #CCFFFFFF
- #80FFFFFF
- #40FFFFFF
- #F0E0EFFF
- #66000000
+ #80000000
+ #80288DFC
+ #3060ABFE
+ #0060ABFE
+ #00EFF6FF
+ #B3EFF6FF
+ #91EFF6FF
+ #CCFFFFFF
+ #80FFFFFF
+ #40FFFFFF
+ #F0E0EFFF
+ #66000000
+ #FF6D2C
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/values/strings.xml b/OCH/charter/passenger/src/main/res/values/strings.xml
index e2c3f5116a..62696d8687 100644
--- a/OCH/charter/passenger/src/main/res/values/strings.xml
+++ b/OCH/charter/passenger/src/main/res/values/strings.xml
@@ -1,55 +1,55 @@
- 制冷
- 制热
- 通风
- 自动
+ 制冷
+ 制热
+ 通风
+ 自动
- 温度
+ 温度
- 风速
- 低
- 中
- 高
+ 风速
+ 低
+ 中
+ 高
- 关闭顶灯1
- 关闭顶灯2
- 关闭氛围灯
+ 关闭顶灯1
+ 关闭顶灯2
+ 关闭氛围灯
- 开启顶灯1
- 开启顶灯2
- 开启氛围灯
+ 开启顶灯1
+ 开启顶灯2
+ 开启氛围灯
- KM/h
+ KM/h
- 正在为您靠边停车，扶稳坐好哟
- 靠边停车成功
+ 正在为您靠边停车，扶稳坐好哟
+ 靠边停车成功
- 请安全员登录司机屏
- 包车将在5分钟后结束，结束后我们将自动为您寻找停车点
+ 请安全员登录司机屏
+ 15分钟后就要结束用车啦，稍后小助手会自动为您寻找停车点哦
- 距离（KM）
- 距离（M）
- 剩余（分）
- 到达
+ 距离（KM）
+ 距离（M）
+ 剩余（分）
+ 到达
- --:--
+ --:--
- 靠边停车
- 欢迎乘坐\'蘑菇车联\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！
+ 靠边停车
+ 欢迎乘坐\'蘑菇车联\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！
- 接下来由蘑菇小助手为您\'指引方向\'！
- 关闭车门后，点击‘出发’按钮启动
- 点击‘停车’按钮后进行靠边停车，车辆停稳后就可以下车游玩啦！
- 最后,蘑菇小助手为您送上乘车小贴士～
- 太棒了！您已完成乘车指南，更多功能欢迎探索，蘑菇小助手预祝您旅途愉快
+ 接下来由蘑菇小助手为您\'指引方向\'！
+ 关闭车门后，点击‘出发’按钮启动
+ 点击‘停车’按钮后进行靠边停车，车辆停稳后就可以下车游玩啦！
+ 最后,蘑菇小助手为您送上乘车小贴士～
+ 太棒了！您已完成乘车指南，更多功能欢迎探索，蘑菇小助手预祝您旅途愉快
- 先关闭车门再启动吧～
- 自驾系统繁忙，稍后再试试吧～
- %1$s就要到啦！
- 稍后再来看看吧
+ 先关闭车门再启动吧～
+ 自驾系统繁忙，稍后再试试吧～
+ %1$s就要到啦！
+ 稍后再来看看吧
diff --git a/OCH/charter/passenger/src/main/res/values/styles.xml b/OCH/charter/passenger/src/main/res/values/styles.xml
index 0951fd761f..4cd331aa3b 100644
--- a/OCH/charter/passenger/src/main/res/values/styles.xml
+++ b/OCH/charter/passenger/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
-
-
diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
index 3ff97e5489..3b4fd0068a 100644
--- a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
+++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
@@ -2,6 +2,7 @@ package com.mogo.och.common.module.debug
import android.content.Intent
import android.os.Environment
+import chassis.Chassis
import chassis.Chassis.DoorNumber
import chassis.VehicleStateOuterClass
import com.amap.api.maps.model.LatLng
@@ -11,15 +12,18 @@ import com.mogo.eagle.core.data.map.MogoLocation
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisGnssListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
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.ActivityUtils
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.common.module.debug.location.MogoLocationExit
import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager
import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.common.module.view.DebugFloatWindow
import mogo.telematics.pad.MessagePad
import mogo_msg.MogoReportMsg
import java.io.BufferedReader
@@ -36,12 +40,15 @@ object DebugDataDispatch {
const val locationMock = "location"
const val carDoorMock = "carDoor"
const val carNeedTurnAround = "trunAroud"
+ const val carLightSwitch = "lightSwitch"
const val trajectoryStation = "trajectoryStation"
+ const val showDebugView = "showDebugView"
// aadb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "1111/11111"
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json"
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "carDoor" --ei doorPostion 1 --ei doorStatus 1
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "trunAroud" --es code "IMAP_TRA_LOADED"
+// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "lightSwitch" --ei lightPostion 0
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "trajectoryStation" --ef startLon 116.74053643938474 --ef startLat 40.200487993233246 --ef endLon 116.73876977409685 --ef endLat 40.20179054129441 --el lineID 8
@@ -84,7 +91,20 @@ object DebugDataDispatch {
newBuilder.timestampBuilder.nsec = 0
newBuilder.src = "2"
newBuilder.level = ""
- CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build())
+ ThreadUtils.getSinglePool().execute {
+ CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build())
+ }
+ }
+ carLightSwitch -> {
+ //0-5
+ // LIGHT_NONE = 0;
+ // LIGHT_LEFT = 1;
+ // LIGHT_RIGHT = 2;
+ // LIGHT_FLASH = 3;
+ // LIGHT_MANUAL = 4;
+ // LIGHT_AUTO = 5;
+ val lightPostion = intent.getIntExtra("lightPostion",0)
+ CallerChassisLamplightListenerManager.invokeAutopilotLightSwitchData(Chassis.LightSwitch.forNumber(lightPostion))
}
trajectoryStation -> {
val startLon = intent.getFloatExtra("startLon", -1.0f)
@@ -94,6 +114,10 @@ object DebugDataDispatch {
val lineID = intent.getLongExtra("lineID", -1)
setStation(startLon.toDouble(),startLat.toDouble(),endLon.toDouble(),endLat.toDouble(),lineID)
}
+ showDebugView -> {
+ val debugFloatWindow = DebugFloatWindow(ActivityUtils.getTopActivity())
+ debugFloatWindow.showFloatWindow()
+ }
else -> {}
}
}
diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt
new file mode 100644
index 0000000000..81b6f2ce5e
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt
@@ -0,0 +1,107 @@
+package com.mogo.och.common.module.view
+
+import android.app.Activity
+import android.graphics.PixelFormat
+import android.util.DisplayMetrics
+import android.view.*
+import androidx.appcompat.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatImageView
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.eagle.core.utilcode.util.BarUtils
+import com.mogo.och.common.module.R
+import mogo_msg.MogoReportMsg
+
+/**
+ * @author XuXinChao
+ * @description 工控机上报列表面板
+ * @since: 2022/4/13
+ */
+class DebugFloatWindow constructor(activity: Activity) : View.OnTouchListener{
+
+ private var mActivity: Activity = activity
+ private var mWindowParams: WindowManager.LayoutParams? = null
+ private var mWindowManager: WindowManager? = null
+
+ private lateinit var mFloatLayout: View
+ private var mInViewX = 0f
+ private var mInViewY = 0f
+ private var mDownInScreenX = 0f
+ private var mDownInScreenY = 0f
+ private var mInScreenX = 0f
+ private var mInScreenY = 0f
+
+ init {
+ initFloatWindow();
+ }
+
+ private fun initFloatWindow() {
+ mFloatLayout = LayoutInflater.from(mActivity).inflate(R.layout.debug_view, null) as View
+ mFloatLayout.setOnTouchListener(this)
+ mWindowParams = WindowManager.LayoutParams()
+ mWindowManager = mActivity.windowManager
+ mWindowParams?.let {
+ it.format = PixelFormat.RGBA_8888
+ it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+ it.gravity = Gravity.START or Gravity.TOP
+ it.width = 800
+ it.height = 1000
+ it.alpha = 0.9f
+ }
+ mFloatLayout.findViewById(R.id.close_window).onClick {
+ hideFloatWindow()
+ }
+
+ mFloatLayout.findViewById(R.id.acbtn_send_15_dir).onClick {
+ val newBuilder = MogoReportMsg.MogoReportMessage.newBuilder()
+ newBuilder.code = "EMAP_ATTITUDE_INIT_FAILED"
+ newBuilder.timestampBuilder.sec = 0
+ newBuilder.timestampBuilder.nsec = 0
+ newBuilder.src = "2"
+ newBuilder.level = ""
+ CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build())
+ }
+ }
+
+ override fun onTouch(v: View?, motionEvent: MotionEvent?): Boolean {
+ when (motionEvent?.action) {
+ MotionEvent.ACTION_DOWN -> {
+ // 获取相对View的坐标，即以此View左上角为原点
+ mInViewX = motionEvent.x
+ mInViewY = motionEvent.y
+ // 获取相对屏幕的坐标，即以屏幕左上角为原点
+ mDownInScreenX = motionEvent.rawX
+ mDownInScreenY = motionEvent.rawY
+ mInScreenX = motionEvent.rawX
+ mInScreenY = motionEvent.rawY
+
+ }
+ MotionEvent.ACTION_MOVE -> {
+ // 更新浮动窗口位置参数
+ mInScreenX = motionEvent.rawX
+ mInScreenY = motionEvent.rawY
+ mWindowParams!!.x = (mInScreenX - mInViewX).toInt()
+ mWindowParams!!.y = (mInScreenY - mInViewY).toInt()
+ // 手指移动的时候更新小悬浮窗的位置
+ mWindowManager!!.updateViewLayout(mFloatLayout, mWindowParams)
+ }
+ }
+ return true
+ }
+
+ fun showFloatWindow() {
+ if (mFloatLayout.parent == null) {
+ val metrics = DisplayMetrics()
+ // 默认固定位置，靠屏幕右边缘的中间
+ mWindowManager!!.defaultDisplay.getMetrics(metrics)
+ mWindowParams!!.x = metrics.widthPixels
+ mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()
+ mWindowManager!!.addView(mFloatLayout, mWindowParams)
+ }
+ }
+
+ fun hideFloatWindow() {
+ if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
+ }
+
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/debug/res/drawable/baseline_close_24.xml b/OCH/mogo-och-common-module/src/debug/res/drawable/baseline_close_24.xml
new file mode 100644
index 0000000000..4e93ea4883
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/debug/res/drawable/baseline_close_24.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/mogo-och-common-module/src/debug/res/drawable/common_close.xml
similarity index 59%
rename from OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml
rename to OCH/mogo-och-common-module/src/debug/res/drawable/common_close.xml
index 21b39b7e37..842a6ef471 100644
--- a/OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml
+++ b/OCH/mogo-och-common-module/src/debug/res/drawable/common_close.xml
@@ -1,5 +1,5 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/debug/res/layout/debug_view.xml b/OCH/mogo-och-common-module/src/debug/res/layout/debug_view.xml
new file mode 100644
index 0000000000..eb37de1660
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/debug/res/layout/debug_view.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt
index 1fa0e4bf57..ef94848e01 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt
@@ -10,4 +10,10 @@ fun Observable.transformTry():Observable {
.retryWhen(RetryWithTime())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
+}
+fun Observable.transformIoTry():Observable {
+ return flatMap(FRetryWithTime())
+ .retryWhen(RetryWithTime())
+ .subscribeOn(Schedulers.io())
+ .observeOn(Schedulers.io())
}
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
index 4db99d75e8..2fa555553a 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
@@ -1,11 +1,14 @@
package com.mogo.och.common.module.manager.devicemanage
import com.mogo.commons.voice.AIAssist
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
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.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg
+import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
import com.mogo.och.common.module.manager.LanSocketManager
+import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
@@ -15,7 +18,6 @@ object LightAirconditionDoorManager {
private const val TAG = "LightAirconditionDoorManager"
private var dooorSubscribe: Disposable? = null
- private var doorStatusSubscribe: Disposable? = null
fun go2OpenDoor(go2Open:Boolean){
val canOpenOrCloseDoor = canOpenOrCloseDoor()
@@ -28,47 +30,21 @@ object LightAirconditionDoorManager {
CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(0)
}
if(go2Open) {
+ if (LightAirconditionDoorStatusManager.doorStatus.isOpen) {
+ return
+ }
CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(1)
}else{
+ if (!LightAirconditionDoorStatusManager.doorStatus.isOpen) {
+ return
+ }
CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2)
}
- RxUtils.disposeSubscribe(doorStatusSubscribe)
- doorStatusSubscribe = RxUtils.createSubscribe(6000) {
- if (LightAirconditionDoorStatusManager.doorStatus.isOpen) {
- if(!go2Open) {// 关门失败
- ToastCharterUtils.showToastShort("车辆系统繁忙，稍后再试试吧～")
- VoiceNotice.showNotice(
- "车辆系统繁忙，稍后再试试吧～",
- AIAssist.LEVEL0
- )
- sendMsg2Server("车门关闭失败")
- }
- }else{
- if(go2Open) {//开门失败
- ToastCharterUtils.showToastShort("车辆系统繁忙，稍后再试试吧～")
- VoiceNotice.showNotice(
- "车辆系统繁忙，稍后再试试吧～",
- AIAssist.LEVEL0
- )
- sendMsg2Server("车门开启失败")
- }
- }
- }
- }
-
- private fun sendMsg2Server(msg:String){
- val appConnectMsg = AppConnectMsg(
- isViewShow = true,
- isPlay = false,
- msg = msg,
- boxType = 3
- )
- LanSocketManager.sendMsgToServer(appConnectMsg)
}
private fun canOpenOrCloseDoor(): String? {
val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
- return if(location.gnssSpeed<0.01){
+ return if(location.gnssSpeed<0.3){
null
}else{
"车辆行驶中不可以开关门哦～"
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt
index ec647b77f8..53a5f0425c 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt
@@ -4,9 +4,13 @@ import com.mogo.eagle.core.data.map.MogoLocation
interface IDistanceListener {
/**
- * @param distance 距离终点坐标的距离
+ * @param distance 距离终点坐标的距离(终点坐标设置错误可能为负值)
*/
fun distanceCallback(distance: Float){}
+
+ /**
+ * 两个站点之间的距离
+ */
fun stationDistanceCallback(stationDistance:Float){}
}
@@ -26,8 +30,8 @@ interface ITrajectoryListener{
interface ITrajectoryWithStationListener{
/**
- * @param routeArrivied 已经走过的坐标 第一个是站点坐标
- * @param routeArriving 没有走过的坐标 最后一个事站点坐标
+ * @param routeArrivied 已经走过的坐标 第一个是开始站点坐标
+ * @param routeArriving 没有走过的坐标 最后一个是结束站点坐标
* @param location 车的坐标
* @return
*/
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt
index 9b76dcc949..b99a200bdb 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt
@@ -7,4 +7,5 @@ data class StationAndIndex(
var index: Int?,// 坐标对应轨迹中最近的点
var distance: Float?,//轨迹中最近的点
var isNext:Boolean?,// 最近的点在轨迹中是在站点的下一个还是上一个
+ var lineId:Long?,// 站点所属轨迹 todo 未来轨迹线路id和站点线路id 分别存储
)
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
index 57ca3e400a..fa3ebe8443 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
@@ -1,7 +1,6 @@
package com.mogo.och.common.module.manager.distancemamager
import com.mogo.commons.AbsMogoApplication
-import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.data.map.MogoLocation
import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -9,7 +8,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON
import com.mogo.eagle.core.utilcode.util.CoordinateUtils
import com.mogo.eagle.core.utilcode.util.LocationUtils
@@ -17,7 +15,6 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst
import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
import com.mogo.och.common.module.manager.loopmanager.LoopInfo
import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
-import com.zhjt.service.chain.ChainLog
import io.reactivex.schedulers.Schedulers
import mogo.telematics.pad.MessagePad
import java.util.concurrent.ConcurrentHashMap
@@ -26,26 +23,38 @@ import java.util.concurrent.ConcurrentHashMap
/**
* 计算当前位置距离站点距离和走过的和未走过的轨迹点
*/
-object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
+object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener {
- private val distanceListeners: ConcurrentHashMap = ConcurrentHashMap()
- private val trajectoryListeners: ConcurrentHashMap = ConcurrentHashMap()
- private val trajectoryWithStationListeners: ConcurrentHashMap = ConcurrentHashMap()
+ private val distanceListeners: ConcurrentHashMap =
+ ConcurrentHashMap()
+ private val trajectoryListeners: ConcurrentHashMap =
+ ConcurrentHashMap()
+ private val trajectoryWithStationListeners: ConcurrentHashMap =
+ ConcurrentHashMap()
- const val TAG = "DistanceManager"
- const val TAGDISTANCE = "BusPassengerModelDistance"
+ private const val TAG = "DistanceManager"
+ private const val DISTANCE = "BusPassengerModelDistance"
fun addDistanceListener(tag: String, listener: IDistanceListener) {
- if (distanceListeners.containsKey(tag)) { return }
+ if (distanceListeners.containsKey(tag)) {
+ return
+ }
distanceListeners[tag] = listener
}
+
fun addTrajectoryListener(tag: String, listener: ITrajectoryListener) {
- if (trajectoryListeners.containsKey(tag)) { return }
+ if (trajectoryListeners.containsKey(tag)) {
+ return
+ }
trajectoryListeners[tag] = listener
}
+
+ @Suppress("unused")
fun addTrajectoryWithStationListener(tag: String, listener: ITrajectoryWithStationListener) {
- if (trajectoryWithStationListeners.containsKey(tag)) { return }
+ if (trajectoryWithStationListeners.containsKey(tag)) {
+ return
+ }
trajectoryWithStationListeners[tag] = listener
}
@@ -60,30 +69,52 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
}
-
+ /**
+ * 所有轨迹点
+ */
@Volatile
private var mRoutePoints: MutableList? = ArrayList()
- // 0-1 1-2 2-3 各个轨迹点的距离
+
+ /**
+ * 0-1 1-2 2-3 各个轨迹点的距离
+ */
+ @Volatile
private var mRoutePointsDistance: MutableList? = ArrayList()
- // 所有轨迹点距离的和
- private var maxDistanceAllPoint:Double = 0.0
+
+ /**
+ * 所有轨迹点距离的和
+ */
+ @Volatile
+ private var maxDistanceAllPoint: Double = 0.0
+
+ /**
+ * 线路Id
+ */
+ @Volatile
+ private var lineId: Long? = null
+
+ /**
+ * 结束站点
+ */
+ @Volatile
+ private var endStationInfo: StationAndIndex = StationAndIndex(null, null, null, null, null)
+
+ /**
+ * 开始站点
+ */
+ @Volatile
+ private var startStationInfo: StationAndIndex = StationAndIndex(null, null, null, null, null)
+
+ /**
+ * startStationInfo endStationInfo 站点之间的距离
+ */
private val stationDistance: ConcurrentHashMap = ConcurrentHashMap()
- @Volatile
- private var lineId:Long? = null
-
- @Volatile
- private var endStationInfo: StationAndIndex = StationAndIndex(null, null, null, null)
-
- @Volatile
- private var startStationInfo: StationAndIndex = StationAndIndex(null, null, null, null)
-
- //上一次计算最近点的缓存
+ /**
+ * 上一次(上一个tick)计算最近点的缓存
+ */
private var preCarLocationIndexInTrajectory = 0
- // TODO: 计算整个轨迹的长度
- // TODO: 计算轨迹点之间的长度、及轨迹点间最大长度
-
init {
CallerPlanningRottingListenerManager.addListener(TAG, this)
}
@@ -92,14 +123,23 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
d(M_OCHCOMMON + TAG, "onAutopilotRotting: 收到轨迹")
globalPathResp?.wayPointsList?.let {
if (it.size > 0) {
- d(M_OCHCOMMON + TAG, "收到轨迹:轨迹个数${it.size}第一个点${it[0]}最后一个点:${it.last()} 轨迹id:${globalPathResp.lineId}")
- if(globalPathResp.lineId!=null) {// 适配低版本不传递lineId
+ d(
+ M_OCHCOMMON + TAG,
+ "收到轨迹:轨迹个数${it.size}第一个点${it[0]}最后一个点:${it.last()} 轨迹id:${globalPathResp.lineId}"
+ )
+ @Suppress("SENSELESS_COMPARISON")
+ if (globalPathResp.lineId != null) {// 适配低版本不传递lineId
if (globalPathResp.lineId == lineId && !mRoutePoints.isNullOrEmpty()) {
d(M_OCHCOMMON + TAG, "重复轨迹")
startCalculateDistanceLoop()
return
}else{
- resetStation()
+ this.endStationInfo.index = null
+ this.endStationInfo.distance = null
+ this.endStationInfo.isNext = null
+ this.startStationInfo.index = null
+ this.startStationInfo.distance = null
+ this.startStationInfo.isNext = null
}
this.lineId = globalPathResp.lineId
}
@@ -122,7 +162,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
mRoutePointsDistance = ArrayList()
maxDistanceAllPoint = 0.0
mRoutePoints?.forEachIndexed { index, current ->
- if (mRoutePoints!!.last()!=current) {
+ if (mRoutePoints!!.last() != current) {
val next = mRoutePoints!![index + 1]
val distanceItem = CoordinateUtils.calculateLineDistance(
current.longitude,
@@ -136,56 +176,69 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
}
}
-
- private fun removeTempData() {
- resetStation()
- preCarLocationIndexInTrajectory = 0
- lineId = null
- }
- private fun resetStation() {
- this.endStationInfo.index = null
- this.endStationInfo.distance = null
- this.endStationInfo.isNext = null
- this.startStationInfo.index = null
- this.startStationInfo.distance = null
- this.startStationInfo.isNext = null
- }
-
- fun cleanRoutePoints() {
- mRoutePoints = null
- mRoutePointsDistance = null
- }
-
/**
* 设置或清理站点坐标
*/
- fun setStationPoint(startStationInfo: MogoLocation?,endStationInfo: MogoLocation?,lineId:Long?) {
- d(M_OCHCOMMON+ TAG,"线路id:${lineId}设置站点：开始站点${startStationInfo}、结束站点：${endStationInfo}")
+ fun setStationPoint(
+ startStationInfo: MogoLocation?,
+ endStationInfo: MogoLocation?,
+ lineId: Long?
+ ) {
+ d(
+ M_OCHCOMMON + TAG,
+ "线路id:${lineId}设置站点：开始站点${startStationInfo}、结束站点：${endStationInfo}"
+ )
if (startStationInfo == null || endStationInfo == null || lineId == -1L) {
- removeTempData()
+ this.endStationInfo.index = null
+ this.endStationInfo.distance = null
+ this.endStationInfo.isNext = null
+ this.endStationInfo.lineId = null
+ this.startStationInfo.index = null
+ this.startStationInfo.distance = null
+ this.startStationInfo.isNext = null
+ this.startStationInfo.lineId = null
+ preCarLocationIndexInTrajectory = 0
endCalculateDistanceLoop()
- cleanRoutePoints()
+ mRoutePoints = null
+ mRoutePointsDistance = null
TrajectoryCache.deleteCatcheFile()
this.endStationInfo.stationPoint = null
this.startStationInfo.stationPoint = null
this.lineId = null
stationDistance.clear()
- }else{
- if(isSameStation(this.startStationInfo.stationPoint,startStationInfo)&&
- isSameStation(this.endStationInfo.stationPoint,endStationInfo)){
- if(this.lineId!=lineId){
- resetStation()
- cleanRoutePoints()
+ } else {
+ if (isSameStation(this.startStationInfo.stationPoint, startStationInfo) &&
+ isSameStation(this.endStationInfo.stationPoint, endStationInfo)
+ ) {
+ if (this.lineId != lineId) {
+ this.endStationInfo.index = null
+ this.endStationInfo.distance = null
+ this.endStationInfo.isNext = null
+ this.endStationInfo.lineId = null
+ this.startStationInfo.index = null
+ this.startStationInfo.distance = null
+ this.startStationInfo.isNext = null
+ this.startStationInfo.lineId = null
+ mRoutePoints = null
+ mRoutePointsDistance = null
TrajectoryCache.deleteCatcheFile()
stationDistance.clear()
}
- }else{
- resetStation()
+ } else {
+ this.endStationInfo.index = null
+ this.endStationInfo.distance = null
+ this.endStationInfo.isNext = null
+ this.endStationInfo.lineId = null
+ this.startStationInfo.index = null
+ this.startStationInfo.distance = null
+ this.startStationInfo.isNext = null
+ this.startStationInfo.lineId = null
if (this.lineId == 0L || this.lineId == null) {
// 兼容老MAP 不返回轨迹id lineID
- }else {
+ } else {
if (this.lineId != lineId) {// bus 切换站点不会切线路
- cleanRoutePoints()
+ mRoutePoints = null
+ mRoutePointsDistance = null
TrajectoryCache.deleteCatcheFile()
}
}
@@ -198,11 +251,11 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
}
}
- private fun isSameStation(stationOne: MogoLocation?,stationTwo: MogoLocation?):Boolean{
- if(stationOne==null||stationTwo==null){
+ private fun isSameStation(stationOne: MogoLocation?, stationTwo: MogoLocation?): Boolean {
+ if (stationOne == null || stationTwo == null) {
return false
}
- if(stationOne.longitude==stationTwo.longitude&&stationOne.latitude==stationTwo.latitude){
+ if (stationOne.longitude == stationTwo.longitude && stationOne.latitude == stationTwo.latitude) {
return true
}
return false
@@ -220,7 +273,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
endCalculateDistanceLoop()
return
}
- if(it.latitude==0.0&&it.longitude==0.0){
+ if (it.latitude == 0.0 && it.longitude == 0.0) {
return
}
calculateRouteSumLength(it)
@@ -230,11 +283,12 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
/**
* 暂停路距计算
*/
- fun suspendCalculate(){
+ fun suspendCalculate() {
endCalculateDistanceLoop()
}
- fun reStartCalculate(){
+ @Suppress("unused")
+ fun reStartCalculate() {
startCalculateDistanceLoop()
}
@@ -242,9 +296,14 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
* 启动路距计算
*/
private fun startCalculateDistanceLoop() {
- BizLoopManager.setLoopFunction(TAGDISTANCE, LoopInfo(1, ::calculateDistance,
- scheduler = Schedulers.computation()
- ))
+ BizLoopManager.setLoopFunction(
+ DISTANCE,
+ LoopInfo(
+ 1,
+ ::calculateDistance,
+ scheduler = Schedulers.computation()
+ )
+ )
d(M_OCHCOMMON + TAG, "开始路距计算")
}
@@ -252,7 +311,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
* 结束启动路距计算
*/
private fun endCalculateDistanceLoop() {
- BizLoopManager.removeLoopFunction(TAGDISTANCE)
+ BizLoopManager.removeLoopFunction(DISTANCE)
d(M_OCHCOMMON + TAG, "结束路距计算")
}
@@ -262,7 +321,8 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
location: MogoLocation,
) {
val autoPilotState = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state
- val locationInfo = "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading} 当前速度:${location.gnssSpeed}"
+ val locationInfo =
+ "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading} 当前速度:${location.gnssSpeed}"
if (mRoutePoints.isNullOrEmpty()) return
// 计算起始站点在轨迹中的信息 这个是一个常量
if (startStationInfo.stationPoint != null
@@ -272,14 +332,20 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
) {
//要前往的站在轨迹中对应的点的信息
val startStationInfo = CoordinateCalculateRouteUtil.getNearestPointInfo(
- preCarLocationIndexInTrajectory, mRoutePoints!!.size,mRoutePoints!!, startStationInfo.stationPoint!!,1, useHeading = false
+ preCarLocationIndexInTrajectory,
+ mRoutePoints!!.size,
+ mRoutePoints!!,
+ startStationInfo.stationPoint!!,
+ 1,
+ useHeading = false
)
this.startStationInfo.isNext = startStationInfo.second
this.startStationInfo.index = startStationInfo.first
this.startStationInfo.distance = startStationInfo.third
preCarLocationIndexInTrajectory = startStationInfo.first
- val calculateData = "距离起始站点最近的点:${startStationInfo.first} 点在站的后面:${startStationInfo.second} 距离点的距离：${startStationInfo.third}"
- writeLog(calculateData,locationInfo)
+ val calculateData =
+ "距离起始站点最近的点:${startStationInfo.first} 点在站的后面:${startStationInfo.second} 距离点的距离：${startStationInfo.third}"
+ writeLog(calculateData, locationInfo)
}
// 计算结束站点在轨迹中的信息 这个是一个常量可以缓存
@@ -290,18 +356,24 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
) {
//要前往的站在轨迹中对应的点
val endStationInfo = CoordinateCalculateRouteUtil.getNearestPointInfo(
- preCarLocationIndexInTrajectory,mRoutePoints!!.size, mRoutePoints!!, endStationInfo.stationPoint!!,3, useHeading = false
+ preCarLocationIndexInTrajectory,
+ mRoutePoints!!.size,
+ mRoutePoints!!,
+ endStationInfo.stationPoint!!,
+ 3,
+ useHeading = false
)
this.endStationInfo.isNext = endStationInfo.second
this.endStationInfo.index = endStationInfo.first
this.endStationInfo.distance = endStationInfo.third
- val calculateData = "距离结束站点最近的点:${endStationInfo.first} 点在站的后面:${endStationInfo.second} 距离点的距离：${endStationInfo.third}"
+ val calculateData =
+ "距离结束站点最近的点:${endStationInfo.first} 点在站的后面:${endStationInfo.second} 距离点的距离：${endStationInfo.third}"
writeLog(calculateData, locationInfo)
}
try {
if (endStationInfo.stationPoint != null
- && endStationInfo.isNext!= null
+ && endStationInfo.isNext != null
&& endStationInfo.index != null
&& endStationInfo.distance != null
&& startStationInfo.stationPoint != null
@@ -311,39 +383,43 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
) {
calculateStationDistance()
}
- }catch (e:Exception){
- e(M_OCHCOMMON+ TAG,"计算两个站点间的距离")
+ } catch (e: Exception) {
+ e(M_OCHCOMMON + TAG, "计算两个站点间的距离")
}
- val carLocationInfo:Triple
- if(endStationInfo.isNext==true){
+ val carLocationInfo: Triple = if (endStationInfo.isNext == true) {
// 计算车的位置在轨迹中的信息 这个是一个变量可以缓存
- carLocationInfo = CoordinateCalculateRouteUtil.getNearestPointInfo(
- preCarLocationIndexInTrajectory,endStationInfo.index!!, mRoutePoints!!, location,2
+ CoordinateCalculateRouteUtil.getNearestPointInfo(
+ preCarLocationIndexInTrajectory, endStationInfo.index!!, mRoutePoints!!, location, 2
)
- }else{
- carLocationInfo = CoordinateCalculateRouteUtil.getNearestPointInfo(
- preCarLocationIndexInTrajectory,endStationInfo.index!!+1, mRoutePoints!!, location,2
+ } else {
+ CoordinateCalculateRouteUtil.getNearestPointInfo(
+ preCarLocationIndexInTrajectory,
+ endStationInfo.index!! + 1,
+ mRoutePoints!!,
+ location,
+ 2
)
}
- val calculateData = "距离轨迹点最近的点:${carLocationInfo.first} 点在站的后面:${carLocationInfo.second} 距离点的距离：${carLocationInfo.third}"
+ val calculateData =
+ "距离轨迹点最近的点:${carLocationInfo.first} 点在站的后面:${carLocationInfo.second} 距离点的距离：${carLocationInfo.third}"
writeLog(calculateData, locationInfo)
- if(carLocationInfo.second==null||carLocationInfo.third>1_000){
+ if (carLocationInfo.second == null || carLocationInfo.third > 1_000) {
preCarLocationIndexInTrajectory = 0
return
}
var maxDisatance = 0.0f
- if(carLocationInfo.second==true){
- if(carLocationInfo.first>0) {
- maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first - 1)?:0f
+ if (carLocationInfo.second == true) {
+ if (carLocationInfo.first > 0) {
+ maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first - 1) ?: 0f
}
- }else{
- maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first)?:0f
+ } else {
+ maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first) ?: 0f
}
- if(carLocationInfo.third>maxDisatance){
+ if (carLocationInfo.third > maxDisatance) {
preCarLocationIndexInTrajectory = 0
- writeLog("到点的距离${carLocationInfo.third},最大距离${maxDisatance}",locationInfo)
+ writeLog("到点的距离${carLocationInfo.third},最大距离${maxDisatance}", locationInfo)
return
}
@@ -351,28 +427,28 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
// 距离回调
try {
- if(distanceListeners.size>0) {
- invokeDistance(carLocationInfo, location,locationInfo)
+ if (distanceListeners.size > 0) {
+ invokeDistance(carLocationInfo, location, locationInfo)
}
- }catch (e:Exception){
- e(M_OCHCOMMON+ TAG,"距离计算错误")
+ } catch (e: Exception) {
+ e(M_OCHCOMMON + TAG, "距离计算错误")
}
// 不带站点轨迹回调
try {
- if(trajectoryListeners.size>0) {
+ if (trajectoryListeners.size > 0) {
invokeTrajectory(carLocationInfo, location)
}
- }catch (e:Exception){
- e(M_OCHCOMMON+ TAG,"轨迹线(轨迹两头)计算错误")
+ } catch (e: Exception) {
+ e(M_OCHCOMMON + TAG, "轨迹线(轨迹两头)计算错误")
}
// 只展示站点之间轨迹
try {
- if(trajectoryWithStationListeners.size>0) {
+ if (trajectoryWithStationListeners.size > 0) {
invokeTrajectoryWithStation(carLocationInfo, location)
}
- }catch (e:Exception){
- e(M_OCHCOMMON+ TAG,"轨迹线(站点两头)计算错误")
+ } catch (e: Exception) {
+ e(M_OCHCOMMON + TAG, "轨迹线(站点两头)计算错误")
}
}
@@ -381,14 +457,14 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
* 计算站点间距离
*/
private fun calculateStationDistance() {
- var lastSumLength = 0f
+ var lastSumLength: Float
val key = getKey()
- if (stationDistance[key] !=null) {
+ if (stationDistance[key] != null) {
return
}
- val stationIndex = endStationInfo.index?:0
- if (startStationInfo.index!! < stationIndex-1) {
+ val stationIndex = endStationInfo.index ?: 0
+ if (startStationInfo.index!! < stationIndex - 1) {
// subList 是[) 需要的是[]
val subList = mRoutePoints!!.subList(startStationInfo.index!!, stationIndex + 1)
// 轨迹点所有的距离
@@ -399,7 +475,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
} else {// isNext = false
lastSumLength += stationDistance
}
- if (startStationInfo.isNext==true) {// 是否是下一个 true 下一个
+ if (startStationInfo.isNext == true) {// 是否是下一个 true 下一个
lastSumLength += startStationInfo.distance!!
} else {
lastSumLength -= startStationInfo.distance!!
@@ -411,10 +487,10 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
lastPoints!!.longitude, lastPoints.latitude
)
}
- d(M_OCHCOMMON+ TAG,"两站点距离：$lastSumLength")
+ d(M_OCHCOMMON + TAG, "两站点距离：$lastSumLength")
stationDistance[key] = lastSumLength
- if(distanceListeners.size>0) {
+ if (distanceListeners.size > 0) {
distanceListeners.forEach {
//val tag = it.key
val listener = it.value
@@ -427,16 +503,18 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
return "${startStationInfo.stationPoint!!.longitude}${startStationInfo.stationPoint!!.latitude}${endStationInfo.stationPoint!!.longitude}${endStationInfo.stationPoint!!.latitude}"
}
-
+ /**
+ * 到结束站点的距离 站点设置错误可能为负值
+ */
private fun invokeDistance(
carLocationInfo: Triple,
location: MogoLocation,
locationInfo: String
- ){
- var lastSumLength = 0f
+ ) {
+ var lastSumLength: Float
- val stationIndex = endStationInfo.index?:0
- if (carLocationInfo.first < stationIndex-1) {
+ val stationIndex = endStationInfo.index ?: 0
+ if (carLocationInfo.first < stationIndex - 1) {
// subList 是[) 需要的是[]
val subList = mRoutePoints!!.subList(carLocationInfo.first, stationIndex + 1)
// 轨迹点所有的距离
@@ -455,17 +533,17 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
} else {
val lastPoints = endStationInfo.stationPoint
lastSumLength = CoordinateUtils.calculateLineDistance(
- lastPoints!!.longitude, lastPoints!!.latitude,
+ lastPoints!!.longitude, lastPoints.latitude,
location.longitude, location.latitude
)
}
- d(M_OCHCOMMON+ TAG,"距离终点：$lastSumLength")
- if(lastSumLength>maxDistanceAllPoint){
+ d(M_OCHCOMMON + TAG, "距离终点：$lastSumLength")
+ if (lastSumLength > maxDistanceAllPoint) {
// 大于最大值需要需要删除此次计算
- writeLog("距离终点：$lastSumLength",locationInfo)
+ writeLog("距离终点：$lastSumLength", locationInfo)
return
}
- if(distanceListeners.size>0) {
+ if (distanceListeners.size > 0) {
distanceListeners.forEach {
//val tag = it.key
val listener = it.value
@@ -474,6 +552,12 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
}
}
+ /**
+ * 计算站点之间的轨迹(从轨迹起点算起到轨迹结束点结束)
+ * routeArrivied 已经走过的轨迹点
+ * routeArriving 还没有走过的轨迹
+ * location 车的轨迹点
+ */
private fun invokeTrajectory(
carLocationInfo: Triple,
location: MogoLocation
@@ -481,15 +565,15 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
if (mRoutePoints.isNullOrEmpty()) return
val routeArrivied = mutableListOf()
val routeArriving = mutableListOf()
- if(carLocationInfo.second==true){// isNext = true
- routeArrivied.addAll(mRoutePoints!!.subList(0,carLocationInfo.first))
- routeArriving.addAll(mRoutePoints!!.subList(carLocationInfo.first,mRoutePoints!!.size))
- }else{// isNext = false
- val indexNext = carLocationInfo.first+1
- routeArrivied.addAll(mRoutePoints!!.subList(0,indexNext))
- routeArriving.addAll(mRoutePoints!!.subList(indexNext,mRoutePoints!!.size))
+ if (carLocationInfo.second == true) {// isNext = true
+ routeArrivied.addAll(mRoutePoints!!.subList(0, carLocationInfo.first))
+ routeArriving.addAll(mRoutePoints!!.subList(carLocationInfo.first, mRoutePoints!!.size))
+ } else {// isNext = false
+ val indexNext = carLocationInfo.first + 1
+ routeArrivied.addAll(mRoutePoints!!.subList(0, indexNext))
+ routeArriving.addAll(mRoutePoints!!.subList(indexNext, mRoutePoints!!.size))
}
- if(trajectoryListeners.size>0) {
+ if (trajectoryListeners.size > 0) {
trajectoryListeners.forEach {
//val tag = it.key
val listener = it.value
@@ -498,6 +582,12 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
}
}
+ /**
+ * 计算站点之间的轨迹(从开始站点算起到结束站点)
+ * routeArrivied 已经走过的轨迹点
+ * routeArriving 还没有走过的轨迹
+ * location 车的轨迹点
+ */
private fun invokeTrajectoryWithStation(
carLocationInfo: Triple,
location: MogoLocation
@@ -512,10 +602,10 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
&& startStationInfo.index != null
&& startStationInfo.distance != null
) {
- if(startStationInfo.isNext==true){
+ if (startStationInfo.isNext == true) {
fromCut = startStationInfo.index!!
- }else{
- fromCut = startStationInfo.index!!+1
+ } else {
+ fromCut = startStationInfo.index!! + 1
}
}
@@ -524,25 +614,25 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
&& endStationInfo.index != null
&& endStationInfo.distance != null
) {
- if(endStationInfo.isNext==true){
+ if (endStationInfo.isNext == true) {
endCut = endStationInfo.index!!
- }else{
- endCut = endStationInfo.index!!+1
+ } else {
+ endCut = endStationInfo.index!! + 1
}
}
- d(M_OCHCOMMON+ TAG,"根据站点切个：第一个点：$fromCut 最后一个点$endCut")
- if(carLocationInfo.second==true){// isNext = true
- routeArrivied.addAll(mRoutePoints!!.subList(fromCut,carLocationInfo.first))
- routeArriving.addAll(mRoutePoints!!.subList(carLocationInfo.first,endCut))
- }else{// isNext = false
- val indexNext = carLocationInfo.first+1
- routeArrivied.addAll(mRoutePoints!!.subList(fromCut,indexNext))
- routeArriving.addAll(mRoutePoints!!.subList(indexNext,endCut))
+ d(M_OCHCOMMON + TAG, "根据站点切个：第一个点：$fromCut 最后一个点$endCut")
+ if (carLocationInfo.second == true) {// isNext = true
+ routeArrivied.addAll(mRoutePoints!!.subList(fromCut, carLocationInfo.first))
+ routeArriving.addAll(mRoutePoints!!.subList(carLocationInfo.first, endCut))
+ } else {// isNext = false
+ val indexNext = carLocationInfo.first + 1
+ routeArrivied.addAll(mRoutePoints!!.subList(fromCut, indexNext))
+ routeArriving.addAll(mRoutePoints!!.subList(indexNext, endCut))
}
routeArrivied.add(0, startStationInfo.stationPoint!!)
routeArriving.add(endStationInfo.stationPoint!!)
- if(trajectoryWithStationListeners.size>0) {
+ if (trajectoryWithStationListeners.size > 0) {
trajectoryWithStationListeners.forEach {
//val tag = it.key
val listener = it.value
@@ -551,23 +641,61 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
}
}
-// @ChainLog(
+ // @ChainLog(
// linkChainLog = ChainConstant.CHAIN_TYPE_OCH,
// linkCode = ChainConstant.CHAIN_SOURCE_OCH,
// nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE,
// paramIndexes = [0,1]
// )
private fun writeLog(carLocationInfo: String, location: String) {
- d(M_OCHCOMMON+ TAG,carLocationInfo)
- d(M_OCHCOMMON+ TAG,location)
+ d(M_OCHCOMMON + TAG, carLocationInfo)
+ d(M_OCHCOMMON + TAG, location)
}
+ /**
+ * 返回空为可启动自驾
+ * 返回其他不可启动自驾 返回为原因
+ */
+ fun canStartAutopilot(lineId: Long?): String {
+ if (lineId == null) {
+ return "请确认线路ID"
+ }
+
+ try {
+ if (mRoutePoints.isNullOrEmpty()) {
+ // 判断距离起始站的距离
+ // 没有收到过轨迹
+ // 收到过轨迹 且底盘没有在自动驾驶中(没办法申请轨迹) 自驾中重启底盘的形式
+ val redCatche = TrajectoryCache.redCatche(lineId.toString())
+ return if (redCatche.isNullOrEmpty()) {
+ distanceWithStartStation()
+ } else {
+ distanceWithTrajectory(redCatche)
+ }
+
+ } else {
+ return if (this.lineId == 0L || this.lineId == null) {
+ distanceWithTrajectory(mRoutePoints!!)
+ } else {
+ if (lineId != this.lineId) {
+ // 判断距离起始站的距离
+ distanceWithStartStation()
+ } else {
+ distanceWithTrajectory(mRoutePoints!!)
+ }
+ }
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ return ""
+ }
/**
* 距离站点的距离
*/
- private fun distanceWithStartStation():String{
- if (startStationInfo.stationPoint==null) {
+ private fun distanceWithStartStation(): String {
+ if (startStationInfo.stationPoint == null) {
return "请选择起始结束站点"
}
val currentPoint = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
@@ -577,9 +705,9 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
startStationInfo.stationPoint!!.longitude,
startStationInfo.stationPoint!!.latitude
)
- return if(distance <= OchCommonConst.AUTOMATIC_PLANNING_MAX_DISTANCE){
+ return if (distance <= OchCommonConst.AUTOMATIC_PLANNING_MAX_DISTANCE) {
""
- }else{
+ } else {
"距离起始站点过远：${distance}米"
}
}
@@ -641,44 +769,4 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
}
}
-
- /**
- * 返回空为可启动自驾
- * 返回其他不可启动自驾 返回为原因
- */
- fun canStartAutopilot(lineId: Long?):String{
- if(lineId==null){
- return "请确认线路ID"
- }
-
- try {
- if(mRoutePoints.isNullOrEmpty()){
- // 判断距离起始站的距离
- // 没有收到过轨迹
- // 收到过轨迹 且底盘没有在自动驾驶中(没办法申请轨迹) 自驾中重启底盘的形式
- val redCatche = TrajectoryCache.redCatche(lineId.toString())
- return if(redCatche.isNullOrEmpty()){
- distanceWithStartStation()
- }else{
- distanceWithTrajectory(redCatche)
- }
-
- }else {
- return if (this.lineId == 0L || this.lineId == null) {
- distanceWithTrajectory(mRoutePoints!!)
- } else {
- if (lineId != this.lineId) {
- // 判断距离起始站的距离
- distanceWithStartStation()
- } else {
- distanceWithTrajectory(mRoutePoints!!)
- }
- }
- }
- }catch (e:Exception){
- e.printStackTrace()
- }
- return ""
- }
-
}
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/OCHPlanningActionsCallback.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/OCHPlanningActionsCallback.kt
new file mode 100644
index 0000000000..558504a408
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/OCHPlanningActionsCallback.kt
@@ -0,0 +1,5 @@
+package com.mogo.och.common.module.manager.stopsidemanager
+
+interface OCHPlanningActionsCallback {
+ fun onStartAutopilotFailure(actionStatus: StopSideStatus, stopSideStatus : Boolean?, errorInfo : String?)
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/StopSideStatusManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt
similarity index 76%
rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/StopSideStatusManager.kt
rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt
index e0f6e39b0a..f67668de5d 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/StopSideStatusManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt
@@ -1,13 +1,14 @@
-package com.mogo.och.common.module.manager
+package com.mogo.och.common.module.manager.stopsidemanager
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import mogo.telematics.pad.MessagePad
import java.util.concurrent.ConcurrentHashMap
-object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
+object StopSideManager : IMoGoAutopilotPlanningActionsListener {
private const val TAG = "OCHPlanningActionsManager"
init {
@@ -15,7 +16,7 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
CallerPlanningActionsListenerManager.setListenerHz(TAG,5)
}
- var stopSiteStatus = Status.NOTHING
+ var stopSiteStatus = StopSideStatus.NOTHING
val M_LISTENERS: ConcurrentHashMap = ConcurrentHashMap()
@@ -50,6 +51,16 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
}
}
+ fun stopSide(){
+ // 靠边停车
+ CallerAutoPilotControlManager.sendPlanningCmd(1)
+ }
+
+ fun resetStopSide(){
+ // 重新起步
+ CallerAutoPilotControlManager.sendPlanningCmd(2)
+ }
+
override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) {
@@ -63,15 +74,15 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
- if(stopSiteStatus == Status.START){
+ if(stopSiteStatus == StopSideStatus.START){
// 靠边停车中
CallerLogger.d(SceneConstant.M_BUS+ TAG,"靠边停车中")
- listener.onStartAutopilotFailure(Status.DOING,null,null)
+ listener.onStartAutopilotFailure(StopSideStatus.DOING,null,null)
}else{
// 开始靠边停车
- stopSiteStatus = Status.START
+ stopSiteStatus = StopSideStatus.START
CallerLogger.d(SceneConstant.M_BUS+ TAG,"开始靠边停车")
- listener.onStartAutopilotFailure(Status.START,null,null)
+ listener.onStartAutopilotFailure(StopSideStatus.START,null,null)
}
}
}
@@ -80,12 +91,12 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
- if(stopSiteStatus == Status.EndingSuccess){
+ if(stopSiteStatus == StopSideStatus.EndingSuccess){
// 只响应第一次
}else{
- stopSiteStatus = Status.EndingSuccess
+ stopSiteStatus = StopSideStatus.EndingSuccess
CallerLogger.d(SceneConstant.M_BUS+ TAG,"靠边停车成功")
- listener.onStartAutopilotFailure(Status.EndingSuccess,true,null)
+ listener.onStartAutopilotFailure(StopSideStatus.EndingSuccess,true,null)
}
}
@@ -95,12 +106,12 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
- if(stopSiteStatus==Status.EndingFaile){
+ if(stopSiteStatus == StopSideStatus.EndingFaile){
// 只响应第一次
}else{
- stopSiteStatus = Status.EndingFaile
+ stopSiteStatus = StopSideStatus.EndingFaile
CallerLogger.d(SceneConstant.M_BUS+ TAG,"靠边停车失败")
- listener.onStartAutopilotFailure(Status.EndingFaile,false,null)
+ listener.onStartAutopilotFailure(StopSideStatus.EndingFaile,false,null)
}
}
@@ -115,12 +126,12 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
- if(stopSiteStatus==Status.NOSTART){
+ if(stopSiteStatus == StopSideStatus.NOSTART){
// 只响应第一次
}else{
- stopSiteStatus = Status.NOSTART
+ stopSiteStatus = StopSideStatus.NOSTART
CallerLogger.d(SceneConstant.M_BUS+ TAG,"靠边停车失败_原因：距离前方站点100m")
- listener.onStartAutopilotFailure(Status.NOSTART,false,"距离前方站点100m,请稍后再试")
+ listener.onStartAutopilotFailure(StopSideStatus.NOSTART,false,"距离前方站点100m,请稍后再试")
}
}
}
@@ -130,12 +141,12 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
- if(stopSiteStatus==Status.NOSTART){
+ if(stopSiteStatus == StopSideStatus.NOSTART){
// 只响应第一次
}else{
- stopSiteStatus = Status.NOSTART
+ stopSiteStatus = StopSideStatus.NOSTART
CallerLogger.d(SceneConstant.M_BUS+ TAG,"靠边停车失败_原因：距离路口100m,请稍后再试")
- listener.onStartAutopilotFailure(Status.NOSTART,false,"距离路口100m,请稍后再试")
+ listener.onStartAutopilotFailure(StopSideStatus.NOSTART,false,"距离路口100m,请稍后再试")
}
}
}
@@ -144,12 +155,12 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
- if(stopSiteStatus==Status.NOSTART){
+ if(stopSiteStatus == StopSideStatus.NOSTART){
// 只响应第一次
}else{
- stopSiteStatus = Status.NOSTART
+ stopSiteStatus = StopSideStatus.NOSTART
CallerLogger.d(SceneConstant.M_BUS+ TAG,"靠边停车失败_原因：正在变道")
- listener.onStartAutopilotFailure(Status.NOSTART,false,"因车辆正在变道无法靠边停车,请稍后再试")
+ listener.onStartAutopilotFailure(StopSideStatus.NOSTART,false,"因车辆正在变道无法靠边停车,请稍后再试")
}
}
}
@@ -159,39 +170,26 @@ object StopSideStatusManager : IMoGoAutopilotPlanningActionsListener {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
- if(stopSiteStatus==Status.NOSTART){
+ if(stopSiteStatus == StopSideStatus.NOSTART){
// 只响应第一次
}else{
- stopSiteStatus = Status.NOSTART
+ stopSiteStatus = StopSideStatus.NOSTART
CallerLogger.d(SceneConstant.M_BUS+ TAG,"靠边停车失败_原因：未知问题")
- listener.onStartAutopilotFailure(Status.NOSTART,false,"靠边停车失败,请稍后再试")
+ listener.onStartAutopilotFailure(StopSideStatus.NOSTART,false,"靠边停车失败,请稍后再试")
}
}
}
}
}
MessagePad.ParkScenarioDrivingState.PARK_SENARIO_LANKE_KEEP ->{
- if(stopSiteStatus==Status.NOTHING){
+ if(stopSiteStatus == StopSideStatus.NOTHING){
// 只响应第一次
}else{
- stopSiteStatus = Status.NOTHING
+ stopSiteStatus = StopSideStatus.NOTHING
CallerLogger.d(SceneConstant.M_BUS+ TAG,"进入正常驾驶")
}
}
else -> {}
}
}
-
- enum class Status(){
- START(),// 开始靠边停车
- DOING(),// 正在靠边停车
- EndingSuccess(),// 靠边停车成功
- EndingFaile(),// 靠边停车失败
- NOSTART(),// 没有响应靠边停车
- NOTHING()// 默认状态
- }
-
- interface OCHPlanningActionsCallback {
- fun onStartAutopilotFailure(actionStatus:Status,stopSideStatus : Boolean?, errorInfo : String?)
- }
}
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideStatus.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideStatus.kt
new file mode 100644
index 0000000000..87d60dfdb0
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideStatus.kt
@@ -0,0 +1,10 @@
+package com.mogo.och.common.module.manager.stopsidemanager
+
+enum class StopSideStatus {
+ START(),// 开始靠边停车
+ DOING(),// 正在靠边停车
+ EndingSuccess(),// 靠边停车成功
+ EndingFaile(),// 靠边停车失败
+ NOSTART(),// 没有响应靠边停车
+ NOTHING()// 默认状态
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
index bf1bc8d602..498a9ef234 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
@@ -74,15 +74,15 @@ object VoiceManager {
}
fun surplus5min(){
- surplus5min(null)
+ surplus15min(null)
}
- fun surplus5min(callBack: IMogoTTSCallback?=null) {
+ fun surplus15min(callBack: IMogoTTSCallback?=null) {
val contenxt = AbsMogoApplication.getApp()
val list: MutableList = ArrayList()
- val chineseTTS = LangTtsEntity(contenxt.getString(R.string.surplus5_order_zh), LanguageType.CHINESE)
- val engTTS = LangTtsEntity(contenxt.getString(R.string.surplus5_order_en), LanguageType.ENGLISH)
- val koreanTTS = LangTtsEntity(contenxt.getString(R.string.surplus5_order_ko), LanguageType.KOREAN)
+ val chineseTTS = LangTtsEntity(contenxt.getString(R.string.surplus15_order_zh), LanguageType.CHINESE)
+ val engTTS = LangTtsEntity(contenxt.getString(R.string.surplus15_order_en), LanguageType.ENGLISH)
+ val koreanTTS = LangTtsEntity(contenxt.getString(R.string.surplus15_order_ko), LanguageType.KOREAN)
list.add(chineseTTS)
list.add(engTTS)
list.add(koreanTTS)
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt
index 932b1632f7..751d21222e 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt
@@ -5,9 +5,13 @@ import android.view.View
import androidx.annotation.StringRes
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+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.ActivityUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
import me.jessyan.autosize.utils.AutoSizeUtils
object ToastCharterUtils {
@@ -17,22 +21,28 @@ object ToastCharterUtils {
@JvmStatic
fun showToastLong(toastText: String){
- if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
- showCharterLongToast(toastText)
- }else{
- ToastUtils.showLong(toastText)
- }
+ CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG,"showToastLong吐司内容：${toastText}")
+ UiThreadHandler.post( {
+ if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
+ showCharterLongToast(toastText)
+ }else{
+ ToastUtils.showLong(toastText)
+ }
+ }, UiThreadHandler.MODE.QUEUE)
}
@JvmStatic
fun showToastShort(toastText: String?){
- toastText?.let {
- if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
- showCharterShortToast(toastText)
- }else{
- ToastUtils.showShort(toastText)
+ CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG,"showToastShort吐司内容：${toastText}")
+ UiThreadHandler.post( {
+ toastText?.let {
+ if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
+ showCharterShortToast(toastText)
+ }else{
+ ToastUtils.showShort(toastText)
+ }
}
- }
+ }, UiThreadHandler.MODE.QUEUE)
}
@JvmStatic
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png
deleted file mode 100644
index ba8d48e24a..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png
deleted file mode 100644
index 1728ad0b4a..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png
old mode 100644
new mode 100755
index b0c8eb25ba..00b42eff51
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png
deleted file mode 100644
index 1cf6ad1798..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png
deleted file mode 100644
index a477bcd438..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png
deleted file mode 100644
index 65884ac663..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png
deleted file mode 100644
index 4e4cf034ba..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png
deleted file mode 100644
index b820701bb9..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png
deleted file mode 100644
index ae7623ede6..0000000000
Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png and /dev/null differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml
deleted file mode 100644
index e84f3b901b..0000000000
--- a/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-