From a772a6de62c52af506aa99744aaba4fc4ba9953d Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Mon, 16 Mar 2026 17:23:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20v1.6=E5=AE=9A=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dididone/ui/component/TimeNotePopupView.java         | 9 ++++++---
 app/src/main/res/layout/time_note_popup_view.xml         | 6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/cc/niushuai/dididone/ui/component/TimeNotePopupView.java b/app/src/main/java/cc/niushuai/dididone/ui/component/TimeNotePopupView.java
index cad65c7..cc88531 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/component/TimeNotePopupView.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/component/TimeNotePopupView.java
@@ -3,11 +3,14 @@ package cc.niushuai.dididone.ui.component;
 import android.content.Context;
 import android.view.View;
 import android.widget.Button;
+import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.TimePicker;
 import androidx.annotation.NonNull;
 import com.lxj.xpopup.core.CenterPopupView;
 import cc.niushuai.dididone.R;
+
+import java.lang.reflect.Field;
 import java.util.Calendar;
 
 public class TimeNotePopupView extends CenterPopupView {
@@ -44,7 +47,9 @@ public class TimeNotePopupView extends CenterPopupView {
         timePicker.setIs24HourView(true);
         timePicker.setHour(calendar.get(Calendar.HOUR_OF_DAY));
         timePicker.setMinute(calendar.get(Calendar.MINUTE));
-        timePicker.setActivated(false);
+//        timePicker.setActivated(false);
+
+        timePicker.setDescendantFocusability(DatePicker.FOCUS_BLOCK_DESCENDANTS);
 
         btnConfirm.setOnClickListener(v -> {
             // 获取选择的时间（转换为毫秒时间戳）
@@ -63,8 +68,6 @@ public class TimeNotePopupView extends CenterPopupView {
 
         btnCancel.setOnClickListener(v -> dismiss());
 
-        // 让备注获取到焦点
-        etNote.requestFocus();
         // 让确定获取到焦点
         btnConfirm.requestFocus();
     }
diff --git a/app/src/main/res/layout/time_note_popup_view.xml b/app/src/main/res/layout/time_note_popup_view.xml
index 6b5df5d..d085253 100644
--- a/app/src/main/res/layout/time_note_popup_view.xml
+++ b/app/src/main/res/layout/time_note_popup_view.xml
@@ -22,6 +22,12 @@
         android:layout_height="wrap_content"
         android:timePickerMode="clock"/>
 
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
     <!-- 备注输入框 -->
     <EditText
         android:id="@+id/et_note"