diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt index c81ffa4895..6d8dbab382 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt @@ -1,35 +1,49 @@ package com.mogo.och.biz.login.ui +import android.animation.Animator +import android.animation.Animator.AnimatorListener +import android.animation.AnimatorSet +import android.animation.ObjectAnimator import android.graphics.Rect import android.os.SystemClock import android.view.* import android.view.ViewTreeObserver.OnGlobalLayoutListener -import androidx.constraintlayout.widget.ConstraintLayout +import android.view.animation.DecelerateInterpolator +import android.view.animation.LinearInterpolator import androidx.core.content.ContextCompat import androidx.core.widget.addTextChangedListener +import com.mogo.commons.AbsMogoApplication 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.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.KeyboardUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.biz.BuildConfig import com.mogo.och.biz.R import com.mogo.och.biz.login.callback.ILoginViewCallback import com.mogo.och.biz.login.presenter.LoginPresenter +import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder +import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack +import com.shuyu.gsyvideoplayer.utils.Debuger import kotlinx.android.synthetic.main.biz_login_view.biz_acbtn_login import kotlinx.android.synthetic.main.biz_login_view.biz_ace_login_phone_value import kotlinx.android.synthetic.main.biz_login_view.biz_acet_phone_code_value import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_get_code import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_show_sn import kotlinx.android.synthetic.main.biz_login_view.biz_actv_welcome_login_title +import kotlinx.android.synthetic.main.biz_login_view.biz_cl_driver_main +import kotlinx.android.synthetic.main.biz_login_view.biz_login_svp import kotlinx.android.synthetic.main.biz_login_view.bv_switch_business +import kotlinx.android.synthetic.main.biz_login_view.cl_login_info import kotlinx.android.synthetic.main.biz_login_view.eiv_Info +import me.jessyan.autosize.utils.AutoSizeUtils /** @@ -38,7 +52,10 @@ import kotlinx.android.synthetic.main.biz_login_view.eiv_Info */ class LoginFragment : MvpFragment(), ILoginViewCallback { - private var biz_cl_driver_main: ConstraintLayout? = null + private val gsyVideoOptionBuilder = GSYVideoOptionBuilder() + + private var showLoginInfoAnimator1: ObjectAnimator? = null + private var showLoginInfoAnimator2: ObjectAnimator? = null private var onlayoutListener: OnGlobalLayoutListener? = object : OnGlobalLayoutListener { override fun onGlobalLayout() { @@ -71,7 +88,74 @@ class LoginFragment : MvpFragment(), ILoginView override fun initViews() { CallerLogger.d(TAG, "init") - biz_cl_driver_main = mRootView.findViewById(R.id.biz_cl_driver_main) + + context?.let { + val videoUrl:String + if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { + //aciv_login_bg.setImageResource(R.drawable.biz_login_bg_taxi_start) + biz_login_svp.setBackgroundResource(R.drawable.biz_login_bg_taxi_start) + videoUrl = "android.resource://" + it.packageName + "/" + R.raw.biz_login_taxi_bg + }else{ + //aciv_login_bg.setImageResource(R.drawable.biz_login_bg_bus_start) + biz_login_svp.setBackgroundResource(R.drawable.biz_login_bg_bus_start) + videoUrl = "android.resource://" + it.packageName + "/" + R.raw.biz_login_bus_bg + } + Debuger.enable() + + biz_login_svp.setIsTouchWiget(false) + biz_login_svp.setIsTouchWigetFull(false) + biz_login_svp.enableshowProgressDialog = false + biz_login_svp.enableDoubleClick = false + gsyVideoOptionBuilder.setUrl(videoUrl) + .setCacheWithPlay(false) + .setPlayTag("TaxiPassengerArrivedView") + .build(biz_login_svp) + + biz_login_svp.setVideoAllCallBack(object : GSYSampleCallBack() { + override fun onAutoComplete(url: String?, vararg objects: Any?) { + if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { + biz_login_svp?.setBackgroundResource(R.drawable.biz_login_bg_taxi_end) + }else{ + biz_login_svp?.setBackgroundResource(R.drawable.biz_login_bg_bus_end) + } + + } + }) + if (showLoginInfoAnimator1 == null) { + showLoginInfoAnimator1 = ObjectAnimator.ofFloat(cl_login_info, "alpha", 0f, 1f) + showLoginInfoAnimator1?.interpolator = LinearInterpolator() + } + if (showLoginInfoAnimator2 == null) { + val dp2px = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), -50f) + showLoginInfoAnimator2 = ObjectAnimator.ofFloat(cl_login_info, "translationY", 0f, dp2px.toFloat()) + showLoginInfoAnimator2?.interpolator = DecelerateInterpolator() + } + UiThreadHandler.postDelayed({ + val animatorSet = AnimatorSet() + animatorSet.playTogether(showLoginInfoAnimator1, showLoginInfoAnimator2) + animatorSet.duration = 500 + animatorSet.addListener(object :AnimatorListener{ + override fun onAnimationStart(animation: Animator) { + cl_login_info.visibility = View.VISIBLE + } + + override fun onAnimationEnd(animation: Animator) { + + } + + override fun onAnimationCancel(animation: Animator) { + + } + + override fun onAnimationRepeat(animation: Animator) { + + } + + }) + animatorSet.start() + },2_000,UiThreadHandler.MODE.QUEUE) + } + inputPhoneNormal() initBg() initListener() @@ -159,7 +243,7 @@ class LoginFragment : MvpFragment(), ILoginView R.color.taxi_EF262C ) ) - biz_ace_login_phone_value.setBackgroundResource(R.drawable.taxi_login_phone_error) + biz_ace_login_phone_value.setBackgroundResource(R.drawable.biz_login_phone_error) } } @@ -171,7 +255,7 @@ class LoginFragment : MvpFragment(), ILoginView R.color.taxi_878890 ) ) - biz_ace_login_phone_value.setBackgroundResource(R.drawable.taxi_login_phone_normal) + biz_ace_login_phone_value.setBackgroundResource(R.drawable.biz_login_phone_normal) } } @@ -218,6 +302,7 @@ class LoginFragment : MvpFragment(), ILoginView biz_cl_driver_main?.viewTreeObserver?.addOnGlobalLayoutListener(onlayoutListener) super.onResume() CallerLogger.d(TAG, "onResume") + biz_login_svp.startPlayLogic() } override fun onPause() { diff --git a/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_bus_end.webp b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_bus_end.webp new file mode 100644 index 0000000000..3f43daf947 Binary files /dev/null and b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_bus_end.webp differ diff --git a/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_bus_start.webp b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_bus_start.webp new file mode 100644 index 0000000000..d62a99edf8 Binary files /dev/null and b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_bus_start.webp differ diff --git a/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_taxi_end.webp b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_taxi_end.webp new file mode 100644 index 0000000000..b74edaff90 Binary files /dev/null and b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_taxi_end.webp differ diff --git a/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_taxi_start.webp b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_taxi_start.webp new file mode 100644 index 0000000000..fac1a29d20 Binary files /dev/null and b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_bg_taxi_start.webp differ diff --git a/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_pop_bg.png b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_pop_bg.png deleted file mode 100755 index a540ce3cc8..0000000000 Binary files a/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_pop_bg.png and /dev/null differ diff --git a/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_pop_bg.webp b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_pop_bg.webp new file mode 100644 index 0000000000..9a1c887b04 Binary files /dev/null and b/OCH/common/biz/src/main/res/drawable-nodpi/biz_login_pop_bg.webp differ diff --git a/OCH/common/biz/src/main/res/drawable/biz_login_bg_selector.xml b/OCH/common/biz/src/main/res/drawable/biz_login_bg_selector.xml new file mode 100644 index 0000000000..afe7e5870b --- /dev/null +++ b/OCH/common/biz/src/main/res/drawable/biz_login_bg_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/drawable/biz_login_enable.xml b/OCH/common/biz/src/main/res/drawable/biz_login_enable.xml new file mode 100644 index 0000000000..a859ed8295 --- /dev/null +++ b/OCH/common/biz/src/main/res/drawable/biz_login_enable.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable/taxi_login_get_code_text_color.xml b/OCH/common/biz/src/main/res/drawable/biz_login_get_code_text_color.xml similarity index 100% rename from OCH/common/common/src/main/res/drawable/taxi_login_get_code_text_color.xml rename to OCH/common/biz/src/main/res/drawable/biz_login_get_code_text_color.xml diff --git a/OCH/common/common/src/main/res/drawable/taxi_login_phone_error.xml b/OCH/common/biz/src/main/res/drawable/biz_login_phone_error.xml similarity index 75% rename from OCH/common/common/src/main/res/drawable/taxi_login_phone_error.xml rename to OCH/common/biz/src/main/res/drawable/biz_login_phone_error.xml index 488fcdd155..3be9d334a8 100644 --- a/OCH/common/common/src/main/res/drawable/taxi_login_phone_error.xml +++ b/OCH/common/biz/src/main/res/drawable/biz_login_phone_error.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable/taxi_login_phone_normal.xml b/OCH/common/biz/src/main/res/drawable/biz_login_phone_normal.xml similarity index 58% rename from OCH/common/common/src/main/res/drawable/taxi_login_phone_normal.xml rename to OCH/common/biz/src/main/res/drawable/biz_login_phone_normal.xml index c36db380dc..e80e135a3e 100644 --- a/OCH/common/common/src/main/res/drawable/taxi_login_phone_normal.xml +++ b/OCH/common/biz/src/main/res/drawable/biz_login_phone_normal.xml @@ -2,6 +2,7 @@ - - + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable/taxi_login_unenable.xml b/OCH/common/biz/src/main/res/drawable/biz_login_unenable.xml similarity index 100% rename from OCH/common/common/src/main/res/drawable/taxi_login_unenable.xml rename to OCH/common/biz/src/main/res/drawable/biz_login_unenable.xml diff --git a/OCH/common/biz/src/main/res/layout/biz_login_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_view.xml index f448967e41..bdb42c2531 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_view.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_view.xml @@ -6,126 +6,148 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - + - + - + - - + + + + + + + + + + + + + + + + - - #72A7FF #A0B3DA #171D2B + #C6C6C6 + #4DFFFFFF + #4D000000 + #878890 + #19FFF5 + #1970FF \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonDialogStatus.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonDialogStatus.kt new file mode 100644 index 0000000000..db1f17263a --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonDialogStatus.kt @@ -0,0 +1,197 @@ +package com.mogo.och.common.module.wigets + +import android.content.Context +import android.view.View +import android.view.animation.Animation +import android.view.animation.AnimationUtils +import android.view.animation.LinearInterpolator +import android.widget.TextView +import androidx.appcompat.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatTextView +import androidx.lifecycle.LifecycleObserver +import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.R +import io.reactivex.Observable +import io.reactivex.disposables.Disposable +import io.reactivex.schedulers.Schedulers +import java.util.concurrent.TimeUnit + +/** + * 带有title, tip,confirm,cancel的dialog + */ +class CommonDialogStatus: BaseFloatDialog, LifecycleObserver { + + private var commonConfirm : TextView? = null + private var commonCancel : TextView? = null + private var commonTitle : TextView? = null + private var commonTips : TextView? = null + private var countDownTxt: AppCompatTextView? = null + private var commonStatus:AppCompatImageView?=null + + private var clickListener: ClickListener? = null + + private var subscribeCountDown: Disposable? = null + + private var mCountdownValue: Int = 0 + + private var status:Status = Status.ask + + constructor(builder: Builder,context: Context) : super(context) { + commonTitle?.text = builder.titleStr + commonTips?.text = builder.tipsStr + commonCancel?.text = builder.cancelStr + commonConfirm?.text = builder.confirmStr + countDownTxt?.text = builder.countDownValue.toString() + mCountdownValue = builder.countDownValue + status = builder.statusEnum + when (status) { + Status.ask -> { + commonStatus?.setImageResource(R.drawable.common_dialog_icon_ask) + } + Status.loading -> { + commonStatus?.setImageResource(R.drawable.common_dialog_status_loading) + } + } + + if (mCountdownValue > 0){ + countDownTxt?.visibility = View.VISIBLE + }else{ + countDownTxt?.visibility = View.GONE + } + } + + init{ + setContentView(R.layout.common_dialog_status_new) + + setCanceledOnTouchOutside(true) + + commonConfirm = findViewById(R.id.common_dialog_submit_new) + commonCancel = findViewById(R.id.common_dialog_cancle_new) + commonTitle = findViewById(R.id.common_dialog_title_new) + commonTips = findViewById(R.id.common_dialog_content_new) + countDownTxt = findViewById(R.id.common_count_down_new) + commonStatus = findViewById(R.id.common_dialog_status) + + commonConfirm?.setOnClickListener{ + clickListener?.confirm() + dismiss() + } + commonCancel?.setOnClickListener { + clickListener?.cancel() + dismiss() + } + } + + fun setClickListener(clickListener: ClickListener) { + this.clickListener = clickListener + } + + interface ClickListener{ + fun confirm() + fun cancel() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if (mCountdownValue > 0){ + startCountDown() + } + } + + private fun startCountDown() { + subscribeCountDown?.let { + if (!it.isDisposed) { + it.dispose() + } + } + val mAnimation: Animation = AnimationUtils.loadAnimation(context, R.anim.count_down_rotate) + val lin = LinearInterpolator() + mAnimation.interpolator = lin + commonStatus?.startAnimation(mAnimation) + + subscribeCountDown = Observable.intervalRange(0L + , mCountdownValue.toLong(), 0, 1, TimeUnit.SECONDS) + .map { aLong -> mCountdownValue - aLong } + .subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe { + UiThreadHandler.post { + mCountdownValue -= 1 + countDownTxt?.text = mCountdownValue.toString() + if (mCountdownValue == 0){ + mAnimation.cancel() + commonStatus?.clearAnimation() + countDownTxt?.visibility = View.GONE + commonStatus?.visibility = View.GONE + dialogCancel() + } + } + } + } + + private fun dialogCancel() { + clickListener?.cancel() + dismiss() + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + subscribeCountDown?.let { + if (!it.isDisposed) { + it.dispose() + } + } + } + + class Builder{ + var statusEnum: Status = Status.ask + var titleStr:String = "" + var tipsStr:String = "" + var confirmStr:String = "" + var cancelStr:String = "" + var countDownValue: Int = 0 + + fun title(title: String) : Builder{ + this.titleStr = title + return this + } + + fun tips(tips: String) : Builder{ + this.tipsStr = tips + return this + } + + fun confirmStr(commit: String) : Builder{ + this.confirmStr = commit + return this + } + + /** + * 不传倒计时没有， >0 有倒计时 + */ + fun countdownValue(value: Int): Builder{ + this.countDownValue = value + return this + } + + fun cancelStr(cancel: String) : Builder{ + this.cancelStr = cancel + return this + } + + fun build(context: Context): CommonDialogStatus { + return CommonDialogStatus(this,context) + } + + fun status(ask: Status): Builder { + this.statusEnum = ask + return this + } + } + + enum class Status{ + ask,loading + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_dialog_icon_ask.png b/OCH/common/common/src/main/res/drawable-nodpi/common_dialog_icon_ask.png new file mode 100644 index 0000000000..23b5882db7 Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_dialog_icon_ask.png differ diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_dialog_status_loading.png b/OCH/common/common/src/main/res/drawable-nodpi/common_dialog_status_loading.png new file mode 100644 index 0000000000..a4ff19bdd0 Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_dialog_status_loading.png differ diff --git a/OCH/common/common/src/main/res/drawable/common_dialog_bg.xml b/OCH/common/common/src/main/res/drawable/common_dialog_bg.xml new file mode 100644 index 0000000000..3ace186ef8 --- /dev/null +++ b/OCH/common/common/src/main/res/drawable/common_dialog_bg.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/OCH/common/common/src/main/res/drawable/taxi_login_bg_selector.xml b/OCH/common/common/src/main/res/drawable/taxi_login_bg_selector.xml deleted file mode 100644 index 86dcf132d8..0000000000 --- a/OCH/common/common/src/main/res/drawable/taxi_login_bg_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable/taxi_login_enable.xml b/OCH/common/common/src/main/res/drawable/taxi_login_enable.xml deleted file mode 100644 index 5804313fce..0000000000 --- a/OCH/common/common/src/main/res/drawable/taxi_login_enable.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/common/common/src/main/res/layout/common_dialog_status_new.xml b/OCH/common/common/src/main/res/layout/common_dialog_status_new.xml new file mode 100644 index 0000000000..0e099aed47 --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_dialog_status_new.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index 90c62765cc..e7f7499410 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -32,4 +32,5 @@ #19FFCB #FF4E41 #B3FFFFFF + #CCCCCC \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt index c45a5c082c..76becb7860 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt @@ -105,12 +105,10 @@ class TaskRunningAdapter( // 下端 彩色 holder.itemView.setBackgroundResource(R.drawable.bus_task_current_station_bg) - val startColorTemp = argbEvaluator.evaluate(0f,startColor,endColor) as Int - val endColorTemp = argbEvaluator.evaluate((halfHeight/totalHeight).toFloat(),startColor,endColor) as Int val orientation = GradientDrawable.Orientation.TOP_BOTTOM val temp01 = GradientDrawable(orientation, intArrayOf( - startColorTemp, - endColorTemp + startColor, + endColor )) holder.bgPassBottomBg.background = temp01 } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningModel.kt index f905c3e1a4..ae05e450a8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningModel.kt @@ -32,11 +32,12 @@ class TaskRunningModel : ViewModel(), IBusLinesCallback { interface SwtichLineViewCallback{ fun showRunningTaskInfo() + fun hideLoadingAndshowRunningTaskInfo() } override fun onLeaveStaionSuccess() { BizLoopManager.runInMainThread{ - viewCallback?.showRunningTaskInfo() + viewCallback?.hideLoadingAndshowRunningTaskInfo() } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt index abe4279c49..957f39e00d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.och.common.module.manager.autopilot.line.LineManager import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.common.module.wigets.CommonDialogStatus import com.mogo.och.common.module.wigets.OCHCommitDialog import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.model.LineModel @@ -24,6 +25,7 @@ import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_comple import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_running_task_last_station import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_running_task_time import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.bus_task_running_line_name +import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.loading_arrive_station import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.rl_running_task_station_list import me.jessyan.autosize.utils.AutoSizeUtils @@ -67,17 +69,19 @@ class TaskRunningView: ConstraintLayout, TaskRunningModel.SwtichLineViewCallback } }) actv_arriver_station.onClick { + loading_arrive_station.visibility = VISIBLE viewModel?.arriveStation() } actv_complete_task.onClick { - val builder = OCHCommitDialog.Builder() + val builder = CommonDialogStatus.Builder() val closeLineConfirmDialog = builder .title(ResourcesUtils.getString(R.string.bus_dialog_title)) .tips(ResourcesUtils.getString(R.string.bus_dialog_tips)) .confirmStr(ResourcesUtils.getString(R.string.bus_dialog_confirm)) .cancelStr(ResourcesUtils.getString(R.string.bus_dialog_cancel)) + .status(CommonDialogStatus.Status.ask) .build(AbsMogoApplication.getApp()) - closeLineConfirmDialog!!.setClickListener(object : OCHCommitDialog.ClickListener { + closeLineConfirmDialog.setClickListener(object : CommonDialogStatus.ClickListener { override fun confirm() { viewModel?.completeTask() } @@ -125,6 +129,11 @@ class TaskRunningView: ConstraintLayout, TaskRunningModel.SwtichLineViewCallback } } + override fun hideLoadingAndshowRunningTaskInfo() { + loading_arrive_station.visibility = GONE + showRunningTaskInfo() + } + fun showLeaveStationView(){ aciv_task_leave_station_slide_bg.visibility = VISIBLE actv_arriver_station.visibility = GONE diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml index a2c9d13e8b..dfff6fe321 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml @@ -46,8 +46,7 @@ android:layout_marginEnd="@dimen/bus_dp_52" app:layout_constraintTop_toBottomOf="@+id/actv_last_refresh_date" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginTop="@dimen/dp_22" - android:layout_marginBottom="@dimen/dp_24"/> + android:layout_marginTop="@dimen/dp_22" /> + + #4D000000 #1970FF #19FF7F + #B3FFFFFF \ No newline at end of file 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 52a905e080..49ea5c6dc9 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 @@ -80,7 +80,7 @@ public abstract class BaseTaxiTabFragment> : MvpFragment