diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java index e577d2910f..9927dda46c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java @@ -15,4 +15,6 @@ public interface IBusLinesCallback { void onBusLineTasks(List o, int position,boolean autoRefresh); void onRefreshSuccess(long currentTimeStamp); + + void onChangeLineIdFail(); } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt index 586aad1940..689c024307 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt @@ -250,6 +250,7 @@ object BusLineModel { override fun startFail(msg: String) { ToastUtils.showShort("选择任务失败:$msg") + mBusLinesCallback?.onChangeLineIdFail() } }) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt index 7bbd1f10a5..637d150d39 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt @@ -53,9 +53,8 @@ class BusLinePresenter(view: BusSwitchLineView?) : Presenter override fun onChangeLineIdSuccess() { clearBusStationDatas() UiThreadHandler.post({ - if (mView != null) { - mView!!.onChangeLineIdSuccess() - } + mView?.startTaskState(true) + mView?.onChangeLineIdSuccess() }, UiThreadHandler.MODE.QUEUE) } @@ -108,6 +107,10 @@ class BusLinePresenter(view: BusSwitchLineView?) : Presenter mView?.refreshDate(DateTimeUtil.formatLongToString(currentTimeStamp,DateTimeUtil.yyyy_MM_dd_HH_mm_ss)) } + override fun onChangeLineIdFail() { + mView?.startTaskState(false) + } + fun refreshTask() { BusLineModel.refreshTask() } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt index 5b61e4303e..929f48e6e6 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt @@ -2,6 +2,8 @@ package com.mogo.och.weaknet.ui import android.animation.ObjectAnimator import android.animation.ValueAnimator +import android.content.res.ColorStateList +import android.graphics.Color import android.graphics.Point import android.os.Bundle import android.view.Gravity @@ -9,6 +11,7 @@ import android.view.View import android.view.ViewGroup import android.view.WindowManager import android.widget.ImageView +import android.widget.LinearLayout import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager @@ -28,6 +31,8 @@ import com.mogo.och.weaknet.ui.adapter.OpenItemAnimator import com.mogo.och.weaknet.ui.adapter.SwitchLineAdapter import kotlinx.android.synthetic.main.shuttle_weak_switch_line.aciv_refresh_task import kotlinx.android.synthetic.main.shuttle_weak_switch_line.actv_last_refresh_date +import kotlinx.android.synthetic.main.shuttle_weak_switch_line.pb_start_task +import kotlinx.android.synthetic.main.shuttle_weak_switch_line.tv_start_task /** @@ -44,7 +49,7 @@ class BusSwitchLineActivity : MvpActivity private lateinit var mClose: ImageView private lateinit var mNoDatasView: ConstraintLayout private lateinit var mLinesListView: RecyclerView - private lateinit var mLineCommitBtn: TextView + private lateinit var mLineCommitBtn: LinearLayout private lateinit var mAdapter: SwitchLineAdapter private lateinit var linearLayoutManager:LinearLayoutManager private val mData: MutableList = ArrayList() @@ -105,6 +110,7 @@ class BusSwitchLineActivity : MvpActivity animator?.start() } mPresenter?.setRefreshTime() + pb_start_task.progressTintList = ColorStateList.valueOf(Color.WHITE) } /** @@ -214,6 +220,7 @@ class BusSwitchLineActivity : MvpActivity } + /** * 有无数据UI显示 * @param b @@ -240,12 +247,35 @@ class BusSwitchLineActivity : MvpActivity if (v.id == R.id.switch_line_btn_commit) { if(mAdapter.checkLine!=null&&mAdapter.checkTask!=null){ mPresenter?.commitSwitchLineId(mAdapter.checkTask!!,mAdapter.checkLine!!) + mPresenter?.let { + it.commitSwitchLineId(mAdapter.checkTask!!,mAdapter.checkLine!!) + startTaskLoading() + } }else{ ToastUtils.showLong("请选择任务") } } } + override fun startTaskState(success: Boolean) { + pb_start_task.visibility = View.GONE + if(success){ + tv_start_task.text = "创建成功" + }else{ + tv_start_task.text = "创建失败" + UiThreadHandler.postDelayed({ + tv_start_task.text = "确定" + },1_000) + } + } + + + fun startTaskLoading(){ + pb_start_task.visibility = View.VISIBLE + tv_start_task.text = "创建中" + } + + override fun onDestroy() { mPresenter!!.removeListener() super.onDestroy() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java index a193cf0832..21706e2b16 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java @@ -20,5 +20,7 @@ public interface BusSwitchLineView extends IView { void onBusLineTasks(List o, int position,boolean autoRefresh); void refreshDate(@Nullable String formatLongToString); + + void startTaskState(boolean b); } diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml index ae75520d60..afbb178bc8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml @@ -93,6 +93,7 @@ android:visibility="gone" android:id="@+id/upload_btn_commit_progress" android:progressBackgroundTint="@color/white" + android:layout_marginEnd="@dimen/dp_15" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - + android:layout_marginBottom="@dimen/bus_switch_line_btn_margin_b"> + + + +