diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java index d8a11924af..38fcd59b86 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * 中止/结束任务请求 @@ -10,7 +10,7 @@ public class BusCloseTaskRequest { private String sn; private int taskId; public BusCloseTaskRequest(int taskId) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.taskId = taskId; } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java index 96d4435ef4..11b865f15c 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; public /** @@ -15,7 +15,7 @@ class BusOperationStatusRequest { private double lat; private double lon; public BusOperationStatusRequest(double lon, double lat) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.lat = lat; this.lon = lon; } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java index adf7878ec5..f6c9828873 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * @author congtaowang @@ -12,6 +12,6 @@ public class BusQueryLineStationsRequest { private String sn; public BusQueryLineStationsRequest() { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); } } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java index 7de15dae2c..5edd0e8574 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * @author: wangmingjun @@ -11,7 +11,7 @@ public class BusResetDrivingLineRequest { public int taskId; //切换到的线路id public BusResetDrivingLineRequest(int taskId) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.taskId = taskId; } } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java index 595ceafce3..e3642a892e 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; public /** @@ -13,7 +13,7 @@ class BusResetLineStatusRequest { private String sn; public BusResetLineStatusRequest() { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); } public String getSn() { diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java index 93ff4b5457..e513b18f3c 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * @author congtaowang @@ -16,7 +16,7 @@ public class BusUpdateSiteStatusRequest { public int siteId;//站点id public BusUpdateSiteStatusRequest(int taskId,int siteId,int seq) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.seq = seq; this.siteId = siteId; this.taskId = taskId; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java index 708819e436..da4e012782 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.eagle.core.data.BaseData; import java.util.List; @@ -15,7 +15,7 @@ public class BusWriteOffPassengersQueryRequest { private int siteId; private long verificationTime; public BusWriteOffPassengersQueryRequest(int taskId, int siteId,long prePassengerTime) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.taskId = taskId; this.siteId = siteId; this.verificationTime = prePassengerTime; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java index 443fd76211..72e5a3a68f 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * 查询下车乘客请求参数 @@ -13,7 +13,7 @@ public class QueryLeaveAwayPassengersRequest { private int siteId; //站点id public QueryLeaveAwayPassengersRequest(int seq, int siteId) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.seq = seq; this.siteId = siteId; } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 4681a95981..081d51b701 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -16,7 +16,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Group; import com.alibaba.android.arouter.launcher.ARouter; -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.temp.EventLogout; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -132,7 +132,7 @@ public class BusFragment extends BaseBusTabFragment }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码 CallerLogger.d(M_BUS + TAG,"changeOverview Event qrcode"); String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(), - MoGoAiCloudClientConfig.getInstance().getSn()); + SharedPrefsMgr.getInstance().getSn()); Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture( BitmapFactory.decodeResource(getResources(), R.drawable.icon_qr_center_logo) ,qrUrl, AutoSizeUtils.dp2px(getContext(),340f), diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java index f863019acf..e7418f4d37 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java @@ -3,7 +3,7 @@ package com.mogo.och.bus.model; import android.content.Context; import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.bus.R; @@ -121,7 +121,7 @@ public class BusLineModel { OrderServiceManager.switchLine(mContext,taskId, new OchCommonServiceCallback() { @Override public void onSuccess(BusRoutesResponse o) { - SharedPrefsMgr.getInstance(mContext).putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId); + SharedPrefsMgr.getInstance().putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId); if (mBusLinesCallback != null){ mBusLinesCallback.onChangeLineIdSuccess(); } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt index 884d342eac..bc6fc62a01 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt @@ -5,6 +5,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.bus.bean.* import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback @@ -36,8 +37,8 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.queryBusRoutes( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusRoutes")) @@ -45,7 +46,7 @@ object OrderServiceManager { }else{ M_SERVICE.queryBusRoutes( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusQueryLineStationsRequest() ) .transformTry() @@ -70,7 +71,7 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.switchLine( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusResetDrivingLineRequest(taskId) ) .transformTry() @@ -78,7 +79,7 @@ object OrderServiceManager { }else{ M_SERVICE.switchLine( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusResetDrivingLineRequest(taskId) ) .transformTry() @@ -98,7 +99,7 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.abortTask( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusCloseTaskRequest(taskId) ) .transformTry() @@ -106,7 +107,7 @@ object OrderServiceManager { }else{ M_SERVICE.abortTask( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusCloseTaskRequest(taskId) ) .transformTry() @@ -125,7 +126,7 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.endTask( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusCloseTaskRequest(taskId) ) .transformTry() @@ -133,7 +134,7 @@ object OrderServiceManager { }else{ M_SERVICE.endTask( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusCloseTaskRequest(taskId) ) .transformTry() @@ -160,7 +161,7 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.leaveStation( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusUpdateSiteStatusRequest(taskId, siteId, seq) ) .transformTry() @@ -168,7 +169,7 @@ object OrderServiceManager { }else{ M_SERVICE.leaveStation( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusUpdateSiteStatusRequest(taskId, siteId, seq) ) .transformTry() @@ -191,7 +192,7 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.arriveSiteStation( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusUpdateSiteStatusRequest(taskId, siteId, seq) ) .transformTry() @@ -199,7 +200,7 @@ object OrderServiceManager { }else{ M_SERVICE.arriveSiteStation( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusUpdateSiteStatusRequest(taskId, siteId, seq) ) .transformTry() @@ -223,7 +224,7 @@ object OrderServiceManager { ) { M_SERVICE.queryStationLeaveAwayPassengers( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, QueryLeaveAwayPassengersRequest(seq, siteId) ) .transformTry() @@ -246,7 +247,7 @@ object OrderServiceManager { ) { M_SERVICE.queryWriteOffPassengers( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusWriteOffPassengersQueryRequest(taskId, siteId, prePassengerTime) ) .transformTry() @@ -263,16 +264,16 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.queryBusOrders( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusOrders")) }else{ M_SERVICE.queryBusOrders( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusOrders")) @@ -283,16 +284,16 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.queryBusLines( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines")) }else{ M_SERVICE.queryBusLines( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines")) @@ -308,7 +309,7 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.queryBusTaskByLineId( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, lineId ) .transformTry() @@ -316,7 +317,7 @@ object OrderServiceManager { }else{ M_SERVICE.queryBusTaskByLineId( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, lineId ) .transformTry() @@ -335,9 +336,9 @@ object OrderServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ M_SAAS_SERVICE.updateOrderRoute( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusRoutePlanningUpdateReqBean( - MoGoAiCloudClientConfig.getInstance().sn, lineId, startSiteId, endSiteId, points + SharedPrefsMgr.getInstance().sn, lineId, startSiteId, endSiteId, points ) ) .transformTry() @@ -345,9 +346,9 @@ object OrderServiceManager { }else{ M_SERVICE.updateOrderRoute( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusRoutePlanningUpdateReqBean( - MoGoAiCloudClientConfig.getInstance().sn, lineId, startSiteId, endSiteId, points + SharedPrefsMgr.getInstance().sn, lineId, startSiteId, endSiteId, points ) ) .transformTry() @@ -372,9 +373,9 @@ object OrderServiceManager { }else{ M_SERVICE.runCarHeartbeat( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, CarHeartbeatReqBean( - MoGoAiCloudClientConfig.getInstance().sn, lon, lat + SharedPrefsMgr.getInstance().sn, lon, lat ) ) .transformTry() diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt index 6a52618adb..55e1c742a0 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt @@ -12,6 +12,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl import com.mogo.och.common.module.biz.network.interceptor.transformTry @@ -46,14 +47,14 @@ object OchCommonServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ mLoginSaasServiceApi.getPhoneCode( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginSmsReqBean(phone) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode")) }else{ mLoginServiceApi.getPhoneCode( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginSmsReqBean(phone) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode")) @@ -71,18 +72,18 @@ object OchCommonServiceManager { location4Login: TaxiLoginReqBean.Location4Login?, callback: OchCommonServiceCallback? ) { - val sn = MoGoAiCloudClientConfig.getInstance().sn + val sn = SharedPrefsMgr.getInstance().sn if (DebugConfig.getProjectFlavor().contains("saas")){ mLoginSaasServiceApi.gotoLoginBycode4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginReqBean(phone, code, sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode")) }else{ mLoginServiceApi.gotoLoginBycode4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginReqBean(phone, code, sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode")) } @@ -100,14 +101,14 @@ object OchCommonServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ mLoginSaasServiceApi.logout4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login) + SharedPrefsMgr.getInstance().token, + TaxiLogoutReqBean(SharedPrefsMgr.getInstance().sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout")) }else{ mLoginServiceApi.logout4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login) + SharedPrefsMgr.getInstance().token, + TaxiLogoutReqBean(SharedPrefsMgr.getInstance().sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout")) } } @@ -123,7 +124,7 @@ object OchCommonServiceManager { context: Context, callback: OchCommonServiceCallback? ) { - if (MoGoAiCloudClientConfig.getInstance().token.isEmpty()) { + if (SharedPrefsMgr.getInstance().token.isEmpty()) { callback?.onFail(OchCommonConst.WAIT_TAKEN, "等待令牌中请稍等") MoGoAiCloudClient.getInstance().refreshToken() return @@ -131,15 +132,15 @@ object OchCommonServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ mLoginSaasServiceApi.queryDriverServiceStatusAndLoginStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus")) }else{ mLoginServiceApi.queryDriverServiceStatusAndLoginStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus")) } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt index eff63dd20b..412574bdc4 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt @@ -12,7 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.mogo.commons.mvp.MvpActivity -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.bus.presenter.BusLinePresenter import com.mogo.och.bus.ui.adapter.SwitchLineAdapter import com.mogo.och.bus.bean.BusQueryLinesResponse @@ -118,7 +118,7 @@ class BusSwitchLineActivity : MvpActivity showNoData(true) return } - val lastCommitLineid = SharedPrefsMgr.getInstance(this).getInt(LASTCOMMITLINEID, -1) + val lastCommitLineid = SharedPrefsMgr.getInstance().getInt(LASTCOMMITLINEID, -1) if (data.data != null && data.data.size > 0) { showNoData(false) mData.clear() diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt index 28aa596788..8a43a1137e 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt @@ -1,8 +1,8 @@ package com.mogo.och.bus.util import android.text.TextUtils -import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig +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.function.api.autopilot.IMoGoAutopilotStatusListener @@ -76,7 +76,7 @@ object BusAnalyticsManager { clearStartAutopilotParams() //清空参数数据，防止误传 } else { val plateNum = AppConfigInfo.plateNumber - mStartAutopilotParams[BusConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + mStartAutopilotParams[BusConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn mStartAutopilotParams[BusConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum mStartAutopilotParams[BusConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE mStartAutopilotParams[BusConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) @@ -102,7 +102,7 @@ object BusAnalyticsManager { ) { val plateNum = AppConfigInfo.plateNumber val params = HashMap() - params[BusConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + params[BusConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn params[BusConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum params[BusConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE params[BusConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt index 2dc3afbc48..1e8c2ea0fa 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt @@ -32,7 +32,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger 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.Companion.M_BUS_P -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils @@ -69,8 +69,6 @@ import com.mogo.och.common.module.utils.PinYinUtil import mogo.telematics.pad.MessagePad import mogo.telematics.pad.MessagePad.ArrivalNotification import mogo.telematics.pad.MessagePad.GlobalPathResp -import system_master.SsmInfo -import system_master.SystemStatusInfo import java.util.concurrent.ConcurrentHashMap /** @@ -576,7 +574,7 @@ object BusPassengerModel { } if (mTwoStationsRouts.size > 0) { val sumLength = calculateRouteSumLength(mTwoStationsRouts) - SharedPrefsMgr.getInstance(mContext!!) + SharedPrefsMgr.getInstance() .putInt(BusPassengerConst.BUS_SP_KEY_ORDER_SUM_DIS, sumLength.toInt()) mAutopilotPlanningCallback?.updateTotalDistance() } diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt index 94ab982151..8d92a70a56 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt @@ -8,6 +8,7 @@ import com.mogo.commons.debug.DebugConfig import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl @@ -51,14 +52,14 @@ object BusPassengerServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ mBusPassengerSaasServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) }else{ mBusPassengerServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusPassengerQueryLineRequest( driverAppSn ) @@ -81,7 +82,7 @@ object BusPassengerServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ mBusPassengerSaasServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ) .transformTry() @@ -89,7 +90,7 @@ object BusPassengerServiceManager { }else{ mBusPassengerServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ) .transformTry() diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index b1a51e6a45..e576d70bc2 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -20,7 +20,7 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.och.bus.passenger.R; import com.mogo.och.bus.passenger.adapter.BusPassengerLineStationsAdapter; import com.mogo.och.bus.passenger.bean.BusPassengerStation; @@ -335,7 +335,7 @@ public class BusPassengerRouteFragment extends } if (currentStationIndex == 0 && isArrived){ //到达始发站且并未出发， 恢复站点marker 清楚路径 清空路径点 - SharedPrefsMgr.getInstance(getContext()) + SharedPrefsMgr.getInstance() .remove(BusPassengerConst.BUS_SP_KEY_ORDER_SUM_DIS); clearMapView(); } diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt index f3c9406e08..1288b4a06e 100644 --- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt @@ -5,6 +5,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getSer import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse @@ -53,14 +54,14 @@ object PM2ServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ mBusPassengerSaasServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) }else{ mBusPassengerServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusPassengerQueryLineRequest( driverAppSn ) @@ -81,7 +82,7 @@ object PM2ServiceManager { ) { mBusPassengerServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ) .transformTry() @@ -89,7 +90,7 @@ object PM2ServiceManager { if (DebugConfig.getProjectFlavor().contains("saas")){ mBusPassengerSaasServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ) .transformTry() @@ -97,7 +98,7 @@ object PM2ServiceManager { }else{ mBusPassengerServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ) .transformTry() diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index c670bad905..350aa1d261 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -14,7 +14,7 @@ import com.magic.mogo.och.charter.constant.CharterConst.Companion.LOOP_PERIOD_60 import com.magic.mogo.och.charter.net.login.LoginDriverM1Impl import com.magic.mogo.och.charter.presenter.DriverM1Presenter import com.magic.mogo.och.charter.view.SlidePanelView -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.temp.EventLogout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -131,9 +131,9 @@ class DriverM1Fragment : CharterBaseFragment?){ mDriverM1ServiceApi.queryBusinessStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn )?.transformTry() ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "queryCurrentServiceStatus")) } @@ -56,8 +56,8 @@ object DriverM1ServiceManager { fun queryCurrentOrder(context: Context?, callback: OchCommonServiceCallback?){ mDriverM1ServiceApi.queryCurrentOrder(MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn )?.transformTry() ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "queryCurrentOrder")) } @@ -65,8 +65,8 @@ object DriverM1ServiceManager { fun checkOrderCountDown(context: Context?, callback: OchCommonServiceCallback?){ mDriverM1ServiceApi.checkOrderCountDown(MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn )?.transformTry() ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "checkOrderCountDown")) } @@ -74,8 +74,8 @@ object DriverM1ServiceManager { fun changeDest(context: Context?,lineId: Int,startSiteId: Int,siteId: Int,writeVersion: Long, callback: OchCommonServiceCallback?){ mDriverM1ServiceApi.changeDest(MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - RequestChangeDest(MoGoAiCloudClientConfig.getInstance().sn,lineId,startSiteId,siteId, + SharedPrefsMgr.getInstance().token, + RequestChangeDest(SharedPrefsMgr.getInstance().sn,lineId,startSiteId,siteId, writeVersion) )?.transformTry() ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "changeDest")) @@ -84,17 +84,17 @@ object DriverM1ServiceManager { fun arriveDest(context: Context,lindId: Long ,writeVersion:Long ,callback: OchCommonServiceCallback?){ mDriverM1ServiceApi.arriveDest(MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - ArriveDestRequest(MoGoAiCloudClientConfig.getInstance().sn,lindId,writeVersion) + SharedPrefsMgr.getInstance().token, + ArriveDestRequest(SharedPrefsMgr.getInstance().sn,lindId,writeVersion) ).transformTry() - .subscribe(OchCommonSubscribeImpl(context!!, callback, "arriveDest")) + .subscribe(OchCommonSubscribeImpl(context, callback, "arriveDest")) } fun checkoutContrail(context: Context?,lineId: Int, callback: OchCommonServiceCallback?){ mDriverM1ServiceApi.checkoutContrail(MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn, + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn, lineId )?.transformTry() ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "checkOrderCountDown")) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt index f18a23fb7b..68412ada11 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt @@ -11,6 +11,7 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl import com.mogo.och.common.module.biz.network.interceptor.transformTry @@ -39,7 +40,7 @@ object OchCommonServiceManager { ) { mLoginServiceApi.getPhoneCode( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginSmsReqBean(phone) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode")) @@ -56,10 +57,10 @@ object OchCommonServiceManager { location4Login: TaxiLoginReqBean.Location4Login?, callback: OchCommonServiceCallback? ) { - val sn = MoGoAiCloudClientConfig.getInstance().sn + val sn = SharedPrefsMgr.getInstance().sn mLoginServiceApi.gotoLoginBycode4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginReqBean(phone, code, sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode")) } @@ -75,8 +76,8 @@ object OchCommonServiceManager { ) { mLoginServiceApi.logout4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login) + SharedPrefsMgr.getInstance().token, + TaxiLogoutReqBean(SharedPrefsMgr.getInstance().sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout")) } @@ -91,15 +92,15 @@ object OchCommonServiceManager { context: Context, callback: OchCommonServiceCallback? ) { - if (MoGoAiCloudClientConfig.getInstance().token.isEmpty()) { + if (SharedPrefsMgr.getInstance().token.isEmpty()) { callback?.onFail(OchCommonConst.WAIT_TAKEN, "等待令牌中请稍等") MoGoAiCloudClient.getInstance().refreshToken() return } mLoginServiceApi.queryDriverServiceStatusAndLoginStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus")) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index cebda9766f..db603f25a4 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -22,7 +22,7 @@ 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.logger.scene.SceneConstant.Companion.M_BUS_P -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.och.charter.passenger.R import com.mogo.och.common.module.manager.loopmanager.LoopInfo @@ -387,7 +387,7 @@ object CharterPassengerModel { this.orderInfo?.orderNo?.let { if (it != orderData.orderNo) { // orderNo 变后清理 - SharedPrefsMgr.getInstance(mContext).remove("${it}$min5Speak") + SharedPrefsMgr.getInstance().remove("${it}$min5Speak") } } if (order.lineId == null || order.lineId == 0L || order.siteId == null || order.siteId == 0L) { @@ -563,7 +563,7 @@ object CharterPassengerModel { .subscribe { millisUntilFinished -> if (millisUntilFinished <= 900L) { orderInfo?.let { - val isPlayed = SharedPrefsMgr.getInstance(mContext) + val isPlayed = SharedPrefsMgr.getInstance() .getBoolean("${it.orderNo}$min5Speak", false) if (!isPlayed) { //发送 通知 @@ -574,7 +574,7 @@ object CharterPassengerModel { ) VoiceManager.surplus15min(VoiceFocusManager.getVoiceCmdCallBack()) d(M_BUS_P + TAG, "倒计时15分钟${it.orderNo}") - SharedPrefsMgr.getInstance(mContext) + SharedPrefsMgr.getInstance() .putBoolean("${it.orderNo}$min5Speak", true) } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt index e0d4dd686d..be3a411eb5 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt @@ -1,8 +1,8 @@ package com.mogo.och.charter.passenger.net import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.och.charter.passenger.bean.request.ArriveDestRequest import com.mogo.och.charter.passenger.bean.request.EndOrderRequest import com.mogo.och.charter.passenger.bean.response.* @@ -19,7 +19,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/driver/loginStatus") fun queryDriverOperationStatus( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn ): Observable @@ -29,7 +29,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/driver/order") fun queryOrderInfo( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn ): Observable @@ -39,7 +39,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/driver/lineList") fun queryLineList( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn ): Observable @@ -49,7 +49,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/driver/siteList") fun queryLineSiteList( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn, @Query("lineId") lineId: String? ): Observable @@ -61,7 +61,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/driver/businessStatus") fun queryBusinessStatus( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn ): Observable @@ -71,7 +71,7 @@ internal interface PassengerServiceApi { @POST("/och-rental-cabin/api/flow/v1/driver/serviceEnd") fun endOrder( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Body request: EndOrderRequest ): Observable @@ -81,7 +81,7 @@ internal interface PassengerServiceApi { @POST("/och-rental-cabin/api/flow/v1/driver/arriveDest") fun arriveDest( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Body request: ArriveDestRequest ): Observable @@ -92,7 +92,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/driver/contrail") fun queryLocusByLineId( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn, @Query("lineId") lineId: String? ): Observable @@ -104,7 +104,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/driver/queryBusinessTime") fun queryBusinessTime( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn ): Observable @@ -115,7 +115,7 @@ internal interface PassengerServiceApi { @GET("/och-rental-cabin/api/business/v1/queryLineLocation") fun queryLineLocation( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("sn") sn: String = BusPassengerServiceManager.draiverSn, @Query("lineId") lineId: String ): Observable diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt index 8018df7053..8387d842cb 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt @@ -17,7 +17,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManage import com.mogo.eagle.core.function.view.SiteMarkerBean import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.bean.response.LineInfoResponse import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse @@ -149,14 +149,14 @@ class BusPassengerPresenter(view: MainFragment?) : } private fun clearShowNoviceGuidanceSharedPrefs() { - SharedPrefsMgr.getInstance(context).remove(KEY4SHOWNOVICEGUIDANCE) + SharedPrefsMgr.getInstance().remove(KEY4SHOWNOVICEGUIDANCE) } private fun showNoviceGuidance() { CallerLogger.d(M_BUS_P + TAG, "showNoviceGuidance") val currentOrderInfo = CharterPassengerModel.getCurrentOrderInfo() currentOrderInfo?.orderNo?.let { order -> - val stringSet = SharedPrefsMgr.getInstance(context).getStringSet(KEY4SHOWNOVICEGUIDANCE) + val stringSet = SharedPrefsMgr.getInstance().getStringSet(KEY4SHOWNOVICEGUIDANCE) if (stringSet == null) { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt index 74167e212e..4e35ecc62b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt @@ -14,7 +14,7 @@ import com.mogo.commons.mvp.MvpDialogFragment import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P -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.och.charter.passenger.R import com.mogo.och.charter.passenger.model.CharterPassengerModel @@ -161,7 +161,7 @@ class NoviceGuidanceFragment : val currentOrderInfo = CharterPassengerModel.getCurrentOrderInfo() currentOrderInfo?.orderNo?.let { order -> val orderNoSet = mutableSetOf(order) - SharedPrefsMgr.getInstance(requireContext()) + SharedPrefsMgr.getInstance() .putStringSet(BusPassengerPresenter.KEY4SHOWNOVICEGUIDANCE, orderNoSet) } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt index 6a67cfbbea..d7fe05aea2 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt @@ -23,7 +23,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick 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.mogo.storage.SharedPrefsMgr +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.charter.passenger.R @@ -649,7 +649,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba snapHelper.attachToRecyclerView(rv_aircondition_temperature) rv_aircondition_temperature.layoutManager = pickerLayoutManager rv_aircondition_temperature.adapter = adapter - com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distance = SharedPrefsMgr.getInstance(context).getInt( + com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distance = SharedPrefsMgr.getInstance().getInt( com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distancekey, 0 ) val space = AutoSizeUtils.dp2px(context, 15f) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java index 09f4c44241..8ce32fa4be 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java @@ -6,9 +6,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; -import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter; public class HorizontalDecoration extends RecyclerView.ItemDecoration { @@ -67,7 +65,7 @@ public class HorizontalDecoration extends RecyclerView.ItemDecoration { } } }, 500); - SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putInt(distancekey,distance); + SharedPrefsMgr.getInstance().putInt(distancekey,distance); } }); } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt index 4be8d6a160..ebf531dbfb 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import com.mogo.eagle.core.data.BaseData 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.NetworkUtils import com.mogo.och.common.module.R import com.mogo.och.common.module.biz.bean.TaxiLoginReqBean @@ -100,7 +100,7 @@ object OchCommonLoginModel { ToastCharterUtils.showToastShort(mContext?.getString(R.string.module_och_taxi_login_login_success)) LoginStatusManager.setLoginStatus(TaxiLoginStatusEnum.Login) mContext?.let { c -> - SharedPrefsMgr.getInstance(c).putString("och_account", phone) + SharedPrefsMgr.getInstance().putString("och_account", phone) } iTaxiLoginCallback?.loginSuccess() } else { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt index a2d0ece58f..afaf7bbf28 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt @@ -3,7 +3,7 @@ package com.mogo.och.common.module.biz.model import android.annotation.SuppressLint 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.mogo.storage.SharedPrefsMgr +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.bean.dpmsg.BusCacheKey import com.mogo.och.common.module.bean.dpmsg.LoginCacheStatus @@ -27,10 +27,10 @@ object OchCommonLoginStatusDefaultModel : OchCommonLoginStatusModel() { override fun loginSuccess(data: DriverStatusQueryRespBean?) { CallerLogger.d(SceneConstant.M_TAXI + TAG, "loginSuccess:${LoginStatusManager.isLogin()}") if (LoginStatusManager.isLogin()) { - SharedPrefsMgr.getInstance(mContext).putString("och_account", data?.data?.phone) + SharedPrefsMgr.getInstance().putString("och_account", data?.data?.phone) loginViewCallback?.hideLoginDialogFragment() } else { - SharedPrefsMgr.getInstance(mContext).putString("och_account", "") + SharedPrefsMgr.getInstance().putString("och_account", "") loginViewCallback?.showLoginDialogFragment() } loginCallback?.loginSuccess(data) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt index ce48f0d692..802b3e6c32 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt @@ -18,9 +18,8 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.cloud.passport.MoGoAiCloudClientConfig -import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.MvpDialogFragment +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.utilcode.kotlin.onClick @@ -29,10 +28,7 @@ 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.KeyboardUtils import com.mogo.och.common.module.R -import com.mogo.och.common.module.biz.bean.TaxiLoginReqBean import com.mogo.och.common.module.biz.constant.OchCommonConst -import com.mogo.och.common.module.biz.network.OchCommonServiceManager -import com.mogo.och.common.module.biz.network.interceptor.transformTry import com.mogo.och.common.module.biz.presenter.OchCommonLoginPresenter import com.mogo.och.common.module.biz.provider.LoginService @@ -159,7 +155,7 @@ class TaxiLoginDialogFragment : } } } - actvLoginShowSn.text = MoGoAiCloudClientConfig.getInstance().sn + actvLoginShowSn.text = SharedPrefsMgr.getInstance().sn } /** diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt index 6dd342e160..7e958fea09 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt @@ -1,8 +1,8 @@ package com.mogo.och.common.module.manager.orderlogmanager import android.text.TextUtils -import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig +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.deva.chain.ChainConstant @@ -36,7 +36,7 @@ object OchChainLogManager { if(upload) { val plateNum = AppConfigInfo.plateNumber val params = HashMap() - params["sn"] = MoGoAiCloudClientConfig.getInstance().sn + params["sn"] = SharedPrefsMgr.getInstance().sn params["env"] = DebugConfig.getNetMode() params["plate_number"] = if (TextUtils.isEmpty(plateNum)) "" else plateNum params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) diff --git a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index d914d4a1b7..05639c7cbd 100644 --- a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -8,7 +8,6 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager import com.mogo.och.common.module.utils.DateTimeUtil -import com.zhidao.thirdlogin.utils.Aes import org.junit.Assert.* import org.junit.Test @@ -20,13 +19,7 @@ import org.junit.Test class ExampleUnitTest { @Test fun addition_isCorrect() { - assertEquals(4, 2 + 2) - val json = "{\"device\":\"03cdfec225781de0\",\"time\":" + System.currentTimeMillis() + "}" - val IVS = "tqXMOa6g2w3S4sso+DqCfKAHRNA5jg3Mzp45e33zHFA=" - val KEY = "y5VajBH+sTHonJP2a5Uh6uDZcK0fxNB5ORHmbg9B3V0=" - val encrypt: String = Aes.encrypt(json, KEY, IVS, "UTF-8") - println(encrypt) } @Test fun testData() { diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt b/OCH/common/data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt index ee6df51dd7..a2178e8bb2 100644 --- a/OCH/common/data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt @@ -1,7 +1,7 @@ package com.mogo.och.data.manager.cache import android.content.Context -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr +import com.elegant.utils.storage.SharedPrefsMgr /** * @author: wangmingjun diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java index 010c5812d0..14346ad51a 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.och.common.module.utils.DateTimeUtil; /** @@ -12,7 +12,7 @@ public class BusCloseTaskRequest { private int taskId; private long writeVersion; public BusCloseTaskRequest(int taskId) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.taskId = taskId; this.writeVersion = DateTimeUtil.getCurrentTimeStamp(); } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java index 96d4435ef4..11b865f15c 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; public /** @@ -15,7 +15,7 @@ class BusOperationStatusRequest { private double lat; private double lon; public BusOperationStatusRequest(double lon, double lat) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.lat = lat; this.lon = lon; } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java index adf7878ec5..f6c9828873 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * @author congtaowang @@ -12,6 +12,6 @@ public class BusQueryLineStationsRequest { private String sn; public BusQueryLineStationsRequest() { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); } } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java index ed3aa1a8e8..75432c7782 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.och.common.module.utils.DateTimeUtil; /** @@ -13,7 +13,7 @@ public class BusResetDrivingLineRequest { public long writeVersion; //更新时间戳 public BusResetDrivingLineRequest(int taskId) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.taskId = taskId; this.writeVersion = DateTimeUtil.getCurrentTimeStamp(); } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java index 595ceafce3..e3642a892e 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; public /** @@ -13,7 +13,7 @@ class BusResetLineStatusRequest { private String sn; public BusResetLineStatusRequest() { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); } public String getSn() { diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java index a76f2be2cb..92f5f22ea4 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java @@ -1,7 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.och.common.module.utils.DateTimeUtil; +import com.mogo.commons.storage.SharedPrefsMgr; /** * @author congtaowang @@ -18,7 +17,7 @@ public class BusUpdateSiteStatusRequest { public long writeVersion; //更新时间戳 public BusUpdateSiteStatusRequest(int taskId,int siteId,int seq, long writeVersion) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.seq = seq; this.siteId = siteId; this.taskId = taskId; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java index 6f07456c78..3e41b91727 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * 查询核销乘客 @@ -12,7 +12,7 @@ public class BusWriteOffPassengersQueryRequest { private int siteId; private long verificationTime; public BusWriteOffPassengersQueryRequest(int taskId, int siteId,long prePassengerTime) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.taskId = taskId; this.siteId = siteId; this.verificationTime = prePassengerTime; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java index 443fd76211..72e5a3a68f 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.bean; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; /** * 查询下车乘客请求参数 @@ -13,7 +13,7 @@ public class QueryLeaveAwayPassengersRequest { private int siteId; //站点id public QueryLeaveAwayPassengersRequest(int seq, int siteId) { - this.sn = MoGoAiCloudClientConfig.getInstance().getSn(); + this.sn = SharedPrefsMgr.getInstance().getSn(); this.seq = seq; this.siteId = siteId; } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index e71e70d28c..4fcd04f64e 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -16,7 +16,7 @@ import androidx.constraintlayout.widget.Group; import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; -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.temp.EventLogout; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -134,9 +134,9 @@ public class BusFragment extends BaseBusTabFragment mPresenter.logout(); }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码 CallerLogger.d(M_BUS + TAG,"changeOverview Event qrcode，sn = " - + MoGoAiCloudClientConfig.getInstance().getSn()); + + SharedPrefsMgr.getInstance().getSn()); String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(), - MoGoAiCloudClientConfig.getInstance().getSn()); + SharedPrefsMgr.getInstance().getSn()); Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture( BitmapFactory.decodeResource(getResources(), R.drawable.icon_qr_center_logo) ,qrUrl, AutoSizeUtils.dp2px(getContext(),340f), diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java index 244ef9526d..0d9094f33b 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java @@ -3,7 +3,7 @@ package com.mogo.och.bus.model; import android.content.Context; import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.bus.R; @@ -119,7 +119,7 @@ public class BusLineModel { OrderServiceManager.switchLine(mContext,taskId, new OchCommonServiceCallback() { @Override public void onSuccess(BusRoutesResponse o) { - SharedPrefsMgr.getInstance(mContext).putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId); + SharedPrefsMgr.getInstance().putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId); if (mBusLinesCallback != null){ mBusLinesCallback.onChangeLineIdSuccess(); } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt index f081f08a34..387ef5ba98 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt @@ -4,6 +4,7 @@ import android.content.Context import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.bus.bean.* import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback @@ -31,7 +32,7 @@ object OrderServiceManager { //获取当前高德坐标 mService.queryBusRoutes( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusQueryLineStationsRequest() ) .transformTry() @@ -52,7 +53,7 @@ object OrderServiceManager { ) { mService.switchLine( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusResetDrivingLineRequest(taskId) ) .transformTry() @@ -69,7 +70,7 @@ object OrderServiceManager { fun abortTask(context: Context, taskId: Int, callback: OchCommonServiceCallback?) { mService.abortTask( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusCloseTaskRequest(taskId) ) .transformTry() @@ -86,7 +87,7 @@ object OrderServiceManager { fun endTask(context: Context, taskId: Int, callback: OchCommonServiceCallback?) { mService.endTask( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusCloseTaskRequest(taskId) ) .transformTry() @@ -111,7 +112,7 @@ object OrderServiceManager { ) { mService.leaveStation( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusUpdateSiteStatusRequest(taskId, siteId, seq,writeVersion) ) .transformTry() @@ -132,7 +133,7 @@ object OrderServiceManager { ) { mService.arriveSiteStation( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusUpdateSiteStatusRequest(taskId, siteId, seq, writeVersion) ) .transformTry() @@ -155,7 +156,7 @@ object OrderServiceManager { ) { mService.queryStationLeaveAwayPassengers( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, QueryLeaveAwayPassengersRequest(seq, siteId) ) .transformTry() @@ -171,8 +172,8 @@ object OrderServiceManager { fun queryBusOrders(context: Context, callback: OchCommonServiceCallback?) { mService.queryBusOrders( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusOrders")) @@ -181,8 +182,8 @@ object OrderServiceManager { fun queryBusLines(context: Context, callback: OchCommonServiceCallback?) { mService.queryBusLines( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines")) @@ -195,7 +196,7 @@ object OrderServiceManager { ) { mService.queryBusTaskByLineId( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, lineId ) .transformTry() diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt index d331b69633..a31ffeb463 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt @@ -11,6 +11,7 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl import com.mogo.och.common.module.biz.network.interceptor.transformTry @@ -39,7 +40,7 @@ object OchCommonServiceManager { ) { mLoginServiceApi.getPhoneCode( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginSmsReqBean(phone) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode")) @@ -56,10 +57,10 @@ object OchCommonServiceManager { location4Login: TaxiLoginReqBean.Location4Login?, callback: OchCommonServiceCallback? ) { - val sn = MoGoAiCloudClientConfig.getInstance().sn + val sn = SharedPrefsMgr.getInstance().sn mLoginServiceApi.gotoLoginBycode4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginReqBean(phone, code, sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode")) } @@ -75,8 +76,8 @@ object OchCommonServiceManager { ) { mLoginServiceApi.logout4Bus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login) + SharedPrefsMgr.getInstance().token, + TaxiLogoutReqBean(SharedPrefsMgr.getInstance().sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout")) } @@ -91,15 +92,15 @@ object OchCommonServiceManager { context: Context, callback: OchCommonServiceCallback? ) { - if (MoGoAiCloudClientConfig.getInstance().token.isEmpty()) { + if (SharedPrefsMgr.getInstance().token.isEmpty()) { callback?.onFail(OchCommonConst.WAIT_TAKEN, "等待令牌中请稍等") MoGoAiCloudClient.getInstance().refreshToken() return } mLoginServiceApi.queryDriverServiceStatusAndLoginStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus")) } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt index eff63dd20b..412574bdc4 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt @@ -12,7 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.mogo.commons.mvp.MvpActivity -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.bus.presenter.BusLinePresenter import com.mogo.och.bus.ui.adapter.SwitchLineAdapter import com.mogo.och.bus.bean.BusQueryLinesResponse @@ -118,7 +118,7 @@ class BusSwitchLineActivity : MvpActivity showNoData(true) return } - val lastCommitLineid = SharedPrefsMgr.getInstance(this).getInt(LASTCOMMITLINEID, -1) + val lastCommitLineid = SharedPrefsMgr.getInstance().getInt(LASTCOMMITLINEID, -1) if (data.data != null && data.data.size > 0) { showNoData(false) mData.clear() diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java index 27009e156f..789e8491fd 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java @@ -4,8 +4,8 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS import android.text.TextUtils; -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.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.commons.utils.MogoAnalyticUtils; @@ -95,7 +95,7 @@ public class BusAnalyticsManager { boolean restart, boolean send, String startName, String endName, int lineId) { mStartAutopilotKey = restart ? BusConst.EVENT_KEY_RESTART_AUTOPILOT : BusConst.EVENT_KEY_START_SERVICE; - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + String sn = SharedPrefsMgr.getInstance().getSn(); String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); String dateTime = DateTimeUtils.getTimeText( System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); @@ -131,7 +131,7 @@ public class BusAnalyticsManager { */ public void triggerUnableStartAPReasonEvent(String startName, String endName, int lineId, String reason) { - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + String sn = SharedPrefsMgr.getInstance().getSn(); String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); String dateTime = DateTimeUtils.getTimeText( System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java index fff3303949..cef59202c7 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java @@ -40,7 +40,6 @@ import com.mogo.och.common.module.manager.distancemamager.IDistanceListener; import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager; import com.mogo.och.common.module.utils.DateTimeUtil; import com.mogo.commons.module.status.StatusDescriptor; -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -51,7 +50,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; 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.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.och.shuttle.passenger.callback.IBusPassegerDriverStatusCallback; import com.mogo.och.shuttle.passenger.callback.IBusPassengerADASStatusCallback; @@ -69,8 +68,6 @@ import com.mogo.och.data.bean.BusRoutesResult; import com.mogo.och.data.bean.BusStationBean; import com.mogo.och.data.bean.BusTransferData; -import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -623,7 +620,7 @@ public class BusPassengerModel { // } if (mTwoStationsRouts.size() > 0){ float sumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(mTwoStationsRouts); - SharedPrefsMgr.getInstance(mContext).putInt(BusPassengerConst.BUS_SP_KEY_ORDER_SUM_DIS,(int) sumLength); + SharedPrefsMgr.getInstance().putInt(BusPassengerConst.BUS_SP_KEY_ORDER_SUM_DIS,(int) sumLength); if (mAutopilotPlanningCallback != null){ mAutopilotPlanningCallback.updateTotalDistance(); } diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt index 4d7d88b823..2c3a4bbca9 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt @@ -7,6 +7,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.och.shuttle.passenger.bean.BusPassengerQueryLineRequest import com.mogo.och.shuttle.passenger.bean.BusPassengerOperationStatusResponse import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl @@ -47,7 +48,7 @@ object BusPassengerServiceManager { ) { mShuttleBusPassengerServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, BusPassengerQueryLineRequest( driverAppSn ) @@ -67,7 +68,7 @@ object BusPassengerServiceManager { ) { mShuttleBusPassengerServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ) .transformTry() diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java index 3bc99cf4a7..f16af0997b 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java @@ -17,7 +17,7 @@ import com.amap.api.maps.model.LatLng; import com.elegant.utils.UiThreadHandler; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.och.shuttle.passenger.R; import com.mogo.och.shuttle.passenger.adapter.BusPassengerLineStationsAdapter; import com.mogo.och.shuttle.passenger.constant.BusPassengerConst; @@ -215,7 +215,7 @@ public class BusPassengerRouteFragment extends } if (currentStationIndex == 0 && isArrived){ //到达始发站且并未出发， 恢复站点marker 清楚路径 清空路径点 - SharedPrefsMgr.getInstance(getContext()) + SharedPrefsMgr.getInstance() .remove(BusPassengerConst.BUS_SP_KEY_ORDER_SUM_DIS); clearMapView(); } diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt index 99f133a0d2..4301b1de54 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt @@ -4,6 +4,7 @@ import android.content.Context import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.shuttle.passenger.bean.PM2OperationStatusResponse import com.mogo.och.shuttle.passenger.bean.PM2QueryLineRequest import com.mogo.och.shuttle.passenger.bean.PM2RoutesResponse @@ -46,7 +47,7 @@ object PM2ServiceManager { ) { mBusPassengerServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, PM2QueryLineRequest( driverAppSn ) @@ -67,7 +68,7 @@ object PM2ServiceManager { ) { mBusPassengerServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, driverAppSn ) .transformTry() diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java index e359f8d97f..97453f051a 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java @@ -8,11 +8,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.amap.api.maps.model.LatLng; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; 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.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener; @@ -690,7 +690,7 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene } public String getDriverSn() { - return MoGoAiCloudClientConfig.getInstance().getSn(); + return SharedPrefsMgr.getInstance().getSn(); } @Override diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt index c759f2f649..eb7e97b19e 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt @@ -5,7 +5,7 @@ import android.util.Log import com.elegant.utils.UiThreadHandler import com.google.protobuf.MessageOrBuilder import com.google.protobuf.TextFormat -import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -280,7 +280,7 @@ object SweeperCloudTaskUtils { } private fun getDriverSn(): String? { - return MoGoAiCloudClientConfig.getInstance().sn + return SharedPrefsMgr.getInstance().sn } /** diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperAnalyticsManager.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperAnalyticsManager.java index d46c36a9b9..5fe4e5b20e 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/util/SweeperAnalyticsManager.java @@ -5,8 +5,8 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWE import android.os.Build; import android.text.TextUtils; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; +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.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -92,7 +92,7 @@ public class SweeperAnalyticsManager { boolean restart, boolean send, String startName, String endName, int lineId) { mStartAutopilotKey = restart ? SweeperConst.EVENT_KEY_RESTART_AUTOPILOT : SweeperConst.EVENT_KEY_START_SERVICE; - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + String sn = SharedPrefsMgr.getInstance().getSn(); String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); String dateTime = DateTimeUtils.getTimeText( System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); @@ -128,7 +128,7 @@ public class SweeperAnalyticsManager { */ public void triggerUnableStartAPReasonEvent(String startName, String endName, int lineId, String reason) { - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + String sn = SharedPrefsMgr.getInstance().getSn(); String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); String dateTime = DateTimeUtils.getTimeText( System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt index 96f3d6c1da..84bbf969b2 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/bean/SubStartRequest.kt @@ -1,9 +1,9 @@ package com.mogo.och.sweeper.operate.bean -import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr data class SubStartRequest( - var carSn:String=MoGoAiCloudClientConfig.getInstance().sn, + var carSn:String= SharedPrefsMgr.getInstance().sn, var taskId:Int, var startTime:Long, var isFirst:Boolean, diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperOperateServiceManager.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperOperateServiceManager.kt index 35882d1427..5f58a9852b 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperOperateServiceManager.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/net/SweeperOperateServiceManager.kt @@ -3,6 +3,7 @@ package com.mogo.och.sweeper.operate.net import android.content.Context import com.elegant.network.utils.GsonUtil import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -165,7 +166,7 @@ object SweeperOperateServiceManager { } private fun getCarSN(): String { - return MoGoAiCloudClientConfig.getInstance().sn + return SharedPrefsMgr.getInstance().sn } private fun getServiceAppId(): String { @@ -173,6 +174,6 @@ object SweeperOperateServiceManager { } private fun getToken(): String { - return MoGoAiCloudClientConfig.getInstance().token + return SharedPrefsMgr.getInstance().token } } \ No newline at end of file diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index bab5a47f4c..f3f7823045 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -21,12 +21,8 @@ import com.elegant.network.utils.GsonUtil; import com.mogo.aicloud.services.socket.IMogoOnMessageListener; import com.mogo.commons.module.intent.IMogoIntentListener; import com.mogo.commons.module.intent.IntentManager; -import com.mogo.commons.module.status.IMogoStatusChangedListener; -import com.mogo.commons.module.status.MogoStatusManager; -import com.mogo.commons.module.status.StatusDescriptor; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -37,7 +33,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager; 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.mogo.eagle.core.utilcode.util.CoordinateUtils; import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils; import com.mogo.eagle.core.utilcode.util.NetworkUtils; @@ -97,7 +93,6 @@ import java.util.Collections; import java.util.List; import io.reactivex.exceptions.UndeliverableException; -import io.reactivex.functions.Consumer; import io.reactivex.plugins.RxJavaPlugins; import mogo.telematics.pad.MessagePad; import mogo_msg.MogoReportMsg; @@ -844,7 +839,7 @@ public class TaxiModel { } mCurrentOCHOrder = data; TaxiTrajectoryManager.getInstance().syncTrajectoryInfo(); - SharedPrefsMgr.getInstance(mContext).putString(TaxiConst.SP_KEY_OCH_TAXI_ORDER, + SharedPrefsMgr.getInstance().putString(TaxiConst.SP_KEY_OCH_TAXI_ORDER, GsonUtil.jsonFromObject(data)); if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { @@ -896,7 +891,7 @@ public class TaxiModel { mCurrentOCHOrder = null; clearAutopilotControlParameters(); TaxiTrajectoryManager.getInstance().syncTrajectoryInfo(); - SharedPrefsMgr.getInstance(mContext).remove(TaxiConst.SP_KEY_OCH_TAXI_ORDER); + SharedPrefsMgr.getInstance().remove(TaxiConst.SP_KEY_OCH_TAXI_ORDER); isRestartAutopilot = false; if (FunctionBuildConfig.isDemoMode) { // 当美化模式（演示模式）开启时: 取消或订单已完成时，置false diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt index 95d8c56cde..47c58418ff 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt @@ -12,6 +12,7 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl import com.mogo.och.common.module.biz.network.interceptor.transformTry @@ -40,7 +41,7 @@ object OchCommonServiceManager { ) { mOCHTaxiServiceApi.getPhoneCode( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginSmsReqBean(phone) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode")) @@ -57,10 +58,10 @@ object OchCommonServiceManager { location4Login: TaxiLoginReqBean.Location4Login?, callback: OchCommonServiceCallback? ) { - val sn = MoGoAiCloudClientConfig.getInstance().sn + val sn = SharedPrefsMgr.getInstance().sn mOCHTaxiServiceApi.gotoLoginBycode4Taxi( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginReqBean(phone, code, sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode")) } @@ -76,8 +77,8 @@ object OchCommonServiceManager { ) { mOCHTaxiServiceApi.logout4Taxi( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login) + SharedPrefsMgr.getInstance().token, + TaxiLogoutReqBean(SharedPrefsMgr.getInstance().sn, location4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout")) } @@ -92,15 +93,15 @@ object OchCommonServiceManager { context: Context, callback: OchCommonServiceCallback? ) { - if (MoGoAiCloudClientConfig.getInstance().token.isEmpty()) { + if (SharedPrefsMgr.getInstance().token.isEmpty()) { callback?.onFail(OchCommonConst.WAIT_TAKEN, "等待令牌中请稍等") MoGoAiCloudClient.getInstance().refreshToken() return } mOCHTaxiServiceApi.queryDriverServiceStatusAndLoginStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus")) } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt index 63b5cfa751..53fd62c894 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt @@ -4,6 +4,7 @@ import android.content.Context import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl @@ -34,8 +35,8 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryOrdersInAndWaitService( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrdersInAndWaitService")) @@ -53,8 +54,8 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryNewBookingOrder( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryNewBookingOrder")) @@ -73,9 +74,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.grabOrder( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrderGrabReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo + SharedPrefsMgr.getInstance().sn, orderNo ) ) .transformTry() @@ -95,9 +96,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryOrderGrabStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrderGrabReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo + SharedPrefsMgr.getInstance().sn, orderNo ) ) .transformTry() @@ -117,9 +118,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryOrderRouteInfo( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrderQueryRouteInfoReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo + SharedPrefsMgr.getInstance().sn, orderNo ) ) .transformTry() @@ -140,9 +141,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryOrderById( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrderQueryReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo + SharedPrefsMgr.getInstance().sn, orderNo ) ) .transformTry() @@ -163,8 +164,8 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryOrderInService( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrderInService")) @@ -185,9 +186,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.cancelOrder( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrderCancelReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, cancelType, cancelReason + SharedPrefsMgr.getInstance().sn, orderNo, cancelType, cancelReason ) ) .transformTry() @@ -208,9 +209,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryOrdersList( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrdersListQueryReqBean( - MoGoAiCloudClientConfig.getInstance().sn, page, size + SharedPrefsMgr.getInstance().sn, page, size ) ) .transformTry() @@ -231,9 +232,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.updateOrderStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrderStatusUpdateReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, orderStatus + SharedPrefsMgr.getInstance().sn, orderNo, orderStatus ) ) .transformTry() @@ -253,17 +254,17 @@ object TaxiServiceManager { val baseDataObservable: Observable = if (isOrdering) { // 正在接单去暂停 mOCHTaxiServiceApi.stopOrderServing( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, DriverStatusUpdateReqBean( - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().sn ) ).transformTry() } else { // 没有接单去接单 mOCHTaxiServiceApi.resetOrderServing( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, DriverStatusUpdateReqBean( - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().sn ) ).transformTry() } @@ -285,9 +286,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.runCarHeartbeat( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, CarHeartbeatReqBean( - MoGoAiCloudClientConfig.getInstance().sn, lon, lat + SharedPrefsMgr.getInstance().sn, lon, lat ) ) .transformTry() @@ -306,8 +307,8 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryServiceData( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceData")) @@ -326,7 +327,7 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.updateOrderRoute( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, OrderRouteUpdateReqBean(orderNo, points) ) .transformTry() @@ -351,7 +352,7 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.reportOrderRemain( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, UpdateOrderDisAndTimeReqBean(orderNo, distance, duration) ) .transformTry() @@ -372,7 +373,7 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryOrderRoute( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, orderNo ) .transformTry() @@ -387,9 +388,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.confirmAutopilotConditionByDriver( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiOrPassengerReadyReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, loc + SharedPrefsMgr.getInstance().sn, orderNo, loc ) ) .transformTry() @@ -402,7 +403,7 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.queryPilotStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, orderNo ) .transformTry() @@ -417,9 +418,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.updatePassengerHasBoardedStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiOrPassengerReadyReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, loc + SharedPrefsMgr.getInstance().sn, orderNo, loc ) ) .transformTry() @@ -434,9 +435,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.startServicePilotDone( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiOrPassengerReadyReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, loc + SharedPrefsMgr.getInstance().sn, orderNo, loc ) ) .transformTry() @@ -451,9 +452,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.arrivedStartPoint( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiOrPassengerReadyReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, loc + SharedPrefsMgr.getInstance().sn, orderNo, loc ) ) .transformTry() @@ -468,9 +469,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.arriveTerminal( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiOrPassengerReadyReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, loc + SharedPrefsMgr.getInstance().sn, orderNo, loc ) ) .transformTry() @@ -485,9 +486,9 @@ object TaxiServiceManager { ) { mOCHTaxiServiceApi.orderCompleted( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiOrPassengerReadyReqBean( - MoGoAiCloudClientConfig.getInstance().sn, orderNo, loc + SharedPrefsMgr.getInstance().sn, orderNo, loc ) ) .transformTry() diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt index 94f03aa857..da02ed9768 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt @@ -1,8 +1,8 @@ package com.mogo.och.taxi.utils import android.text.TextUtils -import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig +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.function.api.autopilot.IMoGoAutopilotStatusListener @@ -101,7 +101,7 @@ object TaxiAnalyticsManager { clearStartAutopilotParams() //清空参数数据，防止误传 } else { val plateNum = AppConfigInfo.plateNumber - mStartAutopilotParams[TaxiConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + mStartAutopilotParams[TaxiConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn mStartAutopilotParams[TaxiConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum mStartAutopilotParams[TaxiConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE mStartAutopilotParams[TaxiConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) @@ -126,7 +126,7 @@ object TaxiAnalyticsManager { fun triggerUnableStartAPReasonEvent(startName: String, endName: String, orderNo: String, reason: String) { val plateNum = AppConfigInfo.plateNumber val params = HashMap() - params[TaxiConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + params[TaxiConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn params[TaxiConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum params[TaxiConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE params[TaxiConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt index 83c145f6d4..a07636ec8d 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt @@ -1,6 +1,7 @@ package com.mogo.och.taxi.passenger.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.taxi.passenger.bean.TaxiPassengerAllStarWorld import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean @@ -33,7 +34,7 @@ internal interface TaxiPassengerServiceApi { @GET("/autopilot-car-hailing/order/v2/driver/taxi/passenger/orderInService/query") fun queryOrdersInAndWaitService( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("driverSn") driverSn: String ): Observable @@ -46,7 +47,7 @@ internal interface TaxiPassengerServiceApi { @POST("/autopilot-car-hailing/order/v2/driver/taxi/passenger/queryOrderById") fun queryOrderById( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerOrderQueryReqBean ): Observable @@ -61,7 +62,7 @@ internal interface TaxiPassengerServiceApi { @GET("/autopilot-car-hailing/order/v2/driver/taxi/queryOrderRemaining") fun queryOrderRemaining( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("orderNo") orderNo: String ): Observable @@ -74,7 +75,7 @@ internal interface TaxiPassengerServiceApi { @POST("/autopilot-car-hailing/cab/flow/v1/driver/taxi/passenger/verification/phone") fun checkPhoneAndUpdateOrderStatus( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerCheckPhoneUpdateOrderReqBean? ): Observable @@ -87,7 +88,7 @@ internal interface TaxiPassengerServiceApi { @POST("/autopilot-car-hailing/evaluation/info/driver/taxi/submit") fun arrivedAndScore( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerScoreUpdateOrderReqBean ): Observable @@ -99,7 +100,7 @@ internal interface TaxiPassengerServiceApi { @GET("/autopilot-car-hailing/evaluation/label/driver/taxi/list") fun getWorldAllStar( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, ): Observable /** @@ -110,7 +111,7 @@ internal interface TaxiPassengerServiceApi { @GET("/autopilot-car-hailing/evaluation/label/driver/taxi/listByStar") fun getWorldByStar( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("star") star: String ): Observable @@ -125,7 +126,7 @@ internal interface TaxiPassengerServiceApi { @GET("/autopilot-car-hailing/cab/flow/v1/driver/taxi/pilot/status") fun queryPilotStatus( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Query("orderNo") orderNo: String ): Observable @@ -140,7 +141,7 @@ internal interface TaxiPassengerServiceApi { @POST("/autopilot-car-hailing/cab/flow/v1/driver/taxi/passenger/startServicePilot") fun startServicePilotDone( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String= MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerStartReqBean ): Observable } \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index 24cb9a546a..d18cf00625 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -1,8 +1,8 @@ package com.mogo.och.taxi.passenger.utils import android.text.TextUtils -import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig +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.function.api.autopilot.IMoGoAutopilotStatusListener @@ -87,7 +87,7 @@ object TaxiPassengerAnalyticsManager { clearStartAutopilotParams() //清空参数数据，防止误传 } else { val plateNum = AppConfigInfo.plateNumber - mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) @@ -111,7 +111,7 @@ object TaxiPassengerAnalyticsManager { fun triggerUnableStartAPReasonEvent(startName: String, endName: String, orderNo: String, reason: String) { val plateNum = AppConfigInfo.plateNumber val params = HashMap() - params[TaxiPassengerConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + params[TaxiPassengerConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn params[TaxiPassengerConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum params[TaxiPassengerConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE params[TaxiPassengerConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiDriverLoginServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiDriverLoginServiceManager.kt index 728c44e314..24428404ae 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiDriverLoginServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiDriverLoginServiceManager.kt @@ -14,6 +14,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.network.utils.GsonUtil +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl import com.mogo.och.common.module.biz.network.interceptor.transformTry @@ -45,7 +46,7 @@ object TaxiDriverLoginServiceManager { ) { mOCHTaxiServiceApi.getPhoneCode( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, TaxiLoginSmsReqBean(phone) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode")) @@ -69,10 +70,10 @@ object TaxiDriverLoginServiceManager { ) } Log.d("taxiUnmanned-request = " , GsonUtil.jsonFromObject(mOCHTaxiServiceApi)) - val sn = MoGoAiCloudClientConfig.getInstance().sn + val sn = SharedPrefsMgr.getInstance().sn mOCHTaxiServiceApi.gotoLoginBycode4Taxi( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, + SharedPrefsMgr.getInstance().token, UnmannedLoginReqBean(phone, code, sn, unmannedLocation4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode")) } @@ -96,8 +97,8 @@ object TaxiDriverLoginServiceManager { mOCHTaxiServiceApi.logout4Taxi( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - UnmannedLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, unmannedLocation4Login) + SharedPrefsMgr.getInstance().token, + UnmannedLogoutReqBean(SharedPrefsMgr.getInstance().sn, unmannedLocation4Login) ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout")) } @@ -112,15 +113,15 @@ object TaxiDriverLoginServiceManager { context: Context, callback: OchCommonServiceCallback? ) { - if (MoGoAiCloudClientConfig.getInstance().token.isEmpty()) { + if (SharedPrefsMgr.getInstance().token.isEmpty()) { callback?.onFail(OchCommonConst.WAIT_TAKEN, "等待令牌中请稍等") MoGoAiCloudClient.getInstance().refreshToken() return } mOCHTaxiServiceApi.queryDriverServiceStatusAndLoginStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - MoGoAiCloudClientConfig.getInstance().sn + SharedPrefsMgr.getInstance().token, + SharedPrefsMgr.getInstance().sn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus")) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceApi.kt index cd5b817c7e..c8957592c4 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceApi.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceApi.kt @@ -1,6 +1,7 @@ package com.mogo.och.taxi.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData import com.mogo.och.taxi.bean.QueryTaskRespBean import com.mogo.och.taxi.bean.QueryOrdersRespBean @@ -24,7 +25,7 @@ interface TaxiOperationalDataServiceApi { @GET("/och-taxi-cabin/api/business/v1/queryCurrentScheduledTaskList") fun queryCurrentScheduledTaskList( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? ): Observable @@ -34,7 +35,7 @@ interface TaxiOperationalDataServiceApi { @Headers("Content-type:application/json;charset=UTF-8") @GET("/och-taxi-cabin/api/business/v1/queryServingDuration") fun queryServingDuration(@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? ):Observable @@ -45,7 +46,7 @@ interface TaxiOperationalDataServiceApi { @GET("/och-taxi-cabin/api/business/v1/queryTaskListByOrder") fun queryTaskListByOrder( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("orderNo")orderNo: String? ): Observable @@ -56,7 +57,7 @@ interface TaxiOperationalDataServiceApi { @GET("/och-taxi-cabin/api/business/v1/queryCurrentCompleteOrder") fun queryCurrentCompleteOrder( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? ): Observable @@ -67,7 +68,7 @@ interface TaxiOperationalDataServiceApi { @GET("/och-taxi-cabin/api/business/v1/queryCurrentDayOrder") fun queryCurrentDayOrder( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? ): Observable } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceManager.kt index c6cd8a9121..8f31813488 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceManager.kt @@ -1,8 +1,7 @@ package com.mogo.och.taxi.network import android.content.Context -import com.mogo.cloud.passport.MoGoAiCloudClientConfig -import com.mogo.eagle.core.data.BaseData +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback @@ -30,7 +29,7 @@ object TaxiOperationalDataServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiOperationalDataServiceApi.queryCurrentScheduledTaskList( - sn = MoGoAiCloudClientConfig.getInstance().sn + sn = SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryCurrentScheduledTaskList")) @@ -43,7 +42,7 @@ object TaxiOperationalDataServiceManager { fun queryServingDuration(context: Context, callback: OchCommonServiceCallback?) { mOCHTaxiOperationalDataServiceApi.queryServingDuration( - sn = MoGoAiCloudClientConfig.getInstance().sn + sn = SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryServingDuration")) @@ -73,7 +72,7 @@ object TaxiOperationalDataServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiOperationalDataServiceApi.queryCurrentCompleteOrder( - sn = MoGoAiCloudClientConfig.getInstance().sn + sn = SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryCurrentCompleteOrder")) @@ -88,7 +87,7 @@ object TaxiOperationalDataServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiOperationalDataServiceApi.queryCurrentDayOrder( - sn = MoGoAiCloudClientConfig.getInstance().sn + sn = SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryCurrentDayOrder")) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceApi.kt index f1857459e4..0d751a973e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceApi.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceApi.kt @@ -1,6 +1,7 @@ package com.mogo.och.taxi.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData import com.mogo.och.taxi.bean.EndGrayContrailTaskReq import com.mogo.och.taxi.bean.QueryGrayContrailListRsp @@ -25,7 +26,7 @@ interface TaxiRoutingServiceApi { @GET("/och-taxi-cabin/api/business/v1/queryGrayContrailList") fun queryRoutingGrayLineList( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? ): Observable @@ -36,7 +37,7 @@ interface TaxiRoutingServiceApi { @POST("/och-taxi-cabin/api/business/v1/startGray") fun startGrayTask( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: StartGrayContrailTaskReq ): Observable @@ -47,7 +48,7 @@ interface TaxiRoutingServiceApi { @GET("/och-taxi-cabin/api/business/v1/gray/contrail") fun queryRoutingContrailById( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("id") contrailId: Long ): Observable @@ -58,7 +59,7 @@ interface TaxiRoutingServiceApi { @POST("/och-taxi-cabin/api/business/v1/saveDotDetail") fun submitGrayLineIssueLocation( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: SubmitGrayLineIssueLocationReq ): Observable @@ -69,7 +70,7 @@ interface TaxiRoutingServiceApi { @POST("/och-taxi-cabin/api/business/v1/endGray") fun endGrayTask( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: EndGrayContrailTaskReq ): Observable } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceManager.kt index aaa1b5c288..e12ac4a519 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceManager.kt @@ -1,7 +1,7 @@ package com.mogo.och.taxi.network import android.content.Context -import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.och.common.module.biz.constant.OchCommonConst @@ -33,7 +33,7 @@ object TaxiRoutingServiceManager { callback: OchCommonServiceCallback ) { mRoutingServiceApi.queryRoutingGrayLineList( - sn = MoGoAiCloudClientConfig.getInstance().sn + sn = SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryRoutingGrayLineList")) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt index cf3a4e1263..743f0b70fe 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt @@ -1,6 +1,7 @@ package com.mogo.och.taxi.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData import com.mogo.och.taxi.bean.ArriveSiteReqBean import com.mogo.och.taxi.bean.CancelOrderReqBean @@ -38,7 +39,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/flow/v1/startService") fun startService( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: StartServiceReqBean? ): Observable @@ -49,7 +50,7 @@ interface TaxiTaskWithOrderServiceApi { @GET("/och-taxi-cabin/api/flow/v1/endService") fun endService( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? ): Observable @@ -59,7 +60,7 @@ interface TaxiTaskWithOrderServiceApi { @Headers("Content-type:application/json;charset=UTF-8") @GET("/och-taxi-cabin/api/flow/v1/queryCurrentTask") fun queryCurrentTask(@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? ):Observable @@ -70,7 +71,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/flow/v1/startTask") fun startTask( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: StartTaskReqBean? ): Observable @@ -81,7 +82,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/flow/v1/arriveSite") fun arriveSite( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: ArriveSiteReqBean? ): Observable @@ -92,7 +93,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/flow/v1/prepareTask") fun prepareTask( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: PrepareTaskReqBean? ): Observable @@ -103,7 +104,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/flow/v1/orderCompleted") fun orderCompleted( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: OrderCompletedReqBean? ): Observable @@ -115,7 +116,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/flow/v1/cancelOrder") fun cancelOrder( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: CancelOrderReqBean? ): Observable @@ -126,7 +127,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/business/v1/contrail") fun queryTrajectoryByLindIds( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: Array ): Observable @@ -137,7 +138,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/flow/v1/ready/passenger") fun jumpPassengerCheck( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: JumpPassengerCheckReqBean? ): Observable @@ -145,7 +146,7 @@ interface TaxiTaskWithOrderServiceApi { @POST("/och-taxi-cabin/api/business/v1/queryCarOrder") fun queryCarOrderByOrderNo( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body data: QueryCarOrderByNoReqBean? ): Observable diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt index de9673a2a6..e2012628c4 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt @@ -1,7 +1,7 @@ package com.mogo.och.taxi.network import android.content.Context -import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.och.common.module.biz.constant.OchCommonConst @@ -41,7 +41,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.startService( - data = StartServiceReqBean(MoGoAiCloudClientConfig.getInstance().sn, gcjLat, gcjLon) + data = StartServiceReqBean(SharedPrefsMgr.getInstance().sn, gcjLat, gcjLon) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "startService")) } @@ -52,7 +52,7 @@ object TaxiTaskWithOrderServiceManager { @JvmStatic fun endService(context: Context, callback: OchCommonServiceCallback?) { mOCHTaxiServiceApi.endService( - sn = MoGoAiCloudClientConfig.getInstance().sn + sn = SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "endService")) @@ -67,7 +67,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.queryCurrentTask( - sn = MoGoAiCloudClientConfig.getInstance().sn + sn = SharedPrefsMgr.getInstance().sn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryCurrentTask")) @@ -82,7 +82,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.startTask( - data = StartTaskReqBean(MoGoAiCloudClientConfig.getInstance().sn, lineId) + data = StartTaskReqBean(SharedPrefsMgr.getInstance().sn, lineId) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "startTask")) } @@ -96,7 +96,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.arriveSite( - data = ArriveSiteReqBean(MoGoAiCloudClientConfig.getInstance().sn, siteId) + data = ArriveSiteReqBean(SharedPrefsMgr.getInstance().sn, siteId) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "arriveSite")) } @@ -110,7 +110,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.prepareTask( - data = PrepareTaskReqBean(MoGoAiCloudClientConfig.getInstance().sn, siteId) + data = PrepareTaskReqBean(SharedPrefsMgr.getInstance().sn, siteId) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "prepareTask")) } @@ -124,7 +124,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.jumpPassengerCheck( - data = JumpPassengerCheckReqBean(MoGoAiCloudClientConfig.getInstance().sn, orderNo) + data = JumpPassengerCheckReqBean(SharedPrefsMgr.getInstance().sn, orderNo) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "jumpPassengerCheck")) } @@ -138,7 +138,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.queryCarOrderByOrderNo( - data = QueryCarOrderByNoReqBean(MoGoAiCloudClientConfig.getInstance().sn, orderNo) + data = QueryCarOrderByNoReqBean(SharedPrefsMgr.getInstance().sn, orderNo) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryCarOrderByOrderNo")) } @@ -152,7 +152,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.orderCompleted( - data = OrderCompletedReqBean(MoGoAiCloudClientConfig.getInstance().sn, orderNo) + data = OrderCompletedReqBean(SharedPrefsMgr.getInstance().sn, orderNo) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "orderCompleted")) } @@ -166,7 +166,7 @@ object TaxiTaskWithOrderServiceManager { callback: OchCommonServiceCallback? ) { mOCHTaxiServiceApi.cancelOrder( - data = CancelOrderReqBean(MoGoAiCloudClientConfig.getInstance().sn, orderNo, cancelType) + data = CancelOrderReqBean(SharedPrefsMgr.getInstance().sn, orderNo, cancelType) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "cancelOrder")) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt index 6caa2cce08..f4d58857aa 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt @@ -2,8 +2,8 @@ package com.mogo.och.taxi.ui.routing import android.content.Context import android.text.TextUtils -import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -205,7 +205,7 @@ object TaxiRoutingModel { } fun queryRoutingGrayLineList() { - DebugView.printInfoMsg("[查询灰度路线] 准备发送请求，sn=${MoGoAiCloudClientConfig.getInstance().sn}") + DebugView.printInfoMsg("[查询灰度路线] 准备发送请求，sn=${SharedPrefsMgr.getInstance().sn}") TaxiRoutingServiceManager.queryRoutingGrayLineList(mContext, object : OchCommonServiceCallback { override fun onSuccess(data: QueryGrayContrailListRsp) { @@ -229,7 +229,7 @@ object TaxiRoutingModel { TAG, "queryRoutingGrayLineList onFail: code=$code, msg=$msg" ) - DebugView.printErrorMsg("[查询灰度路线] 请求fail, code=$code, msg=$msg, sn=${MoGoAiCloudClientConfig.getInstance().sn}") + DebugView.printErrorMsg("[查询灰度路线] 请求fail, code=$code, msg=$msg, sn=${SharedPrefsMgr.getInstance().sn}") ToastUtils.showShort("查询灰度线路列表异常, 请稍后重试, code=$code") mTaxiRoutingCallbackMap.forEach { val listener = it.value @@ -249,7 +249,7 @@ object TaxiRoutingModel { } CallerLogger.d( TAG, - "queryRoutingGrayLineList onError, msg=$hintStr, sn=${MoGoAiCloudClientConfig.getInstance().sn}" + "queryRoutingGrayLineList onError, msg=$hintStr, sn=${SharedPrefsMgr.getInstance().sn}" ) DebugView.printErrorMsg("[查询灰度路线] 请求error, msg=$hintStr") mTaxiRoutingCallbackMap.forEach { @@ -264,7 +264,7 @@ object TaxiRoutingModel { DebugView.printInfoMsg("[开始灰度任务&查询轨迹详情] 准备发送请求，contrailId=${contrailId}, lineId=${grayLineBean.lineId}") TaxiRoutingServiceManager.startGrayTaskAndQueryRoutingContrail( mContext, - sn = MoGoAiCloudClientConfig.getInstance().sn, + sn = SharedPrefsMgr.getInstance().sn, contrailId = contrailId, grayLineBean = grayLineBean, object : OchCommonServiceCallback { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java index c422872cdd..4ea89fb536 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java @@ -3,8 +3,8 @@ package com.mogo.och.taxi.utils; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; import android.text.TextUtils; -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.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.commons.utils.MogoAnalyticUtils; @@ -94,7 +94,7 @@ public class TaxiAnalyticsManager { boolean restart, boolean send, String startName, String endName, long lineId, String orderNo) { mStartAutopilotKey = restart ? TaxiUnmannedConst.EVENT_KEY_RESTART_AUTOPILOT : TaxiUnmannedConst.EVENT_KEY_START_SERVICE; - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + String sn = SharedPrefsMgr.getInstance().getSn(); String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); String dateTime = DateTimeUtils.getTimeText( System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); @@ -133,7 +133,7 @@ public class TaxiAnalyticsManager { */ public void triggerUnableStartAPReasonEvent(String startName, String endName, String orderNo, String reason) { - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + String sn = SharedPrefsMgr.getInstance().getSn(); String plateNum = AppConfigInfo.INSTANCE.getPlateNumber(); String dateTime = DateTimeUtils.getTimeText( System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt index 1dae935590..c5eb87dd0a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt @@ -1,6 +1,7 @@ package com.mogo.och.taxi.passenger.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean @@ -31,7 +32,7 @@ internal interface TaxiPassengerServiceApi { @GET("/och-taxi-cabin/api/flow/v1/queryCurrentTask") fun queryOrdersInAndWaitService( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String ): Observable @@ -42,7 +43,7 @@ internal interface TaxiPassengerServiceApi { @POST("/och-taxi-cabin/api/business/v1/contrail") fun getTrajectoryInfoByLineIds( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Body lineIds: List ):Observable @@ -56,7 +57,7 @@ internal interface TaxiPassengerServiceApi { @POST("/och-taxi-cabin/api/business/v1/queryCarOrder") fun queryOrderById( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerOrderQueryReqBean ): Observable @@ -69,7 +70,7 @@ internal interface TaxiPassengerServiceApi { @POST("/och-taxi-cabin/api/flow/v1/verification/phone") fun checkPhoneAndUpdateOrderStatus( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String=SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerCheckPhoneUpdateOrderReqBean? ): Observable @@ -84,7 +85,7 @@ internal interface TaxiPassengerServiceApi { @POST("/och-taxi-cabin/api/flow/v1/startTask") fun startAutoPilotServiceByPassenger( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String= MoGoAiCloudClientConfig.getInstance().token, + @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerStartReqBean ): Observable } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index f4a7b22c41..ff2ff9d875 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -1,8 +1,8 @@ package com.mogo.och.taxi.passenger.utils import android.text.TextUtils -import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig +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.function.api.autopilot.IMoGoAutopilotStatusListener @@ -87,7 +87,7 @@ object TaxiPassengerAnalyticsManager { clearStartAutopilotParams() //清空参数数据，防止误传 } else { val plateNum = AppConfigInfo.plateNumber - mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) @@ -111,7 +111,7 @@ object TaxiPassengerAnalyticsManager { fun triggerUnableStartAPReasonEvent(startName: String, endName: String, orderNo: String, reason: String) { val plateNum = AppConfigInfo.plateNumber val params = HashMap() - params[TaxiPassengerConst.EVENT_PARAM_SN] = MoGoAiCloudClientConfig.getInstance().sn + params[TaxiPassengerConst.EVENT_PARAM_SN] = SharedPrefsMgr.getInstance().sn params[TaxiPassengerConst.EVENT_PARAM_PLATE_NUM] = if (TextUtils.isEmpty(plateNum)) "" else plateNum params[TaxiPassengerConst.EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE params[TaxiPassengerConst.EVENT_PARAM_TIME] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index a4270fc1a2..3617c841b1 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -3,15 +3,13 @@ package com.mogo.launcher; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.function.api.devatools.strict.IStrictModeProvider; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; -import com.mogo.eagle.core.function.call.startup.CallerStartUpManager; import com.mogo.eagle.core.function.main.MainMoGoApplication; 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.storage.SharedPrefsMgr; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.launcher.crash.CrashSystem; import com.mogo.launcher.startup.ARouterStartUp; import com.mogo.launcher.startup.ConfigStartUp; -import com.zhjt.service.chain.TraceNodeCore; /** * @author congtaowang @@ -33,7 +31,7 @@ public class MogoApplication extends MainMoGoApplication { private void tryEnableStrictMode() { IStrictModeProvider strict = CallerDevaToolsManager.INSTANCE.strict(); if (DebugConfig.isDebug() && strict != null) { - boolean enabled = SharedPrefsMgr.getInstance(this).getBoolean("MOGO_STRICT_MODE_ENABLED", false); + boolean enabled = SharedPrefsMgr.getInstance().getBoolean("MOGO_STRICT_MODE_ENABLED", false); Logger.e("StrictMode", "isEnabled:" + enabled); if (enabled) { strict.enable(); diff --git a/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java b/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java index eecd970d72..c36936b330 100644 --- a/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java +++ b/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java @@ -8,7 +8,7 @@ import android.os.Environment; import android.text.TextUtils; import android.util.Log; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.storage.SharedPrefsMgr; import java.io.File; import java.io.FileOutputStream; @@ -190,7 +190,7 @@ public class CrashSystem implements UncaughtExceptionHandler { this.mAppPackage = packageInfo.packageName; this.mAppName = packageInfo.applicationInfo.loadLabel(context.getPackageManager()).toString(); this.mOsVersion = Build.DISPLAY; - String deviceId = MoGoAiCloudClientConfig.getInstance().getSn(); + String deviceId = SharedPrefsMgr.getInstance().getSn(); if(TextUtils.isEmpty(deviceId)) { deviceId = "11111111"; } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt index 0f26ffc02c..943c90cf67 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt @@ -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() { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt index 6f0264cbe3..09534eeaaa 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt @@ -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?) { - 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, diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java index 946f602fc8..e8052143fd 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java @@ -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 map = new HashMap<>(); map.put("sn", sn); map.put("infoId", dbId); diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt index bd49ec6ff4..50d018209b 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt @@ -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) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index e5b1c2632a..e5360016e6 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt @@ -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() 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) } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt index 1835084bda..3c8f1ff45a 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt @@ -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) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt index f722e49601..3b95698709 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt @@ -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 diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java index 76074b309b..c26f41219e 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java @@ -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 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); } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2XEventAnalyticsManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2XEventAnalyticsManager.kt index 034aa542f8..06171ea90b 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2XEventAnalyticsManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2XEventAnalyticsManager.kt @@ -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}" //纬度 diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt index 08b55b7ed7..9ede3299a7 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt @@ -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, 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()) { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/network/VipNetWorkModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/network/VipNetWorkModel.kt index cb1600345c..c513f4855a 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/network/VipNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/network/VipNetWorkModel.kt @@ -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> { loader { apiCall { - getNetWorkApi().requestVip(MoGoAiCloudClientConfig.getInstance().sn) + getNetWorkApi().requestVip(SharedPrefsMgr.getInstance().sn) } } onSuccess { diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt index c09a9446ae..769d2d4ef2 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt +++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt @@ -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().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().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 diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt index fa86e03170..fc64c1e0fb 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt +++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt @@ -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 { val map = hashMapOf() - 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 { val map = hashMapOf() 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) diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/socket/SocketConnectManager.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/socket/SocketConnectManager.kt index 4b8ce59b55..f75c02b9f9 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/socket/SocketConnectManager.kt +++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/socket/SocketConnectManager.kt @@ -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) } } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index a2d5b1ed05..77b154540b 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -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 { 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 { 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}") } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 9302a00183..2a4d638496 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -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() ) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index ad4743829f..b192ec16b1 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -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( diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt index 64722c7880..cdea63d8d8 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt @@ -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( diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index 655cbe50ca..f840e60ae2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -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 ) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt index 016fdb554a..5faf9a28f0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt @@ -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 ?: "" //工控机版本 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 86ae7fbd0d..f86c4317ff 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -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") diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index c47990e270..dd7db893ae 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -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") diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt index fc35aaddcb..dcaec72654 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt @@ -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 ) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index fd16b4f50e..3d7db44916 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -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, diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt index fdf119aeb2..43ce0a6e01 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt @@ -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? { @@ -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 -> "未知" diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt index 50a6404f54..a18268b81e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt @@ -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) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index e3375d3325..b57f847749 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -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, 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, 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, Handl openLoggerLevel() logInfoManager = LogInfoManagerFactory.createPushLogInfoManager( mContext, - MoGoAiCloudClientConfig.getInstance().sn, + SharedPrefsMgr.getInstance().sn, AppConfigInfo.toString(), logPrefixName?.replace("_", "-"), mutableListOf(), @@ -192,8 +190,8 @@ object MogoLogCatchManager : IMogoOnMessageListener, 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, 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, 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() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt index da26ec4642..0f9bb886c6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt @@ -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() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index 00d5559ec1..fed124372b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -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() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kt index e42e314fa4..4390f541f3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kt @@ -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 , //弹窗提示，确认是否进行工控机升级 CallerHmiManager.showAdUpgradeDialog( it.images, - MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn, + SharedPrefsMgr.getInstance().sn, releaseId) } }else{ @@ -89,7 +89,7 @@ class IPCUpgradeManager: IMogoOnMessageListener , } CallerHmiManager.showAdUpgradeDialog( it.images, - MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn, + SharedPrefsMgr.getInstance().sn, releaseId) //将升级任务置为false hasIPCUpgradeTask = false diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt index cc97ca970d..afcf1f75a8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt @@ -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)) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt index 7716227eb4..660526fd19 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt @@ -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().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 ?: "更新接口请求失败") diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt index 97f01d712f..756ddca572 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt @@ -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() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt index 6b70a24666..450a75a49c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt @@ -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 ) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt index c484c2bb6d..498ca3e68d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt @@ -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 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 8e05d9b313..db91cc7565 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -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 = diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt index e7eb56f079..39afee1416 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt @@ -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","")) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt index fff7dc45ea..a0249df86a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt @@ -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 ) ) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt index bb612f1cc8..99b5e682d6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt @@ -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 { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt index f835356bef..b6fd4aa4a3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt @@ -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:鹰眼请求 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 8280a3bfe8..aaa5e660f9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -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; } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java index 41d252124d..62d4d09530 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java @@ -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(); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java index a968560284..fe838ac6f0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java @@ -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; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt index fad2bd1230..f11544d6f0 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt @@ -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() - map["sn"] = MoGoAiCloudClientConfig.getInstance().sn + map["sn"] = SharedPrefsMgr.getInstance().sn map["status"] = dataReceive map["startMetre"] = START_METRE map["endMetre"] = END_METRE diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt index bc88adddbd..bd4faebe6b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt @@ -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) } diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index dc23edb3eb..83bd1a85c3 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -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() { 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() { 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() { 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() { "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() { 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() diff --git a/core/mogo-core-res/src/main/res/raw/lucedaba.nt3d b/core/mogo-core-res/src/main/res/raw/lucedaba.nt3d new file mode 100644 index 0000000000..29a31ddaf7 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/lucedaba.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/lucexiaoche.nt3d b/core/mogo-core-res/src/main/res/raw/lucexiaoche.nt3d new file mode 100644 index 0000000000..9fa14617f8 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/lucexiaoche.nt3d differ diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceIdUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceIdUtils.java deleted file mode 100644 index d143e4f954..0000000000 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceIdUtils.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.mogo.eagle.core.utilcode.util; - -import android.Manifest; -import android.content.Context; -import android.content.pm.PackageManager; -import android.media.MediaDrm; -import android.os.Build; -import android.provider.Settings; -import android.telephony.TelephonyManager; -import android.text.TextUtils; - -import androidx.core.content.ContextCompat; - -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.UUID; - -public final class DeviceIdUtils { - - public static final String KEY_DEVICE_ID = "deviceId"; - - private DeviceIdUtils() { - } - - private static void saveDeviceId(Context context, String deviceId) { - SharedPrefsMgr.getInstance(context).putString(KEY_DEVICE_ID, deviceId); - } - - public static String getDeviceId(Context context) { - if (context == null) { - throw new NullPointerException("context must not be null."); - } - - final Context appContext = context.getApplicationContext(); - String deviceId = SharedPrefsMgr.getInstance(context).getString(KEY_DEVICE_ID); - - if (TextUtils.isEmpty(deviceId)) { - deviceId = getDeviceIdInternal(appContext); - if (TextUtils.isEmpty(deviceId)) { - if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { - deviceId = ((TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE)).getSimSerialNumber(); - } - if (TextUtils.isEmpty(deviceId)) { - deviceId = getDeviceSerial(); - if (TextUtils.isEmpty(deviceId) || deviceId.equalsIgnoreCase("unknown")) { - deviceId = getAndroidId(appContext); - if (TextUtils.isEmpty(deviceId)) { - deviceId = String.valueOf(System.currentTimeMillis()); - } - } - } - } - saveDeviceId(appContext, deviceId); - } - - return deviceId; - } - - private static String getDeviceIdInternal(Context context) { - String id = ""; - - if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { - return id; - } - - TelephonyManager telephonymanager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - if (telephonymanager != null) { - id = telephonymanager.getDeviceId(); - if (TextUtils.isEmpty(id)) { - id = ""; - } - } - return id; - } - - private static String getAndroidId(Context context) { - String s = ""; - s = Settings.Secure.getString(context.getContentResolver(), "android_id"); - if (TextUtils.isEmpty(s)) { - s = ""; - } - return s; - } - - private static String getDeviceSerial() { - String serial = "unknown"; - try { - Class clazz = Class.forName("android.os.Build"); - Class paraTypes = Class.forName("java.lang.String"); - Method method = clazz.getDeclaredMethod("getString", paraTypes); - if (!method.isAccessible()) { - method.setAccessible(true); - } - serial = (String) method.invoke(new Build(), "ro.serialno"); - } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { - e.printStackTrace(); - } - return serial; - } - - /** - * 获取数字版权管理设备ID - * - * @return WidevineID，可能为空 - */ - public static String getWidevineID(Context context) { - try { - //See https://stackoverflow.com/questions/16369818/how-to-get-crypto-scheme-uuid - //You can find some UUIDs in the https://github.com/google/ExoPlayer source code - final UUID WIDEVINE_UUID = new UUID(0xEDEF8BA979D64ACEL, 0xA3C827DCD51D21EDL); - MediaDrm mediaDrm = new MediaDrm(WIDEVINE_UUID); - byte[] widevineId = mediaDrm.getPropertyByteArray(MediaDrm.PROPERTY_DEVICE_UNIQUE_ID); - if (widevineId == null) { - return ""; - } - StringBuilder sb = new StringBuilder(); - for (byte aByte : widevineId) { - sb.append(String.format("%02x", aByte)); - } - return sb.toString(); - } catch (Exception | Error e) { - e.printStackTrace(); - } - return ""; - } - - /** - * 获取数字版权管理设备ID,进行MD5加密，获取32位的唯一标记，给后台生成SN - * - * @return WidevineID，可能为空 - */ - public static String getWidevineIDWithMd5(Context context) { - try { - String widevineId = getWidevineID(context); - if (!TextUtils.isEmpty(widevineId)) { - widevineId = EncryptUtils.encryptHmacMD5ToString(widevineId, "MoGoAuto"); - return widevineId; - } else { - return getDeviceId(context); - } - } catch (Exception | Error e) { - e.printStackTrace(); - } - return getDeviceId(context); - } - -} \ No newline at end of file diff --git a/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt b/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt index da8eadb279..7f1b8e8a0e 100644 --- a/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt +++ b/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt @@ -1,7 +1,6 @@ package com.mogo.eagle.core.utilcode import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.zhidao.thirdlogin.utils.Aes import org.junit.Assert.* import org.junit.Test diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java index 302a01be68..590306fff7 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java @@ -6,10 +6,9 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.collection.ArrayMap; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.storage.SpStorage; +import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.eagle.core.network.Constants; import com.mogo.eagle.core.network.LocationHelper; import com.mogo.eagle.core.network.ServerParam; @@ -41,8 +40,8 @@ public class ParamsUtil { params.put(ServerParam.CELL_ID, DeviceUtils.getCellId()); // params.put( ServerParam.DISPLAY_ID, DeviceUtil.getSystemVersion() ); - params.put(ServerParam.SN, MoGoAiCloudClientConfig.getInstance().getSn()); - params.put(ServerParam.TICKET, SpStorage.getTicket()); + params.put(ServerParam.SN, SharedPrefsMgr.getInstance().getSn()); + params.put(ServerParam.TICKET, SharedPrefsMgr.getInstance().getToken()); return params; } @@ -77,7 +76,7 @@ public class ParamsUtil { map.put("debug", DebugConfig.isDebug() ? 1 : 0); String fota = DeviceUtils.getFotaVersion(); map.put("systemversion", TextUtils.isEmpty(fota) ? DebugConfig.getProductFlavor() : fota); - map.put("sn", MoGoAiCloudClientConfig.getInstance().getSn()); + map.put("sn", SharedPrefsMgr.getInstance().getSn()); return map; } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/SharedPrefsMgr.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/storage/SharedPrefsMgr.java similarity index 67% rename from core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/SharedPrefsMgr.java rename to foudations/mogo-commons/src/main/java/com/mogo/commons/storage/SharedPrefsMgr.java index 23f32a03d4..f625bdbf29 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/SharedPrefsMgr.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/storage/SharedPrefsMgr.java @@ -1,22 +1,30 @@ -package com.mogo.eagle.core.utilcode.mogo.storage; +package com.mogo.commons.storage; import android.content.Context; import android.content.SharedPreferences; +import android.text.TextUtils; +import android.util.Log; import java.util.Set; import androidx.annotation.NonNull; +import com.mogo.cloud.passport.SpStorage; +import com.mogo.commons.AbsMogoApplication; + public class SharedPrefsMgr { private static final String File_Name = "app_shared_pref"; private static SharedPrefsMgr sInstance; private static SharedPreferences sSharedPrefs; - public synchronized static SharedPrefsMgr getInstance( @NonNull Context context ) { + private String sn; + private String token; + + public synchronized static SharedPrefsMgr getInstance() { if ( sInstance == null ) { try { - sInstance = new SharedPrefsMgr( context.getApplicationContext() ); + sInstance = new SharedPrefsMgr(AbsMogoApplication.getApp()); } catch ( Exception e ) { sInstance = new SharedPrefsMgr(); } @@ -36,7 +44,63 @@ public class SharedPrefsMgr { } } - public void putString( String key, String value ) { + public void putSn(String value ) { + try { + sn = value; + SharedPreferences.Editor editor = sSharedPrefs.edit(); + editor.putString( "sn", value ); + editor.apply(); + } catch ( Exception e ) { + } + } + + private String getDeviceSn(){ + try { + return sSharedPrefs.getString( "sn", "" ); + } catch ( Exception e ) { + return ""; + } + } + + public String getSn() { + if (sn != null && !sn.isEmpty()) { + return sn; + } + if (TextUtils.isEmpty(SpStorage.getSn())) { + Log.e("SharedPrefsMgr", "本地 SN 获取失败……"); + } + return getDeviceSn(); + } + + public void putToken(String value ){ + try { + token = value; + SharedPreferences.Editor editor = sSharedPrefs.edit(); + editor.putString( "token", value ); + editor.apply(); + } catch ( Exception e ) { + } + } + + public String getToken() { + if (token != null && !token.isEmpty()) { + return token; + } + if (TextUtils.isEmpty(SpStorage.getToken())) { + Log.e("SharedPrefsMgr", "本地 Token 获取失败……"); + } + return getDeviceToken(); + } + + private String getDeviceToken(){ + try { + return sSharedPrefs.getString( "token", "" ); + } catch ( Exception e ) { + return ""; + } + } + + public void putString(String key, String value ) { try { SharedPreferences.Editor editor = sSharedPrefs.edit(); editor.putString( key, value ); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/storage/SpStorage.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/storage/SpStorage.java deleted file mode 100644 index 7a80d52978..0000000000 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/storage/SpStorage.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.mogo.commons.storage; - -import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; - -/** - * @author congtaowang - * @since 2020-01-03 - *

- * sp 公共缓存区域 - */ -public class SpStorage { - - public static String getTicket() { - return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "token" ); - } - - public static void setTicket( String ticket ) { - SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).putString( "token", ticket ); - } - - public static String getNavigationTarget(){ - return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "naviTarget" ); - } - - public static void setNavigationTarget( String naviTarget ) { - SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).putString( "naviTarget", naviTarget ); - } -} diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt index 14a63addb2..d6218e7a82 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt @@ -7,7 +7,7 @@ import com.elegant.analytics.Analytics import com.elegant.analytics.AnalyticsConfig import com.elegant.analytics.IAnalyticsParamsProvider import com.elegant.analytics.UploadMode -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.utilcode.util.AppUtils @@ -56,7 +56,7 @@ object MogoAnalyticUtils { fun getAnalyticsCustomParams(isDebug: Boolean): Map { val map: MutableMap = ArrayMap() map["debug"] = if (isDebug) 1 else 0 - map["sn"] = MoGoAiCloudClientConfig.getInstance().sn + map["sn"] = SharedPrefsMgr.getInstance().sn map["app_version"] = AppUtils.getAppVersionName() map["app_identity_mode"] = FunctionBuildConfig.appIdentityMode diff --git a/gradle.properties b/gradle.properties index 0ef2db782c..8aeb7782c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,21 +64,21 @@ bytex.ASM_API=ASM7 LOGLIB_VERSION=1.10.7 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.20 +MOGO_NETWORK_VERSION=1.4.7.23 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.20 +MOGO_PASSPORT_VERSION=1.4.7.23 # 长链接 -MOGO_SOCKET_VERSION=1.4.7.20 +MOGO_SOCKET_VERSION=1.4.7.23 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.20 +MOGO_REALTIME_VERSION=1.4.7.23 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.20 +MOGO_LIVE_VERSION=1.4.7.23 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.20 +MOGO_TRAFFICLIVE_VERSION=1.4.7.23 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.20 +MOGO_LOCATION_VERSION=1.4.7.23 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.20 +MOGO_TELEMATIC_VERSION=1.4.7.23 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=3.3.3.7 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt index c76c7271f4..fda36e748c 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt @@ -13,7 +13,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_HTTP_DNS_CITY_CODE import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.call.map.CallerGaoDeMapLocationListenerManager -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.CoordinateTransform import com.mogo.eagle.core.utilcode.util.TimeUtils import com.zhjt.service.chain.ChainLog @@ -119,18 +119,18 @@ class GDLocationClient private constructor() : AMapLocationListener, if (cityCode != null && cityCode.isNotEmpty()) { if (mCityCode.isEmpty() || mCityCode != cityCode) { setCityCode(cityCode) - SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()) + SharedPrefsMgr.getInstance() .putString(SharedPrefsConstants.LOCATION_CITY_CODE, cityCode) } } // 缓存经纬度 - SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()) + SharedPrefsMgr.getInstance() .putString( SharedPrefsConstants.LOCATION_LATITUDE, aMapLocation.latitude.toString() ) - SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()) + SharedPrefsMgr.getInstance() .putString( SharedPrefsConstants.LOCATION_LONGITUDE, aMapLocation.longitude.toString() diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index 15053e52cf..d5f24521ed 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -17,7 +17,7 @@ import com.mogo.eagle.core.function.api.devatools.apm.IApmEnvProvider; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; 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.mogo.eagle.core.utilcode.util.CommonUtils; import com.mogo.eagle.core.utilcode.util.DeviceUtils; import com.mogo.eagle.core.utilcode.util.GsonUtils; @@ -87,7 +87,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { .dynamicParams(new MonitorCrash.Config.IDynamicParams() { @Override public String getDid() {//返回空会使用内部默认的did - String sn = SharedPrefsMgr.getInstance(context).getString("sn"); + String sn = SharedPrefsMgr.getInstance().getString("sn"); if (sn != null && !sn.isEmpty()) { return sn; } else { @@ -103,11 +103,11 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { //应用崩溃后会执行这里，可选，添加业务自定义数据，在崩溃详情页->现场数据展示->自定义数据 .customData(crashType -> { //车辆所在位置 - mCityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE); - mLat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE); - mLogt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE); + mCityCode = SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_CITY_CODE); + mLat = SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_LATITUDE); + mLogt = SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_LONGITUDE); //车辆信息 - String carInfoString = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO); + String carInfoString = SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.CAR_INFO); if (carInfoString != null && !carInfoString.isEmpty()) { mInfo = GsonUtils.fromJson(carInfoString, CarInfo.class); } diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index 095aa2c1fb..5a6e57490f 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -24,8 +24,8 @@ import com.aispeech.export.engines.AILocalTTSEngine; import com.aispeech.export.intent.AILocalTTSIntent; import com.aispeech.export.listeners.AITTSListener; import com.aispeech.lite.AuthType; +import com.elegant.utils.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.tts.base.IMogoTTS; diff --git a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java index 15510794b7..f22ac83b28 100644 --- a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java +++ b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java @@ -8,8 +8,8 @@ import android.provider.Settings; import androidx.annotation.MainThread; +import com.elegant.utils.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.tts.base.IMogoTTS; import com.mogo.tts.base.IMogoTTSCallback;