1:羽声新版本
This commit is contained in:
@@ -28,6 +28,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog;
|
||||
import com.xscm.moduleutil.activity.BaseMvpActivity;
|
||||
import com.xscm.moduleutil.adapter.CirleListAdapter;
|
||||
import com.xscm.moduleutil.adapter.CommentAdapter;
|
||||
import com.xscm.moduleutil.base.RoomManager;
|
||||
import com.xscm.moduleutil.bean.CircleListBean;
|
||||
import com.xscm.moduleutil.bean.CommentBean;
|
||||
import com.xscm.moduleutil.bean.ExpandColumnBean;
|
||||
@@ -128,7 +129,9 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
|
||||
@Override
|
||||
public void onGensui(CircleListBean item) {
|
||||
if (item.getRoom_id()!=null && !item.getRoom_id().equals("0")) {
|
||||
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
|
||||
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(),"");
|
||||
|
||||
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
|
||||
}else {
|
||||
ChatLauncher.getInstance().launchC2CChat(DynamicDetailActivity.this, item.getUser_id()+"");
|
||||
}
|
||||
@@ -187,7 +190,9 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
|
||||
}
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onEvent(GiftRewardEvent event) {
|
||||
cirleListAdapter.notifyItemChanged(event.getPoints());
|
||||
|
||||
MvpPre.topicId(zone_id, 2);
|
||||
// cirleListAdapter.notifyItemChanged(event.getPoints());
|
||||
}
|
||||
private void onClick(View view) {
|
||||
if (view.getId() == R.id.tv_send) {
|
||||
@@ -240,8 +245,13 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLikeZone() {
|
||||
MvpPre.topicId(zone_id, 2);
|
||||
public void setLikeZone(int type) {
|
||||
if (type == 1){
|
||||
finish();
|
||||
}else {
|
||||
// MvpPre.topicId(zone_id, 2);
|
||||
}
|
||||
// finish();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,6 +16,7 @@ import com.example.modulecircle.presenter.CirclePresenter;
|
||||
import com.example.modulevocal.activity.UserHomepageActivity;
|
||||
import com.xscm.moduleutil.activity.BaseMvpActivity;
|
||||
import com.xscm.moduleutil.adapter.CirleListAdapter;
|
||||
import com.xscm.moduleutil.base.RoomManager;
|
||||
import com.xscm.moduleutil.bean.CircleListBean;
|
||||
import com.xscm.moduleutil.bean.CommentBean;
|
||||
import com.xscm.moduleutil.bean.ExpandColumnBean;
|
||||
@@ -113,7 +114,9 @@ public class DynamicListActivity extends BaseMvpActivity<CirclePresenter, Activi
|
||||
@Override
|
||||
public void onGensui(CircleListBean item) {
|
||||
if (item.getRoom_id()!=null && !item.getRoom_id().equals("0")) {
|
||||
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
|
||||
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(),"");
|
||||
|
||||
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
|
||||
}else {
|
||||
ChatLauncher.getInstance().launchC2CChat(DynamicListActivity.this, item.getUser_id()+"");
|
||||
}
|
||||
@@ -147,18 +150,37 @@ public class DynamicListActivity extends BaseMvpActivity<CirclePresenter, Activi
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLikeZone() {
|
||||
public void setLikeZone(int type) {
|
||||
// ToastUtils.show("成功");
|
||||
// MvpPre.topicId(heatedBean.getTopic_id(),1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCircleDetail(CircleListBean bean) {
|
||||
|
||||
// 更新列表中的单个数据项(仅更新特定字段)
|
||||
if (cirleListAdapter != null && bean != null) {
|
||||
List<CircleListBean> dataList = cirleListAdapter.getData();
|
||||
if (dataList != null) {
|
||||
// 查找并更新对应的项
|
||||
for (int i = 0; i < dataList.size(); i++) {
|
||||
CircleListBean item = dataList.get(i);
|
||||
// 根据ID匹配需要更新的项
|
||||
if (item.getId() == bean.getId()) {
|
||||
// 只更新特定字段
|
||||
item.setRewards_num(bean.getRewards_num());
|
||||
// 可以继续更新其他需要的字段
|
||||
// 局部刷新该位置的数据
|
||||
cirleListAdapter.notifyItemChanged(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onEvent(GiftRewardEvent event) {
|
||||
cirleListAdapter.notifyItemChanged(event.getPoints());
|
||||
MvpPre.topicId(event.getZone_id(), 2);
|
||||
// cirleListAdapter.notifyItemChanged(event.getPoints());
|
||||
}
|
||||
@Override
|
||||
public void getCommentList(CommentBean commentBean) {
|
||||
|
||||
@@ -27,6 +27,7 @@ import com.example.modulecircle.contacts.ReleaseContract;
|
||||
import com.example.modulecircle.databinding.ActivityReleaseBinding;
|
||||
import com.example.modulecircle.adapter.MultiSelectAdapter;
|
||||
import com.example.modulecircle.presenter.ReleasePresenter;
|
||||
import com.example.modulevocal.activity.EditUserInfoActivity;
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialog;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.PictureConfig;
|
||||
@@ -40,6 +41,7 @@ import com.xscm.moduleutil.utils.GlideEngine;
|
||||
import com.xscm.moduleutil.utils.location.LocationProvider;
|
||||
import com.xscm.moduleutil.utils.location.LocationServiceFactory;
|
||||
import com.xscm.moduleutil.widget.Constants;
|
||||
import com.xscm.moduleutil.widget.img.FullScreenUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
@@ -90,11 +92,26 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
|
||||
@Override
|
||||
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
|
||||
String item = list.get(position);
|
||||
if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) {
|
||||
// 点击的是“+”号,启动图片选择
|
||||
startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, 9);
|
||||
int id = view.getId();
|
||||
if (id == com.example.modulevocal.R.id.iv_close) {
|
||||
uploadedUrls.remove(item);
|
||||
updateAdapterData();
|
||||
} else {
|
||||
// 查看大图或其他操作
|
||||
if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) {
|
||||
int maxSelectable = 9 - uploadedUrls.size();
|
||||
if (maxSelectable > 0) {
|
||||
// 点击的是"+"'号,启动图片选择
|
||||
startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, maxSelectable);
|
||||
} else {
|
||||
ToastUtils.showShort("最多只能选择9张图片");
|
||||
}
|
||||
// 点击的是“+”号,启动图片选择
|
||||
// startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, 9);
|
||||
} else {
|
||||
// 查看大图或其他操作
|
||||
// 查看大图或其他操作
|
||||
FullScreenUtil.showFullScreenDialog(ReleaseActivity.this, position, list);
|
||||
}
|
||||
}
|
||||
|
||||
// int id = view.getId();
|
||||
@@ -165,10 +182,15 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
|
||||
if (view.getId() == R.id.rl_1) {
|
||||
dialog();
|
||||
}else if (view.getId()==R.id.tv_fb){
|
||||
if (mBinding.tvFb.getText().toString().equals("正在发布...")){
|
||||
ToastUtils.showShort("请勿重复发布");
|
||||
return;
|
||||
}
|
||||
if (mBinding.etG.getText().toString().isEmpty()){
|
||||
ToastUtils.showShort("请输入发布内容");
|
||||
return;
|
||||
}
|
||||
mBinding.tvFb.setText( "正在发布...");
|
||||
MvpPre.publishZone(TextUtils.join(",", uploadedUrls),mBinding.etG.getText().toString(),TextUtils.join(",", topicId),"",city1);
|
||||
|
||||
}
|
||||
@@ -198,7 +220,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
|
||||
.setImageEngine(GlideEngine.createGlideEngine())
|
||||
.setMaxSelectNum(type)
|
||||
.isPreviewImage(true)
|
||||
.isDisplayCamera(true)
|
||||
.isDisplayCamera(false)
|
||||
.setOutputCameraDir(Constants.FILE_PATH)
|
||||
.isOriginalSkipCompress(true)
|
||||
|
||||
@@ -220,7 +242,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
|
||||
String path = media.isCompressed() ? media.getCompressPath() : media.getRealPath();
|
||||
imageFiles.add(new File(path));
|
||||
}
|
||||
|
||||
size = uploadedUrls.size();
|
||||
// 开始批量上传
|
||||
MvpPre.batchUploadFiles(imageFiles, 0); // 第二个参数是你原来的 type
|
||||
|
||||
@@ -306,7 +328,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
|
||||
|
||||
dialog.show();
|
||||
}
|
||||
|
||||
int size=0;
|
||||
@Override
|
||||
public void upLoadSuccess(String url, int type, int index, int total) {
|
||||
if (index >= 0 && index < uploadedUrls.size()) {
|
||||
@@ -315,13 +337,14 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
|
||||
uploadedUrls.add(url); // 添加到最后
|
||||
}
|
||||
|
||||
if (uploadedUrls.size() == total) {
|
||||
if (uploadedUrls.size() == total+size) {
|
||||
updateAdapterData(); // 所有图片上传完成,更新适配器数据
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void publishSuccess() {
|
||||
mBinding.etG.setText( "立即发布");
|
||||
ToastUtils.showShort("发布成功");
|
||||
finish();
|
||||
}
|
||||
|
||||
@@ -114,8 +114,8 @@ public class ExpandColumnAdapter extends BaseQuickAdapter<ExpandColumnBean, Base
|
||||
|
||||
ImageView imageView = new ImageView(mContext);
|
||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
||||
mContext.getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
|
||||
mContext.getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
|
||||
mContext.getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
|
||||
mContext.getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
|
||||
);
|
||||
params.setMargins(0, 0, mContext.getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
|
||||
imageView.setLayoutParams(params);
|
||||
|
||||
@@ -22,7 +22,7 @@ public class CircleContacts {
|
||||
|
||||
void setExpandColumn(List<ExpandColumnBean> list);
|
||||
|
||||
void setLikeZone();
|
||||
void setLikeZone(int type);
|
||||
|
||||
void setCircleDetail(CircleListBean bean);
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import com.example.modulecircle.contacts.CircleContacts;
|
||||
import com.example.modulecircle.databinding.FragmentCircleCategoryBinding;
|
||||
import com.example.modulecircle.presenter.CirclePresenter;
|
||||
import com.xscm.moduleutil.base.BaseMvpFragment;
|
||||
import com.xscm.moduleutil.base.RoomManager;
|
||||
import com.xscm.moduleutil.bean.BaseListData;
|
||||
import com.xscm.moduleutil.bean.CircleListBean;
|
||||
import com.xscm.moduleutil.bean.CommentBean;
|
||||
@@ -57,6 +58,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
page=1;
|
||||
MvpPre.getCategories();
|
||||
MvpPre.getCircleList("1", "10");
|
||||
}
|
||||
@@ -161,7 +163,9 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
|
||||
@Override
|
||||
public void onGensui(CircleListBean item) {
|
||||
if (item.getRoom_id()!=null && !item.getRoom_id().equals("0")) {
|
||||
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
|
||||
RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), item.getRoom_id(),"");
|
||||
|
||||
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
|
||||
}else {
|
||||
ChatLauncher.getInstance().launchC2CChat(getActivity(), item.getUser_id()+"");
|
||||
}
|
||||
@@ -186,7 +190,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onEvent(GiftRewardEvent event) {
|
||||
cirleListAdapter.notifyItemChanged(event.getPoints()-1);
|
||||
MvpPre.topicId(event.getZone_id(), 2);
|
||||
}
|
||||
private IIndicator getVectorDrawableIndicator() {
|
||||
int dp6 = getResources().getDimensionPixelOffset(com.xscm.moduleutil.R.dimen.dp_6);
|
||||
@@ -224,6 +228,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
|
||||
@Override
|
||||
public void setCircleList(List<CircleListBean> list) {
|
||||
if (page == 1) {
|
||||
cirleListAdapter.setNewData(new ArrayList<>());
|
||||
cirleListAdapter.setNewData(list);
|
||||
}else {
|
||||
if (list!=null && list.size() > 0){
|
||||
@@ -238,13 +243,34 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLikeZone() {
|
||||
MvpPre.getCircleList(page + "", "10");
|
||||
public void setLikeZone(int type) {
|
||||
if (type == 1) {
|
||||
MvpPre.getCircleList(page + "", "10");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCircleDetail(CircleListBean bean) {
|
||||
|
||||
// 更新列表中的单个数据项(仅更新特定字段)
|
||||
if (cirleListAdapter != null && bean != null) {
|
||||
List<CircleListBean> dataList = cirleListAdapter.getData();
|
||||
if (dataList != null) {
|
||||
// 查找并更新对应的项
|
||||
for (int i = 0; i < dataList.size(); i++) {
|
||||
CircleListBean item = dataList.get(i);
|
||||
// 根据ID匹配需要更新的项
|
||||
if (item.getId() == bean.getId()) {
|
||||
// 只更新特定字段
|
||||
item.setRewards_num(bean.getRewards_num());
|
||||
// 可以继续更新其他需要的字段
|
||||
// 局部刷新该位置的数据
|
||||
cirleListAdapter.notifyItemChanged(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -89,7 +89,7 @@ public class CircleFragment extends BaseMvpFragment<CirclePresenter, FragmentCir
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLikeZone() {
|
||||
public void setLikeZone(int type) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.example.modulecircle.contacts.CircleContacts;
|
||||
import com.example.modulecircle.databinding.FragmentExpandColumnBinding;
|
||||
import com.example.modulecircle.presenter.CirclePresenter;
|
||||
import com.xscm.moduleutil.base.BaseMvpFragment;
|
||||
import com.xscm.moduleutil.base.RoomManager;
|
||||
import com.xscm.moduleutil.bean.CircleListBean;
|
||||
import com.xscm.moduleutil.bean.CommentBean;
|
||||
import com.xscm.moduleutil.bean.ExpandColumnBean;
|
||||
@@ -25,6 +26,7 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
|
||||
import org.angmarch.views.NiceSpinner;
|
||||
import org.angmarch.views.OnSpinnerItemSelectedListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
@@ -61,10 +63,13 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
|
||||
mBinding.niceSpinner.setText(item);
|
||||
if (item.equals("只看女生")){
|
||||
type="2";
|
||||
page=1;
|
||||
}else if (item.equals("只看男生")){
|
||||
type="1";
|
||||
page=1;
|
||||
}else {
|
||||
type="0";
|
||||
page=1;
|
||||
}
|
||||
MvpPre.getExpandColumn(type,"1", "10");
|
||||
// mBinding.niceSpinner.getItemAtPosition(position);
|
||||
@@ -126,7 +131,9 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
|
||||
@Override
|
||||
public void onGnsClick(ExpandColumnBean item) {
|
||||
if ( item.getRoom_id()!=0){
|
||||
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()+"").navigation();
|
||||
RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), item.getRoom_id()+"","");
|
||||
|
||||
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()+"").navigation();
|
||||
}else {
|
||||
ChatLauncher.getInstance().launchC2CChat(getActivity(), item.getUser_id()+"");
|
||||
}
|
||||
@@ -136,6 +143,7 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
page=1;
|
||||
MvpPre.getExpandColumn(type,"1", "10");
|
||||
}
|
||||
@Override
|
||||
@@ -160,17 +168,39 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
|
||||
|
||||
@Override
|
||||
public void setExpandColumn(List<ExpandColumnBean> list) {
|
||||
if (page==1) {
|
||||
expandColumnAdapter.setNewData(list);
|
||||
}else {
|
||||
if (list!=null && list.size()>0){
|
||||
expandColumnAdapter.addData(list);
|
||||
if (type.equals("2")) {
|
||||
if (page == 1) {
|
||||
expandColumnAdapter.setNewData(new ArrayList<>());
|
||||
expandColumnAdapter.setNewData(list);
|
||||
} else {
|
||||
if (list != null && list.size() > 0) {
|
||||
expandColumnAdapter.addData(list);
|
||||
}
|
||||
}
|
||||
}else if (type.equals("1")){
|
||||
if (page == 1) {
|
||||
expandColumnAdapter.setNewData(new ArrayList<>());
|
||||
expandColumnAdapter.setNewData(list);
|
||||
} else {
|
||||
if (list != null && list.size() > 0) {
|
||||
expandColumnAdapter.addData(list);
|
||||
}
|
||||
}
|
||||
|
||||
}else if (type.equals("0")){
|
||||
if (page == 1) {
|
||||
expandColumnAdapter.setNewData(new ArrayList<>());
|
||||
expandColumnAdapter.setNewData(list);
|
||||
} else {
|
||||
if (list != null && list.size() > 0) {
|
||||
expandColumnAdapter.addData(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLikeZone() {
|
||||
public void setLikeZone(int type) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -10,14 +10,18 @@ import com.xscm.moduleutil.bean.HeatedBean;
|
||||
import com.xscm.moduleutil.http.BaseObserver;
|
||||
import com.xscm.moduleutil.presenter.BasePresenter;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.List;
|
||||
|
||||
import io.reactivex.disposables.Disposable;
|
||||
|
||||
public class CirclePresenter extends BasePresenter<CircleContacts.View> implements CircleContacts.IIndexPre {
|
||||
|
||||
CircleContacts.View mView;
|
||||
|
||||
public CirclePresenter(CircleContacts.View view, Context context) {
|
||||
super(view, context);
|
||||
this.mView = view;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -32,6 +36,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(List<HeatedBean> heatedBeanList) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().setCategories(heatedBeanList);
|
||||
}
|
||||
});
|
||||
@@ -48,6 +55,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(List<CircleListBean> circleListBeans) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().setCircleList(circleListBeans);
|
||||
MvpRef.get().finishComment();
|
||||
}
|
||||
@@ -65,6 +75,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(List<ExpandColumnBean> expandColumnBeans) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().setExpandColumn(expandColumnBeans);
|
||||
MvpRef.get().finishComment();
|
||||
|
||||
@@ -101,7 +114,10 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(String s) {
|
||||
MvpRef.get().setLikeZone();
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().setLikeZone(2);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -117,6 +133,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(List<CircleListBean> circleListBeans) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().setCircleList(circleListBeans);
|
||||
}
|
||||
});
|
||||
@@ -129,6 +148,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(CircleListBean circleListBeans) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().setCircleDetail(circleListBeans);
|
||||
}
|
||||
});
|
||||
@@ -146,7 +168,10 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(String s) {
|
||||
MvpRef.get().setLikeZone();
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().setLikeZone(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -162,6 +187,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(CommentBean commentBean) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().getCommentList(commentBean);
|
||||
}
|
||||
});
|
||||
@@ -178,6 +206,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(String s) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().commentZone();
|
||||
}
|
||||
});
|
||||
@@ -193,6 +224,9 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
|
||||
|
||||
@Override
|
||||
public void onNext(String s) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().commentZone();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -7,14 +7,17 @@ import com.hjq.toast.ToastUtils;
|
||||
import com.xscm.moduleutil.bean.HeatedBean;
|
||||
import com.xscm.moduleutil.http.BaseObserver;
|
||||
import com.xscm.moduleutil.presenter.BasePresenter;
|
||||
import com.xscm.moduleutil.utils.cos.CosUploadManager;
|
||||
import com.xscm.moduleutil.utils.oss.OSSOperUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.List;
|
||||
|
||||
import io.reactivex.disposables.Disposable;
|
||||
|
||||
public class ReleasePresenter extends BasePresenter<ReleaseContract.View> implements ReleaseContract.IIndexPre {
|
||||
ReleaseContract.View mView;
|
||||
public ReleasePresenter(ReleaseContract.View view, Context context) {
|
||||
super(view, context);
|
||||
}
|
||||
@@ -29,6 +32,9 @@ public class ReleasePresenter extends BasePresenter<ReleaseContract.View> implem
|
||||
|
||||
@Override
|
||||
public void onNext(List<HeatedBean> heatedBeanList) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().topicList(heatedBeanList);
|
||||
}
|
||||
});
|
||||
@@ -43,22 +49,43 @@ public class ReleasePresenter extends BasePresenter<ReleaseContract.View> implem
|
||||
@Override
|
||||
public void uploadFile(File file, int type,int index,int size) {
|
||||
// MvpRef.get().showLoadings("上传中...");
|
||||
|
||||
|
||||
|
||||
String url = OSSOperUtils.getPath(file, type);
|
||||
OSSOperUtils.newInstance().putObjectMethod(url, file.getPath(), new OSSOperUtils.OssCallback() {
|
||||
CosUploadManager.getInstance().upParameters(url,file.getPath(), new CosUploadManager.UploadCallback() {
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
if (isViewAttach()) {
|
||||
MvpRef.get().upLoadSuccess(OSSOperUtils.AliYunOSSURLFile + url, type, index, size);
|
||||
public void onSuccess(String url) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().upLoadSuccess(url, type, index, size);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFail() {
|
||||
if (isViewAttach()) {
|
||||
ToastUtils.show("上传失败");
|
||||
}
|
||||
public void onFailure(Exception e) {
|
||||
ToastUtils.show("上传失败");
|
||||
}
|
||||
});
|
||||
// OSSOperUtils.newInstance().putObjectMethod(url, file.getPath(), new OSSOperUtils.OssCallback() {
|
||||
// @Override
|
||||
// public void onSuccess() {
|
||||
// if (isViewAttach()) {
|
||||
// if (MvpRef==null){
|
||||
// MvpRef=new WeakReference<>(mView);
|
||||
// }
|
||||
// MvpRef.get().upLoadSuccess(OSSOperUtils.AliYunOSSURLFile + url, type, index, size);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onFail() {
|
||||
// if (isViewAttach()) {
|
||||
// ToastUtils.show("上传失败");
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -72,6 +99,9 @@ public class ReleasePresenter extends BasePresenter<ReleaseContract.View> implem
|
||||
|
||||
@Override
|
||||
public void onNext(String s) {
|
||||
if (MvpRef==null){
|
||||
MvpRef=new WeakReference<>(mView);
|
||||
}
|
||||
MvpRef.get().publishSuccess();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
|
||||
app:srlEnableLoadMore="true"
|
||||
app:srlEnableRefresh="false">
|
||||
app:srlEnableRefresh="true">
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:layout_width="match_parent"
|
||||
@@ -80,7 +80,7 @@
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_20"/>
|
||||
android:layout_height="@dimen/dp_45"/>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
|
||||
@@ -68,7 +68,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginStart="@dimen/dp_9"
|
||||
android:gravity="center_vertical"/>
|
||||
android:gravity="center_vertical"
|
||||
android:visibility="gone"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user