From be914dc9075a26d30b223370a44c87b867c22317 Mon Sep 17 00:00:00 2001 From: MUQING <1966944300@qq.com> Date: Mon, 27 Nov 2023 13:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=99=E4=BA=86=E4=B8=80=E4=B8=AA=E7=AE=80?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E8=BF=9E=E6=8E=A5=E9=9D=99=E6=80=81=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.0/fileHashes/fileHashes.bin | Bin 127733 -> 131833 bytes .gradle/8.0/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../com/muqingedit/ConnectionManager.java | 48 +++++++ .../java/com/muqingedit/activity/Edit.java | 43 +++++-- app/src/main/java/com/muqingedit/fanjian.java | 121 ++++++++++++------ app/src/main/java/com/muqingedit/xian.java | 9 +- app/src/main/res/layout/new_fangjian.xml | 43 +++++++ local.properties | 2 +- 10 files changed, 208 insertions(+), 58 deletions(-) create mode 100644 app/src/main/java/com/muqingedit/ConnectionManager.java create mode 100644 app/src/main/res/layout/new_fangjian.xml diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock index 2e7a9ef7916ce5d823e7d9a3df45995692bce600..a5cc10d329a4973bbe2c2054fe35d38e0eb3de84 100644 GIT binary patch literal 17 VcmZR6yJ^m`1vkAnF@OQjLI6h81}Fdk literal 17 VcmZR6yJ^m`1vkAnF@OQb0RTqp215V< diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index 89108dd51469c3b05caa90a5572f68b0574a051d..4cc16ed6fac3fe26ff22255500f83a8a89feab15 100644 GIT binary patch delta 8244 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 literal 17 VcmZSX2>ZE?wbpt&0~m-F001*I1cCqn diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a5fb0f6f68bde4c2956f8189384f0e5f7c489835..3d428fbbffb85db39a9b45e9055ef1558b8210a5 100644 GIT binary patch literal 17 UcmZQR{+!=6w@BEC0Sx5%0V`hvSO5S3 literal 17 VcmZQR{+!=6w@BEC0SqKQ0RSvC1T+8u diff --git a/app/src/main/java/com/muqingedit/ConnectionManager.java b/app/src/main/java/com/muqingedit/ConnectionManager.java new file mode 100644 index 0000000..3de91b5 --- /dev/null +++ b/app/src/main/java/com/muqingedit/ConnectionManager.java @@ -0,0 +1,48 @@ +package com.muqingedit; + +import java.util.HashSet; +import java.util.Set; + +/** + * ConnectionManager 类用于管理视图之间的连接关系。 + */ +public class ConnectionManager { + private static Set connections = new HashSet<>(); + /** + * ConnectionManager 构造函数，初始化连接集合。 + */ + /** + * 添加视图之间的连接。 + * + * @param view1Id 第一个视图的ID + * @param view2Id 第二个视图的ID + */ + public static void addConnection(String view1Id, String view2Id) { + String connection = getConnectionKey(view1Id, view2Id); + connections.add(connection); + } + + /** + * 检查两个视图是否已连接。 + * + * @param view1Id 第一个视图的ID + * @param view2Id 第二个视图的ID + * @return 如果两个视图已连接，则返回 true；否则返回 false。 + */ + public static boolean isConnected(String view1Id, String view2Id) { + String connection = getConnectionKey(view1Id, view2Id); + return connections.contains(connection); + } + + /** + * 获取视图连接的唯一标识。 + * + * @param view1Id 第一个视图的ID + * @param view2Id 第二个视图的ID + * @return 视图连接的唯一标识 + */ + private static String getConnectionKey(String view1Id, String view2Id) { + // 这里使用视图 ID 作为连接信息的关键 + return view1Id + "-" + view2Id; + } +} diff --git a/app/src/main/java/com/muqingedit/activity/Edit.java b/app/src/main/java/com/muqingedit/activity/Edit.java index b3369be..09a5fa3 100644 --- a/app/src/main/java/com/muqingedit/activity/Edit.java +++ b/app/src/main/java/com/muqingedit/activity/Edit.java @@ -1,34 +1,49 @@ package com.muqingedit.activity; import android.annotation.SuppressLint; -import android.content.Context; import android.os.Bundle; -import android.view.View; +import android.view.ViewTreeObserver; import android.widget.FrameLayout; import androidx.annotation.Nullable; +import com.muqingedit.ConnectionManager; import com.muqingedit.R; import com.muqingedit.fanjian; -import com.muqingedit.xian; +import com.muqingedit.gj; + +import java.util.ArrayList; +import java.util.List; public class Edit extends ActivityFragment { - @SuppressLint("StaticFieldLeak") - public FrameLayout frameLayout; - + public FrameLayout frameLayout;//后续需要添加fragment的移动和缩放 + public static List list_fanjian = new ArrayList<>(); + @SuppressLint("ClickableViewAccessibility") @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.edit); frameLayout = findViewById(R.id.view); //绘制一个房间 - findViewById(R.id.button).setOnClickListener(view -> { - fanjian button = new fanjian(Edit.this).setPaletteView(frameLayout) - .setLayoutParams(260, 250) - .setXY(200, 100); - frameLayout.addView(button); + findViewById(R.id.button).setOnClickListener(view -> new fanjian(frameLayout)); + frameLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + // 在布局完成之后获取 FrameLayout 的高度 + int height = frameLayout.getHeight(); + int width = frameLayout.getWidth(); + + fanjian main = new fanjian(frameLayout, "main");//设置主房间 + int viewWidth = main.getMeasuredWidth(); + int viewHeight = main.getMeasuredHeight(); + float x = (width - viewWidth) / 2.0f; + float y = (height - viewHeight) / 2.0f; + gj.sc(height + ":" + y); + main.setXY((int) x, (int) y); + frameLayout.addView(main); + // 如果只需要获取一次高度，可以在获取之后移除监听器 + frameLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this); + } }); } - - -} +} \ No newline at end of file diff --git a/app/src/main/java/com/muqingedit/fanjian.java b/app/src/main/java/com/muqingedit/fanjian.java index 637484a..a30f967 100644 --- a/app/src/main/java/com/muqingedit/fanjian.java +++ b/app/src/main/java/com/muqingedit/fanjian.java @@ -5,38 +5,61 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; +import android.text.TextUtils; import android.view.GestureDetector; import android.view.Gravity; +import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; import android.widget.FrameLayout; import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.muqingedit.activity.Edit; public class fanjian extends FrameLayout { + private String id; + private int X, Y; + public FrameLayout frameLayout; - private FrameLayout paletteView; - - /** - * 为其设置画板视图 - * - * @param paletteView - */ - public fanjian setPaletteView(FrameLayout paletteView) { - this.paletteView = paletteView; - return this; + public fanjian(FrameLayout context, String id) { + super(context.getContext()); + this.frameLayout = context; + init(); + setId(id.hashCode()); + setLayoutParams(300, 300); } - public static int id = 0; - - private int X, Y; - - public fanjian(Context context) { - super(context); - setId(id++); + public fanjian(FrameLayout context) { + super(context.getContext()); + this.frameLayout = context; + MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(this.getContext()); + dialogBuilder.setTitle("创建房间"); + View inflate = LayoutInflater.from(getContext()).inflate(R.layout.new_fangjian, null); + EditText edit_id = inflate.findViewById(R.id.edit_id); + Button end = inflate.findViewById(R.id.button_end); + Button start = inflate.findViewById(R.id.button_start); + dialogBuilder.setView(inflate); + AlertDialog show = dialogBuilder.show(); + end.setOnClickListener(view -> show.dismiss()); + start.setOnClickListener(view -> { + String id = edit_id.getText().toString(); + if (TextUtils.isEmpty(id)) { + return; + } + fanjian.this.id = id; + setId(id.hashCode()); + Edit.list_fanjian.add(fanjian.this); + setLayoutParams(300, 300); + setXY(0, 0); + frameLayout.addView(fanjian.this); + show.dismiss(); + }); init(); } @@ -78,21 +101,41 @@ public class fanjian extends FrameLayout { fanjian.this.getLocationOnScreen(location); csx = (int) fanjian.this.getX() + fanjian.this.getWidth() / 2; csy = (int) fanjian.this.getY() + fanjian.this.getHeight() / 2; - xian = new xian(getContext()).createNewLine(paletteView, csx, csy); - return true; + xian = new xian(fanjian.this.frameLayout).createNewLine(csx, csy); + break; case MotionEvent.ACTION_MOVE: //绘制线 xian.updateCurrentLine(csx + ax, csy + ay); // xian.updateCurrentLine(event.getRawX()-ax, event.getRawY()-ay); - return true; + break; case MotionEvent.ACTION_UP: - //删除线 + //删除线 判断是否连接房间 如果连接则不删除不连接则删除 + int size = Edit.list_fanjian.size(); + //只要大于1个房间才会进行判断操作 + if (size > 1) { + for (int i = 0; i < size; i++) { + fanjian aa = Edit.list_fanjian.get(i); + if (aa == fanjian.this) { + continue; + } + boolean ab = ConnectionManager.isConnected(fanjian.this.Id(), aa.Id()); + if (ab) { + break; + } + boolean a = csx + ax > aa.getX() && csx + ax < aa.getX() + 300; + boolean b = csy + ay > aa.getY() && csy + ay < aa.getY() + 300; + if (a && b) { + ConnectionManager.addConnection(fanjian.this.Id(), aa.Id()); + return true; + } + } + } xian.clearCurrentLine(); - paletteView.removeView(xian); + frameLayout.removeView(xian); xian = null; - return true; + break; } - return super.onTouchEvent(event); + return true; } } @@ -115,12 +158,9 @@ public class fanjian extends FrameLayout { @Override public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) { - if (Long) { - } else { - Y = (int) (e2.getY() - e1.getY()); - X = (int) (e2.getX() - e1.getX()); - animate().xBy(X).yBy(Y).setDuration(0).start(); - } + Y = (int) (e2.getY() - e1.getY()); + X = (int) (e2.getX() - e1.getX()); + animate().xBy(X).yBy(Y).setDuration(0).start(); return true; } }); @@ -144,17 +184,20 @@ public class fanjian extends FrameLayout { return this; } -/* - @Override - public float getX() { - return this.X; - } + /* + @Override + public float getX() { + return this.X; + } - @Override - public float getY() { - return this.Y; + @Override + public float getY() { + return this.Y; + } + */ + public String Id() { + return id; } -*/ public String getXY() { return X + ":" + Y; diff --git a/app/src/main/java/com/muqingedit/xian.java b/app/src/main/java/com/muqingedit/xian.java index 2b69c11..d989a7a 100644 --- a/app/src/main/java/com/muqingedit/xian.java +++ b/app/src/main/java/com/muqingedit/xian.java @@ -17,9 +17,10 @@ public class xian extends View { private Paint linePaint; private float currentX, currentY; private float startX, startY; - - public xian(Context context) { - super(context); + FrameLayout frameLayout; + public xian(FrameLayout context) { + super(context.getContext()); + this.frameLayout = context; init(); } @@ -33,7 +34,7 @@ public class xian extends View { linePaint.setStrokeWidth(5f); } - public xian createNewLine(FrameLayout frameLayout, float x, float y) { + public xian createNewLine(float x, float y) { startX = x; startY = y; currentX = x; diff --git a/app/src/main/res/layout/new_fangjian.xml b/app/src/main/res/layout/new_fangjian.xml new file mode 100644 index 0000000..da79be6 --- /dev/null +++ b/app/src/main/res/layout/new_fangjian.xml @@ -0,0 +1,43 @@ + + + + + + + + + + +