From 9673bcd57c6100ad9fdfbee728ef078104511fc1 Mon Sep 17 00:00:00 2001
From: 罗明文 <125975490@qq.com>
Date: 星期日, 16 六月 2024 22:27:47 +0800
Subject: [PATCH] save
---
app/src/main/java/com/dollearn/student/network/Apis.kt | 4 ++--
.idea/runConfigurations.xml | 10 ++++++++++
.idea/.name | 1 +
app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt | 2 +-
app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt | 8 +++++++-
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..b6fe07f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+DophinEnglish
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RunConfigurationProducerService">
+ <option name="ignoredProducers">
+ <set>
+ <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+ </set>
+ </option>
+ </component>
+</project>
\ No newline at end of file
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 5b5f7eb..aad8018 100644
--- a/app/src/main/java/com/dollearn/student/network/Apis.kt
+++ b/app/src/main/java/com/dollearn/student/network/Apis.kt
@@ -3,9 +3,9 @@
object Apis {
private var isTest = true
- private const val TEST_URL = "http://192.168.110.237:9000/" //周帅内网
+// private const val TEST_URL = "http://192.168.110.237:9000/" //周帅内网
// private const val TEST_URL = "http://221.182.45.100:56666/" //内网穿透
-// private const val TEST_URL = "http://8.137.22.229:56666/" //外网
+ 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
diff --git a/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt b/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt
index 07082f4..d503106 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt
@@ -34,7 +34,7 @@
cl_1.clickDelay {
showDialog("加载题目...")
HttpManager.listenSelectPicture(season, week, day).requestByF(this){_,data->
- startActivityForResult<ListenActivity>(1,"data" to data)
+ startActivityForResult<ListenActivity>(1,"data" to data,"day" to day,"week" to week)
}
}
}
diff --git a/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt b/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
index 33766e7..d4388a2 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
@@ -21,6 +21,12 @@
class ListenActivity:TransparentStatusBarActivity() {
override fun setContentView() = R.layout.activity_listen
+ private val day by lazy {
+ intent.getIntExtra("day",0)
+ }
+ private val week by lazy {
+ intent.getIntExtra("week",0)
+ }
val data by lazy { intent.getParcelableExtra<SubjectBean>("data") }
private val fragments = arrayListOf<Fragment>()
@@ -88,7 +94,7 @@
tipDialog.arguments = bundleOf("msg" to "未完成全部答题，确认退出吗？")
tipDialog.setCallback(object :TipDialog.OnClickCallback{
override fun onOk() {
- HttpManager.exitLearning()
+ HttpManager.exitLearning(day,week,1,data?.data?.id?:"",)
}
override fun onCancel() {
--
Gitblit v1.7.1