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 4b4d6f8e20..6222657bb8 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -9,8 +9,6 @@ import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.inputmethod.InputMethodManager; -import android.widget.LinearLayout; -import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; @@ -22,6 +20,8 @@ import com.gh.download.DownloadManager; import com.gh.download.DownloadStatus; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; +import com.gh.gamecenter.adapter.viewholder.GameViewHolder; +import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.manager.PackageManager; @@ -87,14 +87,7 @@ public class DownloadItemUtils { } // 更新正常的条目，只有一个apk包 - public static void updateNormalItem(Context context, - TextView textView, - ProgressBar game_progressbar, - LinearLayout game_ll_info, - TextView download_speed, - TextView download_percentage, - TextView downloadBtn, - GameEntity gameEntity, + public static void updateNormalItem(Context context, GameViewHolder holder, GameEntity gameEntity, boolean isShowPlatform) { ArrayMap entryMap = gameEntity.getEntryMap(); @@ -102,71 +95,63 @@ public class DownloadItemUtils { DownloadEntity downloadEntity = entryMap.get(gameEntity.getApk().get(0).getPlatform()); if (downloadEntity != null) { // 更改进度条和提示文本的状态 - changeStatus(context, textView, game_progressbar, game_ll_info, download_speed, download_percentage, downloadBtn, - downloadEntity, isShowPlatform, true); + changeStatus(context, holder, downloadEntity, isShowPlatform, true); return; } } - textView.setVisibility(View.VISIBLE); - game_progressbar.setVisibility(View.GONE); - game_ll_info.setVisibility(View.GONE); + holder.gameDes.setVisibility(View.VISIBLE); + holder.gameProgressbar.setVisibility(View.GONE); + holder.gameInfo.setVisibility(View.GONE); - downloadBtn.setTextColor(Color.WHITE); + holder.gameDownloadBtn.setTextColor(Color.WHITE); if (gameEntity.isPluggable()) { - downloadBtn.setText("插件化"); + holder.gameDownloadBtn.setText("插件化"); DownloadEntity downloadEntity = DownloadManager.getInstance(context).getByPackage( gameEntity.getApk().get(0).getPackageName()); if (downloadEntity == null || downloadEntity.getUrl().equals(gameEntity.getApk().get(0).getUrl())) { - downloadBtn.setClickable(true); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + holder.gameDownloadBtn.setClickable(true); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else { - downloadBtn.setClickable(false); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up); + holder.gameDownloadBtn.setClickable(false); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up); } } else if (PackageManager.isInstalled(gameEntity.getApk().get(0).getPackageName())) { if (PackageManager.isCanUpdate(gameEntity.getId(), gameEntity.getApk().get(0).getPackageName())) { - downloadBtn.setText("更新"); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); + holder.gameDownloadBtn.setText("更新"); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } else { if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0 && !TextUtils.isEmpty(gameEntity.getApk().get(0).getGhVersion()) && !PackageUtils.isSignature(context, gameEntity.getApk().get(0).getPackageName())) { - downloadBtn.setText("插件化"); + holder.gameDownloadBtn.setText("插件化"); DownloadEntity downloadEntity = DownloadManager.getInstance(context).getByPackage( gameEntity.getApk().get(0).getPackageName()); if (downloadEntity == null || downloadEntity.getUrl().equals(gameEntity.getApk().get(0).getUrl())) { - downloadBtn.setClickable(true); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + holder.gameDownloadBtn.setClickable(true); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else { - downloadBtn.setClickable(false); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up); + holder.gameDownloadBtn.setClickable(false); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up); } } else { - downloadBtn.setText("启动"); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_launch_style); + holder.gameDownloadBtn.setText("启动"); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_launch_style); } } } else { - downloadBtn.setText("下载"); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); + holder.gameDownloadBtn.setText("下载"); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } } // 更新插件的条目，有多个apk包 - public static void updatePluginItem(Context context, - TextView textView, - ProgressBar game_progressbar, - LinearLayout game_ll_info, - TextView download_speed, - TextView download_percentage, - TextView downloadBtn, - GameEntity gameEntity, + public static void updatePluginItem(Context context, GameViewHolder holder, GameEntity gameEntity, boolean isShowPlatform) { - GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn); + GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn); ArrayMap entryMap = gameEntity.getEntryMap(); if (entryMap != null && !entryMap.isEmpty()) { @@ -182,31 +167,22 @@ public class DownloadItemUtils { if (downloadEntity != null) { // 更改进度条和提示文本的状态 - changeStatus(context, textView, game_progressbar, game_ll_info, download_speed, - download_percentage, downloadBtn, downloadEntity, isShowPlatform, false); + changeStatus(context, holder, downloadEntity, isShowPlatform, false); return; } } - textView.setVisibility(View.VISIBLE); - game_progressbar.setVisibility(View.GONE); - game_ll_info.setVisibility(View.GONE); + holder.gameDes.setVisibility(View.VISIBLE); + holder.gameProgressbar.setVisibility(View.GONE); + holder.gameInfo.setVisibility(View.GONE); } // 更改进度条和提示文本的状态 - public static void changeStatus(Context context, - TextView textView, - ProgressBar game_progressbar, - LinearLayout game_ll_info, - TextView download_speed, - TextView download_percentage, - TextView downloadBtn, - DownloadEntity downloadEntity, - boolean isShowPlatform, - boolean isNormal) { - textView.setVisibility(View.GONE); - game_progressbar.setVisibility(View.VISIBLE); - game_ll_info.setVisibility(View.VISIBLE); + public static void changeStatus(Context context, GameViewHolder holder, DownloadEntity downloadEntity, + boolean isShowPlatform, boolean isNormal) { + holder.gameDes.setVisibility(View.GONE); + holder.gameProgressbar.setVisibility(View.VISIBLE); + holder.gameInfo.setVisibility(View.VISIBLE); String platform = PlatformUtils.getInstance(context) .getPlatformName(downloadEntity.getPlatform()); @@ -214,119 +190,108 @@ public class DownloadItemUtils { DownloadStatus status = downloadEntity.getStatus(); if (status.equals(DownloadStatus.downloading)) { if (!"pause".equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) { - game_progressbar.setProgress((int) (downloadEntity.getPercent() * 10)); + holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); if (isShowPlatform && platform != null) { - download_speed.setText(String.format("%s - %s(剩%s)", platform, + holder.gameDownloadSpeed.setText(String.format("%s - %s(剩%s)", platform, SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); } else { - download_speed.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), + holder.gameDownloadSpeed.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); } - download_percentage.setText(downloadEntity.getPercent() + "%"); + holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%"); } if (isNormal) { - downloadBtn.setText("下载中"); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + holder.gameDownloadBtn.setText("下载中"); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); + holder.gameDownloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.waiting)) { - game_progressbar.setProgress((int) (downloadEntity.getPercent() * 10)); + holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); if (isShowPlatform && platform != null) { - download_speed.setText(String.format("%s - 等待", platform)); + holder.gameDownloadSpeed.setText(String.format("%s - 等待", platform)); } else { - download_speed.setText("等待"); + holder.gameDownloadSpeed.setText("等待"); } - download_percentage.setText(downloadEntity.getPercent() + "%"); + holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%"); if (isNormal) { - downloadBtn.setText("下载中"); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + holder.gameDownloadBtn.setText("下载中"); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); + holder.gameDownloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.pause) || status.equals(DownloadStatus.timeout) || status.equals(DownloadStatus.neterror)) { - game_progressbar.setProgress((int) (downloadEntity.getPercent() * 10)); + holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); if (isShowPlatform && platform != null) { - download_speed.setText(String.format("%s - 暂停", platform)); + holder.gameDownloadSpeed.setText(String.format("%s - 暂停", platform)); } else { - download_speed.setText("暂停"); + holder.gameDownloadSpeed.setText("暂停"); } - download_percentage.setText(downloadEntity.getPercent() + "%"); + holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%"); if (isNormal) { - downloadBtn.setText("下载中"); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + holder.gameDownloadBtn.setText("下载中"); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); + holder.gameDownloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.done)) { - game_progressbar.setProgress(1000); + holder.gameProgressbar.setProgress(1000); if (isShowPlatform && platform != null) { - download_speed.setText(String.format("%s - 下载完成", platform)); + holder.gameDownloadSpeed.setText(String.format("%s - 下载完成", platform)); } else { - download_speed.setText("下载完成"); + holder.gameDownloadSpeed.setText("下载完成"); } - download_percentage.setText(R.string.hundred_percent); + holder.gameDownloadPercentage.setText(R.string.hundred_percent); if (isNormal) { - downloadBtn.setText("安装"); - downloadBtn.setTextColor(Color.WHITE); + holder.gameDownloadBtn.setText("安装"); + holder.gameDownloadBtn.setTextColor(Color.WHITE); if (downloadEntity.isPluggable() && PackageManager.isInstalled(downloadEntity.getPackageName())) { - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else { - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } } } } - public static void updateItem(Context context, - TextView textView, - ProgressBar game_progressbar, - LinearLayout game_ll_info, - TextView download_speed, - TextView download_percentage, - TextView downloadBtn, - GameEntity entity, - boolean isShowPlatform) { + public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder, boolean isShowPlatform) { // 控制是否显示下载按钮 - if (!Config.isShow(context) || "光环助手".equals(entity.getName())) { - downloadBtn.setVisibility(View.GONE); + if (!Config.isShow(context) || "光环助手".equals(gameEntity.getName())) { + holder.gameDownloadBtn.setVisibility(View.GONE); } else { - downloadBtn.setVisibility(View.VISIBLE); + holder.gameDownloadBtn.setVisibility(View.VISIBLE); } - if (entity.getApk() == null || entity.getApk().isEmpty()) { - textView.setVisibility(View.VISIBLE); - game_progressbar.setVisibility(View.GONE); - game_ll_info.setVisibility(View.GONE); - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_style); - downloadBtn.setText("暂无"); - downloadBtn.setClickable(false); - } else if (entity.getApk().size() == 1) { - updateNormalItem(context, textView, game_progressbar, game_ll_info, download_speed, - download_percentage, downloadBtn, entity, isShowPlatform); + LibaoDao libaoDao = new LibaoDao(context); + if (libaoDao.isExist(gameEntity.getId())) { + holder.gameLibaoIcon.setVisibility(View.VISIBLE); } else { - updatePluginItem(context, textView, game_progressbar, game_ll_info, download_speed, - download_percentage, downloadBtn, entity, isShowPlatform); + if (gameEntity.isLibaoExists()) { + holder.gameLibaoIcon.setVisibility(View.VISIBLE); + } else { + holder.gameLibaoIcon.setVisibility(View.GONE); + } } - } + if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { + holder.gameDes.setVisibility(View.VISIBLE); + holder.gameProgressbar.setVisibility(View.GONE); + holder.gameInfo.setVisibility(View.GONE); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_style); + holder.gameDownloadBtn.setText("暂无"); + holder.gameDownloadBtn.setClickable(false); + } else if (gameEntity.getApk().size() == 1) { + updateNormalItem(context, holder, gameEntity, isShowPlatform); + } else { + updatePluginItem(context, holder, gameEntity, isShowPlatform); + } - public static void updateItem(Context context, - TextView textView, - ProgressBar game_progressbar, - LinearLayout game_ll_info, - TextView download_speed, - TextView download_percentage, - TextView downloadBtn, - GameEntity entity) { - updateItem(context, textView, game_progressbar, game_ll_info, download_speed, - download_percentage, downloadBtn, entity, true); } private static void setNormalOnClickListener(final Context context, diff --git a/app/src/main/java/com/gh/common/util/TokenUtils.java b/app/src/main/java/com/gh/common/util/TokenUtils.java index 82bed7edc2..2f35f12421 100644 --- a/app/src/main/java/com/gh/common/util/TokenUtils.java +++ b/app/src/main/java/com/gh/common/util/TokenUtils.java @@ -134,7 +134,7 @@ public class TokenUtils { }).onErrorResumeNext(new Func1>() { @Override public Observable call(Throwable throwable) { - return Observable.empty(); + return Observable.error(throwable); } }); } @@ -142,7 +142,7 @@ public class TokenUtils { } // 检查设备信息是否已经上传完整 - public static synchronized void checkDeviceInfo(final Context context) { + public static synchronized void checkDeviceInfo(Context context, String token) { final SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); final HashMap params = new HashMap<>(); if (!sp.getBoolean("isUploadExtra", false)) { @@ -165,15 +165,10 @@ public class TokenUtils { } } if (params.size() != 0) { - TokenUtils.getToken(context, true) - .flatMap(new Func1>() { - @Override - public Observable call(String token) { - RequestBody body = RequestBody.create(MediaType.parse("application/json"), - new JSONObject(params).toString()); - return RetrofitManager.getUser().postDevice(token, body, TokenUtils.getDeviceId(context)); - } - }).subscribeOn(Schedulers.io()) + RequestBody body = RequestBody.create(MediaType.parse("application/json"), + new JSONObject(params).toString()); + RetrofitManager.getUser().postDevice(token, body, TokenUtils.getDeviceId(context)) + .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index f80655f166..a86bcb5ff5 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -117,7 +117,6 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene private int currentTab; - private boolean isNewFirstLaunch; private boolean isSkipped; private Handler handler = new Handler(); @@ -327,7 +326,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene setContentView(contentView); sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); - isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getApplicationContext()), true); + boolean isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getApplicationContext()), true); isSkipped = false; @@ -371,23 +370,31 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene public void run() { // 注册设备 TokenUtils.register(MainActivity.this); - TokenUtils.getToken(MainActivity.this, false); - TokenUtils.checkDeviceInfo(MainActivity.this); + TokenUtils.getToken(MainActivity.this, false) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Response() { + @Override + public void onResponse(String token) { + TokenUtils.checkDeviceInfo(MainActivity.this, token); + } + }); + updateUserGhzs(); initConcern(); // 初始化关注 LibaoUtils.getCunHaoXiang(MainActivity.this, true); } }.start(); + } else { + updateUserGhzs(); } - // 更新用户使用的助手信息 - updateUserGhzs(); - // 执行跳转事件 handler.postDelayed(skipRun, 500); Log.e("TD_CHANNEL_ID", (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID")); } + // 更新用户使用的助手信息 private void updateUserGhzs() { String version_code = sp.getString("version_code", null); String version_name = sp.getString("version_name", null); 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 01804f5acc..e5834a676a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -154,21 +154,21 @@ public class PluginAdapter extends RecyclerView.Adapter final GameEntity gameEntity = pluginList.get(position); - viewHolder.home1_game_order.setVisibility(View.GONE); + viewHolder.gameOrder.setVisibility(View.GONE); viewHolder.gameThumb.setImageURI(gameEntity.getIcon()); if (gameEntity.isPluggable()) { - viewHolder.gameNameAndSize.setText(gameEntity.getName() + " - " + + viewHolder.gameName.setText(gameEntity.getName() + " - " + PlatformUtils.getInstance(context).getPlatformName(gameEntity.getApk().get(0).getPlatform())); } else { - viewHolder.gameNameAndSize.setText(gameEntity.getName()); + viewHolder.gameName.setText(gameEntity.getName()); } if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { viewHolder.gameDes.setText(gameEntity.getBrief()); } else { viewHolder.gameDes.setText(gameEntity.getApk().get(0).getSize() + " " + gameEntity.getBrief()); } - GameViewUtils.setLabelList(context, viewHolder.labelList, gameEntity.getTag()); + GameViewUtils.setLabelList(context, viewHolder.gameLabelList, gameEntity.getTag()); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -184,12 +184,10 @@ public class PluginAdapter extends RecyclerView.Adapter } }); - DownloadItemUtils.setOnClickListener(context, viewHolder.downloadBtn, gameEntity, position, + DownloadItemUtils.setOnClickListener(context, viewHolder.gameDownloadBtn, gameEntity, position, PluginAdapter.this, entrance + "+(插件化[" + (viewHolder.getPosition() + 1) + "])", "插件化:" + gameEntity.getName(), false); - DownloadItemUtils.updateItem(context, viewHolder.gameDes, - viewHolder.game_progressbar, viewHolder.game_ll_info, viewHolder.download_speed, - viewHolder.download_percentage, viewHolder.downloadBtn, gameEntity, false); + DownloadItemUtils.updateItem(context, gameEntity, viewHolder, false); } } 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 acb5c5b50b..55559458dd 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java @@ -24,7 +24,6 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameImageViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.adapter.viewholder.GameTestViewHolder; -import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.listener.OnCallBackListener; @@ -53,8 +52,6 @@ public class SubjectAdapter extends RecyclerView.Adapter> locationMap; - private LibaoDao libaoDao; - private String id; private String name; private String entrance; @@ -85,7 +82,6 @@ public class SubjectAdapter extends RecyclerView.Adapter(); isLoaded = false; isNetworkError = false; - libaoDao = new LibaoDao(context); initList(1); } @@ -294,22 +290,16 @@ public class SubjectAdapter extends RecyclerView.Adapter getSubjectList() { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java index f05e3eadde..7988f2a204 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -10,37 +9,25 @@ import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.gamecenter.R; -/** - * Created by LGT on 2016/7/2. - */ -public class GameNormalViewHolder extends RecyclerView.ViewHolder { +import static com.gh.gamecenter.R.id.home1_game_order; - public TextView home1_game_order; - public SimpleDraweeView gameThumb; - public TextView gameNameAndSize; - public TextView downloadBtn; - public TextView gameDes; - public LinearLayout labelList; - public ProgressBar game_progressbar; - public LinearLayout game_ll_info; - public TextView download_speed; - public TextView download_percentage; - public ImageView libaoIcon; + +public class GameNormalViewHolder extends GameViewHolder { public GameNormalViewHolder(View itemView) { super(itemView); - home1_game_order = (TextView) itemView.findViewById(R.id.home1_game_order); + gameLibaoIcon = (ImageView) itemView.findViewById(R.id.home1_game_libao); + gameOrder = (TextView) itemView.findViewById(home1_game_order); gameThumb = (SimpleDraweeView) itemView.findViewById(R.id.home1_game_thumb); - gameNameAndSize = (TextView) itemView.findViewById(R.id.home1_game_nameAndsize); - downloadBtn = (TextView) itemView.findViewById(R.id.home1_download_btn); + gameName = (TextView) itemView.findViewById(R.id.home1_game_nameAndsize); + gameDownloadBtn = (TextView) itemView.findViewById(R.id.home1_download_btn); gameDes = (TextView) itemView.findViewById(R.id.home1_game_des); - labelList = (LinearLayout) itemView.findViewById(R.id.home1_label_list); - game_ll_info = (LinearLayout) itemView.findViewById(R.id.home1_game_ll_info); - game_progressbar = (ProgressBar) itemView.findViewById(R.id.home1_game_progressbar); - download_speed = (TextView) itemView.findViewById(R.id.home1_download_speed); - download_percentage = (TextView) itemView.findViewById(R.id.home1_download_percentage); - libaoIcon = (ImageView) itemView.findViewById(R.id.home1_game_libao); + gameLabelList = (LinearLayout) itemView.findViewById(R.id.home1_label_list); + gameInfo = (LinearLayout) itemView.findViewById(R.id.home1_game_ll_info); + gameProgressbar = (ProgressBar) itemView.findViewById(R.id.home1_game_progressbar); + gameDownloadSpeed = (TextView) itemView.findViewById(R.id.home1_download_speed); + gameDownloadPercentage = (TextView) itemView.findViewById(R.id.home1_download_percentage); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java index 99d835baa0..bea6b8da84 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -10,40 +9,30 @@ import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.gamecenter.R; -/** - * Created by LGT on 2016/7/2. - */ -public class GameTestViewHolder extends RecyclerView.ViewHolder { +import static com.gh.gamecenter.R.id.home2_game_order; + + +public class GameTestViewHolder extends GameViewHolder { - public TextView home2_game_order; - public SimpleDraweeView gameThumb; - public TextView gameNameAndSize; - public TextView downloadBtn; - public TextView gameDes; public TextView gameTestType; public TextView gameTestTime; - public LinearLayout labelList; - public ProgressBar game_progressbar; - public LinearLayout game_ll_info; - public TextView download_speed; - public TextView download_percentage; - public ImageView libaoIcon; public GameTestViewHolder(View itemView) { super(itemView); - home2_game_order = (TextView) itemView.findViewById(R.id.home2_game_order); + gameLibaoIcon = (ImageView) itemView.findViewById(R.id.home2_game_libao); + gameOrder = (TextView) itemView.findViewById(home2_game_order); gameThumb = (SimpleDraweeView) itemView.findViewById(R.id.home2_game_thumb); - gameNameAndSize = (TextView) itemView.findViewById(R.id.home2_game_nameAndsize); - downloadBtn = (TextView) itemView.findViewById(R.id.home2_download_btn); + gameName = (TextView) itemView.findViewById(R.id.home2_game_nameAndsize); + gameDownloadBtn = (TextView) itemView.findViewById(R.id.home2_download_btn); gameDes = (TextView) itemView.findViewById(R.id.home2_game_des); + gameLabelList = (LinearLayout) itemView.findViewById(R.id.home2_label_list); gameTestType = (TextView) itemView.findViewById(R.id.home2_test_type); gameTestTime = (TextView) itemView.findViewById(R.id.home2_test_time); - game_ll_info = (LinearLayout) itemView.findViewById(R.id.home2_game_ll_info); - game_progressbar = (ProgressBar) itemView.findViewById(R.id.home2_game_progressbar); - download_speed = (TextView) itemView.findViewById(R.id.home2_download_speed); - download_percentage = (TextView) itemView.findViewById(R.id.home2_download_percentage); - libaoIcon = (ImageView) itemView.findViewById(R.id.home2_game_libao); + gameInfo = (LinearLayout) itemView.findViewById(R.id.home2_game_ll_info); + gameProgressbar = (ProgressBar) itemView.findViewById(R.id.home2_game_progressbar); + gameDownloadSpeed = (TextView) itemView.findViewById(R.id.home2_download_speed); + gameDownloadPercentage = (TextView) itemView.findViewById(R.id.home2_download_percentage); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java new file mode 100644 index 0000000000..a814ebb39c --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java @@ -0,0 +1,31 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ProgressBar; +import android.widget.TextView; + +import com.facebook.drawee.view.SimpleDraweeView; + + +public class GameViewHolder extends RecyclerView.ViewHolder { + + public ImageView gameLibaoIcon; + public TextView gameOrder; + public SimpleDraweeView gameThumb; + public TextView gameName; + public TextView gameDownloadBtn; + public TextView gameDes; + public LinearLayout gameLabelList; + public LinearLayout gameInfo; + public ProgressBar gameProgressbar; + public TextView gameDownloadSpeed; + public TextView gameDownloadPercentage; + + public GameViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java b/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java index 700825e759..569fa06a26 100644 --- a/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java @@ -71,10 +71,9 @@ public class LibaoDao { public boolean isExist(String gameId) { try { - if (dao.queryBuilder().where().eq("gameId", gameId).query().size() > 0) { + List list = dao.queryBuilder().where().eq("gameId", gameId).query(); + if (list != null && list.size() > 0) { return true; - } else { - return false; } } catch (SQLException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 85edb8c91c..a154fa7649 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -51,7 +51,6 @@ import com.gh.gamecenter.adapter.viewholder.GameImageViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.adapter.viewholder.GameTestViewHolder; import com.gh.gamecenter.adapter.viewholder.GameViewPagerViewHolder; -import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameUpdateEntity; @@ -97,8 +96,6 @@ class GameFragmentAdapter extends RecyclerView.Adapter private ArrayMap> locationMap; private ArrayMap> subjectChangedMap; //存储换一换的数据 - private LibaoDao libaoDao; - private int itemCount; private int pluginSize; @@ -120,8 +117,6 @@ class GameFragmentAdapter extends RecyclerView.Adapter this.context = fragment.getActivity(); this.listener = fragment; - libaoDao = new LibaoDao(context); - game_swipe_refresh = refreshLayout; slideList = new ArrayList<>(); @@ -787,25 +782,15 @@ class GameFragmentAdapter extends RecyclerView.Adapter } } - if (libaoDao.isExist(gameEntity.getId())) { - holder.libaoIcon.setVisibility(View.VISIBLE); - } else { - if (gameEntity.isLibaoExists()) { - holder.libaoIcon.setVisibility(View.VISIBLE); - } else { - holder.libaoIcon.setVisibility(View.GONE); - } - } - if (subjectEntity.isOrder()) { - holder.home2_game_order.setVisibility(View.VISIBLE); - holder.home2_game_order.setText(String.valueOf(i + 1)); + holder.gameOrder.setVisibility(View.VISIBLE); + holder.gameOrder.setText(String.valueOf(i + 1)); } else { - holder.home2_game_order.setVisibility(View.GONE); + holder.gameOrder.setVisibility(View.GONE); } holder.gameThumb.setImageURI(gameEntity.getIcon()); - holder.gameNameAndSize.setText(gameEntity.getName()); + holder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { holder.gameDes.setText(gameEntity.getBrief()); } else { @@ -842,13 +827,11 @@ class GameFragmentAdapter extends RecyclerView.Adapter } DownloadItemUtils.setOnClickListener(context, - holder.downloadBtn, gameEntity, i, + holder.gameDownloadBtn, gameEntity, i, GameFragmentAdapter.this, "(游戏-专题:" + subjectEntity.getName() + "-列表[" + (i + 1) + "])", "游戏-专题-" + subjectEntity.getName() + ":" + gameEntity.getName(), false); - DownloadItemUtils.updateItem(context, holder.gameDes, - holder.game_progressbar, holder.game_ll_info, holder.download_speed, - holder.download_percentage, holder.downloadBtn, gameEntity); + DownloadItemUtils.updateItem(context, gameEntity, holder, true); } private void initGameNormalViewHolder(GameNormalViewHolder holder, int position) { @@ -907,36 +890,26 @@ class GameFragmentAdapter extends RecyclerView.Adapter } } - if (libaoDao.isExist(gameEntity.getId())) { - holder.libaoIcon.setVisibility(View.VISIBLE); - } else { - if (gameEntity.isLibaoExists()) { - holder.libaoIcon.setVisibility(View.VISIBLE); - } else { - holder.libaoIcon.setVisibility(View.GONE); - } - } - if (subjectEntity.isOrder()) { - holder.home1_game_order.setVisibility(View.VISIBLE); - holder.home1_game_order.setText(String.valueOf(i + 1)); + holder.gameOrder.setVisibility(View.VISIBLE); + holder.gameOrder.setText(String.valueOf(i + 1)); } else { - holder.home1_game_order.setVisibility(View.GONE); + holder.gameOrder.setVisibility(View.GONE); } holder.gameThumb.setImageURI(gameEntity.getIcon()); if (gameEntity.isPluggable()) { - holder.gameNameAndSize.setText(String.format("%s - %s", gameEntity.getName(), + holder.gameName.setText(String.format("%s - %s", gameEntity.getName(), PlatformUtils.getInstance(context).getPlatformName( gameEntity.getApk().get(0).getPlatform()))); } else { - holder.gameNameAndSize.setText(gameEntity.getName()); + holder.gameName.setText(gameEntity.getName()); } if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { holder.gameDes.setText(gameEntity.getBrief()); } else { holder.gameDes.setText(String.format("%s %s", gameEntity.getApk().get(0).getSize(), gameEntity.getBrief())); } - GameViewUtils.setLabelList(context, holder.labelList, gameEntity.getTag()); + GameViewUtils.setLabelList(context, holder.gameLabelList, gameEntity.getTag()); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -956,13 +929,11 @@ class GameFragmentAdapter extends RecyclerView.Adapter } }); - DownloadItemUtils.setOnClickListener(context, holder.downloadBtn, gameEntity, i, + DownloadItemUtils.setOnClickListener(context, holder.gameDownloadBtn, gameEntity, i, GameFragmentAdapter.this, "(游戏-专题:" + subjectEntity.getName() + "-列表[" + (i + 1) + "])", "游戏-专题-" + subjectEntity.getName() + ":" + gameEntity.getName(), false); - DownloadItemUtils.updateItem(context, holder.gameDes, - holder.game_progressbar, holder.game_ll_info, holder.download_speed, - holder.download_percentage, holder.downloadBtn, gameEntity, !gameEntity.isPluggable()); + DownloadItemUtils.updateItem(context, gameEntity, holder, !gameEntity.isPluggable()); } private void initGameImageViewHolder(GameImageViewHolder holder, int position) { diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java index 0bf3b5b6a7..e28b799147 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java @@ -17,6 +17,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; +import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; @@ -48,8 +49,7 @@ public class ConcernFragment extends BaseFragment { for (int location : locationList) { gameEntity = adapter.getGameList().get(location); if (gameEntity != null) { - DownloadItemUtils.processDate(getActivity(), gameEntity, - downloadEntity, adapter, location); + DownloadItemUtils.processDate(getActivity(), gameEntity, downloadEntity, adapter, location); } } } @@ -84,19 +84,15 @@ public class ConcernFragment extends BaseFragment { reuse_nodata_skip.setVisibility(View.VISIBLE); } + //连接上网络事件 + public void onEventMainThread(EBNetworkState busNetworkState) { + if (busNetworkState.isNetworkConnected()) { + + } + } + // 关注事件 public void onEventMainThread(EBConcernChanged changed) { -// if (changed.isConcern()) { -// -// } else { -// for (int i = 0; i < adapter.getGameList().size(); i++) { -// if (adapter.getGameList().get(i).getId().equals(changed.getGameId())) { -// adapter.getGameList().remove(i); -// adapter.notifyDataSetChanged(); -// break; -// } -// } -// } fm_concern_rv_show.setVisibility(View.VISIBLE); reuse_nodata_skip.setVisibility(View.GONE); adapter = new ConcernFragmentAdapter(this); diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java index e5603ebc64..0a1d370178 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -18,7 +18,6 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; -import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; @@ -44,8 +43,6 @@ class ConcernFragmentAdapter extends RecyclerView.Adapter concernList; private List gameList; @@ -67,8 +64,6 @@ class ConcernFragmentAdapter extends RecyclerView.Adapter> getLocationMap() { return locationMap; } - public List getGameList() { + List getGameList() { return gameList; } diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java index 719312cda1..bf28ba26cb 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java @@ -15,6 +15,7 @@ import com.gh.download.DownloadEntity; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameEntity; +import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; @@ -82,6 +83,13 @@ public class InstallFragment extends BaseFragment { reuse_nodata_skip.setVisibility(View.VISIBLE); } + //连接上网络事件 + public void onEventMainThread(EBNetworkState busNetworkState) { + if (busNetworkState.isNetworkConnected()) { + + } + } + // 打开下载按钮事件 public void onEventMainThread(EBReuse reuse) { if (("Refresh".equals(reuse.getType()) || "PlatformChanged".equals(reuse.getType())) diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index 540344e0ca..6c02c075e7 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -21,7 +21,6 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; -import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; @@ -60,8 +59,6 @@ class InstallFragmentAdapter extends RecyclerView.Adapter runnableGame = cManager.getInstalledGame(); if (runnableGame.isEmpty()) { @@ -364,26 +359,16 @@ class InstallFragmentAdapter extends RecyclerView.Adapter list = new ArrayList<>(); list.add(new InstallFragment()); list.add(new ConcernFragment()); @@ -162,41 +155,51 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, isLogin = false; - new Thread() { - @Override - public void run() { - TokenUtils.getToken(getActivity(), true); - TokenUtils.checkDeviceInfo(getActivity()); - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (getActivity() != null) { - SharedPreferences sp = getActivity().getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); - String name = sp.getString("user_name", null); - if (!TextUtils.isEmpty(name)) { - me_tv_top_name.setText(name); - } - String icon = sp.getString("user_icon", null); - if (!TextUtils.isEmpty(icon)) { - me_iv_top_icon.setImageURI(icon); - } - isLogin = true; - } - } - }); - } - } - }.start(); + login(null); } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - if (container != null) { - container.removeView(view); + public void login(final Dialog dialog) { + TokenUtils.getToken(getActivity(), true) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Response() { + @Override + public void onResponse(String token) { + if (getActivity() != null) { + TokenUtils.checkDeviceInfo(getActivity(), token); + + SharedPreferences sp = getActivity().getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); + String name = sp.getString("user_name", null); + if (!TextUtils.isEmpty(name)) { + me_tv_top_name.setText(name); + } + String icon = sp.getString("user_icon", null); + if (!TextUtils.isEmpty(icon)) { + me_iv_top_icon.setImageURI(icon); + } + isLogin = true; + } + if (dialog != null) { + Toast.makeText(getActivity(), "登录成功", Toast.LENGTH_SHORT).show(); + dialog.dismiss(); + } + } + + @Override + public void onFailure(HttpException e) { + if (dialog != null) { + Toast.makeText(getActivity(), "登录失败", Toast.LENGTH_SHORT).show(); + dialog.dismiss(); + } + } + }); + } + + //连接上网络事件 + public void onEventMainThread(EBNetworkState busNetworkState) { + if (busNetworkState.isNetworkConnected() && !isLogin) { + login(null); } - return view; } @Override @@ -239,6 +242,8 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, if (isLogin) { showModifyNicknameDialog(me_tv_top_name.getText().toString()); + } else { + login(DialogUtils.showWaitDialog(getActivity(), "登录中...")); } } else if (id == R.id.me_iv_top_icon) { DataUtils.onEvent(getActivity(), "我的光环", "用户头像"); @@ -247,6 +252,8 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, if (isLogin) { Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); startActivityForResult(intent, 0x123); + } else { + login(DialogUtils.showWaitDialog(getActivity(), "登录中...")); } } else if (id == R.id.me_tv_top_install) { me_vp_show.setCurrentItem(0); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 08c01f905e..3e6117ac1f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -18,7 +18,6 @@ import com.gh.common.util.GameViewUtils; import com.gh.common.view.CardLinearLayout; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; -import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.listener.OnCallBackListener; @@ -42,8 +41,6 @@ class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter gameList; private ArrayMap> locationMap; - private LibaoDao libaoDao; - private String key; private String entrance; @@ -59,8 +56,6 @@ class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter(); locationMap = new ArrayMap<>(); - libaoDao = new LibaoDao(context); - this.key = key; if (!TextUtils.isEmpty(key)) { search(key); @@ -136,16 +131,6 @@ class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter gameList; private ArrayMap> locationMap; - private LibaoDao libaoDao; - private String key; private String entrance; @@ -57,8 +54,6 @@ class SearchGameListFragmentAdapter extends RecyclerView.Adapter(); locationMap = new ArrayMap<>(); @@ -137,25 +132,15 @@ class SearchGameListFragmentAdapter extends RecyclerView.Adapter