From f84c51bb2f6be93b1ff6e48077316eaabd713d9f Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 07 三月 2025 13:51:51 +0800
Subject: [PATCH] save
---
app/src/main/java/com/dollearn/student/ui/home/ChooseVoiceFragment.kt | 19 +++++++++++--------
app/src/main/java/com/dollearn/student/network/ApiService.kt | 3 +++
app/src/main/java/com/dollearn/student/network/Apis.kt | 5 +++--
app/src/main/java/com/dollearn/student/MainActivity.kt | 7 +++++++
app/src/main/java/com/dollearn/student/utils/Const.kt | 1 +
app/src/main/java/com/dollearn/student/network/HttpManager.kt | 7 +++++++
6 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/MainActivity.kt b/app/src/main/java/com/dollearn/student/MainActivity.kt
index 90a8e89..cee32e6 100644
--- a/app/src/main/java/com/dollearn/student/MainActivity.kt
+++ b/app/src/main/java/com/dollearn/student/MainActivity.kt
@@ -48,6 +48,13 @@
getData()
getVoiceUrl()
getScoreConfig()
+ getIsText2()
+ }
+
+ private fun getIsText2() {
+ HttpManager.getIsOpen().request(this){_,data->
+ SPUtils.instance().put(Const.IS_SHOW_TEXT,data?:true).apply()
+ }
}
private fun getScoreConfig() {
diff --git a/app/src/main/java/com/dollearn/student/network/ApiService.kt b/app/src/main/java/com/dollearn/student/network/ApiService.kt
index 26c040a..c720c83 100644
--- a/app/src/main/java/com/dollearn/student/network/ApiService.kt
+++ b/app/src/main/java/com/dollearn/student/network/ApiService.kt
@@ -82,6 +82,9 @@
@GET(Apis.userGameDifficulty)
fun userGameDifficulty(@Query("week") week: Int): Flowable<ResultData<Int?>>
+ @GET(Apis.getIsOpen)
+ fun getIsOpen(): Flowable<ResultData<Boolean>>
+
@GET(Apis.teamSchedule)
fun teamSchedule(@Query("day") day:Int,@Query("type") type:Int,@Query("week") week:Int): Flowable<ResultData<ProgressBean>>
diff --git a/app/src/main/java/com/dollearn/student/network/Apis.kt b/app/src/main/java/com/dollearn/student/network/Apis.kt
index 98dace0..b9f99f6 100644
--- a/app/src/main/java/com/dollearn/student/network/Apis.kt
+++ b/app/src/main/java/com/dollearn/student/network/Apis.kt
@@ -3,8 +3,8 @@
object Apis {
private var isTest = true
-// private const val TEST_URL = "http://192.168.110.237:9000/" //周帅内网
- private const val TEST_URL = "http://1.95.15.237:9000/" //外网
+ private const val TEST_URL = "http://192.168.110.64:9000/" //周帅内网
+// private const val TEST_URL = "http://1.95.15.237:9000/" //外网
private const val LINE_URL = "http://8.137.22.229:56666/" //正式服
val BASE_URL = if (isTest) TEST_URL else LINE_URL
@@ -51,6 +51,7 @@
const val gameMemory = "study/base/study/gameMemory"
const val gameAchievement = "study/base/study/gameAchievement"
const val userGameDifficulty = "study/base/study/userGameDifficulty"
+ const val getIsOpen = "management/tSysSet/getIsOpen"
/**
diff --git a/app/src/main/java/com/dollearn/student/network/HttpManager.kt b/app/src/main/java/com/dollearn/student/network/HttpManager.kt
index 1cf99f3..e0ad5e6 100644
--- a/app/src/main/java/com/dollearn/student/network/HttpManager.kt
+++ b/app/src/main/java/com/dollearn/student/network/HttpManager.kt
@@ -154,6 +154,13 @@
}
/**
+ * 题目二是否展示文字
+ */
+ fun getIsOpen(): Flowable<ResultData<Boolean>> {
+ return request().getIsOpen()
+ }
+
+ /**
* 回复进度
*/
fun teamSchedule(day: Int,week: Int,type: Int): Flowable<ResultData<ProgressBean>> {
diff --git a/app/src/main/java/com/dollearn/student/ui/home/ChooseVoiceFragment.kt b/app/src/main/java/com/dollearn/student/ui/home/ChooseVoiceFragment.kt
index fdc9cd1..c898449 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/ChooseVoiceFragment.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/ChooseVoiceFragment.kt
@@ -58,6 +58,8 @@
private var nowVoiceView:View? = null
+ private val isShowText by lazy { SPUtils.instance().getBoolean(Const.IS_SHOW_TEXT,true) }
+
override fun onFirstVisibleToUser() {
player.setOnAudioStatusUpdateListener(this)
player.stopPlayMusic()
@@ -243,15 +245,16 @@
val shuffledList = list.shuffled()
voiceList.clear()
voiceList.addAll(shuffledList)
- nameViews.forEachIndexed { index, textView ->
- if (index == currentIndex){
- textView.text = originList[index].name
- textView.backgroundResource = R.color.textColor99
- }else{
- textView.text = ""
- textView.backgroundResource = R.color.page_bg
+ if (isShowText)
+ nameViews.forEachIndexed { index, textView ->
+ if (index == currentIndex){
+ textView.text = originList[index].name
+ textView.backgroundResource = R.color.textColor99
+ }else{
+ textView.text = ""
+ textView.backgroundResource = R.color.page_bg
+ }
}
- }
//设置动画飞行路径 3对4
val rightVoiceIndex = voiceList.indexOf(imageNow.correct)
var start = 0
diff --git a/app/src/main/java/com/dollearn/student/utils/Const.kt b/app/src/main/java/com/dollearn/student/utils/Const.kt
index 9735ada..d3c87c5 100644
--- a/app/src/main/java/com/dollearn/student/utils/Const.kt
+++ b/app/src/main/java/com/dollearn/student/utils/Const.kt
@@ -19,6 +19,7 @@
const val RV = "rightVoice"
const val EV = "errorVoice"
const val SCORE_DURATION = "score_duration"
+ const val IS_SHOW_TEXT = "isShowText"
object Permission{
const val CAMERA_REFUSE = "CAMERA_REFUSE"
--
Gitblit v1.7.1