From e9906b913bc136387d989fa0d1b383e678fca066 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 11 Oct 2024 14:34:47 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[slide=20=E6=8A=BD=E7=A6=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/common/common/build.gradle | 1 + .../common}/src/main/assets/data.json | 0 .../common}/src/main/assets/images/img_0.png | Bin .../common}/src/main/assets/images/img_1.png | Bin .../common}/src/main/assets/images/img_2.png | Bin .../common}/src/main/assets/slide.json | 0 .../common/module/wigets/CommonSlideView.kt | 159 ++++++++++++++++++ .../res/drawable-nodpi/common_slide_block.png | Bin 0 -> 7900 bytes .../src/main/res/layout/common_slide_view.xml | 32 ++++ .../common/src/main/res/values/attrs.xml | 6 + .../common/src/main/res/values/colors.xml | 1 + OCH/shuttle/driver_weaknet/build.gradle | 1 - .../weaknet/ui/taskrunning/TaskRunningView.kt | 6 +- .../com/mogo/och/weaknet/view/BizMapView.kt | 63 ------- .../shuttle_weak_task_leave_station_view.xml | 9 - .../res/layout/shuttle_weak_task_running.xml | 4 +- .../src/main/res/values/attrs.xml | 90 ---------- 17 files changed, 204 insertions(+), 168 deletions(-) rename OCH/{shuttle/driver_weaknet => common/common}/src/main/assets/data.json (100%) rename OCH/{shuttle/driver_weaknet => common/common}/src/main/assets/images/img_0.png (100%) rename OCH/{shuttle/driver_weaknet => common/common}/src/main/assets/images/img_1.png (100%) rename OCH/{shuttle/driver_weaknet => common/common}/src/main/assets/images/img_2.png (100%) rename OCH/{shuttle/driver_weaknet => common/common}/src/main/assets/slide.json (100%) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonSlideView.kt create mode 100755 OCH/common/common/src/main/res/drawable-nodpi/common_slide_block.png create mode 100644 OCH/common/common/src/main/res/layout/common_slide_view.xml delete mode 100644 OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt diff --git a/OCH/common/common/build.gradle b/OCH/common/common/build.gradle index 5a7057c888..6597437eaf 100644 --- a/OCH/common/common/build.gradle +++ b/OCH/common/common/build.gradle @@ -74,6 +74,7 @@ dependencies { api rootProject.ext.dependencies.flexbox api project(":OCH:common:data") + api rootProject.ext.dependencies.lottie if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogocommons diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/data.json b/OCH/common/common/src/main/assets/data.json similarity index 100% rename from OCH/shuttle/driver_weaknet/src/main/assets/data.json rename to OCH/common/common/src/main/assets/data.json diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/images/img_0.png b/OCH/common/common/src/main/assets/images/img_0.png similarity index 100% rename from OCH/shuttle/driver_weaknet/src/main/assets/images/img_0.png rename to OCH/common/common/src/main/assets/images/img_0.png diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/images/img_1.png b/OCH/common/common/src/main/assets/images/img_1.png similarity index 100% rename from OCH/shuttle/driver_weaknet/src/main/assets/images/img_1.png rename to OCH/common/common/src/main/assets/images/img_1.png diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/images/img_2.png b/OCH/common/common/src/main/assets/images/img_2.png similarity index 100% rename from OCH/shuttle/driver_weaknet/src/main/assets/images/img_2.png rename to OCH/common/common/src/main/assets/images/img_2.png diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/slide.json b/OCH/common/common/src/main/assets/slide.json similarity index 100% rename from OCH/shuttle/driver_weaknet/src/main/assets/slide.json rename to OCH/common/common/src/main/assets/slide.json diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonSlideView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonSlideView.kt new file mode 100644 index 0000000000..69e257067f --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonSlideView.kt @@ -0,0 +1,159 @@ +package com.mogo.och.common.module.wigets + +import android.animation.ObjectAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.MotionEvent +import androidx.appcompat.widget.AppCompatTextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.constraintlayout.widget.ConstraintSet +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.common.module.R +import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.common.module.utils.RxUtils +import kotlinx.android.synthetic.main.common_slide_view.view.lottie_bg + +class CommonSlideView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) { + companion object { + const val TAG = "LoadingMapStatusView" + } + + + private var initialX = 0f + private var initialY = 0f + private val tempSet = ConstraintSet() + + private var draggableButton: AppCompatTextView + + private var slideListener:SlideListener?=null + + private var slideTitle:String?=null + private var assetsfolder:String?=null + + fun setSlideListener(slideListener:SlideListener){ + this.slideListener = slideListener + } + + + init { + LayoutInflater.from(context).inflate(R.layout.common_slide_view, this, true) + + try { + val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CommonSlideView) + slideTitle = typedArray.getString(R.styleable.CommonSlideView_slide_title)?:"" + assetsfolder = typedArray.getString(R.styleable.CommonSlideView_assetsfolder)?:"images" + typedArray.recycle() + } catch (e: Exception) { + e.printStackTrace() + } + + draggableButton = findViewById(R.id.actv_draggable_block) + draggableButton.text = slideTitle + lottie_bg.imageAssetsFolder = assetsfolder + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerLogger.d(TAG,"onAttachedToWindow") + } + + + /** + * 为该组件的触碰事件重写事件处理方法 + */ + override fun onTouchEvent(event: MotionEvent?): Boolean { + when (event?.action) { + MotionEvent.ACTION_DOWN -> { + initialX = event.rawX; + initialY = event.rawY; + } + MotionEvent.ACTION_MOVE -> { + val dx = event.rawX - initialX; + val dy = event.rawY - initialY; + initialX = event.rawX; + initialY = event.rawY; + + if(draggableButton.translationX<0){ + tempSet.clone(this) + tempSet.setTranslationX(draggableButton.id, 0f) + tempSet.applyTo(this) + }else if(draggableButton.translationX>=0&&draggableButton.translationX<=width-draggableButton.width){ + tempSet.clone(this) + val dex = (draggableButton.translationX + dx).takeIf { it>=0 }?:0f + val newDex = dex.takeIf { it<=width-draggableButton.width }?:(width-draggableButton.width).toFloat() + tempSet.setTranslationX(draggableButton.id, newDex) + tempSet.applyTo(this) + }else{ + tempSet.clone(this) + val dex = (draggableButton.translationX + dx).takeIf { it<=width-draggableButton.width }?:(width-draggableButton.width).toFloat() + tempSet.setTranslationX(draggableButton.id, dex) + tempSet.applyTo(this) + } + } + MotionEvent.ACTION_UP -> { + if(draggableButton.translationX<(width-draggableButton.width)){ + ObjectAnimator.ofFloat( + draggableButton, "translationX", draggableButton.translationX, + 0f + ).apply { + duration = 100 + }.start() + }else if (draggableButton.translationX>=(width-draggableButton.width)){ + lottie_bg.setAnimation("data.json") + lottie_bg.playAnimation() + draggableButton.setTextColor(ResourcesUtils.getColor(R.color.common_80FFFFFF)) + RxUtils.createSubscribe(1_000) { + slideListener?.slideEnd() + } + }else{ + ObjectAnimator.ofFloat( + draggableButton, "translationX", draggableButton.translationX, + 0f + ).apply { + duration = 100 + }.start() + } + } + else -> {} + } + return true + } + + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + lottie_bg.setAnimation("slide.json") + lottie_bg.playAnimation() + draggableButton.setTextColor(ResourcesUtils.getColor(R.color.white)) + ObjectAnimator.ofFloat( + draggableButton, "translationX", draggableButton.translationX, + 0f + ).apply { + duration = 100 + }.start() + } + } + + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerLogger.d(TAG,"onDetachedFromWindow") + } + + fun setTextValue(value: String) { + draggableButton.text = value + } + + interface SlideListener{ + fun slideEnd() + } + + + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_slide_block.png b/OCH/common/common/src/main/res/drawable-nodpi/common_slide_block.png new file mode 100755 index 0000000000000000000000000000000000000000..ba80399ef40526cc075dac88baa2d4f2a91e676f GIT binary patch literal 7900 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 + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/attrs.xml b/OCH/common/common/src/main/res/values/attrs.xml index 13b47cc9ee..31323f4270 100644 --- a/OCH/common/common/src/main/res/values/attrs.xml +++ b/OCH/common/common/src/main/res/values/attrs.xml @@ -9,6 +9,12 @@ + + + + + + diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index 770f857d92..4bdbaf74bf 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -16,6 +16,7 @@ #3B4577 #80000000 + #80FFFFFF #1466FB #E0EFFF #B8C2D7 diff --git a/OCH/shuttle/driver_weaknet/build.gradle b/OCH/shuttle/driver_weaknet/build.gradle index a230b9a66d..3f2bd62161 100644 --- a/OCH/shuttle/driver_weaknet/build.gradle +++ b/OCH/shuttle/driver_weaknet/build.gradle @@ -61,7 +61,6 @@ dependencies { implementation rootProject.ext.dependencies.roomRxjava implementation rootProject.ext.dependencies.androidxrecyclerview kapt rootProject.ext.dependencies.recyclerviewadapterhelper - implementation rootProject.ext.dependencies.lottie implementation rootProject.ext.dependencies.androidxroomruntime kapt rootProject.ext.dependencies.androidxroomcompiler 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 957f39e00d..4eb0cc1fd0 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 @@ -10,15 +10,13 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.kotlin.onClick 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.common.module.wigets.CommonSlideView import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.model.LineModel import com.mogo.och.weaknet.ui.bizswitch.SwtichBizeModel -import com.mogo.och.weaknet.view.BizLeaveStationView.SlideListener import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.aciv_task_leave_station_slide_bg import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_arriver_station import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_complete_task @@ -63,7 +61,7 @@ class TaskRunningView: ConstraintLayout, TaskRunningModel.SwtichLineViewCallback rl_running_task_station_list.setLayoutManager(linearLayoutManager) mAdapter = TaskRunningAdapter(context, mutableListOf()) rl_running_task_station_list.setAdapter(mAdapter) - aciv_task_leave_station_slide_bg.setSlideListener(object : SlideListener{ + aciv_task_leave_station_slide_bg.setSlideListener(object : CommonSlideView.SlideListener { override fun slideEnd() { viewModel?.leaveStation() } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt deleted file mode 100644 index aa7c1e657e..0000000000 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.mogo.och.weaknet.view - -import android.content.Context -import android.os.Bundle -import android.util.AttributeSet -import android.view.LayoutInflater -import android.widget.FrameLayout -import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.function.view.MapBizView -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.map.uicontroller.IMogoMapUIController -import com.mogo.och.shuttle.weaknet.R - -/** - * 魔戒蓝牙控件 - * 放置于StatusBar右侧位置 - */ -class BizMapView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : FrameLayout(context, attrs, defStyleAttr) { - - private lateinit var mapBizView: MapBizView - - init { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { - LayoutInflater.from(context).inflate(R.layout.shuttle_weak_m2_bizmap_map, this, true) - }else if(AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)){ - LayoutInflater.from(context).inflate(R.layout.shuttle_weak_jl_bizmap_map, this, true) - }else{ - LayoutInflater.from(context).inflate(R.layout.shuttle_weak_jl_bizmap_map, this, true) - } - mapBizView = findViewById(R.id.bizMapView) - } - - fun getUI(): IMogoMapUIController? { - return mapBizView.getUI() - } - - fun onCreate(bundle: Bundle?) { - mapBizView.onCreate(bundle) - } - fun onResume() { - mapBizView.onResume() - } - - fun onSaveInstanceState(outState: Bundle){ - mapBizView.onSaveInstanceState(outState) - } - - fun onLowMemory() { - mapBizView.onLowMemory() - } - - fun onPause() { - mapBizView.onPause() - } - - fun onDestroy() { - mapBizView.onDestroy() - } -} \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml index ff7fa80565..60aaed0563 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml @@ -7,15 +7,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - - - - - - - - - diff --git a/OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml b/OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml index 99006aeb52..0e9452f453 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml @@ -5,94 +5,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file