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

# Conflicts: # config.gradle # 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-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt # core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
2021-10-15 10:47:43 +08:00
parent 0702c1090b c58d9f70b3
commit fc47f7233a
6 changed files with 42 additions and 23 deletions
--- 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
@@ -5,7 +5,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
-import android.content.Context;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.util.Log;
@@ -17,25 +16,15 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.RecyclerView;

-import com.elegant.network.ParamsBuilder;
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.eagle.core.function.check.R;
 import com.mogo.eagle.core.function.check.api.ICheckResultCallBack;
-import com.mogo.eagle.core.function.check.net.CheckApiServiceFactory;
 import com.mogo.eagle.core.function.check.net.CheckNetWork;
 import com.mogo.eagle.core.function.check.net.CheckResultData;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.module.common.view.ImageViewClipBounds;
 import com.mogo.module.common.view.SpacesItemDecoration;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.NetworkStatusUtil;

 import java.math.BigDecimal;
-import java.util.Map;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;

 /**
 * @author liujing
@@ -102,6 +91,7 @@ public class CheckActivity extends AppCompatActivity {
        mRecyclerView.setAdapter(mCheckAdapter);
    }

+
    private void checkAction() {
        CheckNetWork.INSTANCE.checkNetWork(this.getApplicationContext(), new ICheckResultCallBack() {
            @Override
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
@@ -5,8 +5,8 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
 import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters
+import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.LogUtils
@@ -64,14 +64,14 @@ class AutoPilotStatusView @JvmOverloads constructor(
                CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(false)
            }
        }
-//        startAutoPilot();
+        startAutoPilot();
    }
    private fun startAutoPilot() {
        val currentAutopilot =
            AutoPilotControlParameters()
        currentAutopilot.isSpeakVoice = false
-        currentAutopilot.startLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409);
-        currentAutopilot.endLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.199730,116.735687);
+        currentAutopilot.startLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.199157289445921,116.73675895051454);
+        currentAutopilot.endLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.199255159538758,116.73274535677977);
        currentAutopilot.vehicleType = 10
        MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot)
    }
--- 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
@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;
 import com.amap.api.maps.AMap;
 import com.amap.api.maps.CameraUpdate;
 import com.amap.api.maps.CameraUpdateFactory;
+import com.amap.api.maps.CoordinateConverter;
 import com.amap.api.maps.TextureMapView;
 import com.amap.api.maps.UiSettings;
 import com.amap.api.maps.model.BitmapDescriptorFactory;
@@ -67,7 +68,7 @@ public class SmallMapDirectionView
    private List<MogoLatLng> mCoordinatesLatLngCurrent = new ArrayList<>();
    private Polyline mPolyline;
    private CameraUpdate mCameraUpdate;
-
+    private Context mContext;
    public SmallMapDirectionView(Context context) {
        this(context, null);
    }
@@ -86,6 +87,7 @@ public class SmallMapDirectionView
    }

    private void initView(Context context) {
+        mContext = context;
        View  smpView = LayoutInflater.from(context).inflate(R.layout.module_small_map_view, this);

        mAMapNaviView = (TextureMapView)smpView.findViewById(R.id.aMapNaviView);
@@ -110,6 +112,7 @@ public class SmallMapDirectionView
                    );
            return false;
        });
+
    }

    @Override
@@ -231,11 +234,11 @@ public class SmallMapDirectionView
    public void drawablePolyline(List<MogoLatLng> coordinates) {
        clearPolyline();
        mCoordinatesLatLng.clear();
-
-        for (MogoLatLng coordinate : coordinates) {
-            mCoordinatesLatLng.add(new LatLng(coordinate.getLat(), coordinate.getLon()));
-        }
-
+        List<LatLng>  latLngs =  CoordinateConverterFrom84ForList(mContext,coordinates);
+        mCoordinatesLatLng.addAll(latLngs);
+//        for (MogoLatLng coordinate : coordinates) {
+//            mCoordinatesLatLng.add(new LatLng(coordinate.getLat(), coordinate.getLon()));
+//        }
        if (mAMap != null) {
            if (mCoordinatesLatLng.size() > 2) {
                // 设置开始结束Marker位置
@@ -253,7 +256,6 @@ public class SmallMapDirectionView
                }
                //第二个参数为四周留空宽度
                mAMap.animateCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(), 65, 65, 65, 65));
-
                // 绘制线
                mPolyline = mAMap.addPolyline(
                        new PolylineOptions()
@@ -268,6 +270,24 @@ public class SmallMapDirectionView
        }
    }

+
+    public LatLng CoordinateConverterFrom84(Context mContext, MogoLatLng mogoLatLng){
+        CoordinateConverter mCoordinateConverter = new CoordinateConverter(mContext);
+        mCoordinateConverter.from(CoordinateConverter.CoordType.GPS);
+        mCoordinateConverter.coord(new LatLng(mogoLatLng.lat,mogoLatLng.lon));
+        LatLng  latLng =  mCoordinateConverter.convert();
+        return latLng;
+    }
+
+    public List<LatLng> CoordinateConverterFrom84ForList(Context mContext, List<MogoLatLng> mogoLatLngList){
+
+        List<LatLng>  list  = new ArrayList<>();
+        for (MogoLatLng m:mogoLatLngList) {
+            LatLng mogoLatLng =   CoordinateConverterFrom84(mContext,m);
+            list.add(mogoLatLng);
+        }
+        return list;
+    }
    @Override
    public void clearPolyline() {
        mCoordinatesLatLng.clear();