Skip to content

R
RvApp
Commit 3bc4272d authored by linfeng's avatar linfeng
Browse files
Options

推广短视频

parents a6c78294 dd9c0061
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 37 deletions
RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java
View file @ 3bc4272d
......@@ -4,7 +4,6 @@ import android.Manifest;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
......@@ -28,8 +27,12 @@ import com.rv.component.utils.RvCache;
import com.rv.im.AppConfig;
import com.rv.im.bean.ImConfig;
import com.rv.im.bean.ImConfigBean;
import com.sh.sdk.shareinstall.ShareInstall;
import com.yuyife.okgo.OkGoUtil;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.concurrent.TimeUnit;
import io.reactivex.Flowable;
......@@ -73,6 +76,27 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);//隐藏菜单栏
permissionProcess();
initShareCode();
}
/********
* 保存分享的code
*/
private void initShareCode() {
ShareInstall.getInstance().getInfo(getIntent(), info -> {
// 客户端获取到的参数是json字符串格式
LogUtil.d("ShareInstall", "info = " + info);
JSONObject object;
try {
object = new JSONObject(info);
String inviteCode = object.optString("code");
if (!TextUtils.isEmpty(inviteCode)) {
AppCookie.save("code", inviteCode);
}
} catch (JSONException e) {
e.printStackTrace();
}
});
}
private void init() {
......
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java
View file @ 3bc4272d
......@@ -21,12 +21,13 @@ import com.ruiwenliu.wrapper.util.glide.GlideRoundTransform;
import com.xxfc.discovery.R;
import com.xxfc.discovery.bean.DiscoveryRecommendBean;
import com.xxfc.imcamera.photopicker.Image;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
/**
* 推荐
*/
public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecommendBean.DataBeanX.DataBean, BaseViewHolder> {
public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryDataBean, BaseViewHolder> {
private Display display;
......@@ -37,13 +38,13 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
@Override
protected void convert(BaseViewHolder helper, DiscoveryRecommendBean.DataBeanX.DataBean item) {
protected void convert(BaseViewHolder helper, DiscoveryDataBean item) {
if (item == null) {
return;
}
DiscoveryRecommendBean.DataBeanX.DataBean.Body body = item.getBody();
DiscoveryDataBean.Body body = item.getBody();
if (body != null) {
if (body.getImages() != null && body.getImages().size() > 0) {
// Glide.with(mContext)
......
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryShortVideoAdapter.java
View file @ 3bc4272d
......@@ -33,7 +33,6 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryDataBe
DiscoveryDataBean.Body body = item.getBody();
if (body != null) {
if (body.getVideos() != null && body.getVideos().size() > 0) {
ImageView image = helper.getView(R.id.iv_icon_video);
GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
......@@ -45,7 +44,7 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryDataBe
.centerCrop()
)
.asBitmap()
.load(body.getVideos().get(0).getOurl())
.load(item.getFirstImageOriginal())
.apply(options)
.apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(image.getWidth(), image.getHeight()))
.into(utils);
......
module_discovery/src/main/java/com/xxfc/discovery/bean/DiscoveryRecommendBean.java
View file @ 3bc4272d
......@@ -3,6 +3,7 @@ package com.xxfc.discovery.bean;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import java.io.Serializable;
import java.util.ArrayList;
......@@ -50,7 +51,7 @@ public class DiscoveryRecommendBean extends BaseBean {
private int navigateFirstPage;
private int navigateLastPage;
private List<DataBean> list;
private List<DiscoveryDataBean> list;
public int getTotalCount() {
return totalCount;
......@@ -204,11 +205,11 @@ public class DiscoveryRecommendBean extends BaseBean {
this.navigateLastPage = navigateLastPage;
}
public List<DataBean> getList() {
public List<DiscoveryDataBean> getList() {
return list;
}
public void setList(List<DataBean> list) {
public void setList(List<DiscoveryDataBean> list) {
this.list = list;
}
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java
View file @ 3bc4272d
......@@ -25,6 +25,7 @@ import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
import com.xxfc.discovery.bean.DiscoveryRecommendBean;
import com.xxfc.discovery.event.PostPatEvent;
import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap;
......@@ -99,7 +100,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
DiscoveryRecommendBean.DataBeanX.DataBean item = (DiscoveryRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
DiscoveryDataBean item = (DiscoveryDataBean) adapter.getItem(position);
if (item != null) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_DETAILPAT)
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/RecommendFragment.java
View file @ 3bc4272d
......@@ -22,9 +22,13 @@ import com.xxfc.discovery.api.DiscoveryApi;
import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
import com.xxfc.discovery.bean.DiscoveryRecommendBean;
import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.xxrv.video.activity.TriListActivity;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
......@@ -90,7 +94,7 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
mRecommendAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
DiscoveryRecommendBean.DataBeanX.DataBean item = (DiscoveryRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
DiscoveryDataBean item = (DiscoveryDataBean) adapter.getItem(position);
if (item != null) {
if ("2".equals(item.getBody().getType())) {
ARouter.getInstance()
......@@ -102,7 +106,9 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
.withString("userUrl", item.getPicUrl())
.navigation();
} else if ("4".equals(item.getBody().getType())) {
showToast("亲，该功能还在开发中。。。");
List<DiscoveryDataBean> data = new ArrayList<>();
data.add(item);
startActivity(TriListActivity.getIntent(_mActivity, 0, 0, data, false));
}
}
}
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/ShortVideoFragment.java
View file @ 3bc4272d
......@@ -93,9 +93,8 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> impleme
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
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));
startActivity(TriListActivity.getIntent(_mActivity, position, mPage, data,true));
}
}
});
......
module_home/build.gradle
View file @ 3bc4272d
......@@ -61,6 +61,7 @@ dependencies {
api project(':plugin_poster')
api project(':plugin_invoice')
api project(':RvWrapper')
api project(':plugin_video')
// api project(':RvTravel')
annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
implementation 'com.alibaba:fastjson:1.2.21'
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 3bc4272d
......@@ -82,6 +82,8 @@ import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
import com.rv.home.rv.module.ui.main.home.bean.SelectedActivitiesBean;
import com.rv.home.rv.module.ui.main.home.bean.ShopListBean;
import com.rv.home.rv.module.ui.main.home.presenter.HomePresenter;
import com.xxrv.video.activity.TriListActivity;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.yuyife.banner.Banner;
import com.yuyife.banner.BannerConfig;
import com.yuyife.banner.listener.OnBannerListener;
......@@ -339,9 +341,28 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
// mRvEnthusiast.bindToRecyclerView(recyclerViewRvEnthusiast);
// mRvEnthusiast.setEnableLoadMore(true);
// mRvEnthusiast.disableLoadMoreIfNotFullPage();
mRvEnthusiast.bindToRecyclerView(recyclerViewRvEnthusiast);
mRvEnthusiast.setEnableLoadMore(true);
mRvEnthusiast.disableLoadMoreIfNotFullPage();
mRvEnthusiast.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
if (recyclerViewRvEnthusiast != null) {
recyclerViewRvEnthusiast.postDelayed(new Runnable() {
@Override
public void run() {
if (mPage >= countPage) {
mRvEnthusiast.loadMoreEnd();
} else {
mPage++;
loadDisCovery(mPage);
}
}
}, 200);
}
}
}, recyclerViewRvEnthusiast);
// recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
......@@ -425,7 +446,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
mRvEnthusiast.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
HomeRecommendBean.DataBeanX.DataBean item = (HomeRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
DiscoveryDataBean item = (DiscoveryDataBean) adapter.getItem(position);
if (item != null) {
if ("2".equals(item.getBody().getType())) {
ARouter.getInstance()
......@@ -437,7 +458,9 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
.withString("userUrl", item.getPicUrl())
.navigation();
} else if ("4".equals(item.getBody().getType())) {
showToast("亲，该功能还在开发中。。。");
List<DiscoveryDataBean> data = new ArrayList<>();
data.add(item);
startActivity(TriListActivity.getIntent(_mActivity, 0, 0, data, false));
}
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/RVEnthusiastAdapter.java
View file @ 3bc4272d
......@@ -12,16 +12,17 @@ import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.rv.home.R;
import com.rv.home.rv.module.ui.main.home.bean.HomeRecommendBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
public class RVEnthusiastAdapter extends BaseQuickAdapter<HomeRecommendBean.DataBeanX.DataBean, BaseGlideHolder> {
public class RVEnthusiastAdapter extends BaseQuickAdapter<DiscoveryDataBean, BaseGlideHolder> {
public RVEnthusiastAdapter() {
super(R.layout.rv_item_rv_enthusiast);
}
@Override
protected void convert(BaseGlideHolder helper, HomeRecommendBean.DataBeanX.DataBean item) {
HomeRecommendBean.DataBeanX.DataBean.Body body = item.getBody();
protected void convert(BaseGlideHolder helper, DiscoveryDataBean item) {
DiscoveryDataBean.Body body = item.getBody();
if (body != null) {
if (body.getImages() != null && body.getImages().size() > 0) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/HomeRecommendBean.java
View file @ 3bc4272d
......@@ -2,6 +2,7 @@ package com.rv.home.rv.module.ui.main.home.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import java.io.Serializable;
import java.util.ArrayList;
......@@ -49,7 +50,7 @@ public class HomeRecommendBean extends BaseBean {
private int navigateFirstPage;
private int navigateLastPage;
private List<DataBean> list;
private List<DiscoveryDataBean> list;
public int getTotalCount() {
return totalCount;
......@@ -203,11 +204,11 @@ public class HomeRecommendBean extends BaseBean {
this.navigateLastPage = navigateLastPage;
}
public List<DataBean> getList() {
public List<DiscoveryDataBean> getList() {
return list;
}
public void setList(List<DataBean> list) {
public void setList(List<DiscoveryDataBean> list) {
this.list = list;
}
......
module_home/src/main/res/layout/rv_item_rv_enthusiast.xml
View file @ 3bc4272d
......@@ -43,16 +43,18 @@
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/size_5"
android:layout_marginBottom="@dimen/size_10"
android:paddingLeft="@dimen/size_5">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -66,8 +68,10 @@
android:id="@+id/tv_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text=""
android:layout_marginLeft="@dimen/size_3"
android:text="房车旅行家Rose"
android:textSize="@dimen/text_8" />
</LinearLayout>
......@@ -82,6 +86,6 @@
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
module_mine/src/main/java/com/rv/rvmine/fragment/MyReleaseVideoFragment.java
View file @ 3bc4272d
......@@ -130,7 +130,7 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
} else {
List<DiscoveryDataBean> data = adapter.getData();
if (data != null && data.size() > 0) {
startActivity(TriListActivity.getIntent(_mActivity, position, mPage, data));
startActivity(TriListActivity.getIntent(_mActivity, position, mPage, data, true));
}
}
}
......
plugin_video/src/main/java/com/xxrv/video/activity/TriListActivity.java
View file @ 3bc4272d
......@@ -86,7 +86,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
private VideoIMTokenBean ImTokenBean;
private ShareManager shareManager;
Handler handler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
......@@ -96,11 +95,12 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
}
});
public static Intent getIntent(Context context, int position, int page, List<DiscoveryDataBean> data) {
public static Intent getIntent(Context context, int position, int page, List<DiscoveryDataBean> data, boolean isMore) {
return new Intent(context, TriListActivity.class)
.putExtra("position", position)
.putExtra("page", page)
.putExtra("data", JSON.toJSONString(data));
.putExtra("data", JSON.toJSONString(data))
.putExtra("more", isMore);
}
......@@ -122,6 +122,7 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
position = intent.getIntExtra("position", 0);
pagerIndex = intent.getIntExtra("page", 0);
String data = intent.getStringExtra("data");
boolean more = intent.getBooleanExtra("more", false);
urlList = JSON.parseArray(data, DiscoveryDataBean.class);
snapHelper = new PagerSnapHelper();
......@@ -148,8 +149,9 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
}
}
});
addListener();
if (more) {
addListener();
}
}
@Override
......@@ -388,6 +390,4 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
mPresenter.getData(3, VideoApi.DISCOVERY_PLAYAMOUNT_ADD, VideoIMTokenBean.class, map, 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