diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index d5405a3360..51e73fdfdc 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -31,9 +31,9 @@ import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; -import java.lang.reflect.Field; import java.util.ArrayList; +import butterknife.ButterKnife; import de.greenrobot.event.EventBus; public class BaseActivity extends Activity implements OnCallBackListener { @@ -70,6 +70,8 @@ public class BaseActivity extends Activity implements OnCallBackListener { setContentView(contentView); + ButterKnife.bind(this); + int actionbar_height = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE).getInt("actionbar_height", DisplayUtils.dip2px(getApplicationContext(), 48)); @@ -86,25 +88,6 @@ public class BaseActivity extends Activity implements OnCallBackListener { finish(); } }); - - //简化findViewById - try { - Class clazz = this.getClass(); - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - int id = Utils.getId(field.getName()); - if (id != -1) { - Utils.log("reflect name = " + field.getName()); - field.setAccessible(true); - Class fieldType = field.getType(); - Object injectedValue = fieldType.cast(findViewById(id)); - field.set(this, injectedValue); - field.setAccessible(false); - } - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } } protected SystemBarTintManager getTintManager() { @@ -220,4 +203,5 @@ public class BaseActivity extends Activity implements OnCallBackListener { public void loadEmpty() { } + } diff --git a/app/src/main/java/com/gh/base/BaseFragment.java b/app/src/main/java/com/gh/base/BaseFragment.java index 46d87a9906..b07c78f62e 100644 --- a/app/src/main/java/com/gh/base/BaseFragment.java +++ b/app/src/main/java/com/gh/base/BaseFragment.java @@ -8,11 +8,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.gh.common.util.Utils; import com.gh.gamecenter.listener.OnCallBackListener; -import java.lang.reflect.Field; - import butterknife.ButterKnife; import de.greenrobot.event.EventBus; @@ -22,46 +19,16 @@ import de.greenrobot.event.EventBus; */ public class BaseFragment extends Fragment implements OnCallBackListener { -// private Unbinder unbinder; - protected View view; protected Handler handler = new Handler(); protected boolean isEverpause; - protected void init(int layout, boolean flag) { + protected void init(int layout) { view = View.inflate(getActivity(), layout, null); -// unbinder = ButterKnife.bind(this, view); - - if (flag) { - //简化findViewById - try { - Class clazz = this.getClass(); - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - int id = Utils.getId(field.getName()); - if (id != -1) { - Utils.log("reflect name = " + field.getName()); - field.setAccessible(true); - Class fieldType = field.getType(); - Object injectedValue = fieldType.cast(view.findViewById(id)); - field.set(this, injectedValue); - field.setAccessible(false); - } - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } else { - ButterKnife.bind(this, view); - } - - } - - protected void init(int layout) { - init(layout, true); + ButterKnife.bind(this, view); } @Override @@ -101,7 +68,6 @@ public class BaseFragment extends Fragment implements OnCallBackListener { public void onDestroy() { super.onDestroy(); EventBus.getDefault().unregister(this); -// unbinder.unbind(); } @Override diff --git a/app/src/main/java/com/gh/base/BaseFragmentActivity.java b/app/src/main/java/com/gh/base/BaseFragmentActivity.java index 412a810f0e..ec716db0bf 100644 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ b/app/src/main/java/com/gh/base/BaseFragmentActivity.java @@ -30,9 +30,9 @@ import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; -import java.lang.reflect.Field; import java.util.ArrayList; +import butterknife.ButterKnife; import de.greenrobot.event.EventBus; public class BaseFragmentActivity extends FragmentActivity { @@ -67,6 +67,8 @@ public class BaseFragmentActivity extends FragmentActivity { setContentView(contentView); + ButterKnife.bind(this); + int actionbar_height = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE).getInt("actionbar_height", DisplayUtils.dip2px(getApplicationContext(), 48)); @@ -83,24 +85,6 @@ public class BaseFragmentActivity extends FragmentActivity { finish(); } }); - - try { - Class clazz = this.getClass(); - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - int id = Utils.getId(field.getName()); - if (id != -1) { - Utils.log("reflect name = " + field.getName()); - field.setAccessible(true); - Class fieldType = field.getType(); - Object injectedValue = fieldType.cast(findViewById(id)); - field.set(this, injectedValue); - field.setAccessible(false); - } - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } } @Override diff --git a/app/src/main/java/com/gh/base/HomeFragment.java b/app/src/main/java/com/gh/base/HomeFragment.java index d8d934c695..c336627563 100644 --- a/app/src/main/java/com/gh/base/HomeFragment.java +++ b/app/src/main/java/com/gh/base/HomeFragment.java @@ -71,7 +71,7 @@ public class HomeFragment extends Fragment implements View.OnClickListener { DisplayUtils.dip2px(getActivity(), 48))); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - int top = DisplayUtils.getInternalDimensionSize(getResources(), "status_bar_height"); + int top = DisplayUtils.getStatusBarHeight(getResources()); home_actionbar.setPadding(0, top, 0, 0); lparams.height += top; } diff --git a/app/src/main/java/com/gh/common/util/DisplayUtils.java b/app/src/main/java/com/gh/common/util/DisplayUtils.java index f13826c220..626f800148 100644 --- a/app/src/main/java/com/gh/common/util/DisplayUtils.java +++ b/app/src/main/java/com/gh/common/util/DisplayUtils.java @@ -49,10 +49,13 @@ public class DisplayUtils { /** * 获取状态栏的高度 - * @param res - * @param key - * @return + * @param resources 资源 + * @return height */ + public static int getStatusBarHeight(Resources resources) { + return getInternalDimensionSize(resources, "status_bar_height"); + } + public static int getInternalDimensionSize(Resources res, String key) { int result = 0; int resourceId = res.getIdentifier(key, "dimen", "android"); diff --git a/app/src/main/java/com/gh/common/util/GameUtils.java b/app/src/main/java/com/gh/common/util/GameUtils.java index 04ce303692..50d6b99fe1 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -16,9 +16,33 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.manager.PackageManager; +import java.util.List; + public class GameUtils { + /** + * 去除与重复sourceList相同的数据 + */ + public static List removeDuplicateData(List sourceList, List rawList) { + if (sourceList == null || sourceList.isEmpty() + || rawList == null || rawList.isEmpty()) { + return rawList; + } + String id; + for (int i = 0; i < rawList.size(); i++) { + id = rawList.get(i).getId(); + for (GameEntity gameEntity : sourceList) { + if (id.equals(gameEntity.getId())) { + rawList.remove(i); + i--; + break; + } + } + } + return rawList; + } + /** * 启动游戏详情页面 */ diff --git a/app/src/main/java/com/gh/common/util/TokenUtils.java b/app/src/main/java/com/gh/common/util/TokenUtils.java index 038e7d5c75..82bed7edc2 100644 --- a/app/src/main/java/com/gh/common/util/TokenUtils.java +++ b/app/src/main/java/com/gh/common/util/TokenUtils.java @@ -36,8 +36,6 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; -import static anetwork.channel.http.NetworkSdkSetting.context; - public class TokenUtils { // 注册设备 diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index ff46c9e99f..c605d0f028 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -23,15 +23,18 @@ import org.json.JSONArray; import java.util.List; +import butterknife.BindView; + public class ConcernActivity extends BaseActivity implements OnClickListener { + @BindView(R.id.concern_rv_show) RecyclerView concern_rv_show; + @BindView(R.id.concern_rv_recommend) RecyclerView concern_rv_recommend; + @BindView(R.id.concern_rl_title) RelativeLayout concern_rl_title; + @BindView(R.id.reuse_none_data) LinearLayout reuse_none_data; + private Concern_LinearLayout view; - private RecyclerView concern_rv_show, concern_rv_recommend; private ConcernAdapter concernAdapter; private ConcernRecommendAdapter concernRecommendAdapter; - private RelativeLayout concern_rl_title; - private LinearLayout reuse_none_data; - private ConcernManager concernManager; @Override diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index ac12f56696..cb78451a0b 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -29,6 +29,7 @@ import java.io.File; import java.lang.ref.SoftReference; import java.net.HttpURLConnection; +import butterknife.BindView; import rx.Observable; import rx.Subscriber; import rx.functions.Action1; @@ -37,7 +38,7 @@ import rx.schedulers.Schedulers; public class CropImageActivity extends BaseActivity { - private CropImageCustom cropimage_custom; + @BindView(R.id.cropimage_custom) CropImageCustom cropimage_custom; private SoftReference reference; diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 4f5d2b3bdb..412e93bb22 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -26,6 +26,7 @@ import com.gh.gamecenter.manager.PackageManager; import java.util.ArrayList; import java.util.List; +import butterknife.BindView; import de.greenrobot.event.EventBus; /** @@ -37,14 +38,15 @@ import de.greenrobot.event.EventBus; public class DownloadManagerActivity extends BaseFragmentActivity implements OnClickListener, OnPageChangeListener { - private ViewPager downloadmanager_viewPager; - private TextView downloadmanager_tv_download; - private TextView downloadmanager_tv_update; - private TextView downloadmanager_download_number; - private TextView downloadmanager_update_number; - private LinearLayout downloadmanager_ll_download; - private LinearLayout downloadmanager_ll_update; - private View downloadmanager_slide_line; + @BindView(R.id.downloadmanager_viewPager) ViewPager downloadmanager_viewPager; + @BindView(R.id.downloadmanager_tv_download) TextView downloadmanager_tv_download; + @BindView(R.id.downloadmanager_tv_update) TextView downloadmanager_tv_update; + @BindView(R.id.downloadmanager_download_number) TextView downloadmanager_download_number; + @BindView(R.id.downloadmanager_update_number) TextView downloadmanager_update_number; + @BindView(R.id.downloadmanager_ll_download) LinearLayout downloadmanager_ll_download; + @BindView(R.id.downloadmanager_ll_update) LinearLayout downloadmanager_ll_update; + @BindView(R.id.downloadmanager_slide_line) View downloadmanager_slide_line; + private LinearLayout.LayoutParams lparams; private int width; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 07e0aa73d3..247c0ffaf3 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; +import butterknife.BindView; import retrofit2.adapter.rxjava.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; @@ -43,7 +44,7 @@ public class GameDetailActivity extends BaseDetailActivity implements View.OnCli private boolean isSentReport; - private RelativeLayout actionbar_rl_back; + @BindView(R.id.actionbar_rl_back) RelativeLayout actionbar_rl_back; @Override protected void onSaveInstanceState(Bundle outState) { diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index 4a09377b8b..9fb02f4ea5 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -19,16 +19,18 @@ import com.gh.gamecenter.eventbus.EBTypeChange; import java.util.ArrayList; +import butterknife.BindView; + /** * Created by LGT on 2016/8/29. */ public class GameNewsActivity extends BaseActivity implements View.OnClickListener{ + @BindView(R.id.game_news_list) RecyclerView game_news_list; + @BindView(R.id.game_news_top_type_list) RecyclerView game_news_top_type_list; + private GameNewsAdapter adapter; private GameNewsTypeListAdapter typeListAdapter; - - private RecyclerView game_news_list; - private RecyclerView game_news_top_type_list; private LinearLayoutManager layoutManager; private ImageView ivSearch; @@ -36,7 +38,6 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen private ArrayList typeList; - private String gameName; private String gameId; private String entrance; @@ -64,7 +65,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen ivSearch.setOnClickListener(this); ivSearch.setVisibility(View.GONE); - gameName = getIntent().getStringExtra("gameName"); + String gameName = getIntent().getStringExtra("gameName"); init(contentView, gameName); adapterMap = new ArrayMap<>(); diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index d80dfaa8cd..0cb4b9b94b 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -21,13 +21,14 @@ import java.util.ArrayList; import java.util.List; import butterknife.BindView; -import butterknife.ButterKnife; import de.greenrobot.event.EventBus; /** * Created by khy on 2016/12/12. */ -public class LibaoActivity extends BaseFragmentActivity implements View.OnClickListener, ViewPager.OnPageChangeListener { +public class LibaoActivity extends BaseFragmentActivity implements View.OnClickListener, + ViewPager.OnPageChangeListener { + @BindView(R.id.libao_vp_content) ViewPager mLibaoVp; @BindView(R.id.libao_ll_top) LinearLayout mLibaoTopLl; @BindView(R.id.libao_slide_line) View mLibaoLine; @@ -48,8 +49,6 @@ public class LibaoActivity extends BaseFragmentActivity implements View.OnClickL View view = View.inflate(this, R.layout.activity_libao, null); init(view, "礼包中心"); - ButterKnife.bind(this); - initTextView(); List list = new ArrayList<>(); diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index ad1841c49e..f8ac0d656c 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -51,7 +51,6 @@ import org.json.JSONObject; import java.util.List; import butterknife.BindView; -import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnTouch; import retrofit2.adapter.rxjava.HttpException; @@ -121,8 +120,6 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail View contentView = View.inflate(this, R.layout.activity_messagedetail, null); init(contentView, "消息详情"); - ButterKnife.bind(this); - sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); mCommentDao = new CommentDao(this); diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index fe966b680a..68118d4adf 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -56,7 +56,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import butterknife.BindView; -import butterknife.ButterKnife; import retrofit2.adapter.rxjava.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; @@ -156,8 +155,6 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener init(contentView); - ButterKnife.bind(this); - DisplayMetrics outMetrics = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getMetrics(outMetrics); diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 0f56e8aabe..a965487592 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -35,6 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import butterknife.BindView; import retrofit2.adapter.rxjava.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; @@ -46,17 +47,17 @@ import rx.schedulers.Schedulers; */ public class NewsSearchActivity extends BaseActivity { - private RecyclerView gamedetail_news_rv; - private List newsEntities; - private NewsSearchAdapter searchAdapter; - private TextView tv_search; - private LinearLayout reuse_none_data; - private EditText et_search; - private LinearLayout gamedetail_news_ll_loading; - private LinearLayout reuse_no_connection; - private CardLinearLayout gamedetail_news_cardView; + @BindView(R.id.gamedetail_news_rv) RecyclerView gamedetail_news_rv; + @BindView(R.id.tv_search) TextView tv_search; + @BindView(R.id.reuse_none_data) LinearLayout reuse_none_data; + @BindView(R.id.et_search) EditText et_search; + @BindView(R.id.gamedetail_news_ll_loading) LinearLayout gamedetail_news_ll_loading; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; + @BindView(R.id.gamedetail_news_cardView) CardLinearLayout gamedetail_news_cardView; private MeasureHeightLayoutManager layoutManager; + private List newsEntities; + private NewsSearchAdapter searchAdapter; private boolean isLoadOver = true; private boolean isRemove = false; @@ -92,7 +93,7 @@ public class NewsSearchActivity extends BaseActivity { - DisplayUtils.dip2px(this, 38 + 16 + 8 + 8) - getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE).getInt("actionbar_height", DisplayUtils.dip2px(getApplicationContext(), 48)) - - DisplayUtils.getInternalDimensionSize(getResources(), "status_bar_height"); + - DisplayUtils.getStatusBarHeight(getResources()); gamedetail_news_cardView.setLayoutParams(params); newsEntities = new ArrayList<>(); diff --git a/app/src/main/java/com/gh/gamecenter/PluginActivity.java b/app/src/main/java/com/gh/gamecenter/PluginActivity.java index 7e1a498acb..8d3367a506 100644 --- a/app/src/main/java/com/gh/gamecenter/PluginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PluginActivity.java @@ -21,18 +21,20 @@ import com.gh.gamecenter.eventbus.EBPackage; import java.util.ArrayList; import java.util.List; +import butterknife.BindView; + /** * Created by LGT on 2016/7/6. * 可插件化界面 */ public class PluginActivity extends BaseActivity { - private RecyclerView plugin_list; - private PluginAdapter adapter; - private ProgressBarCircularIndeterminate plugin_pb_loading; - private LinearLayout reuse_no_connection; + @BindView(R.id.plugin_list) RecyclerView plugin_list; + @BindView(R.id.plugin_pb_loading) ProgressBarCircularIndeterminate plugin_pb_loading; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; private String entrance; + private PluginAdapter adapter; private boolean isEverpause = false; diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index b44939a816..2549627802 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -37,10 +37,6 @@ import com.gh.gamecenter.search.SearchHistoryFragment; public class SearchActivity extends BaseFragmentActivity { - private SearchGameDetailFragment game_detail_fragment; - private SearchGameListFragment game_list_fragment; - private SearchHistoryFragment search_history_fragment; - private EditText searchInput; private ImageView searchCancel; private TextView searchButton; @@ -246,12 +242,12 @@ public class SearchActivity extends BaseFragmentActivity { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); switch (model) { case 0: - search_history_fragment = new SearchHistoryFragment(); + SearchHistoryFragment search_history_fragment = new SearchHistoryFragment(); transaction.replace(R.id.search_result, search_history_fragment); currentTab = 0; break; case 1: - game_list_fragment = new SearchGameListFragment(); + SearchGameListFragment game_list_fragment = new SearchGameListFragment(); game_list_fragment.setKey(searchKey); transaction.replace(R.id.search_result, game_list_fragment); currentTab = 1; @@ -260,7 +256,7 @@ public class SearchActivity extends BaseFragmentActivity { DataUtils.onEvent(SearchActivity.this, "搜索页面", searchKey); DataCollectionUtils.uploadSearch(this, searchKey, "搜索页面"); - game_detail_fragment = new SearchGameDetailFragment(); + SearchGameDetailFragment game_detail_fragment = new SearchGameDetailFragment(); game_detail_fragment.setKey(searchKey); transaction.replace(R.id.search_result, game_detail_fragment); currentTab = 2; diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index fcf2ede8dc..beb965ec16 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -29,6 +29,7 @@ import com.kyleduo.switchbutton.SwitchButton; import java.io.File; +import butterknife.BindView; import de.greenrobot.event.EventBus; /** @@ -39,9 +40,14 @@ import de.greenrobot.event.EventBus; */ public class SettingActivity extends BaseActivity implements OnClickListener { - private SwitchButton setting_sb_autoinstall, setting_sb_autodelete, - setting_sb_deletedata, setting_sb_autoupdate, setting_sb_concerngame; - private TextView setting_tv_version, setting_tv_cache,setting_tv_size; + @BindView(R.id.setting_sb_autoinstall) SwitchButton setting_sb_autoinstall; + @BindView(R.id.setting_sb_autodelete) SwitchButton setting_sb_autodelete; + @BindView(R.id.setting_sb_deletedata) SwitchButton setting_sb_deletedata; + @BindView(R.id.setting_sb_autoupdate) SwitchButton setting_sb_autoupdate; + @BindView(R.id.setting_sb_concerngame) SwitchButton setting_sb_concerngame; + @BindView(R.id.setting_tv_version) TextView setting_tv_version; + @BindView(R.id.setting_tv_cache) TextView setting_tv_cache; + @BindView(R.id.setting_tv_size) TextView setting_tv_size; private SharedPreferences sp; diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index 5323e16acb..edde249477 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -23,7 +23,6 @@ import com.tencent.tauth.Tencent; import java.io.File; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/11/7. @@ -72,8 +71,6 @@ public class ShareCardActivity extends BaseActivity { View contentView = View.inflate(this, R.layout.activity_sharecard, null); init(contentView, "分享卡片"); - ButterKnife.bind(this); - //修改沉浸栏以及ActionBar 颜色 mActionbar.setBackgroundColor(getResources().getColor(R.color.back)); SystemBarTintManager tintManager = getTintManager(); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index 8abf4aacc0..b64163cab6 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -38,7 +38,6 @@ import java.util.Vector; import java.util.concurrent.CountDownLatch; import butterknife.BindView; -import butterknife.ButterKnife; import butterknife.OnClick; import rx.functions.Action1; @@ -101,8 +100,6 @@ public class ShareCardPicActivity extends BaseActivity { View contentView = View.inflate(this, R.layout.activity_sharecard_pic, null); init(contentView, "分享卡片"); - ButterKnife.bind(this); - shareArrImg = new Vector<>();; shareArrImg.addAll(arrImg); diff --git a/app/src/main/java/com/gh/gamecenter/StrategyActivity.java b/app/src/main/java/com/gh/gamecenter/StrategyActivity.java index 988add8ea7..7b5faa1675 100644 --- a/app/src/main/java/com/gh/gamecenter/StrategyActivity.java +++ b/app/src/main/java/com/gh/gamecenter/StrategyActivity.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import butterknife.BindView; -import butterknife.ButterKnife; import rx.functions.Action1; /** @@ -55,8 +54,6 @@ public class StrategyActivity extends BaseActivity implements StrategyDialogAdap View contentView = View.inflate(this, R.layout.activity_strategy, null); init(contentView, "攻略"); - ButterKnife.bind(this); - mStrategyAdapter = new StrategyAdapter(this, gameId, mNoData); final LinearLayoutManager layoutManager = new LinearLayoutManager(this); mStrategyRv.setLayoutManager(layoutManager); diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index ced2f5da10..4647ad4247 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -20,28 +20,26 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import org.json.JSONException; import org.json.JSONObject; -import java.io.IOException; import java.util.ArrayList; -import okhttp3.ResponseBody; -import retrofit2.adapter.rxjava.HttpException; +import butterknife.BindView; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; public class SubjectActivity extends BaseActivity { - private RecyclerView subject_list; + @BindView(R.id.subject_list) RecyclerView subject_list; + @BindView(R.id.subject_pb_loading) ProgressBarCircularIndeterminate subject_pb_loading; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; + private SubjectAdapter adapter; - private ProgressBarCircularIndeterminate subject_pb_loading; - private LinearLayout reuse_no_connection; private LinearLayoutManager layoutManager; - private TextView actionbar_tv_title; private int page = 1; @@ -119,15 +117,13 @@ public class SubjectActivity extends BaseActivity { .getSubjectName(id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response(){ + .subscribe(new JSONObjectResponse() { @Override - public void onResponse(ResponseBody response) { - actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); - + public void onResponse(JSONObject response) { try { - JSONObject jsonObject = new JSONObject(response.string()); - actionbar_tv_title.setText(jsonObject.getString("name")); - } catch (IOException | JSONException e) { + TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); + actionbar_tv_title.setText(response.getString("name")); + } catch (JSONException e) { e.printStackTrace(); } } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 4fb00bfd85..73ff271684 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import butterknife.BindView; import okhttp3.MediaType; import okhttp3.RequestBody; import retrofit2.adapter.rxjava.HttpException; @@ -43,9 +44,10 @@ import rx.schedulers.Schedulers; * */ public class SuggestionActivity extends BaseActivity implements OnClickListener { - private TextView tv_suggest_connectway; - private EditText et_suggest_content, et_suggest_connectway; - private CardLinearLayout btn_suggest_post; + @BindView(R.id.tv_suggest_connectway) TextView tv_suggest_connectway; + @BindView(R.id.et_suggest_content) EditText et_suggest_content; + @BindView(R.id.et_suggest_connectway) EditText et_suggest_connectway; + @BindView(R.id.btn_suggest_post) CardLinearLayout btn_suggest_post; private boolean isShowing = false; diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index a669390ccc..2cc3cf1eaf 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -35,18 +35,20 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import butterknife.BindView; + /** * 查看游戏截图页面 * * @author 黄壮华 */ -public class ViewImageActivity extends BaseActivity implements - OnPageChangeListener { +public class ViewImageActivity extends BaseActivity implements OnPageChangeListener { + + @BindView(R.id.viewimage_vp_show) Gh_ViewPager viewimage_vp_show; + @BindView(R.id.viewimage_slide_line) View viewimage_slide_line; - private Gh_ViewPager viewimage_vp_show; private ViewImageAdapter adapter; - private View viewimage_slide_line; private RelativeLayout.LayoutParams rparams; private ArrayList urls; diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 57091c1e04..f9b5ed3187 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -23,7 +23,6 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import java.util.List; import butterknife.BindView; -import butterknife.ButterKnife; import butterknife.OnClick; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; @@ -61,8 +60,6 @@ public class WebActivity extends BaseActivity { View contentView = View.inflate(this, R.layout.activity_web, null); init(contentView, webTitle); - ButterKnife.bind(this); - webView.loadUrl(webUrl); WebSettings settings = webView.getSettings(); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java index 111ca06bef..74c43fdfb0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java @@ -14,10 +14,8 @@ import butterknife.ButterKnife; */ public class CommentHeadViewHolder extends RecyclerView.ViewHolder { - @BindView(R.id.comment_head_line) - public View commentHeadLine; - @BindView(R.id.comment_head_title) - public TextView commentHeadTitleTv; + @BindView(R.id.comment_head_line) public View commentHeadLine; + @BindView(R.id.comment_head_title) public TextView commentHeadTitleTv; public CommentHeadViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java index 487753aaf3..503164ff75 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java @@ -16,20 +16,13 @@ import butterknife.ButterKnife; */ public class CommentViewHolder extends RecyclerView.ViewHolder { - @BindView(R.id.comment_line) - public View commentLine; - @BindView(R.id.comment_content) - public TextView commentContentTv; - @BindView(R.id.comment_like) - public ImageView commentLikeIv; - @BindView(R.id.comment_like_count) - public TextView commentLikeCountTv; - @BindView(R.id.comment_time) - public TextView commentTimeTv; - @BindView(R.id.comment_user_icon) - public SimpleDraweeView commentUserIconDv; - @BindView(R.id.comment_user_name) - public TextView commentUserNameTv; + @BindView(R.id.comment_line) public View commentLine; + @BindView(R.id.comment_content) public TextView commentContentTv; + @BindView(R.id.comment_like) public ImageView commentLikeIv; + @BindView(R.id.comment_like_count) public TextView commentLikeCountTv; + @BindView(R.id.comment_time) public TextView commentTimeTv; + @BindView(R.id.comment_user_icon) public SimpleDraweeView commentUserIconDv; + @BindView(R.id.comment_user_name) public TextView commentUserNameTv; public CommentViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java index 650dcc45ee..64ebd67fb6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java @@ -14,6 +14,7 @@ import butterknife.ButterKnife; * Created by khy on 2016/12/12. */ public class LibaoNormalViewHolder extends RecyclerView.ViewHolder{ + @BindView(R.id.libao_name) public TextView libaoName; @BindView(R.id.libao_des) public TextView libaoDes; @BindView(R.id.libao_game_name) public TextView libaoGameName; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java index 7cedb2d3f5..8a96f95fae 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java @@ -14,6 +14,7 @@ import butterknife.ButterKnife; * Created by khy on 2016/12/5. */ public class StrategyDialogViewHolder extends RecyclerView.ViewHolder{ + @BindView(R.id.dialog_strategy_item_icon) public ImageView selectIcon; @BindView(R.id.dialog_strategy_item_name) public TextView gameName; diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java index fa8107cd4d..14ae5e161a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java @@ -28,17 +28,20 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import java.util.ArrayList; import java.util.List; +import butterknife.BindView; + /** * Created by khy on 2016/6/27. * 游戏-插件界面 */ public class Game1Fragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener { - private SwipeRefreshLayout fm_game_swipe_refresh; - private RecyclerView fm_game_rv_list; + @BindView(R.id.fm_game_swipe_refresh) SwipeRefreshLayout fm_game_swipe_refresh; + @BindView(R.id.fm_game_rv_list) RecyclerView fm_game_rv_list; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; + @BindView(R.id.fm_game_pb_loading) ProgressBarCircularIndeterminate fm_game_pb_loading; + private Game1FragmentAdapter adapter; - private LinearLayout reuse_no_connection; - private ProgressBarCircularIndeterminate fm_game_pb_loading; private int currentItem; diff --git a/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java b/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java index 1f51dee3d3..7c2a74d983 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java @@ -27,16 +27,18 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import java.util.ArrayList; +import butterknife.BindView; + /** * Created by khy on 2016/6/28. */ public class Game2Fragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener { - private SwipeRefreshLayout fm_game_swipe_refresh; - private RecyclerView fm_game_rv_list; + @BindView(R.id.fm_game_swipe_refresh) SwipeRefreshLayout fm_game_swipe_refresh; + @BindView(R.id.fm_game_rv_list) RecyclerView fm_game_rv_list; private Game2FragmentAdapter adapter; - private LinearLayout reuse_no_connection; - private ProgressBarCircularIndeterminate fm_game_pb_loading; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; + @BindView(R.id.fm_game_pb_loading) ProgressBarCircularIndeterminate fm_game_pb_loading; DataWatcher dataWatcher = new DataWatcher() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/game/Game3Fragment.java b/app/src/main/java/com/gh/gamecenter/game/Game3Fragment.java index 54decc1940..209276000b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game3Fragment.java @@ -26,6 +26,8 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import java.util.ArrayList; +import butterknife.BindView; + /** * * @author 温冠超 @@ -36,12 +38,12 @@ import java.util.ArrayList; */ public class Game3Fragment extends BaseFragment implements OnRefreshListener { - private SwipeRefreshLayout fm_game_swipe_refresh; - private RecyclerView fm_game_rv_list; + @BindView(R.id.fm_game_swipe_refresh) SwipeRefreshLayout fm_game_swipe_refresh; + @BindView(R.id.fm_game_rv_list) RecyclerView fm_game_rv_list; private Game3FragmentAdapter adapter; private LinearLayoutManager layoutManager; - private LinearLayout reuse_no_connection; - private ProgressBarCircularIndeterminate fm_game_pb_loading; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; + @BindView(R.id.fm_game_pb_loading) ProgressBarCircularIndeterminate fm_game_pb_loading; // 黄壮华 添加观察者 修改2015/8/15 private DataWatcher dataWatcher = new DataWatcher() { diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 9363cba23e..80cf56e0be 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -1106,22 +1106,16 @@ public class GameFragmentAdapter extends RecyclerView.Adapter list = subjectChangedMap.get(subjectEntity.getId()); + if (list != null) { + initRandomGame(subjectEntity.getData(), new ArrayList<>(list)); + holder.progressBar.postDelayed(new Runnable() { + @Override + public void run() { + holder.progressBar.setVisibility(View.GONE); + } + }, 500); + } else { changeSubjectGame(holder.progressBar, subjectEntity); } } @@ -1133,44 +1127,26 @@ public class GameFragmentAdapter extends RecyclerView.Adapter rawList ,List sourceList - , boolean isAddMap, String subjectId) { + private void initRandomGame(List rawList, List sourceList) { - if (isAddMap) { - subjectChangedMap.put(subjectId, sourceList); - } - - List newList = new ArrayList<>(); - newList.addAll(sourceList); - - int index = rawList.size(); // 判断是否有大图 - - - if (rawList.size() * 2 < newList.size()) { - for (int i = 0; i < newList.size(); i++) { //排除重复 - String id = newList.get(i).getId(); - for (GameEntity oldEntity : rawList) { - if (id.equals(oldEntity.getId())) { - newList.remove(i); - i--; - } - } - } - } + int size = rawList.size(); // 判断是否有大图 for (int i = 0; i < rawList.size(); i++) { //删除原数据，排除大图 if (TextUtils.isEmpty(rawList.get(i).getImage())) { rawList.remove(i); i--; } else { - index --; + size--; } } - int[] randomArray = RandomUtils.getRandomArray(index, newList.size()); + if (size * 2 <= sourceList.size()) { + sourceList = GameUtils.removeDuplicateData(rawList, sourceList);//排除重复 + } - for (int i : randomArray) { - rawList.add(newList.get(i)); + int[] indexes = RandomUtils.getRandomArray(size, sourceList.size()); + for (int index : indexes) { + rawList.add(sourceList.get(index)); } notifyDataSetChanged(); @@ -1178,8 +1154,6 @@ public class GameFragmentAdapter extends RecyclerView.Adapter(response)); } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java index e0247eb7f0..e28b560bec 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java @@ -14,6 +14,7 @@ import butterknife.ButterKnife; * Created by khy on 2016/11/16. */ public class GameDetailSkinViewHolder extends RecyclerView.ViewHolder{ + @BindView(R.id.skin_tv_download) public TextView skinDownloadTv; @BindView(R.id.skin_pb_progressbar) public ProgressBar skinDownloadPb; @BindView(R.id.skin_tv_per) public TextView skinDownloadPerTv; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index b6b134d5c0..54723fb7e5 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -49,7 +49,7 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_libao1, false); + init(R.layout.fragment_libao1); mIsSearch = false; mSearckKey = null; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 2d657f59ff..60ad04e3c6 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -44,7 +44,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_libao2, false); + init(R.layout.fragment_libao2); mRefreshLayout.setColorSchemeResources(R.color.theme); mRefreshLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index c61355ebb0..d6390924f7 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -40,7 +40,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_libao3, false); + init(R.layout.fragment_libao3); mRefreshLayout.setColorSchemeResources(R.color.theme); mRefreshLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java index 5b9a6d31f8..ae804e632d 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java @@ -85,7 +85,7 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_news1, false); + init(R.layout.fragment_news1); recommendGameList = new ArrayList<>(); installGameList = new ArrayList<>(); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index acd02b4e36..a141ab1aab 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -44,7 +44,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_news2, false); + init(R.layout.fragment_news2); refreshLayout.setColorSchemeResources(R.color.theme); refreshLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java index 3993d3ef76..8ad96f0202 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java @@ -44,7 +44,7 @@ public class News3Fragment extends BaseFragment implements SwipeRefreshLayout.On public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_news3, false); + init(R.layout.fragment_news3); refreshLayout.setColorSchemeResources(R.color.theme); refreshLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java index 026de54908..675c533702 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java @@ -49,7 +49,7 @@ public class News4Fragment extends BaseFragment implements SwipeRefreshLayout.On public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_news4, false); + init(R.layout.fragment_news4); refreshLayout.setColorSchemeResources(R.color.theme); refreshLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java index aaf058f8c3..0bf3b5b6a7 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java @@ -23,6 +23,7 @@ import com.gh.gamecenter.eventbus.EBSkip; import java.util.ArrayList; +import butterknife.BindView; import de.greenrobot.event.EventBus; /** @@ -31,11 +32,12 @@ import de.greenrobot.event.EventBus; */ public class ConcernFragment extends BaseFragment { - private RecyclerView fm_concern_rv_show; + @BindView(R.id.fm_concern_rv_show) RecyclerView fm_concern_rv_show; + @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; + private ConcernFragmentAdapter adapter; - private LinearLayout reuse_nodata_skip; - private TextView reuse_nodata_skip_tv_hint; - private TextView reuse_nodata_skip_tv_btn; private DataWatcher dataWatcher = new DataWatcher() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java index 9c9c74995a..4fe12fab45 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java @@ -21,6 +21,7 @@ import com.gh.gamecenter.eventbus.EBSkip; import java.util.ArrayList; +import butterknife.BindView; import de.greenrobot.event.EventBus; /** @@ -29,11 +30,11 @@ import de.greenrobot.event.EventBus; */ public class InstallFragment extends BaseFragment { - private RecyclerView fm_install_rv_show; + @BindView(R.id.fm_install_rv_show) RecyclerView fm_install_rv_show; private InstallFragmentAdapter adapter; - private LinearLayout reuse_nodata_skip; - private TextView reuse_nodata_skip_tv_hint; - private TextView reuse_nodata_skip_tv_btn; + @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; private DataWatcher dataWatcher = new DataWatcher() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index fd1e2791d2..1af22ab421 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -104,12 +104,12 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, ImageView me_iv_top_setting = (ImageView) view.findViewById(R.id.me_iv_top_setting); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) me_iv_top_setting.getLayoutParams(); - params.topMargin = DisplayUtils.getInternalDimensionSize(getResources(), "status_bar_height") + params.topMargin = DisplayUtils.getStatusBarHeight(getResources()) + DisplayUtils.dip2px(getActivity(), 15); me_iv_top_setting.setLayoutParams(params); LinearLayout me_ll_info = (LinearLayout) view.findViewById(R.id.me_ll_info); - me_ll_info.setPadding(0, DisplayUtils.getInternalDimensionSize(getResources(), "status_bar_height"), 0, 0); + me_ll_info.setPadding(0, DisplayUtils.getStatusBarHeight(getResources()), 0, 0); } me_iv_top_setting.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index 3039cf8d82..604b298792 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -4,9 +4,7 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; @@ -22,13 +20,14 @@ import com.gh.gamecenter.listener.OnCallBackListener; import java.util.ArrayList; +import butterknife.BindView; + public class SearchGameDetailFragment extends BaseFragment implements OnCallBackListener { - private View view; - private RecyclerView search_detail; - private LinearLayout search_loading; - private LinearLayout reuse_none_date; - private LinearLayout reuse_no_connection; + @BindView(R.id.search_detail) RecyclerView search_detail; + @BindView(R.id.search_gamedetail_ll_loading) LinearLayout search_loading; + @BindView(R.id.reuse_none_data) LinearLayout reuse_none_date; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; private String key; @@ -56,32 +55,17 @@ public class SearchGameDetailFragment extends BaseFragment implements OnCallBack public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - view = View.inflate(getActivity(), R.layout.fm_search, null); + init(R.layout.fm_search); TextView reuse_tv_none_data = (TextView) view.findViewById(R.id.reuse_tv_none_data); reuse_tv_none_data.setText("搜索结果为空"); - search_loading = (LinearLayout) view.findViewById(R.id.search_gamedetail_ll_loading); - reuse_none_date = (LinearLayout) view.findViewById(R.id.reuse_none_data); - reuse_no_connection = (LinearLayout) view.findViewById(R.id.reuse_no_connection); - - search_detail = (RecyclerView) view.findViewById(R.id.search_detail); search_detail.setHasFixedSize(true); search_detail.setLayoutManager(new LinearLayoutManager(getActivity())); adapter = new SearchGameDetailFragmentAdapter(SearchGameDetailFragment.this, key); search_detail.setAdapter(adapter); } - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - if (container != null) { - container.removeView(view); - } - return view; - } - public void setKey(String key) { this.key = key; } @@ -137,14 +121,12 @@ public class SearchGameDetailFragment extends BaseFragment implements OnCallBack @Override public void onResume() { super.onResume(); - isEverpause = false; DownloadManager.getInstance(getContext()).addObserver(dataWatcher); } @Override public void onPause() { super.onPause(); - isEverpause = true; DownloadManager.getInstance(getContext()).removeObserver(dataWatcher); } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index 21e2b2542c..9150eceea7 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -22,13 +22,14 @@ import com.gh.gamecenter.listener.OnCallBackListener; import java.util.ArrayList; +import butterknife.BindView; + public class SearchGameListFragment extends BaseFragment implements OnCallBackListener { - private View view; - private RecyclerView search_detail; - private LinearLayout search_loading; - private LinearLayout reuse_none_date; - private LinearLayout reuse_no_connection; + @BindView(R.id.search_detail) RecyclerView search_detail; + @BindView(R.id.search_gamedetail_ll_loading) LinearLayout search_loading; + @BindView(R.id.reuse_none_data) LinearLayout reuse_none_date; + @BindView(R.id.reuse_no_connection) LinearLayout reuse_no_connection; private String key; @@ -52,32 +53,17 @@ public class SearchGameListFragment extends BaseFragment implements OnCallBackLi public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - view = View.inflate(getActivity(), R.layout.fm_search, null); + init(R.layout.fm_search); TextView reuse_tv_none_data = (TextView) view.findViewById(R.id.reuse_tv_none_data); reuse_tv_none_data.setText("搜索为空"); - search_loading = (LinearLayout) view.findViewById(R.id.search_gamedetail_ll_loading); - reuse_none_date = (LinearLayout) view.findViewById(R.id.reuse_none_data); - reuse_no_connection = (LinearLayout) view.findViewById(R.id.reuse_no_connection); - - search_detail = (RecyclerView) view.findViewById(R.id.search_detail); search_detail.setHasFixedSize(true); search_detail.setLayoutManager(new LinearLayoutManager(getActivity())); adapter = new SearchGameListFragmentAdapter(SearchGameListFragment.this, key); search_detail.setAdapter(adapter); } - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - if (container != null) { - container.removeView(view); - } - return view; - } - public void setKey(String key) { this.key = key; } @@ -131,14 +117,13 @@ public class SearchGameListFragment extends BaseFragment implements OnCallBackLi @Override public void onResume() { super.onResume(); - isEverpause = false; DownloadManager.getInstance(getContext()).addObserver(dataWatcher); } @Override public void onPause() { super.onPause(); - isEverpause = true; DownloadManager.getInstance(getContext()).removeObserver(dataWatcher); } + }