diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index 32ab95019c..e2be4c4680 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -317,7 +317,6 @@ class MoGoAdasListenerImpl : OnAdasListener { carConfigResp: MessagePad.CarConfigResp? ) { if (carConfigResp != null) { - //todo emArrow startUp时确认数据完整性 AppConfigInfo.dockerVersion = carConfigResp.dockVersion AppConfigInfo.plateNumber = carConfigResp.plateNumber//车牌号 AppConfigInfo.iPCMacAddress = carConfigResp.macAddress//工控机MAC地址 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 f692c0d90a..499e30d784 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 @@ -300,14 +300,14 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener mInViewY = motionEvent.y // 获取相对屏幕的坐标，即以屏幕左上角为原点 mDownInScreenX = motionEvent.rawX - mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mDownInScreenY = motionEvent.rawY mInScreenX = motionEvent.rawX - mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mInScreenY = motionEvent.rawY } MotionEvent.ACTION_MOVE -> { // 更新浮动窗口位置参数 mInScreenX = motionEvent.rawX - mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mInScreenY = motionEvent.rawY mWindowParams!!.x = (mInScreenX - mInViewX).toInt() mWindowParams!!.y = (mInScreenY - mInViewY).toInt() // 手指移动的时候更新小悬浮窗的位置 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 6518eb66ac..8f2f8cdda3 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 @@ -315,14 +315,14 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList mInViewY = motionEvent.y // 获取相对屏幕的坐标，即以屏幕左上角为原点 mDownInScreenX = motionEvent.rawX - mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mDownInScreenY = motionEvent.rawY mInScreenX = motionEvent.rawX - mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mInScreenY = motionEvent.rawY } MotionEvent.ACTION_MOVE -> { // 更新浮动窗口位置参数 mInScreenX = motionEvent.rawX - mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mInScreenY = motionEvent.rawY mWindowParams!!.x = (mInScreenX - mInViewX).toInt() mWindowParams!!.y = (mInScreenY - mInViewY).toInt() // 手指移动的时候更新小悬浮窗的位置 @@ -338,7 +338,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList // 默认固定位置，靠屏幕右边缘的中间 mWindowManager!!.defaultDisplay.getMetrics(metrics) mWindowParams!!.x = metrics.widthPixels - mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()-350 + mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()-950 mWindowManager!!.addView(mFloatLayout, mWindowParams) //开启录包 if(recordCaseEntity!=null){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index b7d7139a43..984e95b476 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -270,7 +270,6 @@ class MoGoHmiFragment : MvpFragment(), if(isChecked){ viewPassengerMsgBoxList.visibility = View.VISIBLE viewPassengerMsgBoxBubble.visibility = View.GONE - viewPassengerMsgBoxList.notifyData() viewPassengerMsgBoxBubble.isShowData(false) CallerHmiManager.updatePassengerMsgBoxTipView(false) }else{ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt index a4606ebcd6..554403778b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt @@ -3,15 +3,24 @@ package com.mogo.eagle.core.function.hmi.ui.msgbox import android.app.Activity import android.content.Context import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgCategory +import com.mogo.eagle.core.data.msgbox.OperationMsg +import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.DriverMsgBoxListAdapter import com.mogo.eagle.core.function.msgbox.MsgBoxConfig +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.TimeUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_driver_msg_box_list.view.* /** @@ -23,13 +32,13 @@ class DriverMsgBoxListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr){ +) : ConstraintLayout(context, attrs, defStyleAttr) , IMsgBoxListener { init { LayoutInflater.from(context).inflate(R.layout.layout_driver_msg_box_list, this, true) initView() } - + private val TAG = "DriverMsgBoxListView" private var noticeList: ArrayList ?= null private var ipcReportList: ArrayList ?= null private var badCaseList: ArrayList ?= null @@ -42,10 +51,13 @@ class DriverMsgBoxListView @JvmOverloads constructor( //获取通知消息列表 noticeList= CallerMsgBoxManager.getCachedNotifyData() as ArrayList? + noticeList = noticeList?.let { ArrayList(it.reversed()) } //获取车辆系统信息列表 ipcReportList = CallerMsgBoxManager.getCachedSysInfoData() as ArrayList? + ipcReportList = ipcReportList?.let { ArrayList(it.reversed()) } //获取录包信息列表 badCaseList = CallerMsgBoxManager.getCachedRecordBagData() as ArrayList? + badCaseList = badCaseList?.let { ArrayList(it.reversed()) } //通知 tvMsgNotice.setOnClickListener { tvMsgNotice.setTextColor(resources.getColor(R.color.msg_box_title_color)) @@ -103,14 +115,6 @@ class DriverMsgBoxListView @JvmOverloads constructor( } fun notifyData(){ - val localNoticeList = MsgBoxConfig.noticeList.reversed() - noticeList?.addAll(0,localNoticeList) - val localSysInfoList = MsgBoxConfig.systemInfoList.reversed() - ipcReportList?.addAll(0,localSysInfoList) - val localRecordList = MsgBoxConfig.recordBagList.reversed() - - badCaseList?.addAll(0,localRecordList) - //获取当前Tab选择 when(MsgBoxConfig.getUserRecord()){ 0 ->{ @@ -162,6 +166,35 @@ class DriverMsgBoxListView @JvmOverloads constructor( } + override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { + UiThreadHandler.post{ + when (category) { + MsgCategory.NOTICE -> { + noticeList?.add(0,msgBoxList) + } + MsgCategory.SYS_INFO -> { + ipcReportList?.add(0,msgBoxList) + } + MsgCategory.RECORD_BAG -> { + badCaseList?.add(0,msgBoxList) + } + } + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + CallerMsgBoxListenerManager.addListener(TAG,this) + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + CallerMsgBoxListenerManager.removeListener(TAG) + } + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt index 9b231d917b..f0720f387c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt @@ -7,14 +7,18 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType -import com.mogo.eagle.core.data.msgbox.V2XMsg +import com.mogo.eagle.core.data.msgbox.MsgCategory +import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.PassengerMsgBoxListAdapter -import com.mogo.eagle.core.function.msgbox.MsgBoxConfig +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_passenger_msg_box_list.view.* /** @@ -26,8 +30,9 @@ class PassengerMsgBoxListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr){ +) : ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxListener { + private val TAG = "PassengerMsgBoxListView" var passengerMsgBoxListAdapter: PassengerMsgBoxListAdapter ?= null private var noticeList: ArrayList ?= null @@ -47,18 +52,40 @@ class PassengerMsgBoxListView @JvmOverloads constructor( rvPassengerList.addItemDecoration(divider) //获取通知消息列表 noticeList= CallerMsgBoxManager.getCachedNotifyData() as ArrayList? - noticeList?.reversed() + noticeList = noticeList?.let { ArrayList(it.reversed()) } noticeList?.let { passengerMsgBoxListAdapter?.setData(it) } } - fun notifyData(){ - val localNoticeList = MsgBoxConfig.noticeList.reversed() - noticeList?.addAll(0,localNoticeList) - noticeList?.let { - passengerMsgBoxListAdapter?.setData(it) + override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { + UiThreadHandler.post{ + if(category == MsgCategory.NOTICE){ + if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X + || msgBoxList.type == MsgBoxType.OBU){ + noticeList?.add(0,msgBoxList) + noticeList?.let { + passengerMsgBoxListAdapter?.setData(it) + } + } + } + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){ + CallerMsgBoxListenerManager.addListener(TAG,this) + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){ + CallerMsgBoxListenerManager.removeListener(TAG) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index a7748622dc..bf1fc63be2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -106,11 +106,6 @@ public class MainActivity extends MvpActivity implement return R.layout.module_main_activity_main; } - @Override - protected void beforeSetContentView(Bundle savedInstanceState) { - init(); - } - @Override protected void initViews() { injectStatusBar(); @@ -152,16 +147,6 @@ public class MainActivity extends MvpActivity implement decorView.addView(statusBarView, statusBarLP); } - // 隐藏布局 - protected void hideLayout() { - mFloatingLayout.setVisibility(View.GONE); - } - - // 显示布局 - protected void showLayout() { - mFloatingLayout.setVisibility(View.VISIBLE); - } - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -187,7 +172,6 @@ public class MainActivity extends MvpActivity implement AppLaunchTimeUtils.beginTimeCalculate(AppLaunchTimeUtils.HOT_START); } - @Override public void onWindowFocusChanged(boolean hasFocus) { super.onWindowFocusChanged(hasFocus); @@ -216,10 +200,6 @@ public class MainActivity extends MvpActivity implement } } - private void init() { - MogoStatusManager.getInstance().setMainPageLaunchedStatus(TAG, true); - } - private void initConnectInfoRV() { mConnAdapter = new ConnInfoAdapter(this, dataList); mConnectInfoRV.setLayoutManager(new LinearLayoutManager(this)); @@ -464,7 +444,6 @@ public class MainActivity extends MvpActivity implement if (mapUIController != null) { mapUIController.destroy(); } - MogoStatusManager.getInstance().setMainPageLaunchedStatus(TAG, false); MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false); CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy."); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java index c679dcc4e2..ee82744042 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java @@ -23,7 +23,7 @@ import com.mogo.eagle.core.function.main.constants.MainConstants; */ public class MainPresenter extends Presenter { - private Handler mMsgHandler = new Handler(Looper.getMainLooper()) { + private final Handler mMsgHandler = new Handler(Looper.getMainLooper()) { @Override public void handleMessage(Message msg) { super.handleMessage(msg); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml index e8e3c08f6e..1e58a823d1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml @@ -53,12 +53,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - - - , IMoGoTrafficLightListe CallerMsgBoxManager.saveMsgBox( MsgBoxBean(MsgBoxType.V2X, V2XMsg(v2xType, alertContent.toString(), ttsContent)) ) + CallerHmiManager.warningV2X( + v2xType, alertContent, ttsContent, tag, + object : IMoGoWarningStatusListener { + override fun onShow() {} + override fun onDismiss() {} + }, + true, + 5000L + ) } fun destroy() { diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt index c36746ed14..b66eebe287 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt @@ -7,7 +7,7 @@ import mogo.telematics.pad.MessagePad import java.util.concurrent.ConcurrentHashMap /** - * 车辆地盘数据 回调监听 + * 车辆配置信息 回调监听 */ object CallerAutopilotCarConfigListenerManager : CallerBase() { @@ -18,7 +18,7 @@ object CallerAutopilotCarConfigListenerManager : CallerBase() { ConcurrentHashMap() /** - * 添加 ADAS车辆状态&定位 监听 + * 添加 配置信息 监听 * @param tag 标记，用来注销监听使用 * @param listener 监听回调 */ @@ -48,7 +48,7 @@ object CallerAutopilotCarConfigListenerManager : CallerBase() { } /** - * 删除自动驾驶按钮选中监听 + * 删除配置信息监听 * @param listener 要删除的监听对象 */ fun removeListener(@Nullable listener: IMoGoAutopilotCarConfigListener) { diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/IMogoStatusManager.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/IMogoStatusManager.java index 7b8b02c6c8..b7d4e29ab0 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/IMogoStatusManager.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/IMogoStatusManager.java @@ -51,13 +51,6 @@ public interface IMogoStatusManager extends IProvider { */ boolean isMainPageIsBackground(); - /** - * 主页是否已启动 - * - * @return - */ - boolean isMainPageLaunched(); - /** * 长链是否在线 * @return @@ -135,14 +128,6 @@ public interface IMogoStatusManager extends IProvider { */ void setSeekHelping( String tag, boolean seekHelping ); - /** - * 设置主页是否启动 - * - * @param tag - * @param launched - */ - void setMainPageLaunchedStatus( String tag, boolean launched ); - /** * 注册监听 * diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/MogoStatusManager.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/MogoStatusManager.java index 55e7b1825c..e94f92eec3 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/MogoStatusManager.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/MogoStatusManager.java @@ -78,11 +78,6 @@ public class MogoStatusManager implements IMogoStatusManager { return get_bool_val(StatusDescriptor.MAIN_PAGE_IS_BACKGROUND); } - @Override - public boolean isMainPageLaunched() { - return get_bool_val(StatusDescriptor.MAIN_PAGE_CREATED); - } - @Override public boolean isSocketOnLine() { return get_bool_val(StatusDescriptor.CLOUD_SOCKET); @@ -138,11 +133,6 @@ public class MogoStatusManager implements IMogoStatusManager { doSetStatus(tag, StatusDescriptor.SEEK_HELPING, seekHelping); } - @Override - public void setMainPageLaunchedStatus(String tag, boolean launched) { - doSetStatus(tag, StatusDescriptor.MAIN_PAGE_CREATED, launched); - } - private void doSetStatus(String tag, StatusDescriptor target, boolean value) { mStatus.put(target, value); invokeStatusChangedListener(target, value); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/StatusDescriptor.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/StatusDescriptor.java index a3c5141c87..f4e4a9b462 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/StatusDescriptor.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/StatusDescriptor.java @@ -43,10 +43,6 @@ public enum StatusDescriptor { */ SEEK_HELPING, - /** - * 是否已经进入过主页 - */ - MAIN_PAGE_CREATED, /** * 是否已经进入vr模式 diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java index 7cc179c5fe..4b47d32573 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java @@ -33,7 +33,6 @@ public abstract class MvpActivity> exten protected void onCreate(@Nullable Bundle savedInstanceState) { BarUtils.hideStatusBarAndSticky(this.getWindow()); super.onCreate(savedInstanceState); - beforeSetContentView(savedInstanceState); setContentView(getLayoutId()); initViews(); mPresenter = createPresenter(); @@ -45,11 +44,6 @@ public abstract class MvpActivity> exten super.onResume(); } - - protected void beforeSetContentView(Bundle savedInstanceState) { - - } - /** * 布局资源 * diff --git a/gradle.properties b/gradle.properties index d9d4f30730..d83654b400 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4 LOGLIB_VERSION=1.5.8 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.3.26 +MOGO_NETWORK_VERSION=1.4.3.27 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.3.26 +MOGO_PASSPORT_VERSION=1.4.3.27 # 常链接 -MOGO_SOCKET_VERSION=1.4.3.26 +MOGO_SOCKET_VERSION=1.4.3.27 # 数据采集 -MOGO_REALTIME_VERSION=1.4.3.26 +MOGO_REALTIME_VERSION=1.4.3.27 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.3.26 +MOGO_TANLU_VERSION=1.4.3.27 # 直播推流 -MOGO_LIVE_VERSION=1.4.3.26 +MOGO_LIVE_VERSION=1.4.3.27 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.3.26 +MOGO_TRAFFICLIVE_VERSION=1.4.3.27 # 定位服务 -MOGO_LOCATION_VERSION=1.4.3.26 +MOGO_LOCATION_VERSION=1.4.3.27 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.3.26 +MOGO_TELEMATIC_VERSION=1.4.3.27 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.7.0.10