yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.3.0]

Browse Source 
[动画修改]
This commit is contained in:
yangyakun
2024-03-28 16:32:50 +08:00
parent e847002173
commit 8f5820ee3f
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
View File

@@ -67,7 +67,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
when (TaxiPassengerModel.curOrderStatus) {
TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
// 10 接驾中
mView?.showOrHideCheckAndStartAutopilotView(2)
mView?.showOrHideCheckAndStartAutopilotView(3)
mView?.showOrHideArrivedEndLayout(isShow = false)
overMapViewClear()
@@ -100,13 +100,13 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
}
TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
// 60 行程完成
mView?.showOrHideCheckAndStartAutopilotView(2)
mView?.showOrHideCheckAndStartAutopilotView(3)
mView?.showOrHideArrivedEndLayout(false)
overMapViewClear()
}
TaxiPassengerOrderStatusEnum.Cancel -> {
// 70 取消订单
mView?.showOrHideCheckAndStartAutopilotView(2)
mView?.showOrHideCheckAndStartAutopilotView(3)
mView?.showOrHideArrivedEndLayout(isShow = false)
overMapViewClear()
}

3
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -268,6 +268,9 @@ class TaxiPassengerBaseFragment() :
2 -> {
chekAndStartAutopilotView.aniCheckAndStartAutopilot(false,2)
}
3 -> {
chekAndStartAutopilotView.visibility = View.GONE
}
else -> {}
}
}

3
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt
View File

@@ -7,6 +7,7 @@ import android.animation.ObjectAnimator
import android.animation.ValueAnimator
import android.content.Context
import android.util.AttributeSet
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.animation.LinearInterpolator
@@ -22,6 +23,7 @@ import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager
import com.mogo.och.common.module.utils.BigFrameAnimatorContainer
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.taxi.passenger.R
import com.mogo.och.taxi.passenger.model.TaxiPassengerModel
import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout
import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.aciv_check_autopilot
import kotlinx.android.synthetic.main.taxt_p_check_startautopilot.view.aciv_start_autopilt_success_ani
@@ -133,6 +135,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
* 2 隐藏页面
*/
fun aniCheckAndStartAutopilot(show:Boolean,status:Int){
Log.d(SceneConstant.M_TAXI_P + TAG,"参数${show}--${show}---订单${TaxiPassengerModel.currentOCHOrder?.orderNo}-----订单状态:${TaxiPassengerModel.currentOCHOrder?.orderStatus}")
val alphaStart: Float
val alphaEnd: Float
if(show){

8
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
View File

@@ -58,7 +58,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
when (TaxiPassengerModel.curOrderStatus) {
TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
// 10 接驾中
mView?.showOrHideCheckAndStartAutopilotView(2)
mView?.showOrHideCheckAndStartAutopilotView(3)
mView?.showOrHideArrivedEndLayout(isShow = false)
overMapViewClear()
@@ -93,7 +93,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
// 60 行程完成
mView?.showOrHideCheckAndStartAutopilotView(2)
mView?.showOrHideCheckAndStartAutopilotView(3)
mView?.showOrHideArrivedEndLayout(false)
overMapViewClear()
@@ -101,7 +101,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
TaxiPassengerOrderStatusEnum.Cancel -> {
// 70 取消订单
mView?.showOrHideCheckAndStartAutopilotView(2)
mView?.showOrHideCheckAndStartAutopilotView(3)
mView?.showOrHideArrivedEndLayout(isShow = false)
overMapViewClear()
@@ -109,7 +109,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
TaxiPassengerOrderStatusEnum.None -> {
// 00 默认状态，在不同任务之间切换时使用
mView?.showOrHideCheckAndStartAutopilotView(2)
mView?.showOrHideCheckAndStartAutopilotView(3)
mView?.showOrHideArrivedEndLayout(isShow = false)
overMapViewClear()

3
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -282,6 +282,9 @@ class TaxiPassengerBaseFragment() :
2 -> {
chekAndStartAutopilotView.aniCheckAndStartAutopilot(false, 2)
}
3 -> {
chekAndStartAutopilotView.visibility = View.GONE
}
else -> {}
}
}

3
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt
View File

@@ -6,6 +6,7 @@ import android.animation.AnimatorSet
import android.animation.ObjectAnimator
import android.content.Context
import android.util.AttributeSet
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.animation.LinearInterpolator
@@ -19,6 +20,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager
import com.mogo.och.common.module.utils.BigFrameAnimatorContainer
import com.mogo.och.taxi.passenger.R
import com.mogo.och.taxi.passenger.model.TaxiPassengerModel
import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout
import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_check_autopilot
import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_start_autopilt_success_ani
@@ -132,6 +134,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout,
* 2 隐藏页面
*/
fun aniCheckAndStartAutopilot(show:Boolean,status:Int){
Log.d(SceneConstant.M_TAXI_P + TAG,"参数${show}--${show}---订单${TaxiPassengerModel.currentOCHOrder?.orderNo}-----订单状态:${TaxiPassengerModel.currentOCHOrder?.orderStatus}")
val alphaStart: Float
val alphaEnd: Float
if(show){