From 3b3060d28bd3fb8e713d88b8151b8e75bcaa8bc4 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 29 Jul 2022 10:42:34 +0800 Subject: [PATCH 01/28] =?UTF-8?q?[290=20bus]=201=E3=80=81=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=88=B0=E7=AB=99=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/model/BusOrderModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index 541dcaf7e4..bd63e699c0 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -392,10 +392,10 @@ public class BusOrderModel { //根据围栏判断，是否到达起点 private void judgeStartStation(Location location) { - if (backgroundCurrentStationIndex -1 < 0 || backgroundCurrentStationIndex > stationList.size()-1){ + if (backgroundCurrentStationIndex +1 > stationList.size() - 1 ){ return; } - BusStationBean upcomingStation = stationList.get( backgroundCurrentStationIndex); + BusStationBean upcomingStation = stationList.get( backgroundCurrentStationIndex +1); double startLon = upcomingStation.getGcjLon(); double startLat = upcomingStation.getGcjLat(); From 800b7925dc1e9a91ada7ac0b90dcbfc8710f4358 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 29 Jul 2022 11:01:26 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/map/AMapViewWrapper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 0eeb26891a..a9cfa407f8 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -646,8 +646,10 @@ public class AMapViewWrapper implements IMogoMapView, */ @Override public void setCarLightsType(int type, int time) { - Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); - mMapView.getMapAutoViewHelper().setTailLightsType(type, time); + if (checkAMapView()) { + Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); + mMapView.getMapAutoViewHelper().setTailLightsType(type, time); + } } @Override From 3db11637242530451c034edc1eff47d59b68807c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 29 Jul 2022 11:08:01 +0800 Subject: [PATCH 03/28] =?UTF-8?q?[290=20]=20bus=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?UI=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/bus_p_base_fragment.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index 177cea6b79..d2a9d7ce32 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -8,7 +8,7 @@ android:id="@+id/steering_wheel" android:layout_width="@dimen/dp_490" android:layout_height="@dimen/dp_490" - android:layout_marginLeft="@dimen/dp_22" + android:layout_marginLeft="@dimen/dp_50" android:layout_marginTop="@dimen/dp_88" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> From 42d3c94894984931c23165006fd612f37fb69728 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 29 Jul 2022 11:40:05 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/map/AMapViewWrapper.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index a9cfa407f8..fb7cb4b3d4 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -506,7 +506,9 @@ public class AMapViewWrapper implements IMogoMapView, @Override public MogoLatLng getWindowCenterLocation() { try { - return ObjectUtils.fromAMap(mMapView.getMapAutoViewHelper().getCenter()); + if (checkAMapView()) { + return ObjectUtils.fromAMap(mMapView.getMapAutoViewHelper().getCenter()); + } } catch (Exception e) { e.printStackTrace(); } @@ -813,16 +815,18 @@ public class AMapViewWrapper implements IMogoMapView, public void onMapLoaded() { CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapLoaded: "); mMapLoaded = true; - CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); - Trace.beginSection("timer.onCameraChangeFinish"); - MogoMapListenerHandler.getInstance().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()), - cameraPosition.getZoom(), - cameraPosition.getTilt(), - cameraPosition.getBearing()); - Trace.endSection(); - initMapView(); - initMyLocation(); - loadPreVehicleModel(); + if (checkAMapView()) { + CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); + Trace.beginSection("timer.onCameraChangeFinish"); + MogoMapListenerHandler.getInstance().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()), + cameraPosition.getZoom(), + cameraPosition.getTilt(), + cameraPosition.getBearing()); + Trace.endSection(); + initMapView(); + initMyLocation(); + loadPreVehicleModel(); + } } @Override @@ -1039,7 +1043,9 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setMapDAngle(float angle) { - mMapView.getMapAutoViewHelper().setMapDAngle(angle); + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setMapDAngle(angle); + } } @Override From 6386fbbf5d6c9ef3bea65440f1394873283b9800 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 29 Jul 2022 12:14:02 +0800 Subject: [PATCH 05/28] fix bug of ui causing anr --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 14 ++-- .../hmi/ui/widget/TapPositionView.java | 2 - .../hmi/ui/widget/TrafficDataView.java | 68 +++++++++---------- .../core/data/deva/chain/ChainConstant.kt | 1 + 4 files changed, 44 insertions(+), 41 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index 83dbe41e04..4e0ed275d8 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_C import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT @@ -374,14 +375,19 @@ class MoGoAdasListenerImpl : OnAdasListener { } } + //状态查询应答 +// @ChainLog( +// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, +// linkCode = CHAIN_LINK_ADAS, +// endpoint = PAD, +// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP, +// paramIndexes = [0, 1], +// clientPkFileName = "sn" +// ) override fun onStatusQueryResp( header: MessagePad.Header?, statusInfo: SystemStatusInfo.StatusInfo? ) { - //状态查询应答 - statusInfo?.let { - Log.d(TAG, GsonUtil.jsonFromObject(it)) - } invokeAutopilotStatusRespByQuery(statusInfo) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java index 246cd5bcb2..1aa4b012c2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java @@ -35,7 +35,6 @@ public class TapPositionView extends ConstraintLayout { public TapPositionView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - Log.d(TAG, "2"); LayoutInflater.from(context).inflate(R.layout.hmi_tap_position, this); tabP = findViewById(R.id.tap_p); tabR = findViewById(R.id.tap_r); @@ -48,7 +47,6 @@ public class TapPositionView extends ConstraintLayout { if (tabP != null && tabR != null && tabN != null && tabD != null) { int defaultColor = typedArray.getColor(R.styleable.TapPositionView_defaultColor, -1); int selectColor = typedArray.getColor(R.styleable.TapPositionView_selectColor, -1); - Log.d(TAG, "gear:" + gear); switch (gear) { case GEAR_NONE: tabP.setTextColor(defaultColor); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java index f1ad3626c2..c79c9a0ae2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java @@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateList import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager; import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import org.jetbrains.annotations.NotNull; @@ -76,7 +77,9 @@ public class TrafficDataView extends ConstraintLayout { */ @Override public void onAutopilotLightSwitchData(@org.jetbrains.annotations.Nullable Chassis.LightSwitch lightSwitch) { - Log.d(TAG, "车辆转向灯:" + lightSwitch.toString()); + if(lightSwitch != null){ + CallerLogger.INSTANCE.d(TAG, "车辆转向灯:" + lightSwitch.toString()); + } } /** @@ -85,7 +88,7 @@ public class TrafficDataView extends ConstraintLayout { */ @Override public void onAutopilotBrakeLightData(boolean brakeLight) { - Log.d(TAG, "刹车灯:" + String.valueOf(brakeLight)); + CallerLogger.INSTANCE.d(TAG, "刹车灯:" + brakeLight); } /** @@ -94,18 +97,11 @@ public class TrafficDataView extends ConstraintLayout { */ @Override public void onAutopilotSteeringData(float steering) { - Log.d(TAG, "steering原始值====" + String.valueOf(steering)); + CallerLogger.INSTANCE.d(TAG, "steering原始值====" + steering); if (Math.abs(steering) < 1) { steering = 0; } - float steeringValue = steering; - ThreadUtils.runOnUiThread(new Runnable() { - @Override - public void run() { - Log.d(TAG, "steering忽略小数点后====" + String.valueOf((int) steeringValue)); - } - }); - + CallerLogger.INSTANCE.d(TAG, "steering忽略小数点后====" + (int) steering); } /** @@ -114,16 +110,12 @@ public class TrafficDataView extends ConstraintLayout { */ @Override public void onAutopilotGearData(@NotNull Chassis.GearPosition gear) { - ThreadUtils.runOnUiThread(new Runnable() { - @Override - public void run() { - Log.d(TAG, "司机屏档位" + gear.toString()); - if (tapPositionView != null) { - tapPositionView.updateWithGear(gear); - } + CallerLogger.INSTANCE.d(TAG, "司机屏档位" + gear.toString()); + ThreadUtils.runOnUiThread(() -> { + if (tapPositionView != null) { + tapPositionView.updateWithGear(gear); } }); - } @Override @@ -133,30 +125,36 @@ public class TrafficDataView extends ConstraintLayout { @Override public void onAutopilotAcc(float carAcc) { - Log.d(TAG, "司机屏加速度:" + carAcc); - java.text.DecimalFormat myformat = new java.text.DecimalFormat("0.00"); - String accStr = myformat.format(carAcc); - accTextView.setText("a: " + String.valueOf(accStr)); + CallerLogger.INSTANCE.d(TAG, "司机屏加速度:" + carAcc); + ThreadUtils.runOnUiThread(() -> { + java.text.DecimalFormat mFormat = new java.text.DecimalFormat("0.00"); + String accStr = mFormat.format(carAcc); + accTextView.setText("a: " + accStr); + }); } @Override public void onAutopilotBrake(float brake) { - Log.d(TAG, "刹车:" + String.valueOf(brake)); - if (brake > 0){ - brakeStatus.setImageResource(R.drawable.traffic_data_brake); - }else { - brakeStatus.setImageResource(R.drawable.traffic_data_empty); - } + CallerLogger.INSTANCE.d(TAG, "刹车:" + brake); + ThreadUtils.runOnUiThread(() -> { + if (brake > 0) { + brakeStatus.setImageResource(R.drawable.traffic_data_brake); + } else { + brakeStatus.setImageResource(R.drawable.traffic_data_empty); + } + }); } @Override public void onAutopilotThrottle(float throttle) { - Log.d(TAG, "油门:" + String.valueOf(throttle)); - if (throttle > 0){ - brakeStatus.setImageResource(R.drawable.traffic_data_accelerator); - }else { - brakeStatus.setImageResource(R.drawable.traffic_data_empty); - } + CallerLogger.INSTANCE.d(TAG, "油门:" + throttle); + ThreadUtils.runOnUiThread(() -> { + if (throttle > 0) { + brakeStatus.setImageResource(R.drawable.traffic_data_accelerator); + } else { + brakeStatus.setImageResource(R.drawable.traffic_data_empty); + } + }); } }; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index d08ccfb392..7d18003de7 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -42,6 +42,7 @@ class ChainConstant { const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE = "PAD_ADAS_MESSAGE_AUTOPILOT_VEHICLE" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT = "PAD_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS = "CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS" + const val CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP = "CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN = "PAD_ADAS_MESSAGE_AUTOPILOT_WARN" const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL" From 5dbc7d33eed500c6e5a55be97027b5fa071605a6 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Fri, 29 Jul 2022 13:56:52 +0800 Subject: [PATCH 06/28] BadCase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复上传语音文件监听造成的内存泄漏 --- .../badcase/biz/InitiativeBadCaseWindow.kt | 18 +++++++++++++++++ .../badcase/biz/PassiveBadCaseWindow.kt | 20 +++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 68670208ff..ef5e535cba 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -27,6 +27,7 @@ import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String import com.zhidao.loglib.call.LogInfoManagerFactory import com.zhidao.loglib.upload.OnUploadListener +import com.zhidao.loglib.upload.UploadManager import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import com.zhjt.mogo_core_function_devatools.badcase.record.RecordManager @@ -247,12 +248,16 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList object : OnUploadListener { override fun onUploadSuccess(filePath: String, downloadUrl: String) { CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") + //将语音文件上传Cos监听移除 + removeUploadListener(singlePath) //上传到服务器 upload(downloadUrl) } override fun onUploadFail(filePath: String) { TipToast.shortTip("上传语音文件失败") + //将语音文件上传Cos监听移除 + removeUploadListener(singlePath) } }) }else{ @@ -261,6 +266,19 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList } } + /** + * 将语音文件上传Cos监听移除 + * @param filePath 文件路径 + */ + private fun removeUploadListener(filePath: String){ + val pkgInfo: List = filePath.substring( + filePath.lastIndexOf("/") + 1, + filePath.lastIndexOf(".") + ).split("_") + val pkgName = if (pkgInfo.size == 3) pkgInfo[1] else "" + UploadManager.getInstance().removeUploadListener(pkgName) + } + /** * 将记录上传到服务器 * @param downloadUrl 语音文件下载地址 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 55693b0086..3a68cd603a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -17,7 +17,6 @@ import com.google.android.flexbox.FlexboxLayout import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener -import androidx.lifecycle.lifecycleScope import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA @@ -35,7 +34,7 @@ import com.zhjt.mogo_core_function_devatools.badcase.record.RecordManager import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import mogo.telematics.pad.MessagePad -import com.mogo.eagle.core.utilcode.kotlin.* +import com.zhidao.loglib.upload.UploadManager import java.io.File import java.lang.reflect.Field @@ -198,12 +197,16 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene object : OnUploadListener { override fun onUploadSuccess(filePath: String, downloadUrl: String) { CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") + //将语音文件上传Cos监听移除 + removeUploadListener(singlePath) //上传到服务器 upload(downloadUrl) } override fun onUploadFail(filePath: String) { TipToast.shortTip("上传语音文件失败") + //将语音文件上传Cos监听移除 + removeUploadListener(singlePath) } }) }else{ @@ -212,6 +215,19 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene } } + /** + * 将语音文件上传Cos监听移除 + * @param filePath 文件路径 + */ + private fun removeUploadListener(filePath: String){ + val pkgInfo: List = filePath.substring( + filePath.lastIndexOf("/") + 1, + filePath.lastIndexOf(".") + ).split("_") + val pkgName = if (pkgInfo.size == 3) pkgInfo[1] else "" + UploadManager.getInstance().removeUploadListener(pkgName) + } + /** * 将记录上传到服务器 * @param downloadUrl 语音文件下载地址 From 869cac6295256844e885e56bc0f9376fdc58150e Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 29 Jul 2022 14:12:02 +0800 Subject: [PATCH 07/28] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E5=B0=86?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91=E7=A7=BB=E5=88=B0=E5=86=85?= =?UTF-8?q?=E9=83=A8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 4 +--- .../function/call/devatools/CallerDevaToolsManager.kt | 10 ++++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 7025a4af6c..268eaaf089 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -207,9 +207,7 @@ import java.util.* setViewNotificationProvider(this) context?.also { - if (!AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - CallerDevaToolsManager.showStatusBar(it) - } + CallerDevaToolsManager.showStatusBar(it) } } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index 43004026ef..f4baa19770 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -3,12 +3,14 @@ package com.mogo.eagle.core.function.call.devatools import android.app.Activity import android.content.Context import android.view.View +import com.mogo.eagle.core.data.config.* import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider import com.mogo.eagle.core.function.call.base.CallerBase +import com.mogo.eagle.core.utilcode.mogo.* import record_cache.RecordPanelOuterClass object CallerDevaToolsManager { @@ -149,13 +151,17 @@ object CallerDevaToolsManager { * 展示状态栏 */ fun showStatusBar(ctx: Context) { - devaToolsProviderApi?.showStatusBar(ctx) + if (!AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + devaToolsProviderApi?.showStatusBar(ctx) + } } /** * 隐藏状态栏 */ fun hideStatusBar() { - devaToolsProviderApi?.hideStatusBar() + if (!AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + devaToolsProviderApi?.hideStatusBar() + } } } \ No newline at end of file From b373c139934238151c6d1ac123e4236d0294e393 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 29 Jul 2022 14:17:06 +0800 Subject: [PATCH 08/28] add chain log of statusQuery resp --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index 4e0ed275d8..89d4d63f22 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -376,14 +376,14 @@ class MoGoAdasListenerImpl : OnAdasListener { } //状态查询应答 -// @ChainLog( -// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, -// linkCode = CHAIN_LINK_ADAS, -// endpoint = PAD, -// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP, -// paramIndexes = [0, 1], -// clientPkFileName = "sn" -// ) + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, + linkCode = CHAIN_LINK_ADAS, + endpoint = PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP, + paramIndexes = [0, 1], + clientPkFileName = "sn" + ) override fun onStatusQueryResp( header: MessagePad.Header?, statusInfo: SystemStatusInfo.StatusInfo? From d126a67355caec0d4e6ea7de3e228c28cd6ba427 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 29 Jul 2022 15:04:09 +0800 Subject: [PATCH 09/28] fix bug of p --- .../eagle/core/function/hmi/ui/widget/TapPositionView.java | 3 +++ .../src/main/res/layout/hmi_tap_position.xml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java index 1aa4b012c2..c8de687a2a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java @@ -41,6 +41,9 @@ public class TapPositionView extends ConstraintLayout { tabN = findViewById(R.id.tap_n); tabD = findViewById(R.id.tap_d); typedArray = context.obtainStyledAttributes(attrs, R.styleable.TapPositionView); + if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)){ + tabP.setVisibility(View.GONE); + } } public void updateWithGear(@NotNull Chassis.GearPosition gear) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml index a2a8beedd6..263bee811c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml @@ -15,7 +15,6 @@ android:textColor="@color/p_default_txt_color" android:textSize="@dimen/dp_46" android:textStyle="bold" - android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/tap_r" From 98d3b4099be40e0094bcb3f76f909dbab88ae705 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 29 Jul 2022 15:24:18 +0800 Subject: [PATCH 10/28] =?UTF-8?q?[290=20taxi=E4=B9=98=E5=AE=A2=E5=B1=8F]?= =?UTF-8?q?=20=E5=BC=80=E5=A7=8B=E8=A1=8C=E7=A8=8B=E9=A1=B5=E5=86=85?= =?UTF-8?q?=E5=AD=98=E6=B3=84=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/TaxiPassengerStartAutopilotView.java | 39 ++++++++++--------- .../layout/taxi_p_start_autopilot_view.xml | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java index 41146e5982..5d8aba7836 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java @@ -37,8 +37,9 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V private static final long TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L; private Context mContext; private View view; - private FrameSurfaceView svCarStartingFrame; private AnimatorDrawableUtil mAnimationDrawable ; + private AnimatorDrawableUtil mCarAnimationDrawable ; + private ImageView mCarIv; private Integer[] startingAnimIds = new Integer[]{ R.drawable.light_00000, R.drawable.light_00001, @@ -98,6 +99,7 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V mCloseIV.setOnClickListener(this); mAutopilotBtnBg = view.findViewById(R.id.taxi_p_autopilot_btn_bg); + mCarIv = view.findViewById(R.id.taxi_p_autopilot_starting); initBtnAnimatonDrawable(); @@ -105,9 +107,8 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V } private void initCarStartingFrame() { - svCarStartingFrame = view.findViewById(R.id.taxi_p_autopilot_starting); - svCarStartingFrame.setBitmapIds(Arrays.asList(startingAnimIds)); - svCarStartingFrame.setDuration(1300); + mCarAnimationDrawable = new AnimatorDrawableUtil(); + mCarAnimationDrawable.setAnimation(mCarIv,Arrays.asList(startingAnimIds)); } private void initBtnAnimatonDrawable() { @@ -143,8 +144,8 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V @SuppressLint("UseCompatLoadingForDrawables") public void handleStartAutopilotBtnStatus(boolean isClickable){ - if (svCarStartingFrame != null){ - svCarStartingFrame.setBackgroundResource(R.drawable.light_00000); + if (mCarIv != null){ + mCarIv.setBackgroundResource(R.drawable.light_00000); } if (mStartAutopilotBtn == null) return; @@ -178,7 +179,7 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V if (isStart){ if (mAnimationDrawable == null){ - + initBtnAnimatonDrawable(); } if (mAnimationDrawable != null){ mAnimationDrawable.start(true, 30, null); @@ -189,17 +190,18 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V } private void startingCarBgAnimatorDrawable(boolean isStart){ - if (isStart && svCarStartingFrame != null){ - svCarStartingFrame.setRepeatTimes(-1); - svCarStartingFrame.setBackground(null); - svCarStartingFrame.start(); - }else { - if (svCarStartingFrame != null){ - svCarStartingFrame.reset(); - svCarStartingFrame.setBackgroundResource(R.drawable.light_00000); + if (isStart){ + if (mCarAnimationDrawable == null){ + initCarStartingFrame(); } + mCarIv.setBackgroundResource(0); + mCarAnimationDrawable.start(true,40, null); + }else { + if (mCarAnimationDrawable != null){ + mCarAnimationDrawable.stop(); + } + mCarIv.setBackgroundResource(R.drawable.light_00000); } - } public void startOrStopLoadingAnim(boolean start) { @@ -234,10 +236,9 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V } public void clearStartingAnimFrame(){ - if (svCarStartingFrame != null){ - svCarStartingFrame.destroy(); + if (mCarAnimationDrawable != null){ + mCarAnimationDrawable.stop(); } - svCarStartingFrame = null; } public void onAutopilotStatusSuccess(){ startOrStopLoadingAnim(false); diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml index aefbd0fe6d..3416786abb 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml @@ -7,7 +7,7 @@ android:background="@drawable/taxi_p_passenger_start_panel_bg" tools:ignore="MissingDefaultResource"> - Date: Fri, 29 Jul 2022 17:42:19 +0800 Subject: [PATCH 11/28] =?UTF-8?q?Android=2010=E7=B3=BB=E7=BB=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-v29/taxi_video_order_process.xml | 26 +++++++++++++++++++ .../drawable-v29/taxi_video_seekbar_style.xml | 26 +++++++++++++++++++ .../res/drawable/taxi_video_order_process.xml | 2 +- .../res/drawable/taxi_video_seekbar_style.xml | 2 +- 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml new file mode 100644 index 0000000000..7575e2073b --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml new file mode 100644 index 0000000000..aa3e77ed6e --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml index b3c6d5d088..44c6941d9c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml @@ -17,7 +17,7 @@ - + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml index 597931f974..203d9a5332 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml @@ -17,7 +17,7 @@ - + From 70c1fb7071fd4f7c6c57e6e87f200dae53c88ed4 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 29 Jul 2022 17:56:49 +0800 Subject: [PATCH 12/28] =?UTF-8?q?[290=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF]=20?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E5=87=BA=E5=8F=91=E6=8C=89=E9=92=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/bus/view/SlidePanelView.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java index 1433e8e88e..8d4b8046cd 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java @@ -85,6 +85,7 @@ public class SlidePanelView extends View { private LinearGradient textGradient; private ObjectAnimator matrixAnim; + private ObjectAnimator blockBackanimator; private String blockText = STRING_SLIDE_TO_RIGHT; private Paint.FontMetrics blockTextMetrics = new Paint.FontMetrics(); @@ -239,10 +240,10 @@ public class SlidePanelView extends View { } private void startBlockBackAnim() { - ObjectAnimator animator = ObjectAnimator.ofInt(this, "blockOffset", blockOffset, 0); - animator.setInterpolator(new DecelerateInterpolator()); - animator.setDuration(1000 * blockOffset / getWidth()); - animator.start(); + blockBackanimator = ObjectAnimator.ofInt(this, "blockOffset", blockOffset, 0); + blockBackanimator.setInterpolator(new DecelerateInterpolator()); + blockBackanimator.setDuration(1000 * blockOffset / getWidth()); + blockBackanimator.start(); lastX = 0; } From a3c072fed3e2930a83cdc25d1aac8de4d814a41c Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 29 Jul 2022 20:05:25 +0800 Subject: [PATCH 13/28] =?UTF-8?q?[EnvChange]=E4=BC=98=E5=8C=96=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E5=85=A5=E5=8F=A3=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../env/EnvChangeManager.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt index ebbcc2ee06..a0058e016e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt @@ -33,9 +33,7 @@ object EnvChangeManager { fun getCityName(): String { val cache = getConfig() return if (cache == null) { - val cityCode = CallerMapLocationListenerManager.getCurrentLocation()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010" - updateCityCode(cityCode) - when(cityCode) { + when(CallerMapLocationListenerManager.getCurrentLocation()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") { "010" -> "北京" "0734" -> "衡阳" else -> "未知" @@ -51,17 +49,15 @@ object EnvChangeManager { fun getNetMode(): String { val cache = getConfig() - if (cache == null) { - val mode = DebugConfig.getNetMode() - updateNetMode(mode) - return when(mode) { + return if (cache == null) { + when(DebugConfig.getNetMode()) { DebugConfig.NET_MODE_RELEASE -> "生产" DebugConfig.NET_MODE_QA -> "测试" DebugConfig.NET_MODE_DEMO -> "演示" else -> "未知" } } else { - return when(cache.second) { + when(cache.second) { DebugConfig.NET_MODE_RELEASE -> "生产" DebugConfig.NET_MODE_QA -> "测试" DebugConfig.NET_MODE_DEMO -> "演示" From a9b53357bcaaf1231e9ab55dfd1b6013e77ac3f9 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Sun, 31 Jul 2022 16:03:01 +0800 Subject: [PATCH 14/28] =?UTF-8?q?[290=20bus/taxi=E7=AB=AF]=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/presenter/BaseBusPassengerPresenter.java | 3 ++- .../mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java | 1 - .../src/main/java/com/mogo/och/bus/view/SlidePanelView.java | 3 +-- .../presenter/TaxiPassengerServingOrderPresenter.java | 3 ++- .../taxi/passenger/ui/TaxiPassengerServingOrderFragment.java | 2 -- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index 17adaf85d7..3173247834 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -137,7 +137,8 @@ public class BaseBusPassengerPresenter extends Presenter models, int haveArrivedIndex) { - runOnUIThread(() -> mView.routeResult(models,haveArrivedIndex)); + CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size()); + mView.routeResult(models,haveArrivedIndex); } @Override diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index 74357b47fd..a3ea8e9ebe 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -142,7 +142,6 @@ public class BusPassengerRouteFragment extends } public void routeResult(List latLngList,int haveArrivedIndex) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + latLngList.size()); if (latLngList.size() > 0) { drawablePolyline(latLngList,haveArrivedIndex); } else { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java index 8d4b8046cd..b9bb0b0c18 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java @@ -85,7 +85,6 @@ public class SlidePanelView extends View { private LinearGradient textGradient; private ObjectAnimator matrixAnim; - private ObjectAnimator blockBackanimator; private String blockText = STRING_SLIDE_TO_RIGHT; private Paint.FontMetrics blockTextMetrics = new Paint.FontMetrics(); @@ -240,7 +239,7 @@ public class SlidePanelView extends View { } private void startBlockBackAnim() { - blockBackanimator = ObjectAnimator.ofInt(this, "blockOffset", blockOffset, 0); + ObjectAnimator blockBackanimator = ObjectAnimator.ofInt(this, "blockOffset", blockOffset, 0); blockBackanimator.setInterpolator(new DecelerateInterpolator()); blockBackanimator.setDuration(1000 * blockOffset / getWidth()); blockBackanimator.start(); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java index 4105a50e3c..da983b4303 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java @@ -77,7 +77,8 @@ public class TaxiPassengerServingOrderPresenter extends Presenter models, int haveArrivedIndex) { if (models == null) return; - runOnUIThread(() -> mView.routeResultByServer(models,haveArrivedIndex)); + CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + models.size()); + mView.routeResultByServer(models,haveArrivedIndex); } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java index 1232fbaf33..e15ffbf4b0 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java @@ -22,7 +22,6 @@ import androidx.fragment.app.FragmentTransaction; import com.amap.api.maps.model.LatLng; import com.mogo.commons.mvp.MvpFragment; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; @@ -229,7 +228,6 @@ public class TaxiPassengerServingOrderFragment extends } public void routeResultByServer(List latLngList,int haveArrivedIndex) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + latLngList.size()); if (latLngList.size() > 0) { drawablePolylineByServerRoute(latLngList,haveArrivedIndex); } else { From b1852c201681e324b635b1eb3b2285d0bb8f3c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cdonghongyu-mackbook=E2=80=9D?= Date: Mon, 1 Aug 2022 10:37:50 +0800 Subject: [PATCH 15/28] =?UTF-8?q?[Change]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=A0=E5=85=A5=E5=9C=B0=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “donghongyu-mackbook” --- .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index fb7cb4b3d4..63bc02bfdd 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -1001,7 +1001,7 @@ public class AMapViewWrapper implements IMogoMapView, bean.setAcceleration(gnssInfo.getAcceleration()); bean.setAlt(gnssInfo.getAltitude()); bean.setSystemTime(Double.valueOf(gnssInfo.getSystemTime()).longValue()); - bean.setSatelliteTime(Double.valueOf(gnssInfo.getSatelliteTime()).longValue()); + bean.setSatelliteTime(Double.valueOf(gnssInfo.getSatelliteTime()*1000).longValue()); bean.setLon(gnssInfo.getLongitude()); bean.setLat(gnssInfo.getLatitude()); bean.setGnss_speed(((float) gnssInfo.getGnssSpeed())); From 57fab01347f6cda6330b3aaf1fd681bc9506ac54 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 1 Aug 2022 11:12:26 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/autopilot/adapter/MoGoHandAdasMsgManager.java | 3 +-- .../appupgrade/network/UpgradeAppNetWorkManager.java | 2 +- .../eagle/core/function/bindingcar/BindingcarProvider.java | 4 ++-- .../bindingcar/network/BindingcarNetWorkManager.java | 6 +++--- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 2 -- .../src/main/java/com/mogo/map/AMapViewWrapper.java | 2 +- .../mogo/test/crashreport/apm/ApmCrashReportProvider.java | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index 00962377ac..e3346498b9 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -105,9 +105,8 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { - Log.d("liyz", "onAutopilotCarConfig carConfigResp "); if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { - Log.d("liyz", "carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); +// Log.d("liyz", "carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress(), MoGoAiCloudClientConfig.getInstance().getSn()); } } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index 389c7ef1c2..7a53bd9385 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -80,7 +80,7 @@ public class UpgradeAppNetWorkManager { @Override public void onNext(@NonNull UpgradeAppInfo info) { if (info != null && info.getData() != null && info.getData().size() > 0) { - Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); +// Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); // if (info.getData().get(0).getVersion_code() > versionCode) { diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 223a897d26..2e3783649d 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -95,7 +95,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void driverScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typeDriver", 0); - Log.d("liyz", "driverScreen --------> "); +// Log.d("liyz", "driverScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { @@ -108,7 +108,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void passengerScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typePassenger", 0); - Log.d("liyz", "passengerScreen --------> "); +// Log.d("liyz", "passengerScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index d9ea6a223b..e3fc946415 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -62,7 +62,7 @@ public class BindingcarNetWorkManager { public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) { // String macAddress = "48:b0:2d:3a:bc:78"; // String sn = "X20202203105S688HZ"; - Log.d("liyz", "macAddress = " + macAddress + "----widevineIDWithMd5 = " + widevineIDWithMd5); +// Log.d("liyz", "macAddress = " + macAddress + "----widevineIDWithMd5 = " + widevineIDWithMd5); BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.getBindingcarInfo(token, requestBody) @@ -77,7 +77,7 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); - Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); +// Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); if (info.getData().getCompare().equals("0")) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare().equals("3")) { @@ -104,7 +104,7 @@ public class BindingcarNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); - Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); +// Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 268eaaf089..2697ddad0f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -1043,7 +1043,6 @@ import java.util.* */ override fun showTurnLight(light: Int) { if (HmiBuildConfig.isShowTurnLightView) { - Log.e("liyz", "showTurnLight light = $light") ThreadUtils.runOnUiThread { if (light == 1) { if (!isLeftLight) { @@ -1083,7 +1082,6 @@ import java.util.* */ override fun showBrakeLight(light: Int) { if (HmiBuildConfig.isShowBrakeLightView) { - Log.e("liyz", "showBrakeLight isBrake = $isBrake") ThreadUtils.runOnUiThread { if (light == 1) { //刹车灯亮 if (!isBrake) { diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 63bc02bfdd..8659c81a7f 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -649,7 +649,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setCarLightsType(int type, int time) { if (checkAMapView()) { - Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); +// Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); mMapView.getMapAutoViewHelper().setTailLightsType(type, time); } } diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index 6fb8c7974e..bd6da83424 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -63,7 +63,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { String cityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE); String lat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE); String logt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE); - Log.d("liyz", "cityCode = " + cityCode + " --lat = " +lat + " --logt = " + logt); +// Log.d("liyz", "cityCode = " + cityCode + " --lat = " +lat + " --logt = " + logt); //地图版本 String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); map.put("MAP_SDK_VERSION", mapSDKVersion); From 840a9e842c3d65037955db65131d148d37e937ef Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 1 Aug 2022 12:04:07 +0800 Subject: [PATCH 17/28] =?UTF-8?q?[290=20bus/taxi]=201=E3=80=81=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E9=93=BE=E8=B7=AF=E6=97=A5=E5=BF=97=E9=87=8C=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E4=B8=94=E9=A2=91=E7=B9=81=E6=89=93=E5=8D=B0=E7=9A=84?= =?UTF-8?q?log=202=E3=80=81=E4=BF=AE=E6=94=B9bus=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E5=B0=8F=E5=9C=B0=E5=9B=BE=E4=B8=A4=E8=BE=B9=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/BusPassengerModel.java | 22 +++++++++---------- .../ui/BusPassengerMapDirectionView.java | 2 +- .../mogo/och/bus/presenter/BusPresenter.java | 2 +- .../passenger/model/TaxiPassengerModel.java | 2 +- .../com/mogo/och/taxi/model/TaxiModel.java | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index c43f715dbe..7d06ba2d26 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -301,17 +301,17 @@ public class BusPassengerModel { @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; - int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "state = %s", state ); - if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { - //2022.7.20 自动驾驶更换成带档位的 -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); - } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); - } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); - } +// if (autopilotStatusInfo == null) return; +// int state = autopilotStatusInfo.getState(); +// CallerLogger.INSTANCE.d( M_BUS_P + TAG, "state = %s", state ); +// if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { +// //2022.7.20 自动驾驶更换成带档位的 +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); +// } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); +// } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); +// } } @Override diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index 193ddd3703..b4e780ef1c 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -202,7 +202,7 @@ public class BusPassengerMapDirectionView } boundsBuilder.include(currentLatLng); //第二个参数为四周留空宽度 - mAMap.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(),50,50,50,50)); + mAMap.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(),100,100,100,100)); }else { //设置希望展示的地图缩放级别 diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index d5cb01601e..fadc4ad8d1 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -165,7 +165,7 @@ public class BusPresenter extends Presenter public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); +// CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); switch (state) { case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE: if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index 0a5042f633..43937448f5 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -505,7 +505,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); +// CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder != null diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index c9aff5714a..c5c7e2316f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1119,7 +1119,7 @@ public class TaxiModel { public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); +// CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (state != mPrevAPStatus && mADASStatusCallback != null){ mADASStatusCallback.onAutopilotRunning(); From 4afe25ef3da01edf86269af6e9bad2697dd809c8 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 1 Aug 2022 14:40:24 +0800 Subject: [PATCH 18/28] remove unuse cose --- .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 1 - .../main/java/com/mogo/och/taxi/network/TaxiServiceManager.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index c5c7e2316f..147830d57e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1119,7 +1119,6 @@ public class TaxiModel { public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); -// CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (state != mPrevAPStatus && mADASStatusCallback != null){ mADASStatusCallback.onAutopilotRunning(); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java index ce93f197b6..279623f531 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java @@ -442,7 +442,7 @@ public class TaxiServiceManager { @Override public void onSuccess(T o) { super.onSuccess(o); - CallerLogger.INSTANCE.e(M_TAXI + TAG,apiName + ": onSuccess() " + o.msg); + CallerLogger.INSTANCE.d(M_TAXI + TAG,apiName + ": onSuccess() " + o.msg); if (callback != null) { callback.onSuccess(o); } From 72cb08d7439b8658720c0d1155bd01bd6b905518 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 1 Aug 2022 14:43:47 +0800 Subject: [PATCH 19/28] remove log invoke --- .../eagle/core/function/autopilot/MoGoAutopilotProvider.kt | 1 - .../function/autopilot/adapter/MoGoHandAdasMsgManager.java | 1 - .../function/appupgrade/network/UpgradeAppNetWorkManager.java | 2 -- .../eagle/core/function/bindingcar/BindingcarProvider.java | 2 -- .../function/bindingcar/network/BindingcarNetWorkManager.java | 3 --- .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 1 - .../src/main/java/com/mogo/map/MogoMapUIController.java | 1 - .../main/java/com/mogo/map/uicontroller/AMapUIController.java | 1 - 8 files changed, 12 deletions(-) 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 1b8df636d8..76e82209f0 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 @@ -508,7 +508,6 @@ class MoGoAutopilotProvider : override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { // 乘客屏才监听 AppConfigInfo.plateNumber = carConfigResp.plateNumber -// Log.d("liyz", "onAutopilotCarConfig 乘客屏Mac地址为 = ${carConfigResp.macAddress}") CallerBindingcarManager.getBindingcarProvider() .getBindingcarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}") diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index e3346498b9..ee651b95c2 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -106,7 +106,6 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { -// Log.d("liyz", "carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress(), MoGoAiCloudClientConfig.getInstance().getSn()); } } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index 7a53bd9385..cefcdcc149 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -80,7 +80,6 @@ public class UpgradeAppNetWorkManager { @Override public void onNext(@NonNull UpgradeAppInfo info) { if (info != null && info.getData() != null && info.getData().size() > 0) { -// Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); // if (info.getData().get(0).getVersion_code() > versionCode) { @@ -92,7 +91,6 @@ public class UpgradeAppNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "UpgradeAppInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); -// Log.e("liyz", "UpgradeAppInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 2e3783649d..8a5e01ee78 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -95,7 +95,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void driverScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typeDriver", 0); -// Log.d("liyz", "driverScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { @@ -108,7 +107,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void passengerScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typePassenger", 0); -// Log.d("liyz", "passengerScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index e3fc946415..0a0fa8c38e 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -62,7 +62,6 @@ public class BindingcarNetWorkManager { public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) { // String macAddress = "48:b0:2d:3a:bc:78"; // String sn = "X20202203105S688HZ"; -// Log.d("liyz", "macAddress = " + macAddress + "----widevineIDWithMd5 = " + widevineIDWithMd5); BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.getBindingcarInfo(token, requestBody) @@ -77,7 +76,6 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); -// Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); if (info.getData().getCompare().equals("0")) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare().equals("3")) { @@ -104,7 +102,6 @@ public class BindingcarNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); -// Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 8659c81a7f..340c7ff3fd 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -649,7 +649,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setCarLightsType(int type, int time) { if (checkAMapView()) { -// Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); mMapView.getMapAutoViewHelper().setTailLightsType(type, time); } } 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 f25d1a1d89..dfd5bc2d1a 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 @@ -257,7 +257,6 @@ public class MogoMapUIController implements IMogoMapUIController { public void setCarLightsType(int type, int time) { initDelegate(); if (mDelegate != null) { -// Log.d("liyz", "MogoMapUIController type = " + type + "---time = " + time); mDelegate.setCarLightsType(type, time); } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java index ccc7018538..efba482a0e 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java @@ -223,7 +223,6 @@ public class AMapUIController implements IMogoMapUIController { @Override public void setCarLightsType(int type, int time) { -// Log.d("liyz", "AMapUIController type = " + type + "---time = " + time); if (mClient != null) { mClient.setCarLightsType(type, time); } From a592afc7947b4b1c838ab9d44f65f3a2eca53ae8 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 1 Aug 2022 14:45:18 +0800 Subject: [PATCH 20/28] remove log --- .../com/mogo/eagle/core/function/map/identify/TrackObj.java | 3 --- .../mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt | 2 -- 2 files changed, 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java index 9aeab730d7..1d91f86a50 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java @@ -116,14 +116,11 @@ public class TrackObj { lat = matchedPoint[1]; s2LatLng = S2LatLng.fromDegrees(cacheData.getLatitude(), cacheData.getLongitude()); s2CellId = S2CellId.fromLatLng(s2LatLng).parent(22); -// Log.d("hy uuid : " + cacheData.getUuid(), " 更新定位 lon : " + matchedPoint[0] + " , lat : " + matchedPoint[1]); } else { centerLineInfo = null; -// Log.d("hy uuid : " + cacheData.getUuid(), "计算结果出现问题 : " + matchedPoint[0] + " , " + matchedPoint[1]); } } else { centerLineInfo = null; -// Log.d("hy uuid : " + cacheData.getUuid(), "未获取到道路数据"); } } cacheData = cacheData.toBuilder().setLongitude(lon).setLatitude(lat).build(); 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 1e283712bb..b79d01c83f 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 @@ -395,7 +395,6 @@ class MogoPrivateObuManager private constructor() { // val currentTime = TimeUtils.getNowMills() % 60000 // val delayTime = currentTime - hvTime -// Log.e("liyz", "onCvxIvpThreatIndInfo ---> currentTime = $currentTime ----- hvTime---> $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime") // CallerObuListenerManager.invokeDelayTime(delayTime) // CallerLogger.e( // "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", @@ -423,7 +422,6 @@ class MogoPrivateObuManager private constructor() { // val currentTime = TimeUtils.getNowMills() % 60000 // val delayTime = currentTime - hvTime -// Log.e("liyz", "onCvxPtcThreatIndInfo ---> currentTime = $currentTime ----- hvTime---> $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime") // CallerObuListenerManager.invokeDelayTime(delayTime) // CallerLogger.d( // "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", From e467d244b4e5b3feb8c5442f883d753a6f3e2069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cdonghongyu-mackbook=E2=80=9D?= Date: Mon, 1 Aug 2022 15:00:59 +0800 Subject: [PATCH 21/28] =?UTF-8?q?[Change]=20A=E3=80=81=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E9=AB=98=E7=B2=BE=E5=9C=B0=E5=9B=BE=201=E3=80=81=E7=A8=B3?= =?UTF-8?q?=E5=AE=9A=E6=80=A7=EF=BC=9B=202=E3=80=81=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=EF=BC=9B=203=E3=80=81=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E7=BA=BF=E5=85=89=E6=96=91=E6=95=88=E6=9E=9C?= =?UTF-8?q?=EF=BC=9B=204=E3=80=81=E8=A1=A1=E9=98=B3=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E8=B7=AF=E4=BE=A7=E8=AE=BE=E5=A4=87=E7=BB=98=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=BA=A2=E7=BB=BF=E7=81=AF=E3=80=81=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4=E3=80=81rsu=E3=80=81mec=E3=80=81=E9=9B=B7?= =?UTF-8?q?=E8=BE=BE=EF=BC=9B=205=E3=80=81=E4=BB=96=E8=BD=A6=E9=94=9A?= =?UTF-8?q?=E7=82=B9=E9=A2=9C=E8=89=B2=E6=B8=90=E5=8F=98=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=95=88=E6=9E=9C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “donghongyu-mackbook” --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8e90bc84c3..b5a4928f9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -82,7 +82,7 @@ MOGO_LOCATION_VERSION=1.4.3.8 MOGO_TELEMATIC_VERSION=1.4.3.8 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.3.1.1 +MAP_SDK_VERSION=2.4.0.1 MAP_SDK_OPERATION_VERSION=1.0.13 # websocket WEBSOCKET_VERSION=1.1.7 From f859cd1536f6c3e15183ff86869056e18c2b7409 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 1 Aug 2022 15:09:17 +0800 Subject: [PATCH 22/28] add log manager of callchat --- .../mogo_core_function_devatools/scene/SceneManager.kt | 3 +++ .../core/function/hmi/ui/setting/DebugSettingView.kt | 10 +++++++++- .../src/main/res/layout/view_debug_setting.xml | 8 ++++++++ .../eagle/core/utilcode/mogo/logger/scene/Scene.kt | 4 ++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt index 4f2a447d0b..14f87bb3e6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.Scene.Companion.scene import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_CHAT import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP @@ -28,6 +29,7 @@ class SceneManager { companion object { private const val ADAS = "ADAS" + private const val CALLCHAT = "CALLCHAT" private const val DEVA = "DEVA" private const val HMI = "HMI" private const val OBU = "OBU" @@ -51,6 +53,7 @@ class SceneManager { init { //过滤所需条件 sceneModuleTAG.map[ADAS] = SceneModule(true, M_ADAS_IMPL) + sceneModuleTAG.map[CALLCHAT] = SceneModule(false, M_CHAT) sceneModuleTAG.map[DEVA] = SceneModule(false, M_DEVA) sceneModuleTAG.map[HMI] = SceneModule(false, M_HMI) sceneModuleTAG.map[OBU] = SceneModule(false, M_OBU) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index bd5242473c..f091f7776b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -1065,8 +1065,10 @@ class DebugSettingView @JvmOverloads constructor( val name = map.value.name val log = map.value.log when (name) { - ////ADAS日志标签 + //ADAS日志标签 SceneConstant.M_ADAS_IMPL -> cbAdasLog.isChecked = log + //CALLCHAT日志标签 + SceneConstant.M_CHAT -> cbCallChatLog.isChecked = log //OBU日志标签 SceneConstant.M_OBU -> cbObuLog.isChecked = log //HMI日志标签 @@ -1151,6 +1153,12 @@ class DebugSettingView @JvmOverloads constructor( sceneMap[SceneConstant.M_ADAS_IMPL] = adasModule CallerDevaToolsManager.updateModuleTAG(sceneMap) } + //CALLCHAT日志标签 + cbCallChatLog.setOnCheckedChangeListener { _, isChecked -> + val callChatModule = SceneModule(isChecked, SceneConstant.M_CHAT) + sceneMap[SceneConstant.M_CHAT] = callChatModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } //OBU日志标签 cbObuLog.setOnCheckedChangeListener { _, isChecked -> val obuModule = SceneModule(isChecked, SceneConstant.M_OBU) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 0478f29693..abd25fb7af 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1845,6 +1845,14 @@ android:checked="false" android:text="ADAS日志" /> + + Date: Mon, 1 Aug 2022 15:28:40 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E5=9F=9F=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E4=BF=A1=E6=81=AF=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit leading障碍物，障碍物车身红色提示；避障和择机的障碍物，障碍物车身黄色提示 --- .../map/identify/IdentifyOriginDataDrawer.kt | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/IdentifyOriginDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/IdentifyOriginDataDrawer.kt index b7b7d2fd09..1d88c5f1e3 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/IdentifyOriginDataDrawer.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/IdentifyOriginDataDrawer.kt @@ -68,11 +68,22 @@ class IdentifyOriginDataDrawer : Identify, IMoGoAutopilotStatusListener { val trackId = planningObj.uuid.toString() if (mMarkersCaches.containsKey(trackId)) { val trackObj = mMarkersCaches[trackId] - trackObj?.let { - colorTrafficData[trackId] = PlanningTrack( - "#BCB239FF", - CallerAutoPilotStatusListenerManager.getCurWgs84SatelliteTime() - ) + if(planningObj.type == 0){ + //0是leading障碍物，障碍物车身红色提示 + trackObj?.let { + colorTrafficData[trackId] = PlanningTrack( + "#D77F70FF", + CallerAutoPilotStatusListenerManager.getCurWgs84SatelliteTime() + ) + } + }else if(planningObj.type == 1){ + //1是避障和择机的障碍物，障碍物车身黄色提示 + trackObj?.let { + colorTrafficData[trackId] = PlanningTrack( + "#E4DD94FF", + CallerAutoPilotStatusListenerManager.getCurWgs84SatelliteTime() + ) + } } } } From ab2748f9b5dc55dcbcdcb9a27d3325a65b04d171 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 1 Aug 2022 15:42:38 +0800 Subject: [PATCH 24/28] =?UTF-8?q?[290=20bus/taxi=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E5=B1=8F]=20=E8=A7=A3=E5=86=B3=E5=B0=8F=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E7=BA=BF=E7=BB=98=E5=88=B6=E9=97=AA=E7=83=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/presenter/BaseBusPassengerPresenter.java | 3 ++- .../bus/passenger/ui/BusPassengerMapDirectionView.java | 3 ++- .../presenter/TaxiPassengerServingOrderPresenter.java | 3 ++- .../taxi/passenger/ui/TaxiPassengerMapDirectionView.java | 8 +------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index 3173247834..e3b32a6960 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -137,7 +137,8 @@ public class BaseBusPassengerPresenter extends Presenter models, int haveArrivedIndex) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size()); + CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size() + + " haveArrivedIndex = "+haveArrivedIndex); mView.routeResult(models,haveArrivedIndex); } diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index b4e780ef1c..bef94a28ea 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -221,6 +221,8 @@ public class BusPassengerMapDirectionView } if (mAMap != null) { + addRouteColorList(); + if (mCoordinatesLatLng.size() > 2) { //设置线段纹理 @@ -330,7 +332,6 @@ public class BusPassengerMapDirectionView mCoordinatesLatLng.clear(); mCoordinatesLatLng.addAll(latLngs); mHaveArrivedIndex = haveArrivedIndex; - addRouteColorList(); } public void clearLineMarkers(){ diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java index da983b4303..509b08514f 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java @@ -77,7 +77,8 @@ public class TaxiPassengerServingOrderPresenter extends Presenter models, int haveArrivedIndex) { if (models == null) return; - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + models.size()); + CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + models.size() + + " haveArrivedIndex = " + haveArrivedIndex); mView.routeResultByServer(models,haveArrivedIndex); } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java index d7afe97db2..73ced5eeb3 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java @@ -234,7 +234,7 @@ public class TaxiPassengerMapDirectionView } if (mAMap != null) { -// addRouteColorList(); + addRouteColorList(); if (mCoordinatesLatLng.size() > 2) { //设置线段纹理 @@ -263,11 +263,6 @@ public class TaxiPassengerMapDirectionView textureList.clear(); texIndexList.clear(); for (int i = 0; i < mCoordinatesLatLng.size(); i++){ -// if (i <= mCoordinatesLatLng.size()/2){ -// colorList.add(Color.argb(255, 31, 195, 255));//start -// }else { -// colorList.add(Color.argb(255, 87, 171, 255));//end -// } if (i <= mHaveArrivedIndex){ textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_arrived)); }else { @@ -360,7 +355,6 @@ public class TaxiPassengerMapDirectionView mCoordinatesLatLng.clear(); mCoordinatesLatLng.addAll(latLngs); mHaveArrivedIndex = haveArrivedIndex; - addRouteColorList(); } @Override From 1dee603e18472ebf0c9f6ccd68599b09c3b3ce32 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 1 Aug 2022 18:12:57 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E5=B7=A5=E6=8E=A7=E6=9C=BA=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E5=BC=B9=E7=AA=97=E5=A2=9E=E5=8A=A0Tab=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=88=87=E6=8D=A2=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/setting/IPCReportWindow.kt | 5 +++++ ...{ipc_error_tab_bg.xml => ipc_error_tab_normal_bg.xml} | 0 .../src/main/res/drawable/ipc_error_tab_select_bg.xml | 9 +++++++++ .../src/main/res/drawable/ipc_warning_tab_normal_bg.xml | 8 ++++++++ .../src/main/res/drawable/ipc_warning_tab_select_bg.xml | 8 ++++++++ .../src/main/res/layout/view_ipc_report.xml | 4 ++-- 6 files changed, 32 insertions(+), 2 deletions(-) rename core/function-impl/mogo-core-function-hmi/src/main/res/drawable/{ipc_error_tab_bg.xml => ipc_error_tab_normal_bg.xml} (100%) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_normal_bg.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_select_bg.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt index 1c74fbaf9d..9ff5384823 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt @@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper.getDrawable import java.lang.reflect.Field /** @@ -72,11 +73,15 @@ class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener{ } //错误列表 tvIpcErrorTab.setOnClickListener { + tvIpcErrorTab.background = getDrawable(mActivity,R.drawable.ipc_error_tab_normal_bg) + tvIpcWarningTab.background = getDrawable(mActivity,R.drawable.ipc_warning_tab_normal_bg) ipcReportAdapter?.setData(ipcErrorReportList) ipcReportAdapter?.notifyDataSetChanged() } //预警列表 tvIpcWarningTab.setOnClickListener { + tvIpcErrorTab.background = getDrawable(mActivity,R.drawable.ipc_error_tab_select_bg) + tvIpcWarningTab.background = getDrawable(mActivity,R.drawable.ipc_warning_tab_select_bg) ipcReportAdapter?.setData(ipcWarningReportList) ipcReportAdapter?.notifyDataSetChanged() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_normal_bg.xml similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_bg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_normal_bg.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml new file mode 100644 index 0000000000..4b7aeeb7b9 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_error_tab_select_bg.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_normal_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_normal_bg.xml new file mode 100644 index 0000000000..0e87378fad --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_normal_bg.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_select_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_select_bg.xml new file mode 100644 index 0000000000..dec04a6624 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/ipc_warning_tab_select_bg.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml index 101153a73c..27ae6023ff 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_report.xml @@ -19,7 +19,7 @@ android:textColor="#FFFFFFFF" android:textSize="38px" android:gravity="center" - android:background="@drawable/ipc_error_tab_bg" + android:background="@drawable/ipc_error_tab_normal_bg" app:layout_constraintTop_toTopOf="parent" /> @@ -33,7 +33,7 @@ android:gravity="center" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toRightOf="@id/tv_ipc_error_tab" - android:background="#3A57C5" + android:background="@drawable/ipc_warning_tab_normal_bg" /> Date: Mon, 1 Aug 2022 20:35:25 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E9=80=9F=E5=BA=A6=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BC=A0=E9=80=92=E3=80=81=E5=8F=AA=E6=9C=89=E5=9C=A8?= =?UTF-8?q?=E8=98=91=E8=8F=87=E5=92=A8=E8=AF=A2=E5=92=8C=E5=BD=B1=E8=A7=86?= =?UTF-8?q?=E5=A8=B1=E4=B9=90=20=E5=86=8D=E4=BC=A0=E9=80=92=E9=87=8C?= =?UTF-8?q?=E7=A8=8B=E4=BF=A1=E6=81=AF=E3=80=811s=E5=8F=AA=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E4=B8=80=E6=9D=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/TaxiPassengerModel.java | 13 +++++- .../model/TaxiPassengerModelLoopManager.java | 4 +- .../presenter/BaseTaxiPassengerPresenter.java | 3 +- .../passenger/ui/leftmenu/LeftMenuOpen.kt | 45 ++++++++++++++----- .../ui/leftmenu/OverlayLeftViewUtils.kt | 18 +++++++- .../taxi/passenger/ui/video/VideoActivity.kt | 39 ++++++++++++++-- 6 files changed, 104 insertions(+), 18 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index 43937448f5..06ce8ec0f4 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -194,7 +194,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } /** - * 订单轮询 + * 订单轮询 初始化主Fragment的Presenter init 调用 */ public void startOrStopOrderLoop(){ if (NetworkUtils.isConnected(mContext)) { @@ -202,6 +202,9 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } } + /** + * 关闭订单轮训 页面摧毁时 + */ public void release() { startOrStopOrderLoop(false); startOrStopQueryOrderRemaining(false); @@ -255,6 +258,11 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback CallLimitingVelocityListenerManager.INSTANCE.removeListener(limitingVelocityListener); } + /** + * 订单轮训 + * @param start true 开启订单轮训 + * false 关闭订单轮训 + */ private void startOrStopOrderLoop(boolean start) { CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "startOrStopOrderLoop() " + start); if (start) { @@ -671,6 +679,9 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } } + /** + * 查询订单剩余里程和时间 + */ public void queryOrderRemaining(){ if (mCurrentOCHOrder == null) return; TaxiPassengerServiceManager.getInstance().queryOrderRemaining(mContext, mCurrentOCHOrder.orderNo, new TaxiPassengerServiceCallback() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java index ee85371b35..1ce646c93c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java @@ -126,7 +126,9 @@ public class TaxiPassengerModelLoopManager { } } - + /** + * 轮训查下 查询订单剩余里程和时间 + */ public void startQueryOrderRemainingtLoop() { if (mQueryOrderRemainingDisposable != null && !mQueryOrderRemainingDisposable.isDisposed()) { return; diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java index fe32a0c5ca..056b46c0ff 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java @@ -119,7 +119,8 @@ public class BaseTaxiPassengerPresenter extends Presenter = RemoteCallbackList() + var checkIndex = OverlayLeftViewUtils.LIVE + private var lastClickTime = 0L + private const val FAST_CLICK_DELAY_TIME = 1000 // 防止事件发送过快 + + fun setValue( windowView: View, wl: WindowManager.LayoutParams?, @@ -70,7 +78,8 @@ object LeftMenuOpen { val iterator = dragList.iterator() while (iterator.hasNext()) { val next = iterator.next() - unRegisterDragView(next) + unRegisterDragView(next,false) + iterator.remove() } } @@ -169,8 +178,10 @@ object LeftMenuOpen { } } - fun unRegisterDragView(view: View?) { - dragList.remove(view) + fun unRegisterDragView(view: View?,remove:Boolean) { + if(remove) { + dragList.remove(view) + } view?.let { it.setOnTouchListener(null) it.setOnClickListener(null) @@ -220,15 +231,29 @@ object LeftMenuOpen { } fun callCallBack(meters: Long,timeInSecond: Long,speed:Float){ - val len = icallbacks.beginBroadcast() - for (i in 0 until len) { - try { - icallbacks.getBroadcastItem(i).onResult(meters,timeInSecond,speed) - } catch (e: RemoteException) { - e.printStackTrace() + if(checkIndex == OverlayLeftViewUtils.CONSULT||checkIndex == OverlayLeftViewUtils.MOVIE) { + if (System.currentTimeMillis() - lastClickTime < FAST_CLICK_DELAY_TIME){ + return } + lastClickTime = System.currentTimeMillis() + + Observable.empty().subscribeOn(Schedulers.io()) + .subscribe(object : Observer { + override fun onCompleted() { + val len = icallbacks.beginBroadcast() + for (i in 0 until len) { + try { + icallbacks.getBroadcastItem(i).onResult(meters, timeInSecond, speed) + } catch (e: RemoteException) { + e.printStackTrace() + } + } + icallbacks.finishBroadcast() + } + override fun onError(e: Throwable?) {} + override fun onNext(t: String?) {} + }) } - icallbacks.finishBroadcast() } fun invoKeyByEventType(typeID:Int){ diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt index bb083da531..50a5e225b5 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt @@ -105,6 +105,7 @@ object OverlayLeftViewUtils { val liveSelected = object :ListAdapter.OnTabSelectListener{ override fun onSelect(isCurrentProcess:Boolean) { + LeftMenuOpen.checkIndex = LIVE if(isCurrentProcess) { close(view, windowManager) }else { @@ -124,6 +125,7 @@ object OverlayLeftViewUtils { val overViewSelected = object :ListAdapter.OnTabSelectListener{ override fun onSelect(isCurrentProcess:Boolean) { + LeftMenuOpen.checkIndex = OVERVIEW if(isCurrentProcess) { close(view, windowManager) }else { @@ -143,6 +145,7 @@ object OverlayLeftViewUtils { val consultSelect = object :ListAdapter.OnTabSelectListener{ override fun onSelect(isCurrentProcess:Boolean) { + LeftMenuOpen.checkIndex = CONSULT if(isCurrentProcess) { close(view, windowManager) //计算订单起点和终点距离 @@ -154,6 +157,7 @@ object OverlayLeftViewUtils { val entertainmentSelect = object :ListAdapter.OnTabSelectListener{ override fun onSelect(isCurrentProcess:Boolean) { + LeftMenuOpen.checkIndex = MOVIE if(isCurrentProcess) { close(view, windowManager) val sumDis = SharedPrefsMgr.getInstance(context).getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS, 0) @@ -178,6 +182,9 @@ object OverlayLeftViewUtils { windowManager!!.addView(overlayView, params) checkProcess() isShowing = true + } catch (e: WindowManager.BadTokenException) { + isShowing = true; + dismissOverlayView(false) } catch (e: Exception) { e.printStackTrace() } @@ -260,7 +267,7 @@ object OverlayLeftViewUtils { } fun removeDragTarget(view: View?){ - LeftMenuOpen.unRegisterDragView(view) + LeftMenuOpen.unRegisterDragView(view,true) } /** @@ -365,6 +372,10 @@ object OverlayLeftViewUtils { } } + fun getStatus():Boolean{ + return isShowing + } + /** * 移除覆盖View在Activity上面 */ @@ -387,7 +398,12 @@ object OverlayLeftViewUtils { try { if (windowManager != null && overlayView != null) { windowManager!!.removeViewImmediate(overlayView) + params = null + } + if(windowManager!=null){ windowManager = null + } + if(params!=null){ params = null } if (overlayView!=null) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt index 2863f1e589..d3da306254 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt @@ -16,10 +16,10 @@ import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.bean.TaxiPassengerVideoPlay import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst +import com.mogo.och.taxi.passenger.event.FinishActivity import com.mogo.och.taxi.passenger.mulprocess.ICallback import com.mogo.och.taxi.passenger.ui.leftmenu.LeftMenuOpen import com.mogo.och.taxi.passenger.ui.leftmenu.OverlayLeftViewUtils -import com.mogo.och.taxi.passenger.event.FinishActivity import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselLayoutManager import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselZoomPostLayoutListener import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CenterScrollListener @@ -33,7 +33,14 @@ import com.shuyu.gsyvideoplayer.video.base.GSYVideoView import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -import java.util.* +import rx.Observable +import rx.Observer +import rx.Subscription +import rx.android.schedulers.AndroidSchedulers +import rx.schedulers.Schedulers +import java.util.Calendar +import java.util.concurrent.TimeUnit +import kotlin.collections.ArrayList import kotlin.math.floor @@ -44,6 +51,7 @@ class VideoActivity : AppCompatActivity() { private lateinit var clContain: ConstraintLayout private lateinit var acivTitleIcon: AppCompatImageView private lateinit var tvTitle: TextView + private var subscribe: Subscription?=null private val arrayListOf = ArrayList() @@ -297,7 +305,7 @@ class VideoActivity : AppCompatActivity() { acivTitleIcon = findViewById(R.id.aciv_title_icon) tvTitle = findViewById(R.id.tv_mogo_consult) acivTitleIcon.setOnClickListener { - finish() + //finish() } } @@ -344,7 +352,25 @@ class VideoActivity : AppCompatActivity() { } } - + subscribe = Observable.interval(0, 8, TimeUnit.SECONDS) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Observer { + override fun onCompleted() {} + override fun onError(e: Throwable?) {} + override fun onNext(t: Long?) { + if (!OverlayLeftViewUtils.getStatus()) { + when (videotype){ + VIDEOTYPE_CONSULT -> { + OverlayLeftViewUtils.showOverlayView(this@VideoActivity,isOpen = false, checkIndex = OverlayLeftViewUtils.CONSULT) + } + VIDEOTYPE_MOIES -> { + OverlayLeftViewUtils.showOverlayView(this@VideoActivity,isOpen = false, checkIndex = OverlayLeftViewUtils.MOVIE) + } + } + } + } + }) } override fun onPause() { @@ -361,6 +387,11 @@ class VideoActivity : AppCompatActivity() { } } } + subscribe?.let { + if(it.isUnsubscribed){ + it.unsubscribe() + } + } } @Subscribe(threadMode = ThreadMode.MAIN) From 209423dbcd479324d6359bcc5f417b1eb6f7b262 Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 29 Jul 2022 12:09:19 +0800 Subject: [PATCH 27/28] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=A0=8F=E4=BD=8D=E7=BD=AE=E4=B8=8A=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevaToolsProvider.kt | 5 +- .../ext/Extentions.kt | 10 ++-- .../status/StatusManager.kt | 49 +++++++++++++++--- .../status/ui/StatusView.kt | 12 ++--- .../status/ui/adapter/StatusAdapter.kt | 28 +++++----- .../icon_dev_status_un_fold.png | Bin 9649 -> 12516 bytes .../src/main/res/layout/layout_status_bar.xml | 24 +++++---- .../res/layout/layout_status_bar_item.xml | 25 ++------- .../core/function/hmi/ui/MoGoHmiFragment.kt | 5 +- .../src/main/res/layout/fragment_hmi.xml | 29 ++++++----- .../api/devatools/IDevaToolsProvider.kt | 2 +- .../call/devatools/CallerDevaToolsManager.kt | 15 ++++-- 12 files changed, 115 insertions(+), 89 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 387f7212b8..f483cb7346 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -11,7 +11,6 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager -import com.zhjt.mogo_core_function_devatools.feedback.FeedbackManager import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager import com.zhjt.mogo_core_function_devatools.scene.SceneManager.Companion.sceneManager import com.zhjt.mogo_core_function_devatools.status.* @@ -103,8 +102,8 @@ class DevaToolsProvider : IDevaToolsProvider { upgradeManager.downLoadPackage(mContext!!, downloadKey,downloadUrl) } - override fun showStatusBar(ctx: Context) { - StatusManager.init(ctx) + override fun showStatusBar(ctx: Context, anchor: View) { + StatusManager.init(ctx, anchor) StatusManager.show() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/Extentions.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/Extentions.kt index 64e6279d23..3246a6f238 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/Extentions.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/Extentions.kt @@ -144,7 +144,7 @@ fun Context.enqueuePop(content: View, width: Int, height: Int, key: String = "", @SuppressLint("ClickableViewAccessibility") -fun Context.normalPop(content: View, width: Int, height: Int, startX: Int = 0, startY: Int = 0, gravity: Int = Gravity.START, onOuterViewClicked:((focus: View) -> Unit)? = null, isFocusable: Boolean = true): () -> Unit { +fun Context.normalPop(content: View, width: Int, height: Int, startX: Int = 0, startY: Int = 0, gravity: Int = Gravity.START, onOuterViewClicked:((focus: View) -> Unit)? = null, isFocusable: Boolean = true): PopupWindow? { val activity = (this as? FragmentActivity) ?: throw IllegalStateException("please use Activity to trigger pop show.") val isImmersiveMode = BarUtils.isImmersiveMode(activity) var tempPop: PopupWindow? = null @@ -192,7 +192,7 @@ fun Context.normalPop(content: View, width: Int, height: Int, startX: Int = 0, s it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) } if (VERSION.SDK_INT >= VERSION_CODES.M) { - val transition = Slide(gravity).also { + val transition = Slide(if ((gravity and Gravity.START) != 0) Gravity.START else if ((gravity and Gravity.TOP) != 0) Gravity.TOP else if ((gravity and Gravity.END) != 0) Gravity.END else if ((gravity and Gravity.BOTTOM) != 0) Gravity.BOTTOM else throw AssertionError("gravity is not invalid.")).also { it.interpolator = AccelerateDecelerateInterpolator() it.duration = 200 } @@ -202,16 +202,14 @@ fun Context.normalPop(content: View, width: Int, height: Int, startX: Int = 0, s pop.contentView = content decorView.doOnAttach { try { - pop.showAtLocation(it, gravity, startX, if (isImmersiveMode) 0 else BarUtils.getStatusBarHeight() + startY) + pop.showAtLocation(it, gravity, startX, (if (isImmersiveMode) 0 else BarUtils.getStatusBarHeight()) + startY) tempPop = pop } catch (t: Throwable) { t.printStackTrace() } } } - return { - tempPop?.takeIf { it.isShowing }?.dismiss() - } + return tempPop } fun isVisibleOnPoint(content: View, x: Int, y: Int): Boolean { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt index 649715fb79..177854b555 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt @@ -3,6 +3,7 @@ package com.zhjt.mogo_core_function_devatools.status import android.content.* import android.view.* import android.view.WindowManager.LayoutParams +import android.widget.* import androidx.core.view.* import androidx.lifecycle.* import androidx.lifecycle.Lifecycle.Event @@ -11,8 +12,7 @@ import androidx.lifecycle.Lifecycle.Event.ON_DESTROY import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.utilcode.kotlin.* -import com.mogo.eagle.core.utilcode.util.AppStateManager -import com.mogo.eagle.core.utilcode.util.IAppStateListener +import com.mogo.eagle.core.utilcode.util.* import com.zhjt.mogo_core_function_devatools.ext.* import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus import com.zhjt.mogo_core_function_devatools.status.entity.GpsStatus @@ -41,14 +41,19 @@ object StatusManager { private lateinit var model: StatusModel - private var hidePop: (() -> Unit)? = null + private var pop: PopupWindow? = null private var timer: Job? = null private var context: WeakReference? = null + private var anchor: WeakReference? = null + private var hasInit = false + private var oldX = 0 + private var oldY = 0 + private val listener = object : IMoGoAutopilotStatusListener { override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { super.onAutopilotGuardian(guardianInfo) @@ -88,7 +93,7 @@ object StatusManager { } } - fun init(ctx: Context) { + fun init(ctx: Context, anchor: View) { if (hasInit) { return } @@ -106,6 +111,25 @@ object StatusManager { } }) context = WeakReference(ctx) + anchor.viewTreeObserver.addOnGlobalLayoutListener { + anchor.getLocationInWindow(IntArray(2).also { + val currentX = it[0] + val currentY = it[1] + var changed = false + if (oldX != currentX) { + oldX = currentX + changed = true + } + if (oldY != currentY) { + changed = true + oldY = currentY + } + if (changed && pop?.isShowing == true) { + pop?.update(getOffsetX(currentX), currentY + 130.PX, -1, -1) + } + }) + } + this.anchor = WeakReference(anchor) } private fun onCreate(ctx: Context) { @@ -133,20 +157,29 @@ object StatusManager { } fun show() { + val anchor = this.anchor?.get() ?: return context?.get()?.also { ctx -> - hidePop?.invoke() + pop?.takeIf { it.isShowing }?.dismiss() val content = StatusView(model, ctx) content.doOnAttach { for (f in flows) { f.onCreate() } } - ctx.normalPop(content, width = 665.PX, height = LayoutParams.WRAP_CONTENT, gravity = Gravity.END, startX = 55.PX, isFocusable = false).also { hidePop = it } + val out = IntArray(2) + anchor.getLocationInWindow(out) + ctx.normalPop(content, width = LayoutParams.WRAP_CONTENT, height = LayoutParams.WRAP_CONTENT, gravity = Gravity.END or Gravity.TOP, startX = getOffsetX(out[0]), startY = out[1] + 130.PX , isFocusable = false)?.also { + pop = it + } } } + private fun getOffsetX(anchorX: Int): Int { + return ScreenUtils.getScreenWidth() - anchorX + 40.PX + } + fun hide() { - hidePop?.invoke() + pop?.takeIf { it.isShowing }?.dismiss() } private fun onDestroy(ctx: Context) { @@ -158,6 +191,6 @@ object StatusManager { it.onDestroy() } flows.clear() - hidePop?.invoke() + pop?.takeIf { it.isShowing }?.dismiss() } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index 7c9013a2dd..0adf523bb6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -59,15 +59,14 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra moveDuration = 0 removeDuration = 0 } - itx.layoutManager = GridLayoutManager(context, 3, GridLayoutManager.VERTICAL, false) + itx.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) itx.background = shape(solid = Color.parseColor("#80000000"), radius = 40.PX) itx.addItemDecoration( CommonDividerItemDecoration.Builder() - .horizontalExternalSpace(66.PX) - .verticalExternalSpace(60.PX) - .spanCountTBCare(false) - .verticalInnerSpace(50.PX) - .horizontalInnerSpace(116.PX) + .horizontalExternalSpace(38.PX) + .verticalExternalSpace(30.PX) + .spanCountLRCare(false) + .horizontalInnerSpace(50.PX) .build() ) val adapter = model.status.value?.let { data -> StatusAdapter(context, data.second) }?.also { adapter -> itx.adapter = adapter } @@ -92,7 +91,6 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra } private fun animate(expand: Boolean) { - iv.animate().rotation(if (expand) 0f else -180f).setDuration(200).start() TransitionManager.beginDelayedTransition(this, AutoTransition().setDuration(200)) rv.visibility = if (expand) View.VISIBLE else View.INVISIBLE } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt index 4aa4d23e0b..c502a25195 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt @@ -5,7 +5,10 @@ import android.view.* import android.widget.* import androidx.core.content.* import androidx.recyclerview.widget.* +import com.mogo.eagle.core.utilcode.kotlin.* +import com.mogo.eagle.core.utilcode.util.* import com.zhjt.mogo_core_function_devatools.* +import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.R.drawable import com.zhjt.mogo_core_function_devatools.status.entity.* import com.zhjt.mogo_core_function_devatools.status.entity.IpcStatus @@ -30,11 +33,10 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec itemView.findViewById(R.id.iv) } - private val tv: TextView by lazy { - itemView.findViewById(R.id.tv) - } - fun bind(status: Status) { + itemView.onClick { + ToastUtils.showShort(getText(status)) + } when(status) { is IpcStatus -> { if (status.enabled) { @@ -42,7 +44,6 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_ipc_disable) } - tv.text = "工控机" } is CanStatus -> { if (status.enabled) { @@ -50,15 +51,12 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_can_disable) } - tv.text = "CAN" } is NetStatus -> { if (status.enabled) { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_enable) - tv.text = status.name ?: "WI-FI" } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_disable) - tv.text = "WI-FI" } } is GpsStatus -> { @@ -67,21 +65,17 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_disable) } - tv.text = "GPS" } is TracingStatus -> { when(status.state) { ROUTE_FAILED, TRACK_LOAD_FAIL, TRACK_NOT_EXIST, TRACK_FINDED, UNKNOWN -> { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_trace_unkown) - tv.text = "未知" } TRACK_LOADED -> { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_track_enable) - tv.text = "T" } ROUTE_LOADED -> { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_route_enable) - tv.text = "V" } } } @@ -91,9 +85,17 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_disable) } - tv.text = status.desc } } } + + private fun getText(status: Status): String = when(status) { + is CanStatus -> "CAN:${ if (status.enabled) "状态正常" else "非正常连接" }" + is GpsStatus -> "GPS:${ if (status.enabled) "状态正常" else "非正常连接" }" + is IpcStatus -> "工控机:${ if (status.enabled) "状态正常" else "非正常连接" }" + is NetStatus -> "WIFI:${ if (status.enabled) "${status.name}" else "非正常连接" }" + is RTKStatus -> "${status.desc.uppercase()}:${ if (status.enabled) "状态正常" else "非正常连接" }" + is TracingStatus -> "轨迹类型:${ if (status.state == TRACK_LOADED) "循迹" else if (status.state == ROUTE_LOADED) "自主算路" else "暂无轨迹" }" + } } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_un_fold.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_un_fold.png index 5bd76829ae1e163081e4a3f8bfa92ca23ff26f9a..290ecce308db07f7f97ea63e4d6ef22c48705dbe 100644 GIT binary patch literal 12516 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 + app:layout_constraintEnd_toStartOf="@+id/iv" + app:layout_constraintTop_toTopOf="parent" + android:layout_marginEnd="20px" + android:overScrollMode="never" + app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml index b9e7610987..ca92ba33fc 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml @@ -1,22 +1,5 @@ - - - - \ No newline at end of file + \ 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/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 2697ddad0f..aa21b0bfd5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -205,9 +205,8 @@ import java.util.* setProxyTrafficLightView(viewTrafficLightVr) setProxyLimitingSpeedView(viewLimitingVelocity) setViewNotificationProvider(this) - context?.also { - CallerDevaToolsManager.showStatusBar(it) + CallerDevaToolsManager.showStatusBar(it, vs_status_bar) } } @@ -1226,7 +1225,7 @@ import java.util.* } override fun hideSmallFragment() { - context?.let { CallerDevaToolsManager.showStatusBar(it) } + context?.let { CallerDevaToolsManager.showStatusBar(it, vs_status_bar) } val fragmentOverview = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_OVERVIEW) .navigation() as BaseFragment activity?.supportFragmentManager?.beginTransaction() 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 e0bc4f03fd..ed3b74663e 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 @@ -112,23 +112,21 @@ android:id="@+id/ivBadCaseTools" android:layout_width="120px" android:layout_height="120px" - android:src="@drawable/bad_case_selector" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/ivToolsIcon" android:layout_marginStart="50px" android:layout_marginBottom="40px" - /> + android:src="@drawable/bad_case_selector" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/ivToolsIcon" /> + android:src="@drawable/ai_collect_selector" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/ivBadCaseTools" /> - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index df8eb59c45..fcbafafc21 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -107,7 +107,7 @@ interface IDevaToolsProvider : IProvider { /** * 展示状态栏 */ - fun showStatusBar(ctx: Context) + fun showStatusBar(ctx: Context, anchor: View) /** * 隐藏状态栏 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index f4baa19770..509a611781 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.call.devatools import android.app.Activity import android.content.Context -import android.view.View +import android.view.* import com.mogo.eagle.core.data.config.* import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.chain.ChainLogParam @@ -150,9 +150,18 @@ object CallerDevaToolsManager { /** * 展示状态栏 */ - fun showStatusBar(ctx: Context) { + fun showStatusBar(ctx: Context, anchor: View) { if (!AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - devaToolsProviderApi?.showStatusBar(ctx) + if (anchor.isLaidOut) { + devaToolsProviderApi?.showStatusBar(ctx, anchor) + } else { + anchor.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener { + override fun onGlobalLayout() { + devaToolsProviderApi?.showStatusBar(ctx, anchor) + anchor.viewTreeObserver.removeOnGlobalLayoutListener(this) + } + }) + } } } From c7bbdd2285123bf7bd24558a2deaf9926d18db72 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 2 Aug 2022 11:24:07 +0800 Subject: [PATCH 28/28] =?UTF-8?q?[290=20bus/taxi=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E5=B1=8F]=20=E8=A7=A3=E5=86=B3=E5=B0=8F=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E7=BA=BF=E7=BB=98=E5=88=B6=E9=97=AA=E7=83=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/BusPassengerMapDirectionView.java | 18 +++++++++++------- .../src/main/res/drawable/bus_p_route_bg.xml | 4 ++-- .../main/res/layout/bus_p_base_fragment.xml | 4 ++-- .../main/res/layout/bus_p_route_fragment.xml | 2 +- .../ui/TaxiPassengerMapDirectionView.java | 16 ++++++++++------ 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index bef94a28ea..602792dfea 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -1,7 +1,6 @@ package com.mogo.och.bus.passenger.ui; import android.content.Context; -import android.graphics.Color; import android.os.Bundle; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -71,6 +70,8 @@ public class BusPassengerMapDirectionView private List mLineMarkers = new ArrayList<>(); private IBusPassengerMapViewCallback mIBusPassengerMapViewCallback; + private BitmapDescriptor mArrivedRes; + private BitmapDescriptor mUnArrivedRes; public BusPassengerMapDirectionView(Context context) { this(context, null); @@ -133,6 +134,9 @@ public class BusPassengerMapDirectionView mEndMarker = mAMap.addMarker(new MarkerOptions() .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_view_dir_end_point))); + mArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_arrived); + mUnArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_un_arrive); + // 加载自定义样式 CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions() .setEnable(true) @@ -182,12 +186,12 @@ public class BusPassengerMapDirectionView if (location == null) { return; } - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "onCarLocationChanged2 :" + location.getLatitude() + ":" + location.getLongitude()); +// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "onCarLocationChanged2 :" + location.getLatitude() + ":" + location.getLongitude()); LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude()); //更新车辆位置 if (mCarMarker != null) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "location.getBearing() = " + location.getBearing()); +// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "location.getBearing() = " + location.getBearing()); mCarMarker.setRotateAngle(360 - location.getBearing()); mCarMarker.setPosition(currentLatLng); mCarMarker.setToTop(); @@ -228,8 +232,8 @@ public class BusPassengerMapDirectionView //设置线段纹理 PolylineOptions polylineOptions = new PolylineOptions(); polylineOptions.addAll(mCoordinatesLatLng); - polylineOptions.useGradient(true); - polylineOptions.width(10); //线段宽度 + polylineOptions.width(14); //线段宽度 + polylineOptions.setUseTexture(true); polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound); polylineOptions.setCustomTextureList(textureList); polylineOptions.setCustomTextureIndex(texIndexList); @@ -251,9 +255,9 @@ public class BusPassengerMapDirectionView texIndexList.clear(); for (int i = 0; i < mCoordinatesLatLng.size(); i++){ if (i <= mHaveArrivedIndex){ - textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_arrived)); + textureList.add(mArrivedRes); }else { - textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_un_arrive)); + textureList.add(mUnArrivedRes); } texIndexList.add(i); } diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_route_bg.xml b/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_route_bg.xml index 73fbe1f005..94dd7c0007 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_route_bg.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_route_bg.xml @@ -4,8 +4,8 @@ diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index d2a9d7ce32..03e16a4146 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_56" - android:layout_marginTop="@dimen/dp_28" + android:layout_marginTop="@dimen/dp_40" android:elevation="@dimen/dp_10" android:text="@string/bus_p_cur_station_title" android:textColor="@color/bus_p_panel_cur_txt_color" @@ -65,7 +65,7 @@ android:id="@+id/bus_p_cur_station_name" android:layout_width="@dimen/bus_p_curent_station_txt_width" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_12" android:elevation="@dimen/dp_10" android:ellipsize="end" android:maxLines="1" diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml index 01bff7f219..61e9d4acf9 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml @@ -7,7 +7,7 @@ textureList = new ArrayList<>(); List texIndexList = new ArrayList<>(); + private BitmapDescriptor mArrivedRes; + private BitmapDescriptor mUnArrivedRes; + private ITaxiPassengerMapViewCallback mITaxiPassengerMapViewCallback; public TaxiPassengerMapDirectionView(Context context) { @@ -129,6 +132,9 @@ public class TaxiPassengerMapDirectionView mEndMarker = mAMap.addMarker(new MarkerOptions() .icon(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_view_dir_end))); + mArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_arrived); + mUnArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_un_arrive); + // 加载自定义样式 CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions() .setEnable(true) @@ -189,7 +195,7 @@ public class TaxiPassengerMapDirectionView boundsBuilder.include(endLatLng); //第二个参数为四周留空宽度 mAMap.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(), 100,100,100,100)); - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "onCarLocationChanged2--moveCamera :" + location.getLatitude()+", "+location.getLongitude()); +// CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "onCarLocationChanged2--moveCamera :" + location.getLatitude()+", "+location.getLongitude()); } else { //设置希望展示的地图缩放级别 @@ -240,9 +246,7 @@ public class TaxiPassengerMapDirectionView //设置线段纹理 PolylineOptions polylineOptions = new PolylineOptions(); polylineOptions.addAll(mCoordinatesLatLng); - //polylineOptions.colorValues(colorList); // 1FC3FF -> 57ABFF - //加上这个属性，表示使用渐变线 - //polylineOptions.useGradient(true); + polylineOptions.setUseTexture(true); polylineOptions.width(15); polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound); polylineOptions.setCustomTextureList(textureList); @@ -264,9 +268,9 @@ public class TaxiPassengerMapDirectionView texIndexList.clear(); for (int i = 0; i < mCoordinatesLatLng.size(); i++){ if (i <= mHaveArrivedIndex){ - textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_arrived)); + textureList.add(mArrivedRes); }else { - textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_un_arrive)); + textureList.add(mUnArrivedRes); } texIndexList.add(i); }