diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 994b1c9f59..d6183d9ced 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -130,6 +130,7 @@ public class MogoApplication extends AbsMogoApplication { Intent intent = new Intent(); intent.setComponent(new ComponentName("com.zhidao.speech.voice.pad", "com.zhidao.speech.MainActivity")); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); } } catch (Exception e) { diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index f9adb43a4e..d91b1cb832 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.28' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.29' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java index 1a4ce78294..0e6b6a9769 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java @@ -140,6 +140,9 @@ public class SnapshotLocationController { mLastLocationInfo = null; } } + if (list.size() == 0) { + return null; + } //Logger.d( TAG, "upload loc size = %s", list == null ? 0 : list.size() ); return list; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index d9ef4ba560..4e44318695 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -181,6 +181,7 @@ public class EntranceFragment extends MvpFragment15px 110px 40px + 145px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml deleted file mode 100644 index 027820a732..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - 90px - 32px - 2px - 16px - 26px - 26px - 32px - - 90px - 32px - 2px - 100px - 90px - 2px - 54px - 100px - 90px - 8px - - 180px - 180px - 2px - 60px - 60px - 28px - - 32px - 2px - - 140px - 32px - 60px - 92px - 24px - 48px - 2px - 140px - 140px - 120px - 20px - 30px - 32px - 32px - - 120px - 120px - 32px - 60px - 32px - 60px - 32px - 30px - 20px - - - 120px - 60px - 60px - 32px - 48px - 80px - 28px - 26px - 44px - 44px - 18px - 34px - 26px - 28px - 30px - 30px - 30px - 20px - - 103px - 103px - - - 1058px - 210px - 144px - 159px - 159px - 70px - 70px - 56px - 83px - 24px - 40px - 60px - 50px - 12px - 10px - 40px - 30px - 34px - 24px - 28px - 23px - 17px - 17px - 36px - 36px - -2px - 95px - - 30px - 40px - 40px - 15px - 15px - 5px - 50px - 56px - 30px - 56px - 30px - 56px - 30px - 15px - 15px - - - 1000px - 390px - 200px - 200px - 240px - 30px - 120px - 120px - 10px - 22px - 28px - 28px - 30px - 90px - 90px - 6dp - 15px - 4px - 10px - 20px - - 40px - 45px - 100px - 134px - 30px - 20px - 20px - 8px - 21px - 31px - 1920px - - -1 - 0px - - 36px - 393px - 700px - 145px - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 94c099f9b2..49b1f3ffd8 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -940,7 +940,9 @@ public class MogoServices implements IMogoMapListener, MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true ); MapCenterPointStrategy.resetByChangeMode(); MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); - AIAssist.getInstance( mContext ).speakTTSVoice( "已开启鹰眼模式" ); + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { + AIAssist.getInstance( mContext ).speakTTSVoice( "已开启鹰眼模式" ); + } mLastStatusIsVr = true; } } else { @@ -949,7 +951,9 @@ public class MogoServices implements IMogoMapListener, MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, false ); MapCenterPointStrategy.resetByChangeMode(); MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); - AIAssist.getInstance( mContext ).speakTTSVoice( "已退出鹰眼模式" ); + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { + AIAssist.getInstance( mContext ).speakTTSVoice( "已退出鹰眼模式" ); + } } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java new file mode 100644 index 0000000000..262b7b2d54 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java @@ -0,0 +1,37 @@ +package com.mogo.module.service.network.bean; + +public class MockSocketSendData { + private long systemTime; + private String uuid; + private long satelliteTime; + + public MockSocketSendData(long systemTime, String uuid, long satelliteTime) { + this.systemTime = systemTime; + this.uuid = uuid; + this.satelliteTime = satelliteTime; + } + + public long getSystemTime() { + return systemTime; + } + + public void setSystemTime(long systemTime) { + this.systemTime = systemTime; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public long getSatelliteTime() { + return satelliteTime; + } + + public void setSatelliteTime(long satelliteTime) { + this.satelliteTime = satelliteTime; + } +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java index 0f701d703e..89ad65877d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java @@ -10,17 +10,20 @@ import androidx.annotation.RequiresApi; import com.mogo.cloud.socket.entity.SocketDownData; import com.mogo.commons.data.BaseData; import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.uploadintime.SnapshotLocationController; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.network.TimeDelayApiService; import com.mogo.module.service.network.bean.MockSocketReceiverData; +import com.mogo.module.service.network.bean.MockSocketSendData; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; +import com.mogo.utils.network.utils.GsonUtil; import org.json.JSONException; import org.json.JSONObject; @@ -88,9 +91,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener map = new HashMap<>(); - map.put("systemTime", System.currentTimeMillis()); - map.put("uuid", result.getUuid()); - map.put("satelliteTime", result.getSatelliteTime()); + map.put("sn", Utils.getSn()); + map.put("data", GsonUtil.jsonFromObject(mockSocketSendData)); + Logger.d(TAG, "mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData)); + Logger.d(TAG, "data uuid : " + result.getUuid() + " duration : " + (System.currentTimeMillis() - result.getSatelliteTime())); timeDelayApiService.uploadDelayData(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index f43ed66f30..c0a3c3650d 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java @@ -19,6 +19,7 @@ import com.amap.api.maps.UiSettings; import com.amap.api.navi.AMapNaviView; import com.amap.api.navi.AMapNaviViewOptions; import com.mogo.commons.AbsMogoApplication; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.view.RoundLayout; import com.mogo.utils.FileUtils; @@ -215,15 +216,17 @@ public class SmallMapDirectionView extends RelativeLayout { setOnClickListener(view -> { - MogoApisHandler.getInstance().getApis() - .getMapServiceApi() - .getMapUIController() - .changeMapMode( - MogoApisHandler.getInstance() - .getApis() - .getAdasControllerApi() - .getCurrentSkinMode() - ); + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { + MogoApisHandler.getInstance().getApis() + .getMapServiceApi() + .getMapUIController() + .changeMapMode( + MogoApisHandler.getInstance() + .getApis() + .getAdasControllerApi() + .getCurrentSkinMode() + ); + } }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index 0986ac3deb..0ff47b0d6e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java @@ -570,8 +570,8 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { } if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, clickListener); - mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions())); - mAlarmInfoMarker.showInfoWindow(); +// mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions())); +// mAlarmInfoMarker.showInfoWindow(); } else { optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml index 52b241ea7d..5d49257034 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml @@ -5,6 +5,7 @@ android:id="@+id/llEventMore" android:layout_width="@dimen/module_v2x_panel_width" android:layout_height="@dimen/module_v2x_panel_width" + android:visibility="gone" android:background="@drawable/module_ext_drawable_shadow_bg" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent">