mirror of
https://gitea.winboll.cc/ZhanGSKen/MyWinBoLL.git
synced 2026-08-14 21:47:11 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e8e7887926 | |||
| 4acae6726c |
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Fri May 22 17:22:44 HKT 2026
|
||||
stageCount=5
|
||||
#Fri May 22 19:00:55 HKT 2026
|
||||
stageCount=6
|
||||
libraryProject=
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.4
|
||||
publishVersion=15.20.5
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.5
|
||||
baseBetaVersion=15.20.6
|
||||
|
||||
+10
@@ -612,6 +612,14 @@ 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 {
|
||||
@@ -663,6 +671,7 @@ public class TaskSchedulerActivity extends WinBoLLActivity {
|
||||
class TaskViewHolder extends RecyclerView.ViewHolder {
|
||||
TextView mtvTaskName;
|
||||
TextView mtvCurrentScheduleTime;
|
||||
TextView mtvTimeDiff;
|
||||
TextView mtvDuration;
|
||||
TextView mtvRemark;
|
||||
LinearLayout mllMain;
|
||||
@@ -672,6 +681,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);
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user