1、修复添加按钮消失问题\n2、修改家族导图\n3、新增便捷添加功能\n4、新增修改头像功能\n5、个人财产增加搜索条件

Linjiajia

2023-09-21 454a84caa83c4ebc1b4c422f10166bddfb0e03ec

 app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java

@@ -2,10 +2,9 @@

import android.content.Intent;
import android.os.Bundle;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.PopupWindow;

import androidx.fragment.app.Fragment;
@@ -13,26 +12,19 @@
import androidx.lifecycle.Observer;

import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.GlideUtil;
import com.android.app_base.utils.ScreenSizeUtils;
import com.android.app_base.utils.rxbus.MessageEvent;
import com.android.app_base.utils.rxbus.RxBus;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.BannerBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.databinding.FragmentFunctionBinding;
import com.application.zhangshi_app_android.ui.DLBaseFragment;
import com.application.zhangshi_app_android.ui.TestActivity;
import com.application.zhangshi_app_android.ui.dialog.TotalAddDialog;
import com.application.zhangshi_app_android.ui.home.HomeFragment;
import com.application.zhangshi_app_android.ui.main.MainActivity;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import io.reactivex.functions.Consumer;

/**
 * @author Ljj
@@ -42,8 +34,9 @@
public class FunctionFragment extends DLBaseFragment<FragmentFunctionBinding,FunctionFragmentViewModel> {

    private PopupWindow mOperatePopupWindow;
    private PopupWindow mAddPopupWindow;
    private ImageCarouselFragment imageCarouselFragment;
    private VideoFragment videoFragment;
    private VideoCarouselFragment videoCarouselFragment;

    private FunctionFragment() {
    }
@@ -140,13 +133,77 @@
        binding.layoutContacts.setOnClickListener(v->{
            AppManager.getAppManager().startActivity(ContactsActivity.class);
        });
        binding.ivOperate.setOnClickListener(v->{
            AppManager.getAppManager().startActivity(TestActivity.class);

        binding.fabAdd.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

            }
        });
        binding.fabAdd.setOnTouchListener(new View.OnTouchListener() {

            private boolean isDragging = false;
            private int startX, startY;
            private float dX, dY;

            @Override
            public boolean onTouch(View v, MotionEvent event) {
                boolean flag = false;

                switch (event.getAction()) {
                    case MotionEvent.ACTION_DOWN:
                        // 计算手指按下时相对于 FloatingActionButton 的偏移量
                        dX = v.getX() - event.getRawX();
                        dY = v.getY() - event.getRawY();
                        startY = (int) event.getRawY();
                        startX = (int) event.getRawX();
                        isDragging = false;
                        break;
                    case MotionEvent.ACTION_MOVE:
                        // 更新 FloatingActionButton 的位置
                        float newX = event.getRawX() + dX;
                        float newY = event.getRawY() + dY;

                        // 限制移动范围
                        float minX = 0;
                        float maxX = binding.container.getWidth() - v.getWidth();
                        float minY = 0;
                        float maxY = binding.container.getHeight() - v.getHeight();

                        // 确保不超出范围
                        if (newX < minX) {
                            newX = minX;
                        } else if (newX > maxX) {
                            newX = maxX;
                        }

                        if (newY < minY) {
                            newY = minY;
                        } else if (newY > maxY) {
                            newY = maxY;
                        }
                        v.setX(newX);
                        v.setY(newY);
                        if (Math.abs(event.getRawX() - startX) > 10 || Math.abs(event.getRawY() - startY) > 10) {
                            isDragging = true; // 如果移动距离大于阈值，认为是拖动
                        }else {
                            isDragging = false;
                        }
                        flag = true;
                        break;
                    case MotionEvent.ACTION_UP:
                        if (!isDragging) {
                            // 如果没有拖动，认为是点击事件
                            new TotalAddDialog.Builder(getContext()).show();
                        }
                        break;
                    default:
                        break;
                }
                return flag;
            }
        });

        imageCarouselFragment = ImageCarouselFragment.newInstance();
        videoFragment = VideoFragment.newInstance();
        replaceFragment(imageCarouselFragment);
        binding.ivOperateSelect.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
@@ -158,10 +215,9 @@
        mOperatePopupWindow = initPopUpWindow(View.inflate(getSelfActivity(),R.layout.pop_switch_video_or_image,null));
        mOperatePopupWindow.getContentView().findViewById(R.id.tv_image).setOnClickListener(v -> {
            mOperatePopupWindow.dismiss();
            if (imageCarouselFragment == null){
                imageCarouselFragment = ImageCarouselFragment.newInstance();
            }
            imageCarouselFragment = ImageCarouselFragment.newInstance();
            replaceFragment(imageCarouselFragment);
            imageCarouselFragment.setImageList(viewModel.getImageListLiveData().getValue());
            binding.ivOperateSelect.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
@@ -171,14 +227,13 @@
        });
        mOperatePopupWindow.getContentView().findViewById(R.id.tv_video).setOnClickListener(v -> {
            mOperatePopupWindow.dismiss();
            if (videoFragment == null){
                videoFragment = VideoFragment.newInstance();
            }
            replaceFragment(videoFragment);
            videoCarouselFragment = VideoCarouselFragment.newInstance();
            replaceFragment(videoCarouselFragment);
            videoCarouselFragment.setVideoList(viewModel.getVideoListLiveData().getValue());
            binding.ivOperateSelect.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    AppManager.getAppManager().startActivity(new Intent(getSelfActivity(),ImageSelectActivity.class).putExtra("flag",1).putExtra("list", (Serializable) videoFragment.getVideoList()));
                    AppManager.getAppManager().startActivity(new Intent(getSelfActivity(),ImageSelectActivity.class).putExtra("flag",1).putExtra("list", (Serializable) videoCarouselFragment.getVideoList()));
                }

            });
@@ -187,6 +242,9 @@
        binding.ivOperate.setOnClickListener(v -> {
            mOperatePopupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(getSelfActivity(),85) +binding.ivOperate.getWidth(),0);
        });

        imageCarouselFragment = ImageCarouselFragment.newInstance();
        replaceFragment(imageCarouselFragment);
    }
    public void replaceFragment(Fragment fragment){
        FragmentTransaction transaction = getSelfActivity().getSupportFragmentManager().beginTransaction();
@@ -206,25 +264,22 @@

    @Override
    protected void initLiveDataObserve() {
        viewModel.getBannerListLiveData().observe(this, new Observer<List<BannerBean>>() {
        viewModel.getImageListLiveData().observe(this, new Observer<List<BannerBean>>() {
            @Override
            public void onChanged(List<BannerBean> bannerBeans) {
                List<BannerBean> imageList = new ArrayList<>();
                List<BannerBean> videoList = new ArrayList<>();
                for (BannerBean bannerBean : bannerBeans) {
                    if (bannerBean.getFlag() == 0){
                        //图片
                        imageList.add(bannerBean);
                    }else if (bannerBean.getFlag() == 1){
                        //视频
                        videoList.add(bannerBean);
                    }
                if (imageCarouselFragment != null){
                    imageCarouselFragment.setImageList(bannerBeans);
                }
                imageCarouselFragment.setImageList(imageList);
                videoFragment.setVideoList(videoList);
            }
        });

        viewModel.getVideoListLiveData().observe(this, new Observer<List<BannerBean>>() {
            @Override
            public void onChanged(List<BannerBean> bannerBeans) {
                if (videoCarouselFragment != null){
                    videoCarouselFragment.setVideoList(bannerBeans);
                }
            }
        });

    }

@@ -232,5 +287,6 @@
    protected boolean isStatusBarImmersionEnabled() {
        return true;
    }

}