From 2470596a35d65bf444c3075f156783de7d4b079f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 20 Nov 2020 11:28:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9M1=E4=BD=8E=E9=85=8D=E8=BD=A6=E6=9C=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=99=90=E5=88=B6=20//=20=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=89=93=E7=94=B5=E8=AF=9D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=20//=20=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20//=20=E4=B8=8D=E5=B1=95=E7=A4=BAUGC?= =?UTF-8?q?=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/holder/V2XOtherSeekHelpVH.java | 67 ++++++++++--------- .../v2x/adapter/holder/V2XRoadEventVH.java | 39 ++++++----- .../V2XScenarioHistoryOtherSeekHelpVH.java | 59 ++++++++-------- .../mogo/module/v2x/alarm/V2XAlarmServer.java | 9 ++- 4 files changed, 97 insertions(+), 77 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 18aeb96303..97fa75bc3a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -134,41 +134,46 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { } catch (Exception e) { e.printStackTrace(); } - ivHead.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - triggerIVReportHead(mNoveltyInfo); - } - }); - // 只有自研车机才会 有车聊聊通话 - if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { - // 判断是否可以打电话 - ChartingUtil.isCanCall(b -> { - if (b) { - // 判断是否可以打电话 - ChartingUtil.isOnLine(mV2XPushMessageEntity.getSn(), b1 -> { - if (b1) { - ivCall.setVisibility(VISIBLE); - } else { - ivCall.setVisibility(GONE); - } - }); - } else { - ivCall.setVisibility(GONE); + // M1低配车机限制 + // 不展示打电话按钮 + // 不能查看用户详情 + if (DebugConfig.isMapBased()) { + ivHead.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + triggerIVReportHead(mNoveltyInfo); } }); - - ivCall.setOnClickListener(v -> { - V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); - if (!V2XUtils.isFastClick()) { - try { - triggerCallChart(mNoveltyInfo); - } catch (Exception e) { - e.printStackTrace(); + // 只有自研车机才会 有车聊聊通话 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + // 判断是否可以打电话 + ChartingUtil.isCanCall(b -> { + if (b) { + // 判断是否可以打电话 + ChartingUtil.isOnLine(mV2XPushMessageEntity.getSn(), b1 -> { + if (b1) { + ivCall.setVisibility(VISIBLE); + } else { + ivCall.setVisibility(GONE); + } + }); + } else { + ivCall.setVisibility(GONE); } - } - }); + }); + + ivCall.setOnClickListener(v -> { + V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); + if (!V2XUtils.isFastClick()) { + try { + triggerCallChart(mNoveltyInfo); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } } try { if (!TextUtils.isEmpty(mV2XPushMessageEntity.getHeadImgUrl())) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index d9448a9c36..85c7effcc5 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -376,23 +376,28 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { // 重新设置用户信息 mNoveltyInfo.setUserInfo(mUserInfo); - // 只有自研车机才会 有车聊聊通话 - if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { - // 判断是否可以打电话 - ChartingUtil.isCanCall(b -> { - if (b) { - // 判断是否可以打电话 - ChartingUtil.isOnLine(mUserInfo.getSn(), b1 -> { - if (b1) { - ivEventCallChart.setVisibility(VISIBLE); - } else { - ivEventCallChart.setVisibility(GONE); - } - }); - } else { - ivEventCallChart.setVisibility(GONE); - } - }); + // M1低配车机限制 + // 不展示打电话按钮 + // 不能查看用户详情 + if (DebugConfig.isMapBased()) { + // 只有自研车机才会 有车聊聊通话 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + // 判断是否可以打电话 + ChartingUtil.isCanCall(b -> { + if (b) { + // 判断是否可以打电话 + ChartingUtil.isOnLine(mUserInfo.getSn(), b1 -> { + if (b1) { + ivEventCallChart.setVisibility(VISIBLE); + } else { + ivEventCallChart.setVisibility(GONE); + } + }); + } else { + ivEventCallChart.setVisibility(GONE); + } + }); + } } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java index 06ebd14159..21dc4ef7f6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java @@ -122,34 +122,39 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder { - if (b) { - // 判断是否可以打电话 - ChartingUtil.isOnLine(xPushMessageEntity.getSn(), b1 -> { - if (b1) { - mIvFaultHelpEventCall.setVisibility(VISIBLE); - } else { - mIvFaultHelpEventCall.setVisibility(GONE); - } - }); - } else { - mIvFaultHelpEventCall.setVisibility(GONE); - } - }); - - mIvFaultHelpEventCall.setOnClickListener(v -> { - if (!V2XUtils.isFastClick()) { - V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); - try { - triggerCallChart(mNoveltyInfo); - } catch (Exception e) { - e.printStackTrace(); + // M1低配车机限制 + // 不展示打电话按钮 + // 不能查看用户详情 + if (DebugConfig.isMapBased()) { + // 只有自研车机才会 有车聊聊通话 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + // 判断是否可以打电话 + ChartingUtil.isCanCall(b -> { + if (b) { + // 判断是否可以打电话 + ChartingUtil.isOnLine(xPushMessageEntity.getSn(), b1 -> { + if (b1) { + mIvFaultHelpEventCall.setVisibility(VISIBLE); + } else { + mIvFaultHelpEventCall.setVisibility(GONE); + } + }); + } else { + mIvFaultHelpEventCall.setVisibility(GONE); } - } - }); + }); + + mIvFaultHelpEventCall.setOnClickListener(v -> { + if (!V2XUtils.isFastClick()) { + V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); + try { + triggerCallChart(mNoveltyInfo); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } } } catch (Exception e) { e.printStackTrace(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java index 29ac85eb49..269912b53c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java @@ -2,6 +2,7 @@ package com.mogo.module.v2x.alarm; import android.text.TextUtils; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.map.search.geo.IMogoGeoSearchListener; @@ -69,8 +70,12 @@ public class V2XAlarmServer { CopyOnWriteArrayList v2XRoadEventEntityList, MogoLocation currentLocation) { try { - // 检测道路事件是否需UGC问答 - V2XEarlyWarningServer.roadEventUgcCheck(currentLocation); + // M1低配车机限制 + // 不展示UGC问答 + if (DebugConfig.isMapBased()) { + // 检测道路事件是否需UGC问答 + V2XEarlyWarningServer.roadEventUgcCheck(currentLocation); + } // Logger.w(MODULE_NAME, "V2X预警--车辆状态：" + currentLocation); // Logger.w(MODULE_NAME, "V2X预警--车辆速度：" + currentLocation.getSpeed()); // Logger.w(MODULE_NAME, "V2X预警--v2XRoadEventEntityList：" + GsonUtil.jsonFromObject(v2XRoadEventEntityList));