Skip to content

R
RvApp
Commit 1c9d84d6 authored by linfeng's avatar linfeng
Browse files
Options

短视频

parent 89c7b062
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1655 additions and 764 deletions
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 1c9d84d6
......@@ -617,8 +617,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 5, ApiConfig.HTTP_URL_GET_PWD, DiscoveryIMTokenBean.class, headMap, false);
}
private void initIm() {
hasBindService = true;
ImSetting.setImConfig(Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_IMUSERID),
......
module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java
View file @ 1c9d84d6
package com.xxfc.discovery;
import android.Manifest;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
......@@ -30,17 +27,13 @@ import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.horizontal.GallerySnapHelper;
import com.ruiwenliu.wrapper.weight.horizontal.SpaceItemDecoration;
import com.xxfc.discovery.adapter.DiscoveryMenuAdapter;
import com.xxfc.discovery.event.DiscoveryAddEvent;
import com.xxfc.discovery.event.PostPatEvent;
import com.xxfc.discovery.event.PostVideoEvent;
import com.xxfc.discovery.fragment.PatFragment;
import com.xxfc.discovery.fragment.QuestionAndAnswerFragment;
import com.xxfc.discovery.fragment.RecommendFragment;
import com.xxfc.discovery.fragment.ShortVideoFragment;
import com.xxfc.discovery.other.ShortVideoActivity;
import com.xxfc.discovery.popupwindow.AddDiscoveryContentPw;
import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.xxrv.video.activity.RecordxActivity;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
......@@ -145,7 +138,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
list.add(_mActivity.getString(R.string.discovery_recommend));
list.add(_mActivity.getString(R.string.discovery_pat));
list.add(_mActivity.getString(R.string.discovery_short_video));
list.add(_mActivity.getString(R.string.discovery_question_and_answer));
// list.add(_mActivity.getString(R.string.discovery_question_and_answer));
menuAdapter.setNewData(list);
menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
......@@ -190,7 +183,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
list.add(RecommendFragment.getInstance(TYPE_RECOMMEND));
list.add(PatFragment.getInstance(TYPE_PAT));
list.add(ShortVideoFragment.getInstance(TYPE_SHORT_VIDEO));
list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
// list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
return list;
}
......@@ -263,15 +256,15 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
dismiss();
} else if (id == R.id.tv_short_video) {
verifyAudioPermissions(_mActivity);
// verifyAudioPermissions(_mActivity);
processPicker();
dismiss();
} else if (id == R.id.tv_ask_questions) {
//去提问
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_PUBLISHINGPROBLEM)
.navigation();
// ARouter.getInstance()
// .build(Constance.ACTIVITY_URL_PUBLISHINGPROBLEM)
// .navigation();
dismiss();
}
}
......@@ -299,24 +292,6 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
});
}
//申请录音权限
private static final int GET_RECODE_AUDIO = 1;
private static String[] PERMISSION_AUDIO = {
Manifest.permission.RECORD_AUDIO};
/*
* 申请录音权限*/
public static void verifyAudioPermissions(Activity activity) {
int permission = ActivityCompat.checkSelfPermission(activity,
Manifest.permission.RECORD_AUDIO);
if (permission != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(activity, PERMISSION_AUDIO,
GET_RECODE_AUDIO);
}
}
/**
* 打开相机和相册
*
......@@ -329,7 +304,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(_mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO).subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
......@@ -348,5 +323,10 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
} else {
}
//两个日历权限和一个数据读写权限
// String[] permissions = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO};
//// PermissionsUtils.showSystemSetting = false;//是否支持显示系统设置权限设置窗口跳转
// //这里的this不是上下文，是Activity对象！
// PermissionsUtils.getInstance().chekPermissions(_mActivity, permissions, permissionsResult);
}
}
}
\ No newline at end of file
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryShortVideoAdapter.java
View file @ 1c9d84d6
......@@ -11,13 +11,13 @@ import com.ruiwenliu.wrapper.util.TransformationUtil;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.xxfc.discovery.R;
import com.xxrv.video.bean.circle.DiscoveryVideoBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
/**
* 短视频
*/
public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryVideoBean.DataBeanX.DataBean, BaseViewHolder> {
public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryDataBean, BaseViewHolder> {
public DiscoveryShortVideoAdapter() {
super(R.layout.rv_item_discovery_short_video);
......@@ -25,12 +25,12 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryVideoB
@Override
protected void convert(BaseViewHolder helper, DiscoveryVideoBean.DataBeanX.DataBean item) {
protected void convert(BaseViewHolder helper, DiscoveryDataBean item) {
if (item == null) {
return;
}
DiscoveryVideoBean.DataBeanX.DataBean.Body body = item.getBody();
DiscoveryDataBean.Body body = item.getBody();
if (body != null) {
if (body.getVideos() != null && body.getVideos().size() > 0) {
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/ShortVideoFragment.java
View file @ 1c9d84d6
......@@ -20,6 +20,7 @@ import com.xxfc.discovery.api.DiscoveryApi;
import com.xxfc.discovery.event.PostVideoEvent;
import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.xxrv.video.activity.TriListActivity;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.xxrv.video.bean.circle.DiscoveryVideoBean;
import com.yuyife.okgo.OkGoUtil;
......@@ -91,7 +92,7 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> impleme
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
List<DiscoveryVideoBean.DataBeanX.DataBean> data = adapter.getData();
List<DiscoveryDataBean> data = adapter.getData();
// DiscoveryRecommendBean.DataBeanX.DataBean item = (DiscoveryRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
if (data != null && data.size() > 0) {
startActivity(TriListActivity.getIntent(_mActivity, position, mPage, data));
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/CarRentalCheckPriceAdapter.java
View file @ 1c9d84d6
......@@ -33,7 +33,6 @@ public class CarRentalCheckPriceAdapter extends BaseQuickAdapter<CarRentalPriceB
} else {
helper.setText(R.id.tv_price, "¥" + item.getPrice());
}
}
public void setType(boolean type) {
......
module_mine/build.gradle
View file @ 1c9d84d6
......@@ -59,5 +59,6 @@ dependencies {
api project(':plugin_coupon')
implementation project(':plugin_points')
implementation project(':plugin_wallet')
api project(':plugin_video')
}
module_mine/src/main/java/com/rv/rvmine/adapter/MyReleaseVideoAdapter.java
View file @ 1c9d84d6
......@@ -12,6 +12,7 @@ import com.ruiwenliu.wrapper.util.TransformationUtil;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.rv.rvmine.R;
import com.rv.rvmine.bean.MyReleaseBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import java.util.ArrayList;
import java.util.List;
......@@ -19,17 +20,17 @@ import java.util.List;
/**
* 短视频
*/
public class MyReleaseVideoAdapter extends BaseQuickAdapter<MyReleaseBean.DataBeanX.DataBean, BaseGlideHolder> {
public class MyReleaseVideoAdapter extends BaseQuickAdapter<DiscoveryDataBean, BaseGlideHolder> {
private boolean isShowDelete = false; // 默认不显示选择框
private List<MyReleaseBean.DataBeanX.DataBean> lists = new ArrayList<>(); // 选中
private List<DiscoveryDataBean> lists = new ArrayList<>(); // 选中
public MyReleaseVideoAdapter() {
super(R.layout.rv_item_rv_release_video);
}
public void changeBeanStatus(MyReleaseBean.DataBeanX.DataBean bean) {
public void changeBeanStatus(DiscoveryDataBean bean) {
if (lists.contains(bean)) {
lists.remove(bean);
} else {
......@@ -37,11 +38,11 @@ public class MyReleaseVideoAdapter extends BaseQuickAdapter<MyReleaseBean.DataBe
}
}
public void removeSelect(MyReleaseBean.DataBeanX.DataBean bean) {
public void removeSelect(DiscoveryDataBean bean) {
if (lists.contains(bean)) lists.remove(bean);
}
public List<MyReleaseBean.DataBeanX.DataBean> getSelectLists() {
public List<DiscoveryDataBean> getSelectLists() {
return lists;
}
......@@ -55,8 +56,8 @@ public class MyReleaseVideoAdapter extends BaseQuickAdapter<MyReleaseBean.DataBe
}
@Override
protected void convert(BaseGlideHolder helper, MyReleaseBean.DataBeanX.DataBean item) {
MyReleaseBean.DataBeanX.DataBean.Body body = item.getBody();
protected void convert(BaseGlideHolder helper, DiscoveryDataBean item) {
DiscoveryDataBean.Body body = item.getBody();
if (body != null) {
if (body.getVideos() != null && body.getVideos().size() > 0) {
......
module_mine/src/main/java/com/rv/rvmine/bean/MyReleaseVideoBean.java 0 → 100644
View file @ 1c9d84d6
package com.rv.rvmine.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
public class MyReleaseVideoBean extends BaseBean {
private DataBeanX data;
private boolean rel;
public DataBeanX getData() {
return data;
}
public void setData(DataBeanX data) {
this.data = data;
}
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
public static class DataBeanX {
private int totalCount;
private int totalPage;
private int pageNum;
private int pageSize;
private int total;
private int size;
private int startRow;
private int endRow;
private int pages;
private int prePage;
private int nextPage;
private boolean isFirstPage;
private boolean isLastPage;
private boolean hasPreviousPage;
private boolean hasNextPage;
private int navigatePages;
private ArrayList<Integer> navigatepageNums;
private int navigateFirstPage;
private int navigateLastPage;
private List<DiscoveryDataBean> data;
public int getTotalCount() {
return totalCount;
}
public void setTotalCount(int totalCount) {
this.totalCount = totalCount;
}
public int getTotalPage() {
return totalPage;
}
public void setTotalPage(int totalPage) {
this.totalPage = totalPage;
}
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public int getStartRow() {
return startRow;
}
public void setStartRow(int startRow) {
this.startRow = startRow;
}
public int getEndRow() {
return endRow;
}
public void setEndRow(int endRow) {
this.endRow = endRow;
}
public int getPages() {
return pages;
}
public void setPages(int pages) {
this.pages = pages;
}
public int getPrePage() {
return prePage;
}
public void setPrePage(int prePage) {
this.prePage = prePage;
}
public int getNextPage() {
return nextPage;
}
public void setNextPage(int nextPage) {
this.nextPage = nextPage;
}
public boolean isFirstPage() {
return isFirstPage;
}
public void setFirstPage(boolean firstPage) {
isFirstPage = firstPage;
}
public boolean isLastPage() {
return isLastPage;
}
public void setLastPage(boolean lastPage) {
isLastPage = lastPage;
}
public boolean isHasPreviousPage() {
return hasPreviousPage;
}
public void setHasPreviousPage(boolean hasPreviousPage) {
this.hasPreviousPage = hasPreviousPage;
}
public boolean isHasNextPage() {
return hasNextPage;
}
public void setHasNextPage(boolean hasNextPage) {
this.hasNextPage = hasNextPage;
}
public int getNavigatePages() {
return navigatePages;
}
public void setNavigatePages(int navigatePages) {
this.navigatePages = navigatePages;
}
public ArrayList<Integer> getNavigatepageNums() {
return navigatepageNums;
}
public void setNavigatepageNums(ArrayList<Integer> navigatepageNums) {
this.navigatepageNums = navigatepageNums;
}
public int getNavigateFirstPage() {
return navigateFirstPage;
}
public void setNavigateFirstPage(int navigateFirstPage) {
this.navigateFirstPage = navigateFirstPage;
}
public int getNavigateLastPage() {
return navigateLastPage;
}
public void setNavigateLastPage(int navigateLastPage) {
this.navigateLastPage = navigateLastPage;
}
public List<DiscoveryDataBean> getData() {
return data;
}
public void setData(List<DiscoveryDataBean> data) {
this.data = data;
}
}
}
module_mine/src/main/java/com/rv/rvmine/fragment/MyReleaseVideoFragment.java
View file @ 1c9d84d6
......@@ -19,7 +19,9 @@ import com.rv.home.rv.module.ApiConfig;
import com.rv.rvmine.R;
import com.rv.rvmine.R2;
import com.rv.rvmine.adapter.MyReleaseVideoAdapter;
import com.rv.rvmine.bean.MyReleaseBean;
import com.rv.rvmine.bean.MyReleaseVideoBean;
import com.xxrv.video.activity.TriListActivity;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.yuyife.okgo.OkGoUtil;
import java.util.Iterator;
......@@ -44,7 +46,7 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
private int mPage;
private MyReleaseVideoAdapter mAdapter;
private List<MyReleaseBean.DataBeanX.DataBean> delteMsgs;
private List<DiscoveryDataBean> delteMsgs;
public static MyReleaseVideoFragment getInstance(int type) {
Bundle bundl = new Bundle();
......@@ -120,21 +122,16 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
MyReleaseBean.DataBeanX.DataBean item = (MyReleaseBean.DataBeanX.DataBean) adapter.getItem(position);
DiscoveryDataBean item = (DiscoveryDataBean) adapter.getItem(position);
if (item != null) {
if (isShowDelete) {
mAdapter.changeBeanStatus(item);
mAdapter.notifyItemChanged(position);
} else {
// ARouter.getInstance()
// .build(Constance.ACTIVITY_URL_DETAILPAT)
// .withString("id", item.getMsgId())
// .withString("title", item.getBody().getText())
// .withString("iconUrl", item.getBody().getImages().get(0).getOurl())
// .withString("userName", item.getNickname())
// .withString("userUrl", item.getPicUrl())
// .navigation();
List<DiscoveryDataBean> data = adapter.getData();
if (data != null && data.size() > 0) {
startActivity(TriListActivity.getIntent(_mActivity, position, mPage, data));
}
}
}
}
......@@ -171,12 +168,12 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
mSimpleRefreshLayout.onRefreshComplete();
switch (requestType) {
case 0:
processData((MyReleaseBean) result);
processData((MyReleaseVideoBean) result);
break;
case 2:
Iterator<MyReleaseBean.DataBeanX.DataBean> iterator = delteMsgs.iterator();
Iterator<DiscoveryDataBean> iterator = delteMsgs.iterator();
while (iterator.hasNext()) {
MyReleaseBean.DataBeanX.DataBean bean = iterator.next();
DiscoveryDataBean bean = iterator.next();
if (mAdapter.getData().contains(bean)) {
int indexOf = mAdapter.getData().lastIndexOf(bean);
mAdapter.removeSelect(bean);
......@@ -201,7 +198,7 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
Map<String, Object> map = new LinkedHashMap<>();
StringBuilder builder = new StringBuilder();
for (MyReleaseBean.DataBeanX.DataBean bean : delteMsgs) {
for (DiscoveryDataBean bean : delteMsgs) {
builder.append(bean.getMsgId()).append(",");
}
map.put("ids", builder.toString().substring(0, builder.lastIndexOf(",")));
......@@ -209,7 +206,7 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
}
}
private void processData(MyReleaseBean bean) {
private void processData(MyReleaseVideoBean bean) {
if (mPage == 1) {
countPage = bean.getData().getPageSize();
mAdapter.setNewData(bean.getData().getData());
......@@ -249,7 +246,7 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
Map<String, Object> map = new LinkedHashMap<>();
map.put("page", page);
map.put("type", "4");
mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.RVENTHUSIAST_GETBYUSERID_LIST, MyReleaseBean.class, map, headMap, page == 1 ? true : false);
mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.RVENTHUSIAST_GETBYUSERID_LIST, MyReleaseVideoBean.class, map, headMap, page == 1 ? true : false);
}
public class AbSpacesItemDecoration extends RecyclerView.ItemDecoration {
......
module_mine/src/main/java/com/rv/rvmine/traveler/MyReleaseActivity.java
View file @ 1c9d84d6
......@@ -109,8 +109,8 @@ public class MyReleaseActivity extends BaseStatusActivity<CommonPresenter> {
GallerySnapHelper snapHelper = new GallerySnapHelper();
snapHelper.attachToRecyclerView(recyclerView);
List<String> list = new ArrayList<>();
// list.add("我的拍拍");
// list.add("我的短视频");
list.add("我的拍拍");
list.add("我的短视频");
// list.add("我的问答");
menuAdapter.setNewData(list);
......@@ -167,7 +167,7 @@ public class MyReleaseActivity extends BaseStatusActivity<CommonPresenter> {
myReleaseAskFragment = MyReleaseAskFragment.getInstance(TYPE_ASK);
List<BaseFragment> list = new ArrayList<>();
list.add(myReleasePatFragment);
// list.add(myReleaseVideoFragment);
list.add(myReleaseVideoFragment);
// list.add(myReleaseAskFragment);
return list;
}
......
plugin_video/src/main/java/com/xxrv/video/activity/TriListActivity.java
View file @ 1c9d84d6
......@@ -12,6 +12,7 @@ import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON;
import com.danikula.videocache.HttpProxyCacheServer;
......@@ -27,6 +28,7 @@ import com.xxrv.video.api.VideoApi;
import com.xxrv.video.base.BaseRecAdapter;
import com.xxrv.video.base.BaseRecViewHolder;
import com.xxrv.video.base.Proxy;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.xxrv.video.bean.circle.DiscoveryVideoBean;
import com.xxrv.video.bean.circle.VideoIMTokenBean;
import com.xxrv.video.presenter.VideoPresenter;
......@@ -49,7 +51,7 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
private PagerSnapHelper snapHelper;
private LinearLayoutManager layoutManager;
private ListVideoAdapter videoAdapter;
private List<DiscoveryVideoBean.DataBeanX.DataBean> urlList;
private List<DiscoveryDataBean> urlList;
private int position = -1;
private boolean isLoad;
private int pagerIndex;
......@@ -65,7 +67,7 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
}
});
public static Intent getIntent(Context context, int position, int page, List<DiscoveryVideoBean.DataBeanX.DataBean> data) {
public static Intent getIntent(Context context, int position, int page, List<DiscoveryDataBean> data) {
return new Intent(context, TriListActivity.class)
.putExtra("position", position)
.putExtra("page", page)
......@@ -91,7 +93,7 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
position = intent.getIntExtra("position", 0);
pagerIndex = intent.getIntExtra("page", 0);
String data = intent.getStringExtra("data");
urlList = JSON.parseArray(data, DiscoveryVideoBean.DataBeanX.DataBean.class);
urlList = JSON.parseArray(data, DiscoveryDataBean.class);
snapHelper = new PagerSnapHelper();
snapHelper.attachToRecyclerView(mPager);
......@@ -223,19 +225,26 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
}
class ListVideoAdapter extends BaseRecAdapter<DiscoveryVideoBean.DataBeanX.DataBean, VideoViewHolder> {
public ListVideoAdapter(List<DiscoveryVideoBean.DataBeanX.DataBean> list) {
class ListVideoAdapter extends BaseRecAdapter<DiscoveryDataBean, VideoViewHolder> {
public ListVideoAdapter(List<DiscoveryDataBean> list) {
super(list);
}
@Override
public void onHolder(VideoViewHolder holder, DiscoveryVideoBean.DataBeanX.DataBean bean, int position) {
public void onHolder(VideoViewHolder holder,DiscoveryDataBean bean, int position) {
ViewGroup.LayoutParams layoutParams = holder.itemView.getLayoutParams();
layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
holder.mp_video.updateDatas(bean, "");
holder.mp_video.onShareListener(TriListActivity.this);
holder.mp_video.setPosiont(position);
holder.back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
Log.e("xuan", "onHolder: " + position + " ,, " + TriListActivity.this.position);
if (position == TriListActivity.this.position) {
holder.mp_video.startVideo();
......@@ -251,11 +260,13 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
public class VideoViewHolder extends BaseRecViewHolder {
public View rootView;
public JcvTrillVideo mp_video;
public LinearLayout back;
public VideoViewHolder(View rootView) {
super(rootView);
this.rootView = rootView;
this.mp_video = rootView.findViewById(R.id.mp_video);
this.back = rootView.findViewById(R.id.ll_back);
}
}
......@@ -279,7 +290,7 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
private void playAmount() {
if (urlList != null && urlList.size() >= position) {
DiscoveryVideoBean.DataBeanX.DataBean dataBean = urlList.get(position);
DiscoveryDataBean dataBean = urlList.get(position);
Map<String, Object> map = new LinkedHashMap<>();
map.put("access_token", ImTokenBean.getData());
map.put("messageId", dataBean.getMsgId());
......
plugin_video/src/main/java/com/xxrv/video/adapter/ListVideoAdapter.java
View file @ 1c9d84d6
package com.xxrv.video.adapter;
import android.app.Activity;
import android.content.Context;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.xxrv.video.R;
import com.xxrv.video.activity.TriListActivity;
import com.xxrv.video.bean.circle.DiscoveryVideoBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.xxrv.video.weight.JcvTrillVideo;
/**
* 视频item
*/
public class ListVideoAdapter extends BaseQuickAdapter<DiscoveryVideoBean.DataBeanX.DataBean, BaseViewHolder> {
public class ListVideoAdapter extends BaseQuickAdapter<DiscoveryDataBean, BaseViewHolder> {
private final TriListActivity triListActivity;
private int mPosition;
......@@ -28,7 +22,7 @@ public class ListVideoAdapter extends BaseQuickAdapter<DiscoveryVideoBean.DataBe
}
@Override
protected void convert(BaseViewHolder helper, DiscoveryVideoBean.DataBeanX.DataBean item) {
protected void convert(BaseViewHolder helper, DiscoveryDataBean item) {
ViewGroup.LayoutParams layoutParams = helper.itemView.getLayoutParams();
layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
JcvTrillVideo mp_video = helper.getView(R.id.mp_video);
......
plugin_video/src/main/java/com/xxrv/video/dialog/TrillCommDialog.java
View file @ 1c9d84d6
......@@ -332,6 +332,7 @@ public class TrillCommDialog extends BottomSheetDialogFragment implements BaseVi
comment.setTime(System.currentTimeMillis() / 1000);
String userid = Cookie.getStringValue(getContext(), SPConstance.USER_JSON_USERID, "");
comment.setUserId(userid);
comment.setPicUrl(Cookie.getStringValue(getContext(), SPConstance.USER_JSON_HEADERURL, ""));
mCommentData.add(comment);
mListener.updateCommCount();
if (mCommentData.size() == 1) {// 说明之前没有评论
......@@ -394,7 +395,7 @@ public class TrillCommDialog extends BottomSheetDialogFragment implements BaseVi
@Override
public void onHolder(CommAvatarHolder holder, Comment bean, int position) {
String title = "@" + bean.getNickname();
String title = bean.getNickname();
if (!TextUtils.isEmpty(bean.getToNickname())) {
title += " " + getString(R.string.replay) + " @" + bean.getToNickname();
}
......
plugin_video/src/main/java/com/xxrv/video/weight/JcvTrillVideo.java
View file @ 1c9d84d6
......@@ -33,7 +33,7 @@ import com.xxrv.video.R;
import com.xxrv.video.activity.TriListActivity;
import com.xxrv.video.api.VideoApi;
import com.xxrv.video.base.Proxy;
import com.xxrv.video.bean.circle.DiscoveryVideoBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.xxrv.video.bean.circle.VideoIMTokenBean;
import com.xxrv.video.dialog.TrillCommDialog;
import com.xxrv.video.presenter.VideoPresenter;
......@@ -264,7 +264,7 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
return String.format(Locale.getDefault(), "%.1fw", count / 1000 / 10.0);
}
public void updateDatas(DiscoveryVideoBean.DataBeanX.DataBean bean, String token) {
public void updateDatas(DiscoveryDataBean bean, String token) {
mToken = token;
mMessageid = bean.getMsgId();
......
plugin_video/src/main/res/layout/item_trill.xml
View file @ 1c9d84d6
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.xxrv.video.weight.JcvTrillVideo
android:id="@+id/mp_video"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:use_type="use_padding_top">
<LinearLayout
android:id="@+id/ll_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/shv"
android:orientation="vertical"
android:padding="10dp">
<ImageView
android:layout_width="28dp"
android:layout_height="35dp"
android:src="@drawable/ic_back" />
</LinearLayout>
\ No newline at end of file
</LinearLayout>
</com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
</RelativeLayout>
\ No newline at end of file
plugin_video/src/main/res/layout/layout_jcv_trill.xml
View file @ 1c9d84d6
<?xml version="1.0" encoding="utf-8"?>
<com.xxrv.video.weight.likeView.LikeRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/like_relativeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
......
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