feat: 💯 监听事件

app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java

@@ -4,6 +4,10 @@ package cc.niushuai.dididone.biz;
  * 业务全局对象
  */
 public class BizGlobal {
+    public static final String PROJECT_NAME = "projectName";
+    public static final String PROJECT_ICON = "projectIcon";
+    public static final String PROJECT_ICON_COLOR = "projectIconColor";
+
     private BizGlobal() {
     }
 

app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java

@@ -2,12 +2,13 @@ package cc.niushuai.dididone.ui.setting.project;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 
+import cc.niushuai.dididone.R;
 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;
+import cc.niushuai.dididone.util.Toasts;
+import cn.hutool.core.util.StrUtil;
 
 public class NewProjectActivity extends BaseActivity {
 
@@ -15,9 +16,10 @@ public class NewProjectActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        binding = ActivityNewProjectBinding.inflate(getLayoutInflater());
+
         super.onCreate(savedInstanceState);
 
-        binding = ActivityNewProjectBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
     }
 
@@ -26,31 +28,41 @@ public class NewProjectActivity extends BaseActivity {
 
         // 设置标题
         setTitle("添加新打卡项");
-
-        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() {
+        // icon选择器
+        binding.npIconFill.setOnClickListener(view -> {
+        });
+
+        // 颜色选择器
+        binding.npColorPicker.setOnClickListener(view -> {
+        });
 
-        Intent data = new Intent();
+        // 返回按钮
-        data.putExtra("back1", "v1");
+        binding.npButtonBack.setOnClickListener(view -> finish());
-        data.putExtra("back2", "v2");
-        data.putExtra("back3", "v3");
-        this.setResult(BizGlobal.REQUEST_CODE_GENERAL, data);
 
-        finish();
+        // 确定按钮
+        binding.npButtonBack.setOnClickListener(view -> {
+            // 三种属性
+            Intent data = new Intent();
+            // 名称
+            String projectName = binding.npProjectNameTxt.getText().toString();
+            if (StrUtil.isEmpty(projectName)) {
+                Toasts.shortShow(this, "{}未填", getResources().getString(R.string.np_project_name));
+            }
+            data.putExtra(BizGlobal.PROJECT_NAME, projectName);
+            // 图标
+
+            data.putExtra(BizGlobal.PROJECT_ICON, binding.npProjectNameTxt.getText().toString());
+            // 颜色
+            data.putExtra(BizGlobal.PROJECT_ICON_COLOR, binding.npProjectNameTxt.getText().toString());
+            // 放置结果数据
+            setResult(BizGlobal.REQUEST_CODE_GENERAL, data);
+            finish();
+        });
     }
+
 }

app/src/main/java/cc/niushuai/dididone/ui/setting/project/ProjectFragment.java

@@ -17,7 +17,6 @@ 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;
@@ -147,22 +146,8 @@ public class ProjectFragment extends Fragment implements InitAndSetListener {
      * 添加 被点击
      */
     private void addProjectClick() {
-
+        // 打开添加新项页面
-        HashMap<String, String> withData = new HashMap<>();
+        startActivityForResult(new Intent(getContext(), NewProjectActivity.class), BizGlobal.REQUEST_CODE_GENERAL);
-        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