fix(network): 修复网络请求配置和UI状态管理问题
- 切换回本地开发环境的基础URL配置 - 修改请求完成逻辑,确保无论成功或失败都会执行完成回调 - 在WelcomeActivity中添加请求过程中的按钮状态控制 - 实现请求完成后恢复按钮可点击状态 - 在页面恢复时重置按钮状态为可用状态
这个提交包含在:
父节点
83ce6341ab
当前提交
4471a8e68a
@ -14,8 +14,8 @@ import com.xuqm.base.di.manager.HttpManager;
|
|||||||
*/
|
*/
|
||||||
public class MyApplication extends App {
|
public class MyApplication extends App {
|
||||||
|
|
||||||
// public static String baseUrl = "http://192.168.6.20";
|
public static String baseUrl = "http://192.168.6.20";
|
||||||
public static String baseUrl = "http://22fs132201.imwork.net";
|
// public static String baseUrl = "http://22fs132201.imwork.net";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
|
|||||||
@ -31,8 +31,8 @@ object IntentRecognizeHelper {
|
|||||||
private var questionIndex = 0
|
private var questionIndex = 0
|
||||||
private var disposable: Disposable? = null
|
private var disposable: Disposable? = null
|
||||||
|
|
||||||
private val baseUrl: String = "https://22v1322u01.vicp.fun"
|
// private val baseUrl: String = "https://22v1322u01.vicp.fun"
|
||||||
// private val baseUrl: String = "http://192.168.6.20:12119"
|
private val baseUrl: String = "http://192.168.6.20:12119"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param context 用于显示 Toast
|
* @param context 用于显示 Toast
|
||||||
@ -65,8 +65,8 @@ object IntentRecognizeHelper {
|
|||||||
onSuccess(model.data.action)
|
onSuccess(model.data.action)
|
||||||
} else {
|
} else {
|
||||||
Toast.makeText(context, model.message, Toast.LENGTH_SHORT).show()
|
Toast.makeText(context, model.message, Toast.LENGTH_SHORT).show()
|
||||||
onComplete()
|
|
||||||
}
|
}
|
||||||
|
onComplete() // 无论成功失败都执行
|
||||||
}, { e ->
|
}, { e ->
|
||||||
Toast.makeText(context, "请求失败: ${e.message}", Toast.LENGTH_SHORT).show()
|
Toast.makeText(context, "请求失败: ${e.message}", Toast.LENGTH_SHORT).show()
|
||||||
onComplete()
|
onComplete()
|
||||||
|
|||||||
@ -29,6 +29,8 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
|
|||||||
binding.btnGet.setOnClickListener { vm.demoGet() }
|
binding.btnGet.setOnClickListener { vm.demoGet() }
|
||||||
binding.btnPost.setOnClickListener { vm.demoPost() }
|
binding.btnPost.setOnClickListener { vm.demoPost() }
|
||||||
binding.md.setOnClickListener {
|
binding.md.setOnClickListener {
|
||||||
|
binding.md.text = "请求中"
|
||||||
|
binding.md.isClickable = false
|
||||||
IntentRecognizeHelper.recognize(
|
IntentRecognizeHelper.recognize(
|
||||||
context = this,
|
context = this,
|
||||||
text = "当前阶段,最紧急的任务是什么?",
|
text = "当前阶段,最紧急的任务是什么?",
|
||||||
@ -39,6 +41,10 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
|
|||||||
.putExtra("question", action.params.question)
|
.putExtra("question", action.params.question)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
onComplete = {
|
||||||
|
binding.md.text = "决策中心"
|
||||||
|
binding.md.isClickable = true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -66,6 +72,8 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
|
|||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
OfflineCmdServiceHelper.addOnLineListener(offlineCmdListener)
|
OfflineCmdServiceHelper.addOnLineListener(offlineCmdListener)
|
||||||
|
binding.md.text = "决策中心"
|
||||||
|
binding.md.isClickable = true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
|
|||||||
正在加载...
在新工单中引用
屏蔽一个用户