sonichy
/
DayCount
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

修复图片2天只有一个日期

This commit is contained in:
sonichy 2025-05-14 11:01:07 +08:00
parent c75e104acb
commit e93cb3ac15
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/java/com/hty/daycount/MainActivity.java
View File

@ -493,13 +493,12 @@ public class MainActivity extends Activity {
paint.setColor(Color.rgb(245, 245, 245)); //浅灰色
canvas.drawRoundRect(0, h - 100, w, h, r, r, paint);
String s = "";
long day1 = 24 * 60 * 60 * 3000; //一天毫秒数
Date now = new Date();
if (date.getTime() < now.getTime() && now.getTime() - date.getTime() > day1)
if (date.getTime() < now.getTime() && !(date.getYear() == now.getYear() && date.getMonth() == now.getMonth() && date.getDate() == now.getDate()))
s = SDF2.format(date) + " ~ " + SDF2.format(now);
else if (date.getTime() > now.getTime() && date.getTime() - now.getTime() > day1)
else if (date.getTime() > now.getTime() && !(date.getYear() == now.getYear() && date.getMonth() == now.getMonth() && date.getDate() == now.getDate()))
s = SDF2.format(now) + " ~ " + SDF2.format(date);
else if (Math.abs(date.getTime() - now.getTime()) <= day1)
else if (date.getYear() == now.getYear() && date.getMonth() == now.getMonth() && date.getDate() == now.getDate())
s = SDF2.format(date);
tw = paint.measureText(s);
x = (w - tw) / 2;