diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java index 168f925..cc818db 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java @@ -227,7 +227,7 @@ public class NewsSearchActivity extends BaseActivity { * 保存查询的关键字 */ private void doSaveKeywords() { - String params = String.format(getResources().getString(R.string.big_data_str), "QUERY", mKeywords, "END"); + String params = String.format(getResources().getString(R.string.big_data_str), "QUERY", mKeywords, "新闻"); bigDataRead(params); } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java index 2157fb9..612a9b1 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java @@ -65,6 +65,7 @@ public class NewsFragment extends BaseFragment { private Disposable mD1; private Disposable mD2; private Disposable mDMenu; + private boolean mIsAll; @Override protected void setDataToView(View dataView) { @@ -73,6 +74,7 @@ public class NewsFragment extends BaseFragment { mAdapter = new NewsAdapter(mActivity, mNewsDatas); mType = getArguments().getString("type"); mPId = getArguments().getString("pId"); + mIsAll = getArguments().getBoolean("isAll", false); mCurrentPage = 1; mTotalPage = 0; mNewsDatas.clear(); @@ -88,7 +90,9 @@ public class NewsFragment extends BaseFragment { .adapter(mAdapter) .load(R.layout.item_skeleton_news) .show(); - getNewsSubMenu(mType); + if (!mIsAll) { + getNewsSubMenu(mType); + } if (!TextUtils.isEmpty(UserLgUtils.getToken())) { getNewsListByTypeToken(mCurrentPage); @@ -154,7 +158,7 @@ public class NewsFragment extends BaseFragment { private void getNewsListByTypeToken(int page) { RetrofitManager.getInstance() .create(HomeApi.class) - .getNewsListByToken(mType, "", page + "", UserLgUtils.getToken()) + .getNewsListByToken(mIsAll ? "" : mType, mIsAll ? mType : "", page + "", UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -262,7 +266,7 @@ public class NewsFragment extends BaseFragment { private void getNewsListByType(int page) { RetrofitManager.getInstance() .create(HomeApi.class) - .getNewsList(mType, "",page + "") + .getNewsList(mIsAll ? "" : mType, mIsAll ? mType : "", page + "") .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { diff --git a/modulemain/src/main/res/layout/fragment_news.xml b/modulemain/src/main/res/layout/fragment_news.xml index 7fe1cce..daf69b3 100755 --- a/modulemain/src/main/res/layout/fragment_news.xml +++ b/modulemain/src/main/res/layout/fragment_news.xml @@ -1,6 +1,5 @@ - + android:layout_height="match_parent" + android:fillViewport="true"> - + + + + + + + \ No newline at end of file