封版羽声，作为最后的基础版

modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java

@@ -51,7 +51,9 @@ import com.qxcm.moduleutil.bean.CommentBean;
 import com.qxcm.moduleutil.bean.ExpandColumnBean;
 import com.qxcm.moduleutil.bean.HeatedBean;
 import com.qxcm.moduleutil.dialog.ConfirmDialog;
+import com.qxcm.moduleutil.event.GiftRewardEvent;
 import com.qxcm.moduleutil.utils.ARouteConstants;
+import com.qxcm.moduleutil.utils.ChatLauncher;
 import com.qxcm.moduleutil.utils.ImageUtils;
 import com.qxcm.moduleutil.utils.SpUtil;
 import com.qxcm.moduleutil.widget.MyGridView;
@@ -60,6 +62,9 @@ import com.qxcm.moduleutil.widget.dialog.RewardGiftDialogFragment;
 import com.qxcm.moduleutil.widget.dialog.ShareDialog;
 import com.qxcm.moduleutil.widget.img.FullScreenUtil;
 
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -115,7 +120,8 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
 
             @Override
             public void onZsClick(CircleListBean item) {
-                RewardGiftDialogFragment.show(String.valueOf(item.getId()),item.getUser_id() + "", getSupportFragmentManager());
+                int position = cirleListAdapter.getData().indexOf(item);
+                RewardGiftDialogFragment.show(String.valueOf(item.getId()),item.getUser_id() + "",position, getSupportFragmentManager());
             }
 
             @Override
@@ -143,8 +149,11 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
 
             @Override
             public void onGensui(CircleListBean item) {
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form","首页热门列表").withString("roomId", item.getRoom_id()).navigation();
-
+                if (item.getRoom_id()!=null &&  !item.getRoom_id().equals("0")) {
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                }else {
+                    ChatLauncher.getInstance().launchC2CChat(DynamicDetailActivity.this, item.getUser_id()+"");
+                }
             }
         });
 
@@ -198,7 +207,10 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
         });
 
     }
