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

This commit is contained in:
kehaoyuan
2019-03-28 20:55:58 +08:00
2 changed files with 4 additions and 2 deletions

View File

@ -216,7 +216,7 @@ object CommentHelper {
}
}
if (answerId == null) {
if (answerId != null) {
DialogUtils.showAlertDialog(context, highlight, content,
"确定", "取消", {
RetrofitManager.getInstance(context).api

View File

@ -132,7 +132,9 @@ class AskFragment : BaseFragment<Any>() {
mViewModel.communityStatus.observe(this, Observer { status ->
status?.let {
if (!status.isActive || TextUtils.isEmpty(UserManager.getInstance().community.id)) {
// 先让运营能点进测试社区
if (UserManager.getInstance().community.id != "5a605c3501edfe00213dd061"
&& (!status.isActive || TextUtils.isEmpty(UserManager.getInstance().community.id))) {
showCommunitySelectFragment()
} else {
mAskCommunityName.text = UserManager.getInstance().community.name