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

修改类文件名称大小写问题2

Browse Source 
Signed-off-by: 董宏宇 <martindhy@gmail.com>
This commit is contained in:
董宏宇
2021-10-18 20:01:06 +08:00
parent cf9767436f
commit b31f2b64c7
36 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotsProvider.kt → core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
View File

@@ -2,10 +2,10 @@ package com.mogo.eagle.core.function.autopilot
import android.content.Context
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdPam
import com.mogo.eagle.core.data.autopilot.AutopilotControlPam
import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdParameter
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsProvider
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.LogUtils
import com.zhidao.support.adas.high.AdasManager
@@ -16,8 +16,8 @@ import com.zhidao.support.adas.high.AdasManager
* 域控制器
*/
@Route(path = MogoServicePaths.PATH_AUTO_PILOT)
class MoGoAutopilotsProvider :
IMoGoAutopilotsProvider {
class MoGoAutopilotProvider :
IMoGoAutopilotProvider {
private val TAG = "MoGoAutoPilotProvider"
override val functionName: String
@@ -37,10 +37,10 @@ class MoGoAutopilotsProvider :
}
override fun startAutoPilot(result: AutopilotControlPam) {
override fun startAutoPilot(result: AutopilotControlParameters) {
if (AdasManager.getInstance().isSocketConnect) {
val parameter =
AutopilotControlCmdPam(
AutopilotControlCmdParameter(
TAG,
result
)

12
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -11,7 +11,7 @@ import com.mogo.eagle.core.data.autopilot.*
import com.mogo.eagle.core.data.constants.MoGoConfig
import com.mogo.eagle.core.data.obu.ObuStatusInfo
import com.mogo.eagle.core.data.traffic.TrafficData
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -38,7 +38,7 @@ class DebugSettingView @JvmOverloads constructor(
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener,
IMoGoAutopilotsStatusListener {
IMoGoAutopilotStatusListener {
private val TAG = "DebugSettingView"
@@ -107,11 +107,11 @@ class DebugSettingView @JvmOverloads constructor(
tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
}
override fun onAutopilotStatusResponse(autoPilotStatussInfo: AutopilotStatussInfo) {
tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatussInfo)
override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo)
}
override fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationsInfo?) {
override fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationInfo?) {
}
@@ -135,7 +135,7 @@ class DebugSettingView @JvmOverloads constructor(
}
override fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) {
override fun onAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) {
}

12
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
View File

@@ -5,8 +5,8 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.data.autopilot.AutopilotControlPam
import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo
import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.util.LogUtils
@@ -68,10 +68,10 @@ class AutoPilotStatusView @JvmOverloads constructor(
}
private fun startAutoPilot() {
val currentAutopilot =
AutopilotControlPam()
AutopilotControlParameters()
currentAutopilot.isSpeakVoice = false
currentAutopilot.startLatLon = AutopilotControlPam.AutoPilotLonLat(40.199157289445921,116.73675895051454);
currentAutopilot.endLatLon = AutopilotControlPam.AutoPilotLonLat(40.199255159538758,116.73274535677977);
currentAutopilot.startLatLon = AutopilotControlParameters.AutoPilotLonLat(40.199157289445921,116.73675895051454);
currentAutopilot.endLatLon = AutopilotControlParameters.AutoPilotLonLat(40.199255159538758,116.73274535677977);
currentAutopilot.vehicleType = 10
MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot)
}
@@ -103,7 +103,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
}
}
override fun onArriveAt(data: AutopilotStationsInfo?) {
override fun onArriveAt(data: AutopilotStationInfo?) {
}

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
View File

@@ -25,7 +25,7 @@
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.widget.AutoPilotStatusView
android:id="@+id/autopilotStatusBean"
android:id="@+id/autopilotStatus"
android:layout_width="@dimen/module_mogo_autopilot_status_bg_width"
android:layout_height="@dimen/module_mogo_autopilot_status_bg_height"
android:layout_marginTop="@dimen/module_mogo_autopilot_status_margin_top"

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotWarnMessage.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotWarnMessage.java
View File

@@ -7,7 +7,7 @@ package com.mogo.eagle.core.data.autopilot;
* <p>
* 描述
*/
public class AutopilotWarnMessage {
public class AutoPilotWarnMessage {
public String content;
public String level;

4
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdPam.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdParameter.java
View File

@@ -8,12 +8,12 @@ package com.mogo.eagle.core.data.autopilot;
* 域控制器 控制指令发送
*
*/
public class AutopilotControlCmdPam {
public class AutopilotControlCmdParameter {
public String action;
public Object result;
public AutopilotControlCmdPam(String action, Object result) {
public AutopilotControlCmdParameter(String action, Object result) {
this.action = action;
this.result = result;
}

4
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlPam.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.java
View File

@@ -9,7 +9,7 @@ import java.util.List;
* 启动自动驾驶参数
*
*/
public class AutopilotControlPam {
public class AutopilotControlParameters {
public AutoPilotLonLat startLatLon;
public List<AutoPilotLonLat> wayLatLons;
@@ -44,7 +44,7 @@ public class AutopilotControlPam {
@Override
public String toString() {
return "RemoteControlAutoPilotParameters{" +
return "AutopilotControlParameters{" +
"startLatLon=" + startLatLon +
", wayLatLons=" + wayLatLons +
", endLatLon=" + endLatLon +

4
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationsInfo.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java
View File

@@ -7,13 +7,13 @@ package com.mogo.eagle.core.data.autopilot;
* 自动驾驶网约车回调数据
*
*/
public class AutopilotStationsInfo {
public class AutopilotStationInfo {
private int type;
private double lon;
private double lat;
public AutopilotStationsInfo(int type, double lon, double lat) {
public AutopilotStationInfo(int type, double lon, double lat) {
this.type = type;
this.lon = lon;
this.lat = lat;

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusBean.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatus.java
View File

@@ -7,7 +7,7 @@ import java.io.Serializable;
* @des
* @date 2020/7/14
*/
public class AutopilotStatusBean implements Serializable {
public class AutopilotStatus implements Serializable {
/**
* action : autopilotstate

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatussInfo.kt → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
View File

@@ -9,7 +9,7 @@ import java.io.Serializable
* 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
*
*/
class AutopilotStatussInfo : Serializable {
class AutopilotStatusInfo : Serializable {
/**
* 当前链接的IP地址, 默认地址 192.168.1.102
*/

6
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsProvider.java → core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.java
View File

@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.api.autopilot;
import com.mogo.eagle.core.data.autopilot.AutopilotControlPam;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider;
/**
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider;
* 自动驾驶节点
*
*/
public interface IMoGoAutopilotsProvider extends IMoGoFunctionServerProvider {
public interface IMoGoAutopilotProvider extends IMoGoFunctionServerProvider {
/**
* 连接自动驾驶域控制器
@@ -21,7 +21,7 @@ public interface IMoGoAutopilotsProvider extends IMoGoFunctionServerProvider {
*
* @param result
*/
void startAutoPilot(AutopilotControlPam result);
void startAutoPilot(AutopilotControlParameters result);
/**
* 结束自动驾驶

12
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsStatusListener.kt → core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt
View File

@@ -8,21 +8,21 @@ import com.mogo.eagle.core.data.traffic.TrafficData
* @date 2021/9/22 8:59 下午
* 自动驾驶状态回调监听
*/
interface IMoGoAutopilotsStatusListener {
interface IMoGoAutopilotStatusListener {
/**
* 自动驾驶状态信息
*
* @param autoPilotStatussInfo 状态信息
* @param autoPilotStatusInfo 状态信息
*/
fun onAutopilotStatusResponse(autoPilotStatussInfo: AutopilotStatussInfo)
fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo)
/**
* 自动驾驶到站
*
* @param autopilotWayArrive 所到车站的简单信息
*/
fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationsInfo?)
fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationInfo?)
/**
@@ -59,9 +59,9 @@ interface IMoGoAutopilotsStatusListener {
/**
* 报警信息
*
* @param autopilotWarnMessage 预警信息
* @param autoPilotWarnMessage 预警信息
*/
fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?)
fun onAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?)
companion object {

6
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
View File

@@ -1,7 +1,7 @@
package com.mogo.eagle.core.function.call.autopilot
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsProvider
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider
import com.mogo.eagle.core.function.call.base.CallerBase
/**
@@ -10,9 +10,9 @@ import com.mogo.eagle.core.function.call.base.CallerBase
* 域控制器管理
*/
object CallerAutoPilotManager {
private val providerApi: IMoGoAutopilotsProvider
private val providerApi: IMoGoAutopilotProvider
get() = CallerBase.getApiInstance(
IMoGoAutopilotsProvider::class.java,
IMoGoAutopilotProvider::class.java,
MogoServicePaths.PATH_AUTO_PILOT
)

68
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
View File

@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.call.autopilot
import androidx.annotation.Nullable
import com.mogo.eagle.core.data.autopilot.*
import com.mogo.eagle.core.data.traffic.TrafficData
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.eagle.core.utilcode.util.GsonUtils
@@ -18,24 +18,24 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
private val TAG = "CallerAutoPilotStatusListenerManager"
// 存储最后一次回调的数据，当有新当位置注册了监听将此数据回调过去，防止有些模块注册顺序问题导致无法获取最新状态
private var mAutopilotStatussInfo: AutopilotStatussInfo = AutopilotStatussInfo()
private var mAutopilotStatusInfo: AutopilotStatusInfo = AutopilotStatusInfo()
// 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步
private val M_AUTOPILOTS_STATUS_LISTENERS: HashMap<String, IMoGoAutopilotsStatusListener> =
private val M_AUTOPILOT_STATUS_LISTENERS: HashMap<String, IMoGoAutopilotStatusListener> =
HashMap()
/**
* 查询AutoPilot状态
*/
fun getAutoPilotStatusInfo(): AutopilotStatussInfo {
return mAutopilotStatussInfo
fun getAutoPilotStatusInfo(): AutopilotStatusInfo {
return mAutopilotStatusInfo
}
/**
* 查询AutoPilot状态
*/
fun getAutoPilotStatusInfoJsonString(): String {
return GsonUtils.toJson(mAutopilotStatussInfo)
return GsonUtils.toJson(mAutopilotStatusInfo)
}
/**
@@ -45,10 +45,10 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
*/
fun addListener(
@Nullable tag: String,
@Nullable listener: IMoGoAutopilotsStatusListener
@Nullable listener: IMoGoAutopilotStatusListener
) {
M_AUTOPILOTS_STATUS_LISTENERS[tag] = listener
listener.onAutopilotStatusResponse(mAutopilotStatussInfo)
M_AUTOPILOT_STATUS_LISTENERS[tag] = listener
listener.onAutopilotStatusResponse(mAutopilotStatusInfo)
}
/**
@@ -56,7 +56,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
* @param tag 标记，用来注销监听使用
*/
fun removeListener(@Nullable tag: String) {
M_AUTOPILOTS_STATUS_LISTENERS.remove(tag)
M_AUTOPILOT_STATUS_LISTENERS.remove(tag)
}
/**
@@ -64,9 +64,9 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
* @param listener 要删除的监听对象
*/
fun removeListener(@Nullable listener: IMoGoObuStatusListener) {
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
M_AUTOPILOT_STATUS_LISTENERS.forEach {
if (it.value == listener) {
M_AUTOPILOTS_STATUS_LISTENERS.remove(it.key)
M_AUTOPILOT_STATUS_LISTENERS.remove(it.key)
}
}
}
@@ -76,38 +76,38 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
*/
@Synchronized
fun invokeAutoPilotStatus() {
LogUtils.dTag(TAG, "$mAutopilotStatussInfo")
invokeAutoPilotStatus(mAutopilotStatussInfo)
LogUtils.dTag(TAG, "$mAutopilotStatusInfo")
invokeAutoPilotStatus(mAutopilotStatusInfo)
}
/**
* 自动驾驶状态信息 回调
* @param autopilotStatussInfo 自动驾驶状态信息
* @param autopilotStatusInfo 自动驾驶状态信息
*/
@Synchronized
fun invokeAutoPilotStatus(autopilotStatussInfo: AutopilotStatussInfo) {
LogUtils.dTag(TAG, "$autopilotStatussInfo")
mAutopilotStatussInfo = autopilotStatussInfo
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
fun invokeAutoPilotStatus(autopilotStatusInfo: AutopilotStatusInfo) {
LogUtils.dTag(TAG, "$autopilotStatusInfo")
mAutopilotStatusInfo = autopilotStatusInfo
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
listener.onAutopilotStatusResponse(mAutopilotStatussInfo)
listener.onAutopilotStatusResponse(mAutopilotStatusInfo)
}
}
/**
* 自动驾驶站点信息 回调
* @param autopilotStationsInfo 自动驾驶网约车回调数据
* @param autopilotStationInfo 自动驾驶网约车回调数据
*/
@Synchronized
fun invokeArriveAtStation(autopilotStationsInfo: AutopilotStationsInfo) {
LogUtils.dTag(TAG, "$autopilotStationsInfo")
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
fun invokeArriveAtStation(autopilotStationInfo: AutopilotStationInfo) {
LogUtils.dTag(TAG, "$autopilotStationInfo")
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
listener.onAutopilotArriveAtStation(autopilotStationsInfo)
listener.onAutopilotArriveAtStation(autopilotStationInfo)
}
}
@@ -118,7 +118,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
@Synchronized
fun invokeAutopilotCarStateData(autoPilotCarStateInfo: AutopilotCarStateInfo?) {
LogUtils.dTag(TAG, "$autoPilotCarStateInfo")
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -133,7 +133,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
@Synchronized
fun invokeAutopilotRoute(routeInfo: AutopilotRouteInfo?) {
LogUtils.dTag(TAG, "$routeInfo")
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -147,7 +147,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
@Synchronized
fun invokeAutopilotSNRequest() {
LogUtils.dTag(TAG, "")
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -161,7 +161,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
@Synchronized
fun invokeAutopilotGuardian(guardianInfo: AutopilotGuardianStatusInfo?) {
LogUtils.dTag(TAG, "$guardianInfo")
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -175,7 +175,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
@Synchronized
fun invokeIdentifyDataUpdate(trafficData: List<TrafficData>?) {
LogUtils.dTag(TAG, "$trafficData")
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
@@ -187,13 +187,13 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
* 报警信息 回调
*/
@Synchronized
fun invokeAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) {
LogUtils.dTag(TAG, "$autopilotWarnMessage")
M_AUTOPILOTS_STATUS_LISTENERS.forEach {
fun invokeAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) {
LogUtils.dTag(TAG, "$autoPilotWarnMessage")
M_AUTOPILOT_STATUS_LISTENERS.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
listener.onAutopilotWarnMessage(autopilotWarnMessage)
listener.onAutopilotWarnMessage(autoPilotWarnMessage)
}
}