From b301ac575bc6dec945a075ec692167c0fba5f248 Mon Sep 17 00:00:00 2001 From: Jerry Date: Sun, 6 Apr 2025 18:01:59 +0800 Subject: [PATCH] 1.0.24 --- README.md | 6 +++++- ....0.23_z15.bin => jcalendar_1.0.24_z15.bin} | Bin 1671584 -> 1671584 bytes ....0.23_z21.bin => jcalendar_1.0.24_z21.bin} | Bin 1671552 -> 1671552 bytes ....0.23_z98.bin => jcalendar_1.0.24_z98.bin} | Bin 1671312 -> 1671296 bytes src/main.cpp | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) rename dist/{jcalendar_1.0.23_z15.bin => jcalendar_1.0.24_z15.bin} (99%) rename dist/{jcalendar_1.0.23_z21.bin => jcalendar_1.0.24_z21.bin} (98%) rename dist/{jcalendar_1.0.23_z98.bin => jcalendar_1.0.24_z98.bin} (97%) diff --git a/README.md b/README.md index 7afe49a..8c138fa 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,9 @@ Bilibili连接:https://www.bilibili.com/video/BV1wHDhYoE3G/
* 0: 周日(默认); 1: 周一; * 和风天气: * 输入和风天气的API Key和城市id(城市对应的id请在和风天气的官网查找。)系统会每2小时刷新当前天气,如果Key置空,天气将不会被刷新。
- * 天气类型:0:每日天气(默认,每天凌晨刷新一次); 1: 实时天气(每两个小时刷新一次天气)
[城市id列表](./assets/file/China-City-List-latest.csv)
+ * 天气类型:0:每日天气(默认,每天凌晨刷新一次); 1: 实时天气(每两个小时刷新一次天气)
+ * 位置:城市id或者经纬度 例1: 101010100 例2: 116.41,39.92
+ [城市id列表](./assets/file/China-City-List-latest.csv)
* 倒数日:
输入倒数日名称和日期,名称不能超过4个中文字符,时间以yyyyMMdd的格式填入。配置正确的话,日历每天会显示倒数“距****还有**天”。如果倒数日名称为空,系统将不显示倒数日信息。 * 日期Tag:
1. 输入格式,yyyyMMddx,yyyy为年,每年显示设为0000,MM为月份,每月显示设为00,dd为日期,x为tag的图标(a:书签;b:金钱;c:笑脸;d:警告)。例如:00000015b,每年每月15日旁边显示$符号;00000312a,每年3月12日,显示书签符号。 @@ -110,6 +112,8 @@ A: 1. 换根质量较好的或短一些的USB线,或换个USB口插入。
A: 仅刷新app固件后,配置是保留的,所以,无需重新配置。如果刷新了分区表partition.bin,会将esp的nvs区刷新,这时候需要重新配置。 ## Releases +### 1.0.24 +* Refine: 配置页面location约束改为64长度,允许输入经纬度设置天气位置(e.g. 116.41,39.92) ### 1.0.23 * Refine: 修改和风天气请求url。 * Fix: bug(获取holiday返回码)。 diff --git a/dist/jcalendar_1.0.23_z15.bin b/dist/jcalendar_1.0.24_z15.bin similarity index 99% rename from dist/jcalendar_1.0.23_z15.bin rename to dist/jcalendar_1.0.24_z15.bin index f0e79a6e3be33a328c4ec6602aa5d39250b96a31..918b82c3bf727003053bbffb81118097e6aa2183 100644 GIT binary patch delta 211 zcmZ3`oVK7jZNdfx$&z)!9iA0U%5m~p7e4(9OPH6qK(H j37I={UyRe7USI!Tr8c79npn(y^WDF8UeLH=nS22Nfe}le delta 211 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 C>kHig delta 13907 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 Cy$Bcp diff --git a/dist/jcalendar_1.0.23_z98.bin b/dist/jcalendar_1.0.24_z98.bin similarity index 97% rename from dist/jcalendar_1.0.23_z98.bin rename to dist/jcalendar_1.0.24_z98.bin index 6991768c3682277cd5d98c5aa37486797c4444cc..ac571f202ad43d600422524a48e987be666a769d 100644 GIT binary patch delta 8799 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 delta 8603 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 TbbDLe^Jcr}xYHf^E9d+l#>HWO diff --git a/src/main.cpp b/src/main.cpp index 7c683d4..726ad3c 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -232,7 +232,7 @@ void buttonDoubleClick(void* oneButton) { pref.end(); para_qweather_key.setValue(qToken.c_str(), 32); - para_qweather_location.setValue(qLoc.c_str(), 9); + para_qweather_location.setValue(qLoc.c_str(), 64); para_qweather_type.setValue(qType.c_str(), 1); para_cd_day_label.setValue(cddLabel.c_str(), 16); para_cd_day_date.setValue(cddDate.c_str(), 8);