Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
kehaoyuan
2019-05-22 16:26:10 +08:00
parent 6fb4dac45d 3d49258b84
commit c735d4e717
4 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/common/util/ErrorHelper.kt
View File

@ -34,9 +34,8 @@ object ErrorHelper {
if (customizedHandler(errorEntity.code ?: 0)) {
return
} else {
ErrorHelper.handleError(context, important, errorEntity)
handleError(context, important, errorEntity)
}
}
/**
@ -56,7 +55,7 @@ object ErrorHelper {
return
}
ErrorHelper.handleError(context, important, errorEntity)
handleError(context, important, errorEntity)
}
/***

8
app/src/main/java/com/gh/common/util/Extensions.kt
View File

@ -115,6 +115,14 @@ fun View.debounceActionWithInterval(interval: Long = 300, action: (() -> Unit)?
debounceActionWithInterval(this.id, interval, action)
}
/**
* 告诉需要返回 true or false 的外层这个事件已经被消费（即返回 true）
*/
inline fun consume(f: () -> Unit): Boolean {
f()
return true
}
/**
* String related
*/

10
app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
View File

@ -322,18 +322,14 @@ class AnswerDetailFragment : NormalFragment() {
showFollowHint()
}
} else if (apiResponse.httpException != null) {
ErrorHelper.handleErrorWithCustomizedHandler(requireContext(), apiResponse.httpException.response().errorBody()!!.string(), false) {
ErrorHelper.handleErrorWithCustomizedHandler(requireContext(), apiResponse.httpException.response().errorBody()?.string(), false) {
when (it) {
403008 -> {
403008 -> consume {
toast(R.string.ask_vote_hint)
answerDetail.me.isAnswerVoted = true
updateLikeView(answerDetail.me.isAnswerVoted, answerDetail.vote)
true
}
403036 -> {
toast(R.string.ask_vote_limit_hint)
true
}
403036 -> consume { toast(R.string.ask_vote_limit_hint) }
else -> false
}
}

23
app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt
View File

@ -240,16 +240,11 @@ class AnswerEditActivity : BaseRichEditorActivity() {
startActivity(intent)
}
finish()
} else if (it?.status == Status.ERROR) {
var errorString: String? = null
val e = it.exception
if (e != null && e.code() == 403) {
try {
errorString = e.response().errorBody()!!.string()
val string = JSONObject(errorString)
val code = string.getInt("code")
if (code == 403037) {
val errorString = it.exception?.response()?.errorBody()?.string()
ErrorHelper.handleErrorWithCustomizedHandler(this, errorString, customizedHandler = { code ->
when (code) {
403037 -> consume {
if (TextUtils.isEmpty(mViewModel?.draftId)) {
DialogUtils.showAlertDialog(this, "发布失败"
, "问题已被删除，无法发布回答", "好吧", "", {
@ -262,16 +257,10 @@ class AnswerEditActivity : BaseRichEditorActivity() {
finish()
})
}
return@Observer
} else {
ErrorHelper.handleError(this, errorString, false)
return@Observer
}
} catch (e1: Exception) {
e1.printStackTrace()
else -> false
}
}
ErrorHelper.handleError(this, errorString, false)
})
}
})