From 84f80081679fdd7aab4051040d4e9a61a7d405ce Mon Sep 17 00:00:00 2001 From: huangzhuanghua <401742778@qq.com> Date: Mon, 15 Aug 2016 15:12:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=BF=9B=E5=BA=A6=E6=9D=A1?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=97=B6=EF=BC=8C=E4=B8=8D=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8=EF=BC=8C=E9=9A=90=E8=97=8F?= =?UTF-8?q?des=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DownloadItemUtils.java | 14 +++++++------- .../com/gh/gamecenter/adapter/PluginAdapter.java | 2 +- .../com/gh/gamecenter/adapter/SubjectAdapter.java | 4 ++-- .../gh/gamecenter/game/Game1FragmentAdapter.java | 4 ++-- .../gh/gamecenter/game/Game2FragmentAdapter.java | 4 ++-- .../java/com/gh/gamecenter/game/Game3Fragment.java | 2 +- .../gh/gamecenter/game/Game3FragmentAdapter.java | 2 +- .../gh/gamecenter/personal/ConcernFragment.java | 2 +- .../personal/ConcernFragmentAdapter.java | 3 +-- .../gh/gamecenter/personal/InstallFragment.java | 2 +- .../personal/InstallFragmentAdapter.java | 3 +-- 11 files changed, 20 insertions(+), 22 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 be4a907c24..0511b4554c 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -110,7 +110,7 @@ public class DownloadItemUtils { } public static void updateItem(Context context, - LinearLayout labelList, + TextView textView, ProgressBar game_progressbar, LinearLayout game_ll_info, TextView download_speed, @@ -146,7 +146,7 @@ public class DownloadItemUtils { if (downloadEntry != null && (pluginPlatform == null || pluginPlatform.equals(PlatformUtils.getInstance(context) .getPlatformName(downloadEntry.getMeta().get("platform"))))) { - labelList.setVisibility(View.GONE); + textView.setVisibility(View.GONE); game_progressbar.setVisibility(View.VISIBLE); game_ll_info.setVisibility(View.VISIBLE); @@ -193,17 +193,17 @@ public class DownloadItemUtils { download_percentage.setText("100%"); } else if (status.equals(DownloadStatus.cancel) || status.equals(DownloadStatus.hijack)) { - labelList.setVisibility(View.VISIBLE); + textView.setVisibility(View.VISIBLE); game_progressbar.setVisibility(View.GONE); game_ll_info.setVisibility(View.GONE); } } else { - labelList.setVisibility(View.VISIBLE); + textView.setVisibility(View.VISIBLE); game_progressbar.setVisibility(View.GONE); game_ll_info.setVisibility(View.GONE); } } else { - labelList.setVisibility(View.VISIBLE); + textView.setVisibility(View.VISIBLE); game_progressbar.setVisibility(View.GONE); game_ll_info.setVisibility(View.GONE); } @@ -307,7 +307,7 @@ public class DownloadItemUtils { } public static void updateItem(Context context, - LinearLayout labelList, + TextView textView, ProgressBar game_progressbar, LinearLayout game_ll_info, TextView download_speed, @@ -316,7 +316,7 @@ public class DownloadItemUtils { GameEntity entity, ArrayMap> platformMap, ArrayMap statusMap) { - updateItem(context, labelList, game_progressbar, game_ll_info, download_speed, + updateItem(context, textView, game_progressbar, game_ll_info, download_speed, download_percentage, downloadBtn, entity, platformMap, statusMap, true); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java index 303202c340..fa69bd5fb8 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -247,7 +247,7 @@ public class PluginAdapter extends RecyclerView.Adapter statusMap, platformMap, "游戏-插件", dismissEntity, "主页:" + entity.getName()); - DownloadItemUtils.updateItem(context, viewHolder.labelList, + DownloadItemUtils.updateItem(context, viewHolder.gameDes, viewHolder.game_progressbar, viewHolder.game_ll_info, viewHolder.download_speed, viewHolder.download_percentage, viewHolder.downloadBtn, entity, platformMap, statusMap); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java index eb89a27ee4..e915a05dc5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java @@ -328,7 +328,7 @@ public class SubjectAdapter extends RecyclerView.Adapter 0 && viewType > 1 && viewType <= 1 + gameList.size()) { View view = LayoutInflater.from(parent.getContext()).inflate( - R.layout.home_game_normal_item, parent, false); + R.layout.home_consolegame_item, parent, false); return new GameNormalViewHolder(view); } else if (isRemove) { RelativeLayout relativeLayout = new RelativeLayout(context); @@ -204,7 +204,6 @@ public class ConcernFragmentAdapter extends RecyclerView.Adapter 0 && viewType > 1 && viewType <= 1 + gameList.size()) { View view = LayoutInflater.from(parent.getContext()).inflate( - R.layout.home_game_normal_item, parent, false); + R.layout.home_consolegame_item, parent, false); return new GameNormalViewHolder(view); } else if (isRemove) { RelativeLayout relativeLayout = new RelativeLayout(context); @@ -343,7 +343,6 @@ public class InstallFragmentAdapter extends RecyclerView.Adapter