From 4e5dc1f7ee72bd90b9c0e157e9fcbb91bdb7ca1f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Mar 2024 10:11:59 +0800 Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[=E5=8A=A8=E7=94=BB=E3=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/bottom/impl/MusicCheckView.kt | 2 +- .../ui/music/playing/MusicPlayingView.kt | 18 +++++++++--------- .../manager/xiaozhimanager/ZhiViewmanager.kt | 4 ++-- .../module/utils/FrameAnimatorContainer.kt | 9 +++------ .../src/main/res/xiaozhi/values/arrays.xml | 2 -- .../ui/music/playing/MusicPlayingView.kt | 18 +++++++++--------- .../taxi/passenger/ui/rightbar/RightBarView.kt | 6 +----- app/config/MusicUrlConfig.json | 2 +- 8 files changed, 26 insertions(+), 35 deletions(-) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt index 7d6d544704..60fc3fd4f3 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/MusicCheckView.kt @@ -116,7 +116,7 @@ open class MusicCheckView @JvmOverloads constructor( animator = ObjectAnimator.ofFloat(aciv_playing, "rotation", 0f, 360f) aciv_playing.pivotX = (aciv_playing.width / 2).toFloat() aciv_playing.pivotY = (aciv_playing.height / 2).toFloat() - animator?.duration = 4000 + animator?.duration = 2000 animator?.repeatCount = -1 animator?.repeatMode = ValueAnimator.RESTART animator?.interpolator = LinearInterpolator() diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt index aef03f3d33..c8471bb4d9 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingView.kt @@ -126,14 +126,14 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi sb_musuc_progess.progress=0.toInt() } -// Glide.with(context) -// .load(musicData.coverHeadImageUrl) -// .apply(RequestOptions().placeholder(R.drawable.charter_p_music_bg_relax_head)) -// .into(iv_music_cover) -// Glide.with(context) -// .load(musicData.coverBottomImageUrl) -// .apply(RequestOptions().placeholder(R.drawable.charter_p_music_bg_relax_bottom)) -// .into(iv_music_cover_bg) + Glide.with(context) + .load(musicData.coverHeadImageUrl) + .apply(RequestOptions().placeholder(R.drawable.charter_p_music_bg_relax_head)) + .into(iv_music_cover) + Glide.with(context) + .load(musicData.coverBottomImageUrl) + .apply(RequestOptions().placeholder(R.drawable.charter_p_music_bg_relax_bottom)) + .into(iv_music_cover_bg) } private fun startAnimal(){ @@ -144,7 +144,7 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi animator = ObjectAnimator.ofFloat(iv_music_cover, "rotation", 0f, 360f) iv_music_cover.pivotX = (iv_music_cover.width / 2).toFloat() iv_music_cover.pivotY = (iv_music_cover.height / 2).toFloat() - animator?.duration = 4000 + animator?.duration = 2000 animator?.repeatCount = -1 animator?.repeatMode = ValueAnimator.RESTART animator?.interpolator = LinearInterpolator() diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt index e7d7e57134..3ddd1a58a7 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt @@ -21,8 +21,8 @@ object ZhiViewmanager { val loveAni = AniData(AniType.loveAni, R.array.xiaozhi_love, false, true,12) val warnAni = AniData(AniType.warnAni, R.array.xiaozhi_warn, false, true,12) - val normal2warnAni = AniData(AniType.normal2warnAni, R.array.xiaozhi_normal_warn, false, true,12) - val warn2normalAni = AniData(AniType.warn2normalAni, R.array.xiaozhi_normal_warn, false, false,12) + val normal2warnAni = AniData(AniType.normal2warnAni, R.array.xiaozhi_normal_warn, false, true,24) + val warn2normalAni = AniData(AniType.warn2normalAni, R.array.xiaozhi_normal_warn, false, false,24) enum class AniType{ diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt index c44d685aa0..376e6bcd3f 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt @@ -105,23 +105,20 @@ class FrameAnimatorContainer (resId: Int, private val next: Int get() { mIndex++ - var isPlayOnce = false if (mIndex >= mFrames.size){ mIndex = 0 if(isOnce){// 一次性动画 播放完毕后直接结束 stop() } - isPlayOnce = true - + } + if(mIndex==mFrames.size-1){ + mOnAnimationStoppedListener?.playOnce() } val nextInfo= if(sequence){// 倒叙 mFrames[mIndex] }else{ mFrames[mFrames.size-1-mIndex] } - if(isPlayOnce){// 锁定nextInfo 在回调中可能会修改mFrames值 - mOnAnimationStoppedListener?.playOnce() - } return nextInfo } diff --git a/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml b/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml index 232e11c697..58d0d4c985 100644 --- a/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml +++ b/OCH/common/common/src/main/res/xiaozhi/values/arrays.xml @@ -85,8 +85,6 @@ @drawable/xiaozhi_think_29 @drawable/xiaozhi_think_30 @drawable/xiaozhi_think_31 - - @drawable/xiaozhi_warn_033 @drawable/xiaozhi_think_34 @drawable/xiaozhi_think_35 @drawable/xiaozhi_think_36 diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt index 076acd143d..dd3e14a467 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt @@ -126,14 +126,14 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi sb_musuc_progess.progress=0.toInt() } -// Glide.with(context) -// .load(musicData.coverHeadImageUrl) -// .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_head)) -// .into(iv_music_cover) -// Glide.with(context) -// .load(musicData.coverBottomImageUrl) -// .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_bottom)) -// .into(iv_music_cover_bg) + Glide.with(context) + .load(musicData.coverHeadImageUrl) + .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_head)) + .into(iv_music_cover) + Glide.with(context) + .load(musicData.coverBottomImageUrl) + .apply(RequestOptions().placeholder(R.drawable.taxt_p_music_bg_relax_bottom)) + .into(iv_music_cover_bg) } private fun startAnimal(){ @@ -144,7 +144,7 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi animator = ObjectAnimator.ofFloat(iv_music_cover, "rotation", 0f, 360f) iv_music_cover.pivotX = (iv_music_cover.getWidth() / 2).toFloat() iv_music_cover.pivotY = (iv_music_cover.height / 2).toFloat() - animator?.duration = 4000 + animator?.duration = 2000 animator?.repeatCount = -1 animator?.repeatMode = ValueAnimator.RESTART animator?.interpolator = LinearInterpolator() diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt index 2978335abd..0c61b4bab6 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt @@ -98,10 +98,6 @@ class RightBarView : ConstraintLayout { } iv_center_location.onClick { this.rightBarCallback?.setGo2CenterClick() - VoiceNotice.showNotice( - "想和我对话的时候可以直接戳我，也可以对我说\\'你好小智\\'！", - AIAssist.LEVEL2 - ) } } @@ -113,7 +109,7 @@ class RightBarView : ConstraintLayout { animator = ObjectAnimator.ofFloat(ck_music, "rotation", 0f, 360f) ck_music.pivotX = (ck_music.width / 2).toFloat() ck_music.pivotY = (ck_music.height / 2).toFloat() - animator?.duration = 4000 + animator?.duration = 2000 animator?.repeatCount = -1 animator?.repeatMode = ValueAnimator.RESTART animator?.interpolator = LinearInterpolator() diff --git a/app/config/MusicUrlConfig.json b/app/config/MusicUrlConfig.json index ea54d8c5cc..240ff8af81 100644 --- a/app/config/MusicUrlConfig.json +++ b/app/config/MusicUrlConfig.json @@ -9,7 +9,7 @@ "songUrl": "android.resource://com.mogo.launcher.f/raw/piano_music.mp3", "songUrlType": "local", "coverHeadImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png", - "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1710406555103/taxt_p_music_head_05.png", + "coverBottomImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1709718213773/taxt_p_music_bottom_05.png", "tag": [ "放松" ]