Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-d_230217_1.0.1'

Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!545
This commit is contained in:
wangmingjun
2023-02-17 12:23:52 +00:00
34 changed files with 949 additions and 348 deletions

View File

@@ -61,14 +61,14 @@ object HmiBuildConfig {
*/
@JvmField
@Volatile
var isShowObuV2vView = false
var isShowObuV2vView = true
/**
* 是否展示obu的v2i
*/
@JvmField
@Volatile
var isShowObuV2iView = false
var isShowObuV2iView = true
/**
* 是否展示obu通过工控机展示的v2i

View File

@@ -1,8 +1,16 @@
package com.mogo.eagle.core.data.msgbox
import android.util.Log
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import java.io.Serializable
/**
* 运营消息:-1表示初始值
*/
data class OperationMsg(val timestamp : Long, val content: String, val type: Int = -1): Serializable
data class OperationMsg(val timestamp : Long, val content: String, val type: Int = -1): Serializable {
init {
if (content.isEmpty()) {
CallerLogger.e("MsgBox", Log.getStackTraceString(Throwable()))
}
}
}

View File

@@ -1,5 +1,7 @@
package com.mogo.eagle.core.data.msgbox
import android.util.Log
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import java.io.Serializable
data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = ""): Serializable {
@@ -9,5 +11,8 @@ data class V2XMsg(var type: String = "", var content: String? = "", var tts: Str
init {
timeStamp = System.currentTimeMillis()
if (content.isNullOrEmpty()) {
CallerLogger.e("MsgBox", Log.getStackTraceString(Throwable()))
}
}
}

View File

@@ -6,11 +6,6 @@ package com.mogo.eagle.core.data.obu
* @date 2021/9/30 5:38 下午
*/
class ObuStatusInfo {
/**
* 当前链接的IP地址, 默认地址 192.168.1.199
*/
var connectIP: String = "192.168.1.199"
/**
* OBU SDK 版本
*/