Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade

# Conflicts: # .idea/misc.xml # core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java # core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt # modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
2021-10-09 14:20:01 +08:00
parent 0e995818a3 19d2fd45a6
commit a84c5cdbd6
9 changed files with 36 additions and 25 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,6 @@
        <entry key="../../../../../../layout/custom_preview.xml" value="0.390625" />
        <entry key="../../../../../layout/custom_preview.xml" value="0.19947916666666668" />
        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml" value="0.15572916666666667" />
-        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml" value="0.8466666666666667" />
        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="0.5" />
        <entry key="modules/mogo-module-adas/src/main/res/drawable/module_adas_left_corner_bg.xml" value="0.22125" />
        <entry key="modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml" value="0.22658490296325878" />
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
@@ -53,7 +53,6 @@ public class CheckActivity extends AppCompatActivity {
    private static final String TAG = "CheckActivity";
    private static RecyclerView mRecyclerView;
    private static CheckResultData sCheckResultData;
-    private static Context mContext;
    private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus;
    private ImageView mImageView;
    //车模
@@ -85,7 +84,7 @@ public class CheckActivity extends AppCompatActivity {
    protected void onStart() {
        super.onStart();
        animation();
-        loadDetail(mContext, null);
+        loadDetail(this.getApplicationContext(), null);
    }
    /**
     * 列表View初始化
@@ -99,7 +98,6 @@ public class CheckActivity extends AppCompatActivity {
        scanTopImageView = findViewById(R.id.scan_car_top_image);
        tipsImageView = findViewById(R.id.scan_car_tips);
        mProgressBar = findViewById(R.id.check_progress);
-        mContext = mImageView.getContext();
        mImageView.setOnClickListener(v -> {
            finish();
        });
@@ -109,7 +107,7 @@ public class CheckActivity extends AppCompatActivity {
                new CheckLinearLayout(this, CheckLinearLayout.VERTICAL, false);
        mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.check_item_space_vr)));
        mRecyclerView.setLayoutManager(linearLayoutManager);
-        mCheckAdapter = new CheckAdapter(mContext, sCheckResultData);
+        mCheckAdapter = new CheckAdapter(this, sCheckResultData);
        mRecyclerView.setAdapter(mCheckAdapter);
    }

@@ -118,20 +116,18 @@ public class CheckActivity extends AppCompatActivity {
     */
    public static void checkMonitor(Context context, ICheckResultCallBack checkResultCallBack) {
        Log.d(TAG, "checkMonitor");
-        mContext = context;
-        loadDetail(mContext, checkResultCallBack);
+        loadDetail(context.getApplicationContext(), checkResultCallBack);
    }

    //网络请求,获取自车检测结果(工控机上报云端)
    public static void loadDetail(Context context, ICheckResultCallBack checkResultCallBack) {
-        mContext = context;
        final Map<String, Object> params = ParamsBuilder.of(false)
                .append("sn", MoGoAiCloudClientConfig.getInstance().getSn())
                .build();
        CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SubscribeImpl<CheckResultData>(RequestOptions.create(mContext)) {
+                .subscribe(new SubscribeImpl<CheckResultData>(RequestOptions.create(context)) {
                    @Override
                    public void onSuccess(CheckResultData o) {
                        super.onSuccess(o);
--- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
@@ -19,6 +19,7 @@ import com.amap.api.maps.CameraUpdateFactory;
 import com.amap.api.maps.TextureMapView;
 import com.amap.api.maps.UiSettings;
 import com.amap.api.maps.model.BitmapDescriptorFactory;
+import com.amap.api.maps.model.CameraPosition;
 import com.amap.api.maps.model.CustomMapStyleOptions;
 import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.LatLngBounds;
@@ -130,7 +131,6 @@ public class SmallMapDirectionView
        mAMap.setMapType(AMap.MAP_TYPE_NIGHT);
        // 关闭显示实时路况图层，aMap是地图控制器对象。
        mAMap.setTrafficEnabled(false);
-
        // 设置 锚点 图标
        mCarMarker = mAMap.addMarker(new MarkerOptions()
                .icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo))
@@ -183,7 +183,7 @@ public class SmallMapDirectionView
        LatLng currentLatLng = new LatLng(latLng.getLatitude(), latLng.getLongitude());

        if (mCarMarker != null) {
-            mCarMarker.setRotateAngle(360 - latLng.getBearing());
+//            mCarMarker.setRotateAngle(360 - latLng.getBearing());
            mCarMarker.setPosition(currentLatLng);
            mCarMarker.setToTop();
        }
@@ -219,6 +219,8 @@ public class SmallMapDirectionView
            //设置希望展示的地图缩放级别
            mAMap.moveCamera(CameraUpdateFactory.newLatLngZoom(currentLatLng, zoomLevel));
        }
+        CameraPosition cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).bearing(latLng.getBearing()).tilt(0).zoom(zoomLevel).build();
+        mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
    }

    @Override
--- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java
@@ -63,6 +63,7 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang
                        MogoServicePaths.PATH_SMALL_MAP,
                        StatusDescriptor.MAIN_PAGE_RESUME,
                        this);
+        MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasAutopilotRouteCallBack(this);

        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
            showPanel();
@@ -84,6 +85,7 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang
            Log.d(TAG, "准备show fragment");
            mActivity.getSupportFragmentManager().beginTransaction().show(mSmallMapFragment).commitAllowingStateLoss();
        } catch (Exception e) {
+            Log.d(TAG, "add fragment 失败 ======"+e.getMessage());
            e.printStackTrace();
        }
    }
