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

Merge remote-tracking branch 'origin/qa_1.1.8_easy_mode' into qa_1.1.8_easy_mode

Browse Source
This commit is contained in:
wangcongtao
2020-12-07 14:41:52 +08:00
parent da7e4aae4d 85eeac93d5
commit 1e8d20b894
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
View File

@@ -545,7 +545,11 @@ public class TanluManager implements IMogoMarkerClickListener,
markerShowEntity.setMarkerLocation(markerLocation);
IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity);
mogoMarker.setClickable(false);
if (mogoMarker != null) {
mogoMarker.setClickable(false);
} else {
Logger.e(TAG, "mogoMarker == null ");
}
//添加图片动画
Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.tanlu_circle_image, null);

14
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
View File

@@ -14,6 +14,7 @@ import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager;
import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager;
import com.mogo.module.v2x.manager.IMoGoV2XStatusManager;
import com.mogo.module.v2x.network.V2XRefreshModel;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.adas.IMogoADASController;
@@ -29,11 +30,11 @@ import com.mogo.service.module.IMogoMarkerService;
import com.mogo.service.module.IMogoRegisterCenter;
import com.mogo.service.module.IMogoSearchManager;
import com.mogo.service.share.IMogoShareManager;
import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.share.IMogoTrafficUploadProvider;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
import com.mogo.service.strategy.IMogoRefreshStrategyController;
import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.windowview.IMogoTopViewManager;
import com.mogo.service.windowview.IMogoWindowManager;
import com.zhidao.carchattingprovider.CallChattingProviderConstant;
@@ -96,7 +97,7 @@ public class V2XServiceManager {
private static IMoGoV2XPolylineManager moGoV2XPolylineManager;
private static IMoGoV2XStatusManager moGoV2XStatusManager;
private V2XServiceManager(){
private V2XServiceManager() {
}
@@ -126,7 +127,7 @@ public class V2XServiceManager {
mIMogoTrafficUploadProvider = mMogoServiceApis.getTrafficUploadApi();
mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi();
//事件面板
mIEventPanelProvider = mMogoServiceApis.getEventPanelManager();
mIEventPanelProvider = mMogoServiceApis.getEventPanelManager();
mMarkerManager = mMapService.getMarkerManager(context);
mNavi = mMapService.getNavi(context);
@@ -239,6 +240,9 @@ public class V2XServiceManager {
}
public static IMoGoV2XStatusManager getMoGoV2XStatusManager() {
if (moGoV2XStatusManager == null) {
moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(V2XUtils.getApp());
}
return moGoV2XStatusManager;
}
@@ -278,7 +282,7 @@ public class V2XServiceManager {
return mIMogoTanluProvider;
}
public static IMogoTrafficUploadProvider getIMogoTrafficUploadProvider(){
public static IMogoTrafficUploadProvider getIMogoTrafficUploadProvider() {
return mIMogoTrafficUploadProvider;
}
@@ -286,7 +290,7 @@ public class V2XServiceManager {
return mMogoOnlineCarListPanelProvider;
}
public static IEventPanelProvider getEventPanelProvider(){
public static IEventPanelProvider getEventPanelProvider() {
return mIEventPanelProvider;
}
}

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
View File

@@ -372,7 +372,9 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
1 -> {
try {
if (mRbSurroundingEvent?.isChecked == true) {
mV2XSurroundingFragment?.ttsForVoiceCheckout()
if (DebugConfig.isMapBased()) {
mV2XSurroundingFragment?.ttsForVoiceCheckout()
}
} else {
mRbSurroundingEvent?.isChecked = true
mV2XSurroundingFragment?.fromVoice = true

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
View File

@@ -166,6 +166,7 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
private void initData() {
mTopLayout.setVisibility(View.GONE);
mRecyclerView.setVisibility(View.GONE);
mEmptyLayout.setVisibility(View.GONE);
mloadingImage.start();
surroundingEventPresenter.getSurroundingEventData();
}