新闻接口修改
This commit is contained in:
parent
dbb19590d3
commit
34e2a6d41e
@ -227,7 +227,7 @@ public class NewsSearchActivity extends BaseActivity {
|
|||||||
* 保存查询的关键字
|
* 保存查询的关键字
|
||||||
*/
|
*/
|
||||||
private void doSaveKeywords() {
|
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);
|
bigDataRead(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,6 +65,7 @@ public class NewsFragment extends BaseFragment {
|
|||||||
private Disposable mD1;
|
private Disposable mD1;
|
||||||
private Disposable mD2;
|
private Disposable mD2;
|
||||||
private Disposable mDMenu;
|
private Disposable mDMenu;
|
||||||
|
private boolean mIsAll;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setDataToView(View dataView) {
|
protected void setDataToView(View dataView) {
|
||||||
@ -73,6 +74,7 @@ public class NewsFragment extends BaseFragment {
|
|||||||
mAdapter = new NewsAdapter(mActivity, mNewsDatas);
|
mAdapter = new NewsAdapter(mActivity, mNewsDatas);
|
||||||
mType = getArguments().getString("type");
|
mType = getArguments().getString("type");
|
||||||
mPId = getArguments().getString("pId");
|
mPId = getArguments().getString("pId");
|
||||||
|
mIsAll = getArguments().getBoolean("isAll", false);
|
||||||
mCurrentPage = 1;
|
mCurrentPage = 1;
|
||||||
mTotalPage = 0;
|
mTotalPage = 0;
|
||||||
mNewsDatas.clear();
|
mNewsDatas.clear();
|
||||||
@ -88,7 +90,9 @@ public class NewsFragment extends BaseFragment {
|
|||||||
.adapter(mAdapter)
|
.adapter(mAdapter)
|
||||||
.load(R.layout.item_skeleton_news)
|
.load(R.layout.item_skeleton_news)
|
||||||
.show();
|
.show();
|
||||||
getNewsSubMenu(mType);
|
if (!mIsAll) {
|
||||||
|
getNewsSubMenu(mType);
|
||||||
|
}
|
||||||
|
|
||||||
if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
|
if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
|
||||||
getNewsListByTypeToken(mCurrentPage);
|
getNewsListByTypeToken(mCurrentPage);
|
||||||
@ -154,7 +158,7 @@ public class NewsFragment extends BaseFragment {
|
|||||||
private void getNewsListByTypeToken(int page) {
|
private void getNewsListByTypeToken(int page) {
|
||||||
RetrofitManager.getInstance()
|
RetrofitManager.getInstance()
|
||||||
.create(HomeApi.class)
|
.create(HomeApi.class)
|
||||||
.getNewsListByToken(mType, "", page + "", UserLgUtils.getToken())
|
.getNewsListByToken(mIsAll ? "" : mType, mIsAll ? mType : "", page + "", UserLgUtils.getToken())
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribe(new Observer<NewsItemBean>() {
|
.subscribe(new Observer<NewsItemBean>() {
|
||||||
@ -262,7 +266,7 @@ public class NewsFragment extends BaseFragment {
|
|||||||
private void getNewsListByType(int page) {
|
private void getNewsListByType(int page) {
|
||||||
RetrofitManager.getInstance()
|
RetrofitManager.getInstance()
|
||||||
.create(HomeApi.class)
|
.create(HomeApi.class)
|
||||||
.getNewsList(mType, "",page + "")
|
.getNewsList(mIsAll ? "" : mType, mIsAll ? mType : "", page + "")
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribe(new Observer<NewsItemBean>() {
|
.subscribe(new Observer<NewsItemBean>() {
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
@ -9,13 +8,25 @@
|
|||||||
android:theme="@style/Theme.AppCompat"
|
android:theme="@style/Theme.AppCompat"
|
||||||
tools:ignore="MissingDefaultResource">
|
tools:ignore="MissingDefaultResource">
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.core.widget.NestedScrollView
|
||||||
android:id="@+id/rlv_menu"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="match_parent"
|
||||||
|
android:fillViewport="true">
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<LinearLayout
|
||||||
android:id="@+id/rlv_news_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/rlv_menu"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/rlv_news_content"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
|
</androidx.core.widget.NestedScrollView>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
Loading…
Reference in New Issue
Block a user