From 986709f6ba40e9f0a64a447105bcff4ca746c73c Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 13 二月 2025 16:03:00 +0800
Subject: [PATCH] 修改反馈
---
app/src/main/java/com/sinata/xqmuse/dialog/TipDialog.kt | 5 +++--
app/src/main/java/com/sinata/xqmuse/ui/BGMSettingActivity.kt | 2 +-
app/src/main/java/com/sinata/xqmuse/ui/guide/TagActivity.kt | 2 ++
app/src/main/java/com/sinata/xqmuse/XQApplication.kt | 1 +
app/src/main/java/com/sinata/xqmuse/ui/home/HomeFragment.kt | 24 +++++++++++++++++++++++-
app/src/main/res/layout/fragment_home.xml | 3 ++-
app/src/main/java/com/sinata/xqmuse/MainActivity.kt | 5 +++++
app/src/main/res/raw/default_bg.mp4 | 0
8 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/sinata/xqmuse/MainActivity.kt b/app/src/main/java/com/sinata/xqmuse/MainActivity.kt
index fde026b..2890343 100644
--- a/app/src/main/java/com/sinata/xqmuse/MainActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/MainActivity.kt
@@ -428,6 +428,11 @@
(fragments[2] as TreeFragment).showFirst()
hasTreeFirstShow = true
}
+ if (XQApplication.finishAnswer){
+ XQApplication.finishAnswer = false
+ tab_bar.currentTab = 2
+ onTabSelect(2)
+ }
}
override fun onPause() {
diff --git a/app/src/main/java/com/sinata/xqmuse/XQApplication.kt b/app/src/main/java/com/sinata/xqmuse/XQApplication.kt
index 901b8b4..0564516 100644
--- a/app/src/main/java/com/sinata/xqmuse/XQApplication.kt
+++ b/app/src/main/java/com/sinata/xqmuse/XQApplication.kt
@@ -101,6 +101,7 @@
var lon:Double? = null
var isForeground = true
var appContext: XQApplication? = null
+ var finishAnswer = false //完成答题后置为true，跳转到树苗打卡
fun getInstance(): XQApplication? {
if (appContext == null) {
appContext = XQApplication()
diff --git a/app/src/main/java/com/sinata/xqmuse/dialog/TipDialog.kt b/app/src/main/java/com/sinata/xqmuse/dialog/TipDialog.kt
index 92a577a..184d2c8 100644
--- a/app/src/main/java/com/sinata/xqmuse/dialog/TipDialog.kt
+++ b/app/src/main/java/com/sinata/xqmuse/dialog/TipDialog.kt
@@ -41,7 +41,7 @@
arguments?.getString("title")?:"提示"
}
private val msg by lazy { //提示信息
- arguments?.getString("msg")?:"是否确定取消订单？"
+ arguments?.getString("msg")?:""
}
private val ok by lazy { //确定文字
arguments?.getString("ok")?:"确认"
@@ -65,6 +65,7 @@
tv_msg.text = SpanBuilder(msg).color(requireContext(),6,msg.length-2,R.color.colorPrimary).build()
else
tv_msg.text = msg
+
tv_title.text = title
tv_ok.text = ok
tv_cancel.text = cancel
@@ -114,7 +115,7 @@
}
companion object{
- fun show(fm:FragmentManager,msg:String,callback: OnClickCallback,ok:String = "确认",cancel:String="关闭",isAlert:Boolean = false,title:String = "提示"){
+ fun show(fm:FragmentManager,msg:String?,callback: OnClickCallback,ok:String = "确认",cancel:String="关闭",isAlert:Boolean = false,title:String = "提示"){
val tipDialog = TipDialog()
tipDialog.arguments = bundleOf("msg" to msg,"ok" to ok,"cancel" to cancel,"isAlert" to isAlert,"title" to title)
tipDialog.setCallback(callback)
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/BGMSettingActivity.kt b/app/src/main/java/com/sinata/xqmuse/ui/BGMSettingActivity.kt
index 0f77382..b8cc818 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/BGMSettingActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/BGMSettingActivity.kt
@@ -85,7 +85,7 @@
sb_voice.progress = SPUtils.instance().getInt(Const.User.VOLUME,50)
isSilent = SPUtils.instance().getInt(Const.User.VOLUME,50) == 0
sb_silent.setImageResource(if (!isSilent) R.mipmap.sw_on else R.mipmap.sw_off)
- player.setVolume(sb_voice.progress.toFloat()/100)
+// player.setVolume(sb_voice.progress.toFloat()/100)
getData()
}
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/guide/TagActivity.kt b/app/src/main/java/com/sinata/xqmuse/ui/guide/TagActivity.kt
index 9bb0146..320e64b 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/guide/TagActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/guide/TagActivity.kt
@@ -10,6 +10,7 @@
import com.google.gson.Gson
import com.sinata.xqmuse.MainActivity
import com.sinata.xqmuse.R
+import com.sinata.xqmuse.XQApplication
import com.sinata.xqmuse.network.HttpManager
import com.sinata.xqmuse.network.entity.TagBean
import com.sinata.xqmuse.network.entity.req.ReqAnswer
@@ -44,6 +45,7 @@
if (answer!!.tagIds.isNullOrEmpty()){
toast("请选择标签")
}else{
+ XQApplication.finishAnswer = true
if (SPUtils.instance().getString(Const.User.TOKEN).isNullOrEmpty()){
SPUtils.instance().put(Const.User.ANSWER,Gson().toJson(answer)).apply()
Log.e(Const.Tag,"当前未登录，保存到Sp中")
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 7730a07..f67d9cc 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
@@ -7,6 +7,8 @@
import cn.sinata.xldutils.invisible
import cn.sinata.xldutils.utils.ellipsize
import cn.sinata.xldutils.visible
+import com.google.android.exoplayer2.upstream.DataSpec
+import com.google.android.exoplayer2.upstream.RawResourceDataSource
import com.sinata.xqmuse.MainActivity
import com.sinata.xqmuse.R
import com.sinata.xqmuse.network.HttpManager
@@ -79,7 +81,7 @@
iv_privacy.setOnClickListener {
startActivity<GuideActivity>()
}
- iv_guide.setOnClickListener {
+ tv_3.setOnClickListener {
HttpManager.getH5(4).requestByF(this){ _, data->
data?.let {
startActivity<H5Activity>("title" to "新手冥想指南","url" to it.content)
@@ -150,6 +152,22 @@
player.release()
player.gone()
iv_home.visible()
+ }else{
+ iv_home.invisible()
+ player.visible()
+ player.release()
+ //ExoPlayer
+ val dataSpec = DataSpec(RawResourceDataSource.buildRawResourceUri(R.raw.default_bg))
+ val rawResourceDataSource = RawResourceDataSource(requireContext())
+ try {
+ rawResourceDataSource.open(dataSpec)
+ } catch (e: RawResourceDataSource.RawResourceDataSourceException) {
+ e.printStackTrace()
+ }
+ val url = rawResourceDataSource.uri.toString()
+ player.setUrl(url)
+ player.setLooping(true)
+ player.start()
}
}
@@ -176,6 +194,8 @@
HttpManager.getTodayMeditation().requestByF(this){_,data->
today = data
if (data?.isShow == 0){
+ tv_1.text = "每日疗愈"
+ tv_sub_1.text = "Daily Meditation"
if (today?.clientMeditationVO?.backgroundUrl.isNullOrEmpty()){
iv_daily_empty.visible()
}else{
@@ -185,6 +205,8 @@
tv_today_count.text = "${(today?.clientMeditationVO?.realLearnedNum?:0)+(today?.clientMeditationVO?.virtualLearnedNum?:0)}人已参加学习"
}
}else{
+ tv_1.text = "泉疗愈 微电影"
+ tv_sub_1.text = "Spring Healing Microfilm"
if (today?.meditationVideo?.videoUrl.isNullOrEmpty()){
iv_daily_empty.visible()
}else{
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 681091e..c00013c 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -69,7 +69,7 @@
android:id="@+id/iv_home"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintDimensionRatio="39:42"
- app:placeholderImage="@mipmap/home_default"
+ app:placeholderImage="@color/white"
app:placeholderImageScaleType="centerCrop"
app:actualImageScaleType="centerCrop"/>
<androidx.recyclerview.widget.RecyclerView
@@ -95,6 +95,7 @@
android:textColor="@color/textColor"
android:fontFamily="@font/sourcehansanscn_regular"/>
<TextView
+ android:id="@+id/tv_sub_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Daily Meditation"
diff --git a/app/src/main/res/raw/default_bg.mp4 b/app/src/main/res/raw/default_bg.mp4
new file mode 100644
index 0000000..a3eec0d
--- /dev/null
+++ b/app/src/main/res/raw/default_bg.mp4
Binary files differ
--
Gitblit v1.7.1