From 74e31d8ec9b14a8f24166ceda75e052554339614 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 12 Oct 2021 15:35:50 +0800 Subject: [PATCH 01/21] =?UTF-8?q?[add]=20=E8=A7=A3=E5=86=B3=E4=B8=8D?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E5=AF=BC=E8=87=B4=E5=86=85=E5=AD=98=E6=B3=84?= =?UTF-8?q?=E9=9C=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 3 +- .../check/VehicleMonitoringManager.kt | 20 +++--- .../check/api/ICheckResultCallBack.java | 4 +- .../core/function/check/net/CheckNetWork.kt | 42 ++++++++++++ .../function/check/view/CheckActivity.java | 66 +++++-------------- .../function/api/check/ICheckProvider.java | 5 ++ .../IMogoStatusChangedListener.java | 6 ++ 7 files changed, 87 insertions(+), 59 deletions(-) create mode 100644 core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 97a9cb7d46..8bc2337f09 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt index e01fde4a97..f577d6623d 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt @@ -5,6 +5,8 @@ import android.content.Intent import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.function.api.check.ICheckProvider import com.mogo.eagle.core.function.api.check.IMogoCheckListener +import com.mogo.eagle.core.function.check.api.ICheckResultCallBack +import com.mogo.eagle.core.function.check.net.CheckNetWork import com.mogo.eagle.core.function.check.view.CheckActivity import com.mogo.eagle.core.function.check.view.CheckDialog import com.mogo.eagle.core.utilcode.util.ActivityUtils @@ -36,9 +38,9 @@ class VehicleMonitoringManager : ICheckProvider, IMogoStatusChangedListener { LogUtils.dTag(TAG, "初始化 CheckProvider 模块") mContext = context MogoApisHandler.getInstance().apis.statusManagerApi.registerStatusChangedListener( - TAG, - StatusDescriptor.MAIN_PAGE_RESUME, - this + TAG, + StatusDescriptor.MAIN_PAGE_RESUME, + this ) } @@ -61,9 +63,9 @@ class VehicleMonitoringManager : ICheckProvider, IMogoStatusChangedListener { } override fun checkMonitor(context: Context) { - CheckActivity.checkMonitor(context) { state -> - updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, state) - if (state == 1) { + CheckNetWork.checkNetWork(context, ICheckResultCallBack { state -> + updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, state.data.vehicle.state) + if (state.data.vehicle.state == 1) { hasTipShow = false } else { if (!hasTipShow) { @@ -71,7 +73,7 @@ class VehicleMonitoringManager : ICheckProvider, IMogoStatusChangedListener { hasTipShow = true //已弹框 } } - } + }) } /** @@ -80,8 +82,8 @@ class VehicleMonitoringManager : ICheckProvider, IMogoStatusChangedListener { private fun showDialog(context: Context) { try { if (ActivityLifecycleManager.getInstance().isAppActive && AppUtils.isAppRunning( - AppUtils.getAppPackageName() - ) && ActivityUtils.getTopActivity() !is CheckActivity + AppUtils.getAppPackageName() + ) && ActivityUtils.getTopActivity() !is CheckActivity ) { if (dialog != null) { dialog!!.dismiss() diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java index fbc0e30634..24a1e17378 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java @@ -1,10 +1,12 @@ package com.mogo.eagle.core.function.check.api; +import com.mogo.eagle.core.function.check.net.CheckResultData; + /** * @author liujing * @description 自车检测结果回调 * @since: 9/28/21 */ public interface ICheckResultCallBack { - void callBackWithErrorState(Integer state); + void callBackWithCheckData(CheckResultData data); } diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt new file mode 100644 index 0000000000..5d2703522e --- /dev/null +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt @@ -0,0 +1,42 @@ +package com.mogo.eagle.core.function.check.net + +import android.content.Context +import android.util.Log +import com.elegant.network.ParamsBuilder +import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.network.SubscribeImpl +import com.mogo.eagle.core.function.check.api.ICheckResultCallBack +import com.mogo.eagle.core.function.check.view.CheckActivity +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.utils.network.RequestOptions +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers + +/** + * @author liujing + * @description 自测检测网络请求类 + * @since: 10/12/21 + */ + +object CheckNetWork { + //网络请求,获取自车检测结果(工控机上报云端) + fun checkNetWork(context: Context, callbackFlow: ICheckResultCallBack) { + val params = ParamsBuilder.of(false) + .append("sn", MoGoAiCloudClientConfig.getInstance().sn) + .build() + CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : SubscribeImpl(RequestOptions.create(context)) { + override fun onSuccess(o: CheckResultData) { + super.onSuccess(o) + ThreadUtils.runOnUiThread { callbackFlow?.callBackWithCheckData(o) } + } + + override fun onError(message: String, code: Int) { + super.onError(message, code) + } + }) + } + +} \ No newline at end of file diff --git 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 index aa4b557e6d..391b203f15 100644 --- 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 @@ -23,6 +23,7 @@ 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; @@ -43,11 +44,8 @@ import io.reactivex.schedulers.Schedulers; */ public class CheckActivity extends AppCompatActivity { - private static final String TAG = "CheckActivity"; private RecyclerView mRecyclerView; private static CheckResultData sCheckResultData; -// private static Context mContext; - private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus; private ImageView mImageView; //车模 private ImageView scanBottomCarImage; @@ -64,8 +62,7 @@ public class CheckActivity extends AppCompatActivity { //进度条 private ProgressBar mProgressBar; private final static long DURATION_TIME = 1000; - private static CheckAdapter mCheckAdapter; - private static boolean isFront = false; + private CheckAdapter mCheckAdapter; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -78,13 +75,13 @@ public class CheckActivity extends AppCompatActivity { protected void onStart() { super.onStart(); animation(); - loadDetail(this.getApplicationContext(), null); + checkAction(); } + /** * 列表View初始化 */ public void initView() { - isFront = true; setAnimation = new AnimatorSet(); mImageView = findViewById(R.id.btnBack); scanBottomCarImage = findViewById(R.id.scan_car_image); @@ -106,49 +103,23 @@ public class CheckActivity extends AppCompatActivity { mRecyclerView.setAdapter(mCheckAdapter); } - /** - * 自动驾驶状态下指标监测 - */ - public static void checkMonitor(Context context, ICheckResultCallBack checkResultCallBack) { - Log.d(TAG, "checkMonitor"); -// mContext = context; - loadDetail(context, checkResultCallBack); - } - //网络请求,获取自车检测结果(工控机上报云端) - public static void loadDetail(Context context, ICheckResultCallBack checkResultCallBack) { -// mContext = context; - final Map params = ParamsBuilder.of(false) - .append("sn", MoGoAiCloudClientConfig.getInstance().getSn()) - .build(); - CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new SubscribeImpl(RequestOptions.create(context)) { + private void checkAction() { + CheckNetWork.INSTANCE.checkNetWork(this.getApplicationContext(), new ICheckResultCallBack() { + @Override + public void callBackWithCheckData(CheckResultData data) { + Log.d("CheckActivity", "车辆自检结果是:" + data.toString()); + ThreadUtils.runOnUiThread(new Runnable() { @Override - public void onSuccess(CheckResultData o) { - super.onSuccess(o); - Log.d(TAG, "车辆自检结果是:" + o.toString()); - ThreadUtils.runOnUiThread(new Runnable() { - @Override - public void run() { - if (o != null && mCheckAdapter != null) { - mCheckAdapter.mCheckResultData = o; - mCheckAdapter.notifyDataSetChanged(); - } - if (checkResultCallBack != null) { - checkResultCallBack.callBackWithErrorState(o.getData().getVehicle().getState()); - } - } - }); - } - - @Override - public void onError(String message, int code) { - super.onError(message, code); + public void run() { + if (data != null && mCheckAdapter != null) { + mCheckAdapter.mCheckResultData = data; + mCheckAdapter.notifyDataSetChanged(); + } } }); - + } + }); } /** @@ -242,7 +213,7 @@ public class CheckActivity extends AppCompatActivity { @Override protected void onPause() { super.onPause(); - if (mCheckAdapter!=null){ + if (mCheckAdapter != null) { mCheckAdapter.dismissDialog(); } } @@ -260,7 +231,6 @@ public class CheckActivity extends AppCompatActivity { @Override protected void onDestroy() { super.onDestroy(); -// isFront = false; mCheckAdapter.ondestry(); } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java index 0132954fd9..be0778ee09 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java @@ -4,6 +4,11 @@ import android.content.Context; import com.alibaba.android.arouter.facade.template.IProvider; +import org.jetbrains.annotations.NotNull; + +import kotlin.Unit; +import kotlin.jvm.functions.Function0; + /** * 检测接口 */ diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java index 908af22c34..57725a5a56 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java @@ -1,5 +1,10 @@ package com.mogo.service.statusmanager; +import org.jetbrains.annotations.NotNull; + +import kotlin.Unit; +import kotlin.jvm.functions.Function0; + /** * @author congtaowang * @since 2020-01-04 @@ -13,4 +18,5 @@ public interface IMogoStatusChangedListener { * @param isTrue true - accOn、adas ui show、voice ui show、push ui show、v2x ui show */ void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ); + } From d359d08dfd8cd5de246a8ac7f548a1d12d2f52c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 12 Oct 2021 19:58:04 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae8b54dcd9..6d0361eace 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - 蘑菇车联 + MOGO-Autopilot From 7e7fb6dd0203675d00e0433ab283c71cdc27f4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 12 Oct 2021 20:10:09 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- app/src/main/res/values-xhdpi-1920x1000/strings.xml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 app/src/main/res/values-xhdpi-1920x1000/strings.xml diff --git a/app/src/main/res/values-xhdpi-1920x1000/strings.xml b/app/src/main/res/values-xhdpi-1920x1000/strings.xml deleted file mode 100644 index ae8b54dcd9..0000000000 --- a/app/src/main/res/values-xhdpi-1920x1000/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 蘑菇车联 - From e99d7db445271c0d5de797f356e6a2d17b3c84cf Mon Sep 17 00:00:00 2001 From: lianglihui Date: Wed, 13 Oct 2021 09:57:43 +0800 Subject: [PATCH 04/21] =?UTF-8?q?eagle=20=E5=A4=84=E7=90=86=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/widget/AutoPilotStatusView.kt | 6 +++--- .../mogo/eagle/core/function/smp/SmallMapDirectionView.java | 4 ++-- .../service/routeoverlay/MogoRouteOverlayManager.java | 4 ++++ .../module/service/routeoverlay/RouteOverlayDrawer.java | 4 +++- .../com/mogo/module/service/status/EnvStatusManager.java | 2 ++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git 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 index b4e2be73a1..9c9da2e412 100644 --- 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 @@ -67,13 +67,13 @@ class AutoPilotStatusView @JvmOverloads constructor( CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(false) } } -// startAutoPilot(); + startAutoPilot(); } private fun startAutoPilot() { val currentAutopilot = RemoteControlAutoPilotParameters() currentAutopilot.isSpeakVoice = false - currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409); - currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199730,116.735687); + currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199157289445921,116.73675895051454); + currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199255159538758,116.73274535677977); currentAutopilot.vehicleType = 10 MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot) } diff --git 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 index 0148140f80..e50ad06798 100644 --- 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 @@ -219,8 +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)); +// CameraPosition cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).bearing(latLng.getBearing()).tilt(0).zoom(zoomLevel).build(); +// mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition)); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index 6441a1be55..cad4a1f3e5 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -21,6 +21,10 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 } public void init() { + MogoApisHandler.getInstance() + .getApis() + .getRegisterCenterApi() + .registerCarLocationChangedListener( "MogoRouteOverlayManager",this); MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasAutopilotRouteCallBack(new IMogoAdasRouteCallBack(){ @Override diff --git 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 index c2664860ef..52fe30a459 100644 --- 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 @@ -1,6 +1,7 @@ package com.mogo.module.service.routeoverlay; import android.content.Context; +import android.util.Log; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; @@ -92,8 +93,9 @@ public class RouteOverlayDrawer { // Log.e("IMogoPolyline",polyline.getLat()+":"+polyline.lon); //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃 if (LocationUtils.isPointOnCarFront(carLocal, polyline)) { - mPolylinePointList.add(polyline); } + Log.e("lianglihui",polyline.getLat()+":"+polyline.getLon()); + mPolylinePointList.add(polyline); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java index 2e60fc9d82..e8fe9790ef 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java @@ -92,6 +92,8 @@ public class EnvStatusManager { stringBuilder.append(sStatusName[i]).append(":"); if (i == 3) { stringBuilder.append(DebugConfig.getAutoPilotStatus()).append("\n"); + } else if (i == 4) { + stringBuilder.append("true".equals(DebugConfig.getStatus(i, false)) ? "正常" : "异常").append("\n"); } else if (i == 5 || i == 6) { stringBuilder.append(DebugConfig.getStatusData(i)).append("\n"); } else if (i == 7) { From e65fa7b0b18767634d193ecd39e855a20d2d8887 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 11:37:31 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E8=87=AA=E8=BD=A6=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/fragment_hmi.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 3ff170af5e..173dd322c6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -66,10 +66,9 @@ - + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file From 32464e5f9a39eafed06232eb4df7b5f78e1ec231 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 13:13:20 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BCUI=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/check_info_adapter.xml | 6 +++--- .../src/main/res/layout/check_info_title_item.xml | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml index 39c5a5a9fe..4d3f41e3df 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml @@ -8,7 +8,7 @@ @@ -27,9 +28,8 @@ android:id="@+id/info_result_tx" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_27" android:ellipsize="end" - android:gravity="left" + android:gravity="center" android:maxLines="2" android:text="检测中检测中检测中检测中老链路来了来了" android:textColor="#fff" diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml index eb90a08022..fe59c709b5 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml @@ -10,7 +10,9 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_left_shape" - android:gravity="center" + android:gravity="left" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="模块名称" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" @@ -24,7 +26,8 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_left_shape" - android:gravity="center" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="运行状态" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" @@ -38,7 +41,8 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_left_shape" - android:gravity="center" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="模块名称" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" @@ -52,7 +56,8 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_right_shape" - android:gravity="center" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="运行状态" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" From b7f06278a4b1254d650f3f95f8f4707975e1a561 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 13:28:45 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=88=97=E8=A1=A8UI?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/check_list.xml | 3 +-- .../src/main/res/layout/check_titel.xml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml index f3ad400460..36967c39ca 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml @@ -5,9 +5,8 @@ android:layout_width="2360px" android:layout_height="@dimen/dp_525" android:layout_marginStart="@dimen/dp_100" - android:layout_marginTop="@dimen/dp_15" + android:layout_marginBottom="@dimen/dp_24" android:layout_marginEnd="@dimen/dp_100" - android:layout_marginBottom="@dimen/dp_35" android:background="@drawable/check_list_item_back"> From cac6a419f5a01e5ae1dc0a2d95a5dcfc8aa8386c Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 13:46:44 +0800 Subject: [PATCH 08/21] no message --- .../src/main/res/layout/check_info_adapter.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml index 4d3f41e3df..ef25c53440 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:gravity="center" + android:gravity="left" android:maxLines="2" android:text="检测中检测中检测中检测中老链路来了来了" android:textColor="#fff" From a54b7c9c872211bbbec9b42b7bbc144c76ae8d17 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 14:54:08 +0800 Subject: [PATCH 09/21] =?UTF-8?q?[add]=20=E8=89=B2=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/check_dialog_back.xml | 2 +- .../res/drawable/check_item_left_shape.xml | 2 +- .../res/drawable/check_item_right_shape.xml | 2 +- .../drawable/check_item_top_bottom_shape.xml | 18 ++++++++++++++++++ .../main/res/layout/check_info_title_item.xml | 4 ++-- 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml index b6a2eaefba..a13abbb080 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml index 6f9ebf6133..a92f70693f 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml @@ -7,7 +7,7 @@ diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml index 0fb8e28c84..8d68831820 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml @@ -6,7 +6,7 @@ diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml new file mode 100644 index 0000000000..f1548c7a8e --- /dev/null +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml index fe59c709b5..f4ed1df13a 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml @@ -25,7 +25,7 @@ android:id="@+id/title_two" android:layout_width="0px" android:layout_height="match_parent" - android:background="@drawable/check_item_left_shape" + android:background="@drawable/check_item_top_bottom_shape" android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="运行状态" @@ -40,7 +40,7 @@ android:id="@+id/title_thr" android:layout_width="0px" android:layout_height="match_parent" - android:background="@drawable/check_item_left_shape" + android:background="@drawable/check_item_top_bottom_shape" android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="模块名称" From 846b6b591cc2943dfecaa960c7b5bed931c6ce1a Mon Sep 17 00:00:00 2001 From: lianglihui Date: Wed, 13 Oct 2021 15:26:27 +0800 Subject: [PATCH 10/21] =?UTF-8?q?eagle=20=E5=A4=84=E7=90=86=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E8=BD=A8=E8=BF=B9=E6=89=80=E9=9C=80=E7=9A=84=E5=9D=90?= =?UTF-8?q?=E6=A0=87=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/smp/SmallMapDirectionView.java | 34 +++++++++++++++---- .../routeoverlay/RouteOverlayDrawer.java | 1 + 2 files changed, 28 insertions(+), 7 deletions(-) diff --git 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 index e50ad06798..b7b9c73d3f 100644 --- 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 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); @@ -111,6 +113,7 @@ public class SmallMapDirectionView ); } }); + } @Override @@ -232,11 +235,11 @@ public class SmallMapDirectionView public void drawablePolyline(List coordinates) { clearPolyline(); mCoordinatesLatLng.clear(); - - for (MogoLatLng coordinate : coordinates) { - mCoordinatesLatLng.add(new LatLng(coordinate.getLat(), coordinate.getLon())); - } - + List 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位置 @@ -254,7 +257,6 @@ public class SmallMapDirectionView } //第二个参数为四周留空宽度 mAMap.animateCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(), 65, 65, 65, 65)); - // 绘制线 mPolyline = mAMap.addPolyline( new PolylineOptions() @@ -269,6 +271,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 CoordinateConverterFrom84ForList(Context mContext, List mogoLatLngList){ + + List list = new ArrayList<>(); + for (MogoLatLng m:mogoLatLngList) { + LatLng mogoLatLng = CoordinateConverterFrom84(mContext,m); + list.add(mogoLatLng); + } + return list; + } @Override public void clearPolyline() { mCoordinatesLatLng.clear(); diff --git 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 index 52fe30a459..80396b2e2d 100644 --- 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 @@ -104,6 +104,7 @@ public class RouteOverlayDrawer { mPolylineColors.addAll(ColorUtils.getGradientAlpha("#002965ED", "#FF2965ED", "#002965ED", mPolylinePointList.size())); // 替换路径集合 mPolylineOptions.points(mPolylinePointList); + mPolylineOptions.setGps(true); // 线条粗细，渐变，渐变色值 mPolylineOptions.width(25).useGradient(true).colorValues(mPolylineColors); // 绘制线 From 4043e89b324debedd9137db65d9b3808bb52ca63 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Wed, 13 Oct 2021 16:00:08 +0800 Subject: [PATCH 11/21] eagle map version update --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3c055bd598..1b4a749def 100644 --- a/gradle.properties +++ b/gradle.properties @@ -166,7 +166,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.46 # 定位服务 MOGO_LOCATION_VERSION=1.1.46 # 自研地图 -MAP_SDK_VERSION=1.0.1-vr-1.1.2 +MAP_SDK_VERSION=1.0.1-vr-1.1.3 #################架构升级新的版本号 MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 From c163c17a26aad4a9cb9b433c0c868e8cab996d83 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Wed, 13 Oct 2021 16:04:08 +0800 Subject: [PATCH 12/21] =?UTF-8?q?eagle=20=E5=B0=8F=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/smp/SmallMapDirectionView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git 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 index b7b9c73d3f..548e56984c 100644 --- 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 @@ -222,8 +222,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)); + CameraPosition cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).bearing(latLng.getBearing()).tilt(0).zoom(zoomLevel).build(); + mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition)); } @Override From 4f9b2d88608e0214712ecd8fc1fb9f41a0145997 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 16:45:50 +0800 Subject: [PATCH 13/21] =?UTF-8?q?[add]=20=E6=A3=80=E6=B5=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=88=97=E8=A1=A8UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/check_item_right_shape.xml | 18 ------------------ ...shape.xml => check_top_item_left_shape.xml} | 6 +++--- .../drawable/check_top_item_no_line_shape.xml | 13 +++++++++++++ .../main/res/drawable/check_top_item_shape.xml | 11 +++++++++++ .../main/res/layout/check_info_title_item.xml | 9 +++++---- 5 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml rename core/function-impl/mogo-core-function-check/src/main/res/drawable/{check_item_top_bottom_shape.xml => check_top_item_left_shape.xml} (80%) create mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml create mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml deleted file mode 100644 index 8d68831820..0000000000 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml similarity index 80% rename from core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml rename to core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml index f1548c7a8e..3ec31635a6 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml @@ -6,10 +6,10 @@ + android:top="0px" + android:bottom="0px"> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml new file mode 100644 index 0000000000..3607a98983 --- /dev/null +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml new file mode 100644 index 0000000000..ec7b08a577 --- /dev/null +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml index f4ed1df13a..8afee5f391 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml @@ -3,13 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="@dimen/check_width" android:layout_height="@dimen/dp_127" + android:background="@drawable/check_top_item_shape" android:orientation="horizontal"> Date: Thu, 14 Oct 2021 11:05:31 +0800 Subject: [PATCH 14/21] modify map version --- .../mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 94cc956107..8517ec14b8 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -46,7 +46,7 @@ class MogoPrivateObuManager private constructor() { mIMogoMapService = mMogoServiceApis!!.mapServiceApi //自研obu - MogoObuManager.getInstance().connect(context, "192.168.20.199") + MogoObuManager.getInstance().connect(context, "192.168.1.199") MogoObuManager.getInstance().registerListener(mogoObuListener) } From c58d9f70b384c2e32fbdddd13d89092d20b52d72 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 14 Oct 2021 19:49:44 +0800 Subject: [PATCH 15/21] upgrade map version --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index a62f80e527..aa12a26f29 100644 --- a/config.gradle +++ b/config.gradle @@ -167,7 +167,7 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", // mebulaobu : 'com.zhidao.support.nebulaobu:nebulaobu:1.0.0.3', - mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.13', + mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.16', mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.3', // 左侧面板 From 9e00205cdfe1c1a89e2301b292242db62d198600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 15 Oct 2021 11:26:58 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E6=95=B4=E7=90=86ADAS=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../com/mogo/module/adas/AdasProvider.java | 13 -- .../mogo/module/adas/IAdasDataListener.java | 12 -- .../extensions/entrance/EntranceFragment.java | 8 -- .../com/mogo/module/service/MogoServices.java | 4 +- .../module/service/StatusChangedAdapter.java | 1 - .../service/intent/MockIntentHandler.java | 7 +- .../service/unwake/GlobalUnwakeManager.java | 1 - .../service/adas/IMogoADASController.java | 24 +--- .../mogo/service/impl/adas/AdasLogWriter.java | 98 -------------- .../com/mogo/service/impl/adas/LogWriter.java | 105 --------------- .../service/impl/adas/MogoADASController.java | 125 +----------------- .../impl/adas/OnAdasListenerAdapter.java | 20 +-- 12 files changed, 23 insertions(+), 395 deletions(-) delete mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasLogWriter.java delete mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java index 0514dedfd5..1df536fd16 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java @@ -101,19 +101,6 @@ public class AdasProvider implements IProvider { } - //原ADAS sdk中为空实现 - public void settingCarModelListInfo(String msg) { - - } - - //原ADAS sdk中为空实现 - public void setSettingStatus(boolean show) { - } - - //原ADAS sdk中为空实现 - public void setUseAlgorithm(boolean open) { - } - public AdasAIDLAutopilotStateModel autopilotStateCall() { return adasEventManager.autopilotStateCall(); } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java index dae986fcfe..30555b8b3e 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java @@ -21,18 +21,6 @@ public interface IAdasDataListener { } - default void selectCarModelUrl(String carStyleUrl) { - } - - default void requestGetCarModelListInfo() { - } - - default void clickSettingBack() { - } - - default void showToast(String msg) { - - } /** * 自动驾驶到达站点回调接口 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 0b13f480b9..395a2d6cd4 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 @@ -22,7 +22,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; import android.text.TextUtils; -import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -49,8 +48,6 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.eagle.core.function.api.check.IMogoCheckListener; -import com.mogo.eagle.core.function.call.check.CallerCheckManager; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.location.IMogoLocationClient; @@ -70,7 +67,6 @@ import com.mogo.module.common.dialog.WMDialog; import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.common.map.CustomNaviInterrupter; import com.mogo.module.common.map.MapCenterPointStrategy; -import com.mogo.module.common.map.MyLocationUtil; import com.mogo.module.common.map.Scene; import com.mogo.module.common.view.OnPreventFastClickListener; import com.mogo.module.extensions.R; @@ -84,7 +80,6 @@ import com.mogo.module.extensions.utils.EntranceViewHolder; import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper; import com.mogo.module.extensions.utils.TopViewAnimHelper; import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper; -import com.mogo.module.service.receiver.MogoReceiver; import com.mogo.module.share.manager.ServiceApisManager; import com.mogo.service.IMogoServiceApis; import com.mogo.service.analytics.IMogoAnalytics; @@ -360,9 +355,6 @@ public class EntranceFragment extends MvpFragment modules = MogoModulePaths.getModules(); - if ( modules.isEmpty() || modules == null ) { + if (modules.isEmpty()) { return; } mAIAssistReceiver = new MogoReceiver( context ); IntentFilter filter = new IntentFilter(); - if ( modules != null && !modules.isEmpty() ) { + if (!modules.isEmpty()) { for ( MogoModule module : modules ) { if ( TextUtils.isEmpty( module.getBroadcastAction() ) ) { continue; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java index c8f89e29dc..00ee59b2fd 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java @@ -111,7 +111,6 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener { } MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); if (mCarsChattingProvider == null) { mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index fa781576bb..a82621c62f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -18,6 +18,7 @@ import com.mogo.cloud.socket.entity.SocketDownDataHelper; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; @@ -31,14 +32,13 @@ import com.mogo.map.search.geo.MogoRegeocodeResult; import com.mogo.map.search.geo.query.MogoRegeocodeQuery; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.DataTypes; +import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; import com.mogo.module.common.dialog.WMDialog; import com.mogo.module.common.drawer.SnapshotSetDataDrawer; -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; import com.mogo.module.service.status.EnvStatusManager; import com.mogo.module.service.timedelay.TimeDelayUploadManager; -import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; import com.mogo.service.adas.entity.ADASCarStateInfo; import com.mogo.service.adas.entity.ADASRecognizedResult; import com.mogo.service.entrance.ButtonIndex; @@ -162,9 +162,6 @@ public class MockIntentHandler implements IntentHandler { query.setRadius(1000); geoSearch.getFromLocationAsyn(query); break; - case 11:// 控制ADAS中的设置页面 - MarkerServiceHandler.getADASController().setSettingStatus(intent.getBooleanExtra("status", false)); - break; case 12: {// 控制ADAS显示隐藏 boolean status2 = intent.getBooleanExtra("status", false); if (status2) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index 1f48431a4f..4d87abc85b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -96,7 +96,6 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog * @param type 面板位置索引 */ private void showPanelByStatus(String target, int type){ - MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) { MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type); } else { diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java index 92d907a4b5..8676708622 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java @@ -36,20 +36,6 @@ public interface IMogoADASController extends IProvider { */ void killADAS(); - /** - * adas 设置页面控制 - * - * @param show - */ - void setSettingStatus(boolean show); - - /** - * 控制算法 - * - * @param open - */ - void setUseAlgorithm(boolean open); - void release(); /** @@ -59,13 +45,6 @@ public interface IMogoADASController extends IProvider { */ void changeAdasControlMode(EnumMapUI ui); - /** - * 反向设置 adas 对可见性的控制 - * - * @param visible - */ - void changeAdasControlVisibleMode(boolean visible); - /** * 获取当前皮肤状态 * @@ -80,7 +59,6 @@ public interface IMogoADASController extends IProvider { */ void aiCloudToAdasData(AutoPilotControlParameters result); - /** * 添加adas数据回调接口 * @@ -125,12 +103,14 @@ public interface IMogoADASController extends IProvider { /** * 添加adas自动驾驶路线回调 + * * @param callBack */ void addAdasAutopilotRouteCallBack(IMogoAdasRouteCallBack callBack); /** * 移除adas自动驾驶路线回调 + * * @param callBack */ void removeAdasAutopilotRouteCallBack(IMogoAdasRouteCallBack callBack); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasLogWriter.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasLogWriter.java deleted file mode 100644 index a009c70301..0000000000 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasLogWriter.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.mogo.service.impl.adas; - -import android.content.Context; -import android.os.Environment; - -import com.mogo.utils.logger.Logger; -import com.mogo.utils.network.utils.GsonUtil; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; - -/** - * Adas上报日志本地保存帮助类 - * - * @author tongchenfei - */ -public class AdasLogWriter extends Thread { - private static final String TAG = "AdasLogWritter"; - - private String path; - private final String dir; - - public AdasLogWriter( Context context) { - if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()) || !Environment.isExternalStorageRemovable()) { - dir = context.getExternalCacheDir().getPath()+"/mogoAdasLog"; - } else { - dir = context.getCacheDir().getPath()+"/mogoAdasLog"; - } - Logger.d(TAG, "log dir: " + dir); - } - - private final BlockingQueue logLine = new LinkedBlockingQueue<>(); - - public void write(String log) { - if (!isWritting) { - start(); - } - logLine.offer(log == null ? System.currentTimeMillis() + ",null\r\n" : System.currentTimeMillis() + "," + log + "\r\n"); - } - - public void write(Object object){ - if (!isWritting) { - start(); - } - String json = GsonUtil.jsonFromObject( object ); - if ( json != null ) { - logLine.offer( json ); - } - } - - private volatile boolean isWritting = false; - - @Override - public synchronized void start() { - if(!isWritting) { - isWritting = true; - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.CHINA); - path = dir + "/log_" + format.format(new Date()); - super.start(); - } - } - - public synchronized void stopLog() { - isWritting = false; - interrupt(); - } - - @Override - public void run() { - super.run(); - File fileDir = new File(dir); - File logFile = new File(path); - if (!fileDir.exists()) { - fileDir.mkdirs(); - } - try (FileOutputStream outputStream = new FileOutputStream(logFile)) { - while (isWritting) { - if (isInterrupted()) { - break; - } - String log = logLine.take(); - outputStream.write(log.getBytes()); - } - } catch (InterruptedException e) { - Logger.w(TAG, "writter interrupt: " + e.getMessage()); - e.printStackTrace(); - } catch (IOException e) { - Logger.w(TAG, "writter io exp: " + e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java deleted file mode 100644 index 9336509b84..0000000000 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.mogo.service.impl.adas; - -import android.os.Handler; -import android.os.Message; - -import com.mogo.utils.WorkThreadHandler; -import com.mogo.utils.network.utils.GsonUtil; - -import java.io.File; -import java.io.FileWriter; -import java.util.Random; - -public -/** - * @author congtaowang - * @since 2021/1/22 - * - * 描述 - */ -class LogWriter { - - - public static final int MAX_SIZE = 6 * 1024 * 1924; - - private final String path; - private Handler writeHandler = null; - - public LogWriter( String path ) { - this.path = path; - File file = new File( path ); - if ( !file.exists() ) { - try { - if ( !file.getParentFile().exists() ) { - file.getParentFile().mkdirs(); - } - file.createNewFile(); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - writeHandler = new Handler( WorkThreadHandler.newInstance( "Logger-Writer" + new Random().nextLong() ).getLooper() ) { - @Override - public void handleMessage( Message msg ) { - super.handleMessage( msg ); - if ( msg.what == 100 ) { - writeImpl( msg.obj ); - } else if ( msg.what == 101 ) { - writeImpl( msg.obj, msg.arg1 ); - } - } - }; - } - - private void writeImpl( Object log, int time ) { - try { - FileWriter fw = new FileWriter( path, true ); - fw.append( time + " - " ); - if ( log instanceof CharSequence ) { - fw.append( ( ( CharSequence ) log ) ); - } else { - fw.append( GsonUtil.jsonFromObject( log ) ); - } - fw.append( "\n" ); - fw.flush(); - fw.close(); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - private void writeImpl( Object log ) { - try { - FileWriter fw = new FileWriter( path, true ); - fw.append( System.currentTimeMillis() + " - " ); - if ( log instanceof CharSequence ) { - fw.append( ( ( CharSequence ) log ) ); - } else { - fw.append( GsonUtil.jsonFromObject( log ) ); - } - fw.append( "\n" ); - fw.flush(); - fw.close(); - } catch ( Exception e ) { - e.printStackTrace(); - } - } - - public void write( Object log ) { - if ( log == null ) { - return; - } - Message msg = Message.obtain(); - msg.obj = log; - msg.what = 100; - writeHandler.sendMessage( msg ); - } - - public void write( Object log, long recTime ) { - Message msg = Message.obtain(); - msg.obj = log; - msg.what = 101; - msg.arg1 = ( int ) ( System.currentTimeMillis() - recTime ); - writeHandler.sendMessage( msg ); - } -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index d42e690efd..fe5eca8a59 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -10,16 +10,17 @@ import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.autopilot.AutoPilotControlCmdParameter; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.adas.AdasProvider; import com.mogo.module.adas.IAdasDataListener; import com.mogo.module.adas.IAdasStatusListener; -import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.adas.IMogoAdasCarDataCallback; import com.mogo.service.adas.IMogoAdasDataCallback; @@ -27,29 +28,20 @@ import com.mogo.service.adas.IMogoAdasOCHCallback; import com.mogo.service.adas.IMogoAdasRecognizedDataCallback; import com.mogo.service.adas.IMogoAdasRouteCallBack; import com.mogo.service.adas.IMogoAdasWarnMessageCallback; -import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; import com.mogo.service.adas.entity.ADASCarStateInfo; import com.mogo.service.adas.entity.ADASRecognizedResult; import com.mogo.service.adas.entity.ADASWarnMessage; -import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo; -import com.mogo.service.adas.entity.CarModelListResponse; -import com.mogo.service.datamanager.IMogoDataManager; import com.mogo.service.impl.singleton.SingletonsHolder; -import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoStatusManager; -import com.mogo.utils.TipToast; import com.mogo.utils.UiThreadHandler; 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 com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.adasconfig.api.AdasConfigApiController; -import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode; import com.zhidao.adasconfig.common.config.EnumCarHeading; import com.zhidao.adasconfig.common.config.EnumSkinStyle; +import com.zhidao.autopilot.support.api.AutopilotServiceManage; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel; -import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarRectModel; import com.zhidao.support.adas.high.bean.AutopilotRoute; import com.zhidao.support.adas.high.bean.AutopilotStatus; import com.zhidao.support.adas.high.bean.RectInfo; @@ -58,14 +50,10 @@ import com.zhidao.support.adas.high.bean.WarnMessageInfo; import org.json.JSONObject; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; -import io.reactivex.schedulers.Schedulers; - @Route(path = MogoServicePaths.PATH_ADAS_CONTROLLER) public class MogoADASController implements IMogoADASController { @@ -111,8 +99,6 @@ public class MogoADASController implements IMogoADASController { private IMogoAdasCarDataCallback mMogoAdasCarDataCallback; - private List mLastFrameDatums; - private double mLastLon; private double mLastLat; private double mSpeed; @@ -161,7 +147,6 @@ public class MogoADASController implements IMogoADASController { super.handleMessage(msg); final long start = System.currentTimeMillis(); - ADASCarStateInfo stateInfo = GsonUtil.objectFromJson(((String) msg.obj), ADASCarStateInfo.class); if (stateInfo == null || stateInfo.getValues() == null) { // Logger.d(TAG, "ADAS-LOC-timer", "upd 到 aidl 传输数据 stateInfo or stateInfo.getValues() is null"); @@ -224,7 +209,6 @@ public class MogoADASController implements IMogoADASController { } } - private volatile boolean needEmphasizeMyLocation = false; @Override public void showADAS() { @@ -309,53 +293,14 @@ public class MogoADASController implements IMogoADASController { }); } - @Override - public void selectCarModelUrl(String carStyleUrl) { - Logger.d(TAG, "selectCarModelUrl: " + carStyleUrl); - needEmphasizeMyLocation = true; - // 修改自车图标展示 - SharedPrefsMgr.getInstance(context).putString("MY_LOCATION_CONFIG", carStyleUrl); - SingletonsHolder.get(IMogoDataManager.class).syncData("ADAS", carStyleUrl); - } - - @Override - public void requestGetCarModelListInfo() { - Logger.d(TAG, "requestGetCarModelListInfo "); - if (DebugConfig.isMapBased()) { - Logger.d(TAG, "requestGetCarModelListInfo"); - // 向adas发送车模list - String carModelList = SharedPrefsMgr.getInstance(context).getString("CAR_MODEL_LIST", ""); - if (carModelList != null && !carModelList.isEmpty()) { - adasProvider.settingCarModelListInfo(carModelList); - } - // 此处进行网络请求，请求成功后再通知一次adas - requestCarModelList(); - } - } - - @Override - public void clickSettingBack() { - if (needEmphasizeMyLocation) { - SingletonsHolder.get(IMogoDataManager.class).syncData("ADAS", null); - } - needEmphasizeMyLocation = false; - - useTestSn = !useTestSn; - } - - @Override - public void showToast(String msg) { - UiThreadHandler.post(() -> TipToast.tip(msg)); - } - @Override public void autopilotArrive(AdasAIDLAutopilotArriveModel autopilotArriveModel) { Logger.d(TAG, "autopilotArriveModel " + autopilotArriveModel); if (autopilotArriveModel == null) { - Logger.d(TAG,"autopilotArrive autopilotArriveModel is null"); + Logger.d(TAG, "autopilotArrive autopilotArriveModel is null"); return; } - Logger.d(TAG,"autopilotArrive : " + autopilotArriveModel.toString()); + Logger.d(TAG, "autopilotArrive : " + autopilotArriveModel.toString()); if (!mAdasOCHCallback.isEmpty()) { for (IMogoAdasOCHCallback cb : mAdasOCHCallback) { cb.onArriveAt(new AutoPilotStationInfo( @@ -408,7 +353,6 @@ public class MogoADASController implements IMogoADASController { } } - private boolean useTestSn = false; private void invokeShowADASOperation() { int delay = 0; @@ -475,23 +419,11 @@ public class MogoADASController implements IMogoADASController { app.sendBroadcast(intent); } - private Context context; @Override public void init(Context context) { mIsReleased = false; adasProvider = ARouter.getInstance().navigation(AdasProvider.class); - this.context = context; - } - - @Override - public void setSettingStatus(boolean show) { - adasProvider.setSettingStatus(show); - } - - @Override - public void setUseAlgorithm(boolean open) { - adasProvider.setUseAlgorithm(open); } @Override @@ -526,12 +458,6 @@ public class MogoADASController implements IMogoADASController { } } - @Override - public void changeAdasControlVisibleMode(boolean visible) { - Logger.d(TAG, "new visibility: " + visible); - AdasConfigApiController.getInstance().setUserCarChatIncognitoModel(visible ? EnumCarChatIncognitoMode.OPEN : EnumCarChatIncognitoMode.CLOSE); - } - @Override public EnumMapUI getCurrentSkinMode() { if (!DebugConfig.isMapBased()) { @@ -567,49 +493,12 @@ public class MogoADASController implements IMogoADASController { } } - private void requestCarModelList() { - Map params = new HashMap<>(8); - params.put("sn", MoGoAiCloudClientConfig.getInstance().getSn()); - SingletonsHolder.get(IMogoNetwork.class).create(CarModelInfoNetApiServices.class, CarModelInfoNetApiServices.getBaseUrl()). - requestCarModelList(params). - subscribeOn(Schedulers.io()). - observeOn(Schedulers.io()). - subscribe(new SubscribeImplTemporary(RequestOptions.create(context)) { - @Override - public void onSuccess(CarModelListResponse o) { - super.onSuccess(o); - Logger.d(TAG, "请求车模列表成功: " + o); - // 保存到sp中 - String value = GsonUtil.jsonFromObject(o.getResult()); - SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", value); - if (value != null && !value.isEmpty()) { - adasProvider.settingCarModelListInfo(value); - } - } - - @Override - public void onError(Throwable e) { - super.onError(e); - Logger.e(TAG, e, "请求自车模型失败"); - } - - @Override - public void onError(String message, int code) { - super.onError(message, code); - Logger.e(TAG, "请求自车模型失败: " + message); - } - }); - - } - @Override public void release() { mIsReleased = true; adasProvider.removeAdasEventListener(mAdasDataListener); adasProvider.removeAdasStatusListener(); - //AutopilotServiceManage.getInstance().release(); - //关闭定时任务 - // if (mDisposable != null) mDisposable.dispose(); + AutopilotServiceManage.getInstance().release(); } @Override diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/OnAdasListenerAdapter.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/OnAdasListenerAdapter.java index 9e878c3d5d..9c968e8a39 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/OnAdasListenerAdapter.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/OnAdasListenerAdapter.java @@ -15,52 +15,52 @@ public * @author congtaowang * @since 2020/10/22 * - * 描述 + * 适配ADAS 回调监听分发 */ abstract class OnAdasListenerAdapter implements OnAdasListener { @Override - public void onWarnMessage( WarnMessageInfo warnMessageInfo ) { + public void onWarnMessage(WarnMessageInfo warnMessageInfo) { } @Override - public void onVideoSize( int width, int height ) { + public void onVideoSize(int width, int height) { } @Override - public void onRectData( RectInfo rectInfo ) { + public void onRectData(RectInfo rectInfo) { } @Override - public void onCarStateData( CarStateInfo carStateInfo ) { + public void onCarStateData(CarStateInfo carStateInfo) { } @Override - public void onLightStateData( LightStatueInfo lightStatueInfo ) { + public void onLightStateData(LightStatueInfo lightStatueInfo) { } @Override - public void onObstaclesInfo( ObstaclesInfo obstaclesInfo ) { + public void onObstaclesInfo(ObstaclesInfo obstaclesInfo) { } @Override - public void onCarLaneInfo( CarLaneInfo carLaneInfo ) { + public void onCarLaneInfo(CarLaneInfo carLaneInfo) { } @Override - public void autopilotStatus( AutopilotStatus autopilotStatus ) { + public void autopilotStatus(AutopilotStatus autopilotStatus) { } @Override - public void autopilotArrive( AutopilotWayArrive autopilotWayArrive ) { + public void autopilotArrive(AutopilotWayArrive autopilotWayArrive) { } } From c7f3f8d5a1d1e32f5f7703718cd695e73d84d246 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 15 Oct 2021 18:34:34 +0800 Subject: [PATCH 17/21] add chain lig --- .idea/gradle.xml | 3 +-- app/build.gradle | 16 +++++++++++++++- build.gradle | 4 ++++ config.gradle | 3 +++ gradle.properties | 18 +++++++++++++++++- modules/mogo-module-common/build.gradle | 3 +++ .../common/drawer/SnapshotSetDataDrawer.java | 9 +++++++-- .../service/marker/MapMarkerManager.java | 3 ++- 8 files changed, 52 insertions(+), 7 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8bc2337f09..97a9cb7d46 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/app/build.gradle b/app/build.gradle index 97f8e15cac..4efc3a41c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,6 +4,19 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'android-aspectjx' +//apply ByteX宿主 +apply plugin: 'bytex' +ByteX { + enable true + enableInDebug true + logLevel "DEBUG" +} + +apply plugin: 'chain.log.hook' +hooklog{ + enableLoggerToServer true +} + Properties properties = new Properties(); properties.load(project.rootProject.file("gradle.properties").newDataInputStream()) @@ -29,6 +42,8 @@ android { packagingOptions { exclude 'META-INF/proguard/coroutines.pro' exclude 'META-INF/*' + exclude '*/proguard' + pickFirst 'migrateToAndroidx/migration.xml' } signingConfigs { @@ -132,7 +147,6 @@ aspectjx { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - //Crash日志收集 implementation rootProject.ext.dependencies.crashSdk implementation rootProject.ext.dependencies.androidxappcompat diff --git a/build.gradle b/build.gradle index 488fd1b534..fc46f91485 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ apply from: "javadoc.gradle" buildscript { repositories { + maven { url "https://artifact.bytedance.com/repository/byteX/" } maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/google' } @@ -18,6 +19,8 @@ buildscript { classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31' classpath "com.alibaba:arouter-register:1.0.2" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' + classpath "com.bytedance.android.byteX:base-plugin:0.3.0" + classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" // classpath ("com.tencent.matrix:matrix-gradle-plugin:0.6.6") { changing = true } } @@ -26,6 +29,7 @@ buildscript { allprojects { repositories { + maven { url "https://artifact.bytedance.com/repository/byteX/" } maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/google' } diff --git a/config.gradle b/config.gradle index 3ead80512b..abeb2b6f37 100644 --- a/config.gradle +++ b/config.gradle @@ -241,6 +241,9 @@ ext { mogoaicloudtrafficlive : "com.mogo.cloud:trafficlive:${MOGO_TRAFFICLIVE_VERSION}", mogoaicloudlocation : "com.mogo.cloud:location:${MOGO_LOCATION_VERSION}", + //plugin + mogochainbase : "com.mogo.cloud:service-chain:${SERVICE_CHAIN_VERSION}", + mogochainplugin : "com.mogo.cloud:hook:${HOOK_LOG_VERSION}", ] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1b4a749def..5ce42ef968 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ kapt.include.compile.classpath=false # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true +android.enableJetifier=false android.jetifier.blacklist=module-service-2.0.58.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ @@ -45,6 +45,22 @@ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 RELEASE=false + +#plugin 插件 +android.enableR8.libraries=false +android.enableR8=false +android.enableD8=true +android.enableD8.desugaring=true +android.enableDesugar=true +bytex.enableHtmlLog=true +bytex.forbidUseLenientMutationDuringGetArtifact=true +bytex.verifyProguardConfigurationChanged=false +bytex.ASM_API=ASM7 + +HOOK_LOG_VERSION=1.4.63 +SERVICE_CHAIN_VERSION=1.0.22 + + # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=2.0.58 diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index 762eb4ee0c..bd110d83d2 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -73,6 +73,9 @@ dependencies { implementation project(':core:mogo-core-function-call') } + implementation rootProject.ext.dependencies.mogochainbase + implementation rootProject.ext.dependencies.mogochainplugin + annotationProcessor 'com.elegant.spi:compiler:1.0.3' } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 5903a122e3..9c9983c420 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -29,6 +29,8 @@ import com.mogo.utils.ViewUtils; import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.ICarsChattingProvider; import com.zhidao.carchattingprovider.MogoDriverInfo; +import com.zhjt.service.chain.ChainLog; +import com.zhjt.service.chain.TracingConstants; import java.util.ArrayList; import java.util.Iterator; @@ -138,12 +140,15 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic * * @param data 自车周边数据 */ + @ChainLog(endpoint = TracingConstants.Endpoint.PAD, + nodeAliasCode = "PAD_YINGYAN_SHOW", + paramIndexes = 0, + clientPkFileName = "sn") public void renderSnapshotData(SocketDownData.LauncherSnapshotProto data) { final long start = System.nanoTime(); if (clear(data)) { return; } - if (!MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { return; } @@ -222,7 +227,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic while (iterator.hasNext()) { IMogoMarker result = iterator.next(); SocketDownData.CloudRoadDataProto proto = ((SocketDownData.CloudRoadDataProto) result.getObject()); - if(proto == null){ // 后续有业务数据在操作，更新数据，不做处理 + if (proto == null) { // 后续有业务数据在操作，更新数据，不做处理 continue; } long internal = Long.parseLong(adasControllerApi.getSatelliteTime()) - proto.getSatelliteTime(); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index c99081b320..7d52f427ad 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -20,6 +20,7 @@ import com.mogo.module.common.drawer.AdasRecognizedResultDrawer; import com.mogo.module.common.drawer.MarkerDrawer; import com.mogo.module.common.drawer.OnlineCarDrawer; import com.mogo.module.common.drawer.RoadConditionDrawer; +import com.mogo.module.common.drawer.SnapshotSetDataDrawer; import com.mogo.module.common.drawer.marker.IMarkerView; import com.mogo.module.common.drawer.marker.MapMarkerAdapter; import com.mogo.module.common.drawer.marker.OnlineCarMarkerView; @@ -147,7 +148,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, @Override public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) { DebugConfig.setStatus(DebugConfig.sDownloadSnapshot, true); - // SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData); +// SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData); // Message msg = mSnapshotHandler.obtainMessage(); // msg.obj = mogoSnapshotSetData; // msg.what = MSG_SNAPSHOT; From 0e119f8f5536d1bdcec0fd9c43bba474bc32aa94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 15 Oct 2021 18:57:06 +0800 Subject: [PATCH 18/21] Rename .java to .kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../notice/{MoGoNoticeProvider.java => MoGoNoticeProvider.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/{MoGoNoticeProvider.java => MoGoNoticeProvider.kt} (100%) diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt similarity index 100% rename from core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt From da955835a2dab167ff4a85c4bd0a8c033d5f746b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 15 Oct 2021 18:57:07 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=20=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .idea/gradle.xml | 3 +- .idea/misc.xml | 2 + .../com/mogo/launcher/MogoApplication.java | 23 +++-- .../autopilot/MoGoAutoPilotProvider.kt | 8 +- .../hmi/ui/widget/PerspectiveSwitchView.kt | 25 ++++++ .../res/layout/view_perspective_switch.xml | 35 ++++++++ .../function/notice/MoGoNoticeProvider.kt | 19 +++-- .../core/function/obu/mogo/MoGoObuProvider.kt | 5 ++ .../api/base/IMoGoFunctionServerProvider.kt | 13 +++ .../api/map/hd/IMoGoMapStyleChangeListener.kt | 15 ++++ .../call/map/CallerMapListenerManager.kt | 77 +++++++++++++++++ .../call/obu/CallerObuListenerManager.kt | 17 ++-- .../module_switch_map_angle.png | Bin .../module_switch_map_angle.png | Bin .../res/values-xhdpi-2560x1440/dimens.xml | 9 ++ .../src/main/res/values/color.xml | 2 + .../src/main/res/values/dimens.xml | 9 ++ .../src/main/res/values/string.xml | 3 + libraries/map-custom/build.gradle | 2 + .../mogo/map/impl/custom/AMapViewWrapper.java | 80 ++---------------- .../custom/uicontroller/AMapUIController.java | 25 ------ .../uicontroller/IMogoMapUIController.java | 23 ----- .../com/mogo/map/MogoMapUIController.java | 18 ---- .../mogo/module/common/MogoModulePaths.java | 29 ++++--- .../module_switch_map_angle.png | Bin 862 -> 0 bytes .../module_switch_map_angle.png | Bin 862 -> 0 bytes .../module_switch_map_angle.png | Bin 862 -> 0 bytes .../res/values-xhdpi-2560x1440/dimens.xml | 8 -- .../src/main/res/values-xhdpi/dimens.xml | 7 -- .../src/main/res/values/colors.xml | 1 - .../src/main/res/values/dimens.xml | 8 -- .../src/main/res/values/strings.xml | 2 - .../module/main/cards/MogoModulesHandler.java | 5 ++ .../module/main/cards/MogoModulesManager.java | 58 ++++++++++++- .../service/impl/adas/MogoADASController.java | 9 +- 35 files changed, 321 insertions(+), 219 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml create mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapStyleChangeListener.kt create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapListenerManager.kt rename {modules/mogo-module-extensions/src/main/res/drawable-ldpi => core/mogo-core-res/src/main/function-hmi-res/drawable-mdpi}/module_switch_map_angle.png (100%) rename {modules/mogo-module-extensions/src/main/res/drawable-mdpi => core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi}/module_switch_map_angle.png (100%) delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1440/module_switch_map_angle.png delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8bc2337f09..97a9cb7d46 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index af14fc0eb5..e01f72218c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -17,12 +17,14 @@ + + diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 5b04ee81e1..9fb9243a7a 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -267,20 +267,19 @@ public class MogoApplication extends AbsMogoApplication { if (DebugConfig.isLauncher()) { MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_BACK, MogoServicePaths.PATH_BACK)); } - MogoModulePaths.addModule(new MogoModule(ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG)); MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS)); if (DebugConfig.isMapBased()) { MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); } - MogoModulePaths.addBaseModule(new MogoModule(ShareConstants.TAG, ShareConstants.MODEL_NAME)); - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_TANLU_API, "TanluApi")); - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_SHARE, "ShareControl")); - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_TRAFFIC_UPLOAD, "TrafficUpload")); - MogoModulePaths.addModule(new MogoModule(LeftPanelConst.PATH_NAME, LeftPanelConst.MODULE_NAME)); + MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG)); + MogoModulePaths.addBaseModule(new MogoModule(ShareConstants.TAG, ShareConstants.MODEL_NAME)); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_TANLU_API, "TanluApi")); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_TRAFFIC_UPLOAD, "TrafficUpload")); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_SHARE, "ShareControl")); MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY)); MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME)); MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_STRATEGY_SHARE, "StrategyShare")); @@ -288,24 +287,24 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_MOGO_MONITOR, "MogoMonitor")); // 域控制器模块（新） - MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_AUTO_PILOT, "IMoGoAutoPilotProvider")); + MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AUTO_PILOT, "IMoGoAutoPilotProvider")); // OBU 模块 - MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "IMoGoObuProvider")); + MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "IMoGoObuProvider")); // 小地图模块 MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_SMALL_MAP, "IMogoSmallMapProvider")); // widgets 模块 MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_V2X_WARNING, "IMoGoWaringProvider")); // 自动驾驶系统检测模块 - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_CHECK, "CheckProvider")); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_CHECK, "CheckProvider")); // 推送模块 MogoModulePaths.addModule(new MogoModule(PushUIConstants.PATH, PushUIConstants.NAME)); // 碰撞报警模块 - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_CRASH_WARNING, "IMogoCrashWarnProvider")); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_CRASH_WARNING, "IMogoCrashWarnProvider")); // ADAS模块（旧，慢慢被 域控制器模块 替换掉） - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_ADAS, "AdasProvider")); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_ADAS, "AdasProvider")); // 前方碰撞预警 - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_V2X_FRONT_CRASH_WARNING, "IV2XManagerProvider")); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_V2X_FRONT_CRASH_WARNING, "IV2XManagerProvider")); // 全局语音唤醒 MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_GLOBAL_UNWAKE, "GlobalUnwake")); diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt index 92f55c18bf..954a003840 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt @@ -16,6 +16,11 @@ import com.zhidao.support.adas.high.AdasManager */ @Route(path = MogoServicePaths.PATH_AUTO_PILOT) class MoGoAutoPilotProvider : IMoGoAutoPilotProvider { + private val TAG = "MoGoAutoPilotProvider" + + override val functionName: String + get() = TAG + override fun init(context: Context) { // 初始化ADAS 域控制器 @@ -66,7 +71,4 @@ class MoGoAutoPilotProvider : IMoGoAutoPilotProvider { return AdasManager.getInstance().recordPackage() } - companion object { - private const val TAG = "MogoAutoPilotProvider" - } } \ 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/widget/PerspectiveSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt new file mode 100644 index 0000000000..628f23d669 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt @@ -0,0 +1,25 @@ +package com.mogo.eagle.core.function.hmi.ui.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.FrameLayout +import com.mogo.eagle.core.function.hmi.R + +/** + *@author xiaoyuzhou + *@date 2021/10/15 11:34 上午 + * 视角切换按钮 + */ +class PerspectiveSwitchView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + + init { + LayoutInflater.from(context).inflate(R.layout.view_perspective_switch, this, true) + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml new file mode 100644 index 0000000000..c05395b101 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml @@ -0,0 +1,35 @@ + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt index 39d79f4609..8f66306f78 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt @@ -1,17 +1,18 @@ -package com.mogo.eagle.core.function.notice; +package com.mogo.eagle.core.function.notice -import android.content.Context; - -import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider; +import android.content.Context +import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider /** * @author xiaoyuzhou * @date 2021/9/18 11:44 上午 * 处理云端下发通知、公告类的逻辑的接口 */ -public class MoGoNoticeProvider implements IMoGoNoticeProvider { - @Override - public void init(Context context) { +class MoGoNoticeProvider : IMoGoNoticeProvider { + private val TAG = "MoGoNoticeProvider" - } -} + override val functionName: String + get() = TAG + + override fun init(context: Context) {} +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt index af11270099..a0b3723917 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt @@ -18,6 +18,10 @@ class MoGoObuProvider : IMoGoObuProvider { private var mContext: Context? = null + override val functionName: String + get() = TAG + + override fun init(context: Context) { LogUtils.dTag(TAG, "初始化蘑菇自研OBU……") mContext = context @@ -34,4 +38,5 @@ class MoGoObuProvider : IMoGoObuProvider { } } + } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt index 6cc65b1f90..7860e0c27e 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.api.base +import android.util.Log import com.alibaba.android.arouter.facade.template.IProvider /** @@ -8,5 +9,17 @@ import com.alibaba.android.arouter.facade.template.IProvider * 处理没有页面的服务及交互逻辑的提供者 */ interface IMoGoFunctionServerProvider : IProvider { + /** + * 功能模块唯一标识 + * + * @return 功能模块名称 + */ + val functionName: String + /** + * 功能销毁回调 + */ + fun onDestroy() { + Log.d("IMoGoFunctionServerProvider", "onDestroy") + } } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapStyleChangeListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapStyleChangeListener.kt new file mode 100644 index 0000000000..b9412ab2cf --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapStyleChangeListener.kt @@ -0,0 +1,15 @@ +package com.mogo.eagle.core.function.api.map.hd + +/** + *@author xiaoyuzhou + *@date 2021/10/15 12:18 下午 + * 地图样式改变回调监听 + */ +interface IMoGoMapStyleChangeListener { + + /** + * 地图样式改变回调监听 + */ + fun onMapStyleModeChange(styleMode: Int) + +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapListenerManager.kt new file mode 100644 index 0000000000..5518d460c8 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapListenerManager.kt @@ -0,0 +1,77 @@ +package com.mogo.eagle.core.function.call.map + +import androidx.annotation.Nullable +import com.mogo.eagle.core.function.api.map.hd.IMoGoMapStyleChangeListener +import com.mogo.eagle.core.function.call.base.CallerBase +import com.mogo.eagle.core.utilcode.util.LogUtils + +/** + * @author xiaoyuzhou + * @date 2021/9/30 5:48 下午 + * 地图 监听管理 + */ +object CallerMapListenerManager : CallerBase() { + private val TAG = "CallerMapListenerManager" + + // 记录地图样式 + private var mMapStyleMode = 0 + + // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步 + private val mMapStyleChangeListeners: HashMap = HashMap() + + /** + * 添加 地图样式改变 监听 + * @param tag 标记，用来注销监听使用 + * @param listener 监听回调 + */ + fun addMapStyleChangeListener( + @Nullable tag: String, + @Nullable listener: IMoGoMapStyleChangeListener + ) { + mMapStyleChangeListeners[tag] = listener + listener.onMapStyleModeChange(mMapStyleMode) + } + + /** + * 删除 地图样式改变 监听 + * @param tag 标记，用来注销监听使用 + */ + fun removeMapStyleChangeListener(@Nullable tag: String) { + mMapStyleChangeListeners.remove(tag) + } + + /** + * 删除 地图样式改变 监听 + * @param listener 要删除的监听对象 + */ + fun removeMapStyleChangeListener(@Nullable listener: IMoGoMapStyleChangeListener) { + mMapStyleChangeListeners.forEach { + if (it.value == listener) { + mMapStyleChangeListeners.remove(it.key) + } + } + } + + /** + * 触发 地图样式改变 监听 + */ + fun invokeMapStyleChangeListener() { + invokeMapStyleChangeListener(mMapStyleMode) + } + + /** + * 触发 地图样式改变 监听 + * @param mapStyleMode 选中状态 + */ + fun invokeMapStyleChangeListener(mapStyleMode: Int) { + LogUtils.dTag(TAG, "mapStyleMode:$mapStyleMode") + mMapStyleMode = mapStyleMode + mMapStyleChangeListeners.forEach { + val tag = it.key + val listener = it.value + LogUtils.dTag(TAG, "tag:$tag listener:$listener") + listener.onMapStyleModeChange(mMapStyleMode) + } + } + +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuListenerManager.kt index 7377fc4e2b..7e75e9824e 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuListenerManager.kt @@ -22,21 +22,21 @@ object CallerObuListenerManager : CallerBase() { private val mObuStatusListeners: HashMap = HashMap() /** - * 查询OBU状态 + * 查询 OBU状态 */ fun getObuStatusInfo(): ObuStatusInfo { return mObuStatusInfo } /** - * 查询OBU状态 + * 查询 OBU状态 */ fun getObuStatusInfoJsonString(): String { return GsonUtils.toJson(mObuStatusInfo) } /** - * 添加自动驾驶按钮选中监听 + * 添加 OBU状态 监听 * @param tag 标记，用来注销监听使用 * @param listener 监听回调 */ @@ -49,7 +49,7 @@ object CallerObuListenerManager : CallerBase() { } /** - * 删除 监听 + * 删除 OBU状态 监听 * @param tag 标记，用来注销监听使用 */ fun removeListener(@Nullable tag: String) { @@ -57,7 +57,7 @@ object CallerObuListenerManager : CallerBase() { } /** - * 删除自动驾驶按钮选中监听 + * 删除 OBU状态 监听 * @param listener 要删除的监听对象 */ fun removeListener(@Nullable listener: IMoGoObuStatusListener) { @@ -69,19 +69,18 @@ object CallerObuListenerManager : CallerBase() { } /** - * 触发自动驾驶按钮选中监听 + * 触发 OBU状态 监听 */ fun invokeListener() { - LogUtils.dTag(TAG, "isChecked:$mObuStatusInfo") invokeListener(mObuStatusInfo) } /** - * 触发自动驾驶按钮选中监听 + * 触发 OBU状态 监听 * @param obuStatusInfo 选中状态 */ fun invokeListener(obuStatusInfo: ObuStatusInfo) { - LogUtils.dTag(TAG, "isChecked:$obuStatusInfo") + LogUtils.dTag(TAG, "obuStatusInfo:$obuStatusInfo") mObuStatusInfo = obuStatusInfo mObuStatusListeners.forEach { val tag = it.key diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-mdpi/module_switch_map_angle.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-mdpi/module_switch_map_angle.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/module_switch_map_angle.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/module_switch_map_angle.png diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml index a32b5ba646..044c28954c 100644 --- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -32,4 +32,13 @@ 44px + 279px + 119px + 22px + 36px + 50px + 60px + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/color.xml b/core/mogo-core-res/src/main/res/values/color.xml index aa7e6bacf6..b2c628bf52 100644 --- a/core/mogo-core-res/src/main/res/values/color.xml +++ b/core/mogo-core-res/src/main/res/values/color.xml @@ -5,4 +5,6 @@ #323C6F + #FFFFFF + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 8753a23a7b..7c21290aea 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -32,4 +32,13 @@ 33px + 190px + 76px + 16px + 24px + 35px + 38px + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/string.xml b/core/mogo-core-res/src/main/res/values/string.xml index eb4163b982..e618039a94 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -4,4 +4,7 @@ "不支持该视频。" 此文件不支持播放 + + 近距视角 + 远距视角 \ No newline at end of file diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 07236c1b18..ab34b9f21c 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -61,7 +61,9 @@ dependencies { implementation project(':foudations:mogo-utils') implementation project(':libraries:mogo-map-api') implementation project(':foudations:mogo-commons') + implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-function-call') } implementation rootProject.ext.dependencies.mogocustommap } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 8525b36650..64a31a3f4c 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -17,7 +17,6 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.animation.Interpolator; import android.widget.TextView; import com.mogo.commons.FunctionBuildConfig; @@ -33,7 +32,6 @@ import com.mogo.map.impl.custom.utils.ObjectUtils; import com.mogo.map.impl.custom.utils.PointInterpolatorUtil; import com.mogo.map.impl.custom.utils.ResIdCache; import com.mogo.map.listener.MogoMapListenerHandler; -import com.mogo.map.marker.IMogoMarker; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -458,9 +456,7 @@ public class AMapViewWrapper implements IMogoMapView, if (visible && NaviClient.getInstance(getContext()).isNaviing()) { return; } - // if (DebugConfig.isDebug()) { - // Logger.d(TAG, Log.getStackTraceString(new Throwable())); - // } + if (checkAMapView()) { MyLocationStyle style = mMapView.getMapAutoViewHelper().getMyLocationStyle(); if (visible) { @@ -504,9 +500,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void recoverLockMode() { if (checkAMapView()) { - // if ( DebugConfig.isDebug() ) { - // Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - // } if (mCurrentUI == EnumMapUI.Type_VR) { return; } @@ -562,7 +555,7 @@ public class AMapViewWrapper implements IMogoMapView, try { return ObjectUtils.fromAMap(MapTools.INSTANCE.getVisibleRegion().getLeftBottomPoint()); } catch (Exception e) { - + e.printStackTrace(); } return null; } @@ -572,7 +565,7 @@ public class AMapViewWrapper implements IMogoMapView, try { return ObjectUtils.fromAMap(mMapView.getMapAutoViewHelper().getCenter()); } catch (Exception e) { - + e.printStackTrace(); } return null; } @@ -594,6 +587,7 @@ public class AMapViewWrapper implements IMogoMapView, try { return MapTools.INSTANCE.toScreenLocation(ObjectUtils.fromMogo(latLng)); } catch (Exception e) { + e.printStackTrace(); return null; } } @@ -607,38 +601,13 @@ public class AMapViewWrapper implements IMogoMapView, return ObjectUtils.fromAMap( MapTools.INSTANCE.fromScreenLocation(point)); } catch (Exception e) { + e.printStackTrace(); return null; } } return null; } - @Override - public void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator, - long duration) { - if (marker == null || high <= 0.0f || interpolator == null || duration < 0) { - return; - } - try { - // final LatLng latLng = ObjectUtils.fromMogo2( marker.getPosition() ); - // Point point = mMapView.getMap().getProjection().toScreenLocation( latLng ); - // point.y -= WindowUtils.dip2px( getContext(), high ); - // LatLng target = mMapView.getMap().getProjection().fromScreenLocation( point ); - // //使用TranslateAnimation,填写一个需要移动的目标点 - // Animation animation = new TranslateAnimation( target ); - // animation.setInterpolator( interpolator ); - // //整个移动所需要的时间 - // animation.setDuration( duration ); - // //设置动画 - // if ( marker instanceof AMapMarkerWrapper ) { - // ( ( AMapMarkerWrapper ) marker ).getMarker().setAnimation( animation ); - // ( ( AMapMarkerWrapper ) marker ).getMarker().startAnimation(); - // } - } catch (Exception e) { - Logger.e(TAG, e, "error."); - } - } - @Override public void setRenderFps(int fps) { if (checkAMapView()) { @@ -833,14 +802,6 @@ public class AMapViewWrapper implements IMogoMapView, //showSelfSpeed(location.getSpeed()); } - private int mDrawlevel; - - @Override - public void setAdasRecognizedResult(int drawlevel) { - mDrawlevel = drawlevel; - } - - private TextView mSpeedView = null; private int mLastYOffset = 20; @@ -936,7 +897,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onMapStatusChanged(int type, int value) { - // Logger.i( TAG, "mapop--onMapStatusChanged-: " + type + "," + value ); + //Logger.i(TAG, "mapop--onMapStatusChanged-: " + type + "," + value); } @Override @@ -961,7 +922,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onCameraChange(int type, int value) { - // Logger.i( TAG, "mapop--onCameraChange-: " + type + "," + value ); + //Logger.i(TAG, "mapop--onCameraChange-: " + type + "," + value); } @Override @@ -977,24 +938,11 @@ public class AMapViewWrapper implements IMogoMapView, } } - @Override - public void setAnchorScale(float x, float y) { - mMapView.getMapAutoViewHelper().setAnchorScale(x, y); - } - - @Override - public void setAnchorRate(float rate) { - mMapView.getMapAutoViewHelper().setAnchorRate(rate); - } - @Override public void emphasizeMyLocation() { } - //目前切换完vr之后，会立即回调其他样式，这里做一个判断 - // private boolean mVrModeAutoChangedFlag = false; - @Override public void onChangeMapStyle(int i) { @@ -1012,11 +960,6 @@ public class AMapViewWrapper implements IMogoMapView, // 进入vr模式的时候自动切换到车头朝上 change2CarUp(); } - // else if ( i == MapAutoApi.MAP_PERSPECTIVE_2D ) { - // mCurrentUI = EnumMapUI.CarUp_2D; - // } else if ( i == MapAutoApi.MAP_PERSPECTIVE_3D ) { - // mCurrentUI = EnumMapUI.CarUp_3D; - // } if (last == mCurrentUI) { Logger.d(TAG, "currentUI is same as last = %s", mCurrentUI); @@ -1024,17 +967,11 @@ public class AMapViewWrapper implements IMogoMapView, } // vr 模式切换到普通模式下，保持之前的白天模式 wtf. - if (last == EnumMapUI.Type_VR - && mCurrentUI != last - && mCurrentUI != EnumMapUI.Type_Light) { + if (last == EnumMapUI.Type_VR && mCurrentUI != EnumMapUI.Type_Light) { if (mIsLightStyle) { changeMapMode(EnumMapUI.Type_Light); return; } - // if ( mVrModeAutoChangedFlag ) { - // mVrModeAutoChangedFlag = false; - // return; - // } } Logger.d(TAG, Log.getStackTraceString(new Throwable())); if (mCurrentUI != null) { @@ -1066,7 +1003,6 @@ public class AMapViewWrapper implements IMogoMapView, if (isVrMode) { if (mCurrentUI != EnumMapUI.Type_VR) { Logger.d(TAG, "自动切换为vr模式"); - // mVrModeAutoChangedFlag = true; changeMapMode(EnumMapUI.Type_VR); } } else { diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java index d51e914a16..745990d9e6 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java @@ -4,10 +4,8 @@ import android.graphics.Point; import android.graphics.Rect; import android.location.Location; import android.view.View; -import android.view.animation.Interpolator; import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.map.marker.IMogoMarker; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -221,13 +219,6 @@ public class AMapUIController implements IMogoMapUIController { return null; } - @Override - public void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator, - long duration) { - if (mClient != null) { - mClient.startJumpAnimation(marker, high, interpolator, duration); - } - } @Override public void setRenderFps(int fps) { @@ -308,21 +299,11 @@ public class AMapUIController implements IMogoMapUIController { return MapAutoApi.INSTANCE.getTileID(lon, lat, 13); // 13为默认获取瓦片层级级别 } - @Override - public void setAnchorScale(float x, float y) { - - } - @Override public void emphasizeMyLocation() { } - @Override - public void setAnchorRate(float rate) { - - } - @Override public void rtkEnable(boolean enable) { if (mClient != null) { @@ -374,10 +355,4 @@ public class AMapUIController implements IMogoMapUIController { } } - @Override - public void setAdasRecognizedResult(int drawlevel) { - if (mClient != null) { - mClient.setAdasRecognizedResult(drawlevel); - } - } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 7df23c1442..0cfcf107b2 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -172,20 +172,6 @@ public interface IMogoMapUIController { */ MogoLatLng getLocationMogoLatLngInScreen(Point point); - /** - * marker 跳跃动画 - *

- * Deprecated, instead of by {@link IMogoMarker#startJumpAnimation(float, long, Interpolator, OnMarkerAnimationListener)} - * - * @param marker 跳跃的 marker - * @param high 跳跃的高度 - * @param interpolator 插值器 - * @param duration 动画时间 - */ - @Deprecated - void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator, - long duration); - /** * 设置刷新帧率 */ @@ -250,8 +236,6 @@ public interface IMogoMapUIController { */ void changeBearing(float bearing); - void setAdasRecognizedResult(int drawlevel); - /** * 获取瓦片id * @@ -262,13 +246,6 @@ public interface IMogoMapUIController { long getTileId(double lon, double lat); - default void setAnchorScale(float x, float y) { - - } - - default void setAnchorRate(float rate) { - - } default void testGpsData() { diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index 1178b5c2ba..7e20185931 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -4,10 +4,8 @@ import android.graphics.Point; import android.graphics.Rect; import android.location.Location; import android.view.View; -import android.view.animation.Interpolator; import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.map.marker.IMogoMarker; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -255,14 +253,6 @@ public class MogoMapUIController implements IMogoMapUIController { return null; } - @Override - public void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator, long duration) { - initDelegate(); - if (mDelegate != null) { - mDelegate.startJumpAnimation(marker, high, interpolator, duration); - } - } - @Override public void setRenderFps(int fps) { initDelegate(); @@ -420,12 +410,4 @@ public class MogoMapUIController implements IMogoMapUIController { mDelegate.clearRoadCacheById(id); } } - - @Override - public void setAdasRecognizedResult(int drawlevel) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setAdasRecognizedResult(drawlevel); - } - } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java index c82bc91192..be70a3baf3 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java @@ -22,6 +22,8 @@ public class MogoModulePaths { private static final List mModuleFunctions = new ArrayList<>(); + private static final List mModuleFunctionServers = new ArrayList<>(); + /** * 地图模块 fragment 路径 */ @@ -38,17 +40,6 @@ public class MogoModulePaths { */ public static final String PATH_ENTRANCE = "/extension/entrance"; - - /** - * 添加卡片模块 - * - * @param path - */ - @Deprecated - public static void addModule(String path) { - throw new IllegalArgumentException("this method can't be invoked."); - } - /** * 添加卡片模块 * @@ -73,6 +64,18 @@ public class MogoModulePaths { mModuleFunctions.add(module); } + /** + * 添加 功能服务， 不带UI Fragment的 + * + * @param module 功能模块 + */ + public static void addModuleFunctionServer(MogoModule module) { + if (module == null || TextUtils.isEmpty(module.getPath().replace(" ", ""))) { + throw new IllegalArgumentException("module path can't be empty or null or blank"); + } + mModuleFunctionServers.add(module); + } + /** * 添加基础模块 * @@ -96,4 +99,8 @@ public class MogoModulePaths { public static List getModuleFunctions() { return mModuleFunctions; } + + public static List getModuleFunctionServers() { + return mModuleFunctionServers; + } } diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png deleted file mode 100644 index 3e1b96f3e3f0a01072632bcd1389a7811a195517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1440/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1440/module_switch_map_angle.png deleted file mode 100644 index 3e1b96f3e3f0a01072632bcd1389a7811a195517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png deleted file mode 100644 index 3e1b96f3e3f0a01072632bcd1389a7811a195517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml index 2b86120186..4b98d8758d 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -2,12 +2,4 @@ 1100px - 279px - 119px - 22px - 36px - 50px - 60px - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 0985d97ed6..50d095a929 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -184,11 +184,4 @@ - 190px - 76px - 16px - 24px - 35px - 38px - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml index 66347a003a..6ff588cc10 100644 --- a/modules/mogo-module-extensions/src/main/res/values/colors.xml +++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml @@ -1,6 +1,5 @@ - #FFFFFF #BF30334C #fff #f1f1f1 diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 064dab01f5..605838bb8c 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -244,12 +244,4 @@ 400px 300px - 190px - 76px - 16px - 24px - 35px - 38px - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml index 2ffaf6481b..9c7601fdad 100644 --- a/modules/mogo-module-extensions/src/main/res/values/strings.xml +++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml @@ -69,7 +69,5 @@ 提前看看出行路况，试试唤醒小智说，“中关村路况怎么样” - 近距视角 - 远距视角 diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index 22bd187896..c48de48d45 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -29,6 +29,11 @@ public interface MogoModulesHandler { */ void loadFunctionModules(); + /** + * 架构升级v1.1加载功能模块 + */ + void loadFunctionModulesServer(); + /** * 加载地图 * diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 4165878884..602920c58d 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -5,8 +5,10 @@ import android.content.Context; import androidx.fragment.app.Fragment; +import com.alibaba.android.arouter.facade.template.IProvider; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; +import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; @@ -43,6 +45,10 @@ public class MogoModulesManager implements MogoModulesHandler { private Map< MogoModule, IMoGoFunctionProvider> mModuleFunctionProviders = new HashMap<>(); private Map< String, IMoGoFunctionProvider> mModuleNameFunctionProviders = new HashMap<>(); + // 架构升级后的加载功能模块的方式 + private Map< MogoModule, IMoGoFunctionServerProvider> mModuleFunctionServerProviders = new HashMap<>(); + private Map< String, IMoGoFunctionServerProvider> mModuleNameFunctionServerProviders = new HashMap<>(); + private static volatile MogoModulesManager sInstance; private MogoModulesManager() { @@ -121,6 +127,21 @@ public class MogoModulesManager implements MogoModulesHandler { } } + @Override + public void loadFunctionModulesServer() { + final List< MogoModule > modules = MogoModulePaths.getModuleFunctionServers(); + if ( modules != null && !modules.isEmpty() ) { + for ( MogoModule module : modules ) { + Logger.d( TAG, "module.getPath():" + module.getPath() + " name: " + module.getName() ); + IMoGoFunctionServerProvider provider = loadFunctionServer( module.getPath() ); + if ( provider != null ) { + mModuleFunctionServerProviders.put( module, provider ); + mModuleNameFunctionServerProviders.put( module.getName(), provider ); + } + } + } + } + @Override public void loadMapModule( int containerId ) { Logger.d( TAG, "loadMapModule" ); @@ -168,7 +189,7 @@ public class MogoModulesManager implements MogoModulesHandler { continue; } Logger.d( TAG, "加载基本模块：%s", baseModule.getPath() ); - load( baseModule.getPath() ); + loadBaseProvider( baseModule.getPath() ); } } @@ -181,6 +202,15 @@ public class MogoModulesManager implements MogoModulesHandler { } + private IProvider loadBaseProvider(String path ) { + try { + return ( IProvider ) ARouter.getInstance().build( path ).navigation( getContext() ); + } catch ( Exception e ) { + e.printStackTrace(); + return null; + } + } + private IMogoModuleProvider load( String path ) { try { return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() ); @@ -199,6 +229,15 @@ public class MogoModulesManager implements MogoModulesHandler { } } + private IMoGoFunctionServerProvider loadFunctionServer(String path ) { + try { + return ( IMoGoFunctionServerProvider ) ARouter.getInstance().build( path ).navigation( getContext() ); + } catch ( Exception e ) { + e.printStackTrace(); + return null; + } + } + private void addFragment( IMogoModuleProvider provider, int containerId ) { if ( provider == null ) { Logger.e( TAG, "add fragment fail cause provider == null, container is %s", ResourcesHelper.getResNameById( getApplicationContext(), containerId ) ); @@ -272,6 +311,23 @@ public class MogoModulesManager implements MogoModulesHandler { if ( mModuleFunctionProviders != null ) { mModuleFunctionProviders.clear(); } + if ( mModuleFunctionServerProviders != null ) { + Collection< IMoGoFunctionServerProvider > modules = mModuleFunctionServerProviders.values(); + if ( modules != null ) { + for ( IMoGoFunctionServerProvider module : modules ) { + try { + Logger.d( TAG, "destroy module: " + module.getFunctionName() ); + module.onDestroy(); + } catch ( Exception e ) { + Logger.e( TAG, e, "onDestroy" ); + } + } + } + mModuleNameFunctionProviders.clear(); + } + if ( mModuleFunctionServerProviders != null ) { + mModuleFunctionServerProviders.clear(); + } mActivity = null; } } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index fe5eca8a59..79e6546233 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -460,14 +460,7 @@ public class MogoADASController implements IMogoADASController { @Override public EnumMapUI getCurrentSkinMode() { - if (!DebugConfig.isMapBased()) { - return EnumMapUI.Type_Night; - } - boolean white = AdasConfigApiController.getInstance().isShowUISkinWhiteModel(); - if (!white) { - return EnumMapUI.Type_Night; - } - return EnumMapUI.Type_Light; + return EnumMapUI.Type_VR; } @Override From dc31e46fc05a4111037c75fbc48fb4560b9ee7bc Mon Sep 17 00:00:00 2001 From: lianglihui Date: Fri, 15 Oct 2021 19:46:49 +0800 Subject: [PATCH 20/21] =?UTF-8?q?eagle=20=E9=A1=BA=E4=B9=89=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=20=E8=B0=83=E6=95=B4=E8=B7=AF=E7=BA=BF=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/smp/SmallMapDirectionView.java | 74 ++++++++++--------- .../core/function/smp/SmallMapFragment.java | 1 + .../core/function/smp/SmallMapProvider.java | 5 +- .../routeoverlay/RouteOverlayDrawer.java | 8 +- 4 files changed, 48 insertions(+), 40 deletions(-) diff --git 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 index 548e56984c..1f22c249ce 100644 --- 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 @@ -192,36 +192,36 @@ public class SmallMapDirectionView } - if (mCoordinatesLatLng.size() > 1) { - mCoordinatesLatLngCurrent.clear(); - for (LatLng lng : mCoordinatesLatLng) { - MogoLatLng mogoLatLng = new MogoLatLng(lng.latitude, lng.longitude); - mCoordinatesLatLngCurrent.add(mogoLatLng); - } - - // 结束位置 - LatLng endLatLng = mCoordinatesLatLng.get(mCoordinatesLatLng.size() - 1); - // 与结束位置进行 GeoHash 0-12 -// GeoHash endGeoHash = GeoHash.withCharacterPrecision(endLatLng.latitude, endLatLng.longitude, 7); -// GeoHash currentGeoHash = GeoHash.withCharacterPrecision(currentLatLng.latitude, currentLatLng.longitude, 7); -// Log.d(MODULE_NAME, "currentGeoHash=" + currentGeoHash); -// Log.d(MODULE_NAME, "endGeoHash=" + endGeoHash); - - float calculateDistance = CoordinateUtils.calculateLineDistance( - endLatLng.latitude, endLatLng.longitude, - currentLatLng.latitude, currentLatLng.longitude - ); - - Log.d(MODULE_NAME, "calculateDistance=" + calculateDistance); - if (calculateDistance <= 20) { - clearPolyline(); - } else { - drawablePolyline(mCoordinatesLatLngCurrent); - } - } else { - //设置希望展示的地图缩放级别 - mAMap.moveCamera(CameraUpdateFactory.newLatLngZoom(currentLatLng, zoomLevel)); - } +// if (mCoordinatesLatLng.size() > 1) { +// mCoordinatesLatLngCurrent.clear(); +// for (LatLng lng : mCoordinatesLatLng) { +// MogoLatLng mogoLatLng = new MogoLatLng(lng.latitude, lng.longitude); +// mCoordinatesLatLngCurrent.add(mogoLatLng); +// } +// +// // 结束位置 +// LatLng endLatLng = mCoordinatesLatLng.get(mCoordinatesLatLng.size() - 1); +// // 与结束位置进行 GeoHash 0-12 +//// GeoHash endGeoHash = GeoHash.withCharacterPrecision(endLatLng.latitude, endLatLng.longitude, 7); +//// GeoHash currentGeoHash = GeoHash.withCharacterPrecision(currentLatLng.latitude, currentLatLng.longitude, 7); +//// Log.d(MODULE_NAME, "currentGeoHash=" + currentGeoHash); +//// Log.d(MODULE_NAME, "endGeoHash=" + endGeoHash); +// +// float calculateDistance = CoordinateUtils.calculateLineDistance( +// endLatLng.latitude, endLatLng.longitude, +// currentLatLng.latitude, currentLatLng.longitude +// ); +// +// Log.d(MODULE_NAME, "calculateDistance=" + calculateDistance); +// if (calculateDistance <= 20) { +// clearPolyline(); +// } else { +// drawablePolyline(mCoordinatesLatLngCurrent); +// } +// } else { +// //设置希望展示的地图缩放级别 +// 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)); } @@ -234,11 +234,12 @@ public class SmallMapDirectionView @Override public void drawablePolyline(List coordinates) { clearPolyline(); - mCoordinatesLatLng.clear(); +// mCoordinatesLatLng.clear(); List latLngs = CoordinateConverterFrom84ForList(mContext,coordinates); mCoordinatesLatLng.addAll(latLngs); -// for (MogoLatLng coordinate : coordinates) { -// mCoordinatesLatLng.add(new LatLng(coordinate.getLat(), coordinate.getLon())); +// for (LatLng coordinate : mCoordinatesLatLng) { +//// mCoordinatesLatLng.add(new LatLng(coordinate.getLat(), coordinate.getLon())); +//// Log.e("",coordinate.latitude+":"+coordinate.longitude); // } if (mAMap != null) { if (mCoordinatesLatLng.size() > 2) { @@ -281,7 +282,6 @@ public class SmallMapDirectionView } public List CoordinateConverterFrom84ForList(Context mContext, List mogoLatLngList){ - List list = new ArrayList<>(); for (MogoLatLng m:mogoLatLngList) { LatLng mogoLatLng = CoordinateConverterFrom84(mContext,m); @@ -326,4 +326,10 @@ public class SmallMapDirectionView mAMapNaviView.onDestroy(); } } + + public void setRouteList(List coordinates) { +// mCoordinatesLatLng.clear(); +// List latLngs = CoordinateConverterFrom84ForList(mContext,coordinates); +// mCoordinatesLatLng.addAll(latLngs); + } } diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index 9f0358aaec..f8ff5709dd 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -45,6 +45,7 @@ public class SmallMapFragment extends Fragment { public void drawablePolyline(List coordinates) { if (mSmallMapDirectionView != null) { + mSmallMapDirectionView.setRouteList(coordinates); mSmallMapDirectionView.drawablePolyline(coordinates); } } diff --git 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 index 92e582064d..94a1b76fb6 100644 --- 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 @@ -40,7 +40,7 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang mActivity = activity; mContainerId = containerId; SmpServiceManager.init(mActivity); - //MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasAutopilotRouteCallBack(this); + MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasAutopilotRouteCallBack(this); } @Override @@ -63,7 +63,7 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang MogoServicePaths.PATH_SMALL_MAP, StatusDescriptor.MAIN_PAGE_RESUME, this); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasAutopilotRouteCallBack(this); +// MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasAutopilotRouteCallBack(this); if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { showPanel(); @@ -132,6 +132,7 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang @Override public void routeResult(List routeList) { + Log.e("lianglihui","SmallMapProvider"); if (routeList != null && routeList.size() > 0) { drawablePolyline(routeList); } else { diff --git 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 index 80396b2e2d..02ca549744 100644 --- 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 @@ -88,23 +88,23 @@ public class RouteOverlayDrawer { } }else { // 将当前车辆位置放进去 - mPolylinePointList.add(new MogoLatLng(carLocal.getLatitude(), carLocal.getLongitude())); +// mPolylinePointList.add(new MogoLatLng(carLocal.getLatitude(), carLocal.getLongitude())); for (MogoLatLng polyline : routelist) { // Log.e("IMogoPolyline",polyline.getLat()+":"+polyline.lon); - //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃 if (LocationUtils.isPointOnCarFront(carLocal, polyline)) { } - Log.e("lianglihui",polyline.getLat()+":"+polyline.getLon()); mPolylinePointList.add(polyline); + //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃 +// Log.e("lianglihui",polyline.getLat()+":"+polyline.getLon()); } } // 过滤后台推送的推荐路线集合 + mPolylineOptions.setGps(true); mPolylineColors.addAll(ColorUtils.getGradientAlpha("#002965ED", "#FF2965ED", "#002965ED", mPolylinePointList.size())); // 替换路径集合 mPolylineOptions.points(mPolylinePointList); - mPolylineOptions.setGps(true); // 线条粗细，渐变，渐变色值 mPolylineOptions.width(25).useGradient(true).colorValues(mPolylineColors); // 绘制线 From 226b279e53a222602bb99746ec468a18666a6091 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 15 Oct 2021 22:54:47 +0800 Subject: [PATCH 21/21] note the pluigin --- app/build.gradle | 26 +++++++++---------- build.gradle | 6 ++--- gradle.properties | 22 ++++++++-------- modules/mogo-module-common/build.gradle | 4 +-- .../common/drawer/SnapshotSetDataDrawer.java | 11 +++----- 5 files changed, 32 insertions(+), 37 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4efc3a41c6..768f77a866 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,18 +4,18 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'android-aspectjx' -//apply ByteX宿主 -apply plugin: 'bytex' -ByteX { - enable true - enableInDebug true - logLevel "DEBUG" -} - -apply plugin: 'chain.log.hook' -hooklog{ - enableLoggerToServer true -} +////apply ByteX宿主 +//apply plugin: 'bytex' +//ByteX { +// enable true +// enableInDebug true +// logLevel "DEBUG" +//} +// +//apply plugin: 'chain.log.hook' +//hooklog{ +// enableLoggerToServer true +//} Properties properties = new Properties(); properties.load(project.rootProject.file("gradle.properties").newDataInputStream()) @@ -42,8 +42,6 @@ android { packagingOptions { exclude 'META-INF/proguard/coroutines.pro' exclude 'META-INF/*' - exclude '*/proguard' - pickFirst 'migrateToAndroidx/migration.xml' } signingConfigs { diff --git a/build.gradle b/build.gradle index fc46f91485..8b3d6180a0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply from: "javadoc.gradle" buildscript { repositories { - maven { url "https://artifact.bytedance.com/repository/byteX/" } +// maven { url "https://artifact.bytedance.com/repository/byteX/" } maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/google' } @@ -19,8 +19,8 @@ buildscript { classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31' classpath "com.alibaba:arouter-register:1.0.2" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' - classpath "com.bytedance.android.byteX:base-plugin:0.3.0" - classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" +// classpath "com.bytedance.android.byteX:base-plugin:0.3.0" +// classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" // classpath ("com.tencent.matrix:matrix-gradle-plugin:0.6.6") { changing = true } } diff --git a/gradle.properties b/gradle.properties index 5ce42ef968..eea0949dbd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ kapt.include.compile.classpath=false # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX -android.enableJetifier=false +android.enableJetifier=true android.jetifier.blacklist=module-service-2.0.58.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ @@ -46,16 +46,16 @@ PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 RELEASE=false -#plugin 插件 -android.enableR8.libraries=false -android.enableR8=false -android.enableD8=true -android.enableD8.desugaring=true -android.enableDesugar=true -bytex.enableHtmlLog=true -bytex.forbidUseLenientMutationDuringGetArtifact=true -bytex.verifyProguardConfigurationChanged=false -bytex.ASM_API=ASM7 +##plugin 插件 +#android.enableR8.libraries=false +#android.enableR8=false +#android.enableD8=true +#android.enableD8.desugaring=true +#android.enableDesugar=true +#bytex.enableHtmlLog=true +#bytex.forbidUseLenientMutationDuringGetArtifact=true +#bytex.verifyProguardConfigurationChanged=false +#bytex.ASM_API=ASM7 HOOK_LOG_VERSION=1.4.63 SERVICE_CHAIN_VERSION=1.0.22 diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index bd110d83d2..c6b45a8681 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -73,8 +73,8 @@ dependencies { implementation project(':core:mogo-core-function-call') } - implementation rootProject.ext.dependencies.mogochainbase - implementation rootProject.ext.dependencies.mogochainplugin +// implementation rootProject.ext.dependencies.mogochainbase +// implementation rootProject.ext.dependencies.mogochainplugin annotationProcessor 'com.elegant.spi:compiler:1.0.3' } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 9c9983c420..2ff8412526 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -29,9 +29,6 @@ import com.mogo.utils.ViewUtils; import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.ICarsChattingProvider; import com.zhidao.carchattingprovider.MogoDriverInfo; -import com.zhjt.service.chain.ChainLog; -import com.zhjt.service.chain.TracingConstants; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -140,10 +137,10 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic * * @param data 自车周边数据 */ - @ChainLog(endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = "PAD_YINGYAN_SHOW", - paramIndexes = 0, - clientPkFileName = "sn") +// @ChainLog(endpoint = TracingConstants.Endpoint.PAD, +// nodeAliasCode = "PAD_YINGYAN_SHOW", +// paramIndexes = 0, +// clientPkFileName = "sn") public void renderSnapshotData(SocketDownData.LauncherSnapshotProto data) { final long start = System.nanoTime(); if (clear(data)) {