diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index ad5b27a862..a43cc55b2c 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -47,7 +47,6 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { private Concern_LinearLayout view; private RecyclerView concern_rv_show, concern_rv_recommend; private ConcernManager manager; - private ImageView concern_iv_delete; private RelativeLayout concern_rl_title; private TextView concern_tv_none; @@ -84,7 +83,6 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { concern_rv_show.setVisibility(View.GONE); } - concern_iv_delete.setOnClickListener(this); concern_rl_title.setOnClickListener(this); concern_rv_show.setHasFixedSize(true); @@ -466,7 +464,6 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { concern_rv_show = null; concern_rv_recommend = null; manager = null; - concern_iv_delete = null; concern_rl_title = null; concern_tv_none = null; list = null; diff --git a/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java index 887f45954b..d663683f36 100644 --- a/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java @@ -77,24 +77,30 @@ import de.greenrobot.event.EventBus; * Created by khy on 2016/8/12. */ public class NewGameDetailsActivity extends BaseActivity implements View.OnClickListener{ - private String gameId ; - private String entrance; - private GameDetailsAdapter detailsAdapter; - private Context context = this; + private RecyclerView detailsRecyclerView; + private GameDetailsAdapter detailsAdapter; private LinearLayout llLoading; private LinearLayout noConnection; - private GameDetailsEntity entity = new GameDetailsEntity(); - private GameEntity gameEntity; - private TextView tvDowload,tvPer; + private TextView tvDowload, tvPer; private ProgressBar progressBar; + private ArrayMap statusMap; - private DismissEntity dismissEntity; - private DownloadEntry downloadEntry; + private ConcernManager concernManager; + private GameEntity gameEntity; + private GameDetailsEntity entity = new GameDetailsEntity(); + private DismissEntity dismissEntity; + private DownloadEntry downloadEntry; + + private String gameId ; + private String entrance; + private boolean isConcern = false; + private int concernCode = 0;//0关注不做操作，1添加关注，2删除关注 + private Handler handler = new Handler(); private DataWatcher dataWatcher = new DataWatcher() { @@ -120,6 +126,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + View contentView = View.inflate(this, R.layout.activity_new_gamedetails, null); gameId = getIntent().getStringExtra("gameId"); entrance = getIntent().getStringExtra("entrance"); @@ -148,8 +155,8 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick tvPer = (TextView) findViewById(R.id.gamedetails_tv_per); noConnection = (LinearLayout) findViewById(R.id.reuse_no_connection); detailsRecyclerView = (RecyclerView) findViewById(R.id.gamedetails_rv); - detailsAdapter = new GameDetailsAdapter(context); - detailsRecyclerView.setLayoutManager(new LinearLayoutManager(context)); + detailsAdapter = new GameDetailsAdapter(NewGameDetailsActivity.this); + detailsRecyclerView.setLayoutManager(new LinearLayoutManager(NewGameDetailsActivity.this)); detailsRecyclerView.setAdapter(detailsAdapter); if (entity != null) { initDowload(); @@ -192,13 +199,12 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick Message msg = Message.obtain(); msg.what = Constants.CONTINUE_DOWNLOAD_TASK; msg.obj = downloadEntry.getUrl(); - DownloadManager.getInstance(context).put(downloadEntry.getUrl(), + DownloadManager.getInstance(NewGameDetailsActivity.this).put(downloadEntry.getUrl(), System.currentTimeMillis()); - DownloadManager.getInstance(context).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance(NewGameDetailsActivity.this).sendMessageDelayed(msg, 1000); } else if ("安装".equals(str)) { final String path = downloadEntry.getPath(); - PackageManager manager = new PackageManager( - context); + PackageManager manager = new PackageManager(NewGameDetailsActivity.this); if (manager.launchSetup(path)) { startActivity(PackageUtils.getInstallIntent(path)); } else { @@ -220,9 +226,9 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick Message msg = Message.obtain(); msg.what = Constants.PAUSE_DOWNLOAD_TASK; msg.obj = downloadEntry.getUrl(); - DownloadManager.getInstance(context).put(downloadEntry.getUrl(), + DownloadManager.getInstance(NewGameDetailsActivity.this).put(downloadEntry.getUrl(), System.currentTimeMillis()); - DownloadManager.getInstance(context).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance(NewGameDetailsActivity.this).sendMessageDelayed(msg, 1000); } break; case R.id.reuse_no_connection: @@ -322,7 +328,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick gameEntity.getName(), kv); PackageUtils.launchApplicationByPackageName( - context, gameEntity.getApk() + NewGameDetailsActivity.this, gameEntity.getApk() .get(0).getPackageName()); } else { ApkEntity apkEntity = gameEntity.getApk().get(0); @@ -353,7 +359,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick map.put("method", "正常"); map.put("platform", PlatformUtils.getInstance( - context) + NewGameDetailsActivity.this) .getPlatformName( gameEntity.getApk().get(0) .getPlatform())); @@ -386,7 +392,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick entry.setMeta(meta); DownloadManager.getInstance( - context).add(entry); + NewGameDetailsActivity.this).add(entry); EventBus.getDefault().post(new EBRedDot(1)); @@ -524,7 +530,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick } else { String url = gameEntity.getApk().get(0).getUrl(); for (DownloadEntry entry : DownloadManager.getInstance( - context).getAll()) { + NewGameDetailsActivity.this).getAll()) { if (url.equals(entry.getUrl())) { downloadEntry = entry; tvDowload.setVisibility(View.GONE); @@ -536,7 +542,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick } } } - DownloadManager.getInstance(context).addObserver( + DownloadManager.getInstance(NewGameDetailsActivity.this).addObserver( dataWatcher); } @Override @@ -576,7 +582,6 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick gameId = null; entrance = null; detailsAdapter = null; - context = null; detailsRecyclerView = null; llLoading = null; noConnection = null; @@ -594,6 +599,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick public class GameDetailsAdapter extends RecyclerView.Adapter{ + private Context context; public GameDetailsAdapter(Context context) { @@ -688,8 +694,8 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick @Override public void onClick(View v) { Intent intent = new Intent(context,NewsActivity.class); - intent.putExtra("newsId",entity.getNews().get(finalI).getId()); - intent.putExtra("entrance","游戏详情"); + intent.putExtra("newsId", entity.getNews().get(finalI).getId()); + intent.putExtra("entrance", "游戏详情"); context.startActivity(intent); } }); @@ -698,13 +704,15 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick ziXunViewHolder.llMore.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (entity.getArticleTypes()!= null&&gameEntity.getId()!=null&&gameEntity.getName()!= null){ - Intent intent = new Intent(context,GameDeatilsNewsActivity.class); - intent.putExtra("articleTypes",entity.getArticleTypes()); - intent.putExtra("gameName",gameEntity.getName()); - intent.putExtra("gameId",gameId); - context.startActivity(intent); - } +// if (entity.getArticleTypes() != null +// && gameEntity.getId() != null +// && gameEntity.getName() != null){ +// Intent intent = new Intent(context, GameDeatilsNewsActivity.class); +// intent.putExtra("articleTypes", entity.getArticleTypes()); +// intent.putExtra("gameName", gameEntity.getName()); +// intent.putExtra("gameId", gameId); +// context.startActivity(intent); +// } } }); } @@ -907,7 +915,8 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View inflate = LayoutInflater.from(context).inflate(R.layout.gamedetails_screenshot_item, parent, false); + View inflate = LayoutInflater.from(NewGameDetailsActivity.this). + inflate(R.layout.gamedetails_screenshot_item, parent, false); return new ViewHolder(inflate); } @@ -915,7 +924,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick public void onBindViewHolder(ViewHolder holder, final int position) { holder.gamepic_iv.setImageResource(R.drawable.me_icon); holder.gamepic_iv.setScaleType(ImageView.ScaleType.CENTER_INSIDE); - ImageUtils.getInstance(context).display(entity.getGallery().get(position),holder.gamepic_iv); + ImageUtils.getInstance(NewGameDetailsActivity.this).display(entity.getGallery().get(position),holder.gamepic_iv); holder.view.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -934,13 +943,16 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick } public class ViewHolder extends RecyclerView.ViewHolder { + View view; ImageView gamepic_iv; + public ViewHolder(View itemView) { super(itemView); view = itemView; gamepic_iv = (ImageView) view.findViewById(R.id.screenshot_item_iv); - gamepic_iv.setPadding((int)(context.getResources().getDisplayMetrics().density*2),0,(int)(context.getResources().getDisplayMetrics().density*2),0); + gamepic_iv.setPadding((int)(NewGameDetailsActivity.this.getResources().getDisplayMetrics().density * 2), + 0, (int)(NewGameDetailsActivity.this.getResources().getDisplayMetrics().density * 2), 0); } } } diff --git a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java index 8f7f1aab12..bfad20d748 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java @@ -70,7 +70,6 @@ public class News1Fragment extends Fragment implements SwipeRefreshLayout.OnRefr adapter = new News1FragmentAdapter(News1Fragment.this, original_list, original_swipe_refresh, original_pb_loading, reuse_no_connection, false); original_list.setAdapter(adapter); - original_list.addItemDecoration(new VerticalItemDecoration(getActivity(), 1)); original_list.setOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrollStateChanged(RecyclerView recyclerView, int newState) { diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index 6055710e88..e841946de2 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -70,7 +70,6 @@ public class News2Fragment extends Fragment implements SwipeRefreshLayout.OnRefr adapter = new News2FragmentAdapter(News2Fragment.this, original_list, original_swipe_refresh, original_pb_loading, reuse_no_connection, false); original_list.setAdapter(adapter); - original_list.addItemDecoration(new VerticalItemDecoration(getActivity(), 1)); original_list.setOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrollStateChanged(RecyclerView recyclerView, int newState) { diff --git a/app/src/main/res/layout/activity_new_gamedetails.xml b/app/src/main/res/layout/activity_new_gamedetails.xml index 60e3f6e4d0..faa23d0126 100644 --- a/app/src/main/res/layout/activity_new_gamedetails.xml +++ b/app/src/main/res/layout/activity_new_gamedetails.xml @@ -4,16 +4,19 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + + + - + - + - + + + + + + - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_original.xml b/app/src/main/res/layout/fragment_original.xml index ed9323f6e9..403e8c15c3 100644 --- a/app/src/main/res/layout/fragment_original.xml +++ b/app/src/main/res/layout/fragment_original.xml @@ -1,7 +1,9 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + @@ -28,4 +30,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/gamedetails_rv_item_zixun.xml b/app/src/main/res/layout/gamedetails_rv_item_zixun.xml index 2c2f0dbd2f..6f673ae8d2 100644 --- a/app/src/main/res/layout/gamedetails_rv_item_zixun.xml +++ b/app/src/main/res/layout/gamedetails_rv_item_zixun.xml @@ -49,7 +49,7 @@ + android:src="@drawable/userinfo_more" />