From 17f69004d22642611e9bd5edc4bca548f5b197af Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 9 Oct 2023 11:52:41 +0800 Subject: [PATCH 1/5] [6.1.0] yml and update log --- .gitlab-ci.yml | 5 +++-- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8d78f273a..5f115e31aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,12 +14,13 @@ inspect java and kotlin codes: - source change_java_version artifacts: name: "${CI_JOB_STAGE}_reports_${CI_PROJECT_NAME}_$CI_COMMIT_REF_SLUG" - when: on_failure + when: always expire_in: 1 days paths: - "build/reports/*" only: - - "dev_robotaxi-d_230912_6.1.0" + - $CI_COMMIT_BRANCH + - schedules except: - master allow_failure: true diff --git a/gradle.properties b/gradle.properties index dd86ae85df..d122d31f49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,7 +58,7 @@ bytex.ASM_API=ASM7 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.9.16 +LOGLIB_VERSION=1.9.17 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.7.17 From aaa5697f94f87184351455422f034c11f8bdf0e4 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 9 Oct 2023 12:19:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[6.1.0]=20=E8=A7=A3=E5=86=B3=E5=89=8D?= =?UTF-8?q?=E5=BE=80=E4=B8=8A=E8=BD=A6=E7=82=B9=E9=87=8C=E7=A8=8B=E5=92=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/map/AmapNaviToDestinationModel.java | 15 ++++++++------- .../com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index a0de8f4d6f..37d89fbac1 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -22,6 +22,7 @@ import com.amap.api.navi.model.AimLessModeCongestionInfo; import com.amap.api.navi.model.AimLessModeStat; import com.amap.api.navi.model.NaviInfo; import com.amap.api.navi.model.NaviLatLng; +import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.och.common.module.utils.PermissionUtil; @@ -39,7 +40,6 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public static final String TAG = "NaviToDestinationModel"; - private static Context mContext; private AMapNavi mAMapNavi = null; protected final List sList = new ArrayList(); protected final List eList = new ArrayList(); @@ -49,7 +49,6 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { private boolean isPlay; public static AmapNaviToDestinationModel getInstance(Context context) { - mContext = context; return SingletonHolder.INSTANCE; } @@ -62,7 +61,8 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void initAMapNavi(NaviLatLng startLatLng, NaviLatLng endLatLng) { try { - mAMapNavi = AMapNavi.getInstance(mContext); + CallerLogger.i( TAG, "initAMapNavi()"); + mAMapNavi = AMapNavi.getInstance(AbsMogoApplication.getApp()); mAMapNavi.addAMapNaviListener(this); mAMapNavi.setUseInnerVoice(true, true); sList.add(startLatLng); @@ -88,6 +88,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void destroyAmaNavi() { if (mAMapNavi != null) { + CallerLogger.i( TAG, "destroyAmaNavi()"); isPlay = false; sList.clear(); eList.clear(); @@ -104,7 +105,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { @Override public void onInitNaviFailure() { - Toast.makeText(mContext, "init navi Failed", Toast.LENGTH_SHORT).show(); + Toast.makeText(AbsMogoApplication.getApp(), "init navi Failed", Toast.LENGTH_SHORT).show(); } @Override @@ -141,8 +142,8 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { @Override public void onNaviInfoUpdate(NaviInfo naviinfo) { //导航过程中的信息更新，请看NaviInfo的具体说明 + CallerLogger.i( TAG, "距离=" + naviinfo.getPathRetainDistance() + ", 剩余时间 " + naviinfo.getPathRetainTime()); if (null != mNaviChangedCallback) { - CallerLogger.i(M_TAXI + TAG, "距离=" + naviinfo.getPathRetainDistance() + ", 剩余时间 " + naviinfo.getPathRetainTime()); mNaviChangedCallback.onCurrentNaviDistAndTimeChanged(naviinfo.getPathRetainDistance(), naviinfo.getPathRetainTime());// 米、秒 } } @@ -162,14 +163,14 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { mNaviChangedCallback.reInitNaviAmap(isPlay, true); } } - if (!NetworkUtils.isConnected(mContext) || result.getErrorCode() == 2) { + if (!NetworkUtils.isConnected(AbsMogoApplication.getApp()) || result.getErrorCode() == 2) { ToastCharterUtils.showToastShort("网络异常，请重试"); if (mNaviChangedCallback != null) { mNaviChangedCallback.reInitNaviAmap(isPlay, false); } return; } - if (!PermissionUtil.isLocServiceEnable(mContext) || !PermissionUtil.checkPermission(mContext, new String[]{Manifest.permission.ACCESS_FINE_LOCATION})) { + if (!PermissionUtil.isLocServiceEnable(AbsMogoApplication.getApp()) || !PermissionUtil.checkPermission(AbsMogoApplication.getApp(), new String[]{Manifest.permission.ACCESS_FINE_LOCATION})) { ToastCharterUtils.showToastShort("请开启车机定位后重试"); if (mNaviChangedCallback != null) { mNaviChangedCallback.reInitNaviAmap(isPlay, false); diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 53d97c34e4..b0ba113e37 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -816,7 +816,9 @@ object TaxiTaskModel { } } else { d(TAG, "updateLocalCalculateStation stop") - AmapNaviToDestinationModel.getInstance(mContext).destroyAmaNavi() + if (mDriveToNearestStationTask == null){ + AmapNaviToDestinationModel.getInstance(mContext).destroyAmaNavi() + } setStationPoint(null, null, -1L) } } From 339edbcac879eed01eaeaeef064b1438de7ebb72 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 9 Oct 2023 14:09:33 +0800 Subject: [PATCH 3/5] [6.1.0] push trigger yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f115e31aa..c4416b34c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ inspect java and kotlin codes: - "build/reports/*" only: - $CI_COMMIT_BRANCH + - pushes - schedules except: - master From 04cc428f3e8027d72cae671a58522b10f67dd8cf Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 9 Oct 2023 14:48:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[6.1.0]=20=E9=AB=98=E5=BE=B7=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E4=B8=BB=E7=BA=BF=E7=A8=8B=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/TaxiBeingServerdOrdersFragment.java | 19 +++++++++----- .../taxi/ui/task/TaxiCurrentTaskFragment.kt | 26 ++++++++++--------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index 7dae3b8fa4..36c6e5f812 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -343,15 +343,20 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment } private void startNaviToStation(boolean isVoicePlay, double stationLat, double stationLng) { - AmapNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi(); + UiThreadHandler.post(new Runnable() { + @Override + public void run() { + AmapNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi(); - double mCurLatitude = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLatitude(); - double mCurLongitude =CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLongitude(); + double mCurLatitude = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLatitude(); + double mCurLongitude =CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLongitude(); - CallerLogger.d(M_TAXI + TAG, "currentLatLng=" + mCurLatitude + " " +mCurLongitude); - NaviLatLng startNaviLatLng = new NaviLatLng(mCurLatitude, mCurLongitude); - NaviLatLng endNaviLatLng = new NaviLatLng(stationLat, stationLng); - AmapNaviToDestinationModel.getInstance(getContext()).initAMapNavi(startNaviLatLng, endNaviLatLng); + CallerLogger.d(M_TAXI + TAG, "currentLatLng=" + mCurLatitude + " " +mCurLongitude); + NaviLatLng startNaviLatLng = new NaviLatLng(mCurLatitude, mCurLongitude); + NaviLatLng endNaviLatLng = new NaviLatLng(stationLat, stationLng); + AmapNaviToDestinationModel.getInstance(getContext()).initAMapNavi(startNaviLatLng, endNaviLatLng); + } + }); AmapNaviToDestinationModel.getInstance(getContext()).setVoiceIsMute(isVoicePlay); AmapNaviToDestinationModel.getInstance(getContext()).setTaxiNaviChangedCallback(this); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 1f7b1cf37a..72a2601d09 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -594,18 +594,20 @@ class TaxiCurrentTaskFragment : BaseFragment(), } private fun startNaviToStation(isVoicePlay: Boolean, stationLat: Double, stationLng: Double) { - AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() - val mCurLatitude = getChassisLocationGCJ02().latitude - val mCurLongitude = getChassisLocationGCJ02().longitude - d( - TAG, - "currentLatLng=$mCurLatitude $mCurLongitude" - ) - val startNaviLatLng = NaviLatLng(mCurLatitude, mCurLongitude) - val endNaviLatLng = NaviLatLng(stationLat, stationLng) - AmapNaviToDestinationModel.getInstance(context).initAMapNavi(startNaviLatLng, endNaviLatLng) - AmapNaviToDestinationModel.getInstance(context).setVoiceIsMute(isVoicePlay) - AmapNaviToDestinationModel.getInstance(context).setTaxiNaviChangedCallback(this) + UiThreadHandler.post{ + AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() + val mCurLatitude = getChassisLocationGCJ02().latitude + val mCurLongitude = getChassisLocationGCJ02().longitude + d( + TAG, + "currentLatLng=$mCurLatitude $mCurLongitude" + ) + val startNaviLatLng = NaviLatLng(mCurLatitude, mCurLongitude) + val endNaviLatLng = NaviLatLng(stationLat, stationLng) + AmapNaviToDestinationModel.getInstance(context).initAMapNavi(startNaviLatLng, endNaviLatLng) + AmapNaviToDestinationModel.getInstance(context).setVoiceIsMute(isVoicePlay) + AmapNaviToDestinationModel.getInstance(context).setTaxiNaviChangedCallback(this) + } } /** From 8a511df9915aa0dec2dcdbc65ca449b0f27d8640 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 9 Oct 2023 18:58:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[6.1.0]=20[taxi]=20[=E4=B8=BB=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E5=B0=81=E8=A3=85=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/startautopilot/StartAutopilotViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt index 6926be8ce1..740d30e33c 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt @@ -76,9 +76,9 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac } private fun runMain(posttion:DoorPosition,state: DoorState){ - UiThreadHandler.post { + UiThreadHandler.post({ viewCallback?.setDoorStatus(posttion,state) - } + },UiThreadHandler.MODE.QUEUE) }