From 2c5a21ec2a04495fea992517367dbaf920ba7ec2 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Wed, 31 Oct 2018 05:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=20UI=20=E9=97=AE=E9=A2=98=EF=BC=8C=201=E3=80=812=E3=80=814?= =?UTF-8?q?=E3=80=815=E3=80=8112=20https://gitlab.ghzhushou.com/pm/halo-ap?= =?UTF-8?q?p-issues/issues/385?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/download/DownloadManager.java | 9 +++++++-- .../gamecenter/adapter/MessageDetailAdapter.java | 16 +++++++++++++--- .../message/MessageDetailFragment.java | 2 +- .../gamecenter/retrofit/service/ApiService.java | 2 +- app/src/main/res/layout/comment_head_item.xml | 2 +- .../main/res/layout/gamedetail_item_image.xml | 1 + app/src/main/res/layout/news_detail_comment.xml | 2 +- 7 files changed, 25 insertions(+), 9 deletions(-) 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" />