From ec282d9bf134fbda578ff901e4a620222a851d3f Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期三, 20 十一月 2024 10:14:46 +0800
Subject: [PATCH] fix bug

---
 app/src/main/java/com/sinata/xqmuse/MainActivity.kt |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sinata/xqmuse/MainActivity.kt b/app/src/main/java/com/sinata/xqmuse/MainActivity.kt
index 1bd9cc8..7cf6d92 100644
--- a/app/src/main/java/com/sinata/xqmuse/MainActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/MainActivity.kt
@@ -1,9 +1,11 @@
 package com.sinata.xqmuse
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import android.provider.Settings
 import android.util.Log
 import android.view.View
 import androidx.fragment.app.Fragment
@@ -245,7 +247,7 @@
      * 保存冥想记录
      */
     private fun saveThinkRecord() {
-        if (voice == null||startTime == 0L)
+        if (voice == null||startTime == 0L||SPUtils.instance().getString(Const.User.TOKEN).isNullOrEmpty())
             return
         val time = ((System.currentTimeMillis() - startTime) / 1000).toInt()
         startTime = 0L
@@ -395,7 +397,7 @@
         }else if(e.code == Const.EventCode.REFRESH_PRIVATE){ //重新答题后,刷新私人定制
             (fragments[0] as HomeFragment).getPrivacy()
         }else if(e.code == Const.EventCode.THINK_TIMER){ //开启倒计时
-            thinkHandler?.sendEmptyMessage(1)
+            thinkHandler?.sendEmptyMessage(MSG_COUNTDOWN)
         }
     }
 
@@ -407,10 +409,13 @@
         }
     }
 
+    @SuppressLint("HardwareIds")
     private fun checkAnswer() {
         val answer = SPUtils.instance().getString(Const.User.ANSWER)
         if (!answer.isNullOrEmpty()){ //已登录并且有答案
-            HttpManager.saveUserAnswers(Gson().fromJson(answer, ReqAnswer::class.java)).request(this,false,success = { _, _->
+            val reqAnswer = Gson().fromJson(answer, ReqAnswer::class.java)
+            reqAnswer?.device = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
+            HttpManager.saveUserAnswers(reqAnswer).request(this,false,success = { _, _->
                 SPUtils.instance().put(Const.User.ANSWER,"").apply()
                 Log.e(Const.Tag,"私人定制已保存")
                 (fragments[0] as HomeFragment).getPrivacy()

--
Gitblit v1.7.1