diff --git a/README.md b/README.md index fac8b6b..6886f5e 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,8 @@ A: 这个取决于选用的电池和使用场景,以及开发板的质量。 A: 可能是开发板或驱动板的质量问题,实际发现有些板子休眠功耗能达2ma,这会极大影响待机时长。另外,由于电池容量的虚标,待机时长与理论计算值也有较大偏差。建议,增加电池测量电路,及时显示电池电量情况。 ## Releases +### 1.1.7 +* Fix: 内置节日信息未展现。 ### 1.1.6 * Fix: 课程表页面星期显示位置不当。 ### 1.1.5 diff --git a/dist/jcalendar_1.1.6_1680.bin b/dist/jcalendar_1.1.7_1680.bin similarity index 82% rename from dist/jcalendar_1.1.6_1680.bin rename to dist/jcalendar_1.1.7_1680.bin index a0c0b46..93b03f5 100644 Binary files a/dist/jcalendar_1.1.6_1680.bin and b/dist/jcalendar_1.1.7_1680.bin differ diff --git a/dist/jcalendar_1.1.6_z98.bin b/dist/jcalendar_1.1.7_z15.bin similarity index 73% rename from dist/jcalendar_1.1.6_z98.bin rename to dist/jcalendar_1.1.7_z15.bin index cb87f94..85ada52 100644 Binary files a/dist/jcalendar_1.1.6_z98.bin and b/dist/jcalendar_1.1.7_z15.bin differ diff --git a/dist/jcalendar_1.1.6_z21.bin b/dist/jcalendar_1.1.7_z21.bin similarity index 76% rename from dist/jcalendar_1.1.6_z21.bin rename to dist/jcalendar_1.1.7_z21.bin index 6833b91..d6b4816 100644 Binary files a/dist/jcalendar_1.1.6_z21.bin and b/dist/jcalendar_1.1.7_z21.bin differ diff --git a/dist/jcalendar_1.1.6_z15.bin b/dist/jcalendar_1.1.7_z98.bin similarity index 78% rename from dist/jcalendar_1.1.6_z15.bin rename to dist/jcalendar_1.1.7_z98.bin index 8878742..d9635f7 100644 Binary files a/dist/jcalendar_1.1.6_z15.bin and b/dist/jcalendar_1.1.7_z98.bin differ diff --git a/src/screen_ink.cpp b/src/screen_ink.cpp index 4a01fdc..7fe3f91 100644 --- a/src/screen_ink.cpp +++ b/src/screen_ink.cpp @@ -388,13 +388,14 @@ void draw_cal_days(bool partial) { } } bool isJr = false; // 是否节日 + int currentDateNum = (tmInfo.tm_mon + 1) * 100 + iDay + 1; for (; jrIndex < jrLength; jrIndex++) { - if (tmInfo.tm_mon * 100 + iDay + 1 < jrDate[jrIndex]) { + if (currentDateNum < jrDate[jrIndex]) { break; } - if (tmInfo.tm_mon * 100 + iDay + 1 < jrDate[jrIndex]) { + if (currentDateNum == jrDate[jrIndex]) { lunarStr = jrText[jrIndex]; - isJr == true; + isJr = true; break; } }