From 9f6a911765ab3b7607d86a1b105ff1e6d68464e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 21 Jun 2021 18:21:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=99=8D=E7=BA=A7=E5=9C=B0=E5=9B=BEsdk?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=9B=A0=E6=98=AF=E5=9C=B0=E5=9B=BEcrash=20h?= =?UTF-8?q?ttps://bugly.qq.com/v2/crash-reporting/crashes/f3f8b0b2f1/45202?= =?UTF-8?q?8=3Fpid=3D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6415cf01ad..995425e5dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -187,4 +187,4 @@ applicationId=com.mogo.launcer applicationName=IntelligentPilot versionCode=80007 versionName=8.0.7 -MAP_SDK_VERSION=1.0.0-vr-8.5.50 \ No newline at end of file +MAP_SDK_VERSION=1.0.0-vr-8.5.49 \ No newline at end of file From a9b8067d5df5b8fc9cfc3a971f6ca771115a3cf9 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 21 Jun 2021 18:21:20 +0800 Subject: [PATCH 2/7] opt mogoobu --- .../com/mogo/module/v2x/V2XObuManager.java | 80 +++++++++++++++---- .../com/mogo/module/v2x/utils/V2XUtils.java | 12 +++ 2 files changed, 77 insertions(+), 15 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java index f117c07323..02b4309e98 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java @@ -17,6 +17,7 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; import com.mogo.map.location.MogoLocation; import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.common.drawer.AdasRecognizedResultDrawer; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XObuEventEntity; import com.mogo.module.common.entity.V2XPushMessageEntity; @@ -29,6 +30,8 @@ import com.mogo.module.v2x.utils.DrivingDirectionUtils; import com.mogo.module.v2x.utils.ObuConfig; import com.mogo.module.v2x.utils.TestOnLineCarUtils; import com.mogo.module.v2x.utils.ToastUtils; +import com.mogo.module.v2x.utils.V2XUtils; +import com.mogo.service.adas.entity.ADASRecognizedResult; import com.mogo.service.entrance.IMogoEntranceButtonController; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; @@ -46,6 +49,7 @@ import com.zhidao.mogo.module.obu.obu.bean.MogoObuTrafficLightInfo; import com.zhidao.support.obu.MogoObuManager; import com.zhidao.support.obu.OnMogoObuListener; +import com.zhidao.support.obu.constants.ObuConstants; import com.zhidao.support.obu.model.CvxAppInitIndInfo; import com.zhidao.support.obu.model.CvxHvCarIndInfo; import com.zhidao.support.obu.model.CvxHvInfoIndInfo; @@ -56,6 +60,7 @@ import com.zhidao.support.obu.model.CvxV2vThreatIndInfo; import org.json.JSONArray; import org.json.JSONObject; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -94,6 +99,7 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { private final Handler handler = new Handler(this); private final ObuTypeExchangeReceiver obuTypeExchangeReceiver = new ObuTypeExchangeReceiver(); private ObuManager obuManager; + final String icw_data = "02000114010000000000001effd7892b11a4440af70100142a03000907e506100e2917019000005662010a45000b0000220847162c000037970010000a17f6215c459478b6010347ac045000090a0006012c01f4009600080073007300730073000b000000000000000000000000000000002b000037780000247300003261000000000000426c827f47001200100000000000000000000021220000349a006c0010000a17f63ecb45947ba301030000332c0010000a17f642e945947bea010300004d580010000a17f6435545947e4e0103000054c40010000a17f6413a45947f96010300005c300010000a17f62c2845947d140103000070e40010000a17f5fdb14594786001030000992000060004ffec2710"; public void init(Context context) { Logger.d(MODULE_NAME, "obuManager初始化--"); @@ -111,10 +117,11 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { MogoObuManager.getInstance().init(context); MogoObuManager.getInstance().connect(); MogoObuManager.getInstance().registerListener(mogoObuListener); - MogoObuManager.getInstance().unregisterListener(); + + //TODO 测试 +// MogoObuManager.getInstance().test(icw_data); // UiThreadHandler.postDelayed( () -> { -// //TODO 测试 // MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(3, MogoReceiver.ACTION_V2X_FRONT_WARNING); // handleSdkObu(1); // @@ -191,19 +198,66 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { @Override public void onCvxV2vThreatIndInfo(CvxV2vThreatIndInfo info) { //预警信息 - Logger.e("liyz", "onCvxRvInfoIndInfo ------> " + info.toString()); + Logger.e("liyz", "onCvxV2vThreatIndInfo ------> " + info.toString()); + //预警类型 threat_level 3 + if (info != null) { + if (info.getThreat_info() != null && info.getControl() != null && + info.getThreat_info().getThreat_level() == 3) { //看看2的情况 + //预警方位 + int direction = V2XUtils.getDirection((float) info.getExt_info().getAzimuth()); + Log.d("liyz", "direction = " + direction + "---azimuth = " + (float) info.getExt_info().getAzimuth()); + MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(direction, MogoReceiver.ACTION_V2X_FRONT_WARNING); - //预警数据的组装，车辆实时移动和变色。 - //预警方位 - //预警类型 + //处理预警类型 + int appId = info.getThreat_info().getApp_id(); + handleSdkObu(getEventType(appId)); + } + //预警数据的组装，车辆实时移动和变色 TODO 这里需要obu提供他车列表 + AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(getResultList(info)); + } else { + Log.e("liyz", "info == null "); + } } }; + private int getEventType(int appid) { + if (appid == ObuConstants.USE_CASE_ID.EBW) { + return ObuConstant.TYPE_URGENCY_COLLISION_WARNING; + } else if (appid == ObuConstants.USE_CASE_ID.ICW) { + return ObuConstant.TYPE_CROSS_COLLISION_WARNING; + } + + return 0; + } + + private List resultList = null; + + private List getResultList(CvxV2vThreatIndInfo info) { + if (resultList == null) { + resultList = new ArrayList<>(); + } + + ADASRecognizedResult adasRecognizedResult = new ADASRecognizedResult(); + adasRecognizedResult.uuid = info.getVehicle_id(); + if (info.getBasic_info() != null && info.getBasic_info().getPosition() != null) { + adasRecognizedResult.lat = info.getBasic_info().getPosition().getLatitude(); + adasRecognizedResult.lon = info.getBasic_info().getPosition().getLongitude(); + } + adasRecognizedResult.type = 3; //小轿车 + adasRecognizedResult.heading = info.getBasic_info().getHeading(); + adasRecognizedResult.speed = info.getBasic_info().getSpeed(); + + resultList.add(adasRecognizedResult); + + return resultList; + + } // public void release() { // NebulaObuClient.getInstance().unregisterObu(); // NebulaObuClient.getInstance().unregisterObuListener(); +// MogoObuManager.getInstance().unregisterListener(); // } /** @@ -216,7 +270,6 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { // // @Override // public void onConnectFail(boolean isNeedReconnect) { -// Logger.d("liyz", "onConnectFail ------> "); // } // // @Override @@ -225,7 +278,6 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { // // @Override // public void onObuInfo(ObuInfo info) { -// Logger.d("liyz", "onObuInfo ------> " + info.toString()); // } // // @Override @@ -243,22 +295,20 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { // } // } // }; - - private void handleSdkObu(int type) { V2XMessageEntity messageEntity = new V2XMessageEntity<>(); messageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_OBU_EVENT); V2XObuEventEntity urgencyEvent = new V2XObuEventEntity(); - if (type == 1) { //交叉路口碰撞预警 TODO + if (type == ObuConstant.TYPE_CROSS_COLLISION_WARNING) { //交叉路口碰撞预警 urgencyEvent.setType(ObuConstant.TYPE_CROSS_COLLISION_WARNING); urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_CROING_WARN_TEXT); - } else if (type == 2) { // 前车紧急制动预警 + } else if (type == ObuConstant.TYPE_URGENCY_COLLISION_WARNING) { // 前车紧急制动预警 urgencyEvent.setType(ObuConstant.TYPE_URGENCY_COLLISION_WARNING); urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_COLLISION_WARN_TEXT); } else { - urgencyEvent.setType(ObuConstant.TYPE_URGENCY_COLLISION_WARNING); - urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_COLLISION_WARN_TEXT); +// urgencyEvent.setType(ObuConstant.TYPE_URGENCY_COLLISION_WARNING); +// urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_COLLISION_WARN_TEXT); } messageEntity.setContent(urgencyEvent); @@ -457,7 +507,7 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { // 暂无设计图，先简单显示 V2XObuEventEntity tmpEvent = new V2XObuEventEntity(); tmpEvent.setType(eventType); - tmpEvent.setDesc(info.getType()+"--"+info.getDescribe()); + tmpEvent.setDesc(info.getType() + "--" + info.getDescribe()); messageEntity.setContent(tmpEvent); V2XObuEventScenario.getInstance().init(messageEntity); break; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java index 4cf2b7a50c..3cd697c057 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java @@ -779,4 +779,16 @@ public class V2XUtils { return flag; } + public static int getDirection(float degree) { + if (degree > 45 && degree < 135) { + return 1; //前方 + } else if (degree > 135 && degree < 225) { + return 4; //右方 + } else if ((degree < 45 && degree > 0) || degree < 360 && degree > 315) { + return 3; //左方 + } + + return 1; + } + } From ede583b77fd188f56bfab013de4b108f50e980fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 21 Jun 2021 18:21:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=99=8D=E7=BA=A7=E5=9C=B0=E5=9B=BEsdk?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=9B=A0=E6=98=AF=E5=9C=B0=E5=9B=BEcrash=20h?= =?UTF-8?q?ttps://bugly.qq.com/v2/crash-reporting/crashes/f3f8b0b2f1/45202?= =?UTF-8?q?8=3Fpid=3D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index c696662939..995425e5dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -180,8 +180,6 @@ MOGO_AICLOUD_SERVICES_APK_VERSION=1.0.0-SNAPSHOT # mogoAiCloud sdk services MOGO_AICLOUD_SERVICES_SDK_VERSION=1.0.0-SNAPSHOT -#地图版本 -MAP_SDK_VERSION=1.0.0-vr-8.5.50 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 @@ -189,4 +187,4 @@ applicationId=com.mogo.launcer applicationName=IntelligentPilot versionCode=80007 versionName=8.0.7 -MAP_SDK_VERSION=1.0.0-vr-8.5.50 +MAP_SDK_VERSION=1.0.0-vr-8.5.49 \ No newline at end of file From cbc8ee1f72511ea95992e0fb3399ef3abe3e549b Mon Sep 17 00:00:00 2001 From: lianglihui Date: Mon, 21 Jun 2021 18:23:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=BD=91=E7=BA=A6=E8=BD=A6=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95=20UI=E8=B5=B0=E6=9F=A5=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/module_och_bus_panel_bkg.xml | 4 +-- .../com/mogo/och/taxi/MogoOCHTaxiModel.java | 36 ++++++++----------- .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 1 + .../layout/module_mogo_och_base_fragment.xml | 3 +- .../res/values-xhdpi-2560x1440/dimens.xml | 9 ++--- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml b/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml index 204c5fc692..4a08f10745 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ android:right="3px" android:top="3px"> - + diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index a256c40d2f..c044046c82 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -132,12 +132,12 @@ class MogoOCHTaxiModel { .getApis() .getIntentManagerApi() .registerIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener ); - if ( NetworkUtils.isConnected( mContext ) ) { - restoreOrderInfo(); - } - if ( NetworkUtils.isConnected( mContext ) ) { - querryCarStatus(); - } +// if ( NetworkUtils.isConnected( mContext ) ) { +// restoreOrderInfo(); +// } +// if ( NetworkUtils.isConnected( mContext ) ) { +// querryCarStatus(); +// } } public void querryCarStatus() { @@ -148,7 +148,7 @@ class MogoOCHTaxiModel { @Override public void onSuccess(OCHCarStatusResponse data) { super.onSuccess(data); - Logger.e(TAG,"OCHCarStatusResponse:"+data.data.status); + Logger.e(TAG,"querryCarStatus:"+data.data.status); mOCHRHCarstatus = data.data.status; //更新view OCHTaxiUiController.getInstance().onOperationChanged(mOCHRHCarstatus==1); @@ -159,13 +159,13 @@ class MogoOCHTaxiModel { @Override public void onError(Throwable e) { super.onError(e); - Logger.e(TAG,"OCHCarStatusResponse:"+e.getMessage()); + Logger.e(TAG,"querryCarStatus:"+e.getMessage()); } @Override public void onError(String message, int code) { super.onError(message,code); - Logger.e(TAG,"OCHCarStatusResponse:"+message); + Logger.e(TAG,"querryCarStatus:"+message); } }); } @@ -189,19 +189,9 @@ class MogoOCHTaxiModel { Logger.d(TAG,"restoreOrderInfo:"+orderInfo); if ( !TextUtils.isEmpty( orderInfo ) ) { mCurrentOCHOrder = GsonUtil.objectFromJson( orderInfo, OCHTaxiOrderResponse.class ); - if ( mCurrentOCHOrder == null ) { - // 解决本地没有缓存订单号的问题 - query2RestoreOrderStatus( null ); - } else { - query2RestoreOrderStatus( mCurrentOCHOrder.orderNo ); - } - } else { - // 解决本地没有缓存订单号的问题 - query2RestoreOrderStatus( null ); } - } else { - query2RestoreOrderStatus( mCurrentOCHOrder.orderNo ); } + query2RestoreOrderStatus(mCurrentOCHOrder == null ? null : mCurrentOCHOrder.orderNo); } // private void restoreOrderInfo_() { @@ -244,7 +234,7 @@ class MogoOCHTaxiModel { @Override public void onSuccess( OCHTaxiOrderResponse2 data ) { - if ( data == null || data.data == null ) { + if ( data == null || data.data == null) { Logger.d( TAG, "订单已取消或已完成" ); clearCurrentOCHOrder(); OCHTaxiUiController.getInstance().onOrderStatusChanged(OCHOrderStatus.None.getCode()); @@ -359,7 +349,8 @@ class MogoOCHTaxiModel { Logger.d( TAG, "onIntentReceived = %s", intentStr ); if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) { if ( NetworkUtils.isConnected( mContext ) ) { - restoreOrderInfo(); +// restoreOrderInfo(); + querryCarStatus(); } } } @@ -384,6 +375,7 @@ class MogoOCHTaxiModel { @Override public void onSuccess(OCHCarStatusResponse o) { super.onSuccess(o); + Logger.d(TAG,"OCHCarStatusResponse:"+o.data.status); mOCHRHCarstatus = o.data.status; // mIsWork = mOCHRHCarstatus.status == 1; // mOCHRHCarstatus.status = status; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index d78518eaad..ad814460dd 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -385,6 +385,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i @Override public void onOperationChanged(boolean launch) { + Logger.e(TAG,"onOperationChanged:"+ launch); isOperationStatus = launch; if ( launch ) { tvOperationStatus.setText( "收车" ); diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index 66ae400e43..c369dc9da8 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -20,7 +20,6 @@ android:text="自动驾驶" android:textColor="@color/module_mogo_och_autopilot_text_color_normal" android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" - android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> @@ -50,7 +49,7 @@ android:text="出车" android:textAlignment="center" android:textColor="@color/module_mogo_och_autopilot_text_color_selector" - android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" + android:textSize="@dimen/module_mogo_och_operation_status_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" /> diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml index 96770d26e2..44445885c1 100644 --- a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -21,10 +21,10 @@ 460px 140px - 140px - 140px + 120px + 120px - 92px + 83px 30px 466px @@ -32,7 +32,8 @@ - 49px + 46px + 36px 13px 12px 350px From 6078cc20f4762ca41d7b99ad87fdabce81a4cf38 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 21 Jun 2021 18:36:29 +0800 Subject: [PATCH 5/7] change UI --- .idea/runConfigurations.xml | 1 - .../src/main/res/drawable/v2x_refresh_button_bg.xml | 2 +- .../src/main/res/layout/item_v2x_see_crossroad_live_video.xml | 2 +- .../src/main/res/layout/view_video_layout_see_crossroad.xml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml index e497da9998..7f68460d8b 100644 --- a/.idea/runConfigurations.xml +++ b/.idea/runConfigurations.xml @@ -3,7 +3,6 @@