From 454a84caa83c4ebc1b4c422f10166bddfb0e03ec Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 21 九月 2023 21:53:30 +0800
Subject: [PATCH] 1、修复添加按钮消失问题\n2、修改家族导图\n3、新增便捷添加功能\n4、新增修改头像功能\n5、个人财产增加搜索条件
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
index 3d4297a..dbb4ce6 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
@@ -2,6 +2,8 @@
import android.content.Intent;
import android.os.Bundle;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
import android.view.View;
import android.widget.PopupWindow;
@@ -16,6 +18,7 @@
import com.application.zhangshi_app_android.bean.BannerBean;
import com.application.zhangshi_app_android.databinding.FragmentFunctionBinding;
import com.application.zhangshi_app_android.ui.DLBaseFragment;
+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;
@@ -31,6 +34,7 @@
public class FunctionFragment extends DLBaseFragment<FragmentFunctionBinding,FunctionFragmentViewModel> {
private PopupWindow mOperatePopupWindow;
+ private PopupWindow mAddPopupWindow;
private ImageCarouselFragment imageCarouselFragment;
private VideoCarouselFragment videoCarouselFragment;
@@ -130,6 +134,76 @@
AppManager.getAppManager().startActivity(ContactsActivity.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;
+ }
+ });
+
binding.ivOperateSelect.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -213,5 +287,6 @@
protected boolean isStatusBarImmersionEnabled() {
return true;
}
+
}
--
Gitblit v1.9.1