添加飘屏和访客功能

2025-08-11 17:12:10 +08:00
parent 4f09ec38c1
commit eb1c3807cb
46 changed files with 1119312 additions and 922130 deletions
--- a/modulevocal/build.gradle
+++ b/modulevocal/build.gradle
@@ -15,8 +15,6 @@ android {

    defaultConfig {
        minSdk 24
-        versionCode 1
-        versionName "1.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        javaCompileOptions {
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java
@@ -32,7 +32,7 @@ public class BlacklistActivity extends BaseMvpActivity<BlacklistPresenter,Activi
    private static final String TAG = "BlacklistActivity";
    private int type;//关注--黑名单--粉丝
    BlackAdapter blackAdapter;
-    private String[] mTitles = new String[]{"关注", "黑名单", "粉丝"};
+    private String[] mTitles = new String[]{"关注", "黑名单", "粉丝","访客"};
    List<BlackUserBean> blackUserBeans;

    @Override
@@ -73,6 +73,8 @@ public class BlacklistActivity extends BaseMvpActivity<BlacklistPresenter,Activi
                blackAdapter.notifyItemRangeChanged(position, blackAdapter.getItemCount());
 //                removeItemFromServer(item); // 调用网络请求删除
                MvpPre.removeBlackList(String.valueOf(item.getUser_id()));
+            }else if (item.getType() == 3){
+
            }
        });

@@ -113,6 +115,15 @@ public class BlacklistActivity extends BaseMvpActivity<BlacklistPresenter,Activi
                }
                blackAdapter.setNewData(blackUserBeans);
            }
+        }else if (type.equals("3")){
+            if (list!=null){
+                List<BlackUserBean> blackUserBeans = new ArrayList<>();
+                for (BlackUserBean item:list){
+                    item.setType(3);
+                    blackUserBeans.add(item);
+                }
+                blackAdapter.setNewData(blackUserBeans);
+            }
        }

    }
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java
@@ -51,6 +51,7 @@ public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder
        helper.setText(R.id.tv_oline, item.getIs_online() == 1 ? "[在线]" : "[离线]");
        // 根据 type 设置图片资源
        // 根据 type 和 status 设置图片资源
+        imageView.setVisibility(View.VISIBLE);
        if (item.getType() == 0) { // 关注
            if (item.getIs_follow() == 0) {
                imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.gz);
@@ -65,6 +66,8 @@ public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder
            } else {
                imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.yigz);
            }
