Commit 47e56a4b authored by linfeng's avatar linfeng

短视频

parent 0065b57f
...@@ -221,7 +221,7 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen ...@@ -221,7 +221,7 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
private void processData(DiscoveryRecommendBean bean) { private void processData(DiscoveryRecommendBean bean) {
if (mPage == 1) { if (mPage == 1) {
countPage = bean.getData().getTotalPage(); countPage = bean.getData().getPageSize();
mRecommendAdapter.setNewData(bean.getData().getList()); mRecommendAdapter.setNewData(bean.getData().getList());
if (bean.getData().getTotalCount() == 0) { if (bean.getData().getTotalCount() == 0) {
mRecommendAdapter.setEmptyView(getEmptyView(rvContent, -1, "暂无推荐数据")); mRecommendAdapter.setEmptyView(getEmptyView(rvContent, -1, "暂无推荐数据"));
......
...@@ -32,7 +32,7 @@ import io.reactivex.schedulers.Schedulers; ...@@ -32,7 +32,7 @@ import io.reactivex.schedulers.Schedulers;
/** /**
* 短视频 * 短视频
*/ */
public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener { public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> implements SimpleRefreshLayout.OnSimpleRefreshListener {
@BindView(R2.id.rv_content) @BindView(R2.id.rv_content)
RecyclerView rvContent; RecyclerView rvContent;
...@@ -169,7 +169,7 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> impleme ...@@ -169,7 +169,7 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> impleme
private void processData(DiscoveryVideoBean bean) { private void processData(DiscoveryVideoBean bean) {
if (mPage == 1) { if (mPage == 1) {
countPage = bean.getData().getTotalPage(); countPage = bean.getData().getPageSize();
mAdapter.setNewData(bean.getData().getList()); mAdapter.setNewData(bean.getData().getList());
if (bean.getData().getTotalCount() == 0) { if (bean.getData().getTotalCount() == 0) {
// mAdapter.setEmptyView(getEmptyView(rvContent, -1, "暂无拍拍数据")); // mAdapter.setEmptyView(getEmptyView(rvContent, -1, "暂无拍拍数据"));
...@@ -181,15 +181,15 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> impleme ...@@ -181,15 +181,15 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> impleme
} }
} }
@Override // @Override
public void onLoadMoreRequested() { // public void onLoadMoreRequested() {
if (mPage >= countPage) { // if (mPage >= countPage) {
mAdapter.loadMoreEnd(); // mAdapter.loadMoreEnd();
} else { // } else {
mPage++; // mPage++;
geDataList(mPage); // geDataList(mPage);
} // }
} // }
@Override @Override
public void onRefresh() { public void onRefresh() {
......
...@@ -54,7 +54,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> { ...@@ -54,7 +54,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
private boolean isLoad; private boolean isLoad;
private int pagerIndex; private int pagerIndex;
boolean shareBack; boolean shareBack;
private VideoIMTokenBean ImTokenBean;
Handler handler = new Handler(new Handler.Callback() { Handler handler = new Handler(new Handler.Callback() {
@Override @Override
...@@ -125,9 +124,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> { ...@@ -125,9 +124,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
case 1: case 1:
processData((DiscoveryVideoBean) result); processData((DiscoveryVideoBean) result);
break; break;
case 2:
ImTokenBean = (VideoIMTokenBean) result;
break;
} }
} }
...@@ -229,7 +225,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> { ...@@ -229,7 +225,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
public void onHolder(VideoViewHolder holder, DiscoveryVideoBean.DataBeanX.DataBean bean, int position) { public void onHolder(VideoViewHolder holder, DiscoveryVideoBean.DataBeanX.DataBean bean, int position) {
ViewGroup.LayoutParams layoutParams = holder.itemView.getLayoutParams(); ViewGroup.LayoutParams layoutParams = holder.itemView.getLayoutParams();
layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;
holder.mp_video.updateDatas(bean, ""); holder.mp_video.updateDatas(bean, "");
holder.mp_video.onShareListener(TriListActivity.this); holder.mp_video.onShareListener(TriListActivity.this);
holder.mp_video.setPosiont(position); holder.mp_video.setPosiont(position);
...@@ -265,19 +260,4 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> { ...@@ -265,19 +260,4 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
mPresenter.postData(1, VideoApi.DISCOVERY_UNAUTH_LIST, DiscoveryVideoBean.class, map, false); mPresenter.postData(1, VideoApi.DISCOVERY_UNAUTH_LIST, DiscoveryVideoBean.class, map, false);
} }
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
loadImToken();
}
private void loadImToken() {
if (OkGoUtil.getToken() != null) {
Map<String, Object> headMap = new LinkedHashMap<>();
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postData(RvFrameConfig.HOST, 2, VideoApi.DISCOVERY_IM_LOGIN, VideoIMTokenBean.class, headMap, headMap, false);
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment