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 9ab9e562f7..f863019acf 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,8 +3,8 @@ 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.eagle.core.utilcode.util.NetworkUtils;
-import com.mogo.eagle.core.utilcode.util.SharedPrefs;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
@@ -121,7 +121,7 @@ public class BusLineModel {
         OrderServiceManager.switchLine(mContext,taskId, new OchCommonServiceCallback<BusRoutesResponse>() {
             @Override
             public void onSuccess(BusRoutesResponse o) {
-                SharedPrefs.getInstance(mContext).putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId);
+                SharedPrefsMgr.getInstance(mContext).putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId);
                 if (mBusLinesCallback != null){
                     mBusLinesCallback.onChangeLineIdSuccess();
                 }
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 57d37c2805..eff63dd20b 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.util.SharedPrefs
+import com.mogo.eagle.core.utilcode.mogo.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<BusSwitchLineView?, BusLinePresenter?>
             showNoData(true)
             return
         }
-        var lastCommitLineid = SharedPrefs.getInstance(this).getInt(LASTCOMMITLINEID, -1)
+        val lastCommitLineid = SharedPrefsMgr.getInstance(this).getInt(LASTCOMMITLINEID, -1)
         if (data.data != null && data.data.size > 0) {
             showNoData(false)
             mData.clear()
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 8a281e7963..cebda9766f 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,6 +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.eagle.core.utilcode.util.*
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.common.module.manager.loopmanager.LoopInfo
@@ -312,7 +313,7 @@ object CharterPassengerModel {
     }
 
     //监听网络变化，避免启动机器时无网导致无法更新订单信息
-    private val mNetWorkIntentListener = IMogoIntentListener { intentStr, intent ->
+    private val mNetWorkIntentListener = IMogoIntentListener { intentStr, _ ->
         d(M_BUS_P + TAG, "onIntentReceived = %s", intentStr)
         if (ConnectivityManager.CONNECTIVITY_ACTION == intentStr) {
             if (NetworkUtils.isConnected(mContext)) {
@@ -386,7 +387,7 @@ object CharterPassengerModel {
             this.orderInfo?.orderNo?.let {
                 if (it != orderData.orderNo) {
                     // orderNo 变后清理
-                    SharedPrefs.getInstance(mContext).remove("${it}$min5Speak")
+                    SharedPrefsMgr.getInstance(mContext).remove("${it}$min5Speak")
                 }
             }
             if (order.lineId == null || order.lineId == 0L || order.siteId == null || order.siteId == 0L) {
@@ -562,7 +563,7 @@ object CharterPassengerModel {
                                 .subscribe { millisUntilFinished ->
                                     if (millisUntilFinished <= 900L) {
                                         orderInfo?.let {
-                                            val isPlayed = SharedPrefs.getInstance(mContext)
+                                            val isPlayed = SharedPrefsMgr.getInstance(mContext)
                                                 .getBoolean("${it.orderNo}$min5Speak", false)
                                             if (!isPlayed) {
                                                 //发送 通知
@@ -573,7 +574,7 @@ object CharterPassengerModel {
                                                 )
                                                 VoiceManager.surplus15min(VoiceFocusManager.getVoiceCmdCallBack())
                                                 d(M_BUS_P + TAG, "倒计时15分钟${it.orderNo}")
-                                                SharedPrefs.getInstance(mContext)
+                                                SharedPrefsMgr.getInstance(mContext)
                                                     .putBoolean("${it.orderNo}$min5Speak", true)
                                             }
                                         }
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 a0523ec277..8018df7053 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.util.SharedPrefs
+import com.mogo.eagle.core.utilcode.mogo.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() {
-        SharedPrefs.getInstance(context).remove(KEY4SHOWNOVICEGUIDANCE)
+        SharedPrefsMgr.getInstance(context).remove(KEY4SHOWNOVICEGUIDANCE)
     }
 
     private fun showNoviceGuidance() {
         CallerLogger.d(M_BUS_P + TAG, "showNoviceGuidance")
         val currentOrderInfo = CharterPassengerModel.getCurrentOrderInfo()
         currentOrderInfo?.orderNo?.let { order ->
-            val stringSet = SharedPrefs.getInstance(context).getStringSet(KEY4SHOWNOVICEGUIDANCE)
+            val stringSet = SharedPrefsMgr.getInstance(context).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 661c1abedb..74167e212e 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,6 +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.eagle.core.utilcode.util.*
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
@@ -160,7 +161,7 @@ class NoviceGuidanceFragment :
         val currentOrderInfo = CharterPassengerModel.getCurrentOrderInfo()
         currentOrderInfo?.orderNo?.let { order ->
             val orderNoSet = mutableSetOf(order)
-            SharedPrefs.getInstance(requireContext())
+            SharedPrefsMgr.getInstance(requireContext())
                 .putStringSet(BusPassengerPresenter.KEY4SHOWNOVICEGUIDANCE, orderNoSet)
         }
     }
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
index 223f60effa..4be8d6a160 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
@@ -4,9 +4,8 @@ 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.eagle.core.utilcode.util.NetworkUtils
-import com.mogo.eagle.core.utilcode.util.SharedPrefs
-import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.R
 import com.mogo.och.common.module.biz.bean.TaxiLoginReqBean
 import com.mogo.och.common.module.biz.bean.TaxiLoginRespBean
@@ -100,8 +99,8 @@ object OchCommonLoginModel {
                             // 获取验证码成功
                             ToastCharterUtils.showToastShort(mContext?.getString(R.string.module_och_taxi_login_login_success))
                             LoginStatusManager.setLoginStatus(TaxiLoginStatusEnum.Login)
-                            mContext?.let {
-                                SharedPrefs.getInstance(it).putString("och_account", phone)
+                            mContext?.let { c ->
+                                SharedPrefsMgr.getInstance(c).putString("och_account", phone)
                             }
                             iTaxiLoginCallback?.loginSuccess()
                         } else {
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt
index 9e32bd2aa5..a2d0ece58f 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt
@@ -3,16 +3,14 @@ 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.eagle.core.utilcode.util.GsonUtils
-import com.mogo.eagle.core.utilcode.util.SharedPrefs
-import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.och.common.module.bean.dpmsg.BusCacheKey
 import com.mogo.och.common.module.bean.dpmsg.LoginCacheStatus
 import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean
 import com.mogo.och.common.module.biz.callback.ILoginCallback
 import com.mogo.och.common.module.biz.callback.ILoginViewCallback
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
-import com.mogo.och.common.module.biz.constant.LoginStatusManager.isLogin
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.data.manager.cache.CacheDataManager
 
@@ -29,10 +27,10 @@ object OchCommonLoginStatusDefaultModel : OchCommonLoginStatusModel() {
     override fun loginSuccess(data: DriverStatusQueryRespBean?) {
         CallerLogger.d(SceneConstant.M_TAXI + TAG, "loginSuccess:${LoginStatusManager.isLogin()}")
         if (LoginStatusManager.isLogin()) {
-            SharedPrefs.getInstance(mContext).putString("och_account", data?.data?.phone)
+            SharedPrefsMgr.getInstance(mContext).putString("och_account", data?.data?.phone)
             loginViewCallback?.hideLoginDialogFragment()
         } else {
-            SharedPrefs.getInstance(mContext).putString("och_account", "")
+            SharedPrefsMgr.getInstance(mContext).putString("och_account", "")
             loginViewCallback?.showLoginDialogFragment()
         }
         loginCallback?.loginSuccess(data)
@@ -42,8 +40,7 @@ object OchCommonLoginStatusDefaultModel : OchCommonLoginStatusModel() {
     }
 
     private fun updateLoginLocalStatus(loginStatus: Int = 0) {
-        var loginCacheStatus = LoginCacheStatus(loginStatus,DateTimeUtil.getCurrentTimeStamp())
-
+        val loginCacheStatus = LoginCacheStatus(loginStatus,DateTimeUtil.getCurrentTimeStamp())
         CacheDataManager.instance.putCacheData(mContext, BusCacheKey.BUS_LOGIN_STATUS_CACHE,
             GsonUtils.toJson(loginCacheStatus))
     }
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 fe5138ed11..244ef9526d 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,8 +3,8 @@ 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.eagle.core.utilcode.util.NetworkUtils;
-import com.mogo.eagle.core.utilcode.util.SharedPrefs;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
@@ -78,7 +78,7 @@ public class BusLineModel {
 
     /**
      * 通过线路id 查询线路排班表
-     * @param lineId
+     * @param lineId 线路ID
      * @param position 位置
      */
     public void queryBusLineTasksById(int lineId, int position,boolean autoRefresh){
@@ -119,7 +119,7 @@ public class BusLineModel {
         OrderServiceManager.switchLine(mContext,taskId, new OchCommonServiceCallback<BusRoutesResponse>() {
             @Override
             public void onSuccess(BusRoutesResponse o) {
-                SharedPrefs.getInstance(mContext).putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId);
+                SharedPrefsMgr.getInstance(mContext).putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId);
                 if (mBusLinesCallback != null){
                     mBusLinesCallback.onChangeLineIdSuccess();
                 }
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 57d37c2805..eff63dd20b 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.util.SharedPrefs
+import com.mogo.eagle.core.utilcode.mogo.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<BusSwitchLineView?, BusLinePresenter?>
             showNoData(true)
             return
         }
-        var lastCommitLineid = SharedPrefs.getInstance(this).getInt(LASTCOMMITLINEID, -1)
+        val lastCommitLineid = SharedPrefsMgr.getInstance(this).getInt(LASTCOMMITLINEID, -1)
         if (data.data != null && data.data.size > 0) {
             showNoData(false)
             mData.clear()
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 5679a80c0e..a4270fc1a2 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -7,7 +7,7 @@ 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.util.SharedPrefs;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.launcher.crash.CrashSystem;
 import com.mogo.launcher.startup.ARouterStartUp;
 import com.mogo.launcher.startup.ConfigStartUp;
@@ -33,7 +33,7 @@ public class MogoApplication extends MainMoGoApplication {
     private void tryEnableStrictMode() {
         IStrictModeProvider strict = CallerDevaToolsManager.INSTANCE.strict();
         if (DebugConfig.isDebug() && strict != null) {
-            boolean enabled = SharedPrefs.getInstance(this).getBoolean("MOGO_STRICT_MODE_ENABLED", false);
+            boolean enabled = SharedPrefsMgr.getInstance(this).getBoolean("MOGO_STRICT_MODE_ENABLED", false);
             Logger.e("StrictMode", "isEnabled:" + enabled);
             if (enabled) {
                 strict.enable();
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 3903d42442..97f01d712f 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
@@ -3,12 +3,9 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.mogo.eagle.core.data.msgbox.MsgBoxBean
-import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.utilcode.util.SharedPrefs
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 
 /**
  * 用于普通云公告的测试
@@ -24,23 +21,25 @@ class NoticeNormalBroadcastReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         try {
             // 分发场景
-            dispatchShowWaring("11", "官方公告", "测试普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告哈哈哈哈哈哈好好",
-                    "https://dataservice-1255510688.cos.ap-beijing.myqcloud.com/carImg/yycp_NoticeDETAIL_location.png",
-                 "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)
-            SharedPrefs.getInstance(context).putInt("videoType", 1)
+            dispatchShowWaring(
+                "11", "官方公告", "测试普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告哈哈哈哈哈哈好好",
+                "https://dataservice-1255510688.cos.ap-beijing.myqcloud.com/carImg/yycp_NoticeDETAIL_location.png",
+                "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)
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
     private fun dispatchShowWaring(
-            id: String,
-            titleTv: String,
-            contentTv: String,
-            imageUrl: String,
-            videoUrl: String,
-            fileType: Int
+        id: String,
+        titleTv: String,
+        contentTv: String,
+        imageUrl: String,
+        videoUrl: String,
+        fileType: Int
     ) {
 
         val data = NoticeNormalData()
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 57a11a18ba..b5758c6c39 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
@@ -732,10 +732,10 @@ internal class DebugSettingView @JvmOverloads constructor(
         }
 
         tbIsStrictMode?.also {
-            it.isChecked = SharedPrefs.getInstance(Utils.getApp())
+            it.isChecked = SharedPrefsMgr.getInstance(Utils.getApp())
                 .getBoolean("MOGO_STRICT_MODE_ENABLED", false)
             it.setOnCheckedChangeListener { _, isChecked ->
-                SharedPrefs.getInstance(Utils.getApp())
+                SharedPrefsMgr.getInstance(Utils.getApp())
                     .putBoolean("MOGO_STRICT_MODE_ENABLED", isChecked)
                 scope.launch {
                     ToastUtils.showShort("配置生效, 2秒后重启应用...")
@@ -1686,21 +1686,10 @@ internal class DebugSettingView @JvmOverloads constructor(
          */
         tvServerEnvironment.text = "当前服务器环境：${AppConfigInfo.netMode} -- ${
             when (AppConfigInfo.netMode) {
-                2 -> {
-                    "测试环境"
-                }
-
-                3 -> {
-                    "生产环境"
-                }
-
-                4 -> {
-                    "演示环境"
-                }
-
-                else -> {
-                    "未知环境"
-                }
+                2 -> "测试环境"
+                3 -> "生产环境"
+                4 -> "演示环境"
+                else -> "未知环境"
             }
         }"
 
@@ -1791,18 +1780,17 @@ internal class DebugSettingView @JvmOverloads constructor(
         }
         tvCmdbCarInfoContent.text =
             SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO) ?: ""
-
         //APP升级功能
         tvAppHost.text = "HOST地址：" + SharedPrefsMgr.getInstance(context)
-            .getString(SharedPrefsConstants.HOST_ADDRESS) ?: ""
+            .getString(SharedPrefsConstants.HOST_ADDRESS)
         tvAppContent.text = "APP升级数据：" + SharedPrefsMgr.getInstance(context)
-            .getString(SharedPrefsConstants.APP_UPGRADE_CONTENT) ?: ""
+            .getString(SharedPrefsConstants.APP_UPGRADE_CONTENT)
 
         tvCarInfo.text =
-            "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" +
+            "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))}\n" +
                     "自车经纬度：\n${mGnssInfo?.longitude}\n${mGnssInfo?.latitude}\n"
         tvCarInfoCopy.text =
-            "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" +
+            "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))}\n" +
                     "自车经纬度：\n${mGnssInfo?.longitude}\n${mGnssInfo?.latitude}\n"
 
         tvIdentifyInfo.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 39982a3752..e7eb56f079 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.util.SharedPrefs
+import com.mogo.eagle.core.utilcode.mogo.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(SharedPrefs.getInstance(it).getString("och_account",""))
+                actvAccountPhone.text = phoneMask(SharedPrefsMgr.getInstance(it).getString("och_account",""))
             }
             clickPersonalRightView()
             clickQRBtn()
@@ -69,7 +69,7 @@ class BusOperationView @JvmOverloads constructor(
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         context?.let {
-            actvAccountPhone.text = phoneMask(SharedPrefs.getInstance(it).getString("och_account",""))
+            actvAccountPhone.text = phoneMask(SharedPrefsMgr.getInstance(it).getString("och_account",""))
         }
     }
 
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
index 06a457b844..d143e4f954 100644
--- 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
@@ -11,7 +11,7 @@ import android.text.TextUtils;
 
 import androidx.core.content.ContextCompat;
 
-import com.elegant.utils.storage.SharedPrefsMgr;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SharedPrefs.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SharedPrefs.java
deleted file mode 100644
index e614aca9a9..0000000000
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SharedPrefs.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.mogo.eagle.core.utilcode.util;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import androidx.annotation.NonNull;
-
-import java.util.Set;
-
-/**
- * 通用sp处理类
- */
-public class SharedPrefs {
-
-    private static final String File_Name = "app_shared_pref";
-    private static SharedPrefs sInstance;
-    private static SharedPreferences sSharedPrefs;
-
-    public synchronized static SharedPrefs getInstance( @NonNull Context context ) {
-        if ( sInstance == null ) {
-            try {
-                sInstance = new SharedPrefs( context.getApplicationContext() );
-            } catch ( Exception e ) {
-                sInstance = new SharedPrefs();
-            }
-        }
-        return sInstance;
-    }
-
-    private SharedPrefs() {
-
-    }
-
-    private SharedPrefs(Context context ) {
-        try {
-            sSharedPrefs = context.getSharedPreferences( File_Name, Context.MODE_PRIVATE );
-        } catch ( Exception e ) {
-            e.printStackTrace();
-        }
-    }
-
-    public void putString( String key, String value ) {
-        try {
-            SharedPreferences.Editor editor = sSharedPrefs.edit();
-            editor.putString( key, value );
-            editor.apply();
-        } catch ( Exception e ) {
-        }
-    }
-
-    public String getString( String tag ) {
-        try {
-            return sSharedPrefs.getString( tag, "" );
-        } catch ( Exception e ) {
-            return "";
-        }
-    }
-
-    public String getString( String tag, String defVal ) {
-        try {
-            return sSharedPrefs.getString( tag, defVal );
-        } catch ( Exception e ) {
-            return "";
-        }
-    }
-
-    public boolean getBoolean( String key, boolean defaultValue ) {
-        try {
-            return sSharedPrefs.getBoolean( key, defaultValue );
-        } catch ( Exception e ) {
-            return defaultValue;
-        }
-    }
-
-    public long getLong( String key, long defaultValue ) {
-        try {
-            return sSharedPrefs.getLong( key, defaultValue );
-        } catch ( Exception e ) {
-            return defaultValue;
-        }
-    }
-
-    public float getFloat( String key, float defaultValue ) {
-        try {
-            return sSharedPrefs.getFloat( key, defaultValue );
-        } catch ( Exception e ) {
-            return defaultValue;
-        }
-    }
-
-    public int getInt( String key, int value ) {
-        try {
-            return sSharedPrefs.getInt( key, value );
-        } catch ( Exception e ) {
-            return value;
-        }
-    }
-
-    public void putBoolean( String key, boolean value ) {
-        try {
-            SharedPreferences.Editor editor = sSharedPrefs.edit();
-            editor.putBoolean( key, value );
-            editor.apply();
-        } catch ( Exception e ) {
-        }
-    }
-
-    public void putLong( String key, long value ) {
-        try {
-            SharedPreferences.Editor editor = sSharedPrefs.edit();
-            editor.putLong( key, value );
-            editor.apply();
-        } catch ( Exception e ) {
-        }
-    }
-
-    public void putInt( String key, int value ) {
-        try {
-            SharedPreferences.Editor editor = sSharedPrefs.edit();
-            editor.putInt( key, value );
-            editor.apply();
-        } catch ( Exception e ) {
-        }
-    }
-
-    public void putFloat( String key, float value ) {
-        try {
-            SharedPreferences.Editor editor = sSharedPrefs.edit();
-            editor.putFloat( key, value );
-            editor.apply();
-        } catch ( Exception e ) {
-        }
-    }
-
-    public void remove( String key ) {
-        try {
-            SharedPreferences.Editor editor = sSharedPrefs.edit();
-            editor.remove( key );
-            editor.apply();
-        } catch ( Exception e ) {
-        }
-    }
-
-    public void putStringSet( String key, Set< String > values ) {
-        try {
-            SharedPreferences.Editor editor = sSharedPrefs.edit();
-            editor.putStringSet( key, values );
-            editor.apply();
-        } catch ( Exception e ) {
-        }
-    }
-
-    public Set<String> getStringSet( String key ) {
-        return sSharedPrefs.getStringSet( key, null );
-    }
-
-}
\ No newline at end of file
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 5a6e57490f..095aa2c1fb 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 b12e78c35f..4f02500a14 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;