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

[6.6.0] update socket version and remove unuse code , plus add trace

Browse Source
This commit is contained in:
EmArrow
2024-08-13 14:25:42 +08:00
parent 91ec298e84
commit 303db95da5
10 changed files with 79 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
View File

@@ -10,6 +10,9 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.fragment.app.FragmentManager
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.env.ProjectUtils
import com.mogo.commons.utils.MogoAnalyticUtils
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
@@ -19,22 +22,21 @@ import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
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.CallerLogger.d
import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.eagle.core.utilcode.util.VolumeUtils
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.biz.login.BusinessEnum
import com.mogo.och.common.module.biz.login.ILoginCallback
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.biz.login.LoginStatusEnum
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.biz.provider.CommonService
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.commons.env.ProjectUtils
/**
* 网约车小巴业务实现入口
*
* @author tongchenfei
*/
abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
private var containerId = 0
@@ -79,38 +81,45 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
}
private fun getFragment(): Fragment {
if(FunctionBuildConfig.isOffLine){
if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
if (FunctionBuildConfig.isOffLine) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.OFFLINE_DRIVER)
}else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
} else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.OFFLINE_PASSENGER)
}
}
if(DeviceUtils.isEB5Model()&&AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)){
if (DeviceUtils.isEB5Model() && AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
val maxVolume = VolumeUtils.getMaxVolume(AudioManager.STREAM_MUSIC)
val volume = VolumeUtils.getVolume(AudioManager.STREAM_MUSIC)
val tartgetVolume = (maxVolume * 0.8).toInt()
OchChainLogManager.writeChainLog("音量","最大声音量:${maxVolume}------当前音量:${volume}----目的音量:${tartgetVolume}")
if(volume<tartgetVolume){
VolumeUtils.setVolume( AudioManager.STREAM_MUSIC, tartgetVolume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE)
OchChainLogManager.writeChainLog(
"音量",
"最大声音量:${maxVolume}------当前音量:${volume}----目的音量:${tartgetVolume}"
)
if (volume < tartgetVolume) {
VolumeUtils.setVolume(
AudioManager.STREAM_MUSIC,
tartgetVolume,
AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE
)
}
}
if (AppIdentityModeUtils.isBusDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.BUS_DRIVER)
} else if (AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)) {
return if(ProjectUtils.isSaas()){
return if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
}else{
} else {
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER)
}
} else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER)
} else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) {
return if(ProjectUtils.isMogo()){
return if (ProjectUtils.isMogo()) {
getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
}else if(ProjectUtils.isSaas()){
} else if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER)
}else{
} else {
getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
}
} else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) {
@@ -118,19 +127,19 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
} else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.BUS_PASSENGER)
} else if (AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
return if(ProjectUtils.isSaas()){
return if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
}else{
} else {
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER)
}
} else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER)
} else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {
return if(ProjectUtils.isMogo()){
return if (ProjectUtils.isMogo()) {
getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
}else if(ProjectUtils.isSaas()){
} else if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER)
}else{
} else {
getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
}
}
@@ -162,7 +171,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
}
override fun onStatusChange(currentStatus: LoginStatusEnum) {
d(TAG, "登录状态发生改变 ${currentStatus}")
d(TAG, "登录状态发生改变 $currentStatus")
UiThreadHandler.post {
showFragment()
}
@@ -170,18 +179,32 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
override fun onBusinessChange(businessEnum: BusinessEnum) {
super.onBusinessChange(businessEnum)
val (_, identity, model) =AppIdentityModeUtils.getInfo(FunctionBuildConfig.appIdentityMode)
val (_, identity, model) = AppIdentityModeUtils.getInfo(FunctionBuildConfig.appIdentityMode)
when (businessEnum) {
BusinessEnum.None -> {}
BusinessEnum.Taxi -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.TAXI}_${identity}_${model}"
BusinessEnum.Bus -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.BUS}_${identity}_${model}"
BusinessEnum.Shuttle -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.SHUTTLE}_${identity}_${model}"
BusinessEnum.Charter -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.CHARTER}_${identity}_${model}"
BusinessEnum.Taxi -> FunctionBuildConfig.appIdentityMode =
"${AppIdentityModeUtils.TAXI}_${identity}_${model}"
BusinessEnum.Bus -> FunctionBuildConfig.appIdentityMode =
"${AppIdentityModeUtils.BUS}_${identity}_${model}"
BusinessEnum.Shuttle -> FunctionBuildConfig.appIdentityMode =
"${AppIdentityModeUtils.SHUTTLE}_${identity}_${model}"
BusinessEnum.Charter -> FunctionBuildConfig.appIdentityMode =
"${AppIdentityModeUtils.CHARTER}_${identity}_${model}"
}
// 加入启动统计
val mStartParams: HashMap<String, Any> = HashMap()
mStartParams["start_time"] = TimeUtils.getNowMills()
mStartParams["app_version"] = AppUtils.getAppVersionName()
mStartParams["app_flavor"] = DebugConfig.getProductFlavor()
mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode
MogoAnalyticUtils.track("app_start_time", mStartParams)
}
override fun onBusinessChangeDebug(businessEnum: BusinessEnum) {
if(businessEnum==BusinessEnum.None){
if (businessEnum == BusinessEnum.None) {
removeStatusBar()
CallerHmiManager.hideToolsView()
ToggleDebugView.toggleDebugView.dismiss()
@@ -194,7 +217,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
back.replace(containerId, fragment, fragment.tag)
back.commitAllowingStateLoss()
}
}else {
} else {
onBusinessChange(businessEnum)
val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
val fragment = getFragment()
@@ -227,22 +250,23 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
)
statusBarLP.topMargin = 0
statusBarLP.gravity = Gravity.TOP
statusBar?.let {view->
if(view.isAttachedToWindow){
statusBar?.let { view ->
if (view.isAttachedToWindow) {
return
}
}
CallerLogger.d(TAG,"添加statusBar---${commonService}")
CallerLogger.d(TAG, "添加statusBar---${commonService}")
decorView.addView(statusBarView, statusBarLP)
}
}
private fun removeStatusBar(){
private fun removeStatusBar() {
activity?.let {
CallerLogger.d(TAG,"移除statusBar")
CallerLogger.d(TAG, "移除statusBar")
val decorView = it.window.decorView as? FrameLayout ?: return
val statusBar = decorView.findViewWithTag<View>("status_bar")
statusBar?.let {
decorView.removeView(it)
val statusBar = decorView.findViewWithTag<View>("status_bar")
statusBar?.let { view ->
decorView.removeView(view)
}
}
}

2
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt
View File

@@ -8,7 +8,6 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.network.MoGoRetrofitFactory
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.function.biz.v2x.V2XBizTrace
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
@@ -48,7 +47,6 @@ class LineUploadManager private constructor(context: Context) : IMoGoAutopilotSt
override fun onAutopilotRouteLineId(lineId: Long) {
super.onAutopilotRouteLineId(lineId)
V2XBizTrace.onAck("onAutopilotRouteLineId", "lineId: $lineId")
if (lineId > 0) {
uploadLine(lineId)
}

6
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
View File

@@ -239,10 +239,9 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
uuid = e.uuid ?: ""
}
}
Logger.d(TAG, "cameraIp: $cameraIp, heading:$heading, uuid: $uuid")
val newEventId = "other_retrograde_vehicle_${event.eventId}"
val isUseGps = event.gnssType != 0
Logger.i(TAG, "isUseGps --> $isUseGps")
V2XBizTrace.onAck(TAG, mapOf("cameraIp" to cameraIp, "heading" to heading, "uuid" to uuid, "isUseGps" to isUseGps, "newEventId" to newEventId), true)
val eventLocation = arrayOf(event.longitude, event.latitude)
val carLocation = if (isUseGps) CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() else CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
if (DrivingDirectionUtils.getDegreeOfCar2Poi(
@@ -531,7 +530,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
}
private fun drawShiGong(events: List<TrackedObject>) {
// V2XBizTrace.onAck(events,"onV2NShiGong", false)
if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) {
handler.removeMessages(MSG_WHAT_DRAW_SHIGONE)
handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGONE, events))
@@ -539,7 +537,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
}
private fun drawShiGu(events: List<TrackedObject>) {
// V2XBizTrace.onAck(events,"onV2NShiGu", false)
if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) {
handler.removeMessages(MSG_WHAT_DRAW_SHIGU)
handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGU, events))
@@ -547,7 +544,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
}
private fun drawYongDu(events: List<MogoV2X.RTEData_PB>) {
// V2XBizTrace.onAck(events,"onV2NYongDu", false)
if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) {
handler.removeMessages(MSG_WHAT_DRAW_YONGDU)
handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_YONGDU, events))

