1.添加获取首页轮播图接口

baselib/src/main/java/com/yingyangfly/baselib/net/LoggingInterceptor.kt

@@ -1,6 +1,7 @@
 package com.yingyangfly.baselib.net
 
 import android.util.Log
+import com.yingyangfly.baselib.BuildConfig
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.io.IOException
@@ -11,7 +12,7 @@ import java.util.regex.Pattern
 //https://blog.csdn.net/bunny1024/article/details/53504556?utm_source=blogxgwz0
 class LoggingInterceptor : Interceptor {
     var TAG = "MyHttpLog"
-    val isLog = true
+    val isLog = BuildConfig.DEBUG
     @Throws(IOException::class)
     override fun intercept(chain: Interceptor.Chain): Response {
         //这个chain里面包含了request和response，所以你要什么都可以从这里拿

evaluation/src/main/java/com/yingyangfly/evaluation/history/EvaluationHistoryActivity.kt

@@ -34,6 +34,7 @@ class EvaluationHistoryActivity :
     private var page = 0
     private val otherEvaluationHistoryAdapter by lazy { OtherEvaluationHistoryAdapter() }
     private var selectAnswerRecord = mutableListOf<SelectAnswerRecord>()
+    private var jumpType: String = ""
 
     /**
      * MOCA/MMSE测评
@@ -42,6 +43,7 @@ class EvaluationHistoryActivity :
     private val adapter by lazy { EvaluationHistoryAdapter() }
 
     override fun initViews() {
+        jumpType = intent.getStringExtra("url") ?: ""
         binding {
             swipeOtherResult.setEnableLoadMore(true)
             swipeOtherResult.setEnableRefresh(true)
@@ -92,7 +94,11 @@ class EvaluationHistoryActivity :
     }
 
     override fun initData() {
-
+        if (TextUtils.equals("other", jumpType)) {
+            binding.radioOtherEvaluation.isChecked = true
+        } else {
+            binding.radioProfessionalEvaluation.isChecked = true
+        }
     }
 
     override fun onResume() {

evaluation/src/main/java/com/yingyangfly/evaluation/questionlist/QuestionListActivity.kt

@@ -12,6 +12,7 @@ import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.RxTimer
 import com.yingyangfly.evaluation.R
 import com.yingyangfly.evaluation.adapter.QuestionListAdapter
@@ -30,6 +31,7 @@ class QuestionListActivity : BaseMVVMActivity<ActivityQuestionListBinding, Quest
     private lateinit var rxTimer: RxTimer
     private var time: Long = 0
     private var questionIndex = 0
+    private var id = ""
 
     private var questionRecordsBean: QuestionRecordsBean? = null
     private var questionRecordsBeans = mutableListOf<QuestionRecordsBean>()
@@ -192,6 +194,7 @@ class QuestionListActivity : BaseMVVMActivity<ActivityQuestionListBinding, Quest
                     title = it.title
                     usedTime = time.toString()
                 }
+                id = it.id.toString()
                 saveAnswerRecord.examinationId = examinationId
                 saveAnswerRecord.examinationTitle = examinationTitle
                 saveAnswerRecordBean.add(saveAnswerRecord)
@@ -199,7 +202,10 @@ class QuestionListActivity : BaseMVVMActivity<ActivityQuestionListBinding, Quest
             viewModel.saveAnswerRecord(saveAnswerRecordBean, fail = {
                 it.toast()
             }, success = {
-
+                JumpUtil.jumpActivityWithUrl(
+                    RouterUrlCommon.evaluationHistory, "other", mContext
+                )
+                finish()
             })
         }
     }