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

[6.0.0] code opt and update sdk of aicloud , map , plus kotlin union

Browse Source
This commit is contained in:
zhongchao
2023-08-25 13:30:43 +08:00
parent e32f2c5f0a
commit 22ec53bb2f
73 changed files with 91 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-biz/build.gradle
View File

@@ -52,7 +52,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.arouter
kapt rootProject.ext.dependencies.aroutercompiler

6
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt
View File

@@ -60,7 +60,7 @@ class CronTaskManager {
* 请求路口一定范围内的设备信息(包含：摄像头、灯)
*/
private fun requestDeviceList() {
CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.let { location ->
CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let { location ->
disposable = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
.create(ICameraListServices::class.java)
.getDeviceList(location.longitude, location.latitude, 500)
@@ -80,7 +80,7 @@ class CronTaskManager {
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
cameraList = it
// CallerLogger.d("$M_BIZ$TAG", "requestDeviceList返回结果为：$it")
// CallerLogger.d("$M_BIZ$TAG", "requestDeviceList返回结果为：$it")
}, {
it.printStackTrace()
CallerLogger.e(
@@ -88,8 +88,6 @@ class CronTaskManager {
"requestDeviceList:message is:${it.message}, cause is:${it.cause}"
)
})
}?: run {
CallerLogger.e("$M_BIZ$TAG", "CurrentLocation is null!")
}
}

12
core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt
View File

@@ -589,8 +589,8 @@ object MoGoChatFacade: IMoGoChatFacade {
it.cardIdAge = mySelf.get().age
it.cardIdSex = mySelf.get().sex
it.cityName = mySelf.get().city
it.lat = location?.latitude ?: 0.0
it.lon = location?.longitude ?: 0.0
it.lat = location.latitude
it.lon = location.longitude
})
if (response.code != 0 && response.code != 200) {
send(AnswerState.Error(AnswerState.CODE_ANSWER_API_REQ_FAIL, "[Answer] - ${response.msg}", mutableMapOf<String, String>().also {
@@ -818,8 +818,8 @@ object MoGoChatFacade: IMoGoChatFacade {
it.nickName = user.name
it.headImgUrl = user.icon
it.carInfo = user.brand
it.lat = location?.latitude ?: 0.0
it.lon = location?.longitude ?: 0.0
it.lat = location.latitude
it.lon = location.longitude
})
val code = response.code
if (code != 0 && code != 200) {
@@ -966,8 +966,8 @@ object MoGoChatFacade: IMoGoChatFacade {
it.cardIdAge = mySelf.get().age
it.cardIdSex = mySelf.get().sex
it.cityName = mySelf.get().city
it.lat = location?.latitude ?: 0.0
it.lon = location?.longitude ?: 0.0
it.lat = location.latitude
it.lon = location.longitude
})
if (response.code != 0 && response.code != 200) {
send(JoinState.Error(AnswerState.CODE_ANSWER_API_REQ_FAIL, "[JoinTeam] - ${response.msg}", mutableMapOf<String, String>().also {

6
core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt
View File

@@ -70,10 +70,8 @@ internal class ChatServiceModel {
val sn = MoGoAiCloudClientConfig.getInstance().sn
val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
if (location != null) {
params.lon = location.longitude
params.lat = location.latitude
}
params.lon = location.longitude
params.lat = location.latitude
Logger.d(ChatConsts.TAG, "connectStatusParam:$params")
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["data"] = Gson().toJson(params)

2
core/function-impl/mogo-core-function-devatools/build.gradle
View File

@@ -71,7 +71,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.arouter
kapt rootProject.ext.dependencies.aroutercompiler
implementation rootProject.ext.dependencies.mogologlib

2
core/function-impl/mogo-core-function-hmi/build.gradle
View File

@@ -50,7 +50,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.androidxccorektx
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.androidxconstraintlayout

2
core/function-impl/mogo-core-function-map/build.gradle
View File

@@ -49,7 +49,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.androidxccorektx
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.androidxconstraintlayout

24
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/MapPointCloudSubscriber.kt
View File

@@ -83,24 +83,24 @@ class MapPointCloudSubscriber private constructor()
// MAP_RoboBus_B1_3.3.0_lxw_20230526_old_dev
val dockerVersionName = AppConfigInfo.dockerVersion
// "." 分割，取前两位
val dockerVersionNameArray = dockerVersionName?.split(".")
val dockerVersionNameArray = dockerVersionName.split(".")
var dockerVersionCode = ""
dockerVersionNameArray?.let {
dockerVersionNameArray.let {
if (it.size >= 3) {
for (index in 0 until 3) {
dockerVersionCode +=
when (index) {
0 -> {
it[index].substring(it[index].lastIndex)
}
it.size - 1 -> {
it[index].substring(0, 1)
}
else -> {
it[index]
}
when (index) {
0 -> {
it[index].substring(it[index].lastIndex)
}
it.size - 1 -> {
it[index].substring(0, 1)
}
else -> {
it[index]
}
}
}
}
}

8
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
View File

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.business.ai
import android.content.Context
import android.os.Handler
import android.os.Looper
import android.os.Message
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
@@ -18,6 +19,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_RO
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_ERROR
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_START
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_DELAY
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_ERROR
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_OK
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_ROUTE_MODE
@@ -68,7 +70,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
@Volatile
private var cloudDataSize = 0
private val handler = Handler {
private val handler = Handler(Looper.getMainLooper()) {
if (it.what == H_ERROR_CLOUD) {
if (!aiCloudDataChange.get()) {
MapBizTrace.log(
@@ -210,6 +212,10 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
if (dataReceive) {
// 请求地图开始漫游
MogoMapUIController.getInstance().setRomaMode(FunctionBuildConfig.romaModeStyle)
}else{
// 保底清除策略
MapBizTrace.log("",CHAIN_CODE_ROMA_REQUEST_DELAY,TAG,mutableMapOf("delay" to true),true)
MapIdentifySubscriber.instance.clearAiCloudRoma()
}
},
{ errorMsg ->

5
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt
View File

@@ -182,10 +182,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
}
override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
if (gnssInfo != null
&& gnssInfo.longitude != 0.0
&& gnssInfo.latitude != 0.0
) {
if (gnssInfo.longitude != 0.0 && gnssInfo.latitude != 0.0) {
executor.get()?.updateLocation(
gnssInfo.longitude,
gnssInfo.latitude,

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
View File

@@ -412,7 +412,7 @@ class OverMapView @JvmOverloads constructor(
resources.getDrawable(R.drawable.transparent_background, null)
.toBitmap(AutoSizeUtils.dp2px(context, 32f), AutoSizeUtils.dp2px(context, 230f))
)
initAMapView(context)
initAMapView()
//设置全览模式
overLayerView?.setOnClickListener { displayCustomOverView() }
overLayerView?.let {
@@ -426,7 +426,7 @@ class OverMapView @JvmOverloads constructor(
}
}
private fun initAMapView(context: Context) {
private fun initAMapView() {
Log.d(TAG, "initAMapView")
mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel.toFloat())
mAMap = mMapView?.map

4
core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
View File

@@ -57,8 +57,8 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
private val handler = Handler(Looper.getMainLooper()) {
if (it.what == 1) {
val value = it.obj as Pair<String, String>
reConnectSocket(value.first, value.second)
val value = it.obj as Pair<*, *>
reConnectSocket(value.first as String, value.second as String)
}
true
}

2
core/mogo-core-data/build.gradle
View File

@@ -67,7 +67,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.gson

1
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
View File

@@ -32,7 +32,6 @@ public class MogoServicePaths {
* Float View
*/
@Keep
@Deprecated
public static final String PATH_FLOAT_VIEW_MANAGER = "/floatview/api";
/**

1
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
View File

@@ -116,6 +116,7 @@ class ChainConstant {
const val CHAIN_CODE_ROMA_REQUEST = "CHAIN_CODE_ROMA_REQUEST"
const val CHAIN_CODE_ROMA_REQUEST_OK = "CHAIN_CODE_ROMA_REQUEST_OK"
const val CHAIN_CODE_ROMA_REQUEST_ERROR = "CHAIN_CODE_ROMA_REQUEST_ERROR"
const val CHAIN_CODE_ROMA_REQUEST_DELAY = "CHAIN_CODE_ROMA_REQUEST_DELAY"
const val CHAIN_CODE_ROMA_MODE_INVOKE = "CHAIN_CODE_ROMA_MODE_INVOKE"
const val CHAIN_CODE_ROMA_MAP_START = "CHAIN_CODE_ROMA_MAP_START"
const val CHAIN_CODE_ROMA_MAP_END = "CHAIN_CODE_ROMA_MAP_END"

2
core/mogo-core-function-api/build.gradle
View File

@@ -46,7 +46,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.arouter
kapt rootProject.ext.dependencies.aroutercompiler

2
core/mogo-core-function-call/build.gradle
View File

@@ -44,7 +44,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.arouter
kapt rootProject.ext.dependencies.aroutercompiler

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

@@ -19,7 +19,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase<IMoGoAutopilotIdentif
@Synchronized
fun invokeAutopilotIdentifyDataUpdate(trafficData: List<MessagePad.TrackedObject>?) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotIdentifyDataUpdate(trafficData)
}
@@ -31,7 +30,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase<IMoGoAutopilotIdentif
@Synchronized
fun invokeAutopilotIdentifyPlanningObj(planningObjects: List<MessagePad.PlanningObject>?) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotIdentifyPlanningObj(planningObjects)
}
@@ -43,7 +41,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase<IMoGoAutopilotIdentif
@Synchronized
fun invokeAutopilotPerceptionTrafficLight(trafficLights: TrafficLightOuterClass.TrafficLights?) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotPerceptionTrafficLight(trafficLights)
}

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

@@ -16,7 +16,6 @@ object CallerAutopilotPointCloudListenerManager : CallerBase<IMoGoAutopilotPoint
@Synchronized
fun invokeAutopilotPointCloudDataUpdate(pointCloud: ByteArray?) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotPointCloudDataUpdate(pointCloud)
}

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

@@ -18,7 +18,6 @@ object CallerAutopilotRecordListenerManager : CallerBase<IMoGoAutopilotRecordLis
*/
fun invokeAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotRecordResult(recordPanel)
}
@@ -29,7 +28,6 @@ object CallerAutopilotRecordListenerManager : CallerBase<IMoGoAutopilotRecordLis
*/
fun invokeAutopilotRecordConfig(config: MessagePad.RecordDataConfig) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotRecordConfig(config)
}
@@ -40,7 +38,6 @@ object CallerAutopilotRecordListenerManager : CallerBase<IMoGoAutopilotRecordLis
*/
fun invokeBagManagerResult(bagManager: BagManagerOuterClass.BagManager){
M_LISTENERS.forEach{
val tag = it.key
val listener = it.value
listener.onBagManagerResult(bagManager)
}

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

@@ -18,7 +18,6 @@ object CallerChassisGnssListenerManager : CallerBase<IMoGoChassisGnssListener>()
@Synchronized
fun invokeChassisGnssListener(gnssInfo: MessagePad.GnssInfo) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onChassisGnss(gnssInfo)
}

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

@@ -16,7 +16,6 @@ object CallerPlanningActionsListenerManager : CallerBase<IMoGoAutopilotPlanningA
@Synchronized
fun invokePNCActions(planningActionMsg: MessagePad.PlanningActionMsg) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.pncActions(planningActionMsg)
}

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

@@ -34,7 +34,6 @@ object CallerPlanningRottingListenerManager : CallerBase<IMoGoPlanningRottingLis
fun invokeAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
this.globalPathResp = globalPathResp
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotRotting(globalPathResp)
}

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

@@ -18,7 +18,6 @@ object CallerPlanningTrajectoryListenerManager : CallerBase<IMoGoPlanningTraject
@Synchronized
fun invokeAutopilotTrajectory(trajectoryInfo: MutableList<MessagePad.TrajectoryPoint>) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onAutopilotTrajectory(trajectoryInfo)
}

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/chat/CallerChatManager.kt
View File

@@ -15,13 +15,13 @@ import org.jetbrains.annotations.TestOnly
object CallerChatManager: CallerBase<Any>() {
private val provider by lazy {
getApiInstance(IMoGoChatProvider::class.java, ChatConsts.CHAT_PROVIDER_PATH)?.chat()
getApiInstance(IMoGoChatProvider::class.java, ChatConsts.CHAT_PROVIDER_PATH).chat()
}
@TestOnly
@OptIn(ExperimentalCoroutinesApi::class)
fun call(ctx: Context , sn: String) {
val facade = provider ?: return
val facade = provider
facade
.call(ChatParams(sn))
.onEach {

2
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt
View File

@@ -24,7 +24,6 @@ object CallerHmiListenerManager : CallerBase<IMoGoCheckAutoPilotBtnListener>() {
fun invokeCheckAutoPilotBtnListener(isChecked: Boolean) {
mIsChecked = isChecked
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onCheck(mIsChecked)
}
@@ -32,7 +31,6 @@ object CallerHmiListenerManager : CallerBase<IMoGoCheckAutoPilotBtnListener>() {
fun invokeHDDataCacheStatus(isCached: Boolean) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.updateHDDataCacheStatus(isCached)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerGaoDeMapLocationListenerManager.kt
View File

@@ -15,7 +15,6 @@ object CallerGaoDeMapLocationListenerManager : CallerBase<IGaoDeMapLocationListe
@Synchronized
fun invokeMoGoLocationChanged(location: MogoLocation) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMoGoLocationChanged(location)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt
View File

@@ -25,7 +25,6 @@ object CallerMapRomaListener : CallerBase<IMoGoRomaListener>() {
fun invokeMapRoma(romaStatus: Boolean) {
roma = romaStatus
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.romaStatus(romaStatus)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapStyleListenerManager.kt
View File

@@ -38,7 +38,6 @@ object CallerMapStyleListenerManager : CallerBase<IMoGoMapStyleChangeListener>()
fun invokeMapStyleChange(mapStyleMode: Int) {
mMapStyleMode = mapStyleMode
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMapStyleModeChange(mMapStyleMode)
}

5
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxEventListenerManager.kt
View File

@@ -16,7 +16,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
*/
fun invokeSummaryListener(){
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onSummaryClickEvent()
}
@@ -27,7 +26,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
*/
fun invokeUpdateTipListener(isShow: Boolean){
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onUpdateTipEvent(isShow)
}
@@ -38,7 +36,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
**/
fun invokeBubbleOperationListener(msgBoxBean: MsgBoxBean){
M_LISTENERS.forEach{
val tag = it.key
val listener = it.value
listener.onBubbleOperationClickEvent(msgBoxBean)
}
@@ -49,7 +46,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
*/
fun invokeBubbleV2XListener(msgBoxBean: MsgBoxBean){
M_LISTENERS.forEach{
val tag = it.key
val listener = it.value
listener.onBubbleV2XClickEvent(msgBoxBean)
}
@@ -60,7 +56,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
*/
fun invokeBubbleReportListener(msgBoxBean: MsgBoxBean){
M_LISTENERS.forEach{
val tag = it.key
val listener = it.value
listener.onBubbleReportClickEvent(msgBoxBean)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxListenerManager.kt
View File

@@ -21,7 +21,6 @@ object CallerMsgBoxListenerManager : CallerBase<IMsgBoxListener>() {
*/
fun invokeListener(category: MsgCategory, msgBox: MsgBoxBean) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onDataChanged(category, msgBox)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuConnectListenerManager.kt
View File

@@ -49,7 +49,6 @@ object CallerObuConnectListenerManager : CallerBase<IMoGoObuConnectListener>() {
fun invokeObuConnectListener(obuStatusInfo: ObuStatusInfo) {
mObuStatusInfo = obuStatusInfo
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onConnectStatus(mObuStatusInfo)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt
View File

@@ -11,7 +11,6 @@ object CallerObuLocationWGS84ListenerManager : CallerBase<IMoGoObuLocationWGS84L
fun invokeObuLocationWGS84(data: MessagePad.GnssInfo) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onObuLocationWGS84(data)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt
View File

@@ -11,7 +11,6 @@ object CallerObuMapMathListenerManager : CallerBase<IMoGoObuWarningMapListener>(
fun invokeObuMapMath(data: ObuScene.MapMatchData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMoGoObuMapMath(data)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuSaveMessageListenerManager.kt
View File

@@ -13,7 +13,6 @@ object CallerObuSaveMessageListenerManager : CallerBase<IMoGoObuSaveMessageListe
fun invokeObuSaveMessage(type: String, content: String, tts: String, sourceType: DataSourceType,communicationType: CommunicationType) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMoGoObuSaveMessage(type, content, tts, sourceType,communicationType)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningListenerManager.kt
View File

@@ -14,7 +14,6 @@ object CallerObuWarningListenerManager : CallerBase<IMoGoObuStatusListener>() {
fun invokeDelayTime(delayTime: Long) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onObuV2iDelayTime(delayTime)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsiListenerManager.kt
View File

@@ -11,7 +11,6 @@ object CallerObuWarningRsiListenerManager : CallerBase<IMoGoObuWarningRsiListene
fun invokeObuRsiWarning(data: ObuScene.RsiWarningData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMoGoObuRsiWarning(data)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsmListenerManager.kt
View File

@@ -11,7 +11,6 @@ object CallerObuWarningRsmListenerManager : CallerBase<IMoGoObuWarningRsmListene
fun invokeObuRsmWarning(data: ObuScene.RsmWarningData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMoGoObuRsmWarning(data)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRvListenerManager.kt
View File

@@ -11,7 +11,6 @@ object CallerObuWarningRvListenerManager : CallerBase<IMoGoObuWarningRvListener>
fun invokeObuRvWarning(data: MogoObuRvWarningData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMoGoObuRvWarning(data)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningSpatListenerManager.kt
View File

@@ -11,7 +11,6 @@ object CallerObuWarningSpatListenerManager : CallerBase<IMoGoObuWarningSpatListe
fun invokeObuSpatWarning(data: ObuScene.SpatWarningData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onMoGoObuSpatWarning(data)
}

2
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/order/CallerOrderListenerManager.kt
View File

@@ -12,7 +12,6 @@ object CallerOrderListenerManager: CallerBase<IOrderListener>() {
fun invokeOrderStatus(inOrder: Boolean){
M_LISTENERS.forEach{
val tag = it.key
val listener = it.value
listener.onUpdateOrderStatus(inOrder)
}
@@ -20,7 +19,6 @@ object CallerOrderListenerManager: CallerBase<IOrderListener>() {
fun invokeOrderRemoval(){
M_LISTENERS.forEach{
val tag = it.key
val listener = it.value
listener.onOrderRemoval()
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/setting/CallerSkinModeListenerManager.kt
View File

@@ -20,7 +20,6 @@ object CallerSkinModeListenerManager : CallerBase<IMoGoSkinModeChangeListener>()
*/
fun invokeListener(skinMode: Int) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onSkinModeChange(skinMode)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallVipSetListenerManager.kt
View File

@@ -14,7 +14,6 @@ object CallVipSetListenerManager : CallerBase<IMoGoVipSetListener>() {
fun invokeVipSetStatus(vipStatus: Boolean) {
vipSet = vipStatus
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value
listener.onVipSet(vipStatus)
}

2
core/mogo-core-network/build.gradle
View File

@@ -45,7 +45,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.androidxccorektx
implementation rootProject.ext.dependencies.androidxappcompat

2
core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt
View File

@@ -84,7 +84,7 @@ class Request<T> {
} catch (e: Exception) {
e.printStackTrace()
//数据打点
if (e == null) {
if (e.message == null) {
onError?.invoke(NULL_EXCEPTION)
}
when (e) {

4
core/mogo-core-res/build.gradle
View File

@@ -59,9 +59,9 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.androidxccorektx
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.androidxrecyclerview

2
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt
View File

@@ -112,7 +112,7 @@ class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer {
super.hideAllWidget()
mBottomContainer?.visibility = View.VISIBLE
mProgressBar?.visibility = View.VISIBLE
start?.visibility = View.VISIBLE
start.visibility = View.VISIBLE
start.setImageResource(R.drawable.notice_video_pause)
}

12
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt
View File

@@ -89,11 +89,11 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
mBottomContainer?.visibility = View.VISIBLE
mProgressBar?.visibility = View.VISIBLE
start?.visibility = View.VISIBLE
fullscreen?.visibility = View.GONE
start.visibility = View.VISIBLE
fullscreen.visibility = View.GONE
//时间显示
currentTimeTextView?.text = TimeTransformUtils.stringForTime(currentTime)
totalTimeTextView?.text = TimeTransformUtils.stringForTime(totalTime)
currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime)
totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime)
if (progress != 0) {
mProgressBar?.progress = progress
@@ -112,7 +112,7 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
super.hideAllWidget()
mBottomContainer?.visibility = View.VISIBLE
mProgressBar?.visibility = View.VISIBLE
start?.visibility = View.VISIBLE
start.visibility = View.VISIBLE
start.setImageResource(R.drawable.notice_video_pause)
}
@@ -161,7 +161,7 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
override fun onCompletion() {
mBottomContainer?.visibility = View.VISIBLE
mProgressBar?.visibility = View.VISIBLE
start?.visibility = View.VISIBLE
start.visibility = View.VISIBLE
start.setImageResource(R.drawable.notice_video_after_pause)
isPostBufferUpdate = false

3
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt
View File

@@ -152,9 +152,6 @@ class SimpleVideoPlayer : StandardGSYVideoPlayer {
private var runnable = object :Runnable {
override fun run() {
if(this@SimpleVideoPlayer==null){
return
}
updateTimer++
postDelayed(this, 1000)
if (updateTimer >= 3) {

2
core/mogo-core-utils/build.gradle
View File

@@ -61,7 +61,7 @@ dependencies {
api rootProject.ext.dependencies.glide
kapt rootProject.ext.dependencies.glidecompiler
api rootProject.ext.dependencies.fresco
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.kotlinstdlib
implementation rootProject.ext.dependencies.androidxannotation
implementation rootProject.ext.dependencies.material
implementation rootProject.ext.dependencies.guava