2
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -328,7 +328,7 @@ class MoGoAdasMsgConnectStatusListenerImpl :
else -> {}
}
if (title.isNotEmpty() && content.isNotEmpty()) {
CallerMsgBoxManager.saveMsgBox(
CallerMsgBoxManager.saveMsgBoxNoTrace(
MsgBoxBean(
MsgBoxType.AUTOPILOT,
AutopilotMsg(0, title, content, System.currentTimeMillis())

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt
View File

@@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84Lis
import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -64,6 +65,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
ANALYTICS_KEY,
map
)
HmiActionLog.hmiAction(TAG, msg)
}
CallerLogger.i(TAG, msg)
}

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

@@ -256,14 +256,6 @@ class HttpDnsStartUp : AndroidStartup<Boolean>(), IMoGoCloudListener {
ThreadPoolService.execute {
// 初始化网络配置
NetConfigUtils.init()
// 加入启动统计
// todo 钟超 登陆后调用 获取 app_flavor
// val mStartParams: HashMap<String, Any> = HashMap()
// mStartParams["start_time"] = TimeUtils.getNowMills()
// mStartParams["app_version"] = AppUtils.getAppVersionName()
// mStartParams["app_flavor"] = DebugConfig.getProductFlavor()
// mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode
// MogoAnalyticUtils.track("app_start_time", mStartParams)
}
}

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

@@ -24,7 +24,7 @@ class ChainConstant {
//业务类型与下方文件名一一对应
const val CHAIN_TYPE_STATUS = 0 // 记录所有业务信息(正常调用,异常数据)
const val CHAIN_TYPE_GNSS = 1 // 工控定位数据
const val CHAIN_TYPE_SOCKET_AUTOPILOT = 2 // 包括自动驾驶状态,reportMsg,planning数据,全局路径数据,FM
const val CHAIN_TYPE_SOCKET_AUTOPILOT = 2 // 包括自动驾驶状态,reportMsg,PNC数据,全局路径数据,FM
const val CHAIN_TYPE_SOCKET_DATA_TRACKED = 3 // 感知数据,现阶段记录云端漫游
const val CHAIN_TYPE_SOCKET_TRAJECTORY = 4 // 前车引导线,用于调试
const val CHAIN_TYPE_SOCKET_VEHICLE = 5 // 底盘数据
@@ -79,7 +79,6 @@ class ChainConstant {
const val CHAIN_CODE_APP_INFO_CONFIG_UPDATE = "CHAIN_CODE_APP_INFO_CONFIG_UPDATE"
const val CHAIN_CODE_FUNC_CONFIG_CHANGED = "CHAIN_CODE_FUNC_CONFIG_CHANGED"
const val CHAIN_CODE_START_UP = "CHAIN_CODE_START_UP"
const val CHAIN_CODE_INIT_ENV_RESTART = "CHAIN_CODE_INIT_ENV_RESTART"
const val CHAIN_CODE_INIT_ON_MAP_LOADED = "CHAIN_CODE_INIT_ON_MAP_LOADED"
const val CHAIN_CODE_INIT_ON_MAP_INIT = "CHAIN_CODE_INIT_ON_MAP_INIT"
const val CHAIN_CODE_BINDING_CAR = "CHAIN_CODE_BINDING_CAR"

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

@@ -21,6 +21,10 @@ object CallerMsgBoxManager {
providerApi?.queryAllMessages(context)
}
fun saveMsgBoxNoTrace(bean: MsgBoxBean){
providerApi?.saveMsg(bean)
}
/**
* 存储数据到消息盒子
*/

16
gradle.properties
View File

@@ -64,21 +64,21 @@ bytex.ASM_API=ASM7
LOGLIB_VERSION=1.10.18
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.7.28
MOGO_NETWORK_VERSION=1.4.7.29
# 鉴权
MOGO_PASSPORT_VERSION=1.4.7.28
MOGO_PASSPORT_VERSION=1.4.7.29
# 长链接
MOGO_SOCKET_VERSION=1.4.7.28
MOGO_SOCKET_VERSION=1.4.7.29
# 数据采集
MOGO_REALTIME_VERSION=1.4.7.28
MOGO_REALTIME_VERSION=1.4.7.29
# 直播推流
MOGO_LIVE_VERSION=1.4.7.28
MOGO_LIVE_VERSION=1.4.7.29
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.4.7.28
MOGO_TRAFFICLIVE_VERSION=1.4.7.29
# 定位服务
MOGO_LOCATION_VERSION=1.4.7.28
MOGO_LOCATION_VERSION=1.4.7.29
# 远程通讯模块
MOGO_TELEMATIC_VERSION=1.4.7.28
MOGO_TELEMATIC_VERSION=1.4.7.29
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=3.4.0.6

1
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -6,7 +6,6 @@ import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_SEND_
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_SEND_SYSTEM_CMD;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_CONNECT_ADDRESS;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_STATUS_CHANGE_REASON;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_SOURCE_ADAS;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_INIT_STATUS;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_SOCKET_AUTOPILOT;