--- a/gradle.properties
+++ b/gradle.properties
@@ -141,9 +141,9 @@ MOGO_OCH_TAXI_VERSION=2.0.58
 MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.58
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.337
+CARCHATTING_VERSION=2.3.5
 # 车聊聊接口
-CARCHATTINGPROVIDER_VERSION=1.1.16
+CARCHATTINGPROVIDER_VERSION=1.1.20
 # websocket
 WEBSOCKET_VERSION=1.1.7
 # loglib
@@ -166,7 +166,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.46
 # 定位服务
 MOGO_LOCATION_VERSION=1.1.46
 # 自研地图
-MAP_SDK_VERSION=1.0.1-vr-1.0.9
+MAP_SDK_VERSION=1.0.1-vr-1.1.2
 #################架构升级新的版本号
 MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0
 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -140,8 +140,10 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
        RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
        currentAutopilot.isSpeakVoice = false;
        List<RemoteControlAutoPilotParameters.AutoPilotLonLat> wayLatLon = new ArrayList<>();
-        for (MogoLatLng mogoLatLng : receiverBean.getStopsList()) {
-            wayLatLon.add(new RemoteControlAutoPilotParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon));
+        if (receiverBean!=null && receiverBean.getStopsList()!= null){
+            for (MogoLatLng mogoLatLng : receiverBean.getStopsList()) {
+                wayLatLon.add(new RemoteControlAutoPilotParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon));
+            }
        }
        currentAutopilot.wayLatLons = wayLatLon;
        currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon());
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
@@ -79,16 +79,26 @@ public class RouteOverlayDrawer {
    public IMogoPolyline draw(MogoLocation carLocal, List<MogoLatLng> routelist) {
        clearMogoRouteOverlay();
        if (routelist != null) {
-
-            // 将当前车辆位置放进去
-            mPolylinePointList.add(new MogoLatLng(carLocal.getLatitude(), carLocal.getLongitude()));
-            // 过滤后台推送的推荐路线集合
-            for (MogoLatLng polyline : routelist) {
-                //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃
-                if (LocationUtils.isPointOnCarFront(carLocal, polyline)) {
+            if (carLocal == null){
+                for (MogoLatLng polyline : routelist) {
+//                    Log.e("IMogoPolyline",polyline.getLat()+":"+polyline.lon);
+                    //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃
                    mPolylinePointList.add(polyline);
                }
+            }else {
+                // 将当前车辆位置放进去
+                mPolylinePointList.add(new MogoLatLng(carLocal.getLatitude(), carLocal.getLongitude()));
+                for (MogoLatLng polyline : routelist) {
+//                    Log.e("IMogoPolyline",polyline.getLat()+":"+polyline.lon);
+                    //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃
+                    if (LocationUtils.isPointOnCarFront(carLocal, polyline)) {
+                        mPolylinePointList.add(polyline);
+                    }
+                }
            }
+
+            // 过滤后台推送的推荐路线集合
+
            mPolylineColors.addAll(ColorUtils.getGradientAlpha("#002965ED", "#FF2965ED", "#002965ED", mPolylinePointList.size()));
            // 替换路径集合
            mPolylineOptions.points(mPolylinePointList);
--- a/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml
@@ -75,7 +75,7 @@
        app:layout_constraintLeft_toLeftOf="parent" />

    <View
-        android:layout_width="1px"
+        android:layout_width="2px"
        android:layout_height="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom"
        android:layout_marginStart="@dimen/module_services_dispatch_cars_dialog_btn_width"
        android:background="@color/module_services_dispatch_cars_line"
--- a/modules/mogo-module-service/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -33,7 +33,7 @@
    <dimen name="module_services_dispatch_cars_dialog_loc_size">54px</dimen>
    <dimen name="module_services_dispatch_cars_dialog_loc_margin_top">251px</dimen>
    <dimen name="module_services_dispatch_cars_dialog_line_margin_bottom">152px</dimen>
-    <dimen name="module_services_dispatch_cars_dialog_btn_width">474.5px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_btn_width">474px</dimen>
    <dimen name="module_services_dispatch_cars_dialog_timer_margin">20px</dimen>
    <dimen name="module_services_dispatch_cars_dialog_timer_size">46px</dimen>
    <dimen name="module_services_dispatch_cars_dialog_timer_txt_size">24px</dimen>