From 077e17c5aacf78dd780d023bcbb5fa3249c50fb4 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 4 Sep 2020 14:51:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=95=E6=8A=93=E5=88=86=E4=BA=AB=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E8=B0=83=E6=95=B4=E5=9B=9E=E7=AD=94=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=AD=97=E6=95=B0=E4=B8=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/base/BaseActivity.java | 12 ++++++++---- .../gh/gamecenter/qa/comment/NewCommentFragment.kt | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 307c8176c1..d8d129a944 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -28,6 +28,7 @@ import com.gh.common.constant.Constants; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.ExtensionsKt; import com.gh.common.util.MtaHelper; import com.gh.common.util.PackageInstaller; import com.gh.common.util.RunningUtils; @@ -99,10 +100,13 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE - || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) { - Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener); - } + ExtensionsKt.tryCatchInRelease(() -> { + if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE + || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) { + Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener); + } + return null; + }); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt index 14b8ebecc1..c502d500a2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt @@ -199,10 +199,10 @@ open class NewCommentFragment : ListFragment } mViewModel.saveCommentDraft(mCommentEntity, commentEt.text.toString()) } - if (mCommentType == CommentType.VIDEO || mCommentType == CommentType.VIDEO_CONVERSATION) { - commentEt.filters = arrayOf(TextHelper.getFilter(140, "评论不能多于140字")) - } else { + if (mCommentType == CommentType.COMMUNITY_ARTICLE || mCommentType == CommentType.COMMUNITY_ARTICLE_CONVERSATION) { commentEt.filters = arrayOf(TextHelper.getFilter(5000, "评论不能多于5000字")) + } else { + commentEt.filters = arrayOf(TextHelper.getFilter(140, "评论不能多于140字")) } mViewModel.getCommentDraft(mCommentEntity)?.let { commentEt.setText(it.draft)