From bee2d6cacc7ff3af682897eee1eac4720f5e1b8d Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期六, 08 二月 2025 18:15:37 +0800
Subject: [PATCH] 新增功能开发完成
---
app/src/main/java/com/sinata/xqmuse/ui/home/HomeFragment.kt | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/home/HomeFragment.kt b/app/src/main/java/com/sinata/xqmuse/ui/home/HomeFragment.kt
index ac82404..7730a07 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/home/HomeFragment.kt
@@ -4,7 +4,7 @@
import androidx.recyclerview.widget.LinearLayoutManager
import cn.sinata.xldutils.fragment.BaseFragment
import cn.sinata.xldutils.gone
-import cn.sinata.xldutils.utils.SPUtils
+import cn.sinata.xldutils.invisible
import cn.sinata.xldutils.utils.ellipsize
import cn.sinata.xldutils.visible
import com.sinata.xqmuse.MainActivity
@@ -25,7 +25,6 @@
import com.sinata.xqmuse.utils.interfaces.StringCallback
import kotlinx.android.synthetic.main.fragment_home.*
import org.greenrobot.eventbus.EventBus
-import org.jetbrains.anko.startActivity
import org.jetbrains.anko.support.v4.startActivity
import org.jetbrains.anko.support.v4.toast
@@ -70,6 +69,7 @@
getToday()
getPrivacy()
getList()
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.CHANGE_BGM)) //BGM切换流程
}
private fun initClick() {
@@ -97,7 +97,9 @@
}
iv_today.setOnClickListener {
if (today!=null){
- if (MainActivity.voice?.id == today?.meditationId){
+ if (today?.isShow == 1){ //跳转播放微电影
+ startActivity<MicroVideoActivity>("url" to today?.meditationVideo?.videoUrl,"title" to today?.meditationVideo?.title)
+ }else if (MainActivity.voice?.id == today?.meditationId){
EventBus.getDefault().post(EmptyEvent(Const.EventCode.PAUSE_OR_RESUME_THINK))
if (MainActivity.playing) //播放中
iv_play_today.setImageResource(R.mipmap.player_pause)
@@ -135,9 +137,20 @@
iv_pri_empty.setOnClickListener { startActivity<LoginActivity>() }
}
- fun changeBg(bg:String){
- if (!bg.isNullOrEmpty())
+ fun changeBg(bg:String,video:String){
+ if (video.isNotEmpty()){
+ iv_home.invisible()
+ player.visible()
+ player.release()
+ player.setUrl(video)
+ player.setLooping(true)
+ player.start()
+ } else if (bg.isNotEmpty()){
iv_home.setImageURI(bg)
+ player.release()
+ player.gone()
+ iv_home.visible()
+ }
}
private fun getTopMenu(){
@@ -162,13 +175,24 @@
fun getToday() {
HttpManager.getTodayMeditation().requestByF(this){_,data->
today = data
- if (today?.clientMeditationVO?.backgroundUrl.isNullOrEmpty()){
- iv_daily_empty.visible()
+ if (data?.isShow == 0){
+ if (today?.clientMeditationVO?.backgroundUrl.isNullOrEmpty()){
+ iv_daily_empty.visible()
+ }else{
+ iv_daily_empty.gone()
+ iv_today.setImageURI(today?.imageUrl)
+ tv_length_today.text = "${today?.clientMeditationVO?.meditationTitle?.ellipsize(12)} | ${"%02d:%02d".format((data?.time?:0)/60,(data?.time?:0)%60)}"
+ tv_today_count.text = "${(today?.clientMeditationVO?.realLearnedNum?:0)+(today?.clientMeditationVO?.virtualLearnedNum?:0)}人已参加学习"
+ }
}else{
- iv_daily_empty.gone()
- iv_today.setImageURI(today?.imageUrl)
- tv_length_today.text = "${today?.clientMeditationVO?.meditationTitle?.ellipsize(12)} | ${"%02d:%02d".format((data?.time?:0)/60,(data?.time?:0)%60)}"
- tv_today_count.text = "${(today?.clientMeditationVO?.realLearnedNum?:0)+(today?.clientMeditationVO?.virtualLearnedNum?:0)}人已参加学习"
+ if (today?.meditationVideo?.videoUrl.isNullOrEmpty()){
+ iv_daily_empty.visible()
+ }else{
+ iv_daily_empty.gone()
+ iv_today.setImageURI(today?.meditationVideo?.imageUrl)
+ tv_length_today.text = "${today?.meditationVideo?.title?.ellipsize(18)} | ${"%02d:%02d".format((today?.meditationVideo?.videoSecond?:0)/60,(today?.meditationVideo?.videoSecond?:0)%60)}"
+ tv_today_count.text = ""
+ }
}
}
}
@@ -198,4 +222,19 @@
}
}
}
+
+ override fun onPause() {
+ super.onPause()
+ player?.pause()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ player?.resume()
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ player?.release()
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1