From d55afe2c80abc44e975332d90c61d04cb89ba1dd Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Fri, 12 Apr 2024 16:33:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:joy:=20=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  3 +
 .../cc/niushuai/dididone/biz/BizGlobal.java   | 11 ++++
 .../setting/project/NewProjectActivity.java   | 56 +++++++++++++++++++
 .../ui/setting/project/ProjectFragment.java   | 27 +++++++++
 .../main/res/layout/activity_new_project.xml  | 26 +++++++++
 5 files changed, 123 insertions(+)
 create mode 100644 app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java
 create mode 100644 app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java
 create mode 100644 app/src/main/res/layout/activity_new_project.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5f83f68..3b18231 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DiDiDone"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.setting.project.NewProjectActivity"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java
new file mode 100644
index 0000000..dedb40a
--- /dev/null
+++ b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java
@@ -0,0 +1,11 @@
+package cc.niushuai.dididone.biz;
+
+/**
+ * 业务全局对象
+ */
+public class BizGlobal {
+    private BizGlobal() {
+    }
+
+    public static int REQUEST_CODE_GENERAL = 1;
+}
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java
new file mode 100644
index 0000000..621bfd2
--- /dev/null
+++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java
@@ -0,0 +1,56 @@
+package cc.niushuai.dididone.ui.setting.project;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import cc.niushuai.dididone.biz.BizGlobal;
+import cc.niushuai.dididone.databinding.ActivityNewProjectBinding;
+import cc.niushuai.dididone.ui.base.BaseActivity;
+import cc.niushuai.dididone.util.XLog;
+
+public class NewProjectActivity extends BaseActivity {
+
+    private ActivityNewProjectBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        binding = ActivityNewProjectBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        init();
+
+        setListeners();
+    }
+
+    @Override
+    protected void init() {
+        Intent intent = getIntent();
+        for (String key : intent.getExtras().keySet()) {
+            XLog.d("key: {}, val: {}", key, intent.getStringExtra(key));
+        }
+    }
+
+    @Override
+    protected void setListeners() {
+        binding.npBtnBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                backClick();
+            }
+        });
+    }
+
+    private void backClick() {
+
+        Intent data = new Intent();
+        data.putExtra("back1", "v1");
+        data.putExtra("back2", "v2");
+        data.putExtra("back3", "v3");
+        this.setResult(BizGlobal.REQUEST_CODE_GENERAL, data);
+
+        finish();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/setting/project/ProjectFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/project/ProjectFragment.java
index 50208ac..46cb997 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/setting/project/ProjectFragment.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/project/ProjectFragment.java
@@ -1,5 +1,6 @@
 package cc.niushuai.dididone.ui.setting.project;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -16,8 +17,10 @@ import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.ionicons_typeface_library.Ionicons;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
+import cc.niushuai.dididone.biz.BizGlobal;
 import cc.niushuai.dididone.biz.roomx.DBManager;
 import cc.niushuai.dididone.biz.vo.ProjectIcon;
 import cc.niushuai.dididone.databinding.FragmentProjectBinding;
@@ -145,5 +148,29 @@ public class ProjectFragment extends Fragment implements InitAndSetListener {
      */
     private void addProjectClick() {
 
+        HashMap<String, String> withData = new HashMap<>();
+        withData.put("ke", "le");
+        withData.put("bai", "shi");
+
+//        ActivityUtil.startActivityForResult(getActivity(), NewProjectActivity.class, withData, BizGlobal.REQUEST_CODE_GENERAL);
+
+        Intent intent = new Intent(getContext(), NewProjectActivity.class);
+        if (null != withData) {
+            for (String key : withData.keySet()) {
+                intent.putExtra(key, withData.get(key));
+            }
+        }
+
+        startActivityForResult(intent, BizGlobal.REQUEST_CODE_GENERAL);
+
+    }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+
+        for (String key : data.getExtras().keySet()) {
+            XLog.d("keyx: {}, valx: {}", key, data.getStringExtra(key));
+        }
     }
 }
diff --git a/app/src/main/res/layout/activity_new_project.xml b/app/src/main/res/layout/activity_new_project.xml
new file mode 100644
index 0000000..9fd479d
--- /dev/null
+++ b/app/src/main/res/layout/activity_new_project.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.setting.project.NewProjectActivity">
+
+    <TextView
+        android:id="@+id/np_btn_txt"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:text="hello new project"
+        android:textSize="24dp"/>
+
+    <Button
+        android:id="@+id/np_btn_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/np_btn_txt"
+        app:layout_constraintTop_toTopOf="@id/np_btn_txt"
+        android:text="返回"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file