diff --git a/config.gradle b/config.gradle index 9006536b75..8cbaaddd98 100644 --- a/config.gradle +++ b/config.gradle @@ -141,6 +141,7 @@ targetSdkVersion : 22, videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2", videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2", eventbus : "org.greenrobot:eventbus:3.1.1", + videoprocessor : "com.zhidao.video:video-processor:1.0.2.1", coroutinescore : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1", coroutinesandroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1", diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 094b0b00d9..dc358c09d9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -13,10 +13,10 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.module.v2x.R; -import com.mogo.module.v2x.entity.panel.ShareEventDescription; -import com.mogo.module.v2x.entity.panel.ShareEventItem; -import com.mogo.module.v2x.entity.panel.ShareEventItemEnum; -import com.mogo.module.v2x.entity.panel.ShareEventLoadMoreItem; +import com.mogo.module.v2x.entity.panel.V2XShareEventDescription; +import com.mogo.module.v2x.entity.panel.V2XShareEventItem; +import com.mogo.module.v2x.entity.panel.V2XShareEventItemEnum; +import com.mogo.module.v2x.entity.panel.V2XShareEventLoadMoreItem; import com.mogo.module.v2x.fragment.V2XEventPanelFragment; import com.mogo.module.v2x.listener.AdapterCallback; import com.mogo.service.IMogoServiceApis; @@ -44,17 +44,17 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter position) { - ShareEventDescription.ResultBean.EnthusiasmIndexBean data = (ShareEventDescription.ResultBean.EnthusiasmIndexBean) dataArrayList.get(position); + V2XShareEventDescription.ResultBean.EnthusiasmIndexBean data = (V2XShareEventDescription.ResultBean.EnthusiasmIndexBean) dataArrayList.get(position); if (data != null) { String shareNum = String.valueOf(data.getShareNum()); String likeNum = String.valueOf(data.getLikeNum()); @@ -115,7 +115,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter position) { - ShareEventItem.ResultBean.PageBean.ContentBean data = (ShareEventItem.ResultBean.PageBean.ContentBean) dataArrayList.get(position); + V2XShareEventItem.ResultBean.PageBean.ContentBean data = (V2XShareEventItem.ResultBean.PageBean.ContentBean) dataArrayList.get(position); if (data != null) { String poitype = data.getPoiType(); String address = data.getUploadAddress(); @@ -141,29 +141,30 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter 0) { + Object data = dataArrayList.get(dataArrayList.size() - 1); + if (data instanceof V2XShareEventLoadMoreItem || data instanceof V2XShareEventLoadMoreItem) { + dataArrayList.remove(dataArrayList.size() - 1); + } + } if (resultData.getResult().getPage().getContent().size() > 0) { //当前页有数据 - if (dataArrayList.size() > 0) { - Object data = dataArrayList.get(dataArrayList.size() - 1); - if (data instanceof ShareEventLoadMoreItem) { - dataArrayList.remove(dataArrayList.size() - 1); - } - } dataArrayList.addAll(resultData.getResult().getPage().getContent()); - item.setViewType(ShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS); + item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS); item.setStatusText("查看更早记录"); + item.setClickable(true); } else { //当前页没有数据 - item.setViewType(ShareEventItemEnum.ITEM_TYPE_NO_MORE); + item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_NO_MORE); item.setStatusText("没有更多了"); + item.setClickable(false); } if (total > 10) { dataArrayList.add(item); @@ -147,7 +148,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba Log.d(TAG, "分享列表:" + dataArrayList.get(0)); } else { //空白 - item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); + item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); dataArrayList.add(item); } adapter.notifyDataSetChanged(); @@ -194,7 +195,9 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override public void loadMoreShareEventList() { - v2XShareNetworkModel.getShareEventList(pageNum + 1, 10, new V2XRefreshCallback() { + Log.d(TAG,"page--"+pageNum); + pageNum+=1; + v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() { @Override public void onSuccess(Object result) { loadSuccessWithShareEventList(result); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java index 45db4f5fc9..78710b8999 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java @@ -8,8 +8,8 @@ import com.mogo.module.v2x.entity.net.V2XLivePushVoRes; import com.mogo.module.v2x.entity.net.V2XSeekHelpRes; import com.mogo.module.v2x.entity.net.V2XStrategyPushRes; import com.mogo.module.v2x.entity.net.V2XUserInfoRes; -import com.mogo.module.v2x.entity.panel.ShareEventDescription; -import com.mogo.module.v2x.entity.panel.ShareEventItem; +import com.mogo.module.v2x.entity.panel.V2XShareEventDescription; +import com.mogo.module.v2x.entity.panel.V2XShareEventItem; import com.mogo.module.v2x.entity.panel.SurroundingResponse; import java.util.Map; @@ -117,14 +117,14 @@ public interface V2XApiService { */ @FormUrlEncoded @POST("/deva/poiInfoFabulous/car/poi/no/queryEnthusiasmIndex/v1") - Observable getEnthusiasmIndex(@FieldMap Map parames); + Observable getEnthusiasmIndex(@FieldMap Map parames); /** * 我的分享-列表 */ @FormUrlEncoded @POST("/deva/car/pathAndPoi/no/queryInfo") - Observable getShareEventList(@FieldMap Map parames); + Observable getShareEventList(@FieldMap Map parames); /* * 周边列表 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java index 5fe35ea297..417a113edf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java @@ -42,39 +42,13 @@ public class V2XShareNetworkModel { * 2.分享列表 * */ public void getShareEventResponse(int page, int size, V2XRefreshCallback callback) { - final ParamsProvider.Builder builder = new ParamsProvider.Builder(mContext); - HashMap hashMap = new HashMap<>(); - hashMap.put("sn", Utils.getSn()); - builder.append("data", GsonUtil.jsonFromObject(hashMap)); - Map parameters = builder.build(); Observable indexObservable = Observable.create(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { try { - //热心指数 - mRefreshApiService.getEnthusiasmIndex(parameters) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new SubscribeImpl(RequestOptions.create((mContext))) { - @Override - public void onSuccess(BaseData resultData) { - super.onSuccess(resultData); - if (callback != null) { - callback.onSuccess(resultData); - } - } - - @Override - public void onError(String message, int code) { - super.onError(message, code); - if (callback != null) { - callback.onFail(message); - } - } - - }); + getShareIndex(callback); } catch (Exception e) { e.printStackTrace(); } @@ -128,6 +102,40 @@ public class V2XShareNetworkModel { }); } + /* + * 热心指数 + * */ + public void getShareIndex(V2XRefreshCallback callback) { + final ParamsProvider.Builder builder = new ParamsProvider.Builder(mContext); + HashMap hashMap = new HashMap<>(); + hashMap.put("sn", Utils.getSn()); + builder.append("data", GsonUtil.jsonFromObject(hashMap)); + Map parameters = builder.build(); + //热心指数 + mRefreshApiService.getEnthusiasmIndex(parameters) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new SubscribeImpl(RequestOptions.create((mContext))) { + @Override + public void onSuccess(BaseData resultData) { + super.onSuccess(resultData); + if (callback != null) { + callback.onSuccess(resultData); + } + } + + @Override + public void onError(String message, int code) { + super.onError(message, code); + if (callback != null) { + callback.onFail(message); + } + } + + }); + + } + /* * 分享列表 * */ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 7f7650b06c..913477cb5a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -2,23 +2,38 @@ + android:layout_height="match_parent" + android:background="@color/live_video_background_color"> + android:layout_height="80dp"> + @@ -28,13 +43,13 @@ android:layout_height="match_parent" android:layout_below="@+id/layout_top"> - +