From 684fa318ec2b6fdc2b03bfa55e767af6bddf7129 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 26 Apr 2018 17:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3limit=E6=94=B9=E4=B8=BApage?= =?UTF-8?q?=5Fsize=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=B8=B8=E6=88=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E8=BD=BD=E4=B8=8E=E8=AF=A6=E6=83=85=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=AE=89=E8=A3=85=E5=88=A4=E6=96=AD=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AE=89=E8=A3=85=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E5=88=A0=E9=99=A4addFlags(Intent.FLAG=5FACTIVITY=5FNE?= =?UTF-8?q?W=5FTASK)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/DownloadItemUtils.java | 6 ++- .../java/com/gh/common/util/PackageUtils.java | 2 +- .../adapter/CommentDetailAdapter.java | 2 +- .../ask/AskQuestionsRecommendsAdapter.java | 10 +---- .../ask/viewmodel/AnswerCommentViewModel.java | 4 +- .../gh/gamecenter/kaifu/KaiFuVpAdapter.java | 2 +- .../gamecenter/libao/LibaoHistoryAdapter.java | 3 +- .../retrofit/service/ApiService.java | 38 ++++++------------- .../halo/assistant/fragment/VoteFragment.java | 2 +- 9 files changed, 26 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index f3a34398d9..c15eda4ff3 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -156,15 +156,19 @@ public class DownloadItemUtils { holder.gameDownloadBtn.setText(R.string.update); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } else { + Object gh_id = PackageUtils.getMetaData(context, packageName, "gh_id"); if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0 && !TextUtils.isEmpty(apkEntity.getGhVersion()) && !PackageUtils.isSignature(context, packageName)) { holder.gameDownloadBtn.setText(R.string.pluggable); setwhat(context, holder, apkEntity, packageName); - } else { + } else if (gh_id == null || gh_id.equals(gameEntity.getId())) { holder.gameDownloadBtn.setText(R.string.launch); holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); holder.gameDownloadBtn.setBackgroundResource(R.drawable.detail_downloading_normal_style); + } else { + holder.gameDownloadBtn.setText(R.string.download); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } } } else { diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index 9b46de9c39..71351b3c7d 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -167,7 +167,7 @@ public class PackageUtils { public static Intent getInstallIntent(Context context, String path) { Uri uri = Uri.fromFile(new File(path)); Intent installIntent = new Intent(Intent.ACTION_VIEW); - installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); +// installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); installIntent.setDataAndType(uri, "application/vnd.android.package-archive"); InstallUtils.getInstance(context).addInstall(getPackageNameByPath(context, path)); return installIntent; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index edc389ac3a..b856bcde56 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -64,7 +64,7 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { if (mIsLoading) return; mIsLoading = true; RetrofitManager.getInstance(mContext).getApi() - .getCommentTrace(mCommentId, 20, mPage) + .getCommentTrace(mCommentId, mPage) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java index 94ca08021e..ef35f4f9d2 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java @@ -15,7 +15,6 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.ask.entity.AskSubjectEntity; import com.gh.gamecenter.baselist.ListAdapter; -import com.gh.gamecenter.manager.UserManager; import java.util.ArrayList; import java.util.HashMap; @@ -98,14 +97,7 @@ public class AskQuestionsRecommendsAdapter extends ListAdapter { AskSubjectViewHolder subjectViewHolder = (AskSubjectViewHolder) holder; subjectViewHolder.mSubjectRG.removeAllViews(); mSubjectViewPager = subjectViewHolder.mSubjectViewPager; - AskSubjectPageAdapter adapter = mCachePageAdapter.get(UserManager.getInstance().getCommunityId(mContext)); - if (adapter == null || adapter.getDataSize() != mSubjectEntity.size()) { - adapter = new AskSubjectPageAdapter(mContext, mSubjectEntity); - mCachePageAdapter.put(UserManager.getInstance().getCommunityId(mContext), adapter); - subjectViewHolder.mSubjectViewPager.setAdapter(adapter); - } else if (adapter != subjectViewHolder.mSubjectViewPager.getAdapter()) { - subjectViewHolder.mSubjectViewPager.setAdapter(adapter); - } + subjectViewHolder.mSubjectViewPager.setAdapter(new AskSubjectPageAdapter(mContext, mSubjectEntity)); int size = mSubjectEntity.size(); if (size > 1) { for (int i = 0; i < size; i++) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentViewModel.java b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentViewModel.java index 8d6cf233e0..02d80a39bf 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AnswerCommentViewModel.java @@ -40,9 +40,9 @@ public class AnswerCommentViewModel extends ListViewModel> provideDataObservable(int page) { if (TextUtils.isEmpty(mCommentId)) { - return RetrofitManager.getInstance(getApplication()).getApi().getAnswerCommentList(mAnswerId, 20, page); + return RetrofitManager.getInstance(getApplication()).getApi().getAnswerCommentList(mAnswerId, page); } else { - return RetrofitManager.getInstance(getApplication()).getApi().getAnswerCommentConversationList(mAnswerId, mCommentId, 20, page); + return RetrofitManager.getInstance(getApplication()).getApi().getAnswerCommentConversationList(mAnswerId, mCommentId, page); } // return RetrofitManager.getInstance(getApplication()).getApi().getComment("59c0b965e9a64abe2a423544", 0, offset); } diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java index 90e700382d..89372881cb 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java @@ -83,7 +83,7 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter { public void addList() { mIsLoaded = false; RetrofitManager.getInstance(mContext).getApi() - .getKaiFuData(UrlFilterUtils.getFilterQuery("game_id", mGameId, "day", mDay), mPage, 20) + .getKaiFuData(UrlFilterUtils.getFilterQuery("game_id", mGameId, "day", mDay), mPage) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index e0b3c7efc3..f41b408ba3 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -13,6 +13,7 @@ import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.ItemViewType; import com.gh.common.util.DisplayUtils; import com.gh.common.util.LibaoUtils; +import com.gh.common.util.UrlFilterUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; @@ -58,7 +59,7 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { if (isLoading) return; isLoading = true; RetrofitManager.getInstance(mContext).getApi() - .getHistoryLibao("true", mPage) + .getHistoryLibao(UrlFilterUtils.getFilterQuery("history", "true"), mPage) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .map(new Func1, List>() { 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 4d816ee32d..7eac9e0c45 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 @@ -174,22 +174,9 @@ public interface ApiService { * 获取游戏新闻 */ @GET("articles") - Observable> getGameNews(@Query("filter") String filter, @Query("limit") int limit, + Observable> getGameNews(@Query("filter") String filter, @Query("page_size") int pageSize, @Query("page") int page); -// /** -// * 获取游戏新闻 -// */ -// @GET("game/{game_id}/article") -// Observable> getGameNews(@Path("game_id") String game_id, @Query("limit") int limit, -// @Query("page") int page); - - /** - * 获取游戏开服信息 - */ - @GET("game/{game_id}/serverInfo") - Observable getGameServer(@Path("game_id") String game_id); - /** * 获取游戏平台信息 */ @@ -299,7 +286,7 @@ public interface ApiService { * 获取开服表数据 */ @GET("games/servers") - Observable> getKaiFuData(@Query("filter") String type, @Query("page") int page, @Query("limit") int limit); + Observable> getKaiFuData(@Query("filter") String type, @Query("page") int page); /** * 获取游戏新闻类型 @@ -311,8 +298,7 @@ public interface ApiService { * 获取投票 游戏求版本列表 */ @GET("games/{game_id}/platform_requests") - Observable> getVersionVote(@Path("game_id") String gameId, @Query("page") int page, - @Query("limit") int limit); + Observable> getVersionVote(@Path("game_id") String gameId, @Query("page") int page); /** * 提交投票 @@ -487,14 +473,14 @@ public interface ApiService { * 获取新闻评论 */ @GET("articles/{article_id}/comments?filter=order:hot") - Observable> getHotComment(@Path("article_id") String articleId, @Query("limit") int limit, + Observable> getHotComment(@Path("article_id") String articleId, @Query("page_size") int pageSize, @Query("page") int page); /** * 获取新闻评论 */ @GET("articles/{article_id}/comments") - Observable> getComment(@Path("article_id") String articleId, @Query("limit") int limit, + Observable> getComment(@Path("article_id") String articleId, @Query("page_size") int pageSize, @Query("page") int page); /** @@ -509,7 +495,7 @@ public interface ApiService { * 获取评论对话 */ @GET("articles/comments/{comment_id}/traces") - Observable> getCommentTrace(@Path("comment_id") String news_id, @Query("limit") int limit, + Observable> getCommentTrace(@Path("comment_id") String news_id, @Query("page") int page); /********* LibaoService ********/ @@ -517,13 +503,13 @@ public interface ApiService { /** * 获取礼包列表数据 */ - @GET("libao?limit=20") + @GET("libao") Observable> getLibao(@Query("page") int page); /** * 搜索礼包列表数据 */ - @GET("libao?limit=20") + @GET("libao") Observable> getLibaoBySearch(@Query("filter") String filter, @Query("page") int page); /** @@ -537,7 +523,7 @@ public interface ApiService { */ @GET("libao") Observable> getLibaoByGame(@Query("filter") String filter, - @Query("page") int page, @Query("limit") int limit); + @Query("page") int page, @Query("page_size") int pageSize); /** * 获取礼包详情数据 @@ -598,7 +584,7 @@ public interface ApiService { * 获取历史礼包数据 */ @GET("libao") - Observable> getHistoryLibao(@Query("history") String history, @Query("page") int page); + Observable> getHistoryLibao(@Query("filter") String filter, @Query("page") int page); /***************8 MessageService *******/ @@ -924,13 +910,13 @@ public interface ApiService { * 获取评论列表．可以分页 */ @GET("answers/{answer_id}/comments") - Observable> getAnswerCommentList(@Path("answer_id") String answerId, @Query("limit") int limit, @Query("page") int page); + Observable> getAnswerCommentList(@Path("answer_id") String answerId, @Query("page") int page); /** * 获取评论的对话列表． */ @GET("answers/{answer_id}/comments/{comment_id}/trace") - Observable> getAnswerCommentConversationList(@Path("answer_id") String answerId, @Path("comment_id") String commentId, @Query("limit") int limit, @Query("page") int page); + Observable> getAnswerCommentConversationList(@Path("answer_id") String answerId, @Path("comment_id") String commentId, @Query("page") int page); /** * 签到 diff --git a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java index 3af6aafccc..1f800e9e5d 100644 --- a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java @@ -69,7 +69,7 @@ public class VoteFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getVersionVote(mGameId, page, 20); + return RetrofitManager.getInstance(getContext()).getApi().getVersionVote(mGameId, page); } protected int getLayoutId() {