diff --git a/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java b/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java index c2cbe8a..3160000 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java @@ -323,15 +323,17 @@ public class MainActivity extends BaseActivity { if (null != aMenu) { if (optionMenuOn) { - if (homepageList.contains("001")) { - aMenu.findItem(R.id.shangpin_xiaoxi).setVisible(true); - } else { - aMenu.findItem(R.id.shangpin_xiaoxi).setVisible(false); - } - if (homepageList.contains("002")) { - aMenu.findItem(R.id.shangpin_rushedan).setVisible(true); - } else { - aMenu.findItem(R.id.shangpin_rushedan).setVisible(false); + if (homepageList !=null) { + if (homepageList.contains("001")) { + aMenu.findItem(R.id.shangpin_xiaoxi).setVisible(true); + } else { + aMenu.findItem(R.id.shangpin_xiaoxi).setVisible(false); + } + if (homepageList.contains("002")) { + aMenu.findItem(R.id.shangpin_rushedan).setVisible(true); + } else { + aMenu.findItem(R.id.shangpin_rushedan).setVisible(false); + } } } else { diff --git a/app/src/main/java/com/qhclh/ytzh/index/fumudai/FumudaiFragment.java b/app/src/main/java/com/qhclh/ytzh/index/fumudai/FumudaiFragment.java index 36149cf..8fb300f 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/fumudai/FumudaiFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/index/fumudai/FumudaiFragment.java @@ -79,29 +79,33 @@ public class FumudaiFragment extends BaseFragment { @Override public void onResume() { super.onResume(); - if (MainActivity.homepageList.contains("005")){ - rv_fuwudai.setVisibility(View.VISIBLE); - }else { - rv_fuwudai.setVisibility(View.GONE); - } - if (MainActivity.homepageList.contains("006")){ - fumudai_banner.setVisibility(View.VISIBLE); - }else { - fumudai_banner.setVisibility(View.GONE); + if (MainActivity.homepageList!=null) { + if (MainActivity.homepageList.contains("005")) { + rv_fuwudai.setVisibility(View.VISIBLE); + } else { + rv_fuwudai.setVisibility(View.GONE); + } + if (MainActivity.homepageList.contains("006")) { + fumudai_banner.setVisibility(View.VISIBLE); + } else { + fumudai_banner.setVisibility(View.GONE); + } } } @Subscribe(threadMode = ThreadMode.MAIN,sticky = true) public void onEvent(HomepageEvent event){ - if (event.getHomepageList().contains("005")){ - rv_fuwudai.setVisibility(View.VISIBLE); - }else { - rv_fuwudai.setVisibility(View.GONE); - } - if (event.getHomepageList().contains("006")){ - fumudai_banner.setVisibility(View.VISIBLE); - }else { - fumudai_banner.setVisibility(View.GONE); + if (event.getHomepageList()!=null) { + if (event.getHomepageList().contains("005")) { + rv_fuwudai.setVisibility(View.VISIBLE); + } else { + rv_fuwudai.setVisibility(View.GONE); + } + if (event.getHomepageList().contains("006")) { + fumudai_banner.setVisibility(View.VISIBLE); + } else { + fumudai_banner.setVisibility(View.GONE); + } } } diff --git a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java index 7f34c31..cb877c5 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java @@ -129,52 +129,54 @@ public class WorkFragment extends BaseFragment { super.onResume(); workBeanList.clear(); list_path.clear(); - if (MainActivity.workList.contains("001")) { - workBeanList.add(new WorkBean(R.drawable.ribaobiao, getString(R.string.zhognqingribaobiao), 1)); - } - if (MainActivity.workList.contains("002")) { - workBeanList.add(new WorkBean(R.drawable.zhoubao, getString(R.string.zhognqingzhoubaobiao), 2)); - } - if (MainActivity.workList.contains("003")) { - workBeanList.add(new WorkBean(R.drawable.ribao, getString(R.string.shangpinjiribao), 3)); - } - if (MainActivity.workList.contains("004")) { - workBeanList.add(new WorkBean(R.drawable.shanp, getString(R.string.shangpinjibaobiao), 4)); - } - if (MainActivity.workList.contains("005")) { - workBeanList.add(new WorkBean(R.drawable.saoyisao, getString(R.string.saoyisao), 5)); - } - if (MainActivity.workList.contains("006")) { - workBeanList.add(new WorkBean(R.drawable.jilu, getString(R.string.saomajilv), 6)); - } - if (MainActivity.workList.contains("007")) { - banner.setVisibility(View.VISIBLE); - } else { - banner.setVisibility(View.GONE); - } + if (MainActivity.workList!=null) { + if (MainActivity.workList.contains("001")) { + workBeanList.add(new WorkBean(R.drawable.ribaobiao, getString(R.string.zhognqingribaobiao), 1)); + } + if (MainActivity.workList.contains("002")) { + workBeanList.add(new WorkBean(R.drawable.zhoubao, getString(R.string.zhognqingzhoubaobiao), 2)); + } + if (MainActivity.workList.contains("003")) { + workBeanList.add(new WorkBean(R.drawable.ribao, getString(R.string.shangpinjiribao), 3)); + } + if (MainActivity.workList.contains("004")) { + workBeanList.add(new WorkBean(R.drawable.shanp, getString(R.string.shangpinjibaobiao), 4)); + } + if (MainActivity.workList.contains("005")) { + workBeanList.add(new WorkBean(R.drawable.saoyisao, getString(R.string.saoyisao), 5)); + } + if (MainActivity.workList.contains("006")) { + workBeanList.add(new WorkBean(R.drawable.jilu, getString(R.string.saomajilv), 6)); + } + if (MainActivity.workList.contains("007")) { + banner.setVisibility(View.VISIBLE); + } else { + banner.setVisibility(View.GONE); + } - workAdapter = new WorkAdapter(getActivity(), workBeanList); + workAdapter = new WorkAdapter(getActivity(), workBeanList); - mLayoutManager = new GridLayoutManager(getActivity(), 4, GridLayoutManager.VERTICAL, false);//设置为一个4列的纵向网格布局 - rv_work.setLayoutManager(mLayoutManager); - rv_work.setAdapter(workAdapter); + mLayoutManager = new GridLayoutManager(getActivity(), 4, GridLayoutManager.VERTICAL, false);//设置为一个4列的纵向网格布局 + rv_work.setLayoutManager(mLayoutManager); + rv_work.setAdapter(workAdapter); - list_path.add("https://ss1.bdstatic.com/5aAHeD3nKgcUp2HgoI7O1ygwehsv/media/ch18/png/button_03.png"); + list_path.add("https://ss1.bdstatic.com/5aAHeD3nKgcUp2HgoI7O1ygwehsv/media/ch18/png/button_03.png"); - banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR); - banner.setImageLoader(new GlideImageLoader()); - banner.setImages(list_path); - banner.setBannerAnimation(Transformer.Default); - banner.setDelayTime(3000); - banner.isAutoPlay(true); - banner.setIndicatorGravity(BannerConfig.CENTER); - banner.start(); - banner.setOnBannerListener(new OnBannerListener() { - @Override - public void OnBannerClick(int position) { + banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR); + banner.setImageLoader(new GlideImageLoader()); + banner.setImages(list_path); + banner.setBannerAnimation(Transformer.Default); + banner.setDelayTime(3000); + banner.isAutoPlay(true); + banner.setIndicatorGravity(BannerConfig.CENTER); + banner.start(); + banner.setOnBannerListener(new OnBannerListener() { + @Override + public void OnBannerClick(int position) { - } - }); + } + }); + } } @@ -184,30 +186,32 @@ public class WorkFragment extends BaseFragment { list_path.clear(); list_path.add("https://ss1.bdstatic.com/5aAHeD3nKgcUp2HgoI7O1ygwehsv/media/ch18/png/button_03.png"); - if (event.getWorkList().contains("001")) { - workBeanList.add(new WorkBean(R.drawable.ribaobiao, getString(R.string.zhognqingribaobiao), 1)); - } - if (event.getWorkList().contains("002")) { - workBeanList.add(new WorkBean(R.drawable.zhoubao, getString(R.string.zhognqingzhoubaobiao), 2)); - } - if (event.getWorkList().contains("003")) { - workBeanList.add(new WorkBean(R.drawable.ribao, getString(R.string.shangpinjiribao), 3)); - } - if (event.getWorkList().contains("004")) { - workBeanList.add(new WorkBean(R.drawable.shanp, getString(R.string.shangpinjibaobiao), 4)); - } - if (event.getWorkList().contains("005")) { - workBeanList.add(new WorkBean(R.drawable.saoyisao, getString(R.string.saoyisao), 5)); - } - if (event.getWorkList().contains("006")) { - workBeanList.add(new WorkBean(R.drawable.jilu, getString(R.string.saomajilv), 6)); - } - if (event.getWorkList().contains("007")) { - banner.setVisibility(View.VISIBLE); - } else { - banner.setVisibility(View.GONE); + if (event.getWorkList()!=null) { + if (event.getWorkList().contains("001")) { + workBeanList.add(new WorkBean(R.drawable.ribaobiao, getString(R.string.zhognqingribaobiao), 1)); + } + if (event.getWorkList().contains("002")) { + workBeanList.add(new WorkBean(R.drawable.zhoubao, getString(R.string.zhognqingzhoubaobiao), 2)); + } + if (event.getWorkList().contains("003")) { + workBeanList.add(new WorkBean(R.drawable.ribao, getString(R.string.shangpinjiribao), 3)); + } + if (event.getWorkList().contains("004")) { + workBeanList.add(new WorkBean(R.drawable.shanp, getString(R.string.shangpinjibaobiao), 4)); + } + if (event.getWorkList().contains("005")) { + workBeanList.add(new WorkBean(R.drawable.saoyisao, getString(R.string.saoyisao), 5)); + } + if (event.getWorkList().contains("006")) { + workBeanList.add(new WorkBean(R.drawable.jilu, getString(R.string.saomajilv), 6)); + } + if (event.getWorkList().contains("007")) { + banner.setVisibility(View.VISIBLE); + } else { + banner.setVisibility(View.GONE); + } + workAdapter.notifyDataSetChanged(); } - workAdapter.notifyDataSetChanged(); } @Override