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

[6.2.6] sp opt , update aicloud upload loc thread

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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