diff --git a/stallhelper/build.properties b/stallhelper/build.properties index 07a169a..d5cb71f 100644 --- a/stallhelper/build.properties +++ b/stallhelper/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri May 22 20:08:15 HKT 2026 +#Fri May 22 20:23:47 HKT 2026 stageCount=8 libraryProject= baseVersion=15.20 publishVersion=15.20.7 -buildCount=0 +buildCount=3 baseBetaVersion=15.20.8 diff --git a/stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/TaskSchedulerActivity.java b/stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/TaskSchedulerActivity.java index 05b2b09..dc7126a 100644 --- a/stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/TaskSchedulerActivity.java +++ b/stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/TaskSchedulerActivity.java @@ -350,11 +350,11 @@ public class TaskSchedulerActivity extends WinBoLLActivity { * @param position 要编辑的任务位置 */ private void showEditTaskDialog(final int position) { - if (position < 0 || position >= mTaskList.size()) { + if (position < 0 || position >= mAdapter.mDataList.size()) { return; } - final TaskSchedulerBean task = mTaskList.get(position); + final TaskSchedulerBean task = mAdapter.mDataList.get(position); final Dialog dialog = new Dialog(this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(R.layout.dialog_task_edit); @@ -551,52 +551,20 @@ public class TaskSchedulerActivity extends WinBoLLActivity { * @param position 要删除的任务位置 */ private void showDeleteConfirmDialog(final int position) { - if (position < 0 || position >= mTaskList.size()) { + if (position < 0 || position >= mAdapter.mDataList.size()) { return; } - final TaskSchedulerBean task = mTaskList.get(position); + final TaskSchedulerBean task = mAdapter.mDataList.get(position); final Dialog dialog = new Dialog(this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setContentView(R.layout.dialog_task_edit); - - // 修改对话框布局，只保留必要的按钮 - // 隐藏不需要的视图 - android.view.View etTaskName = dialog.findViewById(R.id.dialog_et_task_name); - android.view.View etCurrentScheduleTime = dialog.findViewById(R.id.dialog_et_start_time); - android.view.View etMonth = dialog.findViewById(R.id.dialog_et_month); - android.view.View etDay = dialog.findViewById(R.id.dialog_et_day); - android.view.View etHour = dialog.findViewById(R.id.dialog_et_hour); - android.view.View etRemark = dialog.findViewById(R.id.dialog_et_remark); - - if (etTaskName != null) etTaskName.setVisibility(View.GONE); - if (etCurrentScheduleTime != null) etCurrentScheduleTime.setVisibility(View.GONE); - if (etMonth != null) etMonth.setVisibility(View.GONE); - if (etDay != null) etDay.setVisibility(View.GONE); - if (etHour != null) etHour.setVisibility(View.GONE); - if (etRemark != null) etRemark.setVisibility(View.GONE); - - // 添加提示文本 - android.widget.TextView tvMessage = new android.widget.TextView(this); - tvMessage.setText("确定要删除任务 \"" + task.getTaskName() + "\" 吗？"); - tvMessage.setPadding(40, 40, 40, 20); - tvMessage.setTextSize(16); - - android.view.ViewGroup rootView = dialog.findViewById(android.R.id.content); - if (rootView != null) { - android.view.ViewGroup.LayoutParams params = new android.view.ViewGroup.LayoutParams( - android.view.ViewGroup.LayoutParams.MATCH_PARENT, - android.view.ViewGroup.LayoutParams.WRAP_CONTENT - ); - rootView.addView(tvMessage, 0, params); - } + dialog.setContentView(R.layout.dialog_delete_confirm); + TextView tvMessage = dialog.findViewById(R.id.dialog_delete_message); Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel); - Button btnSave = dialog.findViewById(R.id.dialog_btn_save); - - if (btnSave != null) { - btnSave.setText("确定删除"); - } + Button btnConfirm = dialog.findViewById(R.id.dialog_btn_confirm); + + tvMessage.setText("确定要删除任务 \"" + task.getTaskName() + "\" 吗？"); btnCancel.setOnClickListener(new View.OnClickListener() { @Override @@ -605,11 +573,11 @@ public class TaskSchedulerActivity extends WinBoLLActivity { } }); - btnSave.setOnClickListener(new View.OnClickListener() { + btnConfirm.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { String taskName = task.getTaskName(); - mTaskList.remove(position); + mTaskList.remove(task); applyChanges(); LogUtils.i(TAG, "showDeleteConfirmDialog: 任务 [" + taskName + "] 已删除"); dialog.dismiss(); @@ -623,11 +591,11 @@ public class TaskSchedulerActivity extends WinBoLLActivity { * @param position 要排档的任务位置 */ private void showScheduleConfirmDialog(final int position) { - if (position < 0 || position >= mTaskList.size()) { + if (position < 0 || position >= mAdapter.mDataList.size()) { return; } - final TaskSchedulerBean task = mTaskList.get(position); + final TaskSchedulerBean task = mAdapter.mDataList.get(position); long currentTime = task.getCurrentScheduleTime(); int duration = task.getDurationMinutes(); long newTime = currentTime + duration * 60 * 1000L; @@ -673,10 +641,10 @@ public class TaskSchedulerActivity extends WinBoLLActivity { * @param position 点击排档按钮的任务位置 */ private void performSchedule(int position) { - if (position < 0 || position >= mTaskList.size()) { + if (position < 0 || position >= mAdapter.mDataList.size()) { return; } - TaskSchedulerBean currentTask = mTaskList.get(position); + TaskSchedulerBean currentTask = mAdapter.mDataList.get(position); long currentTime = currentTask.getCurrentScheduleTime(); int duration = currentTask.getDurationMinutes(); long newTime = currentTime + duration * 60 * 1000L; diff --git a/stallhelper/src/main/res/layout/dialog_delete_confirm.xml b/stallhelper/src/main/res/layout/dialog_delete_confirm.xml new file mode 100644 index 0000000..6ea3565 --- /dev/null +++ b/stallhelper/src/main/res/layout/dialog_delete_confirm.xml @@ -0,0 +1,47 @@ + + + + + + + + + +