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

[6.2.6] sp opt , update aicloud upload loc thread

Browse Source
This commit is contained in:
EmArrow
2024-01-03 16:31:29 +08:00
parent 74824c1eba
commit 6729fe50af
135 changed files with 649 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
View File

@@ -2,13 +2,12 @@ package com.mogo.eagle.function.biz
import android.content.Context
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.biz.camera.CameraEntity
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.biz.IMoGoFuncBizProvider
import com.mogo.eagle.core.function.api.biz.IMoGoNoticeNetCallBack
import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager.V2NCarTypeCheck
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.function.biz.dispatch.DispatchAutoPilotManager.Companion.dispatchAutoPilotManager
@@ -109,7 +108,7 @@ class FuncBizProvider : IMoGoFuncBizProvider {
}
override fun getAllV2XEvents() {
OverViewDataManager.getAllV2XEventsByLineId(MoGoAiCloudClientConfig.getInstance().sn)
OverViewDataManager.getAllV2XEventsByLineId(SharedPrefsMgr.getInstance().sn)
}
override fun stopQueryV2XEvents() {

6
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt
View File

@@ -1,8 +1,8 @@
package com.mogo.eagle.function.biz.dispatch.network
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.HostConst
import com.mogo.commons.context.ContextHolderUtil
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseData
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo.RouteModels
import com.mogo.eagle.core.data.biz.dispatch.ReportDispatchResult
@@ -43,7 +43,7 @@ class DispatchServiceModel private constructor() {
* @param list 路线集合
*/
fun uploadAutopilotRoute(list: List<RouteModels?>?) {
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
val reportedRoute = ReportedRoute(
sn,
GsonUtil.jsonFromObject(list)
@@ -81,7 +81,7 @@ class DispatchServiceModel private constructor() {
onSuccess: ((BaseData) -> Unit)? = null,
onError: ((String) -> Unit)? = null
) {
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
val reportDispatchResult =
ReportDispatchResult(
sn,

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java
View File

@@ -3,8 +3,8 @@ package com.mogo.eagle.function.biz.notice.network;
import android.util.ArrayMap;
import com.mogo.cloud.network.RetrofitFactory;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.commons.constants.HostConst;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.data.biz.notice.NoticeNormalDetail;
import com.mogo.eagle.core.data.biz.notice.NoticeRequest;
@@ -124,7 +124,7 @@ public class NoticeNetWorkManager {
* @param dbId
*/
public void getNoticeDetail(String dbId) {
String sn = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn();
String sn = SharedPrefsMgr.getInstance().getSn();
Map<String, String> map = new HashMap<>();
map.put("sn", sn);
map.put("infoId", dbId);

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

@@ -1,8 +1,8 @@
package com.mogo.eagle.function.biz.v2x.road
import android.content.Context
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.HostConst.getEagleHost
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.v2x.LineUploadData
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -55,7 +55,7 @@ class LineUploadManager private constructor(context: Context) : IMoGoAutopilotSt
}
private fun uploadLine(lineId: Long) {
val lineUploadData = LineUploadData(lineId, MoGoAiCloudClientConfig.getInstance().sn)
val lineUploadData = LineUploadData(lineId, SharedPrefsMgr.getInstance().sn)
disposable = MoGoRetrofitFactory.getInstance(getEagleHost())
.create(ILineUploadApi::class.java)
.uploadLineId(lineUploadData)

8
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
View File

@@ -1,7 +1,7 @@
package com.mogo.eagle.function.biz.v2x.trafficlight.network
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.HostConst
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseResponse
import com.mogo.eagle.core.data.biz.trafficlight.*
import com.mogo.eagle.core.network.MoGoRetrofitFactory
@@ -31,7 +31,7 @@ class TrafficLightNetWorkModel {
val tileId = mogoMapData.get()?.getTileId(lon, lat)?:0
val map = hashMapOf<String, String>()
val roadIDRequestData = RoadIDRequestData(tileId, lat, lon, bearing)
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["sn"] = SharedPrefsMgr.getInstance().sn
map["data"] = GsonUtils.toJson(roadIDRequestData)
getNetWorkApi().getFrontRoadID(map)
}
@@ -77,7 +77,7 @@ class TrafficLightNetWorkModel {
loader {
apiCall {
val trafficLightRequestData = TrafficLightRequestData(lat, lon, bearing, roadId!!)
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["sn"] = SharedPrefsMgr.getInstance().sn
map["data"] = GsonUtils.toJson(trafficLightRequestData)
getNetWorkApi().getTrafficLight(map)
}
@@ -115,7 +115,7 @@ class TrafficLightNetWorkModel {
apiCall {
val trafficLightRequestData =
ChangeLightRequestData(lightId, crossingNo, heading, controlTime)
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["sn"] = SharedPrefsMgr.getInstance().sn
map["data"] = GsonUtils.toJson(trafficLightRequestData)
getNetWorkApi().changeLight(map)
}

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt
View File

@@ -2,7 +2,7 @@ package com.mogo.eagle.function.biz.v2x.v2n
import android.os.Handler
import android.os.Looper
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.enums.CommunicationType
import com.mogo.eagle.core.data.enums.DataSourceType
import com.mogo.eagle.core.data.msgbox.MsgBoxBean
@@ -144,7 +144,7 @@ class V2XPoiLoader private constructor() {
*/
fun queryWholeRoadEvents() {
V2XRefreshModel.roadEventDispose()
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
val lineId = CallerAutoPilotStatusListenerManager.getLineId()
if (lineId > 0) {
realQueryV2xEvents(lineId.toString(), sn)

7
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt
View File

@@ -4,10 +4,10 @@ import com.elegant.network.utils.GsonUtil
import com.elegant.network.utils.SignUtil
import com.elegant.utils.CommonUtils
import com.mogo.cloud.network.RetrofitFactory
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.constants.HostConst
import com.mogo.commons.network.ParamsUtil
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.v2x.V2XEventData
import com.mogo.eagle.core.data.v2x.V2XLocation
import com.mogo.eagle.core.data.v2x.V2XMarkerResponse
@@ -19,7 +19,6 @@ 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.DeviceUtils
import com.mogo.eagle.function.biz.v2x.V2XBizTrace
import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
@@ -72,8 +71,8 @@ internal class V2XRefreshModel {
})
this["netType"] = CommonUtils.getNetworkType(AbsMogoApplication.getApp())
this["cellId"] = DeviceUtils.getCellId() ?: ""
this["sn"] = MoGoAiCloudClientConfig.getInstance().sn
this["ticket"] = MoGoAiCloudClientConfig.getInstance().token
this["sn"] = SharedPrefsMgr.getInstance().sn
this["ticket"] = SharedPrefsMgr.getInstance().token
this["sig"] = SignUtil.createSign(this, "JGjZx6")
this["data"] = GsonUtil.jsonFromObject(V2XRefreshEntity().apply {
limit = 999

7
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java
View File

@@ -22,9 +22,8 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager;
import com.mogo.eagle.function.biz.v2x.V2XBizTrace;
import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario;
import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.eagle.function.biz.v2x.v2n.utils.V2XEventAnalyticsManager;
import java.util.Objects;
@@ -116,9 +115,9 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
//占道施工预警
if (poiType.equals("10006") || poiType.equals("100061")) {
long currentTime = System.currentTimeMillis() / 1000;
long oldTime = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getLong("roadwork", 0);
long oldTime = SharedPrefsMgr.getInstance().getLong("roadwork", 0);
if (currentTime - oldTime > 60) { //超过一分钟，才会继续播报重复提醒
SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putLong("roadwork", System.currentTimeMillis() / 1000);
SharedPrefsMgr.getInstance().putLong("roadwork", System.currentTimeMillis() / 1000);
CallerAutoPilotControlManager.sendTripInfo(5, "", "", "", false);
}
}

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

@@ -1,6 +1,6 @@
package com.mogo.eagle.function.biz.v2x.v2n.utils
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.commons.utils.MogoAnalyticUtils
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.enums.CommunicationType
@@ -77,7 +77,7 @@ object V2XEventAnalyticsManager: IFuncBizProvider{
msgEventParams[EVENT_PARAMS_DATA_SOURCE] = dataSource.name //数据来源
msgEventParams[EVENT_PARAMS_COMMUNICATION_TYPE] = communicationType.name //通信类型
msgEventParams[EVENT_PARAMS_PLATE_NUMBER] = AppConfigInfo.plateNumber //车牌号
msgEventParams[EVENT_PARAMS_CAR_SN] = MoGoAiCloudClientConfig.getInstance().sn //鹰眼SN
msgEventParams[EVENT_PARAMS_CAR_SN] = SharedPrefsMgr.getInstance().sn //鹰眼SN
msgEventParams[EVENT_PARAMS_EYE_VERSION] = AppUtils.getAppVersionName() //鹰眼版本
msgEventParams[EVENT_PARAMS_LONGITUDE] = "${CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().longitude}" //经度
msgEventParams[EVENT_PARAMS_LATITUDE] = "${CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().latitude}" //纬度
@@ -99,7 +99,7 @@ object V2XEventAnalyticsManager: IFuncBizProvider{
msgEventParams[EVENT_PARAMS_DATA_SOURCE] = dataSource.name //数据来源
msgEventParams[EVENT_PARAMS_COMMUNICATION_TYPE] = communicationType.name //通信类型
msgEventParams[EVENT_PARAMS_PLATE_NUMBER] = AppConfigInfo.plateNumber //车牌号
msgEventParams[EVENT_PARAMS_CAR_SN] = MoGoAiCloudClientConfig.getInstance().sn //鹰眼SN
msgEventParams[EVENT_PARAMS_CAR_SN] = SharedPrefsMgr.getInstance().sn //鹰眼SN
msgEventParams[EVENT_PARAMS_EYE_VERSION] = AppUtils.getAppVersionName() //鹰眼版本
msgEventParams[EVENT_PARAMS_LONGITUDE] = "${CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().longitude}" //经度
msgEventParams[EVENT_PARAMS_LATITUDE] = "${CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().latitude}" //纬度

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt
View File

@@ -6,7 +6,7 @@ import android.os.Looper
import android.os.Message
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
import com.mogo.eagle.core.data.biz.trafficlight.currentRoadTrafficLight
import com.mogo.eagle.core.data.biz.trafficlight.isGreen
@@ -207,7 +207,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
",controlTime:$controlTime"
)
// 请求变灯成功，直接提示
if (it.sn == MoGoAiCloudClientConfig.getInstance().sn && it.code == 0) {
if (it.sn == SharedPrefsMgr.getInstance().sn && it.code == 0) {
V2XBizTrace.onAck("$M_V2X$TAG", "变灯请求成功")
val light = this.result?.currentRoadTrafficLight()
if (light != null && light.isGreen()) {

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/network/VipNetWorkModel.kt
View File

@@ -1,7 +1,7 @@
package com.mogo.eagle.function.biz.v2x.vip.network
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.HostConst
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseResponse
import com.mogo.eagle.core.data.v2x.VipRequest
import com.mogo.eagle.core.network.MoGoRetrofitFactory
@@ -20,7 +20,7 @@ class VipNetWorkModel {
request<BaseResponse<VipRequest>> {
loader {
apiCall {
getNetWorkApi().requestVip(MoGoAiCloudClientConfig.getInstance().sn)
getNetWorkApi().requestVip(SharedPrefsMgr.getInstance().sn)
}
}
onSuccess {

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

@@ -6,7 +6,7 @@ import android.os.Looper
import android.text.TextUtils
import com.google.gson.Gson
import com.mogo.eagle.core.function.chat.facade.gme.GMEApi
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.chat.UserInfo
import com.mogo.eagle.core.data.chat.socket.Message
import com.mogo.eagle.core.data.chat.socket.TeammateInfo
@@ -198,7 +198,7 @@ object MoGoChatFacade: IMoGoChatFacade {
}
} else {
val message = withContext(Dispatchers.Default) { Gson().fromJson(msg, Message::class.java) } ?: return@launch
if (message.type.toCallType() == CALL_TYPE_VOICE && message.snSender == MoGoAiCloudClientConfig.getInstance().sn) {
if (message.type.toCallType() == CALL_TYPE_VOICE && message.snSender == SharedPrefsMgr.getInstance().sn) {
return@launch
}
when(message.status) {
@@ -209,7 +209,8 @@ object MoGoChatFacade: IMoGoChatFacade {
if (GMEApi.isRoomEntered() && callType == CALL_TYPE_VEHICLE_TEAM) {
Logger.d(ChatConsts.TAG, "收到来电进房消息，此时正在车队通话。需要挂断电话")
try {
serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, message.snSender, message.roomId, PUSH_MSG_HANG_UP, message.type))
serverApi.requestConnectStatus(ConnectStatusParam(
SharedPrefsMgr.getInstance().sn, message.snSender, message.roomId, PUSH_MSG_HANG_UP, message.type))
} catch (t : Throwable) {
t.printStackTrace()
}
@@ -221,7 +222,7 @@ object MoGoChatFacade: IMoGoChatFacade {
CALL_TYPE_VEHICLE_TEAM -> {
if (callStatus.isReadyCalling()) {
try {
serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, message.snSender, message.roomId, PUSH_MSG_HANG_UP, message.type))
serverApi.requestConnectStatus(ConnectStatusParam(SharedPrefsMgr.getInstance().sn, message.snSender, message.roomId, PUSH_MSG_HANG_UP, message.type))
} catch (t : Throwable) {
t.printStackTrace()
}
@@ -241,7 +242,7 @@ object MoGoChatFacade: IMoGoChatFacade {
Logger.d(ChatConsts.TAG, "已经进房，收到被拒绝消息，则不处理(为兼容车队需求)，否则会引发退房操作")
return@launch
}
if (callStatus == READY_TO_CALL_RECEIVER && message.snReceiver == MoGoAiCloudClientConfig.getInstance().sn) {
if (callStatus == READY_TO_CALL_RECEIVER && message.snReceiver == SharedPrefsMgr.getInstance().sn) {
//如果当前是来电状态，并且收到拒绝消息，说明呼叫方呼出又挂断
Logger.d(ChatConsts.TAG, "呼叫方呼出后，又挂断")
onCallingInterrupt?.get()?.invoke(false, message.toUser())
@@ -251,7 +252,7 @@ object MoGoChatFacade: IMoGoChatFacade {
channel4SocketMsg.send(message)
}
CALL_TYPE_VEHICLE_TEAM -> {
if (callStatus == READY_TO_CALL_RECEIVER && message.snReceiver == MoGoAiCloudClientConfig.getInstance().sn) {
if (callStatus == READY_TO_CALL_RECEIVER && message.snReceiver == SharedPrefsMgr.getInstance().sn) {
//如果当前是来电状态，并且收到拒绝消息，说明呼叫方呼出又挂断
onCallingInterrupt?.get()?.invoke(true, message.toUser())
callStatus = INIT_CALL
@@ -274,7 +275,7 @@ object MoGoChatFacade: IMoGoChatFacade {
if (callStatus.isCalling()) {
//如果正在通话, 直接拒接
try {
serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, message.snSender, message.roomId, PUSH_MSG_DENY_ENTER, message.type))
serverApi.requestConnectStatus(ConnectStatusParam(SharedPrefsMgr.getInstance().sn, message.snSender, message.roomId, PUSH_MSG_DENY_ENTER, message.type))
} catch (t: Throwable) {
t.printStackTrace()
}
@@ -322,7 +323,7 @@ object MoGoChatFacade: IMoGoChatFacade {
send(CallState.Error(CallState.CODE_USER_IN_ROOM, "[Call] - 当前用户已经进入房间了"))
return@channelFlow
}
if (params.sn == MoGoAiCloudClientConfig.getInstance().sn) {
if (params.sn == SharedPrefsMgr.getInstance().sn) {
send(CallState.Error(CallState.CODE_CALL_MYSELF, "[Call] - 不能呼叫自己"))
return@channelFlow
}
@@ -341,7 +342,7 @@ object MoGoChatFacade: IMoGoChatFacade {
}
if (mySelf.get() == null || mySelf.get().isIncomplete()) {
try {
val pair = serverApi.queryUserInfo(MoGoAiCloudClientConfig.getInstance().sn)
val pair = serverApi.queryUserInfo(SharedPrefsMgr.getInstance().sn)
if (pair == null || pair.first != null || pair.second == null) {
send(CallState.Error(CallState.CODE_CALLER_USER_INFO_FAIL, "[Call] - 获取用户信息失败 - ${pair?.first?.msg}"))
return@channelFlow
@@ -557,7 +558,7 @@ object MoGoChatFacade: IMoGoChatFacade {
send(AnswerState.Error(AnswerState.CODE_ANSWER_STATE_ERROR, "[Answer] - 应答状态错误 -> 当前状态：${callStatus.toText()}"))
return@channelFlow
}
val mySn = MoGoAiCloudClientConfig.getInstance().sn
val mySn = SharedPrefsMgr.getInstance().sn
if (TextUtils.isEmpty(mySn)) {
send(AnswerState.Error(AnswerState.CODE_ANSWER_PARAMS_INCOMPLETE, "[Answer] - 当前用户/应答方- sn参数不存在"))
return@channelFlow
@@ -568,7 +569,7 @@ object MoGoChatFacade: IMoGoChatFacade {
}
if (mySelf.get() == null || mySelf.get().isIncomplete()) {
try {
val pair = serverApi.queryUserInfo(MoGoAiCloudClientConfig.getInstance().sn)
val pair = serverApi.queryUserInfo(SharedPrefsMgr.getInstance().sn)
if (pair == null || pair.first != null || pair.second == null) {
send(AnswerState.Error(AnswerState.CODE_CALLER_USER_INFO_FAIL, "[Answer] - 获取应答方用户信息失败"))
return@channelFlow
@@ -582,7 +583,7 @@ object MoGoChatFacade: IMoGoChatFacade {
//告之服务器给发送方下发接收通话消息
try {
val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
val response = serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, sn, roomId, PUSH_MSG_AGREE_ENTER, CALL_TYPE_VOICE.type).also {
val response = serverApi.requestConnectStatus(ConnectStatusParam(SharedPrefsMgr.getInstance().sn, sn, roomId, PUSH_MSG_AGREE_ENTER, CALL_TYPE_VOICE.type).also {
it.nickName = mySelf.get().name
it.headImgUrl = mySelf.get().icon
it.carInfo = mySelf.get().brand
@@ -725,7 +726,7 @@ object MoGoChatFacade: IMoGoChatFacade {
return@flow
}
try {
val response = serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, sn, roomId, PUSH_MSG_HANG_UP, callType.type))
val response = serverApi.requestConnectStatus(ConnectStatusParam(SharedPrefsMgr.getInstance().sn, sn, roomId, PUSH_MSG_HANG_UP, callType.type))
val code = response.code
if (code != 0 && code != 200) {
emit(HangUpState.Error(HangUpState.CODE_HANG_UP_API_ERROR, response.msg, mutableMapOf<String, String>().also {
@@ -753,7 +754,7 @@ object MoGoChatFacade: IMoGoChatFacade {
return@flow
}
try {
val response = serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, sn, 0, PUSH_MSG_DENY_ENTER, callType.type))
val response = serverApi.requestConnectStatus(ConnectStatusParam(SharedPrefsMgr.getInstance().sn, sn, 0, PUSH_MSG_DENY_ENTER, callType.type))
val code = response.code
if (code != 0 && code != 200) {
emit(RefuseState.Error(RefuseState.CODE_REFUSE_API_ERROR, response.msg, mutableMapOf<String, String>().also {
@@ -779,7 +780,7 @@ object MoGoChatFacade: IMoGoChatFacade {
send(InviteState.Error(InviteState.CODE_INVITE_STATE_ERROR, "[InviteTeam] - 当前正在语音通话"))
return@channelFlow
}
val mySn = MoGoAiCloudClientConfig.getInstance().sn
val mySn = SharedPrefsMgr.getInstance().sn
if (TextUtils.isEmpty(mySn)){
send(InviteState.Error(InviteState.CODE_INVITE_SN_NOT_IN, "[InviteTeam] - 当前车机sn不存在"))
return@channelFlow
@@ -929,7 +930,7 @@ object MoGoChatFacade: IMoGoChatFacade {
send(JoinState.Error(JoinState.CODE_INVITE_STATE_ERROR, "[JoinTeam]-当前车机不是来电状态: status -> ${callStatus.toText()}"))
return@channelFlow
}
val mySn = MoGoAiCloudClientConfig.getInstance().sn
val mySn = SharedPrefsMgr.getInstance().sn
if (TextUtils.isEmpty(mySn)){
send(JoinState.Error(JoinState.CODE_JOIN_SN_NOT_IN, "[JoinTeam] - 当前车机sn不存在"))
return@channelFlow
@@ -944,7 +945,7 @@ object MoGoChatFacade: IMoGoChatFacade {
}
if (mySelf.get() == null || mySelf.get().isIncomplete()) {
try {
val pair = serverApi.queryUserInfo(MoGoAiCloudClientConfig.getInstance().sn)
val pair = serverApi.queryUserInfo(SharedPrefsMgr.getInstance().sn)
if (pair == null || pair.first != null || pair.second == null) {
send(JoinState.Error(JoinState.CODE_CALLER_USER_INFO_FAIL, "[JoinTeam] - 获取呼叫方用户信息失败"))
return@channelFlow
@@ -959,7 +960,7 @@ object MoGoChatFacade: IMoGoChatFacade {
//告之服务器给发送方下发接收通话消息
try {
val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
val response = serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, sn, roomId, PUSH_MSG_AGREE_ENTER, CALL_TYPE_VEHICLE_TEAM.type).also {
val response = serverApi.requestConnectStatus(ConnectStatusParam(SharedPrefsMgr.getInstance().sn, sn, roomId, PUSH_MSG_AGREE_ENTER, CALL_TYPE_VEHICLE_TEAM.type).also {
it.nickName = mySelf.get().name
it.headImgUrl = mySelf.get().icon
it.carInfo = mySelf.get().brand

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

@@ -2,8 +2,8 @@ package com.mogo.eagle.core.function.chat.facade.net
import com.google.gson.Gson
import com.google.gson.JsonObject
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.HostConst
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseResponse
import com.mogo.eagle.core.data.chat.UserInfo
import com.mogo.eagle.core.function.api.chat.biz.ChatConsts
@@ -67,13 +67,13 @@ internal class ChatServiceModel {
suspend fun requestConnectStatus(params: ConnectStatusParam): BaseResponse<Any> {
val map = hashMapOf<String, String>()
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
params.lon = location.longitude
params.lat = location.latitude
Logger.d(ChatConsts.TAG, "connectStatusParam:$params")
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["sn"] = SharedPrefsMgr.getInstance().sn
map["data"] = Gson().toJson(params)
return if (params.type == CALL_TYPE_VOICE.type) {
apiCall {
@@ -91,7 +91,7 @@ internal class ChatServiceModel {
suspend fun inviteJoinVehicleTeam(param: CallRequestParam): BaseResponse<Any> {
val map = hashMapOf<String, String>()
Logger.d(ChatConsts.TAG, "inviteJoinVehicleTeam paras: $param")
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["sn"] = SharedPrefsMgr.getInstance().sn
map["data"] = Gson().toJson(param)
return apiCall {
getNetWorkApi()?.inviteJoinVehicleTeam(map)

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

@@ -1,7 +1,7 @@
package com.mogo.eagle.core.function.chat.facade.socket
import com.google.gson.Gson
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.chat.socket.HeartBeat
import com.mogo.eagle.core.function.api.chat.biz.ChatConsts
import com.mogo.eagle.core.function.chat.facade.consts.ChatHttp
@@ -47,13 +47,13 @@ internal object SocketConnectManager {
private val socketMsgSetting: ISocketMsgSetting = object : ISocketMsgSetting {
override fun getHandShakeMsg(): String {
Logger.d(ChatConsts.TAG, "getHandShakeMsg")
val socketMsg = HeartBeat(SOCKET_HAND_SHAKE, MoGoAiCloudClientConfig.getInstance().sn)
val socketMsg = HeartBeat(SOCKET_HAND_SHAKE, SharedPrefsMgr.getInstance().sn)
return Gson().toJson(socketMsg)
}
override fun getHeartBeatMsg(): String {
Logger.d(ChatConsts.TAG, "getHeartBeatMsg")
val socketMsg = HeartBeat(SOCKET_HEART_BEAT, MoGoAiCloudClientConfig.getInstance().sn, roomId.get())
val socketMsg = HeartBeat(SOCKET_HEART_BEAT, SharedPrefsMgr.getInstance().sn, roomId.get())
return Gson().toJson(socketMsg)
}
}

13
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
View File

@@ -6,7 +6,6 @@ import androidx.annotation.RequiresPermission
import bag_manager.BagManagerOuterClass
import chassis.SpecialVehicleTaskCmdOuterClass
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
import com.mogo.eagle.core.data.autopilot.toAutoPilotLine
@@ -39,7 +38,7 @@ import com.mogo.eagle.core.function.datacenter.autopilot.telematic.TeleMsgHandle
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.Companion.M_D_C
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.ParseVersionUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -173,10 +172,10 @@ class MoGoAutopilotControlProvider :
invokeNettyConnResult("连接成功的乘客屏sn为:$it")
}
}
}, MoGoAiCloudClientConfig.getInstance().sn)
}, SharedPrefsMgr.getInstance().sn)
} else {
NSDNettyManager.getInstance()
.searchAndConnectServer(context, MoGoAiCloudClientConfig.getInstance().sn,
.searchAndConnectServer(context, SharedPrefsMgr.getInstance().sn,
AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode),
object : NettyClientListener<MogoProtocolMsg> {
override fun onMessageResponseClient(
@@ -301,7 +300,7 @@ class MoGoAutopilotControlProvider :
override fun doInBackground(): String {
// 保存本地 AutoPilot IP地址
mContext?.let {
SharedPrefsMgr.getInstance(it).putString(MoGoConfig.AUTOPILOT_IP, autoPilotIp)
SharedPrefsMgr.getInstance().putString(MoGoConfig.AUTOPILOT_IP, autoPilotIp)
}
// 设置IP地址
AdasManager.getInstance().adasOptions.isClient = false
@@ -924,7 +923,7 @@ class MoGoAutopilotControlProvider :
NSDNettyManager.getInstance().connectSpecifiedServer(
ip,
NettyTcpServer.SERVER_PORT,
MoGoAiCloudClientConfig.getInstance().sn,
SharedPrefsMgr.getInstance().sn,
object : NettyClientListener<MogoProtocolMsg> {
override fun onMessageResponseClient(
msg: MogoProtocolMsg?,
@@ -974,7 +973,7 @@ class MoGoAutopilotControlProvider :
} else {// 乘客屏
CallerDevaToolsManager.getBindingCarInfo(
carConfigResp.macAddress,
MoGoAiCloudClientConfig.getInstance().sn
SharedPrefsMgr.getInstance().sn
)
invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}")
}

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

@@ -1,7 +1,7 @@
package com.mogo.eagle.core.function.datacenter.autopilot.adapter
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.debug.DebugConfig.*
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
@@ -125,7 +125,7 @@ class MoGoAdasMsgConnectStatusListenerImpl :
// 设置PAD-SN给工控,网络环境
AdasManager.getInstance()
.sendBasicInfoResp(
MoGoAiCloudClientConfig.getInstance().sn,
SharedPrefsMgr.getInstance().sn,
getEnvironment(),
getTerminalRole()
)

6
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt
View File

@@ -4,7 +4,7 @@ import android.util.Log
import androidx.lifecycle.ProcessLifecycleOwner
import androidx.lifecycle.lifecycleScope
import com.google.protobuf.TextFormat
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -116,7 +116,7 @@ class TeleMsgHandler : IMsgHandler {
listener?.connectDevice(!carConfig.dockVersion.contains("2.3.0"))
CallerDevaToolsManager.getBindingCarInfo(
carConfig.macAddress,
MoGoAiCloudClientConfig.getInstance().sn
SharedPrefsMgr.getInstance().sn
)
invokeNettyConnResult(
"司机屏发送给乘客屏配置信息为:${
@@ -243,7 +243,7 @@ class TeleMsgHandler : IMsgHandler {
}
10 -> {
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
if (!sn.isNullOrEmpty()) {
val snArray = sn.toByteArray()
NSDNettyManager.getInstance().sendMsgToSpecifiedClient(

6
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt
View File

@@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.constants.MoGoConfig
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.data.obu.MogoObuConst
import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuProvider
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.CommonUtils
/**
@@ -33,7 +33,7 @@ class MoGoObuProvider : IMoGoObuProvider {
mContext = context
mContext?.let {
val ipAddress =
SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, MogoObuConst.OBU_DEFAULT_IP)
SharedPrefsMgr.getInstance().getString(MoGoConfig.OBU_IP, MogoObuConst.OBU_DEFAULT_IP)
//mogo obu
MogoPrivateObuNewManager.INSTANCE.connectObu(
it,
@@ -52,7 +52,7 @@ class MoGoObuProvider : IMoGoObuProvider {
override fun connect(ipAddress: String) {
mContext?.let {
// 保存本地OBU IP地址
SharedPrefsMgr.getInstance(it).putString(MoGoConfig.OBU_IP, ipAddress)
SharedPrefsMgr.getInstance().putString(MoGoConfig.OBU_IP, ipAddress)
//连接 mogo obu
MogoPrivateObuNewManager.INSTANCE.connectObu(

6
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
View File

@@ -13,10 +13,10 @@ import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Lifecycle.Event
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.module.status.IMogoStatusChangedListener
import com.mogo.commons.module.status.MogoStatusManager
import com.mogo.commons.module.status.StatusDescriptor
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.deva.report.ReportEntity
@@ -374,7 +374,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
recordPanel.key.toString(), recordPanel.filename,
System.currentTimeMillis().toString(), recordPanel.stat.toString(),
AppConfigInfo.plateNumber, recordPanel.duration.toString(),
MoGoAiCloudClientConfig.getInstance().sn, BadCaseConfig.dockerVersion ?: "",
SharedPrefsMgr.getInstance().sn, BadCaseConfig.dockerVersion ?: "",
AppUtils.getAppVersionName(), lat.toString(), lon.toString()
)
//日志埋点
@@ -382,7 +382,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
"$M_DEVA$TAG",
"BadCase Receive Analytics=" + "key=" + recordPanel.key + " filename=" + recordPanel.filename +
" receiveTime=" + System.currentTimeMillis() + " stat=" + recordPanel.stat + " plateNumber=" + AppConfigInfo.plateNumber +
" totalDuration=" + recordPanel.duration + " carSn=" + MoGoAiCloudClientConfig.getInstance().sn + " mapVersion=" + BadCaseConfig.dockerVersion +
" totalDuration=" + recordPanel.duration + " carSn=" + SharedPrefsMgr.getInstance().sn + " mapVersion=" + BadCaseConfig.dockerVersion +
" eyeVersion=" + AppUtils.getAppVersionName() + " latitude=" + lat + " longitude=" + lon
)
}

4
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
View File

@@ -9,7 +9,7 @@ import android.view.*
import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.deva.badcase.AiDataEntity
import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
@@ -186,7 +186,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
itx["duration"] = "20" //采集时长，固定为20S
itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
itx["channel"] = "AI" //渠道
itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
itx["carSn"] = SharedPrefsMgr.getInstance().sn //SN
itx["userRole"] = "" //采集者角色
itx["audioUrl"] = "" //音频COS地址
itx["mapVersion"] = BadCaseConfig.dockerVersion ?: "" //工控机版本

10
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
View File

@@ -24,8 +24,8 @@ import com.iflytek.cloud.RecognizerListener
import com.iflytek.cloud.RecognizerResult
import com.iflytek.cloud.SpeechError
import com.iflytek.cloud.SpeechRecognizer
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
@@ -372,7 +372,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
if(file.exists()){
isUploadCos = true
LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,DebugConfig.isDebug(),
TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath,
TAG, SharedPrefsMgr.getInstance().sn,singlePath,
object : OnUploadListener {
override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) {
if(downloadUrl == null){
@@ -441,7 +441,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
itx["duration"] = BadCaseConfig.totalDuration.toString() //采集时长，固定为20S
itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
itx["channel"] = "1" //渠道
itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
itx["carSn"] = SharedPrefsMgr.getInstance().sn //SN
itx["userRole"] = BadCaseConfig.identity //采集者角色
itx["audioUrl"] = downloadUrl?:"" //音频COS地址
itx["mapVersion"] = BadCaseConfig.dockerVersion ?:"" //工控机版本
@@ -470,13 +470,13 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
}
val loc = getChassisLocationWGS84()
BadCaseAnalyticsManager.bagRecordUpload(recordKey.toString(),recordFileName?:"",uploadStamp,
"100",AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),MoGoAiCloudClientConfig.getInstance().sn,
"100",AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),SharedPrefsMgr.getInstance().sn,
BadCaseConfig.dockerVersion ?:"",AppUtils.getAppVersionName(),loc.latitude.toString(),loc.longitude.toString(),
BadCaseConfig.identity,downloadUrl?:"",uploadReasonTotal,System.currentTimeMillis().toString(),"1")
//日志
CallerLogger.i("$M_DEVA$TAG", "BadCase Initiative Analytics="+"key="+recordKey+" filename="+recordFileName+
" receiveTime="+uploadStamp+" stat="+"100"+" plateNumber="+AppConfigInfo.plateNumber+
" totalDuration="+ BadCaseConfig.totalDuration +" carSn="+MoGoAiCloudClientConfig.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
" totalDuration="+ BadCaseConfig.totalDuration +" carSn="+SharedPrefsMgr.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
" eyeVersion="+AppUtils.getAppVersionName()+" latitude="+ loc.latitude +" longitude="+ loc.longitude+
" identity="+BadCaseConfig.identity + " downloadUrl="+downloadUrl +" uploadReason="+uploadReasonTotal+
" uploadTime="+System.currentTimeMillis()+" channel="+"1")

10
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
View File

@@ -23,8 +23,8 @@ import com.iflytek.cloud.RecognizerListener
import com.iflytek.cloud.RecognizerResult
import com.iflytek.cloud.SpeechError
import com.iflytek.cloud.SpeechRecognizer
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
@@ -371,7 +371,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
if(file.exists()){
isUploadCos = true
LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext, DebugConfig.isDebug(),
TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath,
TAG, SharedPrefsMgr.getInstance().sn,singlePath,
object : OnUploadListener {
override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) {
if(downloadUrl == null){
@@ -441,7 +441,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
itx["duration"] = BadCaseConfig.totalDuration.toString() //采集时长，固定为20S
itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
itx["channel"] = "0" //渠道
itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
itx["carSn"] = SharedPrefsMgr.getInstance().sn //SN
itx["userRole"] = BadCaseConfig.identity //采集者角色
itx["audioUrl"] = downloadUrl?:"" //音频COS地址
itx["mapVersion"] = BadCaseConfig.dockerVersion ?:"" //工控机版本
@@ -472,13 +472,13 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
//被动上报埋点统计
val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
BadCaseAnalyticsManager.bagRecordUpload(recordKey?:"",recordFileName?:"",receiveTime?:System.currentTimeMillis().toString(),
stat,AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),MoGoAiCloudClientConfig.getInstance().sn,
stat,AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),SharedPrefsMgr.getInstance().sn,
BadCaseConfig.dockerVersion ?:"",AppUtils.getAppVersionName(),loc.latitude.toString(),loc.longitude.toString(),
BadCaseConfig.identity,downloadUrl?:"",uploadReasonTotal,System.currentTimeMillis().toString(),"0")
//日志
CallerLogger.i("$M_DEVA$TAG", "BadCase Passive Analytics="+"key="+recordKey+" filename="+recordFileName+
" receiveTime="+receiveTime+" stat="+"100"+" plateNumber="+AppConfigInfo.plateNumber+
" totalDuration="+ BadCaseConfig.totalDuration +" carSn="+MoGoAiCloudClientConfig.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
" totalDuration="+ BadCaseConfig.totalDuration +" carSn="+SharedPrefsMgr.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
" eyeVersion="+AppUtils.getAppVersionName()+" latitude="+ loc.latitude +" longitude="+ loc.longitude+
" identity="+BadCaseConfig.identity + " downloadUrl="+downloadUrl +" uploadReason="+uploadReasonTotal+
" uploadTime="+System.currentTimeMillis()+" channel="+"0")

30
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
View File

@@ -3,7 +3,6 @@ package com.zhjt.mogo_core_function_devatools.binding
import android.annotation.SuppressLint
import android.content.Context
import android.text.TextUtils
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.SharedPrefsConstants
import com.mogo.eagle.core.data.app.AppConfigInfo.role
import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -19,7 +18,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isDriver
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.zhjt.mogo_core_function_devatools.trace.TraceManager
import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager
@@ -54,8 +53,8 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
fun init(context: Context) {
mContext = context
SharedPrefsMgr.getInstance(mContext!!).putLong("typeDriver", 0)
SharedPrefsMgr.getInstance(mContext!!).putLong("typePassenger", 0)
SharedPrefsMgr.getInstance().putLong("typeDriver", 0)
SharedPrefsMgr.getInstance().putLong("typePassenger", 0)
CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
CallerCloudListenerManager.addListener(TraceManager.TAG, this)
ipcUpgradeManager.init(context)
@@ -73,11 +72,11 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
"${M_DEVA}${TAG}",
"onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} "
)
if (MoGoAiCloudClientConfig.getInstance().sn.isNullOrEmpty()) {
if (SharedPrefsMgr.getInstance().sn.isNullOrEmpty()) {
return
}
this.carConfigResp = carConfigResp
getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
getBindingCarInfo(carConfigResp.macAddress, SharedPrefsMgr.getInstance().sn)
}
}
@@ -115,7 +114,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
"${M_DEVA}${TAG}",
"getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType"
)
SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress)
SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_MAC, macAddress)
mWidevineIDWithMd5 = widevineIDWithMd5
if (screenType == 1) { //司机屏
driverScreen(macAddress, widevineIDWithMd5)
@@ -158,12 +157,12 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
private fun driverScreen(macAddress: String, widevineIDWithMd5: String) {
val currentHour = System.currentTimeMillis() / (1000 * 60)
val oldHour = SharedPrefsMgr.getInstance(
mContext!!
).getLong("typeDriver", 0)
//如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息
if (HmiBuildConfig.isShowSnBindingView) {
if (currentHour - oldHour > 1) {
SharedPrefsMgr.getInstance(mContext!!)
SharedPrefsMgr.getInstance()
.putLong("typeDriver", System.currentTimeMillis() / (1000 * 60))
BindingCarNetWorkManager.instance
.getBindingCarInfo(mContext!!, macAddress, widevineIDWithMd5, screenType)
@@ -173,14 +172,11 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
private fun passengerScreen(macAddress: String, widevineIDWithMd5: String) {
val currentHour = System.currentTimeMillis() / (1000 * 60)
val oldHour = SharedPrefsMgr.getInstance(
mContext!!
).getLong("typePassenger", 0)
val oldHour = SharedPrefsMgr.getInstance().getLong("typePassenger", 0)
//如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息
if (HmiBuildConfig.isShowSnBindingView) {
if (currentHour - oldHour > 1) {
SharedPrefsMgr.getInstance(mContext!!)
.putLong("typePassenger", System.currentTimeMillis() / (1000 * 60))
SharedPrefsMgr.getInstance().putLong("typePassenger", System.currentTimeMillis() / (1000 * 60))
BindingCarNetWorkManager.instance
.getBindingCarInfo(mContext!!, macAddress, widevineIDWithMd5, screenType)
}
@@ -212,7 +208,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
var macAddress = mAddress
if (TextUtils.isEmpty(macAddress)) {
CallerLogger.d(M_DEVA + "UPGRADE", "---- 2 ----")
macAddress = SharedPrefsMgr.getInstance(mContext!!)
macAddress = SharedPrefsMgr.getInstance()
.getString(SharedPrefsConstants.APP_MAC)
}
if (macAddress != null && !TextUtils.isEmpty(macAddress)) {
@@ -241,9 +237,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
"queryObuUpgrade isConnected = ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress"
)
ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(
if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(
mContext!!
).getString(SharedPrefsConstants.APP_MAC), obuVersionName
if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.APP_MAC), obuVersionName
)
}
}

8
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
View File

@@ -17,7 +17,7 @@ import com.mogo.eagle.core.network.utils.GsonUtil
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.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.zhjt.mogo_core_function_devatools.R
@@ -87,7 +87,7 @@ class BindingCarNetWorkManager private constructor() {
"msg" to info
)
)
SharedPrefsMgr.getInstance(context).putString(
SharedPrefsMgr.getInstance().putString(
SharedPrefsConstants.CAR_INFO,
GsonUtils.toJson(info.getData())
)
@@ -98,7 +98,7 @@ class BindingCarNetWorkManager private constructor() {
}
updateCarVrIconRes(info.getData().brandId)
} else {
SharedPrefsMgr.getInstance(context)
SharedPrefsMgr.getInstance()
.putString(SharedPrefsConstants.CAR_INFO, "")
e(
SceneConstant.M_DEVA + TAG,
@@ -108,7 +108,7 @@ class BindingCarNetWorkManager private constructor() {
}
override fun onError(e: Throwable) {
SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.CAR_INFO, "")
bindLog(mapOf("bindResult" to false, "msg" to e.toString()))
e(
SceneConstant.M_DEVA + TAG,

8
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt vendored
View File

@@ -6,7 +6,7 @@ import com.mogo.commons.constants.SharedPrefsConstants
import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.EnvConfig
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.Utils
@@ -15,11 +15,11 @@ object EnvChangeManager {
private val sp = Utils.getApp().getSharedPreferences("env_change", MODE_PRIVATE)
private fun updateCityCode(cityCode: String?) {
sp.edit().putString("city_code", cityCode).commit()
sp.edit().putString("city_code", cityCode).apply()
}
private fun updateNetMode(netMode: Int) {
sp.edit().putInt("net_mode", netMode).commit()
sp.edit().putInt("net_mode", netMode).apply()
}
private fun getConfig() : Pair<String, Int>? {
@@ -34,7 +34,7 @@ object EnvChangeManager {
fun getCityName(): String {
val cache = getConfig()
return if (cache == null) {
when(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
when(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.cityCode ?: SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
"010" -> "北京"
"0734" -> "衡阳"
else -> "未知"

5
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt
View File

@@ -1,7 +1,7 @@
package com.zhjt.mogo_core_function_devatools.funcconfig.network
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.HostConst
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseResponse
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.network.MoGoRetrofitFactory
@@ -10,7 +10,6 @@ import com.mogo.eagle.core.network.request
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst
import com.zhjt.service_biz.FuncConfig
class FuncConfigNetWorkModel {
@@ -41,7 +40,7 @@ class FuncConfigNetWorkModel {
}
loader {
apiCall {
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["sn"] = SharedPrefsMgr.getInstance().sn
map["mac"] = DeviceUtils.getMacAddress()
map["channelVersion"] = AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode)
getNetWorkApi().funcConfig(map)

24
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
View File

@@ -7,7 +7,6 @@ import android.os.Message
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.app.AppConfigInfo
@@ -22,10 +21,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.map.MogoData
import com.zhidao.loglib.bean.RemoteLogPushContent
import com.zhidao.loglib.call.LogInfoManagerFactory
import com.zhidao.loglib.core.ILogListener
@@ -66,8 +64,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
}
private fun logCheck(context: Context) {
val logger = SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
val loggerTime = SharedPrefsMgr.getInstance(context).getLong(MoGoConfig.CATCH_LOG_TIME, 0)
val logger = SharedPrefsMgr.getInstance().getBoolean(MoGoConfig.CATCH_LOG, false)
val loggerTime = SharedPrefsMgr.getInstance().getLong(MoGoConfig.CATCH_LOG_TIME, 0)
val logCatchDuration = (System.currentTimeMillis() - loggerTime) / 1000 / 60
if (logger && loggerTime > 0) {
val logTime: Int = if (10 - logCatchDuration < 1) {
@@ -161,7 +159,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
private fun startCatchLog(content: RemoteLogPushContent, logPrefixName: String? = null) {
CallerLogger.d("$M_DEVA$TAG", "startCatchLog path : ${content.pkgName + logPrefixName}")
if (MoGoAiCloudClientConfig.getInstance().sn == null) {
if (SharedPrefsMgr.getInstance().sn == null) {
ThreadUtils.runOnUiThread {
TipToast.shortTip("缺少设备唯一ID，请检查网络")
}
@@ -179,7 +177,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
openLoggerLevel()
logInfoManager = LogInfoManagerFactory.createPushLogInfoManager(
mContext,
MoGoAiCloudClientConfig.getInstance().sn,
SharedPrefsMgr.getInstance().sn,
AppConfigInfo.toString(),
logPrefixName?.replace("_", "-"),
mutableListOf(),
@@ -192,8 +190,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
}
handler.sendEmptyMessage(MSG_TRY_START_LOG)
SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, true)
SharedPrefsMgr.getInstance(mContext!!)
SharedPrefsMgr.getInstance().putBoolean(MoGoConfig.CATCH_LOG, true)
SharedPrefsMgr.getInstance()
.putLong(MoGoConfig.CATCH_LOG_TIME, System.currentTimeMillis())
}
@@ -210,8 +208,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
logInfoManager = null
closeLoggerLevel()
SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
SharedPrefsMgr.getInstance().putBoolean(MoGoConfig.CATCH_LOG, false)
SharedPrefsMgr.getInstance().putLong(MoGoConfig.CATCH_LOG_TIME, 0)
}
/**
@@ -252,8 +250,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
ThreadUtils.runOnUiThread {
closeLoggerLevel()
SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
SharedPrefsMgr.getInstance().putBoolean(MoGoConfig.CATCH_LOG, false)
SharedPrefsMgr.getInstance().putLong(MoGoConfig.CATCH_LOG_TIME, 0)
CallerDevaToolsListenerManager.invokeDevaToolsLogCatchClose()
}

5
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt
View File

@@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.NetworkUtils
import com.zhjt.mogo_core_function_devatools.trace.network.StartUpTraceNetWorkModel
import com.zhjt.service.chain.ChainLog
@@ -24,8 +25,8 @@ object SyncConfig {
fun update(context: Context) {
if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
AppConfigInfo.mogoSN = SharedPrefsMgr.getInstance().sn
AppConfigInfo.mogoToken = SharedPrefsMgr.getInstance().token
}
AppConfigInfo.netMode = DebugConfig.getNetMode()
AppConfigInfo.mapSdkVersion = DebugConfig.getMapVersion()

6
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
View File

@@ -13,7 +13,7 @@ import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.Utils
import com.zhidao.loglib.call.LogInfoManagerFactory
import com.zhidao.loglib.fw.FileWriteManager
@@ -39,7 +39,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
const val TAG = "TraceManager"
private const val TRACE_ENABLE = "TRACE_ENABLE"
private const val DELAY_UPLOAD = 60 * 60 * 1000L
private const val DELAY_UPLOAD = 10 * 60 * 1000L
val traceManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
TraceManager()
@@ -109,7 +109,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
}
CallerDevaToolsListenerManager.invokeDevaToolsFwThreadClose()
}
val traceEnable = SharedPrefsMgr.getInstance(context).getBoolean(TRACE_ENABLE,true)
val traceEnable = SharedPrefsMgr.getInstance().getBoolean(TRACE_ENABLE,true)
FileWriteManager.getInstance().setCloseRecord(traceEnable)
if(traceEnable){
delayUpload()

6
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kt
View File

@@ -3,7 +3,7 @@ package com.zhjt.mogo_core_function_devatools.upgrade
import android.content.Context
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -65,7 +65,7 @@ class IPCUpgradeManager: IMogoOnMessageListener<IPCUpgradeStateInfo> ,
//弹窗提示，确认是否进行工控机升级
CallerHmiManager.showAdUpgradeDialog(
it.images,
MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn,
SharedPrefsMgr.getInstance().sn,
releaseId)
}
}else{
@@ -89,7 +89,7 @@ class IPCUpgradeManager: IMogoOnMessageListener<IPCUpgradeStateInfo> ,
}
CallerHmiManager.showAdUpgradeDialog(
it.images,
MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn,
SharedPrefsMgr.getInstance().sn,
releaseId)
//将升级任务置为false
hasIPCUpgradeTask = false

4
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt
View File

@@ -1,7 +1,7 @@
package com.zhjt.mogo_core_function_devatools.upgrade
import com.mogo.cloud.passport.*
import com.mogo.commons.constants.*
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.obu.MogoObuConst.TAG_UPGRADE_OBU
import com.mogo.eagle.core.function.api.devatools.download.DownloadType.OBU
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.downLoadPackage
@@ -38,7 +38,7 @@ class ObuUpgradeAppNetWorkManager private constructor() {
// String mac1 = "48:b0:2d:4d:33:40";
scope.launch {
try {
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
d(SceneConstant.M_DEVA + TAG_UPGRADE_OBU, "getObuUpgradeInfo mac = $mac ---sn = $sn ---versionName = $versionName --host = ${HostConst.getHost()}")
val request = UpgradeAppRequest(sn, mac, "7", null, "0")
val requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request))

11
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt
View File

@@ -3,7 +3,6 @@ package com.zhjt.mogo_core_function_devatools.upgrade
import android.content.*
import android.util.*
import android.widget.Toast
import com.mogo.cloud.passport.*
import com.mogo.commons.constants.*
import com.mogo.commons.utils.*
import com.mogo.eagle.core.data.config.*
@@ -22,7 +21,7 @@ import com.mogo.eagle.core.utilcode.kotlin.*
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
import com.mogo.eagle.core.utilcode.mogo.logger.scene.*
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.*
import com.mogo.eagle.core.utilcode.util.FileUtils
import kotlinx.coroutines.*
@@ -56,10 +55,10 @@ class UpgradeAppNetWorkManager private constructor() {
fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) {
upgradeJob?.safeCancel()
scope.launch {
val sn = MoGoAiCloudClientConfig.getInstance().sn //null
val sn = SharedPrefsMgr.getInstance().sn
val macAddress = mac //"48:b0:2d:4d:31:7f"
val type = screenType //"10"
SharedPrefsMgr.getInstance(context!!).putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost())
SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost())
try {
val records = provider?.getUpgradeRecords()?.also {
MogoAnalyticUtils.track("AppUpgradeRecord", TreeMap<String, Any>().also { itx ->
@@ -80,7 +79,7 @@ class UpgradeAppNetWorkManager private constructor() {
provider?.recordUpgradeRecord(sn ?: "", macAddress, type, FunctionBuildConfig.isSupportPatchUpgrade)
provider?.recordUpgradeRequestStart()
val info = mUpgradeApiService.getUpgradeInfo(requestBody)
SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.APP_UPGRADE_CONTENT, if (info.result != null) GsonUtils.toJson(info) + "--mac:$macAddress --type:$type --sn:$sn --versionName:$versionName" else "info.result == null --mac:$macAddress --type:$type --sn:$sn --versionName:$versionName --versionCode:$versionCode")
SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_UPGRADE_CONTENT, if (info.result != null) GsonUtils.toJson(info) + "--mac:$macAddress --type:$type --sn:$sn --versionName:$versionName" else "info.result == null --mac:$macAddress --type:$type --sn:$sn --versionName:$versionName --versionCode:$versionCode")
if (info.result != null) {
provider?.recordUpgradeRequestSuccess(GsonUtils.toJson(info))
doUpgrade(info)
@@ -89,7 +88,7 @@ class UpgradeAppNetWorkManager private constructor() {
}
} catch (t: Throwable) {
t.printStackTrace()
SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.APP_UPGRADE_CONTENT,
SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_UPGRADE_CONTENT,
"$t--mac:$macAddress --type:$type --sn:$sn "
)
provider?.recordUpgradeRequestFailed(t.message ?: "更新接口请求失败")

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt
View File

@@ -5,7 +5,7 @@ import android.content.Context
import android.content.Intent
import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
/**
* 用于普通云公告的测试
@@ -27,7 +27,7 @@ class NoticeNormalBroadcastReceiver : BroadcastReceiver() {
"https://vd2.bdstatic.com/mda-mk1347dzxdmcre0y/sc/cae_h264/1635819498112313003/mda-mk1347dzxdmcre0y.mp4?v_from_s=hkapp-haokan-tucheng&auth_key=1635837585-0-0-5295f6658c7711ba7b4d3ef478a7fbaa&bcevod_channel=searchbox_feed&pd=1&pt=3&abtest=",
2
)
SharedPrefsMgr.getInstance(context).putInt("videoType", 1)
SharedPrefsMgr.getInstance().putInt("videoType", 1)
} catch (e: Exception) {
e.printStackTrace()
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
View File

@@ -17,9 +17,9 @@ import android.widget.FrameLayout
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
import com.mogo.cloud.live.manager.LiveStreamManagerImpl
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack
import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.biz.camera.CameraEntity
import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager
import com.mogo.eagle.core.function.hmi.R
@@ -67,7 +67,7 @@ class CameraListView : FrameLayout {
private val liveStreamManager by lazy {
LiveStreamManagerImpl.getInstance(
context.applicationContext as Application?,
MoGoAiCloudClientConfig.getInstance().sn,
SharedPrefsMgr.getInstance().sn,
false
)
}

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
View File

@@ -8,10 +8,10 @@ import android.widget.TextView
import androidx.lifecycle.LifecycleObserver
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.module.status.IMogoStatusChangedListener
import com.mogo.commons.module.status.MogoStatusManager
import com.mogo.commons.module.status.StatusDescriptor
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLonLat
import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStyleInfo
@@ -178,7 +178,7 @@ class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver {
private fun feedBackTraffic(i: Int) {
bizProvider.feedBackNoticeTraffic(
mPushData!!.infoId,
MoGoAiCloudClientConfig.getInstance().sn,
SharedPrefsMgr.getInstance().sn,
i
)
if (i == 1) {
@@ -343,7 +343,7 @@ class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver {
d(SceneConstant.M_HMI + TAG, "requestTrafficInfo")
bizProvider.requestAccidentInfo(
mPushData!!.infoId,
MoGoAiCloudClientConfig.getInstance().sn
SharedPrefsMgr.getInstance().sn
) { trafficInfo: NoticeTrafficStyleInfo ->
d(SceneConstant.M_HMI + TAG, "交通事故详情::$trafficInfo")
mTrafficStyleInfo = trafficInfo.getResult().accidentInfo

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

@@ -82,7 +82,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.mogo.permissions.BackgrounderPermission
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
import com.mogo.eagle.core.utilcode.util.*
import com.mogo.map.MogoData.Companion.mogoMapData
@@ -675,7 +675,7 @@ internal class DebugSettingView @JvmOverloads constructor(
// 初始化OBU IP信息
val ipAddress =
SharedPrefsMgr.getInstance(context)
SharedPrefsMgr.getInstance()
.getString(MoGoConfig.OBU_IP, MogoObuConst.OBU_DEFAULT_IP)
etObuIP.setText(ipAddress)
@@ -735,10 +735,10 @@ internal class DebugSettingView @JvmOverloads constructor(
}
tbIsStrictMode?.also {
it.isChecked = SharedPrefsMgr.getInstance(Utils.getApp())
it.isChecked = SharedPrefsMgr.getInstance()
.getBoolean("MOGO_STRICT_MODE_ENABLED", false)
it.setOnCheckedChangeListener { _, isChecked ->
SharedPrefsMgr.getInstance(Utils.getApp())
SharedPrefsMgr.getInstance()
.putBoolean("MOGO_STRICT_MODE_ENABLED", isChecked)
scope.launch {
ToastUtils.showShort("配置生效, 2秒后重启应用...")
@@ -1078,7 +1078,7 @@ internal class DebugSettingView @JvmOverloads constructor(
@SuppressLint("SetTextI18n")
private fun setEagleEyeConfigListener() {
//初始化刹车加速度阈值信息
val brakeThreshold = SharedPrefsMgr.getInstance(context)
val brakeThreshold = SharedPrefsMgr.getInstance()
.getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD, FunctionBuildConfig.accThreshold)
etInputBrakeThreshold.setText(brakeThreshold.toString())
etInputBrakeThreshold.text?.let { etInputBrakeThreshold.setSelection(brakeThreshold.toString().length) }
@@ -1091,7 +1091,7 @@ internal class DebugSettingView @JvmOverloads constructor(
try {
val thresholdStrFloat = thresholdStr.toFloat()
if (thresholdStrFloat < 0) {
SharedPrefsMgr.getInstance(context)
SharedPrefsMgr.getInstance()
.putFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD, thresholdStrFloat)
FunctionBuildConfig.accThreshold = thresholdStrFloat
ToastUtils.showShort("刹车阈值设置成功")
@@ -1394,10 +1394,10 @@ internal class DebugSettingView @JvmOverloads constructor(
/**
* 设置是否开启pre check, true-打开，false-关闭
*/
tbTraceEnable.isChecked = SharedPrefsMgr.getInstance(context).getBoolean("TRACE_ENABLE",true)
tbTraceEnable.isChecked = SharedPrefsMgr.getInstance().getBoolean("TRACE_ENABLE",true)
tbTraceEnable.setOnCheckedChangeListener { _, isChecked ->
HmiActionLog.hmiAction(TAG + "TRACE_ENABLE",isChecked)
SharedPrefsMgr.getInstance(context).putBoolean("TRACE_ENABLE",isChecked)
SharedPrefsMgr.getInstance().putBoolean("TRACE_ENABLE",isChecked)
CallerDevaToolsManager.setTraceEnable(isChecked)
}
@@ -1474,7 +1474,7 @@ internal class DebugSettingView @JvmOverloads constructor(
}
//开始停止抓取全量日志
tbLogCatch.isChecked =
SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
SharedPrefsMgr.getInstance().getBoolean(MoGoConfig.CATCH_LOG, false)
tbLogCatch.setOnCheckedChangeListener { _, isChecked ->
if (isChecked) {
var logTimeStr = etLogCatch.text?.toString()
@@ -1810,11 +1810,11 @@ internal class DebugSettingView @JvmOverloads constructor(
tvIpcInfoKey.text = it
}
tvCmdbCarInfoContent.text =
SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO) ?: ""
SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.CAR_INFO) ?: ""
//APP升级功能
tvAppHost.text = "HOST地址：" + SharedPrefsMgr.getInstance(context)
tvAppHost.text = "HOST地址：" + SharedPrefsMgr.getInstance()
.getString(SharedPrefsConstants.HOST_ADDRESS)
tvAppContent.text = "APP升级数据：" + SharedPrefsMgr.getInstance(context)
tvAppContent.text = "APP升级数据：" + SharedPrefsMgr.getInstance()
.getString(SharedPrefsConstants.APP_UPGRADE_CONTENT)
tvCarInfo.text =

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
View File

@@ -10,7 +10,7 @@ import com.mogo.eagle.core.data.temp.EventLogout
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.StringUtils
import kotlinx.android.synthetic.main.view_och_bus_operation.view.*
import org.greenrobot.eventbus.EventBus
@@ -28,7 +28,7 @@ class BusOperationView @JvmOverloads constructor(
init {
LayoutInflater.from(context).inflate(R.layout.view_och_bus_operation,this,true)
context?.let {
actvAccountPhone.text = phoneMask(SharedPrefsMgr.getInstance(it).getString("och_account",""))
actvAccountPhone.text = phoneMask(SharedPrefsMgr.getInstance().getString("och_account",""))
}
clickPersonalRightView()
clickQRBtn()
@@ -69,7 +69,7 @@ class BusOperationView @JvmOverloads constructor(
override fun onAttachedToWindow() {
super.onAttachedToWindow()
context?.let {
actvAccountPhone.text = phoneMask(SharedPrefsMgr.getInstance(it).getString("och_account",""))
actvAccountPhone.text = phoneMask(SharedPrefsMgr.getInstance().getString("och_account",""))
}
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt
View File

@@ -15,7 +15,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84Lis
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.utilcode.util.Utils
import kotlinx.android.synthetic.main.view_steering_brake.view.*
@@ -48,7 +48,7 @@ class SteeringBrakeView(context: Context, attrs: AttributeSet?) : ConstraintLayo
override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
//设置刹车信息,小于默认认为是刹车 //todo emArrow 优化sp获取，不要每次回调都去调用sp
brakeLight =
if (gnssInfo.acceleration < SharedPrefsMgr.getInstance(Utils.getApp()).getFloat(
if (gnssInfo.acceleration < SharedPrefsMgr.getInstance().getFloat(
MoGoConfig.BRAKE_ACCELERATION_THRESHOLD, -2.5f
)
) {

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

@@ -5,9 +5,9 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import com.mogo.cloud.live.manager.LiveStreamManagerImpl
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack
import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
@@ -107,7 +107,7 @@ class DriverMonitorView :
// 这里知只是了初始化下直播SDK，防止直接调用观看直播时候还未登录问题
LiveStreamManagerImpl.getInstance(
context.applicationContext as Application?,
MoGoAiCloudClientConfig.getInstance().sn,
SharedPrefsMgr.getInstance().sn,
false
)
} ?: let {

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

@@ -11,7 +11,7 @@ import android.view.animation.LinearInterpolator
import android.widget.ImageView
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoParallelDrivingActionsListener
@@ -26,7 +26,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.zhjt.mogo.adas.data.bean.UnableLaunchReason
import mogo.yycp.paralleldriving.protocol.ParallelDrivingRequest.ParallelRequest
import mogo.yycp.paralleldriving.protocol.ParallelTaskProcessNoticeOuterClass
@@ -366,7 +365,7 @@ class ParallelDriveView @JvmOverloads constructor(
}
private fun reqParaDrive() {
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
val parallelRequest = ParallelRequest.newBuilder()
.setSn(sn)
.setType(2)// 2:鹰眼请求
@@ -379,7 +378,7 @@ class ParallelDriveView @JvmOverloads constructor(
}
private fun cancelParaDrive() {
val sn = MoGoAiCloudClientConfig.getInstance().sn
val sn = SharedPrefsMgr.getInstance().sn
val parallelRequest = ParallelRequest.newBuilder()
.setSn(sn)
.setType(2)// 2:鹰眼请求

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
View File

@@ -77,12 +77,12 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
AbsMogoApplication.sApp = this;
ThreadOptInitializer.init();
/*如果是主进程**/
// if (ProcessUtils.isMainProcess(this)) {
AppLaunchTimeUtils.beginTimeCalculate(AppLaunchTimeUtils.COLD_START);
// }
BoostMultiDex.install(base);
AbsMogoApplication.sApp = this;
}
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java
View File

@@ -25,7 +25,7 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager;
import com.mogo.eagle.core.function.hmi.R;
import com.mogo.eagle.core.function.main.moujie.BluetoothMonitorReceiver;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.rousetime.android_startup.model.CostTimesModel;
import com.zhjt.service.chain.ChainLog;
@@ -199,7 +199,7 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte
isConnectedMethod.setAccessible(true);
// boolean isConnected = (boolean) isConnectedMethod.invoke(device, (Object[]) null);
if (device.getName().equals("MINI_KEYBOARD")) {
SharedPrefsMgr.getInstance(getContext()).putString("BLUETOOTH", device.getName());
SharedPrefsMgr.getInstance().putString("BLUETOOTH", device.getName());
}
} catch (NoSuchMethodException e) {
e.printStackTrace();

8
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java
View File

@@ -5,10 +5,6 @@ import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import android.widget.Toast;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import org.greenrobot.eventbus.EventBus;
@@ -45,11 +41,11 @@ public class BluetoothMonitorReceiver extends BroadcastReceiver {
case BluetoothDevice.ACTION_ACL_CONNECTED:
// Toast.makeText(context, "蓝牙设备已连接", Toast.LENGTH_SHORT).show();
// SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", true);
// SharedPrefsMgr.getInstance().putBoolean("BLUETOOTH", true);
break;
case BluetoothDevice.ACTION_ACL_DISCONNECTED:
// SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", false);
// SharedPrefsMgr.getInstance().putBoolean("BLUETOOTH", false);
// Toast.makeText(context, "蓝牙设备已断开", Toast.LENGTH_SHORT).show();
EventBus.getDefault().post(new ConnectBluetoothEvent());
break;

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt
View File

@@ -1,7 +1,7 @@
package com.mogo.eagle.core.function.business.ai.net
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.HostConst.getEagleHost
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseResponse
import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.END_METRE
import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.START_METRE
@@ -32,7 +32,7 @@ class AiCloudIdentifyNetWorkModel private constructor() {
loader {
apiCall {
val map = mutableMapOf<String, Any>()
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["sn"] = SharedPrefsMgr.getInstance().sn
map["status"] = dataReceive
map["startMetre"] = START_METRE
map["endMetre"] = END_METRE

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

@@ -5,7 +5,7 @@ import android.text.TextUtils
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.cloud.passport.IMoGoTokenCallback
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.data.map.MogoLocation
@@ -67,7 +67,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
}
})
executor.get()?.setOnTaskListener(this)
val carSn = MoGoAiCloudClientConfig.getInstance().sn
val carSn = SharedPrefsMgr.getInstance().sn
if (!TextUtils.isEmpty(carSn)) {
executor.get()?.setCarSn(carSn)
}

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

@@ -13,11 +13,11 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.cloud.passport.location.ICurrentLocation
import com.mogo.cloud.passport.location.SimpleLocation
import com.mogo.cloud.socket.SocketBuildConfig
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.constants.SharedPrefsConstants
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.module.status.MogoStatusManager
import com.mogo.commons.network.NetConfigUtils
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.commons.utils.MogoAnalyticUtils
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_CLOUD_INIT
@@ -38,8 +38,11 @@ import com.mogo.eagle.core.function.startup.stageone.secret.IPassportSecret
import com.mogo.eagle.core.function.startup.stageone.secret.PassPortSecret
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAIN
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.*
import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.mogo.eagle.core.utilcode.util.ProcessUtils
import com.mogo.eagle.core.utilcode.util.ThreadPoolService
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.rousetime.android_startup.AndroidStartup
import com.zhjt.service.chain.ChainLog
import kotlin.properties.Delegates
@@ -109,10 +112,13 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
when (DebugConfig.getNetMode()) {
DebugConfig.NET_MODE_DEV -> clientConfig.netMode =
MoGoAiCloudClientConfig.HTTP_DNS_ENV_DEV
DebugConfig.NET_MODE_QA -> clientConfig.netMode =
MoGoAiCloudClientConfig.HTTP_DNS_ENV_QA
DebugConfig.NET_MODE_DEMO -> clientConfig.netMode =
MoGoAiCloudClientConfig.HTTP_DNS_ENV_DEMO
else -> clientConfig.netMode = MoGoAiCloudClientConfig.HTTP_DNS_ENV_RELEASE
}
// 设置是否是第三APP登录
@@ -217,6 +223,8 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
override fun onTokenGot(token: String, sn: String) {
clientConfig.token = token
clientConfig.sn = sn
SharedPrefsMgr.getInstance().putToken(token)
SharedPrefsMgr.getInstance().putSn(sn)
// 由于存在token过期问题，在更新后会回调至此处，增加二次判定
if (!gotToken) {
CallerLogger.d("$M_MAIN$TAG", "onTokenGot token : $token , sn :$sn")
@@ -255,11 +263,11 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
if (FunctionBuildConfig.isSecure) {
context?.let {
val authStatus =
SharedPrefsMgr.getInstance(it)
SharedPrefsMgr.getInstance()
.getBoolean("securityKey-${DebugConfig.getNetMode()}", false)
if (authStatus) {
// clientConfig设置auth值，并带入header
clientConfig.authPubKey = SharedPrefsMgr.getInstance(it)
clientConfig.authPubKey = SharedPrefsMgr.getInstance()
.getString("securityKey-${DebugConfig.getNetMode()}", "")
return@let
}
@@ -280,12 +288,12 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
"onSuccess securityKey:$securityKey , thread:${Thread.currentThread().name}"
)
clientConfig.securityKey = securityKey
SharedPrefsMgr.getInstance(it)
SharedPrefsMgr.getInstance()
.putString(
"securityKey-${DebugConfig.getNetMode()}",
securityKey
)
SharedPrefsMgr.getInstance(it)
SharedPrefsMgr.getInstance()
.putBoolean("securityKey-${DebugConfig.getNetMode()}", true)
}
@@ -409,20 +417,11 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
private fun getDefaultSimpleLocation(): SimpleLocation {
val ciyCode =
SharedPrefsMgr.getInstance(
AbsMogoApplication.getApp()
)
.getString(SharedPrefsConstants.LOCATION_CITY_CODE)
SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_CITY_CODE)
val latitude =
SharedPrefsMgr.getInstance(
AbsMogoApplication.getApp()
)
.getString(SharedPrefsConstants.LOCATION_LATITUDE)
SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_LATITUDE)
val longitude =
SharedPrefsMgr.getInstance(
AbsMogoApplication.getApp()
)
.getString(SharedPrefsConstants.LOCATION_LONGITUDE)
SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_LONGITUDE)
return try {
SimpleLocation(
ciyCode, latitude.toDouble(), longitude.toDouble()