diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 94be3c1b93..c2713f0bc6 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -34,13 +34,13 @@ import butterknife.BindView; public class ConcernActivity extends BaseActivity implements OnClickListener { @BindView(R.id.concern_rv_show) - RecyclerView concern_rv_show; + RecyclerView mConcernRv; @BindView(R.id.concern_rv_recommend) - RecyclerView concern_rv_recommend; + RecyclerView mConcernRecommendRv; @BindView(R.id.concern_rl_title) - RelativeLayout concern_rl_title; + RelativeLayout mConcernTitleRl; @BindView(R.id.reuse_none_data) - LinearLayout reuse_none_data; + LinearLayout mNoneData; private ConcernAdapter concernAdapter; private ConcernRecommendAdapter concernRecommendAdapter; @@ -69,22 +69,22 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { List concernList = concernManager.getConcernGame(); if (concernList == null || concernList.isEmpty()) { - reuse_none_data.setVisibility(View.VISIBLE); - concern_rv_show.setVisibility(View.GONE); + mNoneData.setVisibility(View.VISIBLE); + mConcernRv.setVisibility(View.GONE); } - concern_rl_title.setOnClickListener(this); + mConcernTitleRl.setOnClickListener(this); - concern_rv_show.setHasFixedSize(true); - concern_rv_show.setLayoutManager(new GridLayoutManager(this, 3)); + mConcernRv.setHasFixedSize(true); + mConcernRv.setLayoutManager(new GridLayoutManager(this, 3)); concernAdapter = new ConcernAdapter(this, this, mEntrance); - concern_rv_show.setAdapter(concernAdapter); + mConcernRv.setAdapter(concernAdapter); - concern_rv_recommend.setHasFixedSize(true); - concern_rv_recommend.setLayoutManager(new GridLayoutManager(this, 4)); + mConcernRecommendRv.setHasFixedSize(true); + mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, 4)); concernRecommendAdapter = new ConcernRecommendAdapter(this, this, mEntrance); - concern_rv_recommend.setAdapter(concernRecommendAdapter); + mConcernRecommendRv.setAdapter(concernRecommendAdapter); } @Override @@ -125,7 +125,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { Utils.log("isChanged = " + isChanged); if (isChanged) { concernAdapter = new ConcernAdapter(this, this, mEntrance); - concern_rv_show.setAdapter(concernAdapter); + mConcernRv.setAdapter(concernAdapter); } isPause = false; } @@ -133,27 +133,27 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { @Override public void loadDone() { - concern_rl_title.setVisibility(View.VISIBLE); - concern_rv_recommend.setVisibility(View.VISIBLE); + mConcernTitleRl.setVisibility(View.VISIBLE); + mConcernRecommendRv.setVisibility(View.VISIBLE); int size = concernRecommendAdapter.getRecommendGameList().size(); - concern_rv_recommend.setLayoutManager(new GridLayoutManager(this, size > 4 ? 4 : size)); - concern_rv_recommend.getAdapter().notifyDataSetChanged(); + mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, size > 4 ? 4 : size)); + mConcernRecommendRv.getAdapter().notifyDataSetChanged(); } @Override public void loadEmpty() { if (concernAdapter.getConcernList() == null || concernAdapter.getConcernList().isEmpty()) { - reuse_none_data.setVisibility(View.VISIBLE); - concern_rv_show.setVisibility(View.GONE); + mNoneData.setVisibility(View.VISIBLE); + mConcernRv.setVisibility(View.GONE); } if (concernRecommendAdapter.getRecommendGameList() == null || concernRecommendAdapter.getRecommendGameList().isEmpty()) { - concern_rl_title.setVisibility(View.GONE); - concern_rv_recommend.setVisibility(View.GONE); + mConcernTitleRl.setVisibility(View.GONE); + mConcernRecommendRv.setVisibility(View.GONE); } else { if (concernRecommendAdapter.getRecommendGameList().size() < 4) { - concern_rv_recommend.setLayoutManager(new GridLayoutManager( + mConcernRecommendRv.setLayoutManager(new GridLayoutManager( ConcernActivity.this, concernRecommendAdapter.getRecommendGameList().size())); } } @@ -161,8 +161,8 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { @Override public void onClick(View v) { - if (v == concern_rl_title) { - if (concern_rv_recommend.getVisibility() == View.VISIBLE) { + if (v == mConcernTitleRl) { + if (mConcernRecommendRv.getVisibility() == View.VISIBLE) { ((Concern_LinearLayout) mContentView).hideRecyclerView(); } else { ((Concern_LinearLayout) mContentView).showRecyclerView(); @@ -186,9 +186,9 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { concernInfo.setId(gameEntity.getId()); concernAdapter.getConcernList().add(0, concernInfo); concernAdapter.getConcernGameList().add(0, gameEntity); - if (reuse_none_data.getVisibility() == View.VISIBLE) { - reuse_none_data.setVisibility(View.GONE); - concern_rv_show.setVisibility(View.VISIBLE); + if (mNoneData.getVisibility() == View.VISIBLE) { + mNoneData.setVisibility(View.GONE); + mConcernRv.setVisibility(View.VISIBLE); } concernAdapter.notifyDataSetChanged(); } @@ -198,14 +198,14 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { concernRecommendAdapter.getRecommendGameList().remove(i); concernRecommendAdapter.notifyDataSetChanged(); if (concernRecommendAdapter.getRecommendGameList().isEmpty()) { - concern_rl_title.setVisibility(View.GONE); - concern_rv_recommend.setVisibility(View.GONE); + mConcernTitleRl.setVisibility(View.GONE); + mConcernRecommendRv.setVisibility(View.GONE); } if (concernRecommendAdapter.getRecommendGameList().size() < 4) { - concern_rv_recommend.setLayoutManager(new GridLayoutManager( + mConcernRecommendRv.setLayoutManager(new GridLayoutManager( ConcernActivity.this, concernRecommendAdapter.getRecommendGameList().size())); } else { - concern_rv_recommend.setLayoutManager(new GridLayoutManager( + mConcernRecommendRv.setLayoutManager(new GridLayoutManager( ConcernActivity.this, 4)); } break; @@ -220,17 +220,17 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { } concernRecommendAdapter.notifyDataSetChanged(); if (concernRecommendAdapter.getRecommendGameList().isEmpty()) { - concern_rl_title.setVisibility(View.GONE); - concern_rv_recommend.setVisibility(View.GONE); + mConcernTitleRl.setVisibility(View.GONE); + mConcernRecommendRv.setVisibility(View.GONE); } else { - concern_rl_title.setVisibility(View.VISIBLE); - concern_rv_recommend.setVisibility(View.VISIBLE); + mConcernTitleRl.setVisibility(View.VISIBLE); + mConcernRecommendRv.setVisibility(View.VISIBLE); } if (concernRecommendAdapter.getRecommendGameList().size() < 4) { - concern_rv_recommend.setLayoutManager(new GridLayoutManager( + mConcernRecommendRv.setLayoutManager(new GridLayoutManager( ConcernActivity.this, concernRecommendAdapter.getRecommendGameList().size())); } else { - concern_rv_recommend.setLayoutManager(new GridLayoutManager( + mConcernRecommendRv.setLayoutManager(new GridLayoutManager( ConcernActivity.this, 4)); } } diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index b50a42dc16..23da54fcc1 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -47,7 +47,7 @@ import rx.schedulers.Schedulers; public class CropImageActivity extends BaseActivity { @BindView(R.id.cropimage_custom) - CropImageCustom cropimage_custom; + CropImageCustom mCropimageCustom; private SoftReference reference; @@ -107,7 +107,7 @@ public class CropImageActivity extends BaseActivity { Observable.create(new Observable.OnSubscribe() { @Override public void call(Subscriber subscriber) { - subscriber.onNext(cropimage_custom.savePicture(path)); + subscriber.onNext(mCropimageCustom.savePicture(path)); subscriber.onCompleted(); } }).flatMap(new Func1>() { @@ -230,7 +230,7 @@ public class CropImageActivity extends BaseActivity { public void onWindowFocusChanged(boolean hasFocus) { super.onWindowFocusChanged(hasFocus); if (hasFocus && (reference == null || reference.get() == null)) { - ImageView imageView = cropimage_custom.getCropImageZoomView(); + ImageView imageView = mCropimageCustom.getCropImageZoomView(); Bitmap bitmap = BitmapUtils.getBitmapByFile(getIntent().getStringExtra("path"), imageView.getWidth(), imageView.getHeight()); if (bitmap != null) { diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 9e96d16cbf..b1f68675af 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -50,27 +50,27 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList public static final String TAG = "DownloadManagerActivity"; @BindView(R.id.downloadmanager_viewPager) - ViewPager downloadmanager_viewPager; + ViewPager mDownloadmanagerVp; @BindView(R.id.downloadmanager_tv_download) - TextView downloadmanager_tv_download; + TextView mDownloadmanagerDownloadTv; @BindView(R.id.downloadmanager_tv_update) - TextView downloadmanager_tv_update; + TextView mDownloadmanagerUpdateTv; @BindView(R.id.downloadmanager_download_number) - TextView downloadmanager_download_number; + TextView mDownloadmanagerDownloadNumber; @BindView(R.id.downloadmanager_tv_send) - TextView downloadmanager_tv_send; + TextView mDownloadmanagerSendTv; @BindView(R.id.downloadmanager_update_number) - TextView downloadmanager_update_number; + TextView mDownloadmanagerUpdateNumber; @BindView(R.id.downloadmanager_ll_download) - LinearLayout downloadmanager_ll_download; + LinearLayout mDownloadmanagerDownloadLl; @BindView(R.id.downloadmanager_ll_update) - LinearLayout downloadmanager_ll_update; + LinearLayout mDownloadmanagerUpdateLl; @BindView(R.id.downloadmanager_slide_line) - View downloadmanager_slide_line; + View mDownloadmanagerSlideLine; Runnable runnable = new Runnable() { @Override public void run() { - downloadmanager_ll_download.performClick(); + mDownloadmanagerDownloadLl.performClick(); } }; private LinearLayout.LayoutParams lparams; @@ -94,7 +94,7 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putInt("CurrentItem", downloadmanager_viewPager.getCurrentItem()); + outState.putInt("CurrentItem", mDownloadmanagerVp.getCurrentItem()); } @Override @@ -108,24 +108,24 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList initTitle(getString(R.string.title_downloadmanager)); - downloadmanager_ll_download.setOnClickListener(this); - downloadmanager_ll_update.setOnClickListener(this); - downloadmanager_tv_send.setOnClickListener(this); + mDownloadmanagerDownloadLl.setOnClickListener(this); + mDownloadmanagerUpdateLl.setOnClickListener(this); + mDownloadmanagerSendTv.setOnClickListener(this); int updateSize = PackageManager.getUpdateList().size(); if (updateSize != 0) { - downloadmanager_update_number.setVisibility(View.VISIBLE); - downloadmanager_update_number.setText(String.valueOf(updateSize)); + mDownloadmanagerUpdateNumber.setVisibility(View.VISIBLE); + mDownloadmanagerUpdateNumber.setText(String.valueOf(updateSize)); } else { - downloadmanager_update_number.setVisibility(View.GONE); + mDownloadmanagerUpdateNumber.setVisibility(View.GONE); } int downloadSize = DownloadManager.getInstance(getApplicationContext()).getAll().size(); if (downloadSize != 0) { - downloadmanager_download_number.setVisibility(View.VISIBLE); - downloadmanager_download_number.setText(String.valueOf(downloadSize)); + mDownloadmanagerDownloadNumber.setVisibility(View.VISIBLE); + mDownloadmanagerDownloadNumber.setText(String.valueOf(downloadSize)); } else { - downloadmanager_download_number.setVisibility(View.GONE); + mDownloadmanagerDownloadNumber.setVisibility(View.GONE); } int currentItem; @@ -144,22 +144,22 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList lparams = new LinearLayout.LayoutParams((int) (width * 0.7), DisplayUtils.dip2px(getApplicationContext(), 2)); lparams.leftMargin = (int) (width * (currentItem + 0.17f)); - downloadmanager_slide_line.setLayoutParams(lparams); + mDownloadmanagerSlideLine.setLayoutParams(lparams); List list = new ArrayList<>(); list.add(new GameDownloadFragment()); list.add(new GameUpdateFragment()); list.add(new FileSendFragment()); - downloadmanager_viewPager.setAdapter(new FragmentAdapter(getSupportFragmentManager(), list)); - downloadmanager_viewPager.addOnPageChangeListener(this); - downloadmanager_viewPager.setCurrentItem(currentItem); + mDownloadmanagerVp.setAdapter(new FragmentAdapter(getSupportFragmentManager(), list)); + mDownloadmanagerVp.addOnPageChangeListener(this); + mDownloadmanagerVp.setCurrentItem(currentItem); } @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { if (positionOffset != 0) { lparams.leftMargin = (int) (width * (position + positionOffset + 0.17f)); - downloadmanager_slide_line.setLayoutParams(lparams); + mDownloadmanagerSlideLine.setLayoutParams(lparams); } } @@ -167,18 +167,18 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList public void onPageSelected(int position) { if (position == 0) { EventBus.getDefault().post(new EBUISwitch(DownloadManagerActivity.TAG, 0)); - downloadmanager_tv_download.setTextColor(ContextCompat.getColor(this, R.color.theme)); - downloadmanager_tv_update.setTextColor(ContextCompat.getColor(this, R.color.title)); - downloadmanager_tv_send.setTextColor(ContextCompat.getColor(this, R.color.title)); + mDownloadmanagerDownloadTv.setTextColor(ContextCompat.getColor(this, R.color.theme)); + mDownloadmanagerUpdateTv.setTextColor(ContextCompat.getColor(this, R.color.title)); + mDownloadmanagerSendTv.setTextColor(ContextCompat.getColor(this, R.color.title)); } else if (position == 1) { EventBus.getDefault().post(new EBUISwitch(DownloadManagerActivity.TAG, 0)); - downloadmanager_tv_download.setTextColor(ContextCompat.getColor(this, R.color.title)); - downloadmanager_tv_update.setTextColor(ContextCompat.getColor(this, R.color.theme)); - downloadmanager_tv_send.setTextColor(ContextCompat.getColor(this, R.color.title)); + mDownloadmanagerDownloadTv.setTextColor(ContextCompat.getColor(this, R.color.title)); + mDownloadmanagerUpdateTv.setTextColor(ContextCompat.getColor(this, R.color.theme)); + mDownloadmanagerSendTv.setTextColor(ContextCompat.getColor(this, R.color.title)); } else { - downloadmanager_tv_download.setTextColor(ContextCompat.getColor(this, R.color.title)); - downloadmanager_tv_update.setTextColor(ContextCompat.getColor(this, R.color.title)); - downloadmanager_tv_send.setTextColor(ContextCompat.getColor(this, R.color.theme)); + mDownloadmanagerDownloadTv.setTextColor(ContextCompat.getColor(this, R.color.title)); + mDownloadmanagerUpdateTv.setTextColor(ContextCompat.getColor(this, R.color.title)); + mDownloadmanagerSendTv.setTextColor(ContextCompat.getColor(this, R.color.theme)); } } @@ -191,13 +191,13 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList public void onClick(View view) { switch (view.getId()) { case R.id.downloadmanager_tv_send: - downloadmanager_viewPager.setCurrentItem(INDEX_SEND); + mDownloadmanagerVp.setCurrentItem(INDEX_SEND); break; case R.id.downloadmanager_ll_download: - downloadmanager_viewPager.setCurrentItem(INDEX_DOWNLOAD); + mDownloadmanagerVp.setCurrentItem(INDEX_DOWNLOAD); break; case R.id.downloadmanager_ll_update: - downloadmanager_viewPager.setCurrentItem(INDEX_UPDATE); + mDownloadmanagerVp.setCurrentItem(INDEX_UPDATE); break; } @@ -206,7 +206,7 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBMiPush mipush) { if ("plugin_install".equals(mipush.getFrom())) { - downloadmanager_ll_download.performClick(); + mDownloadmanagerDownloadLl.performClick(); } } @@ -214,33 +214,33 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList public void onEventMainThread(EBDownloadChanged changed) { if ("download".equals(changed.getType())) { if (changed.getVisibility() == View.VISIBLE) { - downloadmanager_download_number.setVisibility(View.VISIBLE); + mDownloadmanagerDownloadNumber.setVisibility(View.VISIBLE); } else if (changed.getVisibility() == View.GONE) { - downloadmanager_download_number.setVisibility(View.GONE); + mDownloadmanagerDownloadNumber.setVisibility(View.GONE); } else if (changed.getVisibility() == View.INVISIBLE) { - downloadmanager_download_number.setVisibility(View.INVISIBLE); + mDownloadmanagerDownloadNumber.setVisibility(View.INVISIBLE); } - downloadmanager_download_number.setText(String.valueOf(changed.getSize())); + mDownloadmanagerDownloadNumber.setText(String.valueOf(changed.getSize())); } else if ("update".equals(changed.getType())) { if (changed.getSize() == -1) { - int number = Integer.valueOf(downloadmanager_update_number.getText().toString()); + int number = Integer.valueOf(mDownloadmanagerUpdateNumber.getText().toString()); if (number == 1) { - downloadmanager_update_number.setVisibility(View.GONE); + mDownloadmanagerUpdateNumber.setVisibility(View.GONE); } else { - downloadmanager_update_number.setText(String.valueOf(number - 1)); + mDownloadmanagerUpdateNumber.setText(String.valueOf(number - 1)); } } else { if (changed.getSize() != 0) { if (changed.getVisibility() == View.VISIBLE) { - downloadmanager_update_number.setVisibility(View.VISIBLE); + mDownloadmanagerUpdateNumber.setVisibility(View.VISIBLE); } else if (changed.getVisibility() == View.GONE) { - downloadmanager_update_number.setVisibility(View.GONE); + mDownloadmanagerUpdateNumber.setVisibility(View.GONE); } else if (changed.getVisibility() == View.INVISIBLE) { - downloadmanager_update_number.setVisibility(View.INVISIBLE); + mDownloadmanagerUpdateNumber.setVisibility(View.INVISIBLE); } - downloadmanager_update_number.setText(String.valueOf(changed.getSize())); + mDownloadmanagerUpdateNumber.setText(String.valueOf(changed.getSize())); } else { - downloadmanager_update_number.setVisibility(View.GONE); + mDownloadmanagerUpdateNumber.setVisibility(View.GONE); } } } diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index 09f533bd3e..9cc1239ea4 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -44,9 +44,9 @@ import rx.schedulers.Schedulers; public class GameNewsActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.game_news_list) - RecyclerView game_news_list; + RecyclerView mGameNewsRv; @BindView(R.id.game_news_top_type_list) - RecyclerView game_news_top_type_list; + RecyclerView mGameNewsTypeRv; @BindView(R.id.reuse_none_data) LinearLayout mNoDataLl; @BindView(R.id.reuse_tv_none_data) @@ -108,11 +108,11 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen gameId = getIntent().getStringExtra("gameId"); - game_news_list.setHasFixedSize(true); + mGameNewsRv.setHasFixedSize(true); layoutManager = new LinearLayoutManager(this); - game_news_list.setLayoutManager(layoutManager); + mGameNewsRv.setLayoutManager(layoutManager); - game_news_list.addOnScrollListener(new RecyclerView.OnScrollListener() { + mGameNewsRv.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrollStateChanged(RecyclerView recyclerView, int newState) { super.onScrollStateChanged(recyclerView, newState); @@ -129,21 +129,21 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen super.onScrolled(recyclerView, dx, dy); if (layoutManager.findFirstVisibleItemPosition() >= 1) { - game_news_top_type_list.setVisibility(View.VISIBLE); + mGameNewsTypeRv.setVisibility(View.VISIBLE); ivSearch.setVisibility(View.VISIBLE); } else { - game_news_top_type_list.setVisibility(View.GONE); + mGameNewsTypeRv.setVisibility(View.GONE); ivSearch.setVisibility(View.GONE); } } }); - game_news_top_type_list.setHasFixedSize(true); - game_news_top_type_list.setLayoutManager(new GridLayoutManager(this, 5)); + mGameNewsTypeRv.setHasFixedSize(true); + mGameNewsTypeRv.setLayoutManager(new GridLayoutManager(this, 5)); //禁止由于滑动出现的阴影 - game_news_top_type_list.setOnTouchListener(new View.OnTouchListener() { + mGameNewsTypeRv.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_DOWN) { @@ -173,17 +173,17 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen super.onResponse(response); typeList = response; typeList.add(0, "全部"); - adapter = new GameNewsAdapter(GameNewsActivity.this, typeList, game_news_list, gameId, "全部", mEntrance, mNoDataLl); + adapter = new GameNewsAdapter(GameNewsActivity.this, typeList, mGameNewsRv, gameId, "全部", mEntrance, mNoDataLl); adapterMap.put("全部", adapter); - game_news_list.setAdapter(adapter); + mGameNewsRv.setAdapter(adapter); typeListAdapter = new GameNewsTypeListAdapter(GameNewsActivity.this, typeList, "全部"); - game_news_top_type_list.setAdapter(typeListAdapter); + mGameNewsTypeRv.setAdapter(typeListAdapter); - ViewGroup.LayoutParams params = game_news_top_type_list.getLayoutParams(); + ViewGroup.LayoutParams params = mGameNewsTypeRv.getLayoutParams(); params.height = (int) Math.ceil(typeList.size() / 5f) * DisplayUtils.dip2px(GameNewsActivity.this, 35) + DisplayUtils.dip2px(GameNewsActivity.this, 12); - game_news_top_type_list.setLayoutParams(params); + mGameNewsTypeRv.setLayoutParams(params); } @Override @@ -197,12 +197,12 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen public void onEventMainThread(EBTypeChange change) { adapter = adapterMap.get(change.getType()); if (adapter == null) { - adapter = new GameNewsAdapter(GameNewsActivity.this, typeList, game_news_list, gameId, change.getType(), mEntrance, mNoDataLl); + adapter = new GameNewsAdapter(GameNewsActivity.this, typeList, mGameNewsRv, gameId, change.getType(), mEntrance, mNoDataLl); adapterMap.put(change.getType(), adapter); } - game_news_list.setAdapter(adapter); + mGameNewsRv.setAdapter(adapter); - game_news_top_type_list.setVisibility(View.GONE); + mGameNewsTypeRv.setVisibility(View.GONE); ivSearch.setVisibility(View.GONE); typeListAdapter.setNewsType(change.getType(), change.getPosition()); } @@ -210,8 +210,8 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen @Override public void onClick(View v) { if (v == ivSearch) { - game_news_list.scrollToPosition(0); - game_news_top_type_list.setVisibility(View.GONE); + mGameNewsRv.scrollToPosition(0); + mGameNewsTypeRv.setVisibility(View.GONE); ivSearch.setVisibility(View.GONE); adapter.openKeyBoard(); } diff --git a/app/src/main/java/com/gh/gamecenter/InstallActivity.java b/app/src/main/java/com/gh/gamecenter/InstallActivity.java index 6b9f76c5c0..d061193a0a 100644 --- a/app/src/main/java/com/gh/gamecenter/InstallActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InstallActivity.java @@ -33,6 +33,9 @@ import java.util.ArrayList; import butterknife.BindView; +import static com.gh.gamecenter.R.id.reuse_nodata_skip_tv_btn; +import static com.gh.gamecenter.R.id.reuse_nodata_skip_tv_hint; + /** * Created by khy on 15/06/17. */ @@ -40,13 +43,13 @@ import butterknife.BindView; public class InstallActivity extends BaseActivity implements InstallFragmentAdapter.onSmoothLayoutListener { @BindView(R.id.fm_install_rv_show) - RecyclerView fm_install_rv_show; + RecyclerView mInstallRv; @BindView(R.id.reuse_nodata_skip) - LinearLayout reuse_nodata_skip; - @BindView(R.id.reuse_nodata_skip_tv_hint) - TextView reuse_nodata_skip_tv_hint; - @BindView(R.id.reuse_nodata_skip_tv_btn) - TextView reuse_nodata_skip_tv_btn; + LinearLayout mNoDataSkip; + @BindView(reuse_nodata_skip_tv_hint) + TextView mNoDataSkipHint; + @BindView(reuse_nodata_skip_tv_btn) + TextView mNoDataSkipBtn; private InstallFragmentAdapter mAdapter; @@ -89,21 +92,21 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); initTitle(getString(R.string.personale_mygame)); - reuse_nodata_skip.setVisibility(View.GONE); - reuse_nodata_skip_tv_hint.setText("暂无游戏"); - reuse_nodata_skip_tv_btn.setText("查看精品推荐"); - reuse_nodata_skip_tv_btn.setOnClickListener(new View.OnClickListener() { + mNoDataSkip.setVisibility(View.GONE); + mNoDataSkipHint.setText("暂无游戏"); + mNoDataSkipBtn.setText("查看精品推荐"); + mNoDataSkipBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 1)); } }); - fm_install_rv_show.setHasFixedSize(true); - fm_install_rv_show.setLayoutManager(new LinearLayoutManager(this)); + mInstallRv.setHasFixedSize(true); + mInstallRv.setLayoutManager(new LinearLayoutManager(this)); mAdapter = new InstallFragmentAdapter(this); - fm_install_rv_show.addItemDecoration(new VerticalItemDecoration(this, 1, true)); - fm_install_rv_show.setAdapter(mAdapter); + mInstallRv.addItemDecoration(new VerticalItemDecoration(this, 1, true)); + mInstallRv.setAdapter(mAdapter); } @Override @@ -133,8 +136,8 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap @Override public void loadEmpty() { - fm_install_rv_show.setVisibility(View.GONE); - reuse_nodata_skip.setVisibility(View.VISIBLE); + mInstallRv.setVisibility(View.GONE); + mNoDataSkip.setVisibility(View.VISIBLE); } // 打开下载按钮事件 @@ -150,17 +153,17 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBPackage busFour) { if ("安装".equals(busFour.getType()) || "卸载".equals(busFour.getType())) { - fm_install_rv_show.setVisibility(View.VISIBLE); - reuse_nodata_skip.setVisibility(View.GONE); + mInstallRv.setVisibility(View.VISIBLE); + mNoDataSkip.setVisibility(View.GONE); mAdapter = new InstallFragmentAdapter(this); - fm_install_rv_show.setAdapter(mAdapter); + mInstallRv.setAdapter(mAdapter); } } // 滑动item @Override public void onSmooth() { - View childAt = fm_install_rv_show.getChildAt(fm_install_rv_show.getChildCount() - 2); + View childAt = mInstallRv.getChildAt(mInstallRv.getChildCount() - 2); SwipeLayout swipeLayout = (SwipeLayout) childAt.findViewById(R.id.swipeLayout); if (swipeLayout == null) return; swipeLayout.openAndColse(); diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 5c68b041bd..dfe120ffc7 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -78,29 +78,29 @@ import rx.schedulers.Schedulers; public class NewsDetailActivity extends BaseActivity implements OnClickListener { @BindView(R.id.actionbar_tv_title) - TextView actionbar_tv_title; + TextView mActionbarTitle; @BindView(R.id.news_detail_rv_show) - RecyclerView detail_rv_show; + RecyclerView mDetailRv; @BindView(R.id.news_detail_ll_bottom) - LinearLayout detail_ll_bottom; + LinearLayout mDetailBottomLl; @BindView(R.id.news_detail_ll_dowload) - RelativeLayout detail_ll_dowload; + RelativeLayout mDetailDowloadLl; @BindView(R.id.news_detail_tv_download) - TextView detail_tv_download; + TextView mDetailDownloadTv; @BindView(R.id.news_detail_pb_progressbar) - ProgressBar detail_pb_progressbar; + ProgressBar mDetailProgressbar; @BindView(R.id.news_detail_tv_per) - TextView detail_tv_per; + TextView mDetailPerTv; @BindView(R.id.reuse_ll_loading) - LinearLayout reuse_ll_loading; + LinearLayout mReuseLoading; @BindView(R.id.reuse_no_connection) - LinearLayout reuse_no_connection; + LinearLayout mNoConn; @BindView(R.id.reuse_none_data) - LinearLayout reuse_none_data; + LinearLayout mNoneData; @BindView(R.id.reuse_tv_none_data) - TextView reuse_tv_none_data; + TextView mNoneDataTv; @BindView(R.id.news_detail_ll_coment) - RelativeLayout detail_ll_comment; + RelativeLayout mDetailCommentLl; private ImageView iv_share; @@ -117,7 +117,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener String type = getIntent().getStringExtra("type"); String title = getIntent().getStringExtra("title"); if (type != null) { - actionbar_tv_title.setText(type); + mActionbarTitle.setText(type); } adapter.setId(id); adapter.setType(type); @@ -238,11 +238,11 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener // DisplayMetrics outMetrics = new DisplayMetrics(); // getWindowManager().getDefaultDisplay().getMetrics(outMetrics); - detail_rv_show.setHasFixedSize(true); - detail_rv_show.setLayoutManager(new LinearLayoutManager(this)); - detail_rv_show.addItemDecoration(new VerticalItemDecoration(this, 8, false)); + mDetailRv.setHasFixedSize(true); + mDetailRv.setLayoutManager(new LinearLayoutManager(this)); + mDetailRv.addItemDecoration(new VerticalItemDecoration(this, 8, false)); adapter = new NewsDetailAdapter(this, this, mEntrance); - detail_rv_show.setAdapter(adapter); + mDetailRv.setAdapter(adapter); newsId = getIntent().getStringExtra("newsId"); if (getIntent().getBundleExtra("data") != null) { @@ -253,7 +253,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener String type = getIntent().getStringExtra("type"); String title = getIntent().getStringExtra("title"); if (type != null) { - actionbar_tv_title.setText(type); + mActionbarTitle.setText(type); } adapter.setId(id); adapter.setType(type); @@ -275,7 +275,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1); mHits[mHits.length - 1] = SystemClock.uptimeMillis(); if (mHits[0] >= (SystemClock.uptimeMillis() - 1000)) { - detail_rv_show.scrollToPosition(0); + mDetailRv.scrollToPosition(0); } } }); @@ -288,12 +288,12 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener } - detail_ll_bottom.setOnClickListener(this); - detail_tv_download.setOnClickListener(this); - detail_pb_progressbar.setOnClickListener(this); - detail_tv_per.setOnClickListener(this); - reuse_no_connection.setOnClickListener(this); - detail_ll_comment.setOnClickListener(this); + mDetailBottomLl.setOnClickListener(this); + mDetailDownloadTv.setOnClickListener(this); + mDetailProgressbar.setOnClickListener(this); + mDetailPerTv.setOnClickListener(this); + mNoConn.setOnClickListener(this); + mDetailCommentLl.setOnClickListener(this); // 防抖处理 RxView.clicks(iv_share) @@ -385,20 +385,20 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener @Override public void loadDone(Object obj) { - if (reuse_ll_loading != null) { - reuse_ll_loading.setVisibility(View.GONE); - detail_rv_show.setVisibility(View.VISIBLE); + if (mReuseLoading != null) { + mReuseLoading.setVisibility(View.GONE); + mDetailRv.setVisibility(View.VISIBLE); } getGameDetail((String) obj); } @Override public void loadError() { - detail_rv_show.setVisibility(View.GONE); - reuse_ll_loading.setVisibility(View.GONE); - detail_ll_bottom.setVisibility(View.GONE); - detail_rv_show.setPadding(0, 0, 0, 0); - reuse_no_connection.setVisibility(View.VISIBLE); + mDetailRv.setVisibility(View.GONE); + mReuseLoading.setVisibility(View.GONE); + mDetailBottomLl.setVisibility(View.GONE); + mDetailRv.setPadding(0, 0, 0, 0); + mNoConn.setVisibility(View.VISIBLE); } private void getNewsDigest(final String newsId) { @@ -409,7 +409,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener @Override public void onResponse(NewsEntity response) { if (response.getType() != null) { - actionbar_tv_title.setText(response.getType()); + mActionbarTitle.setText(response.getType()); } adapter.setId(newsId); @@ -422,11 +422,11 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener @Override public void onFailure(HttpException e) { - detail_rv_show.setVisibility(View.GONE); - reuse_ll_loading.setVisibility(View.GONE); - detail_ll_bottom.setVisibility(View.GONE); - detail_rv_show.setPadding(0, 0, 0, 0); - reuse_no_connection.setVisibility(View.VISIBLE); + mDetailRv.setVisibility(View.GONE); + mReuseLoading.setVisibility(View.GONE); + mDetailBottomLl.setVisibility(View.GONE); + mDetailRv.setPadding(0, 0, 0, 0); + mNoConn.setVisibility(View.VISIBLE); } }); } @@ -497,12 +497,12 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener return super.dispatchTouchEvent(ev); } @Override public void onClick(final View v) { - if (v == reuse_no_connection) { - detail_rv_show.setVisibility(View.VISIBLE); - reuse_ll_loading.setVisibility(View.VISIBLE); - reuse_no_connection.setVisibility(View.GONE); + if (v == mNoConn) { + mDetailRv.setVisibility(View.VISIBLE); + mReuseLoading.setVisibility(View.VISIBLE); + mNoConn.setVisibility(View.GONE); handler.postDelayed(runnable, 1000); - } else if (v == detail_tv_download) { + } else if (v == mDetailDownloadTv) { if (gameEntity != null && !gameEntity.getApk().isEmpty()) { if (gameEntity.getApk().size() == 1) { if (NetworkUtils.isWifiConnected(this)) { @@ -522,8 +522,8 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener } else { toast("稍等片刻~！游戏正在上传中..."); } - } else if (v == detail_pb_progressbar || v == detail_tv_per) { - String str = detail_tv_per.getText().toString(); + } else if (v == mDetailProgressbar || v == mDetailPerTv) { + String str = mDetailPerTv.getText().toString(); if ("下载中".equals(str)) { Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, gameEntity.getApk().get(0).getUrl(), mEntrance + "(新闻详情[" + adapter.getTitle() + "])"); @@ -531,7 +531,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener } else if ("安装".equals(str)) { PackageUtils.launchSetup(this, mDownloadEntity.getPath()); } - } else if (v == detail_ll_comment) { + } else if (v == mDetailCommentLl) { Intent intent = new Intent(this, MessageDetailActivity.class); intent.putExtra("commentNum", -1); intent.putExtra("newsId", adapter.getNewsDetailEntity().getId()); @@ -558,8 +558,8 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener private void getGameDetail(String gameId) { if (TextUtils.isEmpty(gameId)) { - detail_ll_bottom.setVisibility(View.GONE); - detail_rv_show.setPadding(0, 0, 0, 0); + mDetailBottomLl.setVisibility(View.GONE); + mDetailRv.setPadding(0, 0, 0, 0); return; } RetrofitManager.getApi().getGameNewsDigest(gameId) @@ -589,12 +589,12 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBNetworkState busNetworkState) { if (busNetworkState.isNetworkConnected()) { - if (reuse_no_connection.getVisibility() == View.VISIBLE) { - detail_rv_show.setVisibility(View.VISIBLE); - reuse_ll_loading.setVisibility(View.VISIBLE); - detail_ll_bottom.setVisibility(View.VISIBLE); - detail_rv_show.setPadding(0, 0, 0, DisplayUtils.dip2px(getApplicationContext(), 60)); - reuse_no_connection.setVisibility(View.GONE); + if (mNoConn.getVisibility() == View.VISIBLE) { + mDetailRv.setVisibility(View.VISIBLE); + mReuseLoading.setVisibility(View.VISIBLE); + mDetailBottomLl.setVisibility(View.VISIBLE); + mDetailRv.setPadding(0, 0, 0, DisplayUtils.dip2px(getApplicationContext(), 60)); + mNoConn.setVisibility(View.GONE); handler.postDelayed(runnable, 1000); } } @@ -602,36 +602,36 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener protected void initDownload(boolean isCheck) { if (Config.isShow(this)) { - detail_ll_bottom.setVisibility(View.VISIBLE); - detail_rv_show.setPadding(0, 0, 0, + mDetailBottomLl.setVisibility(View.VISIBLE); + mDetailRv.setPadding(0, 0, 0, DisplayUtils.dip2px(getApplicationContext(), 60)); } else { - detail_ll_bottom.setVisibility(View.GONE); - detail_rv_show.setPadding(0, 0, 0, 0); + mDetailBottomLl.setVisibility(View.GONE); + mDetailRv.setPadding(0, 0, 0, 0); } if (gameEntity != null && "光环助手".equals(gameEntity.getName())) { if ("光环助手".equals(gameEntity.getName())) { - detail_ll_dowload.setVisibility(View.GONE); + mDetailDowloadLl.setVisibility(View.GONE); } else { - detail_ll_bottom.setVisibility(View.GONE); - detail_rv_show.setPadding(0, 0, 0, 0); + mDetailBottomLl.setVisibility(View.GONE); + mDetailRv.setPadding(0, 0, 0, 0); } } else if (gameEntity == null || gameEntity.getApk().isEmpty()) { - detail_tv_download.setVisibility(View.VISIBLE); - detail_pb_progressbar.setVisibility(View.GONE); - detail_tv_per.setVisibility(View.GONE); + mDetailDownloadTv.setVisibility(View.VISIBLE); + mDetailProgressbar.setVisibility(View.GONE); + mDetailPerTv.setVisibility(View.GONE); if (TextUtils.isEmpty(downloadOffText)) { - detail_tv_download.setText("暂无下载"); + mDetailDownloadTv.setText("暂无下载"); } else { - detail_tv_download.setText(downloadOffText); + mDetailDownloadTv.setText(downloadOffText); } - detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_pause_style); - detail_tv_download.setTextColor(0xFF999999); - detail_tv_download.setClickable(false); + mDetailDownloadTv.setBackgroundResource(R.drawable.game_item_btn_pause_style); + mDetailDownloadTv.setTextColor(0xFF999999); + mDetailDownloadTv.setClickable(false); } else { - detail_tv_download.setVisibility(View.VISIBLE); - detail_pb_progressbar.setVisibility(View.GONE); - detail_tv_per.setVisibility(View.GONE); + mDetailDownloadTv.setVisibility(View.VISIBLE); + mDetailProgressbar.setVisibility(View.GONE); + mDetailPerTv.setVisibility(View.GONE); boolean isInstalled = false; if (gameEntity.getApk() != null && gameEntity.getApk().size() == 1 && PackageManager.isInstalled(gameEntity.getApk().get(0).getPackageName())) { @@ -639,33 +639,33 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener } if (isInstalled) { if (PackageManager.isCanUpdate(gameEntity.getId(), gameEntity.getApk().get(0).getPackageName())) { - detail_tv_download.setBackgroundResource( + mDetailDownloadTv.setBackgroundResource( R.drawable.game_item_btn_download_style); - detail_tv_download.setText("更新"); + mDetailDownloadTv.setText("更新"); } else { if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0 && !TextUtils.isEmpty(gameEntity.getApk().get(0).getGhVersion()) && !PackageUtils.isSignature(this, gameEntity.getApk().get(0).getPackageName())) { - detail_tv_download.setBackgroundResource( + mDetailDownloadTv.setBackgroundResource( R.drawable.game_item_btn_plugin_style); - detail_tv_download.setText("插件化"); + mDetailDownloadTv.setText("插件化"); } else { - detail_tv_download.setBackgroundResource( + mDetailDownloadTv.setBackgroundResource( R.drawable.game_item_btn_launch_style); - detail_tv_download.setText("启动"); + mDetailDownloadTv.setText("启动"); } } } else { String status = GameUtils.getDownloadBtnText(this, gameEntity); if ("插件化".equals(status)) { - detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + mDetailDownloadTv.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else if ("打开".equals(status)) { - detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_launch_style); + mDetailDownloadTv.setBackgroundResource(R.drawable.game_item_btn_launch_style); } else { - detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_download_style); + mDetailDownloadTv.setBackgroundResource(R.drawable.game_item_btn_download_style); } - detail_tv_download.setText(status); + mDetailDownloadTv.setText(status); } } @@ -676,32 +676,32 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener DownloadEntity downloadEntity = DownloadManager.getInstance(getApplicationContext()).get(url); if (downloadEntity != null) { mDownloadEntity = downloadEntity; - detail_tv_download.setVisibility(View.GONE); - detail_pb_progressbar.setVisibility(View.VISIBLE); - detail_tv_per.setVisibility(View.VISIBLE); + mDetailDownloadTv.setVisibility(View.GONE); + mDetailProgressbar.setVisibility(View.VISIBLE); + mDetailPerTv.setVisibility(View.VISIBLE); invalidate(); } } } private void invalidate() { - detail_pb_progressbar.setProgress((int) (mDownloadEntity.getPercent() * 10)); - detail_tv_per.setTextColor(0xFFFFFFFF); + mDetailProgressbar.setProgress((int) (mDownloadEntity.getPercent() * 10)); + mDetailPerTv.setTextColor(0xFFFFFFFF); switch (mDownloadEntity.getStatus()) { case downloading: case pause: case timeout: case neterror: case waiting: - detail_tv_per.setText("下载中"); + mDetailPerTv.setText("下载中"); break; case done: - detail_tv_per.setText("安装"); + mDetailPerTv.setText("安装"); if (mDownloadEntity.isPluggable() && PackageManager.isInstalled(mDownloadEntity.getPackageName())) { - detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_plugin_radius_style)); + mDetailProgressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_plugin_radius_style)); } else { - detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_normal_radius_style)); + mDetailProgressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_normal_radius_style)); } break; case cancel: @@ -744,7 +744,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener private void download() { - String str = detail_tv_download.getText().toString(); + String str = mDetailDownloadTv.getText().toString(); if (str.contains("启动")) { DataUtils.onGameLaunchEvent(this, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), "新闻详情"); @@ -765,11 +765,11 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener DownloadManager.createDownload(this, apkEntity, gameEntity, method, mEntrance, "新闻详情:" + adapter.getTitle()); - detail_tv_download.setVisibility(View.GONE); - detail_pb_progressbar.setVisibility(View.VISIBLE); - detail_tv_per.setVisibility(View.VISIBLE); - detail_pb_progressbar.setProgress(0); - detail_tv_per.setText("0.0%"); + mDetailDownloadTv.setVisibility(View.GONE); + mDetailProgressbar.setVisibility(View.VISIBLE); + mDetailPerTv.setVisibility(View.VISIBLE); + mDetailProgressbar.setProgress(0); + mDetailPerTv.setText("0.0%"); DownloadManager.getInstance(NewsDetailActivity.this).putStatus(apkEntity.getUrl(), "downloading"); } else { diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 947305cfba..e780477834 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -48,17 +48,17 @@ import rx.schedulers.Schedulers; public class NewsSearchActivity extends BaseActivity { @BindView(R.id.gamedetail_news_rv) - RecyclerView gamedetail_news_rv; + RecyclerView mNewsSearchRv; @BindView(R.id.tv_search) - TextView tv_search; + TextView mNewsSearchTv; @BindView(R.id.reuse_none_data) - LinearLayout reuse_none_data; + LinearLayout mNoneData; @BindView(R.id.et_search) - EditText et_search; + EditText mNewsSearchEt; @BindView(R.id.gamedetail_news_ll_loading) - LinearLayout gamedetail_news_ll_loading; + LinearLayout mLoading; @BindView(R.id.reuse_no_connection) - LinearLayout reuse_no_connection; + LinearLayout mNoConn; private LinearLayoutManager layoutManager; private List newsEntities; @@ -110,23 +110,23 @@ public class NewsSearchActivity extends BaseActivity { layoutManager = new LinearLayoutManager(this); - gamedetail_news_rv.setLayoutManager(layoutManager); - gamedetail_news_rv.setAdapter(searchAdapter); - gamedetail_news_rv.addItemDecoration(new VerticalItemDecoration(NewsSearchActivity.this, 1, false)); + mNewsSearchRv.setLayoutManager(layoutManager); + mNewsSearchRv.setAdapter(searchAdapter); + mNewsSearchRv.addItemDecoration(new VerticalItemDecoration(NewsSearchActivity.this, 1, false)); - et_search.setText(searchKey); + mNewsSearchEt.setText(searchKey); loadNewsData(page); - tv_search.setOnClickListener(new View.OnClickListener() { + mNewsSearchTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - searchKey = et_search.getText().toString().trim(); + searchKey = mNewsSearchEt.getText().toString().trim(); if (searchKey.length() >= 1) { newsEntities.clear(); searchAdapter.notifyDataSetChanged(); - gamedetail_news_ll_loading.setVisibility(View.VISIBLE); - reuse_none_data.setVisibility(View.GONE); + mLoading.setVisibility(View.VISIBLE); + mNoneData.setVisibility(View.GONE); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(v.getWindowToken(), 0); handler.postDelayed(new Runnable() { @@ -144,7 +144,7 @@ public class NewsSearchActivity extends BaseActivity { } }); - gamedetail_news_rv.addOnScrollListener(new RecyclerView.OnScrollListener() { + mNewsSearchRv.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrollStateChanged(RecyclerView recyclerView, int newState) { super.onScrollStateChanged(recyclerView, newState); @@ -157,11 +157,11 @@ public class NewsSearchActivity extends BaseActivity { } }); - reuse_no_connection.setOnClickListener(new View.OnClickListener() { + mNoConn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - reuse_no_connection.setVisibility(View.GONE); - gamedetail_news_ll_loading.setVisibility(View.VISIBLE); + mNoConn.setVisibility(View.GONE); + mLoading.setVisibility(View.VISIBLE); handler.postDelayed(new Runnable() { @Override public void run() { @@ -197,15 +197,15 @@ public class NewsSearchActivity extends BaseActivity { @Override public void onResponse(List response) { isLoadOver = true; - gamedetail_news_ll_loading.setVisibility(View.GONE); - reuse_none_data.setVisibility(View.GONE); + mLoading.setVisibility(View.GONE); + mNoneData.setVisibility(View.GONE); if (response.size() != 0) { newsEntities.addAll(response); searchAdapter.notifyDataSetChanged(); } else { if (page == 1) { - reuse_none_data.setVisibility(View.VISIBLE); + mNoneData.setVisibility(View.VISIBLE); } isRemove = true; @@ -220,8 +220,8 @@ public class NewsSearchActivity extends BaseActivity { @Override public void onFailure(HttpException e) { if (page == 1) { - reuse_no_connection.setVisibility(View.VISIBLE); - gamedetail_news_ll_loading.setVisibility(View.GONE); + mNoConn.setVisibility(View.VISIBLE); + mLoading.setVisibility(View.GONE); } isLoadOver = true; toast("加载失败，请检查网络状态"); diff --git a/app/src/main/java/com/gh/gamecenter/PluginActivity.java b/app/src/main/java/com/gh/gamecenter/PluginActivity.java index 262020d7d5..8386548a8b 100644 --- a/app/src/main/java/com/gh/gamecenter/PluginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PluginActivity.java @@ -37,11 +37,11 @@ import butterknife.BindView; public class PluginActivity extends BaseActivity { @BindView(R.id.plugin_list) - RecyclerView plugin_list; + RecyclerView mPluginRv; @BindView(R.id.plugin_pb_loading) - ProgressBarCircularIndeterminate plugin_pb_loading; + ProgressBarCircularIndeterminate mPluginLoading; @BindView(R.id.reuse_no_connection) - LinearLayout reuse_no_connection; + LinearLayout mNoConn; private PluginAdapter adapter; @@ -85,21 +85,21 @@ public class PluginActivity extends BaseActivity { initTitle(getString(R.string.title_plugin)); - reuse_no_connection.setOnClickListener(new View.OnClickListener() { + mNoConn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - plugin_pb_loading.setVisibility(View.VISIBLE); - plugin_list.setVisibility(View.VISIBLE); - reuse_no_connection.setVisibility(View.GONE); + mPluginLoading.setVisibility(View.VISIBLE); + mPluginRv.setVisibility(View.VISIBLE); + mNoConn.setVisibility(View.GONE); adapter = new PluginAdapter(PluginActivity.this, PluginActivity.this, mEntrance); - plugin_list.setAdapter(adapter); + mPluginRv.setAdapter(adapter); } }); - plugin_list.setHasFixedSize(true); - plugin_list.setLayoutManager(new LinearLayoutManager(this)); + mPluginRv.setHasFixedSize(true); + mPluginRv.setLayoutManager(new LinearLayoutManager(this)); adapter = new PluginAdapter(this, this, mEntrance); - plugin_list.setAdapter(adapter); + mPluginRv.setAdapter(adapter); } @@ -125,8 +125,8 @@ public class PluginActivity extends BaseActivity { @Override public void loadDone() { - if (plugin_pb_loading != null && plugin_pb_loading.getVisibility() == View.VISIBLE) { - plugin_pb_loading.setVisibility(View.GONE); + if (mPluginLoading != null && mPluginLoading.getVisibility() == View.VISIBLE) { + mPluginLoading.setVisibility(View.GONE); } } @@ -154,12 +154,12 @@ public class PluginActivity extends BaseActivity { @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBNetworkState busNetworkState) { if (busNetworkState.isNetworkConnected()) { - if (reuse_no_connection.getVisibility() == View.VISIBLE) { - plugin_list.setVisibility(View.VISIBLE); - plugin_pb_loading.setVisibility(View.VISIBLE); - reuse_no_connection.setVisibility(View.GONE); + if (mNoConn.getVisibility() == View.VISIBLE) { + mPluginRv.setVisibility(View.VISIBLE); + mPluginLoading.setVisibility(View.VISIBLE); + mNoConn.setVisibility(View.GONE); adapter = new PluginAdapter(this, this, mEntrance); - plugin_list.setAdapter(adapter); + mPluginRv.setAdapter(adapter); } } } diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 0fd71534b8..7f6927a812 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -50,17 +50,17 @@ import static java.lang.Thread.sleep; public class SettingActivity extends BaseActivity implements OnClickListener { @BindView(R.id.setting_sb_autoinstall) - SwitchButton setting_sb_autoinstall; + SwitchButton mSettingAutoinstallSb; @BindView(R.id.setting_sb_autodelete) - SwitchButton setting_sb_autodelete; + SwitchButton mSettingAutodeleteSb; @BindView(R.id.setting_sb_deletedata) - SwitchButton setting_sb_deletedata; + SwitchButton mSettingDeletedataSb; @BindView(R.id.setting_sb_concerngame) - SwitchButton setting_sb_concerngame; + SwitchButton mSettingConcerngameSb; @BindView(R.id.setting_tv_cache) - TextView setting_tv_cache; + TextView mSettingCacheTv; @BindView(R.id.setting_tv_size) - TextView setting_tv_size; + TextView mSettingSizeTv; private SharedPreferences sp; @@ -92,7 +92,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { initTitle(getString(R.string.title_settings)); - setting_tv_cache.setText(getCacheSize()); + mSettingCacheTv.setText(getCacheSize()); sp = getSharedPreferences(Config.PREFERENCE, Activity.MODE_PRIVATE); @@ -101,10 +101,10 @@ public class SettingActivity extends BaseActivity implements OnClickListener { findViewById(R.id.setting_cv_fix_download).setVisibility(View.VISIBLE); } - setting_sb_autoinstall.setChecked(sp.getBoolean("autoinstall", true)); - setting_sb_autodelete.setChecked(sp.getBoolean("autodelete", true)); - setting_sb_deletedata.setChecked(sp.getBoolean("deletedata", true)); - setting_sb_concerngame.setChecked(sp.getBoolean("concerngame", true)); + mSettingAutoinstallSb.setChecked(sp.getBoolean("autoinstall", true)); + mSettingAutodeleteSb.setChecked(sp.getBoolean("autodelete", true)); + mSettingDeletedataSb.setChecked(sp.getBoolean("deletedata", true)); + mSettingConcerngameSb.setChecked(sp.getBoolean("concerngame", true)); checkSizeIndex = sp.getInt("fontsize", 1); if (checkSizeIndex == 0) { @@ -121,10 +121,10 @@ public class SettingActivity extends BaseActivity implements OnClickListener { private void saveCurrentSetting() { Editor mEditor = sp.edit(); - mEditor.putBoolean("autoinstall", setting_sb_autoinstall.isChecked()); - mEditor.putBoolean("autodelete", setting_sb_autodelete.isChecked()); - mEditor.putBoolean("deletedata", setting_sb_deletedata.isChecked()); - mEditor.putBoolean("concerngame", setting_sb_concerngame.isChecked()); + mEditor.putBoolean("autoinstall", mSettingAutoinstallSb.isChecked()); + mEditor.putBoolean("autodelete", mSettingAutodeleteSb.isChecked()); + mEditor.putBoolean("deletedata", mSettingDeletedataSb.isChecked()); + mEditor.putBoolean("concerngame", mSettingConcerngameSb.isChecked()); mEditor.putInt("fontsize", checkSizeIndex); mEditor.apply(); } @@ -199,13 +199,13 @@ public class SettingActivity extends BaseActivity implements OnClickListener { }.start(); break; case R.id.setting_rl_autoinstall: - setting_sb_autoinstall.performClick(); + mSettingAutoinstallSb.performClick(); break; case R.id.setting_rl_autodelete: - setting_sb_autodelete.performClick(); + mSettingAutodeleteSb.performClick(); break; case R.id.setting_rl_deletedata: - setting_sb_deletedata.performClick(); + mSettingDeletedataSb.performClick(); break; case R.id.setting_rl_cache: DialogUtils.showWarningDialog(this, "清除缓存", "清空缓存后未安装的游戏可能需要重新下载，确定清空？", @@ -224,7 +224,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { startActivity(AboutActivity.getIntent(this)); break; case R.id.setting_rl_concerngame: - setting_sb_concerngame.performClick(); + mSettingConcerngameSb.performClick(); default: break; } @@ -233,16 +233,16 @@ public class SettingActivity extends BaseActivity implements OnClickListener { private void fontTextSize(int i) { switch (i) { case 1: - setting_tv_size.setText("小字号"); + mSettingSizeTv.setText("小字号"); break; case 2: - setting_tv_size.setText("中字号"); + mSettingSizeTv.setText("中字号"); break; case 3: - setting_tv_size.setText("大字号"); + mSettingSizeTv.setText("大字号"); break; case 4: - setting_tv_size.setText("特大字号"); + mSettingSizeTv.setText("特大字号"); break; } } @@ -307,7 +307,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { if (loadingDialog != null) { loadingDialog.dismiss(); } - setting_tv_cache.setText(getCacheSize()); + mSettingCacheTv.setText(getCacheSize()); Toast.makeText(SettingActivity.this, "缓存清除成功", Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index 769aedd4b7..05380ca5c7 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -70,9 +70,9 @@ import butterknife.BindView; public class ViewImageActivity extends Activity implements OnPageChangeListener { @BindView(R.id.viewimage_vp_show) - Gh_ViewPager viewimage_vp_show; + Gh_ViewPager mViewimageVp; @BindView(R.id.viewimage_slide_line) - View viewimage_slide_line; + View mViewimageLine; private ViewImageAdapter adapter; private RelativeLayout.LayoutParams rparams; @@ -105,7 +105,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener } private void notifyItemChanged(int position) { - Object object = viewimage_vp_show.findViewWithTag(position); + Object object = mViewimageVp.findViewWithTag(position); if (object != null) { RelativeLayout view = (RelativeLayout) object; final ZoomSimpleDraweeView imageView = (ZoomSimpleDraweeView) view.findViewById(R.id.viewimage_iv_show); @@ -165,14 +165,12 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener rparams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); rparams.bottomMargin = DisplayUtils.dip2px(getApplicationContext(), 10); rparams.leftMargin = width * current; - viewimage_slide_line = findViewById(R.id.viewimage_slide_line); - viewimage_slide_line.setLayoutParams(rparams); - - viewimage_vp_show = (Gh_ViewPager) findViewById(R.id.viewimage_vp_show); + mViewimageLine.setLayoutParams(rparams); + adapter = new ViewImageAdapter(); - viewimage_vp_show.setAdapter(adapter); - viewimage_vp_show.setCurrentItem(current); - viewimage_vp_show.addOnPageChangeListener(this); + mViewimageVp.setAdapter(adapter); + mViewimageVp.setCurrentItem(current); + mViewimageVp.addOnPageChangeListener(this); if (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { isOrientation = true; // 横屏 @@ -184,14 +182,14 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putInt("currentItem", viewimage_vp_show.getCurrentItem()); + outState.putInt("currentItem", mViewimageVp.getCurrentItem()); outState.putBoolean("isOrientation", isOrientation); } @Override protected void onDestroy() { super.onDestroy(); - viewimage_vp_show.onDestory(); // 注销EventBus + mViewimageVp.onDestory(); // 注销EventBus handler.removeCallbacksAndMessages(null); } @@ -200,16 +198,16 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener int positionOffsetPixels) { if (positionOffset != 0) { rparams.leftMargin = (int) (width * (positionOffset + position)); - viewimage_slide_line.setLayoutParams(rparams); + mViewimageLine.setLayoutParams(rparams); } } @Override public void onPageSelected(int position) { Gh_RelativeLayout ghRelativeLayout; - for (int i = 0; i < viewimage_vp_show.getChildCount(); i++) { - if (viewimage_vp_show.getChildAt(i).getTag() != null) { - ghRelativeLayout = (Gh_RelativeLayout) viewimage_vp_show.getChildAt(i); + for (int i = 0; i < mViewimageVp.getChildCount(); i++) { + if (mViewimageVp.getChildAt(i).getTag() != null) { + ghRelativeLayout = (Gh_RelativeLayout) mViewimageVp.getChildAt(i); if (ghRelativeLayout == null) { return; } @@ -375,7 +373,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener } private void findImageBM() { - String key = urls.get(viewimage_vp_show.getCurrentItem()); + String key = urls.get(mViewimageVp.getCurrentItem()); String hdKey = "http://image.ghzhushou.com/pic/hq" + key.substring(key.lastIndexOf("/")); ImagePipeline imagePipeline = Fresco.getImagePipeline(); String curUrl; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index fcb6b61578..ccd6f54028 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -168,14 +168,14 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) { if (holder instanceof GameNewsTypeListViewHolder) { GameNewsTypeListViewHolder viewHolder = (GameNewsTypeListViewHolder) holder; - ViewGroup.LayoutParams params = viewHolder.game_news_type_list.getLayoutParams(); + ViewGroup.LayoutParams params = viewHolder.typeList.getLayoutParams(); params.height = (int) Math.ceil(mTypeList.size() / 5f) * DisplayUtils.dip2px(mContext, 35) + DisplayUtils.dip2px(mContext, 12); - viewHolder.game_news_type_list.setLayoutParams(params); + viewHolder.typeList.setLayoutParams(params); - if (viewHolder.game_news_type_list.getAdapter() == null) { - viewHolder.game_news_type_list.setHasFixedSize(true); - viewHolder.game_news_type_list.setLayoutManager(new GridLayoutManager(mContext, 5)); - viewHolder.game_news_type_list.setAdapter(new GameNewsTypeListAdapter(mContext, mTypeList, mNewsType)); + if (viewHolder.typeList.getAdapter() == null) { + viewHolder.typeList.setHasFixedSize(true); + viewHolder.typeList.setLayoutManager(new GridLayoutManager(mContext, 5)); + viewHolder.typeList.setAdapter(new GameNewsTypeListAdapter(mContext, mTypeList, mNewsType)); } } else if (holder instanceof NewsTextViewHolder) { final NewsTextViewHolder viewHolder = (NewsTextViewHolder) holder; @@ -220,17 +220,17 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { } } else if (holder instanceof GameNewsSearchViewHolder) { if (isOpenKeyBoard) { - ((GameNewsSearchViewHolder) holder).game_news_et_search.requestFocus(); + ((GameNewsSearchViewHolder) holder).searchEt.requestFocus(); InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE); imm.toggleSoftInput(0, InputMethodManager.SHOW_FORCED); isOpenKeyBoard = false; } GameNewsSearchViewHolder searchViewHolder = ((GameNewsSearchViewHolder) holder); - searchViewHolder.game_news_tv_search.setOnClickListener(new View.OnClickListener() { + searchViewHolder.searchTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String searchKey = ((GameNewsSearchViewHolder) holder).game_news_et_search.getText().toString().trim(); + String searchKey = ((GameNewsSearchViewHolder) holder).searchEt.getText().toString().trim(); if (searchKey.length() >= 1) { Intent intent = NewsSearchActivity.getIntent(mContext, "搜索结果", searchKey, mGameId, StringUtils.buildString(mEntrance, "+(游戏新闻列表:", mNewsType, ")")); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java index 564edd44b3..2bd6f0677a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java @@ -68,17 +68,17 @@ public class GameNewsTypeListAdapter extends BaseRecyclerAdapter { } private void initLibaoDetailContent(GameDetailNewsViewHolder holder, int position) { - holder.gamedetail_item_news_more.setVisibility(View.GONE); - holder.gamedetail_item_line.setVisibility(View.VISIBLE); - holder.gamedetail_item_news_list.setPadding(0, DisplayUtils.dip2px(mContext, 10) + holder.newsMore.setVisibility(View.GONE); + holder.newsLine.setVisibility(View.VISIBLE); + holder.newsList.setPadding(0, DisplayUtils.dip2px(mContext, 10) , 0, DisplayUtils.dip2px(mContext, 10)); - holder.gamedetail_item_news_list.removeAllViews(); + holder.newsList.removeAllViews(); if (mLibaoEntity.getContent() != null && position == 1) { - holder.gamedetail_item_news_title.setText("礼包内容"); + holder.newsTitle.setText("礼包内容"); TextView textView = new TextView(mContext); textView.setTextColor(Color.parseColor("#717171")); textView.setText(Html.fromHtml(mLibaoEntity.getContent())); - holder.gamedetail_item_news_list.addView(textView); + holder.newsList.addView(textView); } else if (mLibaoDetailEntity != null && position == 2) { - holder.gamedetail_item_news_title.setText("领取规则"); + holder.newsTitle.setText("领取规则"); if (mLibaoDetailEntity.getInstallRequired()) { TextView textView = new TextView(mContext); @@ -325,7 +325,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { } textView.setText(content); - holder.gamedetail_item_news_list.addView(textView); + holder.newsList.addView(textView); } if (mLibaoDetailEntity.getTime() != null) { @@ -336,7 +336,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { TextView tvTime = new TextView(mContext); tvTime.setTextColor(Color.parseColor("#717171")); tvTime.setText(StringUtils.buildString("领取时间：", start, " - ", end)); - holder.gamedetail_item_news_list.addView(tvTime); + holder.newsList.addView(tvTime); } int repeat = mLibaoEntity.getRepeat(); @@ -344,14 +344,14 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { TextView tvRepeat = new TextView(mContext); tvRepeat.setTextColor(Color.parseColor("#717171")); tvRepeat.setText(StringUtils.buildString("领取次数：每人最多可以领取", String.valueOf(repeat), "次（每天0点刷新）")); - holder.gamedetail_item_news_list.addView(tvRepeat); + holder.newsList.addView(tvRepeat); } } else if (mLibaoDetailEntity.getDes() != null && position == getItemCount() - 2) { - holder.gamedetail_item_news_title.setText("使用说明"); + holder.newsTitle.setText("使用说明"); TextView desTv = new TextView(mContext); desTv.setTextColor(Color.parseColor("#717171")); desTv.setText(Html.fromHtml(mLibaoDetailEntity.getDes())); - holder.gamedetail_item_news_list.addView(desTv); + holder.newsList.addView(desTv); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailIntroViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailIntroViewHolder.java index 296cd8a319..78a672ffd2 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailIntroViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailIntroViewHolder.java @@ -15,9 +15,9 @@ import butterknife.BindView; public class GameDetailIntroViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_item_intro_gallery) - public RecyclerView gamedetail_item_intro_gallery; + public RecyclerView introGallery; @BindView(R.id.gamedetail_item_intro_content) - public TextView gamedetail_item_intro_content; + public TextView introContent; public GameDetailIntroViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsServerItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsServerItemViewHolder.java index 42605d74c8..6cf9670194 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsServerItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsServerItemViewHolder.java @@ -15,13 +15,13 @@ import butterknife.BindView; public class GameDetailNewsServerItemViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.newsserver_item_name) - public TextView newsserver_item_name; + public TextView newsserverName; @BindView(R.id.newsserver_item_line) - public View newsserver_item_line; + public View newsserverLine; @BindView(R.id.newsserver_item_point) - public ImageView newsserver_item_point; + public ImageView newsserverPoint; @BindView(R.id.newsserver_item_time) - public TextView newsserver_item_time; + public TextView newsserverTime; public GameDetailNewsServerItemViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java index df80fe41eb..05c42b2abb 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java @@ -15,15 +15,15 @@ import butterknife.BindView; public class GameDetailNewsViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_item_news_more) - public LinearLayout gamedetail_item_news_more; + public LinearLayout newsMore; @BindView(R.id.gamedetail_item_news_list) - public LinearLayout gamedetail_item_news_list; + public LinearLayout newsList; @BindView(R.id.gamedetail_item_news_title) - public TextView gamedetail_item_news_title; + public TextView newsTitle; @BindView(R.id.gamedetail_item_line) - public View gamedetail_item_line; + public View newsLine; @BindView(R.id.gamedetail_item_news_line_top) - public View gamedetail_item_news_line_top; + public View newsLineTop; public GameDetailNewsViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailTopViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailTopViewHolder.java index 5c2f81afcf..bf4bbcaa37 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailTopViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailTopViewHolder.java @@ -15,13 +15,13 @@ import butterknife.BindView; public class GameDetailTopViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_iv_thumb) - public SimpleDraweeView gamedetail_iv_thumb; + public SimpleDraweeView gamedetailThumb; @BindView(R.id.gamedetail_tv_name) - public TextView gamedetail_tv_name; + public TextView gamedetailName; @BindView(R.id.gamedetail_tv_info) - public TextView gamedetail_tv_info; + public TextView gamedetailInfo; @BindView(R.id.gamedetail_tv_concern) - public TextView gamedetail_tv_concern; + public TextView gamedetailConcern; public GameDetailTopViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java index d0a11c8a24..f3c9c6a77e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java @@ -17,28 +17,28 @@ import butterknife.BindView; public class GameDownloadViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.dm_item_iv_icon) - public SimpleDraweeView dm_item_iv_icon; + public SimpleDraweeView dmIcon; @BindView(R.id.dm_item_tv_title) - public TextView dm_item_tv_title; + public TextView dmTitle; @BindView(R.id.dm_item_tv_downloads) - public TextView dm_item_tv_downloads; + public TextView dmDownloads; @BindView(R.id.dm_item_iv_delete) - public ImageView dm_item_iv_delete; + public ImageView dmDelete; @BindView(R.id.dm_item_tv_speed) - public TextView dm_item_tv_speed; + public TextView dmSpeed; @BindView(R.id.dm_item_progressbar) - public ProgressBar dm_item_progressbar; + public ProgressBar dmProgressbar; @BindView(R.id.dm_item_tv_startorpause) - public TextView dm_item_tv_startorpause; + public TextView dmStartorpause; @BindView(R.id.dm_item_line) - public View dm_item_line; + public View dmLine; public GameDownloadViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameGalleryViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameGalleryViewHolder.java index de33717a8d..210561c5e3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameGalleryViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameGalleryViewHolder.java @@ -14,7 +14,7 @@ import butterknife.BindView; public class GameGalleryViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.screenshot_item_iv) - public SimpleDraweeView screenshot_item_iv; + public SimpleDraweeView screenshotIv; public GameGalleryViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java index 4e110b8598..199af7d4ee 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java @@ -15,9 +15,9 @@ import butterknife.BindView; public class GameNewsSearchViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.game_news_et_search) - public EditText game_news_et_search; + public EditText searchEt; @BindView(R.id.game_news_tv_search) - public TextView game_news_tv_search; + public TextView searchTv; public GameNewsSearchViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java index 39af1b764b..4a1d08ee9e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java @@ -14,7 +14,7 @@ import butterknife.BindView; public class GameNewsTypeListViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.game_news_type_list) - public RecyclerView game_news_type_list; + public RecyclerView typeList; public GameNewsTypeListViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java index 471d3a1604..d1b54de8c3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java @@ -14,7 +14,7 @@ import butterknife.BindView; public class GameNewsTypeViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.game_news_type_list_tv_type) - public TextView game_news_type_list_tv_type; + public TextView listTypeTv; public GameNewsTypeViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java index 53c3f0e2f4..2635ab5c33 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java @@ -15,19 +15,19 @@ import butterknife.BindView; public class GameUpdateViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gu_item_iv_icon) - public SimpleDraweeView gu_item_iv_icon; + public SimpleDraweeView guIcon; @BindView(R.id.gu_item_tv_name) - public TextView gu_item_tv_name; + public TextView guName; @BindView(R.id.gu_item_tv_current) - public TextView gu_item_tv_current; + public TextView guCurrent; @BindView(R.id.gu_item_tv_new) - public TextView gu_item_tv_new; + public TextView guNew; @BindView(R.id.gu_item_btv_update) - public TextView gu_item_btv_update; + public TextView guUpdate; public GameUpdateViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java index d8dd7c4c62..49d553101d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java @@ -14,9 +14,9 @@ import butterknife.BindView; public class SearchHistoryViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.search_history_line) - public View search_history_line; + public View searchHistoryLine; @BindView(R.id.search_history_name) - public TextView search_history_name; + public TextView searchHistoryName; public SearchHistoryViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 4d3b3f5733..9ddde852ea 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -67,8 +67,6 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { private String url; - private int cardMargin; - GameDownloadFragmentAdapter(Context context, LinearLayout textView, String url) { super(context); @@ -83,8 +81,6 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { downloadingList = new ArrayList<>(); doneList = new ArrayList<>(); - - cardMargin = (int) context.getResources().getDimension(R.dimen.cardview_margin); } @Override @@ -111,16 +107,16 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // 最后一个 if (position == doneList.size() && downloadingList.size() != 0) { - viewHolder.dm_item_line.setVisibility(View.GONE); + viewHolder.dmLine.setVisibility(View.GONE); } else { - viewHolder.dm_item_line.setVisibility(View.VISIBLE); + viewHolder.dmLine.setVisibility(View.VISIBLE); } } else if (doneList.isEmpty()) { downloadEntity = downloadingList.get(position - 1); - viewHolder.dm_item_line.setVisibility(View.VISIBLE); + viewHolder.dmLine.setVisibility(View.VISIBLE); } else { downloadEntity = downloadingList.get(position - doneList.size() - 2); - viewHolder.dm_item_line.setVisibility(View.VISIBLE); + viewHolder.dmLine.setVisibility(View.VISIBLE); } String icon = downloadEntity.getIcon(); @@ -136,29 +132,29 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { appInfo.sourceDir = apkPath; appInfo.publicSourceDir = apkPath; Bitmap bitmap = BitmapUtils.drawableToBitmap(appInfo.loadIcon(pm)); - viewHolder.dm_item_iv_icon.setImageBitmap(bitmap); + viewHolder.dmIcon.setImageBitmap(bitmap); } } catch (JSONException e) { e.printStackTrace(); } } else if (!TextUtils.isEmpty(icon)) { -// viewHolder.dm_item_iv_icon.setImageURI(icon); - ImageUtils.display(viewHolder.dm_item_iv_icon, icon); +// viewHolder.dmIcon.setImageURI(icon); + ImageUtils.display(viewHolder.dmIcon, icon); } else { - viewHolder.dm_item_iv_icon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); + viewHolder.dmIcon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); } if (downloadEntity.getName().contains("光环助手") || !downloadEntity.isPlugin()) { - viewHolder.dm_item_tv_title.setText(downloadEntity.getName()); + viewHolder.dmTitle.setText(downloadEntity.getName()); } else { String platform = downloadEntity.getPlatform(); platform = PlatformUtils.getInstance(mContext).getPlatformName(platform); if (platform == null) { - viewHolder.dm_item_tv_title.setText(downloadEntity.getName()); + viewHolder.dmTitle.setText(downloadEntity.getName()); } else { - viewHolder.dm_item_tv_title.setText(downloadEntity.getName() + " - " + platform); + viewHolder.dmTitle.setText(downloadEntity.getName() + " - " + platform); } } @@ -166,62 +162,62 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { if (status.equals(DownloadStatus.done)) { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - viewHolder.dm_item_tv_downloads.setLayoutParams(lparams); - viewHolder.dm_item_tv_downloads.setTextColor(0xFF9A9A9A); - viewHolder.dm_item_tv_downloads.setText("下载完成"); - viewHolder.dm_item_iv_delete.setVisibility(View.VISIBLE); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(0xFF9A9A9A); + viewHolder.dmDownloads.setText("下载完成"); + viewHolder.dmDelete.setVisibility(View.VISIBLE); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); if (downloadEntity.isPluggable() && PackageManager.isInstalled(downloadEntity.getPackageName())) { - viewHolder.dm_item_tv_startorpause.setText("安装"); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + viewHolder.dmStartorpause.setText("安装"); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else { - viewHolder.dm_item_tv_startorpause.setText("安装"); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.dmStartorpause.setText("安装"); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); } - viewHolder.dm_item_tv_speed.setText(R.string.hundred_percent); + viewHolder.dmSpeed.setText(R.string.hundred_percent); } else if (status.equals(DownloadStatus.downloading)) { if (!"pause".equals(statusMap.get(downloadEntity.getUrl()))) { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( 0, LinearLayout.LayoutParams.WRAP_CONTENT); lparams.weight = 4; - viewHolder.dm_item_tv_downloads.setLayoutParams(lparams); - viewHolder.dm_item_tv_downloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); - viewHolder.dm_item_tv_downloads.setText(String.format("%s(剩%s)", + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dmDownloads.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); - viewHolder.dm_item_iv_delete.setVisibility(View.GONE); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); - viewHolder.dm_item_tv_startorpause.setText("暂停"); - viewHolder.dm_item_tv_speed.setText(downloadEntity.getPercent() + "%"); + viewHolder.dmDelete.setVisibility(View.GONE); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setText("暂停"); + viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); } } else if (status.equals(DownloadStatus.waiting)) { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - viewHolder.dm_item_tv_downloads.setLayoutParams(lparams); - viewHolder.dm_item_tv_downloads.setTextColor(0xFF9A9A9A); - viewHolder.dm_item_tv_downloads.setText("等待中"); - viewHolder.dm_item_iv_delete.setVisibility(View.VISIBLE); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); - viewHolder.dm_item_tv_startorpause.setText("等待"); - viewHolder.dm_item_tv_speed.setText(downloadEntity.getPercent() + "%"); + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(0xFF9A9A9A); + viewHolder.dmDownloads.setText("等待中"); + viewHolder.dmDelete.setVisibility(View.VISIBLE); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setText("等待"); + viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); } else if (status.equals(DownloadStatus.pause) || status.equals(DownloadStatus.timeout) || status.equals(DownloadStatus.neterror)) { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - viewHolder.dm_item_tv_downloads.setLayoutParams(lparams); - viewHolder.dm_item_tv_downloads.setTextColor(0xFF9A9A9A); - viewHolder.dm_item_tv_downloads.setText("已暂停"); - viewHolder.dm_item_iv_delete.setVisibility(View.VISIBLE); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); - viewHolder.dm_item_tv_startorpause.setText("继续"); - viewHolder.dm_item_tv_speed.setText(downloadEntity.getPercent() + "%"); + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(0xFF9A9A9A); + viewHolder.dmDownloads.setText("已暂停"); + viewHolder.dmDelete.setVisibility(View.VISIBLE); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.dmStartorpause.setText("继续"); + viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); } - viewHolder.dm_item_progressbar.setProgress((int) (downloadEntity.getPercent() * 10)); + viewHolder.dmProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); - viewHolder.dm_item_tv_startorpause.setOnClickListener(new View.OnClickListener() { + viewHolder.dmStartorpause.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { String str = ((TextView) v).getText().toString(); @@ -234,16 +230,16 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( 0, LinearLayout.LayoutParams.WRAP_CONTENT); lparams.weight = 4; - viewHolder.dm_item_tv_downloads.setLayoutParams(lparams); - viewHolder.dm_item_tv_downloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); - viewHolder.dm_item_tv_downloads.setText(String.format("%s(剩%s)", + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dmDownloads.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); - viewHolder.dm_item_iv_delete.setVisibility(View.GONE); + viewHolder.dmDelete.setVisibility(View.GONE); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); - viewHolder.dm_item_tv_startorpause.setText("暂停"); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setText("暂停"); statusMap.put(url, "downloading"); notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size()); @@ -259,16 +255,16 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( 0, LinearLayout.LayoutParams.WRAP_CONTENT); lparams.weight = 4; - viewHolder.dm_item_tv_downloads.setLayoutParams(lparams); - viewHolder.dm_item_tv_downloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); - viewHolder.dm_item_tv_downloads.setText(String.format("%s(剩%s)", + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dmDownloads.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); - viewHolder.dm_item_iv_delete.setVisibility(View.GONE); + viewHolder.dmDelete.setVisibility(View.GONE); - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); - viewHolder.dm_item_tv_startorpause.setText("暂停"); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setText("暂停"); statusMap.put(url, "downloading"); notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size()); @@ -300,14 +296,14 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } break; case "暂停": - viewHolder.dm_item_tv_startorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); - viewHolder.dm_item_tv_startorpause.setText("继续"); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.dmStartorpause.setText("继续"); LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - viewHolder.dm_item_tv_downloads.setLayoutParams(lparams); - viewHolder.dm_item_tv_downloads.setTextColor(0xFF9A9A9A); - viewHolder.dm_item_tv_downloads.setText("已暂停"); - viewHolder.dm_item_iv_delete.setVisibility(View.VISIBLE); + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(0xFF9A9A9A); + viewHolder.dmDownloads.setText("已暂停"); + viewHolder.dmDelete.setVisibility(View.VISIBLE); statusMap.put(url, "pause"); notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size()); Message msg = Message.obtain(); @@ -329,19 +325,19 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } }); - viewHolder.dm_item_tv_downloads.setOnClickListener(new View.OnClickListener() { + viewHolder.dmDownloads.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (viewHolder.dm_item_iv_delete.getVisibility() == View.VISIBLE) { + if (viewHolder.dmDelete.getVisibility() == View.VISIBLE) { showDeleteDialog(downloadEntity, viewHolder.getPosition()); } } }); - viewHolder.dm_item_iv_delete.setOnClickListener(new View.OnClickListener() { + viewHolder.dmDelete.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (viewHolder.dm_item_iv_delete.getVisibility() == View.VISIBLE) { + if (viewHolder.dmDelete.getVisibility() == View.VISIBLE) { showDeleteDialog(downloadEntity, viewHolder.getPosition()); } } @@ -355,7 +351,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.itemView.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { - if (viewHolder.dm_item_iv_delete.getVisibility() == View.VISIBLE) { + if (viewHolder.dmDelete.getVisibility() == View.VISIBLE) { showDeleteDialog(downloadEntity, viewHolder.getPosition()); return true; } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index a1b831db8f..96b0e54885 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -377,44 +377,44 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { // } if (updateEntity.getName().contains("光环助手")) { - viewHolder.gu_item_iv_icon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); + viewHolder.guIcon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); } else { -// viewHolder.gu_item_iv_icon.setImageURI(updateEntity.getIcon()); - ImageUtils.display(viewHolder.gu_item_iv_icon, updateEntity.getIcon()); +// viewHolder.guIcon.setImageURI(updateEntity.getIcon()); + ImageUtils.display(viewHolder.guIcon, updateEntity.getIcon()); } final String platform = PlatformUtils.getInstance(mContext) .getPlatformName(updateEntity.getPlatform()); if (platform == null || "官方版".equals(platform)) { - viewHolder.gu_item_tv_name.setText(updateEntity.getName()); + viewHolder.guName.setText(updateEntity.getName()); } else { - viewHolder.gu_item_tv_name.setText(updateEntity.getName() + " - " + platform); + viewHolder.guName.setText(updateEntity.getName() + " - " + platform); } String currentVersion = PackageUtils.getVersionByPackage( mContext, updateEntity.getPackageName()); if (TextUtils.isEmpty(currentVersion)) { - viewHolder.gu_item_tv_current.setText("当前：无"); + viewHolder.guCurrent.setText("当前：无"); } else { - viewHolder.gu_item_tv_current.setText(StringUtils.buildString("当前：V", currentVersion)); + viewHolder.guCurrent.setText(StringUtils.buildString("当前：V", currentVersion)); } - viewHolder.gu_item_tv_new.setText(StringUtils.buildString("新版：V", updateEntity.getVersion(), " | ", updateEntity.getSize())); + viewHolder.guNew.setText(StringUtils.buildString("新版：V", updateEntity.getVersion(), " | ", updateEntity.getSize())); - viewHolder.gu_item_btv_update.setOnClickListener(new View.OnClickListener() { + viewHolder.guUpdate.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - final String str = viewHolder.gu_item_btv_update.getText().toString(); + final String str = viewHolder.guUpdate.getText().toString(); if ("更新".equals(str) || "插件化".equals(str)) { if (NetworkUtils.isWifiConnected(mContext)) { if ("插件化".equals(str)) { - viewHolder.gu_item_btv_update.setText("插件化中"); - viewHolder.gu_item_btv_update.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_plugining_style)); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_plugining_style); + viewHolder.guUpdate.setText("插件化中"); + viewHolder.guUpdate.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_plugining_style)); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { - viewHolder.gu_item_btv_update.setText("更新中"); - viewHolder.gu_item_btv_update.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_downloading_style)); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_downloading_style); + viewHolder.guUpdate.setText("更新中"); + viewHolder.guUpdate.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_downloading_style)); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_downloading_style); } addUpdateDownload(viewHolder.getPosition() - 1); @@ -425,13 +425,13 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { @Override public void onConfirm() { if ("插件化".equals(str)) { - viewHolder.gu_item_btv_update.setText("插件化中"); - viewHolder.gu_item_btv_update.setTextColor(0xFF06D0A8); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_plugining_style); + viewHolder.guUpdate.setText("插件化中"); + viewHolder.guUpdate.setTextColor(0xFF06D0A8); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { - viewHolder.gu_item_btv_update.setText("更新中"); - viewHolder.gu_item_btv_update.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_downloading_style); + viewHolder.guUpdate.setText("更新中"); + viewHolder.guUpdate.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_downloading_style); } addUpdateDownload(viewHolder.getPosition() - 1); @@ -457,47 +457,47 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { DownloadEntity downloadEntity = DownloadManager.getInstance(mContext).get(updateEntity.getUrl()); if (downloadEntity == null) { if (PackageManager.isCanUpdate(updateEntity.getId(), updateEntity.getPackageName())) { - viewHolder.gu_item_btv_update.setText("更新"); - viewHolder.gu_item_btv_update.setTextColor(Color.WHITE); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.guUpdate.setText("更新"); + viewHolder.guUpdate.setTextColor(Color.WHITE); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_download_style); } else if (updateEntity.isPluggable()) { - viewHolder.gu_item_btv_update.setText("插件化"); - viewHolder.gu_item_btv_update.setTextColor(Color.WHITE); + viewHolder.guUpdate.setText("插件化"); + viewHolder.guUpdate.setTextColor(Color.WHITE); downloadEntity = DownloadManager.getInstance(mContext).getByPackage( updateEntity.getPackageName()); if (downloadEntity == null || downloadEntity.getUrl().equals(updateEntity.getUrl())) { - viewHolder.gu_item_btv_update.setClickable(true); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + viewHolder.guUpdate.setClickable(true); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else { - viewHolder.gu_item_btv_update.setClickable(false); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_pause_up); + viewHolder.guUpdate.setClickable(false); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_pause_up); } } else { - viewHolder.gu_item_btv_update.setText("启动"); - viewHolder.gu_item_btv_update.setTextColor(Color.WHITE); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_launch_style); + viewHolder.guUpdate.setText("启动"); + viewHolder.guUpdate.setTextColor(Color.WHITE); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_launch_style); } } else { if (updateEntity.isPluggable()) { - viewHolder.gu_item_btv_update.setText("插件化中"); - viewHolder.gu_item_btv_update.setTextColor( + viewHolder.guUpdate.setText("插件化中"); + viewHolder.guUpdate.setTextColor( ContextCompat.getColorStateList(mContext, R.color.text_plugining_style)); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_plugining_style); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { - viewHolder.gu_item_btv_update.setText("更新中"); - viewHolder.gu_item_btv_update.setTextColor( + viewHolder.guUpdate.setText("更新中"); + viewHolder.guUpdate.setTextColor( ContextCompat.getColorStateList(mContext, R.color.text_downloading_style)); - viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_downloading_style); + viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_downloading_style); } } if (packageName != null) { // 插件跳转游戏更新页面造成闪退，可能是页面未绘制完成点击造成的闪退 - viewHolder.gu_item_btv_update.post(new Runnable() { + viewHolder.guUpdate.post(new Runnable() { @Override public void run() { - viewHolder.gu_item_btv_update.performClick(); + viewHolder.guUpdate.performClick(); } }); packageName = null; diff --git a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java index 9eeeef4aff..1a2313a580 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java @@ -39,9 +39,14 @@ import java.util.List; */ public class GameFragment extends SearchToolbarFragment implements SwipeRefreshLayout.OnRefreshListener, OnRequestCallBackListener { - private SwipeRefreshLayout fm_game_swipe_refresh; - private RecyclerView fm_game_rv_list; + private SwipeRefreshLayout mGameSwipeRefresh; + private RecyclerView mGameRv; private GameFragmentAdapter adapter; + private LinearLayout mReuseNoConn; + private ProgressBarCircularIndeterminate mGameLoading; + + private boolean isEverpause; + Runnable initPluginRunnable = new Runnable() { @Override public void run() { @@ -52,22 +57,20 @@ public class GameFragment extends SearchToolbarFragment implements SwipeRefreshL } } }; + Runnable runnable = new Runnable() { @Override public void run() { - adapter = new GameFragmentAdapter(GameFragment.this, fm_game_swipe_refresh); - fm_game_rv_list.setAdapter(adapter); + adapter = new GameFragmentAdapter(GameFragment.this, mGameSwipeRefresh); + mGameRv.setAdapter(adapter); // adapter.initSlide(true); } }; - private LinearLayout reuse_no_connection; - private ProgressBarCircularIndeterminate fm_game_pb_loading; - private boolean isEverpause; - private int adapterPosition = -1; + private DataWatcher dataWatcher = new DataWatcher() { @Override public void onDataChanged(DownloadEntity downloadEntity) { - if (!fm_game_swipe_refresh.isRefreshing()) { + if (!mGameSwipeRefresh.isRefreshing()) { ArrayList locationList = adapter.getLocationMap().get(downloadEntity.getPackageName()); if (locationList != null && locationList.size() != 0) { GameEntity gameEntity; @@ -92,32 +95,32 @@ public class GameFragment extends SearchToolbarFragment implements SwipeRefreshL protected void initView(final View view) { super.initView(view); - reuse_no_connection = (LinearLayout) view.findViewById(R.id.reuse_no_connection); - fm_game_swipe_refresh = (SwipeRefreshLayout) view.findViewById(R.id.fm_game_swipe_refresh); - fm_game_rv_list = (RecyclerView) view.findViewById(R.id.fm_game_rv_list); - fm_game_pb_loading = (ProgressBarCircularIndeterminate) view.findViewById(R.id.fm_game_pb_loading); + mReuseNoConn = (LinearLayout) view.findViewById(R.id.reuse_no_connection); + mGameSwipeRefresh = (SwipeRefreshLayout) view.findViewById(R.id.fm_game_swipe_refresh); + mGameRv = (RecyclerView) view.findViewById(R.id.fm_game_rv_list); + mGameLoading = (ProgressBarCircularIndeterminate) view.findViewById(R.id.fm_game_pb_loading); - reuse_no_connection.setOnClickListener(new View.OnClickListener() { + mReuseNoConn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - fm_game_swipe_refresh.setRefreshing(true); - fm_game_rv_list.setVisibility(View.VISIBLE); - fm_game_pb_loading.setVisibility(View.VISIBLE); - reuse_no_connection.setVisibility(View.GONE); + mGameSwipeRefresh.setRefreshing(true); + mGameRv.setVisibility(View.VISIBLE); + mGameLoading.setVisibility(View.VISIBLE); + mReuseNoConn.setVisibility(View.GONE); view.postDelayed(runnable, 1000); } }); - fm_game_swipe_refresh.setColorSchemeResources(R.color.theme); - fm_game_swipe_refresh.setOnRefreshListener(this); + mGameSwipeRefresh.setColorSchemeResources(R.color.theme); + mGameSwipeRefresh.setOnRefreshListener(this); - ((DefaultItemAnimator) fm_game_rv_list.getItemAnimator()).setSupportsChangeAnimations(false); - fm_game_rv_list.setHasFixedSize(true); - fm_game_rv_list.setLayoutManager(new LinearLayoutManager(getActivity())); - adapter = new GameFragmentAdapter(this, fm_game_swipe_refresh); - fm_game_rv_list.setAdapter(adapter); + ((DefaultItemAnimator) mGameRv.getItemAnimator()).setSupportsChangeAnimations(false); + mGameRv.setHasFixedSize(true); + mGameRv.setLayoutManager(new LinearLayoutManager(getActivity())); + adapter = new GameFragmentAdapter(this, mGameSwipeRefresh); + mGameRv.setAdapter(adapter); - fm_game_rv_list.addOnScrollListener(new RecyclerView.OnScrollListener() { + mGameRv.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrollStateChanged(RecyclerView recyclerView, int newState) { if (newState == RecyclerView.SCROLL_STATE_IDLE) { @@ -164,11 +167,11 @@ public class GameFragment extends SearchToolbarFragment implements SwipeRefreshL @Override public void loadDone() { - if (fm_game_swipe_refresh != null && fm_game_swipe_refresh.isRefreshing()) { - fm_game_swipe_refresh.setRefreshing(false); + if (mGameSwipeRefresh != null && mGameSwipeRefresh.isRefreshing()) { + mGameSwipeRefresh.setRefreshing(false); } - if (fm_game_pb_loading != null && fm_game_pb_loading.getVisibility() == View.VISIBLE) { - fm_game_pb_loading.setVisibility(View.GONE); + if (mGameLoading != null && mGameLoading.getVisibility() == View.VISIBLE) { + mGameLoading.setVisibility(View.GONE); } } @@ -179,9 +182,9 @@ public class GameFragment extends SearchToolbarFragment implements SwipeRefreshL @Override public void loadError() { - fm_game_rv_list.setVisibility(View.GONE); - fm_game_pb_loading.setVisibility(View.GONE); - reuse_no_connection.setVisibility(View.VISIBLE); + mGameRv.setVisibility(View.GONE); + mGameLoading.setVisibility(View.GONE); + mReuseNoConn.setVisibility(View.VISIBLE); } @Override @@ -251,11 +254,11 @@ public class GameFragment extends SearchToolbarFragment implements SwipeRefreshL @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBNetworkState busNetworkState) { if (busNetworkState.isNetworkConnected()) { - if (reuse_no_connection.getVisibility() == View.VISIBLE) { - fm_game_swipe_refresh.setRefreshing(true); - fm_game_rv_list.setVisibility(View.VISIBLE); - fm_game_pb_loading.setVisibility(View.GONE); - reuse_no_connection.setVisibility(View.GONE); + if (mReuseNoConn.getVisibility() == View.VISIBLE) { + mGameSwipeRefresh.setRefreshing(true); + mGameRv.setVisibility(View.VISIBLE); + mGameLoading.setVisibility(View.GONE); + mReuseNoConn.setVisibility(View.GONE); view.postDelayed(runnable, 1000); } else if (adapter.isNetworkError()) { adapter.setNetworkError(false); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index 766d5be493..c18265f9c1 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -460,10 +460,10 @@ public class FuLiAdapter extends BaseRecyclerAdapter { private void initNewsViewHolder(GameDetailNewsViewHolder viewHolder) { if (mGameDetailEntity.getNews().size() < 3) { - viewHolder.gamedetail_item_news_more.setVisibility(View.GONE); + viewHolder.newsMore.setVisibility(View.GONE); } else { - viewHolder.gamedetail_item_news_more.setVisibility(View.VISIBLE); - viewHolder.gamedetail_item_news_more.setOnClickListener(new View.OnClickListener() { + viewHolder.newsMore.setVisibility(View.VISIBLE); + viewHolder.newsMore.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (mGameDetailEntity.getArticleTypes() != null @@ -484,7 +484,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { }); } final List newsList = mGameDetailEntity.getNews(); - int childCount = viewHolder.gamedetail_item_news_list.getChildCount(); + int childCount = viewHolder.newsList.getChildCount(); if (childCount == 0) { for (int i = 0, size = newsList.size(); i < size; i++) { View view = mLayoutInflater.inflate(R.layout.gamedetail_news_item, null); @@ -519,7 +519,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, entrance + "+(游戏详情[" + mGameEntity.getName() + "]:资讯攻略-列表[" + (ii + 1) + "])"); } }); - viewHolder.gamedetail_item_news_list.addView(view); + viewHolder.newsList.addView(view); } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java index c533ff3680..8385529040 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java @@ -44,20 +44,20 @@ public class GameDetailNewsServerAdapter extends BaseRecyclerAdapter { @Override public void onBindViewHolder(final GameGalleryViewHolder holder, int position) { // holder.screenshot_item_iv.setImageURI(gallery.get(position)); - ImageUtils.display(holder.screenshot_item_iv, gallery.get(position)); + ImageUtils.display(holder.screenshotIv, gallery.get(position)); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java index 945bec0f7a..d7a8c886f0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -451,21 +451,21 @@ public class XinXiAdapter extends BaseRecyclerAdapter { } private void initIntroViewHolder(GameDetailIntroViewHolder viewHolder) { - viewHolder.gamedetail_item_intro_gallery.setNestedScrollingEnabled(false); - if (viewHolder.gamedetail_item_intro_gallery.getAdapter() == null) { - viewHolder.gamedetail_item_intro_gallery.setHasFixedSize(true); - viewHolder.gamedetail_item_intro_gallery.setLayoutManager( + viewHolder.introGallery.setNestedScrollingEnabled(false); + if (viewHolder.introGallery.getAdapter() == null) { + viewHolder.introGallery.setHasFixedSize(true); + viewHolder.introGallery.setLayoutManager( new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); - viewHolder.gamedetail_item_intro_gallery.setAdapter( + viewHolder.introGallery.setAdapter( new GameGalleryAdapter(mContext, mGameDetailEntity.getGallery(), StringUtils.buildString(mEntrance, "+(游戏详情[", mGameEntity.getName(), "]:游戏介绍)"))); - viewHolder.gamedetail_item_intro_gallery.addItemDecoration( + viewHolder.introGallery.addItemDecoration( new HorizontalItemDecoration(mContext, 1, mGameDetailEntity.getGallery().size())); } if (TextUtils.isEmpty(mGameDetailEntity.getDes())) { - viewHolder.gamedetail_item_intro_content.setText(""); + viewHolder.introContent.setText(""); } else { - viewHolder.gamedetail_item_intro_content.setText(mGameDetailEntity.getDes()); + viewHolder.introContent.setText(mGameDetailEntity.getDes()); } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index 8ce6eb91b1..fdd8b69aaa 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -58,7 +58,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { private OnRequestCallBackListener mCallBackListener; private List mLibaoList; - private List gameIdList; + private List mGameIdList; private boolean isLoading; private boolean isOver; @@ -82,7 +82,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { mEntrance = entrance; mLibaoList = new ArrayList<>(); - gameIdList = new ArrayList<>(); + mGameIdList = new ArrayList<>(); mLibaoDao = new LibaoDao(mContext); @@ -111,11 +111,11 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { subscriber.onNext(null); } else { for (ConcernInfo concernInfo : concernList) { - gameIdList.add(concernInfo.getId()); + mGameIdList.add(concernInfo.getId()); } // 对数据进行排序 - Collections.sort(gameIdList, new Comparator() { + Collections.sort(mGameIdList, new Comparator() { @Override public int compare(String lhs, String rhs) { return lhs.compareTo(rhs); @@ -124,10 +124,10 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { StringBuilder keyBuilder = new StringBuilder(); StringBuilder idsBuilder = new StringBuilder(); - for (int i = 0; i < gameIdList.size(); i++) { - keyBuilder.append(gameIdList.get(i)); + for (int i = 0; i < mGameIdList.size(); i++) { + keyBuilder.append(mGameIdList.get(i)); if (i < 3) { - idsBuilder.append(gameIdList.get(i)); + idsBuilder.append(mGameIdList.get(i)); idsBuilder.append("-"); } } @@ -191,7 +191,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { public void onFailure(HttpException e) { if (e != null && e.code() == 409) { addLibaoListById(offset); - ConcernUtils.updateConcernData(mContext, new JSONArray(gameIdList)); + ConcernUtils.updateConcernData(mContext, new JSONArray(mGameIdList)); return; } mCallBackListener.loadError(); diff --git a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java index f55806823d..cc960676cf 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java @@ -61,8 +61,6 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { private int itemCount; - private int cardMargin; - private boolean isLoading; private boolean isOver; private boolean isNetworkError; @@ -79,8 +77,6 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { isLoading = false; isOver = false; isNetworkError = false; - - cardMargin = (int) mContext.getResources().getDimension(R.dimen.cardview_margin); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index ab1552b02e..6308af04cd 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -329,31 +329,31 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void initGameDetailTopViewHolder(GameDetailTopViewHolder viewHolder) { -// viewHolder.gamedetail_iv_thumb.setImageURI(mGameEntity.getIcon()); - ImageUtils.display(viewHolder.gamedetail_iv_thumb, mGameEntity.getIcon()); - viewHolder.gamedetail_tv_name.setText(mGameEntity.getName()); +// viewHolder.gamedetailThumb.setImageURI(mGameEntity.getIcon()); + ImageUtils.display(viewHolder.gamedetailThumb, mGameEntity.getIcon()); + viewHolder.gamedetailName.setText(mGameEntity.getName()); if (mGameEntity.getApk() != null && mGameEntity.getApk().size() != 0) { for (int i = 0, size = mGameEntity.getApk().size(); i < size; i++) { ApkEntity apkEntity = mGameEntity.getApk().get(i); if ("9u".equals(apkEntity.getPlatform())) { - viewHolder.gamedetail_tv_info.setText(String.format("V%s | %s", apkEntity.getVersion(), apkEntity.getSize())); + viewHolder.gamedetailInfo.setText(String.format("V%s | %s", apkEntity.getVersion(), apkEntity.getSize())); break; } if (i == size - 1) { - viewHolder.gamedetail_tv_info.setText(String.format("V%s | %s", apkEntity.getVersion(), apkEntity.getSize())); + viewHolder.gamedetailInfo.setText(String.format("V%s | %s", apkEntity.getVersion(), apkEntity.getSize())); } } } if (mConcernManager.isConcern(mGameEntity.getId())) { - viewHolder.gamedetail_tv_concern.setText("取消关注"); - viewHolder.gamedetail_tv_concern.setBackgroundResource(R.drawable.border_red_bg); - viewHolder.gamedetail_tv_concern.setTextColor(Color.parseColor("#ff4147")); + viewHolder.gamedetailConcern.setText("取消关注"); + viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.border_red_bg); + viewHolder.gamedetailConcern.setTextColor(Color.parseColor("#ff4147")); } else { - viewHolder.gamedetail_tv_concern.setText("关注"); - viewHolder.gamedetail_tv_concern.setBackgroundResource(R.drawable.textview_concern_red_style); - viewHolder.gamedetail_tv_concern.setTextColor(Color.WHITE); + viewHolder.gamedetailConcern.setText("关注"); + viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.textview_concern_red_style); + viewHolder.gamedetailConcern.setTextColor(Color.WHITE); } - viewHolder.gamedetail_tv_concern.setOnClickListener(new View.OnClickListener() { + viewHolder.gamedetailConcern.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { final TextView concern = ((TextView) v); 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 bbc7e293ce..da02bf406c 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -50,8 +50,6 @@ class ConcernFragmentAdapter extends BaseRecyclerAdapter { private List concernList; private List gameList; - private int cardMargin; - //下载用到的map private ArrayMap> locationMap; @@ -66,8 +64,6 @@ class ConcernFragmentAdapter extends BaseRecyclerAdapter { locationMap = new ArrayMap<>(); - cardMargin = (int) mContext.getResources().getDimension(R.dimen.cardview_margin); - ConcernManager concernManager = new ConcernManager(mContext); concernList = concernManager.getConcernGame(); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 4e1a30daf5..96a549d64c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -201,8 +201,8 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { } else if (holder instanceof SearchHistoryViewHolder) { SearchHistoryViewHolder viewHolder = (SearchHistoryViewHolder) holder; - viewHolder.search_history_name.setText(gameEntity.getName()); - viewHolder.search_history_line.setVisibility(View.GONE); + viewHolder.searchHistoryName.setText(gameEntity.getName()); + viewHolder.searchHistoryLine.setVisibility(View.GONE); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b0adb442b3..2d377dbeef 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,9 +5,6 @@ 6dp - - 9dp - 55dp