From 2b861eee8483d080944bcfabb7139f2df7bffd59 Mon Sep 17 00:00:00 2001 From: bxb Date: Tue, 17 Jan 2023 15:10:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E6=B8=85=E6=89=AB?= =?UTF-8?q?=E8=BD=A6=E5=88=97=E8=A1=A8=E5=92=8C=E5=88=97=E8=A1=A8=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E5=B8=83=E5=B1=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/AndroidManifest.xml | 4 - .../com/mogo/och/sweeper/bean/TaskInfoBean.kt | 3 + .../fragment/BaseSweeperTabFragment.java | 13 +- .../och/sweeper/fragment/SweeperFragment.java | 73 ----- .../och/sweeper/fragment/SweeperFragment.kt | 89 ++++++ .../och/sweeper/ui/adapter/TaskListAdapter.kt | 66 +++++ .../sweeper/view/SweeperTrafficLightView.java | 1 + .../main/res/drawable-xhdpi/no_order_data.png | Bin 14403 -> 0 bytes .../main/res/drawable-xhdpi/no_task_data.png | Bin 0 -> 13477 bytes .../sweeper_task_list_left_select_icon.png | Bin 0 -> 2355 bytes .../main/res/drawable/bg_shape_work_mode.xml | 2 +- .../sweeper_line_dividing_line2_selector.xml | 2 +- ...ine.xml => sweeper_list_left_top_line.xml} | 2 +- .../src/main/res/drawable/sweeper_refresh.xml | 9 + .../res/drawable/sweeper_task_list_btn.xml | 5 + .../res/drawable/sweeper_task_list_nor.xml | 7 + .../drawable/sweeper_yi_biao_pan_bg_nor.xml | 20 -- .../main/res/layout/fragment_och_sweeper.xml | 254 ++++++------------ .../main/res/layout/sweeper_base_fragment.xml | 12 +- .../res/layout/sweeper_current_task_info.xml | 10 +- .../res/layout/sweeper_item_task_info.xml | 64 +++++ .../layout/sweeper_no_data_common_view.xml | 55 ++-- .../src/main/res/values/strings.xml | 2 +- 23 files changed, 392 insertions(+), 301 deletions(-) create mode 100644 OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/TaskInfoBean.kt delete mode 100644 OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java create mode 100644 OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt create mode 100644 OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt delete mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_order_data.png create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_task_data.png create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png rename OCH/mogo-och-sweeper/src/main/res/drawable/{bg_shape_task_info_line.xml => sweeper_list_left_top_line.xml} (61%) create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_refresh.xml create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_btn.xml create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_nor.xml delete mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_nor.xml create mode 100644 OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml diff --git a/OCH/mogo-och-sweeper/src/main/AndroidManifest.xml b/OCH/mogo-och-sweeper/src/main/AndroidManifest.xml index b8d998f9b0..c2a6c2cfeb 100644 --- a/OCH/mogo-och-sweeper/src/main/AndroidManifest.xml +++ b/OCH/mogo-och-sweeper/src/main/AndroidManifest.xml @@ -11,10 +11,6 @@ - /> \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/TaskInfoBean.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/TaskInfoBean.kt new file mode 100644 index 0000000000..55a443224b --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/TaskInfoBean.kt @@ -0,0 +1,3 @@ +package com.mogo.och.sweeper.bean + +data class TaskInfoBean(var taskId: Int, var taskName: String, var taskType: Int) \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java index a436daedfd..73628b6b50 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java @@ -100,14 +100,21 @@ public abstract class BaseSweeperTabFragment { - @Override - public String getTagName() { - return "SweepersFragment"; - } - - @Override - protected void initViews() { - super.initViews(); - } - - @NonNull - @Override - protected SweeperPresenter createPresenter() { - return new SweeperPresenter(this); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public int getStationPanelViewId() { - return R.layout.fragment_och_sweeper; - } - - @Override - public int getSweepOperatePanelViewId() { - return R.layout.sweeper_operate_panel_view; - } - - @Override - public void restartAutopilot() { - if (!isAnimateRunning) { - mPresenter.restartAutopilot(); - } - } - /** - * VR模式切换 - * - * @param isVRMode - */ - public void onVRModeChanged(boolean isVRMode) { - if (mRootView != null) { - mRootView.setVisibility(isVRMode ? View.VISIBLE : View.GONE); - } - } - public void hideOchSweeper(){ - - } - @Override - public void debugAutoPilotStatus(int status) { - mPresenter.debugAutoPilotStatus(status); - } - - -} diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt new file mode 100644 index 0000000000..929146f4ed --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt @@ -0,0 +1,89 @@ +package com.mogo.och.sweeper.fragment + +import android.view.View +import android.widget.ImageView +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.bean.TaskInfoBean +import com.mogo.och.sweeper.presenter.SweeperPresenter +import com.mogo.och.sweeper.ui.adapter.TaskListAdapter + +/** + * 清扫车主界面 + */ +class SweeperFragment : BaseSweeperTabFragment() { + private var mTaskRefresh: ImageView? = null //刷新任务列表按钮 + private var mRecyclerView: RecyclerView? = null + private var mAdapter: TaskListAdapter? = null + private val mutableList:MutableList by lazy { mutableListOf() } + override fun getTagName(): String { + return "SweepersFragment" + } + + override fun initViews() { + super.initViews() + mTaskRefresh = findViewById(R.id.ivTaskRefresh) + mRecyclerView = findViewById(R.id.rvTaskList) + mutableList.add(TaskInfoBean(1,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(2,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(3,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(4,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(5,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(6,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(7,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(8,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(9,"环球贸易中心",1)) + mutableList.add(TaskInfoBean(10,"环球贸易中心",1)) + mAdapter= context?.let { TaskListAdapter(it,mutableList) } + val linearLayoutManager=LinearLayoutManager(context) + linearLayoutManager.orientation=LinearLayoutManager.VERTICAL + mRecyclerView?.layoutManager=linearLayoutManager + mRecyclerView?.adapter=mAdapter + mAdapter?.setOnTaskItemClickListener(onTaskItemClickListener) + } + + override fun createPresenter(): SweeperPresenter { + return SweeperPresenter(this) + } + + override fun onResume() { + super.onResume() + } + + override fun getStationPanelViewId(): Int { + return R.layout.fragment_och_sweeper + } + + override fun getSweepOperatePanelViewId(): Int { + return R.layout.sweeper_operate_panel_view + } + + override fun restartAutopilot() { + if (!isAnimateRunning) { + mPresenter?.restartAutopilot() + } + } + + /** + * VR模式切换 + * + * @param isVRMode + */ + fun onVRModeChanged(isVRMode: Boolean) { + if (mRootView != null) { + mRootView.visibility = if (isVRMode) View.VISIBLE else View.GONE + } + } + + fun hideOchSweeper() {} + override fun debugAutoPilotStatus(status: Int) { + mPresenter!!.debugAutoPilotStatus(status) + } + private val onTaskItemClickListener=object : TaskListAdapter.TaskItemClickListener{ + override fun onItemClick(position: Int) { + mAdapter?.selectPosition(position) + } + + } +} \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt new file mode 100644 index 0000000000..412a851fc7 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt @@ -0,0 +1,66 @@ +package com.mogo.och.sweeper.ui.adapter + +import android.content.Context +import android.graphics.Color +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.mogo.och.sweeper.R +import com.mogo.och.sweeper.bean.TaskInfoBean + +class TaskListAdapter( + private val context: Context, + private val data: List?, +) : RecyclerView.Adapter() { + private var mItemClickListener: TaskItemClickListener? = null + private var mSelectPosition: Int = -1 + fun setOnTaskItemClickListener(itemClickListener: TaskItemClickListener?) { + mItemClickListener = itemClickListener + } + + class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val selectIv: ImageView + val taskName: TextView//任务名称 + val taskDesc: TextView//任务描述 + + init { + selectIv = itemView.findViewById(R.id.ivTaskSelect) + taskName = itemView.findViewById(R.id.tvTaskName) + taskDesc = itemView.findViewById(R.id.tvTaskDesc) + } + } + + fun selectPosition(position: Int) { + this.mSelectPosition = position + notifyDataSetChanged() + } + + interface TaskItemClickListener { + fun onItemClick(position: Int) + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TaskViewHolder { + val view = LayoutInflater.from(parent.context).inflate( + R.layout.sweeper_item_task_info, parent, false + ) + return TaskViewHolder(view) + } + + override fun onBindViewHolder(holder: TaskViewHolder, position: Int) { + if (position == mSelectPosition) { + holder.selectIv.visibility = View.VISIBLE + holder.itemView.setBackgroundColor(Color.parseColor("#FF152644")) + } else { + holder.selectIv.visibility = View.GONE + holder.itemView.setBackgroundColor(Color.parseColor("#00000000")) + } + holder.itemView.setOnClickListener { + mItemClickListener?.onItemClick(position) + } + } + + override fun getItemCount(): Int = data?.size ?: 0 +} \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java index f86733914d..d7e3fa0caf 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java @@ -7,6 +7,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight; +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.och.sweeper.R; diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_order_data.png deleted file mode 100644 index 0e61996d3fb4d3db8413a52fae4eb5d3e7d78cee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14403 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 diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_task_data.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_task_data.png new file mode 100644 index 0000000000000000000000000000000000000000..3a30c8efe8f8858663c8a880742dfa13d33856a6 GIT binary patch literal 13477 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 literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..14a358eb9053781d3b4d26f08dfb1447f97c3572 GIT binary patch literal 2355 zcmV-33C#A1P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR916`%tE1ONa40RR91mH+?%0RCOrOaK4~ok>JNRA>dYTRo2)MG)&u5fC9Efk?nMf58$E01-mS2^I-D8_769 z$Z}xL_T9}+^Ilcg&g|YA-E=Kw?Nx2h^qbdJ)zv+-<8UdZDx^#KlcL(t4vDAJ=acIh z;50OC(ebstQrzZlnAXR`5n*;WY$w{(04xXH4o8}2=9G?P%k=!fD5E(VLj5q@%blKt zrcGTg%`QMU!-fq1pAZsl>T<{snnU4Hvlleju;IuUs6Eom!mLW6ai!2Qfu;$Q#u`)D zjWJ9UwY8OKFpaf=VBi8sT>@r(nl|jguZQz@`jWQOr%kAvF6;=i6lx5A2W)HK@M{cz zH`JLa5-d#dp)QvONmNh6BqI=zVp_kA{fp>N>ngM|+%`0+flWOYXn1~8g&BORE`%Lu zQ+ouU6*9o21H%eepe`4V6M2e&LmB|Ku&K)-fzyQ+KGi^VK&mi&YL5VPQqSk92Wil^ zL59|QLA~0*0WJPfdjw3oW`aRe5c32(QoBF_hd`-R@Fs0)k4W@A0IT|9_z8Zsxxea^ z@oh-{e)!^5xqx#1_;>60Y!f8a?HJ#9(EU~0u?OUUum{b*j zz2p`sfoZ}As|W<1#TGC`>V>mLe&K>&TdX;+Xj6Lx$sgxC36?+vE?Oxp1s0}EA{BC^ z?c)lj9oA#@DbV0cv3)+(Smz?}_nl4oFsbwX$l}P;#e|zrZ zIO^FLKI^GQ8x>1t6SYTV_<+d6wX!!ag+X(yUc)5)Rs=>jG|w&n0H-7rSdZ=eJI8$YqG=+Wxc{cVb`}- zqFhZQ@52QZtgS@#ZY~%E^AuZj6(ZC2@+RoQ69X?G>E&taCP%EfNa^bbOjnYt%cW#m z&F^G0#kuIRP=J+^Z?`o=oM#m6bO2$@KO4#656<#1rYtt-jRpVFC-ZK2$*a z^(MskevjvFjlsqv2xX@XxmhDqSz_St?hNh$zCD?)y!B%Gp2rR(7=Fda9V?i{JkQ$n zM0P`qcE7rb^t%zy-NW#&>=>wZpk6>f;1{^%FZlc&35e}b2u}NP7h$_ynAb7eNH8_w z9{ML@3iZ>`0NKfG(`w1oF{A|UqZV&?kr{lH{_(Tn_@_U_m->goE5NMjKLdq1{0mNe_hvl5 zHKt1EKxw7d#~et1xs`|?Y=yI5A&Vd5Z{xLJgG|DZIFb12Q0P_PjOV^A0pukR{oym% z8AOg4)ul!W1xux^%egt4vetsxykb zxgM6wLP24MA{(4{rn>yjr=I!1bSc-&RJ$)P$;F`XAj+ARJ}oAEFslWo7!-hn^-HpgDM)eM&&)UpXpdj)h9qR}gQx_a`?#2OilNv?%$)3L;$sy1PIQc*+t6Sz$!H(KNW&= z>f1#ML4m?5WvCg{7c0rr#gx)@s*I!dLP}Md+y~qH z9bUs1o7w}47q6e5ZD)j2(0_)bf%0a@PO=002ovPDHLkV1nDtV?Y1^ literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_work_mode.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_work_mode.xml index dc38f6a174..b451082e68 100644 --- a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_work_mode.xml +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_work_mode.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line2_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line2_selector.xml index ee555aae15..55353f3ca8 100644 --- a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line2_selector.xml +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_line_dividing_line2_selector.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_info_line.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml similarity index 61% rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_info_line.xml rename to OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml index 540e1294c9..9d92ddd223 100644 --- a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_info_line.xml +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_refresh.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_refresh.xml new file mode 100644 index 0000000000..58e3089f6f --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_refresh.xml @@ -0,0 +1,9 @@ + + + diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_btn.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_btn.xml new file mode 100644 index 0000000000..bcf6d59bcf --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_btn.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_nor.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_nor.xml new file mode 100644 index 0000000000..e521225074 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_nor.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_nor.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_nor.xml deleted file mode 100644 index 2ef90e60f7..0000000000 --- a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_yi_biao_pan_bg_nor.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml b/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml index a6fa76d9de..142c43625c 100644 --- a/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml @@ -1,176 +1,92 @@ - - - - - - - + + android:layout_height="match_parent"> + + + + + - + - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml index 6b69b7ec87..ac531f1404 100644 --- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml @@ -19,7 +19,8 @@ android:layout_marginStart="@dimen/dp_41" android:background="@drawable/bg_shape_work_mode" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintTop_toBottomOf="@+id/sweeper_arc"/> + app:layout_constraintTop_toBottomOf="@+id/sweeper_arc" + android:visibility="gone"/> + android:visibility="visible" + android:layout_marginBottom="@dimen/dp_30"/> + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_no_data_common_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_no_data_common_view.xml index f2bdf5c425..3256bc03d4 100644 --- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_no_data_common_view.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_no_data_common_view.xml @@ -1,31 +1,42 @@ - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="visible"> - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/values/strings.xml b/OCH/mogo-och-sweeper/src/main/res/values/strings.xml index dde461448c..187d9bf3c9 100644 --- a/OCH/mogo-och-sweeper/src/main/res/values/strings.xml +++ b/OCH/mogo-och-sweeper/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ 准备就绪 自动驾驶中，不可切换路线 当前行程未完成，不可切换路线 - 当前车辆无路线\n请联系运营人员绑定 + 当前暂无任务 起点: 终点: 更换路线成功