== #6 月视图事件标记（每日期最多一个圆点）== 应用市场反馈希望有事件的日期带标记。此前该功能存在但被移除， 原因是**按日历本逐个渲染**：3 个本 3 个点，15 个本满屏都是点。 - MonthCell 只加**一个布尔** hasEvent，不存每本一个的集合 - 用 buildEventDaySet() 一次遍历把有事件的日期收进 Set， 渲染时 O(1) 查（避免 42 格 × N 事件的 O(n²)，本机近 3000 条数据会卡） - 判定口径与 eventsOfDate 一致（区间相交）→ 跨天事件覆盖的每一天都有点 - 待办不计入（无时间点语义，混进来点会失去意义） - 视觉用主题色 5vp 小点而非纯红：42 格里 30 个红点会吵， 正是用户嫌乱的同类问题；选中日深底下换白色保证对比度 - 无事件时用等高透明占位，避免行高跳动 == #5 待办勾选完成 == 先回答关键问题：**系统未开放待办 API**。 本机 SDK 检索 @ohos.calendarManager 全文，todo/VTODO/task 零命中， Calendar/Event 只处理 VEVENT ⇒ 第三方应用无法读写系统「待办」页签。 故只能在本应用内实现，并已在待办页注明不会出现在系统待办中。 现状是**只读**（点击提示请在源端修改），本次补上写回： - TodoService.setCompleted()：GET 原文 → 改状态字段 → PUT 回写 - EventDb: queryById / setTodoCompleted - DavClient.getRawStrict()：失败**抛错**（原 getRaw 失败返回 HTTP 4xx 字符串，若当 ICS 内容 PUT 回去会把待办覆盖成一句错误信息） - IcsUtil.rewriteTodoCompletion() ⚠️ 两个关键设计： 1. **不重建 VTODO，只在原文上改字段** VTODO 有 SUMMARY/DESCRIPTION/DUE/PRIORITY/CATEGORIES/X-* 等字段， 本地库只存了少数几个。重建后 PUT 会把没存的字段全部抹掉（丢数据）。 2. **两遍处理，与字段顺序无关** RFC 5545 不规定字段顺序。单遍实现若 STATUS 出现在 UID 之前， matched 仍为 false → 状态改不到 → 用户点完成没反应。 改为第 1 遍定位目标 VTODO 块、第 2 遍在块内改写。 插入补字段时按**块序号**定位而非行号（改动会删掉旧 COMPLETED 行， 行号不再对齐，会让字段落到 END:VCALENDAR 之后，部分服务端直接 400）。 同步维护三个字段（按 RFC 5545，缺一个各客户端显示就不一致）： STATUS / COMPLETED / PERCENT-COMPLETE。 UI：顶部新增「待办」标签（月/周/列表/待办），未完成在前、已完成在后， 点击勾选即写回；写回失败本地状态不变（避免界面与服务器不一致）。 验证：scripts/test-ics-todo.js 覆盖 26 项（状态在 UID 前/后、取消完成、 多 VTODO 只改目标、缺 STATUS 补字段、折行、结构完整性），全部通过。 编译 BUILD SUCCESSFUL。
This commit is contained in:
@@ -0,0 +1,162 @@
|
||||
// 验证 IcsUtil.rewriteTodoCompletion（第二版：按结构定位插入点）
|
||||
function fmtUtcNow() {
|
||||
return new Date().toISOString().replace(/[-:]/g, '').split('.')[0] + 'Z';
|
||||
}
|
||||
|
||||
function rewrite(ics, uid, done) {
|
||||
const crlf = '\r\n';
|
||||
const unfolded = ics.replace(/\r?\n[ \t]/g, '');
|
||||
const lines = unfolded.split(/\r?\n/).map(s => s.replace(/\r$/, ''));
|
||||
const upperOf = s => s.toUpperCase();
|
||||
const nowUtc = fmtUtcNow();
|
||||
|
||||
let targetBegin = -1, targetEnd = -1, targetOrdinal = -1;
|
||||
let curBegin = -1, curHasUid = false, blockIdx = -1;
|
||||
for (let i = 0; i < lines.length; i++) {
|
||||
const u = upperOf(lines[i]);
|
||||
if (u.startsWith('BEGIN:VTODO')) { blockIdx++; curBegin = i; curHasUid = false; continue; }
|
||||
if (u.startsWith('UID:') && curBegin >= 0) {
|
||||
if (lines[i].substring(4).trim() === uid) curHasUid = true;
|
||||
continue;
|
||||
}
|
||||
if (u.startsWith('END:VTODO')) {
|
||||
if (curBegin >= 0 && curHasUid && targetBegin < 0) {
|
||||
targetBegin = curBegin; targetEnd = i; targetOrdinal = blockIdx;
|
||||
}
|
||||
curBegin = -1; curHasUid = false;
|
||||
}
|
||||
}
|
||||
if (targetBegin < 0) return ics;
|
||||
|
||||
const out = [];
|
||||
let sawStatus = false, sawPercent = false;
|
||||
for (let i = 0; i < lines.length; i++) {
|
||||
const line = lines[i], u = upperOf(line);
|
||||
if (!(i > targetBegin && i < targetEnd)) { out.push(line); continue; }
|
||||
if (u.startsWith('STATUS:')) { sawStatus = true; out.push(done ? 'STATUS:COMPLETED' : 'STATUS:NEEDS-ACTION'); continue; }
|
||||
if (u.startsWith('COMPLETED')) { continue; }
|
||||
if (u.startsWith('PERCENT-COMPLETE')) { sawPercent = true; out.push(done ? 'PERCENT-COMPLETE:100' : 'PERCENT-COMPLETE:0'); continue; }
|
||||
out.push(line);
|
||||
}
|
||||
|
||||
const extra = [];
|
||||
if (!sawStatus) extra.push(done ? 'STATUS:COMPLETED' : 'STATUS:NEEDS-ACTION');
|
||||
if (done) extra.push('COMPLETED:' + nowUtc);
|
||||
if (!sawPercent) extra.push(done ? 'PERCENT-COMPLETE:100' : 'PERCENT-COMPLETE:0');
|
||||
if (extra.length === 0) {
|
||||
const plain = out.join(crlf);
|
||||
return plain.endsWith(crlf) ? plain : plain + crlf;
|
||||
}
|
||||
|
||||
const result = [];
|
||||
let vtodoIdx = -1, inserted = false;
|
||||
for (let i = 0; i < out.length; i++) {
|
||||
const u = upperOf(out[i]);
|
||||
if (u.startsWith('BEGIN:VTODO')) { vtodoIdx++; result.push(out[i]); continue; }
|
||||
if (u.startsWith('END:VTODO')) {
|
||||
if (!inserted && vtodoIdx === targetOrdinal) {
|
||||
for (const ex of extra) result.push(ex);
|
||||
inserted = true;
|
||||
}
|
||||
vtodoIdx = -1; result.push(out[i]); continue;
|
||||
}
|
||||
result.push(out[i]);
|
||||
}
|
||||
if (!inserted) {
|
||||
const tail0 = result.join(crlf);
|
||||
const idxVc = tail0.lastIndexOf('END:VCALENDAR');
|
||||
if (idxVc > 0) {
|
||||
const merged = tail0.substring(0, idxVc) + extra.join(crlf) + crlf + tail0.substring(idxVc);
|
||||
return merged.endsWith(crlf) ? merged : merged + crlf;
|
||||
}
|
||||
for (const ex of extra) result.push(ex);
|
||||
}
|
||||
const text2 = result.join(crlf);
|
||||
return text2.endsWith(crlf) ? text2 : text2 + crlf;
|
||||
}
|
||||
|
||||
let pass = 0, fail = 0;
|
||||
function assert(name, cond, detail) {
|
||||
if (cond) { console.log(' ✅', name); pass++; }
|
||||
else { console.log(' ❌', name, detail || ''); fail++; }
|
||||
}
|
||||
|
||||
/** 关键结构校验：任何字段都不能跑到 END:VCALENDAR 之后 */
|
||||
function structureIntact(ics) {
|
||||
const iEnd = ics.indexOf('END:VCALENDAR');
|
||||
if (iEnd < 0) return false;
|
||||
const after = ics.substring(iEnd + 'END:VCALENDAR'.length).replace(/[\r\n]/g, '');
|
||||
return after === ''; // END:VCALENDAR 之后不应有任何内容
|
||||
}
|
||||
function balanced(ics, tag) {
|
||||
const b = (ics.match(new RegExp('BEGIN:' + tag, 'g')) || []).length;
|
||||
const e = (ics.match(new RegExp('END:' + tag, 'g')) || []).length;
|
||||
return b === e;
|
||||
}
|
||||
|
||||
// 1. STATUS 在 UID 之前（触发补字段的路径）
|
||||
const ics1 = 'BEGIN:VCALENDAR\r\nVERSION:2.0\r\nBEGIN:VTODO\r\nDTSTAMP:20260101T000000Z\r\nSTATUS:NEEDS-ACTION\r\nSUMMARY:买菜\r\nUID:todo-abc-123\r\nDUE:20260105T090000Z\r\nEND:VTODO\r\nEND:VCALENDAR\r\n';
|
||||
const r1 = rewrite(ics1, 'todo-abc-123', true);
|
||||
assert('STATUS 在 UID 之前 → COMPLETED', r1.includes('STATUS:COMPLETED'));
|
||||
assert('旧状态消失', !r1.includes('STATUS:NEEDS-ACTION'));
|
||||
assert('有 COMPLETED 时间戳', /COMPLETED:\d{8}T\d{6}Z/.test(r1));
|
||||
assert('补 PERCENT-COMPLETE:100', r1.includes('PERCENT-COMPLETE:100'));
|
||||
assert('保留 SUMMARY', r1.includes('SUMMARY:买菜'));
|
||||
assert('保留 DUE', r1.includes('DUE:20260105T090000Z'));
|
||||
assert('⭐ 结构完整（END:VCALENDAR 后无残留）', structureIntact(r1), JSON.stringify(r1.slice(r1.indexOf('END:VCALENDAR'))));
|
||||
assert('BEGIN/END VTODO 配对', balanced(r1, 'VTODO'));
|
||||
|
||||
// 2. UID 在前 + 已有 STATUS/PERCENT（不触发补字段）
|
||||
const ics2 = 'BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nUID:todo-xyz\r\nDTSTAMP:20260101T000000Z\r\nSUMMARY:写报告\r\nPRIORITY:1\r\nSTATUS:NEEDS-ACTION\r\nPERCENT-COMPLETE:0\r\nEND:VTODO\r\nEND:VCALENDAR\r\n';
|
||||
const r2 = rewrite(ics2, 'todo-xyz', true);
|
||||
assert('UID 在前 → COMPLETED', r2.includes('STATUS:COMPLETED'));
|
||||
assert('PERCENT 改 100', r2.includes('PERCENT-COMPLETE:100'));
|
||||
assert('保留 SUMMARY/PRIORITY', r2.includes('SUMMARY:写报告') && r2.includes('PRIORITY:1'));
|
||||
assert('⭐ 结构完整', structureIntact(r2));
|
||||
assert('COMPLETED 时间戳在 VTODO 内部', (() => {
|
||||
const body = r2.substring(r2.indexOf('BEGIN:VTODO'), r2.indexOf('END:VTODO'));
|
||||
return /COMPLETED:\d{8}/.test(body);
|
||||
})());
|
||||
|
||||
// 3. 取消完成
|
||||
const ics3 = 'BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nUID:todo-xyz\r\nSTATUS:COMPLETED\r\nCOMPLETED:20260101T000000Z\r\nPERCENT-COMPLETE:100\r\nSUMMARY:写报告\r\nEND:VTODO\r\nEND:VCALENDAR\r\n';
|
||||
const r3 = rewrite(ics3, 'todo-xyz', false);
|
||||
assert('取消完成 → NEEDS-ACTION', r3.includes('STATUS:NEEDS-ACTION'));
|
||||
assert('PERCENT 回 0', r3.includes('PERCENT-COMPLETE:0'));
|
||||
assert('COMPLETED 行被移除', !/COMPLETED:\d{8}/.test(r3));
|
||||
assert('⭐ 结构完整', structureIntact(r3));
|
||||
|
||||
// 4. uid 不匹配 → 原文不动
|
||||
assert('uid 不匹配 → 原文不变', rewrite(ics1, 'nope', true) === ics1);
|
||||
|
||||
// 5. 多 VTODO 只改目标
|
||||
const ics5 = 'BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nUID:a1\r\nSUMMARY:第一个\r\nSTATUS:NEEDS-ACTION\r\nEND:VTODO\r\nBEGIN:VTODO\r\nUID:a2\r\nSUMMARY:第二个\r\nSTATUS:NEEDS-ACTION\r\nEND:VTODO\r\nEND:VCALENDAR\r\n';
|
||||
const r5 = rewrite(ics5, 'a2', true);
|
||||
assert('多 VTODO：a1 未动', r5.split('UID:a1')[1].split('END:VTODO')[0].includes('STATUS:NEEDS-ACTION'));
|
||||
assert('多 VTODO：a2 已改', r5.split('UID:a2')[1].split('END:VTODO')[0].includes('STATUS:COMPLETED'));
|
||||
assert('⭐ 多 VTODO 结构完整', structureIntact(r5));
|
||||
assert('两个 VTODO 都配对', balanced(r5, 'VTODO'));
|
||||
|
||||
// 6. 目标 VTODO 缺 STATUS（走"补字段"最极端路径）
|
||||
const ics6 = 'BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nUID:bare\r\nSUMMARY:没有状态字段\r\nEND:VTODO\r\nEND:VCALENDAR\r\n';
|
||||
const r6 = rewrite(ics6, 'bare', true);
|
||||
assert('缺 STATUS 时能补上', r6.includes('STATUS:COMPLETED'));
|
||||
assert('⭐ 补在 VTODO 内而非 VCALENDAR 后', structureIntact(r6) && (() => {
|
||||
const body = r6.substring(r6.indexOf('BEGIN:VTODO'), r6.indexOf('END:VTODO'));
|
||||
return body.includes('STATUS:COMPLETED');
|
||||
})());
|
||||
|
||||
// 7. 折行保留
|
||||
const ics7 = 'BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nUID:long\r\nSUMMARY:很长的标题\r\n 需要折行\r\nSTATUS:NEEDS-ACTION\r\nEND:VTODO\r\nEND:VCALENDAR\r\n';
|
||||
assert('折行被还原保留', rewrite(ics7, 'long', true).includes('很长的标题需要折行'));
|
||||
|
||||
// 8. 末尾多个空行也不应让结构崩
|
||||
const ics8 = ics1 + '\r\n\r\n';
|
||||
assert('⭐ 尾部空行场景结构完整', structureIntact(rewrite(ics8, 'todo-abc-123', true)));
|
||||
|
||||
console.log(`\n结果：通过 ${pass}，失败 ${fail}`);
|
||||
console.log('\n--- 测试1 输出 ---');
|
||||
console.log(r1.replace(/\r\n/g, '\n'));
|
||||
console.log('--- 测试6 输出（最极端：无 STATUS）---');
|
||||
console.log(r6.replace(/\r\n/g, '\n'));
|
||||
process.exit(fail === 0 ? 0 : 1);
|
||||
Reference in New Issue
Block a user