+        }else if (item.getType() == 3){
+            imageView.setVisibility(View.GONE);
        }

        // 设置点击事件
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/RevenueFragment.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/RevenueFragment.java
@@ -156,7 +156,7 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR

    @Override
    public void saveRevenueData(List<RevenueBean> bean) {
-        if (bean !=null || bean.size() > 0) {
+        if (bean !=null && bean.size() > 0) {
            List<RevenueBean> list = new ArrayList<>();
            for (RevenueBean revenueBean : bean) {
                revenueBean.setType(Integer.parseInt(type));
@@ -167,9 +167,10 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
            }else {
                adapter.addData(list);
            }
-        }else {
-            adapter.setNewData(new ArrayList<>());
        }
+//        else {
+//            adapter.setNewData(new ArrayList<>());
+//        }
    }

    @Override
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
@@ -18,6 +18,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Toast;

+import com.blankj.utilcode.util.ToastUtils;
 import com.example.modulevocal.R;
 import com.example.modulevocal.activity.BlacklistActivity;
 import com.example.modulevocal.activity.DailyTasksActivity;
@@ -46,7 +47,7 @@ import java.util.List;
 public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVocalRangeBinding> implements MeConacts.View {

 //    private MyInfoResp mMyInfoResp;
-    private UserBean userBean;
+    private UserInfo userInfo;

    public static VocalRangeFragment newInstance() {
        return new VocalRangeFragment();
@@ -74,62 +75,6 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc

    }

-//    private final MeItemAdapter.OnMeItemClickListener onMeItemClickListener = item -> {
-//        String type = item.getType();
-//        // 成为大神
-//        if ("skill".equals(type)) {
-//            ARouter.getInstance().build(ARouteConstants.ME_ALL_SKILLS).withString("from", "我的界面").navigation();
-//        }
-//        // 我的订单
-//        else if ("order".equals(type)) {
-//            ToastUtils.show("暂未开放");
-//        }
-//        // 评价订单
-//        else if ("pjOrder".equals(type)) {
-//            ToastUtils.show("暂未开放");
-//        }
-//        // 我的等级
-//        else if ("wdDengji".equals(type)) {
-//        }
-//        // 我的公会
-//        else if ("wdGonghui".equals(type)) {
-////            MvpPre.getGuildInfo();
-//            Intent intent = new Intent(getContext(), BaseWebActivity.class);
-//            intent.putExtra("url", BuildConfig.BASE_URL+"Api/guid/index");
-//            intent.putExtra("title", "我的公会");
-//            startActivity(intent);
-//        }
-//
-////        // 邀请有礼
-//        else if ("yqYouli".equals(type)) {
-//            ARouter.getInstance().build(ARouteConstants.MY_INVITE_CODE).withString("userCode", mMyInfoResp.getUser_code()).navigation();
-//        }
-//        // 实名认证
-//        else if ("verified".equals(type)) {
-//            //实名认证
-//            //判断用户是否已经注册过手机号
-//            if (TextUtils.isEmpty(SpUtils.getUserInfo().getMobile())) {
-//                ToastUtils.show("请先绑定手机号");
-//                ARouter.getInstance().build(ARouteConstants.ACCOUNT_SECURITY).navigation();
-//                return;
-//            }
-//            MvpPre.getNameAuthResult(0);
-//            AppLogUtil.reportAppLog(AppLogEvent.C0108);
-//        }
-//    };
-//    private final MeItemAdapter.OnMeItemClickListener onMeItemClickListener2 = item -> {
-//        String type = item.getType();
-//        if ("customer_service".equals(type)) {
-//            //在线客服
-//            MvpPre.serviceUser();
-//        } else if ("help_center".equals(type)) {
-//            //帮助中心
-//            ARouter.getInstance().build(ARouteConstants.ME_HELP).navigation();
-//        } else if ("settings".equals(type)) {
-//            //设置
-//            ARouter.getInstance().build(ARouteConstants.ME_SETTING).navigation();
-//        }
-//    };


    @Override
@@ -212,22 +157,21 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 //            intent.putExtra("title", "我的公会");
 //            startActivity(intent);
 //        }
-        else if (id == R.id.ll_fans) {
+        else if (id == R.id.ll_fans) {//粉丝
            Intent intent=new Intent(getContext(), BlacklistActivity.class);
            intent.putExtra("type",2);
            startActivity(intent);
-        } else if (id == R.id.ll_friends) {
+        } else if (id == R.id.ll_friends) {//访客
+            if (userInfo.getCharm_level()>=20){
+                Intent intent=new Intent(getContext(), BlacklistActivity.class);
+                intent.putExtra("type",3);
+                startActivity(intent);
+            }else {
+                ToastUtils.showShort("需要魅力等级20以上才能查看");
+            }
 //            ARouter.getInstance().build(ARouteConstants.ME_MY_FRIENDS).withInt("type", 0).navigation();
 //            AppLogUtil.reportAppLog(AppLogEvent.C0112);
        }
-//        else if (id == R.id.tv_ye_cz) {
-//            // 充值
-////            ARouter.getInstance().build(ARouteConstants.ME_BALANCE).withString("from", "我的界面").navigation();
-//        }
-//        else if (id == R.id.tv_jb_dh) {
-//            // 兑换金币
-////            ARouter.getInstance().build(ARouteConstants.ME_PROFIT).withString("from", "我的界面").withBoolean("showExDlg", true).navigation();
-//        }
        else if (id == R.id.im_my_room) {
            //我的房间
            startActivity(new Intent(getContext(), MyRoomActivity.class));
@@ -326,6 +270,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
    @Override
    public void myInfoSuccess(UserInfo data) {
        SpUtil.saveUserInfo(data);
+        this.userInfo = data;
        mBinding.rivUserHead.setData(data.getAvatar(), data.getDress(), String.valueOf(data.getSex()));
        mBinding.tvNickName.setText(data.getNickname());
        mBinding.beautifulView.setText("ID:"+data.getUser_code());
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/BlacklistPresenter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/BlacklistPresenter.java
@@ -50,6 +50,18 @@ public class BlacklistPresenter extends BasePresenter<BlacklistConacts.View> imp
                    addDisposable(d);
                }

+                @Override
+                public void onNext(List<BlackUserBean> userFollowBeans) {
+                    MvpRef.get().getUserFollowList(userFollowBeans, type);
+                }
+            });
+        }else if (type.equals("3")){
+            api.getLockMiniList(page, page_limit, new BaseObserver<List<BlackUserBean>>() {
+                @Override
+                public void onSubscribe(Disposable d) {
+                    addDisposable(d);
+                }
+
                @Override
                public void onNext(List<BlackUserBean> userFollowBeans) {
                    MvpRef.get().getUserFollowList(userFollowBeans, type);