Commit bb35d170 authored by yinjiacheng's avatar yinjiacheng

fix 用户反馈页面反馈意见为空时不允许提交

parent 2782d203
...@@ -48,5 +48,8 @@ class FeedbackActivity : BaseMvvmActivity<ActivityFeedbackBinding, FeedbackViewM ...@@ -48,5 +48,8 @@ class FeedbackActivity : BaseMvvmActivity<ActivityFeedbackBinding, FeedbackViewM
vm.commitFailureEvent.observe(this, { vm.commitFailureEvent.observe(this, {
ToastUtils.showShort("提交失败,请稍后重试") ToastUtils.showShort("提交失败,请稍后重试")
}) })
vm.feedbackContentEmptyEvent.observe(this, {
ToastUtils.showShort("您还没有填写反馈意见呦")
})
} }
} }
...@@ -37,10 +37,20 @@ class FeedbackViewModel : BaseViewModel(), ICommitFeedbackCallback { ...@@ -37,10 +37,20 @@ class FeedbackViewModel : BaseViewModel(), ICommitFeedbackCallback {
*/ */
val commitFailureEvent by lazy { MutableLiveData<Unit>() } val commitFailureEvent by lazy { MutableLiveData<Unit>() }
/**
* 用户输入的反馈内容空事件
*/
val feedbackContentEmptyEvent by lazy { MutableLiveData<Unit>() }
/** /**
* 请求提交反馈信息 * 请求提交反馈信息
*/ */
fun requestCommitFeedback() { fun requestCommitFeedback() {
// 用户未输入反馈内容
if (feedbackContent.value.isNullOrEmpty()) {
feedbackContentEmptyEvent.value = Unit
return
}
// 拼接获取到的用户信息 // 拼接获取到的用户信息
val description = "uid:${Hawk.get(HawkConfig.UserId, 0L)},appversion:${BuildConfig.VERSION_NAME},platform:${AppConfig.feedbackPlatform}" val description = "uid:${Hawk.get(HawkConfig.UserId, 0L)},appversion:${BuildConfig.VERSION_NAME},platform:${AppConfig.feedbackPlatform}"
CommonDataSource.commitFeedback( CommonDataSource.commitFeedback(
...@@ -51,7 +61,7 @@ class FeedbackViewModel : BaseViewModel(), ICommitFeedbackCallback { ...@@ -51,7 +61,7 @@ class FeedbackViewModel : BaseViewModel(), ICommitFeedbackCallback {
CommitFeedbackBean.Issuetype(AppConfig.feedbackIssueType), CommitFeedbackBean.Issuetype(AppConfig.feedbackIssueType),
CommitFeedbackBean.Priority(AppConfig.feedbackPriority), CommitFeedbackBean.Priority(AppConfig.feedbackPriority),
CommitFeedbackBean.Project(AppConfig.feedbackProject), CommitFeedbackBean.Project(AppConfig.feedbackProject),
feedbackContent.value ?: AppConfig.feedbackDefaultSummary feedbackContent.value as String
) )
) )
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment