From a42e417af23238d61e429d9e4f96f51b323cb33f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 25 Sep 2024 17:47:25 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E6=B7=BB=E5=8A=A0=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E7=BC=93=E5=AD=98=E4=BB=BB=E5=8A=A1=E3=80=81=E8=BD=A6?= =?UTF-8?q?=E9=81=93=E5=BC=95=E5=AF=BC=E3=80=81=E8=BF=90=E8=90=A5=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wigets/biz/OperationalInfoGatewayView.kt | 48 ++++++++++++++++ .../module/wigets/map/drawline/LineView.kt | 14 +++-- .../drawable-nodpi/common_biz_operation.png | Bin 0 -> 18677 bytes .../drawable-nodpi/common_map_line_close.png | Bin 20341 -> 5558 bytes .../drawable-nodpi/common_map_line_open.png | Bin 24632 -> 4910 bytes .../src/main/res/layout/common_line_view.xml | 36 ++++++++++++ .../common/src/main/res/values/strings.xml | 3 + .../weaknet/ui/fragment/ShuttleFragment.kt | 18 ++++++ .../ui/taskrunned/RunningTaskGatewayView.kt | 53 ++++++++++++++++++ .../bus_running_task_history.png | Bin 0 -> 17269 bytes .../src/main/res/values/strings.xml | 1 + .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 27 +++++++++ .../com/mogo/och/taxi/ui/TaxiFragment.java | 14 ++--- .../taxi/ui/base/BaseTaxiTabFragment.kt | 27 +++++++++ .../och/unmanned/taxi/ui/base/TaxiFragment.kt | 20 ++----- 15 files changed, 233 insertions(+), 28 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/common_biz_operation.png mode change 100644 => 100755 OCH/common/common/src/main/res/drawable-nodpi/common_map_line_close.png mode change 100644 => 100755 OCH/common/common/src/main/res/drawable-nodpi/common_map_line_open.png create mode 100644 OCH/common/common/src/main/res/layout/common_line_view.xml create mode 100644 OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskGatewayView.kt create mode 100644 OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_running_task_history.png diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt new file mode 100644 index 0000000000..c548b06851 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt @@ -0,0 +1,48 @@ +package com.mogo.och.common.module.wigets.biz + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.och.common.module.R +import com.mogo.och.common.module.utils.ResourcesUtils +import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_head +import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_title + +/** + * + */ +class OperationalInfoGatewayView : ConstraintLayout { + + private val TAG = "LineView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super( + context, + attributeSet, + defStyleAttr + ) + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.common_line_view, this, true) + iv_toolkit_item_head.setImageResource(R.drawable.common_biz_operation) + iv_toolkit_item_title.text = ResourcesUtils.getString(R.string.common_operation) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt index d7f9262861..7515dcdc06 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt @@ -2,18 +2,22 @@ package com.mogo.och.common.module.wigets.map.drawline import android.content.Context import android.util.AttributeSet -import androidx.appcompat.widget.AppCompatImageView +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.R import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.common.module.utils.ResourcesUtils +import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_head +import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_title /** * */ -class LineView : AppCompatImageView, LineViewModel.ILineViewCallback { +class LineView : ConstraintLayout, LineViewModel.ILineViewCallback { private val TAG = "LineView" @@ -28,7 +32,9 @@ class LineView : AppCompatImageView, LineViewModel.ILineViewCallback { ) private fun initView() { - setImageResource(R.drawable.common_map_line_close) + LayoutInflater.from(context).inflate(R.layout.common_line_view, this, true) + iv_toolkit_item_head.setImageResource(R.drawable.common_map_line_close) + iv_toolkit_item_title.text = ResourcesUtils.getString(R.string.common_line_info) } override fun onAttachedToWindow() { @@ -62,7 +68,7 @@ class LineView : AppCompatImageView, LineViewModel.ILineViewCallback { } override fun setImageViewResource(name: Int) { - setImageResource(name) + iv_toolkit_item_head.setImageResource(name) } diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_biz_operation.png b/OCH/common/common/src/main/res/drawable-nodpi/common_biz_operation.png new file mode 100644 index 0000000000000000000000000000000000000000..743141bc95d5bc7baa998c8a1d14bb62584689e5 GIT binary patch literal 18677 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 literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_map_line_close.png b/OCH/common/common/src/main/res/drawable-nodpi/common_map_line_close.png old mode 100644 new mode 100755 index 4187e3ddbd03e180d5e0cf3c44feae776b010f91..febf573bb2361142fffecd89801013d977611f0c GIT binary patch literal 5558 zcmXYV2UJtr)^$SYEi?t`JT9Vwpjbep7ZF83ML`jWbWxBd?FJ1sAV?DhfzXlOr3fJe zLhseklh8t_p_f4X&imiL#>mOeI&;r8*IfIIWF*qm*no>&m>mQHaT(s%djh;?{`bWS z0j_A?Bnc3R;mp*?Odt4&!{L^emgeT>YHMqM{ra`Jxmi+1oA#l=NCJG+*amhSHEwY9aq zy*=RC*4_@(+Su3t)_r~b0CIA2vahdiU|;~)GCe&_CX)d+K*svU2EeeszTVZ<1qf(s zYXhnSad=Aa@9&?Om;ma|&dw4DgtfJGK>XCy)Y#Y<008a+v;f2E>MD^)1ZoWp4FNDf zGXSHV{rz93020Um{3H^osi_H|0-6O10Z1T#d?UJXe0&^$0jhv<02|NT5f1;1l;KSf3d%R04Nz890VExFn}ZqWp!g?b98icb88D=0Pw&XkTg6zJUTW8 zs0FO+>FJrDUjVEFIDxK#U4QU@(C9|MVZa$+3!u5TuMaS-wY9adu&|^dp}oERzYL?J zOVoqj-d;c_P#@ShwMYT-b#-;X1ncVRQ_8&eX>{7z+19}cUx!eJqXA)gd3iwHl#~=;tn(|YpVIZGrlzr2EHHF58VwvU zz;nP=U_gLcpf8|(pb@|>z?t6OK4A2~$bhbWe0*G8U7eksJv=-B=74|z6bhA?m>3us z2vn)4s7y{yj*E*UZtU6E*hEG~A`pm>kdU05obd2)%08{Mv@|m_^XJc>afNmvnGYIp zMUi>txi#T4D_fb>@aFdF?BAi#OxG=EqZ`;Z2o?0vwtPppK-!Znip{|;Ka=fvz(%scxQ$eFFb+izt@jX=q zN4wkjj+~?2+QPHF&GqG`QeMgg=67W&p$k*LR!?0a{TUgquihr$52|;li!;+bts9Gk znc)Gda zbUXUYg`j_ZeedP(%#5P*Gw*MV=ZrR?vwwUI8d3v+cry(3w9Wjc)<-Mf3cnWW-1cF+ zbZ7NHmlHUxC3U49B8lgWY}evKN91iEv7M`048;aXJy8wI)|F&bPSV>94QYI;GR%1* z=v_k893#*$hjag$TSXf$VFtZ)>Y#(uXy8cv|2Sz5XtI}M>7RPi^wHew9dH;=kUxw~ zOt$-bZ+^g4h?P!nm8OMXy82D{i>p-~bM1n?!<|BzJkz^>eZ*Z19`wZ6iTr%inDcBm z^Iy@1a1D3+H^!~?BE;)i!S7RjbY5CoiuBeN`Xc3))X)E$;^rV@_?0SU_#mKKgj+AB zZ{1$$we-1cH}e}trFA-U?j=xrN1O@YwPvf^9|Z+1_(ILtGO}4o!csnVm6fgyh0l(# zatBu*{>hYeky=W}n#lxEGFKjk}&5YaIhgm|I zIaWw|GGy$DM(2Djtj}UWI$5V4xs8wv5A`<@%DFJ0q*16Fb6z28{*8t*t7g#V`z@&% zT*4*Z77Nl=+8~FN^CYGxjO_A8*^DlQ3+V8?>9mizQ^7!do(@vJeZ=J;T~ohRc{JuGD^FmWL^GDh z59EnhoaZmPa)UWiuV9h#NzcZ)UNL|;Y!ay6_rj!vCdSmWExe9@=vq*;dRZ#eBZIHb zR2&syu-QZm%8=bE%`_V7GLVgKQ<5m>mJT*$ifelxLG2Nt%S}%Ov$R1zr5Nq;z4B63 zo0s;>;`ZEEt$kdMA6LEMDHUU(y&f)d8gA!RPXtdB^1mvJLCso&pIs3f@c!V}-e|Y9 z$?g2%ysUL=R|Kua{GxKSR8HdrICbmiS3|PFnvlngu85S%3GgS};R|T%ZGGrb5%QV*2D>!eOlVzL+uty|^=u(fCs#}Ara_b_)n65L z>OXqfHG%CA>!NNZ@v_vVcy&LDg<#IJr2<_GGhp794qXvB_i>wUD*0=ciTfyNFW}!t zN-+y6#{T?_4>o_g^>TBn4mD8xc>Qk`&Rlw}bLmczmEIq$F{A!J0vsjJ7=y&VKNq;U zn*CQ2u3$EjwxUT2Qypdt#56CAj-9;N%0DkK95uMLZ5~)%0@pY^L0x+z>ZeL2@*9d{ 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 literal 20341 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 Hu0mjfK83R0 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_map_line_open.png b/OCH/common/common/src/main/res/drawable-nodpi/common_map_line_open.png old mode 100644 new mode 100755 index 8bfc10bae6ce964a153ae312fcaff2581e4bbeab..cbf5dcc77016e23e0e3de527c395f860dccb1ee5 GIT binary patch literal 4910 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 + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/strings.xml b/OCH/common/common/src/main/res/values/strings.xml index 825d744df0..587ebe9d52 100644 --- a/OCH/common/common/src/main/res/values/strings.xml +++ b/OCH/common/common/src/main/res/values/strings.xml @@ -7,6 +7,9 @@ START 启动失败 + 车道指引 + 运营看板 + 欢迎您登录 登录 获取验证码 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 03520387e9..f2ab0199b7 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,5 +1,6 @@ package com.mogo.och.weaknet.ui.fragment +import android.content.Context import android.graphics.BitmapFactory import android.os.Bundle import android.view.LayoutInflater @@ -10,11 +11,14 @@ 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 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager +import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager 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 @@ -35,6 +39,11 @@ import org.greenrobot.eventbus.ThreadMode */ class ShuttleFragment : MvpFragment() { + + private val runningTaskGateWay = "RUNNINGTASKGATEWAY" + private val lineView = "LINEVIEW" + + override fun getLayoutId(): Int { return R.layout.shuttle_weak_base_fragment } @@ -47,6 +56,15 @@ class ShuttleFragment : MvpFragment() { context?.let { boneContainerView.addBizView(SwitchBizView(it)) + + CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"本地缓存任务", R.drawable.bus_running_task_history,4) + CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object : + IToolKitItemClickListener{ + override fun onItemClick(toolTag: String, ctx: Context?) { + RunningTaskManager.showBadCaseConfigWindow(it) + } + }) + CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10) } initListener() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskGatewayView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskGatewayView.kt new file mode 100644 index 0000000000..cbd692abb6 --- /dev/null +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskGatewayView.kt @@ -0,0 +1,53 @@ +package com.mogo.och.weaknet.ui.taskrunned + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.ImageView +import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.shuttle.weaknet.R + +/** + * + */ +class RunningTaskGatewayView : ConstraintLayout { + + private val TAG = "LineView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super( + context, + attributeSet, + defStyleAttr + ) + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.common_line_view, this, true) + findViewById(R.id.iv_toolkit_item_head).setImageResource(R.drawable.bus_running_task_history) + findViewById(R.id.iv_toolkit_item_title).text = ResourcesUtils.getString(R.string.bus_running_tasked_gateway) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + + onClick { + RunningTaskManager.showBadCaseConfigWindow(context) + } + + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + +} \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_running_task_history.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_running_task_history.png new file mode 100644 index 0000000000000000000000000000000000000000..40f08dc381033915520e4e919e125ec3c9a25a00 GIT binary patch literal 17269 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距离发车时间还有%1$s分钟 平行驾驶 + 本地缓存任务 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 0344ff4e70..b4482c5db0 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 @@ -3,6 +3,7 @@ package com.mogo.och.taxi.ui; import static com.mogo.och.taxi.constant.TaxiConst.TIMER_START_AUTOPILOT_INTERVAL; import android.animation.ObjectAnimator; +import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -15,6 +16,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Group; import androidx.fragment.app.FragmentTransaction; @@ -23,10 +25,12 @@ import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; 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; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; +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.view.OnPreventFastClickListener; @@ -34,11 +38,14 @@ 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.och.common.module.utils.ResourcesUtils; +import com.mogo.och.common.module.wigets.map.drawline.LineView; import com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView; import com.mogo.och.common.module.wigets.map.overmapview.OverMapDialog; import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager; import com.mogo.och.taxi.R; +import java.lang.ref.WeakReference; + import me.jessyan.autosize.utils.AutoSizeUtils; @@ -73,6 +80,13 @@ public abstract class BaseTaxiTabFragment personalDialogFragment = null; + + @Override protected int getLayoutId() { return R.layout.taxi_base_fragment; @@ -175,6 +189,19 @@ public abstract class BaseTaxiTabFragment(new TaxiPersonalDialogFragment()); + personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data"); + } + }); + CallerEagleBaseFunctionCall4OchManager.INSTANCE.addSingleToolKitCustomItem(lineView, new LineView(getContext()),10); + } + } @Override diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index b837a3510f..5d49affc46 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -60,8 +60,6 @@ public class TaxiFragment extends BaseTaxiTabFragment serverOrdersFragmentWR; - // 查看运营情况 点击账户信息右边的箭头展示 - private WeakReference personalDialogFragment = null; @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { @@ -366,16 +364,12 @@ public class TaxiFragment extends BaseTaxiTabFragment(new TaxiPersonalDialogFragment()); - personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data"); - } private void testRouteInfoUpload() { TPRouteDataTestUtils.converToRouteData(); diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt index 2249eba786..b1444dc508 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt @@ -2,6 +2,7 @@ package com.mogo.och.unmanned.taxi.ui.base import android.animation.ObjectAnimator import android.annotation.SuppressLint +import android.content.Context import android.content.Intent import android.os.Bundle import android.view.LayoutInflater @@ -16,11 +17,13 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter 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.devatools.CallerDevaToolsManager 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.ui.widget.ParallelDriveView import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener @@ -29,6 +32,7 @@ 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.wigets.StartAutopilotAnimationView +import com.mogo.och.common.module.wigets.map.drawline.LineView import com.mogo.och.common.module.wigets.map.overmapview.OverMapDialog import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst @@ -36,6 +40,7 @@ import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.START_AUT import com.mogo.och.unmanned.taxi.ui.debug.DebugView 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 kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.aciv_show_guid import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.groupTestPanel import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.mapBizView @@ -50,6 +55,8 @@ import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.parallelDriveV import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.smallMapView import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.startAutopilotAnimationView import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.taxi_close_navi_icon +import java.lang.ref.WeakReference + /** * @author: wangmingjun * @date: 2023/7/24 @@ -70,6 +77,12 @@ abstract class BaseTaxiTabFragment> : MvpFragment? = null + + override fun getLayoutId(): Int { return R.layout.unmanned_taxi_base_fragment } @@ -184,6 +197,20 @@ abstract class BaseTaxiTabFragment> : MvpFragment(), } private var taskTabFragment: WeakReference? = null - private var personalDialogFragment: WeakReference? = null + private var routingVerifyFragment: WeakReference? = null private var moFanglistener: IMogoStatusChangedListener? = object :IMogoStatusChangedListener{ @@ -76,19 +76,11 @@ class TaxiFragment : BaseTaxiTabFragment(), @Subscribe(threadMode = ThreadMode.MAIN) fun openOperationalInfoView(eventLogout: EventLogout) { // V6.2.0 增加订单统计功能 - if (eventLogout.messgae == EventLogout.PERSONAL_TYPE) { -// 个人信息, 运营数据在无人化阶段暂时不展示 - d(SceneConstant.M_TAXI + TAG, "openOperationalInfoView Event个人中心") - openOperationalInfoView() - } - } - - private fun openOperationalInfoView() { - personalDialogFragment = WeakReference(TaxiOperationalDialogFragment()) - activity?.supportFragmentManager?.let { - personalDialogFragment!!.get() - ?.show(it, "service_data") - } +// if (eventLogout.messgae == EventLogout.PERSONAL_TYPE) { +//// 个人信息, 运营数据在无人化阶段暂时不展示 +// d(SceneConstant.M_TAXI + TAG, "openOperationalInfoView Event个人中心") +// openOperationalInfoView() +// } } override fun getTagName(): String {