diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index d15bfa5aab..0a5ce9f5d3 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -206,8 +206,13 @@ public class DownloadManager implements DownloadStatusListener { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); final SharedPreferences.Editor edit = sp.edit(); if (sp.getBoolean("InstallHint" + PackageUtils.getVersionName(), true)) { - DialogUtils.showInstallHintDialog(context, - () -> edit.putBoolean("InstallHint" + PackageUtils.getVersionName(), false).apply()); + try { + DialogUtils.showInstallHintDialog(context, + () -> edit.putBoolean("InstallHint" + PackageUtils.getVersionName(), false).apply()); + } catch (Exception exception) { + exception.printStackTrace(); + edit.putBoolean("InstallHint" + PackageUtils.getVersionName(), false).apply(); + } } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 0a110962b3..826e905181 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -545,12 +545,22 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { // 往位置0添加评论 public void addNormalComment(CommentEntity commentEntity) { - mNormalCommentList.add(0, commentEntity); + mNormalCommentList.add(findTheLastPriorComment(), commentEntity); } public void addCommentCount() { - mConcernEntity.setCommentnum(mConcernEntity.getCommentnum() + 1); - notifyItemChanged(0); + mConcernEntity.setCommentnum(mConcernEntity.getCommentnum()); + notifyDataSetChanged(); + } + + public int findTheLastPriorComment() { + int lastPriorityPosition = 0; + for (int i = 0; i < mNormalCommentList.size(); i++) { + if (mNormalCommentList.get(i).getPriority() != 0) { + lastPriorityPosition = i + 1; + } + } + return lastPriorityPosition; } public int getHotCommentListSize() { diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index e61b9152c6..785c6375a7 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -358,7 +358,7 @@ public class MessageDetailFragment extends NormalFragment implements OnCommentCa adapter.addNormalComment(commentEntity); } - modifyNewsCommentOkhttpCache(0, cacheObject, newsId); + modifyNewsCommentOkhttpCache(adapter.findTheLastPriorComment(), cacheObject, newsId); } catch (JSONException e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 27427aa9c2..501f6d8c9f 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -1225,7 +1225,7 @@ public interface ApiService { /** * 获取社区文章列表 */ - @GET("users/{user_id}/communities/articles") + @GET("users/{user_id}/communities/articles?view=home_page") Observable> getMyArticle(@Path("user_id") String userId, @Query("page") int page); /** diff --git a/app/src/main/res/layout/comment_head_item.xml b/app/src/main/res/layout/comment_head_item.xml index a5a1088244..3c69cf211b 100644 --- a/app/src/main/res/layout/comment_head_item.xml +++ b/app/src/main/res/layout/comment_head_item.xml @@ -22,7 +22,7 @@ android:textStyle = "bold" android:gravity = "center_vertical" android:textColor = "@color/title" - android:textSize = "16sp" /> + android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/news_detail_comment.xml b/app/src/main/res/layout/news_detail_comment.xml index 7afa54ac20..092632c5de 100644 --- a/app/src/main/res/layout/news_detail_comment.xml +++ b/app/src/main/res/layout/news_detail_comment.xml @@ -17,7 +17,7 @@ android:paddingTop = "12dp" android:textStyle = "bold" android:textColor = "@color/text_3a3a3a" - android:textSize = "16sp" /> + android:textSize = "15sp" />