-
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEvent(GiftRewardEvent event) {
+        cirleListAdapter.notifyItemChanged(event.getPoints());
+    }
     private void onClick(View view) {
         if (view.getId() == R.id.tv_send) {
             if (mBinding.etInput.getText().toString().isEmpty()) {
@@ -278,6 +290,11 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
         MvpPre.topicId(zone_id, 2);
     }
 
+    @Override
+    public void finishComment() {
+
+    }
+
     @Override
     public void onInputBoxShow(int id, String s, int position, String replyTo) {
         mBinding.etInput.requestFocus();

modulecircle/src/main/java/com/example/modulecircle/activity/DynamicListActivity.java

@@ -32,11 +32,16 @@ import com.qxcm.moduleutil.bean.CircleListBean;
 import com.qxcm.moduleutil.bean.CommentBean;
 import com.qxcm.moduleutil.bean.ExpandColumnBean;
 import com.qxcm.moduleutil.bean.HeatedBean;
+import com.qxcm.moduleutil.event.GiftRewardEvent;
 import com.qxcm.moduleutil.utils.ARouteConstants;
+import com.qxcm.moduleutil.utils.ChatLauncher;
 import com.qxcm.moduleutil.utils.ImageUtils;
 import com.qxcm.moduleutil.widget.dialog.RewardGiftDialogFragment;
 import com.qxcm.moduleutil.widget.dialog.ShareDialog;
 
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.util.List;
 /**
  *@author qx
@@ -87,7 +92,8 @@ public class DynamicListActivity extends BaseMvpActivity<CirclePresenter, Activi
 
             @Override
             public void onZsClick(CircleListBean item) {
-                RewardGiftDialogFragment.show(String.valueOf(item.getId()),item.getUser_id()+"", getSupportFragmentManager());
+                int position = cirleListAdapter.getData().indexOf(item);
+                RewardGiftDialogFragment.show(String.valueOf(item.getId()),item.getUser_id()+"",position, getSupportFragmentManager());
             }
 
             @Override
@@ -118,8 +124,11 @@ public class DynamicListActivity extends BaseMvpActivity<CirclePresenter, Activi
 
             @Override
             public void onGensui(CircleListBean item) {
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form","首页热门列表").withString("roomId", item.getRoom_id()).navigation();
-
+                if (item.getRoom_id()!=null &&  !item.getRoom_id().equals("0")) {
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                }else {
+                    ChatLauncher.getInstance().launchC2CChat(DynamicListActivity.this, item.getUser_id()+"");
+                }
             }
         });
     }
@@ -159,7 +168,10 @@ public class DynamicListActivity extends BaseMvpActivity<CirclePresenter, Activi
     public void setCircleDetail(CircleListBean bean) {
 
     }
-
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEvent(GiftRewardEvent event) {
+        cirleListAdapter.notifyItemChanged(event.getPoints());
+    }
     @Override
     public void getCommentList(CommentBean commentBean) {
 
@@ -169,4 +181,9 @@ public class DynamicListActivity extends BaseMvpActivity<CirclePresenter, Activi
     public void commentZone() {
 
     }
+
+    @Override
+    public void finishComment() {
+
+    }
 }

modulecircle/src/main/java/com/example/modulecircle/adapter/ExpandColumnAdapter.java

@@ -51,12 +51,11 @@ public class ExpandColumnAdapter extends BaseQuickAdapter<ExpandColumnBean, Base
 
     @Override
     protected void convert(BaseViewHolder helper, ExpandColumnBean item) {
-        helper.addOnClickListener(R.id.dy_head_image)
-        ;
+        helper.addOnClickListener(R.id.dy_head_image);
 
         //先让单图，多图，音频的布局显示
         helper.getView(R.id.dy_image_recyc).setVisibility(View.VISIBLE);
-
+        helper.setText(R.id.tv_agree,(item.getAgree()!=null?item.getAgree():"0")+"岁");
         //昵称
         helper.setText(R.id.dy_name_text, item.getNickname());
         helper.setText(R.id.tv_address, item.getLoginip());

modulecircle/src/main/java/com/example/modulecircle/contacts/CircleContacts.java

@@ -28,6 +28,7 @@ public class CircleContacts {
 
         void getCommentList(CommentBean commentBean);
         void commentZone();
+        void finishComment();
     }
 
     public interface IIndexPre extends IPresenter {

modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java

@@ -3,9 +3,11 @@ package com.example.modulecircle.fragment;
 import android.annotation.SuppressLint;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
 
@@ -30,6 +32,7 @@ import com.qxcm.moduleutil.bean.CircleListBean;
 import com.qxcm.moduleutil.bean.CommentBean;
 import com.qxcm.moduleutil.bean.ExpandColumnBean;
 import com.qxcm.moduleutil.bean.HeatedBean;
+import com.qxcm.moduleutil.event.GiftRewardEvent;
 import com.qxcm.moduleutil.utils.ARouteConstants;
 import com.qxcm.moduleutil.utils.ChatLauncher;
 import com.qxcm.moduleutil.widget.dialog.RewardGiftDialogFragment;
@@ -43,6 +46,10 @@ import com.zhpan.bannerview.indicator.DrawableIndicator;
 import com.zhpan.indicator.base.IIndicator;
 import com.zhpan.indicator.enums.IndicatorSlideMode;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -70,6 +77,12 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
 //        MvpPre.getCategories();
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
+    }
+
     @SuppressLint("WrongConstant")
     @Override
     protected void initView() {
@@ -125,7 +138,8 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
 
             @Override
             public void onZsClick(CircleListBean item) {//打赏
-                RewardGiftDialogFragment.show(String.valueOf(item.getId()),item.getUser_id()+"", getChildFragmentManager());
+                int position = cirleListAdapter.getData().indexOf(item);
+                RewardGiftDialogFragment.show(String.valueOf(item.getId()),item.getUser_id()+"",position, getChildFragmentManager());
             }
 
             @Override
@@ -181,6 +195,10 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
 
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEvent(GiftRewardEvent event) {
+        cirleListAdapter.notifyItemChanged(event.getPoints()-1);
+    }
     private IIndicator getVectorDrawableIndicator() {
         int dp6 = getResources().getDimensionPixelOffset(com.qxcm.moduleutil.R.dimen.dp_6);
         return new DrawableIndicator(getContext())
@@ -244,6 +262,12 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
 
     }
 
+    @Override
+    public void finishComment() {
+        mBinding.smartRefreshLayout.finishRefresh();
+        mBinding.smartRefreshLayout.finishLoadMore();
+    }
+
     // 拆分函数
     private <T> List<List<T>> splitListIntoChunks(List<T> list, int chunkSize) {
         List<List<T>> chunks = new ArrayList<>();

modulecircle/src/main/java/com/example/modulecircle/fragment/CircleFragment.java

@@ -110,6 +110,11 @@ public class CircleFragment extends BaseMvpFragment<CirclePresenter, FragmentCir
 
     }
 
+    @Override
+    public void finishComment() {
+
+    }
+
     private static class MyFragmentPagerAdapter extends FragmentStatePagerAdapter {
 
         private List<MyBagBean> list;

modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java

@@ -189,4 +189,9 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
     public void commentZone() {
 
     }
+
+    @Override
+    public void finishComment() {
+
+    }
 }

modulecircle/src/main/java/com/example/modulecircle/presenter/CirclePresenter.java

@@ -51,6 +51,7 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
             @Override
             public void onNext(List<CircleListBean> circleListBeans) {
                 MvpRef.get().setCircleList(circleListBeans);
+                MvpRef.get().finishComment();
             }
         });
     }

modulecircle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

modulecircle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>