From 74e31d8ec9b14a8f24166ceda75e052554339614 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 12 Oct 2021 15:35:50 +0800 Subject: [PATCH 01/15] =?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/15] =?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/15] =?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/15] =?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/15] =?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/15] =?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/15] =?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/15] 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/15] =?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/15] =?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/15] 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/15] =?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/15] =?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/15] 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/15] 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', // 左侧面板