Compare commits

...

10 Commits

Author SHA1 Message Date
ZhanGSKen 85bf9f1e1c <stallhelper>APK 15.20.6 release Publish. 2026-05-22 19:42:21 +08:00
aBuild 4a0fbf024d 任务列表顶部添加搜索框,支持中文/拼音/拼音首字母搜索
- 新增搜索框 EditText,输入时实时过滤任务列表
- 引入 pinyin4j 库,支持中文全拼和首字母搜索
- matchesSearch 匹配任务名称:中文原文 / 全拼 / 首字母
- 抽取 applyChanges() 统一排序、过滤、保存逻辑
- Adapter 新增 setData() 方法支持动态更新数据
2026-05-22 19:35:26 +08:00
ZhanGSKen e8e7887926 <stallhelper>APK 15.20.5 release Publish. 2026-05-22 19:00:55 +08:00
aBuild 4acae6726c 列表项排档时间旁增加倒计时/已过时间显示
- 排档时间行改为横向布局,新增蓝色 TextView
- 排档时间大于当前时间显示剩余X月X天X小时
- 排档时间小于等于当前时间显示已过X月X天X小时
2026-05-22 18:58:54 +08:00
ZhanGSKen e61c36dfed <stallhelper>APK 15.20.4 release Publish. 2026-05-22 17:22:44 +08:00
aBuild 297d840bff 排档按钮增加确认对话框,列表项背景色标识已过期任务
- 点击 ▷ 按钮弹出确认对话框,显示任务详情与排档后时间
- 确认后执行排档,取消则不做任何操作
- 排档时间不超过当前时间的列表项背景色设为浅绿色
- 新增 dialog_schedule_confirm.xml 布局文件
- 新增 colorScheduleFutureBackground 颜色资源
2026-05-22 17:16:29 +08:00
aBuild 43e783f5aa 任务列表新增正序排列功能,编辑对话框添加现在按钮
- 添加 sortTaskList() 按排档时间正序排列列表
- 加载、添加、编辑、删除、排档后均排序并刷新界面
- 编辑/添加对话框的排档时间输入框旁增加现在按钮
- 点击现在按钮将当前整点时间填入输入框
2026-05-22 17:01:34 +08:00
aBuild a11bad310b 修复任务排档performSchedule逻辑:排档时间应更新当前任务而非下一任务
- performSchedule 改为将新时间设置给当前任务自身
- 添加 notifyItemChanged(position) 刷新当前列表项
- 补充 saveTaskData() 持久化数据
2026-05-22 16:48:09 +08:00
ZhanGSKen 0ad264c4aa <stallhelper>APK 15.20.3 release Publish. 2026-05-21 00:15:15 +08:00
Transformers 81c2b781b6 优化任务排档功能:添加数据持久化、增删功能及界面优化
- 取消测试数据,使用TaskSchedulerBean的存储方法实现数据持久化
- 添加loadTaskData()和saveTaskData()方法,实现数据加载和保存
- 添加showAddTaskDialog()方法,支持通过悬浮按钮添加新任务
- 添加showDeleteConfirmDialog()方法,支持长按删除并二次确认
- 修复删除对话框中的FrameLayout强制转换异常
- 在添加/编辑任务后自动保存数据
- 布局文件添加悬浮添加按钮,背景使用深色colorPrimaryDark
- 调整根布局为FrameLayout以支持悬浮按钮
2026-05-21 00:12:32 +08:00
8 changed files with 593 additions and 46 deletions
Vendored Regular → Executable
View File
+5 -5
View File
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon May 18 20:16:15 CST 2026
stageCount=3
#Fri May 22 19:42:21 HKT 2026
stageCount=7
libraryProject=
baseVersion=15.20
publishVersion=15.20.2
buildCount=4
baseBetaVersion=15.20.3
publishVersion=15.20.6
buildCount=0
baseBetaVersion=15.20.7
@@ -2,6 +2,8 @@ package cc.winboll.studio.stallhelper.activities;
import android.app.Dialog;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -22,6 +24,13 @@ import cc.winboll.studio.libappbase.ToastUtils;
import cc.winboll.studio.stallhelper.R;
import cc.winboll.studio.stallhelper.beans.TaskSchedulerBean;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import net.sourceforge.pinyin4j.PinyinHelper;
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
/**
* @Author ZhanGSKen
@@ -39,6 +48,9 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
ArrayList<TaskSchedulerBean> mTaskList;
TaskSchedulerAdapter mAdapter;
EditText mSearchEditText;
String mSearchQuery = "";
HanyuPinyinOutputFormat mPinyinFormat;
@Override
public String getTag() {
@@ -57,13 +69,44 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
// 初始化任务列表
mTaskList = new ArrayList<TaskSchedulerBean>();
initSampleData();
loadTaskData();
// 设置搜索框
mPinyinFormat = new HanyuPinyinOutputFormat();
mPinyinFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
mPinyinFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
mSearchEditText = findViewById(R.id.et_search);
mSearchEditText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
mSearchQuery = s.toString().trim().toLowerCase();
filterTaskList();
}
});
// 设置 RecyclerView
RecyclerView recyclerView = findViewById(R.id.task_scheduler_recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext(), LinearLayoutManager.VERTICAL, false));
mAdapter = new TaskSchedulerAdapter(mTaskList);
recyclerView.setAdapter(mAdapter);
// 设置悬浮按钮点击事件
Button fabAddTask = findViewById(R.id.fab_add_task);
fabAddTask.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showAddTaskDialog();
}
});
}
@Override
@@ -74,6 +117,52 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
return super.onOptionsItemSelected(item);
}
/**
* 从文件加载任务数据
*/
private void loadTaskData() {
boolean loadSuccess = TaskSchedulerBean.loadBeanList(this, mTaskList, TaskSchedulerBean.class);
if (loadSuccess) {
LogUtils.i(TAG, "loadTaskData: 成功加载 " + mTaskList.size() + " 条任务数据");
} else {
LogUtils.i(TAG, "loadTaskData: 未找到已保存的任务数据,使用空列表");
}
sortTaskList();
}
private void applyChanges() {
sortTaskList();
filterTaskList();
saveTaskData();
}
/**
* 保存任务数据到文件
*/
private void saveTaskData() {
boolean saveSuccess = TaskSchedulerBean.saveBeanList(this, mTaskList, TaskSchedulerBean.class);
if (saveSuccess) {
LogUtils.i(TAG, "saveTaskData: 成功保存 " + mTaskList.size() + " 条任务数据");
} else {
LogUtils.e(TAG, "saveTaskData: 任务数据保存失败");
}
}
/**
* 按排档时间倒序排列列表
*/
private void sortTaskList() {
Collections.sort(mTaskList, new Comparator<TaskSchedulerBean>() {
@Override
public int compare(TaskSchedulerBean a, TaskSchedulerBean b) {
long diff = a.getCurrentScheduleTime() - b.getCurrentScheduleTime();
if (diff > 0) return 1;
if (diff < 0) return -1;
return 0;
}
});
}
/**
* 格式化时间戳为年月日和小时
* @param timestamp 时间戳
@@ -145,6 +234,76 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
mTaskList.add(new TaskSchedulerBean("烹饪晚餐", "制作丰盛的晚餐", time17, 90));
}
/**
* 将中文转换为拼音(不含声调,小写)
*/
private String toPinyin(String chinese) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < chinese.length(); i++) {
char c = chinese.charAt(i);
try {
String[] pinyins = PinyinHelper.toHanyuPinyinStringArray(c, mPinyinFormat);
if (pinyins != null && pinyins.length > 0) {
sb.append(pinyins[0]);
}
} catch (Exception e) {
sb.append(c);
}
}
return sb.toString();
}
/**
* 将中文转换为拼音首字母串(小写)
*/
private String toPinyinInitials(String chinese) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < chinese.length(); i++) {
char c = chinese.charAt(i);
try {
String[] pinyins = PinyinHelper.toHanyuPinyinStringArray(c, mPinyinFormat);
if (pinyins != null && pinyins.length > 0) {
sb.append(pinyins[0].charAt(0));
}
} catch (Exception e) {
sb.append(c);
}
}
return sb.toString();
}
/**
* 检查任务名称是否匹配搜索关键词(支持中文/拼音/首字母)
*/
private boolean matchesSearch(TaskSchedulerBean task, String query) {
if (query == null || query.isEmpty()) return true;
String name = task.getTaskName();
if (name == null) return false;
if (name.toLowerCase().contains(query)) return true;
String pinyin = toPinyin(name);
if (pinyin.contains(query)) return true;
String initials = toPinyinInitials(name);
if (initials.contains(query)) return true;
return false;
}
/**
* 根据搜索关键词过滤任务列表并刷新界面
*/
private void filterTaskList() {
if (mSearchQuery.isEmpty()) {
mAdapter.setData(mTaskList);
return;
}
ArrayList<TaskSchedulerBean> filteredList = new ArrayList<TaskSchedulerBean>();
for (TaskSchedulerBean task : mTaskList) {
if (matchesSearch(task, mSearchQuery)) {
filteredList.add(task);
}
}
mAdapter.setData(filteredList);
}
/**
* 将月、天、小时转换为总分钟数
* @param month 月份
@@ -208,6 +367,7 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
final EditText etRemark = dialog.findViewById(R.id.dialog_et_remark);
Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
Button btnSave = dialog.findViewById(R.id.dialog_btn_save);
Button btnNow = dialog.findViewById(R.id.dialog_btn_now);
etTaskName.setText(task.getTaskName());
etCurrentScheduleTime.setText(formatTimestamp(task.getCurrentScheduleTime()));
@@ -230,6 +390,17 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
etHour.setText(Integer.toString(hour));
}
btnNow.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
java.util.Calendar calendar = java.util.Calendar.getInstance();
calendar.set(java.util.Calendar.MINUTE, 0);
calendar.set(java.util.Calendar.SECOND, 0);
calendar.set(java.util.Calendar.MILLISECOND, 0);
etCurrentScheduleTime.setText(formatTimestamp(calendar.getTimeInMillis()));
}
});
btnCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -278,7 +449,7 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
task.setDurationMinutes(durationMinutes);
task.setRemark(remark);
mAdapter.notifyItemChanged(position);
applyChanges();
LogUtils.i(TAG, "showEditTaskDialog: 任务 [" + taskName + "] 数据已更新,排档幅度=" + durationMinutes + "分钟");
dialog.dismiss();
}
@@ -286,6 +457,217 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
dialog.show();
}
/**
* 显示添加任务对话框
*/
private void showAddTaskDialog() {
final Dialog dialog = new Dialog(this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.dialog_task_edit);
final EditText etTaskName = dialog.findViewById(R.id.dialog_et_task_name);
final EditText etCurrentScheduleTime = dialog.findViewById(R.id.dialog_et_start_time);
final EditText etMonth = dialog.findViewById(R.id.dialog_et_month);
final EditText etDay = dialog.findViewById(R.id.dialog_et_day);
final EditText etHour = dialog.findViewById(R.id.dialog_et_hour);
final EditText etRemark = dialog.findViewById(R.id.dialog_et_remark);
Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
Button btnSave = dialog.findViewById(R.id.dialog_btn_save);
Button btnNow = dialog.findViewById(R.id.dialog_btn_now);
// 设置默认时间为当前时间
java.util.Calendar calendar = java.util.Calendar.getInstance();
calendar.set(java.util.Calendar.MINUTE, 0);
calendar.set(java.util.Calendar.SECOND, 0);
calendar.set(java.util.Calendar.MILLISECOND, 0);
etCurrentScheduleTime.setText(formatTimestamp(calendar.getTimeInMillis()));
btnNow.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
java.util.Calendar cal = java.util.Calendar.getInstance();
cal.set(java.util.Calendar.MINUTE, 0);
cal.set(java.util.Calendar.SECOND, 0);
cal.set(java.util.Calendar.MILLISECOND, 0);
etCurrentScheduleTime.setText(formatTimestamp(cal.getTimeInMillis()));
}
});
btnCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
btnSave.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String taskName = etTaskName.getText().toString().trim();
String currentScheduleTime = etCurrentScheduleTime.getText().toString().trim();
String monthStr = etMonth.getText().toString().trim();
String dayStr = etDay.getText().toString().trim();
String hourStr = etHour.getText().toString().trim();
String remark = etRemark.getText().toString().trim();
if (taskName.isEmpty()) {
etTaskName.setError("请输入任务名称");
return;
}
if (currentScheduleTime.isEmpty()) {
etCurrentScheduleTime.setError("请输入当前排档时间");
return;
}
long timestamp = parseTimeString(currentScheduleTime);
if (timestamp == 0) {
etCurrentScheduleTime.setError("时间格式不正确,请使用 yyyy-MM-dd HH 格式");
return;
}
int month = 0, day = 0, hour = 0;
try {
if (!monthStr.isEmpty()) month = Integer.parseInt(monthStr);
if (!dayStr.isEmpty()) day = Integer.parseInt(dayStr);
if (!hourStr.isEmpty()) hour = Integer.parseInt(hourStr);
} catch (NumberFormatException e) {
LogUtils.e(TAG, "showAddTaskDialog: 数字解析错误", e);
return;
}
int durationMinutes = convertToTotalMinutes(month, day, hour);
TaskSchedulerBean newTask = new TaskSchedulerBean(taskName, remark, timestamp, durationMinutes);
mTaskList.add(newTask);
applyChanges();
LogUtils.i(TAG, "showAddTaskDialog: 任务 [" + taskName + "] 已添加,排档幅度=" + durationMinutes + "分钟");
dialog.dismiss();
}
});
dialog.show();
}
/**
* 显示删除确认对话框
* @param position 要删除的任务位置
*/
private void showDeleteConfirmDialog(final int position) {
if (position < 0 || position >= mTaskList.size()) {
return;
}
final TaskSchedulerBean task = mTaskList.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);
}
Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
Button btnSave = dialog.findViewById(R.id.dialog_btn_save);
if (btnSave != null) {
btnSave.setText("确定删除");
}
btnCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
btnSave.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String taskName = task.getTaskName();
mTaskList.remove(position);
applyChanges();
LogUtils.i(TAG, "showDeleteConfirmDialog: 任务 [" + taskName + "] 已删除");
dialog.dismiss();
}
});
dialog.show();
}
/**
* 显示排档确认对话框
* @param position 要排档的任务位置
*/
private void showScheduleConfirmDialog(final int position) {
if (position < 0 || position >= mTaskList.size()) {
return;
}
final TaskSchedulerBean task = mTaskList.get(position);
long currentTime = task.getCurrentScheduleTime();
int duration = task.getDurationMinutes();
long newTime = currentTime + duration * 60 * 1000L;
final Dialog dialog = new Dialog(this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.dialog_schedule_confirm);
TextView tvTaskName = dialog.findViewById(R.id.dialog_schedule_task_name);
TextView tvCurrentTime = dialog.findViewById(R.id.dialog_schedule_current_time);
TextView tvDuration = dialog.findViewById(R.id.dialog_schedule_duration);
TextView tvRemark = dialog.findViewById(R.id.dialog_schedule_remark);
TextView tvNewTime = dialog.findViewById(R.id.dialog_schedule_new_time);
Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
Button btnConfirm = dialog.findViewById(R.id.dialog_btn_confirm);
tvTaskName.setText("任务:" + task.getTaskName());
tvCurrentTime.setText("当前排档时间:" + formatTimestamp(currentTime));
tvDuration.setText("排档幅度:" + formatDurationToString(duration));
tvRemark.setText("备注:" + (task.getRemark() != null && !task.getRemark().isEmpty() ? task.getRemark() : ""));
tvNewTime.setText("排档后时间:" + formatTimestamp(newTime));
btnCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
btnConfirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
performSchedule(position);
}
});
dialog.show();
}
/**
* 执行排档操作
* @param position 点击排档按钮的任务位置
@@ -299,12 +681,9 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
int duration = currentTask.getDurationMinutes();
long newTime = currentTime + duration * 60 * 1000L;
LogUtils.i(TAG, "performSchedule: 当前时间 " + formatTimestamp(currentTime) + " + " + duration + "分钟 = " + formatTimestamp(newTime));
if (position + 1 < mTaskList.size()) {
TaskSchedulerBean nextTask = mTaskList.get(position + 1);
nextTask.setCurrentScheduleTime(newTime);
mAdapter.notifyItemChanged(position + 1);
LogUtils.i(TAG, "performSchedule: 更新任务 [" + nextTask.getTaskName() + "] 时间更新为 " + formatTimestamp(newTime));
}
currentTask.setCurrentScheduleTime(newTime);
applyChanges();
LogUtils.i(TAG, "performSchedule: 更新任务 [" + currentTask.getTaskName() + "] 时间更新为 " + formatTimestamp(newTime));
}
/**
@@ -318,6 +697,11 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
mDataList = dataList;
}
public void setData(ArrayList<TaskSchedulerBean> dataList) {
mDataList = dataList;
notifyDataSetChanged();
}
@Override
public int getItemCount() {
return mDataList.size();
@@ -333,6 +717,20 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
viewHolder.mtvDuration.setText(formatDurationToString(item.getDurationMinutes()));
viewHolder.mtvRemark.setText(item.getRemark());
long diffMs = item.getCurrentScheduleTime() - System.currentTimeMillis();
int diffMinutes = (int) Math.abs(diffMs / 60000);
if (diffMs >= 0) {
viewHolder.mtvTimeDiff.setText("剩余" + formatDurationToString(diffMinutes));
} else {
viewHolder.mtvTimeDiff.setText("已过" + formatDurationToString(diffMinutes));
}
if (item.getCurrentScheduleTime() <= System.currentTimeMillis()) {
viewHolder.mllMain.setBackgroundResource(R.color.colorScheduleFutureBackground);
} else {
viewHolder.mllMain.setBackgroundResource(R.drawable.bg_frame);
}
// 长按直接内置菜单,直接使用当前position
viewHolder.mllMain.setOnLongClickListener(new View.OnLongClickListener() {
@Override
@@ -340,12 +738,19 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
// 使用PopupMenu替代ContextMenu
PopupMenu popup = new PopupMenu(TaskSchedulerActivity.this, v);
popup.getMenu().add("编辑任务内容");
popup.getMenu().add("删除任务");
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
// 直接使用onBind里的position,无需取tag
showEditTaskDialog(position);
return true;
String title = item.getTitle().toString();
if ("编辑任务内容".equals(title)) {
showEditTaskDialog(position);
return true;
} else if ("删除任务".equals(title)) {
showDeleteConfirmDialog(position);
return true;
}
return false;
}
});
// 弹出菜单
@@ -357,7 +762,7 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
viewHolder.mbtnSchedule.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
performSchedule(position);
showScheduleConfirmDialog(position);
}
});
}
@@ -371,6 +776,7 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
class TaskViewHolder extends RecyclerView.ViewHolder {
TextView mtvTaskName;
TextView mtvCurrentScheduleTime;
TextView mtvTimeDiff;
TextView mtvDuration;
TextView mtvRemark;
LinearLayout mllMain;
@@ -380,6 +786,7 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
super(itemView);
mtvTaskName = itemView.findViewById(R.id.item_task_name);
mtvCurrentScheduleTime = itemView.findViewById(R.id.item_start_time);
mtvTimeDiff = itemView.findViewById(R.id.item_time_diff);
mtvDuration = itemView.findViewById(R.id.item_duration);
mtvRemark = itemView.findViewById(R.id.item_remark);
mllMain = itemView.findViewById(R.id.itemtaskscheduler_llmain);
@@ -1,22 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?attr/activityBackgroundColor">
<androidx.appcompat.widget.Toolbar
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/toolbar"/>
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="10dp"
android:id="@+id/task_scheduler_recycler_view"/>
<androidx.appcompat.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/toolbar"/>
</LinearLayout>
<EditText
android:id="@+id/et_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="搜索任务名称(支持中文/拼音)"
android:padding="10dp"
android:background="@android:drawable/edit_text"
android:layout_margin="10dp"
android:inputType="text"
android:singleLine="true"/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="10dp"
android:id="@+id/task_scheduler_recycler_view"/>
</LinearLayout>
<Button
android:id="@+id/fab_add_task"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:background="@color/colorPrimaryDark"
android:text="+"
android:textColor="@android:color/white"
android:textSize="24sp"/>
</FrameLayout>
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="20dp"
android:background="?android:attr/windowBackground">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="确认执行排档"
android:textSize="18sp"
android:textStyle="bold"
android:gravity="center"
android:paddingBottom="15dp"/>
<TextView
android:id="@+id/dialog_schedule_task_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="10dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:paddingBottom="5dp"
android:id="@+id/dialog_schedule_current_time"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:paddingBottom="5dp"
android:id="@+id/dialog_schedule_duration"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:paddingBottom="5dp"
android:id="@+id/dialog_schedule_remark"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:paddingTop="10dp"
android:textStyle="bold"
android:id="@+id/dialog_schedule_new_time"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="20dp"
android:gravity="end">
<Button
android:id="@+id/dialog_btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="取消"
android:layout_marginEnd="10dp"/>
<Button
android:id="@+id/dialog_btn_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="确认排档"/>
</LinearLayout>
</LinearLayout>
@@ -40,14 +40,30 @@
android:paddingTop="15dp"
android:paddingBottom="5dp"/>
<EditText
android:id="@+id/dialog_et_start_time"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="例如:09:00"
android:inputType="time"
android:padding="10dp"
android:background="@android:drawable/edit_text"/>
android:orientation="horizontal"
android:gravity="center_vertical">
<EditText
android:id="@+id/dialog_et_start_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="例如:09:00"
android:inputType="time"
android:padding="10dp"
android:background="@android:drawable/edit_text"/>
<Button
android:id="@+id/dialog_btn_now"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="现在"
android:layout_marginStart="10dp"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
@@ -50,22 +50,38 @@
android:gravity="center_vertical"
android:layout_marginTop="5dp">
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="排档时间:"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:id="@+id/item_start_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="排档时间:"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView
android:id="@+id/item_start_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView
android:id="@+id/item_time_diff"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#FF1976D2"
android:layout_marginStart="10dp"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" 排档幅度:"
android:text="排档幅度:"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_marginLeft="0dp"/>
@@ -20,4 +20,6 @@
<!-- 基础颜色 -->
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<!-- 排档时间超过当前时间的列表项背景色 -->
<color name="colorScheduleFutureBackground">#FFC8E6C9</color>
</resources>