From 4471a8e68acc2949ec869aea1f2d2b0dcef761ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Thu, 16 Apr 2026 18:18:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(network):=20=E4=BF=AE=E5=A4=8D=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E8=AF=B7=E6=B1=82=E9=85=8D=E7=BD=AE=E5=92=8CUI?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 切换回本地开发环境的基础URL配置 - 修改请求完成逻辑，确保无论成功或失败都会执行完成回调 - 在WelcomeActivity中添加请求过程中的按钮状态控制 - 实现请求完成后恢复按钮可点击状态 - 在页面恢复时重置按钮状态为可用状态 --- app/src/main/java/com/nova/brain/glass/MyApplication.java | 4 ++-- .../com/nova/brain/glass/helper/IntentRecognizeHelper.kt | 6 +++--- .../main/java/com/nova/brain/glass/ui/WelcomeActivity.kt | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nova/brain/glass/MyApplication.java b/app/src/main/java/com/nova/brain/glass/MyApplication.java index 0ada3d6..2bd8313 100644 --- a/app/src/main/java/com/nova/brain/glass/MyApplication.java +++ b/app/src/main/java/com/nova/brain/glass/MyApplication.java @@ -14,8 +14,8 @@ import com.xuqm.base.di.manager.HttpManager; */ public class MyApplication extends App { -// public static String baseUrl = "http://192.168.6.20"; - public static String baseUrl = "http://22fs132201.imwork.net"; + public static String baseUrl = "http://192.168.6.20"; +// public static String baseUrl = "http://22fs132201.imwork.net"; @Override public void onCreate() { diff --git a/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt index c6330a0..dbfcfd8 100644 --- a/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt +++ b/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt @@ -31,8 +31,8 @@ object IntentRecognizeHelper { private var questionIndex = 0 private var disposable: Disposable? = null - private val baseUrl: String = "https://22v1322u01.vicp.fun" -// private val baseUrl: String = "http://192.168.6.20:12119" +// private val baseUrl: String = "https://22v1322u01.vicp.fun" + private val baseUrl: String = "http://192.168.6.20:12119" /** * @param context 用于显示 Toast @@ -65,8 +65,8 @@ object IntentRecognizeHelper { onSuccess(model.data.action) } else { Toast.makeText(context, model.message, Toast.LENGTH_SHORT).show() - onComplete() } + onComplete() // 无论成功失败都执行 }, { e -> Toast.makeText(context, "请求失败: ${e.message}", Toast.LENGTH_SHORT).show() onComplete() diff --git a/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt index 5ecebb1..7ec51f3 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt @@ -29,6 +29,8 @@ class WelcomeActivity : BaseActivity() { binding.btnGet.setOnClickListener { vm.demoGet() } binding.btnPost.setOnClickListener { vm.demoPost() } binding.md.setOnClickListener { + binding.md.text = "请求中" + binding.md.isClickable = false IntentRecognizeHelper.recognize( context = this, text = "当前阶段，最紧急的任务是什么？", @@ -39,6 +41,10 @@ class WelcomeActivity : BaseActivity() { .putExtra("question", action.params.question) ) } + }, + onComplete = { + binding.md.text = "决策中心" + binding.md.isClickable = true } ) } @@ -66,6 +72,8 @@ class WelcomeActivity : BaseActivity() { override fun onResume() { super.onResume() OfflineCmdServiceHelper.addOnLineListener(offlineCmdListener) + binding.md.text = "决策中心" + binding.md.isClickable = true } override fun onPause() {