From 9cdfbb4ef1cf2244c586f81973410412bdb54e49 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 22 Oct 2024 16:38:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.7.0]=20[fix]=20[=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=AB=98=E9=A2=91=E6=97=A5=E5=BF=97=E7=BA=AA=E5=BE=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/autopilot/OchAutoPilotStatusListenerManager.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt index 18937f6391..cb3c94be6f 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt @@ -273,9 +273,6 @@ object OchAutoPilotStatusListenerManager : CallerBase Date: Tue, 22 Oct 2024 17:02:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.7.0]=E8=A1=A5=E5=85=85=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF-=E7=8A=B6=E6=80=81=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=9F=8E=E5=B8=82=E7=A0=81=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 2 +- .../src/main/res/layout/view_debug_setting.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 816e7254a0..23e415b0d2 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 @@ -2118,7 +2118,7 @@ internal class DebugSettingView @JvmOverloads constructor( val cityCode = mogoMapData.get()?.getCityCode() cityCode?.let { - tvHDCityCode.text = "$it" + tvHDCityCode.text = "高德城市码：$it" } tvObuConnectStatus.text = Html.fromHtml( 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 c75982ecc2..e7453824c8 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 @@ -621,6 +621,7 @@ From 496629a4ad2f813ae0807d5cc5ccc39f3fc27fec Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 22 Oct 2024 17:16:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.7.0]=20[fix]=20[=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weaknet/ui/fragment/ShuttleFragment.kt | 10 +--------- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 2 ++ .../och/unmanned/taxi/ui/base/TaxiFragment.kt | 19 ++++++------------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt index 041c1c03fc..834f69c446 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt @@ -1,15 +1,12 @@ package com.mogo.och.weaknet.ui.fragment import android.content.Context -import android.graphics.BitmapFactory import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.mogo.commons.AbsMogoApplication import com.mogo.commons.env.ProjectUtils import com.mogo.commons.mvp.MvpFragment -import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.temp.EventLogout import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener @@ -17,16 +14,10 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.common.module.utils.createQRCodeWithPicture -import com.mogo.och.common.module.wigets.BindQRCodeDialog import com.mogo.och.common.module.wigets.map.drawline.LineView import com.mogo.och.shuttle.weaknet.R -import com.mogo.och.weaknet.ui.bizswitch.SwitchBizView import com.mogo.och.weaknet.ui.taskrunned.RunningTaskManager -import kotlinx.android.synthetic.main.shuttle_weak_base_fragment.boneContainerView import kotlinx.android.synthetic.main.shuttle_weak_base_fragment.mapContainerLayout -import me.jessyan.autosize.utils.AutoSizeUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -65,6 +56,7 @@ class ShuttleFragment : MvpFragment() { override fun onItemClick(toolTag: String, ctx: Context?) { when (toolTag) { runningTaskGateWay -> { + d(TAG, "runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag") RunningTaskManager.showBadCaseConfigWindow(it) } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 49ea5c6dc9..d9363e93ac 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -28,6 +28,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager; import com.mogo.eagle.core.function.hmi.map.MapContainerLayout; import com.mogo.eagle.core.function.view.MapRoamView; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.listener.IMogoMapListener; import com.mogo.och.common.module.wigets.map.drawline.LineView; @@ -85,6 +86,7 @@ public abstract class BaseTaxiTabFragment(new TaxiPersonalDialogFragment()); FragmentActivity activity = getActivity(); if (activity != null) { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt index fb1af09e0c..e8ca54e148 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt @@ -5,15 +5,10 @@ import android.content.Context import android.os.Bundle import android.view.View import androidx.fragment.app.FragmentTransaction -import com.mogo.commons.module.status.IMogoStatusChangedListener import com.mogo.commons.module.status.MogoStatusManager -import com.mogo.commons.module.status.StatusDescriptor import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getState import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager @@ -22,7 +17,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum @@ -32,20 +26,18 @@ import com.mogo.och.common.module.wigets.StartAutopilotAnimationView import com.mogo.och.common.module.wigets.map.drawline.LineView import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst -import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.START_AUTOPILOT_ANIMATION_INTERVAL import com.mogo.och.unmanned.taxi.ui.navi.amap.TaxiAmapNaviFragment import com.mogo.och.unmanned.taxi.ui.navi.auto.TaxiRoutingNaviFragment import com.mogo.och.unmanned.taxi.ui.operational.TaxiOperationalDialogFragment import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel -import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskTabFragment import com.mogo.och.unmanned.taxi.ui.task.itinerarycurrent.ItineraryCurrentView import com.mogo.och.unmanned.taxi.utils.TPRouteDataTestUtils -import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.unmannedMapCL import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.module_mogo_och_navi_panel_container import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.orderDebugView import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.startAutopilotAnimationView import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.taxi_close_navi_icon +import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.unmannedMapCL import java.lang.ref.WeakReference /** @@ -106,13 +98,14 @@ class TaxiFragment :MvpFragment(), object : IToolKitItemClickListener { override fun onItemClick(toolTag: String, ctx: Context?) { + d(TAG, "外部：runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag") when (toolTag) { runningTaskGateWay -> { - personalDialogFragment = - WeakReference(TaxiOperationalDialogFragment()) + d(TAG, "runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag") + personalDialogFragment = WeakReference(TaxiOperationalDialogFragment()) activity?.supportFragmentManager?.let { - personalDialogFragment!!.get() - ?.show(it, "service_data") + d(TAG, "runningTaskGateWay:展示view ${personalDialogFragment!!.get()}") + personalDialogFragment!!.get()?.show(it, "service_data") } } }