diff --git a/.gitignore b/.gitignore index 7df8dff5..9c506bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,18 @@ project.properties .settings/ .classpath .project + +# ===== 本地 Gradle 重构(个人目录,勿提交到团队仓库)===== +.gradle/ +build/ +local.properties + +# Android Studio / IntelliJ 工程文件 +.idea/ +*.iml + +# 备份与杂项 +*.bak +captures/ +.externalNativeBuild/ +.cxx/ diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e5c7d47c..18d484ac 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,7 +16,7 @@ --> @@ -31,6 +31,8 @@ + + - + @@ -83,10 +87,12 @@ @@ -100,6 +106,7 @@ @@ -113,19 +120,24 @@ android:resource="@xml/widget_4x_info" /> - + + @@ -133,6 +145,7 @@ diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..a4e2a337 --- /dev/null +++ b/build.gradle @@ -0,0 +1,54 @@ +// build.gradle —— 根目录即应用模块(单模块工程) +plugins { + id 'com.android.application' version '8.7.3' +} + +android { + // AGP 8 要求用 namespace 声明包名(替代旧 Manifest 里的 package) + namespace 'net.micode.notes' + compileSdk 34 + + defaultConfig { + applicationId "net.micode.notes" + minSdk 14 + targetSdk 34 + versionCode 1 + versionName "0.1" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + // 2011 老代码使用 org.apache.http(API 23 起已从框架移除),重新启用遗留库 + useLibrary 'org.apache.http.legacy' + + // 关键:把 Eclipse 平铺目录映射到 Gradle,源码/资源无需移动 + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + jniLibs.srcDirs = ['libs'] + } + } + + // 老工程没有 lint 配置,关闭中断式 lint 避免构建被历史告警打断 + lint { + abortOnError false + } +} + +// 本项目使用纯 framework API(Theme.Holo 等),未引用任何 support/androidx 库, +// 因此无需额外 dependencies。若后续要加库,在此块声明即可。 +dependencies { +} \ No newline at end of file diff --git "a/doc/members/a/\351\230\266\346\256\2651\357\274\232\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\346\230\276\347\244\272\345\212\237\350\203\275/README.md" "b/doc/members/a/\351\230\266\346\256\2651\357\274\232\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\346\230\276\347\244\272\345\212\237\350\203\275/README.md" new file mode 100644 index 00000000..187bfd07 --- /dev/null +++ "b/doc/members/a/\351\230\266\346\256\2651\357\274\232\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\346\230\276\347\244\272\345\212\237\350\203\275/README.md" @@ -0,0 +1,131 @@ +# 钟萱第一阶段成果 + +姓名:钟萱  学号:202430224015  日期:2026-10-22(北京时间) + +分工:页面流程与 UI 关系梳理、遗留 API 兼容性修复、编辑页实时字数显示功能,以及多处 Bug 修复。个人分支:`member/a-word-count`。仓库:[https://github.com/ttt587/Notes](https://github.com/ttt587/Notes)。起点为 `origin/develop` 的 `81a66024fe48eaa2206b854430856fe3875ff3ba`,建立分支时与 `origin/master` 相同。 + +本阶段完成补齐 Gradle 构建系统并配置版本控制忽略、在 Android Studio 成功运行工程;针对 compileSdk 34 / targetSdk 34 完成 Manifest 与遗留 API 适配;梳理全项目页面流程与 UI 关系;实现编辑页实时字数显示;修复垃圾桶多选 Bug、恢复顶部 ActionBar / overflow 菜单、修复设置页闪退;并完成功能与兼容性测试。 + +| 成果 | 位置 | +| --- | --- | +| Gradle 兼容构建改造与 git 忽略配置 | `settings.gradle`、`build.gradle`、`gradle.properties`、`gradle/wrapper/`、`gradlew`、`gradlew.bat`、`.gitignore` | +| Manifest 与遗留 API 兼容性修复清单 | `AndroidManifest.xml`、`build.gradle`、`GTaskASyncTask.java`、`NoteEditActivity.java`、`NotesListActivity.java` | +| 页面流程与 UI 关系梳理 | 见本文「二、页面流程与 UI 关系」 | +| 实时字数显示功能 | `res/layout/note_edit.xml`、`res/values*/strings.xml`、`NoteEditActivity.java` | +| 垃圾桶按钮多选 Bug 修复 | `src/net/micode/notes/ui/NotesListActivity.java` | +| 顶部 ActionBar / overflow 菜单恢复 | `res/values/styles.xml` | +| 设置页闪退修复 | `src/net/micode/notes/ui/NotesPreferenceActivity.java` | +| 功能与兼容性测试记录 | 见本文「四、此次测试」 | + +## 一、在 Android Studio 运行(Gradle 兼容改造) + +小米便签为 2011 年的项目,当时使用 Eclipse 而非 Gradle,需要为该项目补齐 Gradle 依赖,并在 `.gitignore` 中配置忽略,便于 git 合并。 + +在项目根目录下新建 `settings.gradle`、`build.gradle`、`gradle.properties` 文件,然后通过终端命令安装或直接从其他安卓项目中把 Gradle 依赖复制过来,包括:`gradle` 文件夹但只留下其中的 `wrapper` 文件夹,还有 `gradlew`、`gradlew.bat` 两个文件。然后重新用 Android Studio 打开该项目,会自动识别并询问是否进行同步。 + +同步之后,源文件有些冲突需要更改。此次修改文件清单(compileSdk 34 / targetSdk 34 适配): + +| 文件 | 改动 | 原因 | +| --- | --- | --- | +| `AndroidManifest.xml` | 为 5 个带 `intent-filter` 的组件补 `android:exported`(Activity / Receiver 设 `true`,Provider / AlarmReceiver 设 `false`) | targetSdk 31+ 强制要求带 `intent-filter` 的组件显式声明 `exported`,否则 Manifest 合并失败 | +| `build.gradle` | 在 `android{}` 加 `useLibrary 'org.apache.http.legacy'` | Apache HttpClient(`org.apache.http`)自 API 23 起从框架移除,compileSdk 34 下 `GTaskClient` 编译报「包不存在」 | +| `GTaskASyncTask.java` | `showNotification` 改用 `Notification.Builder`,移除已删除的 `setLatestEventInfo`,`PendingIntent` 加 `FLAG_IMMUTABLE` | `setLatestEventInfo` API 23 已移除导致编译失败;targetSdk 31+ 下 `PendingIntent` 不加可变性标志会崩溃 | +| `NoteEditActivity.java` | 1)修正第 433 行误加的 `-`;2)`onOptionsItemSelected` 的 `switch(R.id)` 改为 if-else | 笔误导致语义错误;AGP 8 生成的应用 R 字段不再是 final 常量,`case R.id` 报「需要常量表达式」 | +| `NotesListActivity.java` | 3 处含 `case R.id` 的 switch(`onMenuItemClick`、`onClick`、`onOptionsItemSelected`)改为 if-else | 同上,应用 R 资源 id 非编译期常量,switch-case 报「需要常量表达式」 | + +## 二、页面流程与 UI 关系 + +### 首页 · 笔记列表页(`NotesListActivity.java`) + +从上到下有组件:标题栏(`tv_title_bar`,子文件夹内才显示)、笔记 / 文件夹列表(`notes_list`)、正下方「新建笔记」按钮(`btn_new_note`)。 + +- 点击「笔记条目」→ 跳转编辑页(`NoteEditActivity.java`),返回时列表刷新。 +- 点击「文件夹 / 系统条目」→ 进入子文件夹(仍是本页,标题栏显示文件夹名,列表变为该夹内容)。 +- 点击「通话记录夹」→ 进入通话记录(本页,隐藏新建按钮)。 +- 点击「新建笔记按钮」→ 跳转编辑页(新建模式)。 +- 长按「笔记条目」→ 进入多选模式(底部出现全选下拉菜单 + 顶部删除 / 移动)。 +- 长按「文件夹条目」→ 弹出菜单:查看 / 删除 / 重命名。 +- 菜单「新建文件夹」→ 弹出命名对话框。 +- 菜单「搜索」→ 系统搜索,选中结果 → 跳转编辑页(高亮关键词)。 +- 菜单「设置」/「同步(未配置)」→ 跳转设置页(`NotesPreferenceActivity.java`)。 +- 菜单「同步(已配置)」→ 触发同步服务(`GTaskSyncService.java`)。 +- 子文件夹 / 通话记录内按返回键 → 回到首页根列表;根列表再按返回键 → 退出应用。 + +### 编辑页(`NoteEditActivity.java`) + +从上到下有组件:标题栏(`note_title`:修改时间、提醒图标 / 文字、背景色按钮 `btn_set_bg_color`)、编辑区(`sv_note_edit`:普通模式单编辑器 `note_edit_view`,或清单模式多行列表 `note_edit_list`)、隐藏面板(背景色选择面板、字号选择面板)。 + +- 点击「背景色按钮」→ 弹出背景色面板,选色即应用并收起。 +- 菜单「字号」→ 弹出字号面板,选择即应用并持久化。 +- 菜单「清单模式」→ 在普通编辑器 ⇄ 清单多行编辑器间切换。 +- 菜单「设置提醒」→ 弹出日期时间选择框(`DateTimePickerDialog.java`),确认后注册闹钟;到期触发 `AlarmReceiver` → 提醒页(`AlarmAlertActivity.java`)。 +- 菜单「分享」→ 系统分享选择器(外部应用)。 +- 菜单「桌面快捷方式」→ 发送广播在桌面创建图标。 +- 菜单「新建」→ 保存当前笔记后打开新的编辑页。 +- 菜单「删除」→ 确认后删除并返回首页。 +- 按返回键 / 离开页面 → 自动保存笔记,回到首页。 + +### 设置页(`NotesPreferenceActivity.java`) + +配置云同步账号等;完成后返回首页。 + +### 提醒页(`AlarmAlertActivity.java`) + +闹钟到点弹出,展示笔记提醒内容。 + +### 桌面小部件(`NoteWidgetProvider_2x/4x.java`) + +主屏 2x / 4x 显示笔记,点击进入编辑页;笔记被删改时通过广播刷新。 + +## 三、字数统计功能与 Bug 修复 + +### 1. 垃圾桶按钮 Bug 修复 + +- **文件**:`src/net/micode/notes/ui/NotesListActivity.java` +- **改动**:`ModeCallback.onMenuItemClick` 里删除确认框的「取消」负按钮,从 `null` 改为点击时调用 `mModeCallBack.finishActionMode()`。 +- **原因**:长按便签进入多选后,点垃圾桶 → 确认框按「取消」时多选模式不退出,导致底部删除按钮一直滞留。 + +### 2. 编辑页底部新增留空行 + 实时字数统计器 + +- **文件**:`res/layout/note_edit.xml` + - **改动**:在编辑区 ScrollView 下方、底部遮罩上方新增 `word_count_bar` 行,内含左对齐的 `tv_word_count` 文本。 + - **原因**:为编辑页底部增加一行留空,并在该行左侧放字数统计器。 +- **文件**:`res/values/strings.xml` / `res/values-zh-rCN/strings.xml` / `res/values-zh-rTW/strings.xml` + - **改动**:各新增一条 `note_word_count` 格式串(`Characters: %1$d` / `字数:%1$d` / `字數:%1$d`)。 + - **原因**:为统计器提供跟随系统语言的文案,避免硬编码。 +- **文件**:`src/net/micode/notes/ui/NoteEditActivity.java` + - **改动**:新增 `Editable` / `TextWatcher` 导入、`mWordCount` 字段、`refreshWordCount()` 方法;在 `initResources` 绑定视图并给编辑器加监听;在 `initNoteScreen`、`switchToListMode`、`getListItem`、`onCheckListModeChanged` 处刷新字数。 + - **原因**:让字数在普通模式与清单模式下都随输入实时更新(不含换行)。 + +### 3. 恢复顶部 ActionBar / overflow 菜单 + +- **文件**:`res/values/styles.xml` +- **改动**:`NoteActionBarStyle` 删除 `android:visibility">gone`,`displayOptions` 由空改为 `showTitle`。 +- **原因**:原主题把 ActionBar 整体隐藏,导致首页 / 编辑页 overflow(新建文件夹、设置、字号、清单模式、提醒、分享等菜单)无法访问。 + +### 4. 设置页闪退修复 + +- **文件**:`src/net/micode/notes/ui/NotesPreferenceActivity.java` +- **改动**:新增 `android.os.Build` 导入;`registerReceiver(mReceiver, filter)` 改为按 `Build.VERSION.SDK_INT` 判断,Android 13+ 使用 `RECEIVER_NOT_EXPORTED` 标志的重载。 +- **原因**:targetSdk 34 下注册自定义广播接收器未指定 exported 标志会抛 `SecurityException`,导致一进设置页即崩溃。 + +### 5. 阅读与注释文件 + +- **文件**: +`src/net/micode/notes/ui/NotesListActivity.java`, +`src/net/micode/notes/ui/NotesListAdapterActivity.java`, +`src/net/micode/notes/ui/NotesEditActivity.java`, +`src/net/micode/notes/ui/NotesListItem.java` + + +## 四、此次测试 + +- 便签新增、删除、编辑(包括模式转化、背景色变化、字号选择、长文本)可行。 +- 字数实时显示可行。 +- 横屏自动适应可行。 +- 补齐语言后随系统切换语言可行。 + +--- + +> **首次提交 SHA: +7d82c16b3bd7e0411ea1e14725bb437555daa5de \ No newline at end of file diff --git "a/doc/members/a/\351\230\266\346\256\2651\357\274\232\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\346\230\276\347\244\272\345\212\237\350\203\275/\351\222\237\350\220\261_\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\347\273\237\350\256\241\345\212\237\350\203\275.docx" "b/doc/members/a/\351\230\266\346\256\2651\357\274\232\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\346\230\276\347\244\272\345\212\237\350\203\275/\351\222\237\350\220\261_\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\347\273\237\350\256\241\345\212\237\350\203\275.docx" new file mode 100644 index 00000000..2ff6ee73 Binary files /dev/null and "b/doc/members/a/\351\230\266\346\256\2651\357\274\232\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\346\230\276\347\244\272\345\212\237\350\203\275/\351\222\237\350\220\261_\345\205\274\345\256\271\345\220\214\346\255\245+\345\256\236\346\227\266\345\255\227\346\225\260\347\273\237\350\256\241\345\212\237\350\203\275.docx" differ diff --git a/doc/members/b/README.md b/doc/members/b/README.md new file mode 100644 index 00000000..a84de865 --- /dev/null +++ b/doc/members/b/README.md @@ -0,0 +1,47 @@ +# B 同学模块成果 + +## 2026-11-02 合并 develop 后验证 + +已把包含 A 字数统计和 C 兼容修复的 `origin/develop`(`cbb6ccd`)合入个人分支,解决 Manifest、开机接收器和编辑页三处冲突。保留 A 的字数监听和 C 的兼容配置,同时保留快捷提醒与统一恢复调度。 + +本轮直接从实际合并仓库 clean 构建:JVM 26 项、设备 59 项断言、共享质量检查 8 项通过;Lint 0 错误、132 警告。字数普通/清单编辑、横竖屏、提醒设置/取消及真实重启恢复均验证通过。详见 [最新测试记录](test-record.md)、[本轮截图](assets/tests/merge-20261102/) 和 [原始日志](evidence/logs/merge-20261102/)。仓库现已包含共享构建配置,下面 10 月 27 日的集成依赖说明保留为历史记录。 + +## 第二阶段 快捷提醒实现与验收 + +胡嘉豪 202430224010,2026-10-27。分支 `member/b-quick-reminder`,目标 `develop`,见 [PR #4](https://github.com/ttt587/Notes/pull/4)。已增加“2 小时后”“明天上午 9:00”“一周后”,保留自定义;修复日期、格式及 Cursor 问题,并完成真实通知、小组件和重启验证。 + +| 成果 | 位置 | +| --- | --- | +| 类职责、时间规则、维护后流程、修改文件清单与集成依赖 | [phase-two-implementation.md](phase-two-implementation.md) | +| 实际测试表、前后界面、系统闹钟证据、环境和排障记录 | [test-record.md](test-record.md)、[截图](assets/tests/) 与 [日志](evidence/logs/) | +| 时间边界测试、Android 验收及复现说明 | [tests/reminder](../../../tests/reminder/README.md) | +| 第二阶段泛读标注维护报告 | [胡嘉豪_泛读标注维护报告_第二阶段.docx](胡嘉豪_泛读标注维护报告_第二阶段.docx) | +| 第二阶段质量分析报告 | [胡嘉豪_质量分析报告_第二阶段.docx](胡嘉豪_质量分析报告_第二阶段.docx) | + +验证:JVM 26 项、Android 45 个断言、共享质量检查 8 项通过;Lint 0 错误、148 警告。构建依赖 C 固定提交,在独立副本测试,当前 develop 仍需集成共享构建配置。以下第一阶段内容保留为历史记录。 + +## 第一阶段阅读成果 + +姓名:胡嘉豪 学号:202430224010 日期:2026-10-21(北京时间) + +分工:提醒、小组件、工具模块及后续快捷提醒。个人分支:`member/b-quick-reminder`。 +仓库:。起点为 `origin/develop` 的 +`81a66024fe48eaa2206b854430856fe3875ff3ba`,建立分支时与 `origin/master` 相同。 + +本阶段完成项目拉取、个人分支、13 个范围内顶层类的职责清单、3 个关键类的详细阅读及源码注释,以及 2 个原始代码质量问题记录。快捷提醒实现和应用运行测试留待第二阶段。 + +| 成果 | 位置 | +| --- | --- | +| 模块类清单、三个关键类详读、提醒调用链 | [phase-one-reading.md](phase-one-reading.md) | +| 两个质量问题的原始证据、复现步骤、修复建议 | [quality-issues.md](quality-issues.md) | +| 用例、包依赖、类关系、提醒流程图 | [diagrams.md](diagrams.md) 与 [assets](assets/) | +| 环境、构建报错、已执行检查、下一阶段测试表 | [environment-and-checks.md](environment-and-checks.md) | +| 可重跑的只读检查与本次输出 | [verify_phase_one.py](verify_phase_one.py)、[verification.txt](verification.txt) | +| 按提供模板填写的泛读标注维护报告 | [胡嘉豪_泛读标注维护报告_第一阶段.docx](胡嘉豪_泛读标注维护报告_第一阶段.docx) | +| 按提供模板填写的质量分析报告 | [胡嘉豪_质量分析报告_第一阶段.docx](胡嘉豪_质量分析报告_第一阶段.docx) | + +源码注释位于 `NoteWidgetProvider`、`DataUtils`、`DateTimePickerDialog`,搜索“B 阅读标注”或“B 阶段一阅读标注”可定位。共增加 39 个注释物理行,包含 Javadoc 的起止行;三个文件去除注释和空白后的 Java token 序列与基线一致。 + +首次提交 SHA 由 Git 在提交完成后生成,见本次交付消息或运行 `git log --reverse 81a66024fe48eaa2206b854430856fe3875ff3ba..member/b-quick-reminder --format="%H %s"`。不将本提交自身 SHA 写回本提交,避免产生循环依赖。 + +本目录是个人阶段成果,后续由小组汇总到总报告。原始模板和作业要求保留在工作区根目录,未被覆盖。根据本人要求,本阶段不向群聊发送消息。 diff --git a/doc/members/b/assets/classes.png b/doc/members/b/assets/classes.png new file mode 100644 index 00000000..e5251454 Binary files /dev/null and b/doc/members/b/assets/classes.png differ diff --git a/doc/members/b/assets/packages.png b/doc/members/b/assets/packages.png new file mode 100644 index 00000000..3dfb828a Binary files /dev/null and b/doc/members/b/assets/packages.png differ diff --git a/doc/members/b/assets/phase-two-design.png b/doc/members/b/assets/phase-two-design.png new file mode 100644 index 00000000..24ae9c8f Binary files /dev/null and b/doc/members/b/assets/phase-two-design.png differ diff --git a/doc/members/b/assets/phase-two-recovery.png b/doc/members/b/assets/phase-two-recovery.png new file mode 100644 index 00000000..d12133d1 Binary files /dev/null and b/doc/members/b/assets/phase-two-recovery.png differ diff --git a/doc/members/b/assets/reminder-flow.png b/doc/members/b/assets/reminder-flow.png new file mode 100644 index 00000000..4ec72f29 Binary files /dev/null and b/doc/members/b/assets/reminder-flow.png differ diff --git a/doc/members/b/assets/tests/01-before-custom-only.png b/doc/members/b/assets/tests/01-before-custom-only.png new file mode 100644 index 00000000..eaca0979 Binary files /dev/null and b/doc/members/b/assets/tests/01-before-custom-only.png differ diff --git a/doc/members/b/assets/tests/01-before-custom-only.xml b/doc/members/b/assets/tests/01-before-custom-only.xml new file mode 100644 index 00000000..0f2c8d71 --- /dev/null +++ b/doc/members/b/assets/tests/01-before-custom-only.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/doc/members/b/assets/tests/02-quick-options.png b/doc/members/b/assets/tests/02-quick-options.png new file mode 100644 index 00000000..bc06e602 Binary files /dev/null and b/doc/members/b/assets/tests/02-quick-options.png differ diff --git a/doc/members/b/assets/tests/03-tomorrow-saved.png b/doc/members/b/assets/tests/03-tomorrow-saved.png new file mode 100644 index 00000000..c0063f3f Binary files /dev/null and b/doc/members/b/assets/tests/03-tomorrow-saved.png differ diff --git a/doc/members/b/assets/tests/04-custom-time-preserved.png b/doc/members/b/assets/tests/04-custom-time-preserved.png new file mode 100644 index 00000000..7168d87b Binary files /dev/null and b/doc/members/b/assets/tests/04-custom-time-preserved.png differ diff --git a/doc/members/b/assets/tests/05-past-time-rejected.png b/doc/members/b/assets/tests/05-past-time-rejected.png new file mode 100644 index 00000000..3d3ae641 Binary files /dev/null and b/doc/members/b/assets/tests/05-past-time-rejected.png differ diff --git a/doc/members/b/assets/tests/06-twelve-hour-format.png b/doc/members/b/assets/tests/06-twelve-hour-format.png new file mode 100644 index 00000000..5567350e Binary files /dev/null and b/doc/members/b/assets/tests/06-twelve-hour-format.png differ diff --git a/doc/members/b/assets/tests/07-cancelled.png b/doc/members/b/assets/tests/07-cancelled.png new file mode 100644 index 00000000..95236ab9 Binary files /dev/null and b/doc/members/b/assets/tests/07-cancelled.png differ diff --git a/doc/members/b/assets/tests/08-widgets-before-edit.png b/doc/members/b/assets/tests/08-widgets-before-edit.png new file mode 100644 index 00000000..258f0f14 Binary files /dev/null and b/doc/members/b/assets/tests/08-widgets-before-edit.png differ diff --git a/doc/members/b/assets/tests/09-widgets-after-edit.png b/doc/members/b/assets/tests/09-widgets-after-edit.png new file mode 100644 index 00000000..cfa12e55 Binary files /dev/null and b/doc/members/b/assets/tests/09-widgets-after-edit.png differ diff --git a/doc/members/b/assets/tests/10-background-reminder-notification.png b/doc/members/b/assets/tests/10-background-reminder-notification.png new file mode 100644 index 00000000..8e9dc405 Binary files /dev/null and b/doc/members/b/assets/tests/10-background-reminder-notification.png differ diff --git a/doc/members/b/assets/tests/11-reminder-alert.png b/doc/members/b/assets/tests/11-reminder-alert.png new file mode 100644 index 00000000..4eb4ad81 Binary files /dev/null and b/doc/members/b/assets/tests/11-reminder-alert.png differ diff --git a/doc/members/b/assets/tests/12-exact-permission-explanation.png b/doc/members/b/assets/tests/12-exact-permission-explanation.png new file mode 100644 index 00000000..2bf1e73e Binary files /dev/null and b/doc/members/b/assets/tests/12-exact-permission-explanation.png differ diff --git a/doc/members/b/assets/tests/13-inexact-fallback-saved.png b/doc/members/b/assets/tests/13-inexact-fallback-saved.png new file mode 100644 index 00000000..9a502334 Binary files /dev/null and b/doc/members/b/assets/tests/13-inexact-fallback-saved.png differ diff --git a/doc/members/b/assets/tests/14-notification-permission-request.png b/doc/members/b/assets/tests/14-notification-permission-request.png new file mode 100644 index 00000000..41e10e29 Binary files /dev/null and b/doc/members/b/assets/tests/14-notification-permission-request.png differ diff --git a/doc/members/b/assets/tests/15-notification-denied-no-reminder.png b/doc/members/b/assets/tests/15-notification-denied-no-reminder.png new file mode 100644 index 00000000..33385ddb Binary files /dev/null and b/doc/members/b/assets/tests/15-notification-denied-no-reminder.png differ diff --git a/doc/members/b/assets/tests/after_reboot.png b/doc/members/b/assets/tests/after_reboot.png new file mode 100644 index 00000000..6d471903 Binary files /dev/null and b/doc/members/b/assets/tests/after_reboot.png differ diff --git a/doc/members/b/assets/tests/after_restart.png b/doc/members/b/assets/tests/after_restart.png new file mode 100644 index 00000000..b0c983c8 Binary files /dev/null and b/doc/members/b/assets/tests/after_restart.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/02-quick-options.png b/doc/members/b/assets/tests/merge-20261102/02-quick-options.png new file mode 100644 index 00000000..e0644b9b Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/02-quick-options.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/03-tomorrow-saved.png b/doc/members/b/assets/tests/merge-20261102/03-tomorrow-saved.png new file mode 100644 index 00000000..43e07293 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/03-tomorrow-saved.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/04-custom-time-preserved.png b/doc/members/b/assets/tests/merge-20261102/04-custom-time-preserved.png new file mode 100644 index 00000000..ada5a4a2 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/04-custom-time-preserved.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/05-past-time-rejected.png b/doc/members/b/assets/tests/merge-20261102/05-past-time-rejected.png new file mode 100644 index 00000000..09cb54cc Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/05-past-time-rejected.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/06-twelve-hour-format.png b/doc/members/b/assets/tests/merge-20261102/06-twelve-hour-format.png new file mode 100644 index 00000000..a18470c0 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/06-twelve-hour-format.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/07-cancelled.png b/doc/members/b/assets/tests/merge-20261102/07-cancelled.png new file mode 100644 index 00000000..d4bc94af Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/07-cancelled.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/08-widgets-before-edit.png b/doc/members/b/assets/tests/merge-20261102/08-widgets-before-edit.png new file mode 100644 index 00000000..2beeca3d Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/08-widgets-before-edit.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/09-widgets-after-edit.png b/doc/members/b/assets/tests/merge-20261102/09-widgets-after-edit.png new file mode 100644 index 00000000..d0316699 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/09-widgets-after-edit.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/10-background-reminder-notification.png b/doc/members/b/assets/tests/merge-20261102/10-background-reminder-notification.png new file mode 100644 index 00000000..7efb477c Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/10-background-reminder-notification.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/11-reminder-alert.png b/doc/members/b/assets/tests/merge-20261102/11-reminder-alert.png new file mode 100644 index 00000000..75035bf0 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/11-reminder-alert.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/12-exact-permission-explanation.png b/doc/members/b/assets/tests/merge-20261102/12-exact-permission-explanation.png new file mode 100644 index 00000000..551f437b Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/12-exact-permission-explanation.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/13-inexact-fallback-saved.png b/doc/members/b/assets/tests/merge-20261102/13-inexact-fallback-saved.png new file mode 100644 index 00000000..1ee5a96a Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/13-inexact-fallback-saved.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/14-notification-permission-request.png b/doc/members/b/assets/tests/merge-20261102/14-notification-permission-request.png new file mode 100644 index 00000000..49ef2b06 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/14-notification-permission-request.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/15-notification-denied-no-reminder.png b/doc/members/b/assets/tests/merge-20261102/15-notification-denied-no-reminder.png new file mode 100644 index 00000000..9f4328b3 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/15-notification-denied-no-reminder.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/after_reboot.png b/doc/members/b/assets/tests/merge-20261102/after_reboot.png new file mode 100644 index 00000000..3c02091e Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/after_reboot.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/after_restart.png b/doc/members/b/assets/tests/merge-20261102/after_restart.png new file mode 100644 index 00000000..3658cef9 Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/after_restart.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/merged-word-count-landscape.png b/doc/members/b/assets/tests/merge-20261102/merged-word-count-landscape.png new file mode 100644 index 00000000..84aab94e Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/merged-word-count-landscape.png differ diff --git a/doc/members/b/assets/tests/merge-20261102/merged-word-count-portrait.png b/doc/members/b/assets/tests/merge-20261102/merged-word-count-portrait.png new file mode 100644 index 00000000..d4bc94af Binary files /dev/null and b/doc/members/b/assets/tests/merge-20261102/merged-word-count-portrait.png differ diff --git a/doc/members/b/assets/use-cases.png b/doc/members/b/assets/use-cases.png new file mode 100644 index 00000000..2e802c61 Binary files /dev/null and b/doc/members/b/assets/use-cases.png differ diff --git a/doc/members/b/diagrams.md b/doc/members/b/diagrams.md new file mode 100644 index 00000000..df3b5003 --- /dev/null +++ b/doc/members/b/diagrams.md @@ -0,0 +1,80 @@ +# B 模块源代码结构图 + +图示依据基线及本阶段阅读;只展示 B 负责的功能和相关依赖,不代表整个应用的完整 UML。PNG 在 assets 下,可供 Word 报告和后续小组 PPT 复用。箭头含义分别标明,不能将依赖箭头当成继承。 + +## 范围内用例 + +![范围内用例](assets/use-cases.png) + +用例参与者为用户;范围内功能包括设置自定义提醒、取消提醒、查看提醒、通过桌面小组件查看和编辑便签。快捷提醒是下一阶段需求,未列为现有实现。 + +## 包依赖 + +![包依赖](assets/packages.png) + +```mermaid +flowchart LR + ui[ui 提醒和编辑界面] --> model[model 工作模型] + ui --> tool[tool 数据查询和资源工具] + ui --> widget[widget 桌面小组件] + model --> data[data 便签数据与契约] + widget --> data + widget --> tool + widget --> ui + tool --> data + tool --> ui +``` + +此图是 B 范围的源码包依赖视图,不包含全部 gtask 依赖。tool → ui 的证据是 AppWidgetAttribute 与偏好键引用,widget → ui 的证据是点击目标 Activity 引用。没有独立 Widget Service。 + +## 关键类关系 + +![关键类关系](assets/classes.png) + +```mermaid +classDiagram + AppWidgetProvider <|-- NoteWidgetProvider + NoteWidgetProvider <|-- NoteWidgetProvider_2x + NoteWidgetProvider <|-- NoteWidgetProvider_4x + NoteWidgetProvider ..> ResourceParser : 背景资源 + NoteWidgetProvider ..> NoteEditActivity : 点击Intent + NoteWidgetProvider : +onDeleted(context, ids) + NoteWidgetProvider : #update(context, manager, ids) + NoteWidgetProvider : #getLayoutId()* + NoteWidgetProvider : #getBgResourceId(bgId)* + NoteWidgetProvider : #getWidgetType()* + AlertDialog <|-- DateTimePickerDialog + DateTimePickerDialog --> DateTimePicker : 持有控件 + NoteEditActivity ..> DateTimePickerDialog : 创建和回调 + NoteEditActivity --> WorkingNote : 工作状态 + WorkingNote ..> NoteEditActivity : 状态监听回调 + NoteEditActivity ..> AlarmReceiver : PendingIntent + AlarmInitReceiver ..> AlarmReceiver : 开机重新注册 + AlarmReceiver ..> AlarmAlertActivity : 启动 + AlarmAlertActivity ..> DataUtils : 摘要和可见性 +``` + +## 提醒流程 + +![提醒流程](assets/reminder-flow.png) + +```mermaid +flowchart TD + A[编辑页 设置提醒] --> B[DateTimePickerDialog 自定义时间] + B -->|确定| C[WorkingNote.setAlertDate 标记待保存值] + C --> D[onClockAlertChanged 未保存便签先尝试保存] + D --> E{有有效便签ID} + E -->|否| F[显示空便签错误提示] + E -->|是| G[按便签URI建立PendingIntent并注册RTC_WAKEUP] + C -.编辑页onPause.-> H[saveNote 经Note.syncNote持久化 按需刷新组件] + G -->|到时| I[AlarmReceiver] + I --> J[AlarmAlertActivity 查询可见性 展示并播放铃声] + J --> K[关闭对话框 停止并释放播放器] + L[取消提醒菜单] --> M[setAlertDate 0 false] + M --> N[相同便签URI的PendingIntent 调用AlarmManager.cancel] + M -.编辑页onPause.-> H + O[设备BOOT_COMPLETED] --> P[AlarmInitReceiver 查询未来普通便签提醒] + P --> G +``` + +现有便签设置提醒后,系统注册发生在回调中,数据库持久化依赖保存流程;两者不是同一个操作。普通应用重启与 BOOT_COMPLETED 恢复路径应分别验证。 diff --git a/doc/members/b/environment-and-checks.md b/doc/members/b/environment-and-checks.md new file mode 100644 index 00000000..2b5815cb --- /dev/null +++ b/doc/members/b/environment-and-checks.md @@ -0,0 +1,85 @@ +# 第一阶段环境和验证记录 + +胡嘉豪 202430224010 2026-10-21(Asia/Shanghai) + +## 环境与仓库 + +| 项目 | 本次记录 | +| --- | --- | +| 系统与终端 | Windows,PowerShell | +| Git | 2.53.0.windows.2 | +| 仓库和个人分支 | ttt587/Notes;member/b-quick-reminder | +| 基线 | 81a66024fe48eaa2206b854430856fe3875ff3ba;建立分支时 develop 与 master 一致 | +| 源码 | Android Java,Manifest versionName 0.1,minSdkVersion 14;未声明 targetSdkVersion | +| JDK | C:\jdk-24.0.2;直接执行 java.exe -version 显示 24.0.2 | +| Android SDK | ANDROID_HOME=E:\Sdk;platforms 有 android-34、35、36、36.1;build-tools 有 34.0.0、36.0.0、36.1.0 | +| 构建入口 | 无 gradlew、build.gradle、settings.gradle、build.xml;project.properties 被 .gitignore 忽略且本次未提供 | + +## 实际尝试与完整错误 + +拉取命令:`git clone https://github.com/ttt587/Notes.git Notes`。首次受沙箱网络限制: + +```text +Cloning into 'Notes'... +fatal: unable to access 'https://github.com/ttt587/Notes.git/': getaddrinfo() thread failed to start +``` + +在允许 Git 访问网络后重试成功。随后执行: + +```powershell +git switch -c member/b-quick-reminder origin/develop +``` + +结果:成功创建个人分支,起点为上述基线。完成提交后将 upstream 指向同名远程个人分支。 + +在 Notes 根目录尝试 `& .\gradlew.bat assembleDebug`,PowerShell 返回: + +```text +&: +Line | + 2 | … ('ANDROID_SDK_ROOT='+$env:ANDROID_SDK_ROOT); & .\gradlew.bat assembl … + | ~~~~~~~~~~~~~ + | The term '.\gradlew.bat' is not recognized as a name of a cmdlet, function, script file, or executable program. +Check the spelling of the name, or if a path was included, verify that the path is correct and try again. +``` + +这是构建入口缺失,尚未进入 Java 编译,不等于“编译器已发现源码错误”。现有较新 SDK 也不能单独证明旧工程可构建或不兼容。下一阶段需与负责构建的成员协调可重复的构建方案及 JDK/SDK 组合,再执行 APK 构建和设备验证。本次未擅自改造全组构建配置。 + +文档排版验证:打包的 render_docx.py 首次报 `FileNotFoundError: LibreOffice soffice.exe was not found on PATH`。改为通过已安装的 Word 只读导出 PDF,再使用同一打包渲染器与 Poppler 生成页面图片检查;未修改原始模板。 + +## 本阶段已执行检查 + +| 检查 | 结果与意义 | +| --- | --- | +| 原始代码清点 | 39 个 Java 文件,8 个包,10,002 物理行,包含注释和空行;由 git show 基线读取并统计 | +| 三个注释文件的 Java token 对比 | 通过;剥离注释和空白后与基线逐 token 相同,字符串和字符字面量保留 | +| 注释数量 | NoteWidgetProvider 13 行、DataUtils 15 行、DateTimePickerDialog 11 行,共 39 个净新增注释物理行 | +| git diff --check | 通过;无补丁空白错误 | +| Q-B-01 静态检查 | 两个分支均 FORMAT_24HOUR;Android 展示待实测 | +| Q-B-02 控制流检查 | 成功 return 跳过 cursor.close;Android 资源检测待执行 | +| APK 构建 | 阻塞于缺少 gradlew.bat;未生成 APK | +| Android 单元测试、设备测试、SonarQube | 未执行,不填报通过率或扫描指标 | + +复核命令:`python doc/members/b/verify_phase_one.py`(Python 3,标准库)。脚本为只读,不修改源码;本次输出见 [verification.txt](verification.txt)。本阶段仅增加注释,因此没有添加与注释实现镜像的单元测试。 + +## 第二阶段测试计划 + +以下均为待执行用例,尚无通过结论。快捷项具体时间规则在实现前确定;时区默认跟随设备设置,测试固定 now 并记录时区。 + +| 编号 | 场景 | 输入或操作 | 预期检查 | 状态 | +| --- | --- | --- | --- | --- | +| B-T01 | 跨天 | 23:50 选择“明天上午 9:00” | 次日 09:00,秒及毫秒按约定归零 | 待执行 | +| B-T02 | 月末 | 1 月 31 日选择明天 | 进入 2 月 1 日,不产生非法日期 | 待执行 | +| B-T03 | 年末 | 12 月 31 日选择明天 | 次年 1 月 1 日 09:00 | 待执行 | +| B-T04 | 一周后 | 月末或年末选择一周后 | Calendar 跨界正确,时分规则符合约定 | 待执行 | +| B-T05 | 过去时间 | 自定义过去时间或当天快捷时刻已过 | 按明确策略提示或调整,不静默设错 | 待执行 | +| B-T06 | 取消提醒 | 设提醒后取消并退出编辑页 | 数据库时间清零,对应闹钟取消,原时刻不触发 | 待执行 | +| B-T07 | 应用重启 | 设置后正常退出,再启动应用 | 数据持久化、界面提示及计划提醒一致;与强制停止区分 | 待执行 | +| B-T08 | 设备重启 | 设置未来提醒后重启设备 | BOOT_COMPLETED 后恢复未来闹钟,已过期策略符合设计 | 待执行 | +| B-T09 | 提醒触发 | 设近期提醒,等待到时 | 显示正确便签和铃声,关闭后释放播放资源 | 待执行 | +| B-T10 | 小组件回归 | 分别放置 2×2 和 4×4,编辑内容和提醒 | 摘要、背景、点击目标及删除解绑正常 | 待执行 | +| B-T11 | 空白便签 | 新建空白便签并设提醒 | 给出原有错误提示,不注册无有效便签 ID 的提醒 | 待执行 | +| B-T12 | 12/24 小时 | 切换设置,测试 00:00、12:00、15:30 | 标题、滚轮与保存时间一致,回归 Q-B-01 | 待执行 | +| B-T13 | Cursor 释放 | 通话查询命中、未命中、null 和读取异常 | 可关闭对象均在完成后关闭,回归 Q-B-02 | 待执行 | + +下一阶段需保留原界面和修改后界面截图、每项测试的设备版本、操作步骤、实际结果和对应 commit SHA。本阶段没有应用运行截图;图示是源代码结构图,不能替代运行证据。 diff --git a/doc/members/b/evidence/logs/README.md b/doc/members/b/evidence/logs/README.md new file mode 100644 index 00000000..f08ac31b --- /dev/null +++ b/doc/members/b/evidence/logs/README.md @@ -0,0 +1,7 @@ +# 运行日志说明 + +这些记录来自本次实际执行。为通过 Git 空白检查,仅移除行末空白和文件末尾多余空行;不改动 PASS、失败数、Lint 数量或任何运行结果。AlarmManager 记录仅摘录与任务应用相关的段落,完整模拟器输出留在任务工作区 `.work`。 + +`android-main.log` 为 37 项主流程,其他分组见各自日志;实时 PASS 与结尾汇总可能重复。`trigger-capture.log` 是修正截图等待后重复的触发验证,不额外计入 45 项设备断言总数。 + +`source-metrics.json` 仅统计生产源码、Manifest 和资源相对第一阶段提交的变化,不含测试、报告和组长文档。`lint.txt` 是整个共享集成副本的完整 Lint 文本输出,0 错误、148 警告。 diff --git a/doc/members/b/evidence/logs/alarm-after-app-kill.txt b/doc/members/b/evidence/logs/alarm-after-app-kill.txt new file mode 100644 index 00000000..db15be5a --- /dev/null +++ b/doc/members/b/evidence/logs/alarm-after-app-kill.txt @@ -0,0 +1,67 @@ +# Excerpts from actual adb shell dumpsys alarm; unrelated emulator services omitted. + whenElapsed=+1h18m11s770ms maxWhenElapsed=+2h18m11s770ms + operation=PendingIntent{c653e7d: PendingIntentRecord{1d3e172 com.google.android.gms/com.google.android.gms.core startService}} + RTC_WAKEUP #11: Alarm{613e9c3 type 0 origWhen 1793112300000 whenElapsed 8899252 net.micode.notes} + tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + type=RTC_WAKEUP origWhen=2026-10-27 14:45:00.000 window=0 exactAllowReason=permission repeatInterval=0 count=0 flags=0x5 + policyWhenElapsed: requester=+1h58m33s313ms app_standby=-51s967ms device_idle=-- battery_saver=-51s886ms + whenElapsed=+1h58m33s313ms maxWhenElapsed=+1h58m33s313ms + operation=PendingIntent{7862240: PendingIntentRecord{c4579 net.micode.notes broadcastIntent}} + idle-options=Bundle[{android.pendingIntent.backgroundActivityAllowed=2, android:broadcast.temporaryAppAllowlistReasonCode=302, android:broadcast.temporaryAppAllowlistDuration=10000, android:broadcast.temporaryAppAllowlistReason=, android:broadcast.temporaryAppAllowlistType=0, android:broadcast.flags=8}] + ELAPSED #12: Alarm{6faa2be type 3 origWhen 14530843 whenElapsed 14530843 android} + tag=*alarm*:PowerStats + type=ELAPSED origWhen=+3h32m24s904ms window=+1h0m0s0ms repeatInterval=0 count=0 flags=0x8 + policyWhenElapsed: requester=+3h32m24s904ms app_standby=-27m24s501ms device_idle=-- battery_saver=-- + #1: Reason=alarm_cancelled elapsed=-1m18s478ms rtc=2026-10-27 12:45:08.210 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=-1m13s503ms app_standby=-1m18s503ms device_idle=-- battery_saver=-1m18s503ms + #2: Reason=alarm_cancelled elapsed=-1m28s563ms rtc=2026-10-27 12:44:58.125 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+6d23h57m33s312ms app_standby=-1m28s794ms device_idle=-- battery_saver=-1m28s794ms + #3: Reason=alarm_cancelled elapsed=-1m29s290ms rtc=2026-10-27 12:44:57.398 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+20h13m33s313ms app_standby=-1m29s993ms device_idle=-- battery_saver=-1m29s993ms + #4: Reason=alarm_cancelled elapsed=-1m30s597ms rtc=2026-10-27 12:44:56.090 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+1h57m33s313ms app_standby=-1m30s697ms device_idle=-- battery_saver=-1m30s697ms + #5: Reason=alarm_cancelled elapsed=-5m31s244ms rtc=2026-10-27 12:40:55.443 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+6d23h53m33s313ms app_standby=-5m31s471ms device_idle=-- battery_saver=-5m31s471ms + #6: Reason=alarm_cancelled elapsed=-5m32s31ms rtc=2026-10-27 12:40:54.657 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+20h13m33s313ms app_standby=-5m32s745ms device_idle=-- battery_saver=-5m32s745ms + #7: Reason=alarm_cancelled elapsed=-5m33s282ms rtc=2026-10-27 12:40:53.406 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+1h53m33s313ms app_standby=-5m33s466ms device_idle=-- battery_saver=-5m33s466ms + #8: Reason=alarm_cancelled elapsed=-7m1s516ms rtc=2026-10-27 12:39:25.172 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+6d23h52m33s312ms app_standby=-7m1s786ms device_idle=-- battery_saver=-7m1s786ms + #9: Reason=alarm_cancelled elapsed=-7m2s316ms rtc=2026-10-27 12:39:24.371 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+20h13m33s313ms app_standby=-7m3s298ms device_idle=-- battery_saver=-7m3s298ms + #10: Reason=alarm_cancelled elapsed=-7m3s978ms rtc=2026-10-27 12:39:22.710 + Snapshot: + type=RTC_WAKEUP tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + policyWhenElapsed: requester=+1h52m33s313ms app_standby=-7m4s99ms device_idle=-- battery_saver=-7m4s99ms + + Top Alarms: + +11s648ms running, 0 wakeups, 21 alarms: u0a147:com.google.android.gms + *alarm*:com.google.android.gms.gcm.ACTION_CHECK_QUEUE + +3s680ms 1 wakes 1 alarms, last -27m1s838ms: + *walarm*:ReverseChargingControl + u0a217:net.micode.notes +436ms running, 1 wakeups: + +436ms 1 wakes 1 alarms, last -56s940ms: + *walarm*:net.micode.notes/.ui.AlarmReceiver + + Alarm manager stats: + REORDER_ALARMS_FOR_STANDBY: count=308, total=84.5ms, avg=0.274ms, max calls/s=153 max dur/s=34.2ms max time=30.5ms + HAS_SCHEDULE_EXACT_ALARM: count=75, total=16.3ms, avg=0.217ms, max calls/s=5 max dur/s=5.5ms max time=5.5ms diff --git a/doc/members/b/evidence/logs/alarm-after-reboot.txt b/doc/members/b/evidence/logs/alarm-after-reboot.txt new file mode 100644 index 00000000..b689050e --- /dev/null +++ b/doc/members/b/evidence/logs/alarm-after-reboot.txt @@ -0,0 +1,32 @@ +# Excerpts from actual adb shell dumpsys alarm; unrelated emulator services omitted. + listener=android.app.AlarmManager$ListenerWrapper@efc71ae + + RTC_WAKEUP #12: Alarm{6445061 type 0 origWhen 1793112300000 whenElapsed 6790227 net.micode.notes} + + tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + + type=RTC_WAKEUP origWhen=2026-10-27 14:45:00.000 window=0 exactAllowReason=permission repeatInterval=0 count=0 flags=0x5 + + policyWhenElapsed: requester=+1h51m43s75ms app_standby=-1s886ms device_idle=-- battery_saver=-1s886ms + + whenElapsed=+1h51m43s75ms maxWhenElapsed=+1h51m43s75ms + + operation=PendingIntent{799f786: PendingIntentRecord{d9d6847 net.micode.notes broadcastIntent}} + + idle-options=Bundle[{android.pendingIntent.backgroundActivityAllowed=2, android:broadcast.temporaryAppAllowlistReasonCode=302, android:broadcast.temporaryAppAllowlistDuration=10000, android:broadcast.temporaryAppAllowlistReason=, android:broadcast.temporaryAppAllowlistType=0, android:broadcast.flags=8}] + + RTC_WAKEUP #13: Alarm{fb53874 type 0 origWhen 1793112540000 whenElapsed 7030227 net.micode.notes} + + tag=*walarm*:net.micode.notes/.ui.AlarmReceiver + + type=RTC_WAKEUP origWhen=2026-10-27 14:49:00.000 window=0 exactAllowReason=permission repeatInterval=0 count=0 flags=0x5 + + policyWhenElapsed: requester=+1h55m43s75ms app_standby=-1s866ms device_idle=-- battery_saver=-1s866ms + + whenElapsed=+1h55m43s75ms maxWhenElapsed=+1h55m43s75ms + + operation=PendingIntent{514919d: PendingIntentRecord{a8e0612 net.micode.notes broadcastIntent}} + + idle-options=Bundle[{android.pendingIntent.backgroundActivityAllowed=2, android:broadcast.temporaryAppAllowlistReasonCode=302, android:broadcast.temporaryAppAllowlistDuration=10000, android:broadcast.temporaryAppAllowlistReason=, android:broadcast.temporaryAppAllowlistType=0, android:broadcast.flags=8}] + + ELAPSED #14: Alarm{727f857 type 3 origWhen 14431597 whenElapsed 14431597 android} diff --git a/doc/members/b/evidence/logs/android-main.log b/doc/members/b/evidence/logs/android-main.log new file mode 100644 index 00000000..040b3a3a --- /dev/null +++ b/doc/members/b/evidence/logs/android-main.log @@ -0,0 +1,75 @@ +PASS exact-alarm-access-granted-for-device-test +PASS cursor-hit-returns-and-closes +PASS cursor-empty-closes +PASS cursor-read-error-closes +PASS cursor-null-safe +PASS phone-cursor-empty-closes +PASS quick-choice-0-saved-immediately +PASS quick-cancel-0-persisted +PASS quick-choice-1-saved-immediately +PASS quick-cancel-1-persisted +PASS quick-choice-2-saved-immediately +PASS quick-cancel-2-persisted +PASS cancelled-broadcast-rejected +PASS picker-january-to-february +PASS picker-leap-day +PASS picker-24-hour-evening +PASS picker-midnight +PASS picker-noon +PASS picker-last-minute +PASS picker-midnight-cross-year +PASS custom-past-rejected-and-kept-open +PASS dialog-title-24-hour +PASS dialog-title-12-hour +PASS custom-cancel-no-callback +PASS custom-month-end-callback-timestamp +PASS bind-2x2 +PASS bind-4x4 +PASS 2x2-content-displayed +PASS 4x4-content-displayed +PASS widget-updated-through-editor-save +PASS widget-delete-keeps-note +PASS widget-delete-unbinds +PASS cancelled-alarm-does-not-notify-after-due +PASS real-background-alarm-notification +PASS notification-opens-existing-alert +PASS alert-dismiss-clears-notification +PASS restart-fixture-persisted +PASS exact-alarm-access-granted-for-device-test +PASS cursor-hit-returns-and-closes +PASS cursor-empty-closes +PASS cursor-read-error-closes +PASS cursor-null-safe +PASS phone-cursor-empty-closes +PASS quick-choice-0-saved-immediately +PASS quick-cancel-0-persisted +PASS quick-choice-1-saved-immediately +PASS quick-cancel-1-persisted +PASS quick-choice-2-saved-immediately +PASS quick-cancel-2-persisted +PASS cancelled-broadcast-rejected +PASS picker-january-to-february +PASS picker-leap-day +PASS picker-24-hour-evening +PASS picker-midnight +PASS picker-noon +PASS picker-last-minute +PASS picker-midnight-cross-year +PASS custom-past-rejected-and-kept-open +PASS dialog-title-24-hour +PASS dialog-title-12-hour +PASS custom-cancel-no-callback +PASS custom-month-end-callback-timestamp +PASS bind-2x2 +PASS bind-4x4 +PASS 2x2-content-displayed +PASS 4x4-content-displayed +PASS widget-updated-through-editor-save +PASS widget-delete-keeps-note +PASS widget-delete-unbinds +PASS cancelled-alarm-does-not-notify-after-due +PASS real-background-alarm-notification +PASS notification-opens-existing-alert +PASS alert-dismiss-clears-notification +PASS restart-fixture-persisted +RESULT: 37 passed, 0 failed diff --git a/doc/members/b/evidence/logs/app-restart.log b/doc/members/b/evidence/logs/app-restart.log new file mode 100644 index 00000000..f3d40d45 --- /dev/null +++ b/doc/members/b/evidence/logs/app-restart.log @@ -0,0 +1,3 @@ +PASS after_restart-database-survives +PASS after_restart-database-survives +RESULT: 1 passed, 0 failed diff --git a/doc/members/b/evidence/logs/build.log b/doc/members/b/evidence/logs/build.log new file mode 100644 index 00000000..ab60a94c --- /dev/null +++ b/doc/members/b/evidence/logs/build.log @@ -0,0 +1,112 @@ +> Task :preBuild UP-TO-DATE +> Task :preDebugBuild UP-TO-DATE +> Task :mergeDebugNativeDebugMetadata NO-SOURCE +> Task :javaPreCompileDebug UP-TO-DATE +> Task :checkDebugAarMetadata UP-TO-DATE +> Task :generateDebugResValues UP-TO-DATE +> Task :mapDebugSourceSetPaths UP-TO-DATE +> Task :generateDebugResources UP-TO-DATE +> Task :mergeDebugResources UP-TO-DATE +> Task :createDebugCompatibleScreenManifests UP-TO-DATE +> Task :extractDeepLinksDebug UP-TO-DATE +> Task :processDebugMainManifest +> Task :processDebugManifest +> Task :mergeDebugShaders UP-TO-DATE +> Task :compileDebugShaders NO-SOURCE +> Task :generateDebugAssets UP-TO-DATE +> Task :mergeDebugAssets UP-TO-DATE +> Task :compressDebugAssets UP-TO-DATE +> Task :processDebugJavaRes NO-SOURCE +> Task :mergeDebugJavaResource UP-TO-DATE +> Task :checkDebugDuplicateClasses UP-TO-DATE +> Task :desugarDebugFileDependencies UP-TO-DATE +> Task :mergeExtDexDebug UP-TO-DATE +> Task :mergeDebugJniLibFolders UP-TO-DATE +> Task :mergeDebugNativeLibs NO-SOURCE +> Task :stripDebugDebugSymbols NO-SOURCE +> Task :validateSigningDebug UP-TO-DATE +> Task :writeDebugAppMetadata UP-TO-DATE +> Task :writeDebugSigningConfigVersions UP-TO-DATE +> Task :preDebugAndroidTestBuild SKIPPED +> Task :javaPreCompileDebugAndroidTest UP-TO-DATE +> Task :checkDebugAndroidTestAarMetadata UP-TO-DATE +> Task :generateDebugAndroidTestResValues UP-TO-DATE +> Task :mapDebugAndroidTestSourceSetPaths UP-TO-DATE +> Task :generateDebugAndroidTestResources UP-TO-DATE +> Task :mergeDebugAndroidTestResources UP-TO-DATE +> Task :processDebugAndroidTestManifest UP-TO-DATE +> Task :processDebugAndroidTestResources UP-TO-DATE +> Task :mergeDebugAndroidTestShaders UP-TO-DATE +> Task :compileDebugAndroidTestShaders NO-SOURCE +> Task :generateDebugAndroidTestAssets UP-TO-DATE +> Task :mergeDebugAndroidTestAssets UP-TO-DATE +> Task :compressDebugAndroidTestAssets UP-TO-DATE +> Task :processDebugAndroidTestJavaRes NO-SOURCE +> Task :mergeDebugAndroidTestJavaResource UP-TO-DATE +> Task :checkDebugAndroidTestDuplicateClasses UP-TO-DATE +> Task :desugarDebugAndroidTestFileDependencies UP-TO-DATE +> Task :mergeExtDexDebugAndroidTest UP-TO-DATE +> Task :mergeDebugAndroidTestJniLibFolders UP-TO-DATE +> Task :mergeDebugAndroidTestNativeLibs NO-SOURCE +> Task :stripDebugAndroidTestDebugSymbols NO-SOURCE +> Task :validateSigningDebugAndroidTest UP-TO-DATE +> Task :writeDebugAndroidTestSigningConfigVersions UP-TO-DATE +> Task :extractProguardFiles UP-TO-DATE +> Task :preDebugUnitTestBuild UP-TO-DATE +> Task :processDebugManifestForPackage +> Task :processDebugResources + +> Task :compileDebugJavaWithJavac +Java compiler version 21 has deprecated support for compiling with source/target version 8. +Try one of the following options: + 1. [Recommended] Use Java toolchain with a lower language version + 2. Set a higher source/target version + 3. Use a lower version of the JDK running the build (if you're not using Java toolchain) +For more details on how to configure these settings, see https://developer.android.com/build/jdks. +To suppress this warning, set android.javaCompile.suppressSourceTargetDeprecationWarning=true in gradle.properties. +警告: [options] 源值 8 已过时,将在未来发行版中删除 +警告: [options] 目标值 8 已过时,将在未来发行版中删除 +警告: [options] 要隐藏有关已过时选项的警告, 请使用 -Xlint:-options。 +注: 某些输入文件使用或覆盖了已过时的 API。 +注: 有关详细信息, 请使用 -Xlint:deprecation 重新编译。 +3 个警告 + +> Task :dexBuilderDebug +> Task :generateDebugLintReportModel +> Task :bundleDebugClassesToCompileJar +> Task :mergeDexDebug + +> Task :compileDebugAndroidTestJavaWithJavac +Java compiler version 21 has deprecated support for compiling with source/target version 8. +Try one of the following options: + 1. [Recommended] Use Java toolchain with a lower language version + 2. Set a higher source/target version + 3. Use a lower version of the JDK running the build (if you're not using Java toolchain) +For more details on how to configure these settings, see https://developer.android.com/build/jdks. +To suppress this warning, set android.javaCompile.suppressSourceTargetDeprecationWarning=true in gradle.properties. +警告: [options] 源值 8 已过时,将在未来发行版中删除 +警告: [options] 目标值 8 已过时,将在未来发行版中删除 +警告: [options] 要隐藏有关已过时选项的警告, 请使用 -Xlint:-options。 +3 个警告 + +> Task :dexBuilderDebugAndroidTest +> Task :mergeDexDebugAndroidTest +> Task :generateDebugAndroidTestLintModel +> Task :generateDebugUnitTestLintModel +> Task :packageDebugAndroidTest +> Task :createDebugAndroidTestApkListingFileRedirect UP-TO-DATE +> Task :assembleDebugAndroidTest +> Task :packageDebug +> Task :createDebugApkListingFileRedirect UP-TO-DATE +> Task :assembleDebug +> Task :lintAnalyzeDebugUnitTest +> Task :lintAnalyzeDebugAndroidTest +> Task :lintAnalyzeDebug + +> Task :lintReportDebug +Wrote HTML report to file:///C:/Users/HAO18/Desktop/homeworkgaishu/.work/b-integration/build/reports/lint-results-debug.html + +> Task :lintDebug + +BUILD SUCCESSFUL in 9s +61 actionable tasks: 21 executed, 40 up-to-date diff --git a/doc/members/b/evidence/logs/inexact.log b/doc/members/b/evidence/logs/inexact.log new file mode 100644 index 00000000..ef735e1d --- /dev/null +++ b/doc/members/b/evidence/logs/inexact.log @@ -0,0 +1,5 @@ +PASS exact-alarm-access-denied +PASS inexact-fallback-saved-without-crash +PASS exact-alarm-access-denied +PASS inexact-fallback-saved-without-crash +RESULT: 2 passed, 0 failed diff --git a/doc/members/b/evidence/logs/jvm-tests.log b/doc/members/b/evidence/logs/jvm-tests.log new file mode 100644 index 00000000..bbbeba9f --- /dev/null +++ b/doc/members/b/evidence/logs/jvm-tests.log @@ -0,0 +1,27 @@ +PASS later-normal +PASS later-cross-midnight +PASS later-cross-year +PASS tomorrow-before-nine +PASS tomorrow-at-nine +PASS tomorrow-after-nine +PASS january-end +PASS april-end +PASS non-leap-february +PASS leap-day +PASS leap-february-end +PASS tomorrow-cross-year +PASS week-keeps-local-time +PASS week-cross-year +PASS clears-seconds-and-millis +PASS DST-spring-clock +PASS DST-spring-23-hours +PASS DST-autumn-25-hours +PASS DST-two-elapsed-hours +PASS DST-week-clock +PASS past-rejected +PASS now-rejected +PASS future-accepted +PASS explicit-zone-independent-of-default +PASS null-argument-0 +PASS null-argument-1 +RESULT: 26 passed, 0 failed diff --git a/doc/members/b/evidence/logs/lint.txt b/doc/members/b/evidence/logs/lint.txt new file mode 100644 index 00000000..0b02cd75 --- /dev/null +++ b/doc/members/b/evidence/logs/lint.txt @@ -0,0 +1,811 @@ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\AndroidManifest.xml:93: Error: Class referenced in the manifest, net.micode.notes.tests.WidgetHostActivity, was not found in the project or the libraries [MissingClass] + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Explanation for issues of type "MissingClass": + If a class is referenced in the manifest or in a layout file, it must also + exist in the project (or in one of the libraries included by the project. + This check helps uncover typos in registration names, or attempts to rename + or move classes without updating the XML references properly. + + https://developer.android.com/guide/topics/manifest/manifest-intro.html + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\AndroidManifest.xml:8: Warning: WRITE_EXTERNAL_STORAGE is deprecated (and is not granted) when targeting Android 13+. If you need to write to shared storage, use the MediaStore.createWriteRequest intent. [ScopedStorage] + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Explanation for issues of type "ScopedStorage": + Scoped storage is enforced on Android 10+ (or Android 11+ if using + requestLegacyExternalStorage). In particular, WRITE_EXTERNAL_STORAGE will + no longer provide write access to all files; it will provide the equivalent + of READ_EXTERNAL_STORAGE instead. + + As of Android 13, if you need to query or interact with MediaStore or media + files on the shared storage, you should be using instead one or more new + storage permissions: + * android.permission.READ_MEDIA_IMAGES + * android.permission.READ_MEDIA_VIDEO + * android.permission.READ_MEDIA_AUDIO + + and then add maxSdkVersion="33" to the older permission. See the developer + guide for how to do this: + https://developer.android.com/about/versions/13/behavior-changes-13#granula + r-media-permissions + + The MANAGE_EXTERNAL_STORAGE permission can be used to manage all files, but + it is rarely necessary and most apps on Google Play are not allowed to use + it. Most apps should instead migrate to use scoped storage. To modify or + delete files, apps should request write access from the user as described + at https://goo.gle/android-mediastore-createwriterequest. + + To learn more, read these resources: Play policy: + https://goo.gle/policy-storage-help Allowable use cases: + https://goo.gle/policy-storage-usecases + + https://goo.gle/android-storage-usecases + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\layout\note_edit.xml:88: Warning: This LinearLayout should use android:layout_height="wrap_content" [ScrollViewSize] + android:layout_height="fill_parent" + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Explanation for issues of type "ScrollViewSize": + ScrollView children must set their layout_width or layout_height attributes + to wrap_content rather than fill_parent or match_parent in the scrolling + dimension. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:449: Warning: Consider using apply() instead; commit writes its data to persistent storage immediately, whereas apply will handle it in the background [ApplySharedPref] + mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); + ~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:198: Warning: Consider using apply() instead; commit writes its data to persistent storage immediately, whereas apply will handle it in the background [ApplySharedPref] + sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit(); + ~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesPreferenceActivity.java:312: Warning: Consider using apply() instead; commit writes its data to persistent storage immediately, whereas apply will handle it in the background [ApplySharedPref] + editor.commit(); + ~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesPreferenceActivity.java:342: Warning: Consider using apply() instead; commit writes its data to persistent storage immediately, whereas apply will handle it in the background [ApplySharedPref] + editor.commit(); + ~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesPreferenceActivity.java:366: Warning: Consider using apply() instead; commit writes its data to persistent storage immediately, whereas apply will handle it in the background [ApplySharedPref] + editor.commit(); + ~~~~~~~~ + + Explanation for issues of type "ApplySharedPref": + Consider using apply() instead of commit on shared preferences. Whereas + commit blocks and writes its data to persistent storage immediately, apply + will handle it in the background. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\gtask\remote\GTaskClient.java:140: Warning: Implicitly using the default locale is a common source of bugs: Use toLowerCase(Locale) instead. For strings meant to be internal use Locale.ROOT, otherwise Locale.getDefault(). [DefaultLocale] + if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() + ~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\gtask\remote\GTaskClient.java:140: Warning: Implicitly using the default locale is a common source of bugs: Use toLowerCase(Locale) instead. For strings meant to be internal use Locale.ROOT, otherwise Locale.getDefault(). [DefaultLocale] + if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() + ~~~~~~~~~~~ + + Explanation for issues of type "DefaultLocale": + Calling String#toLowerCase() or #toUpperCase() without specifying an + explicit locale is a common source of bugs. The reason for that is that + those methods will use the current locale on the user's device, and even + though the code appears to work correctly when you are developing the app, + it will fail in some locales. For example, in the Turkish locale, the + uppercase replacement for i is not I. + + If you want the methods to just perform ASCII replacement, for example to + convert an enum name, call String#toUpperCase(Locale.ROOT) instead. If you + really want to use the current locale, call + String#toUpperCase(Locale.getDefault()) instead. + + https://developer.android.com/reference/java/util/Locale.html#default_locale + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\drawable\ic_reminder_notification.xml: Warning: Notification icon ic_reminder_notification has to have a raster image to support Android versions below 5.0 (API 21) [NotificationIconCompatibility] + + Explanation for issues of type "NotificationIconCompatibility": + Notification icons should define a raster image to support Android versions + below 5.0 (API 21). Note that the way Lint decides whether an icon is a + notification icon is based on the filename prefix ic_stat_. This + corresponds to the naming convention documented in + https://d.android.com/r/studio-ui/designer/material/iconography + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\build.gradle:14: Warning: Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the android.os.Build.VERSION_CODES javadoc for details. [OldTargetApi] + targetSdk 34 + ~~~~~~~~~~~~ + + Explanation for issues of type "OldTargetApi": + When your application runs on a version of Android that is more recent than + your targetSdkVersion specifies that it has been tested with, various + compatibility modes kick in. This ensures that your application continues + to work, but it may look out of place. For example, if the targetSdkVersion + is less than 14, your app may get an option button in the UI. + + To fix this issue, set the targetSdkVersion to the highest available value. + Then test your app to make sure everything works correctly. You may want to + consult the compatibility notes to see what changes apply to each version + you are adding support for: + https://developer.android.com/reference/android/os/Build.VERSION_CODES.html + as well as follow this guide: + https://developer.android.com/distribute/best-practices/develop/target-sdk. + html + + https://developer.android.com/distribute/best-practices/develop/target-sdk.html + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:819: Warning: Avoid passing null as the view root (needed to resolve layout parameters on the inflated layout's root element) [InflateParams] + View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); + ~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:217: Warning: Avoid passing null as the view root (needed to resolve layout parameters on the inflated layout's root element) [InflateParams] + mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), + ~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:256: Warning: Avoid passing null as the view root (needed to resolve layout parameters on the inflated layout's root element) [InflateParams] + R.layout.note_list_dropdown_menu, null); + ~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesPreferenceActivity.java:89: Warning: Avoid passing null as the view root (needed to resolve layout parameters on the inflated layout's root element) [InflateParams] + View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); + ~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesPreferenceActivity.java:216: Warning: Avoid passing null as the view root (needed to resolve layout parameters on the inflated layout's root element) [InflateParams] + View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); + ~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesPreferenceActivity.java:272: Warning: Avoid passing null as the view root (needed to resolve layout parameters on the inflated layout's root element) [InflateParams] + View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); + ~~~~ + + Explanation for issues of type "InflateParams": + When inflating a layout, avoid passing in null as the parent view, since + otherwise any layout parameters on the root of the inflated layout will be + ignored. + + https://www.bignerdranch.com/blog/understanding-androids-layoutinflater-inflate/ + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:518: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_new_note: + ~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:521: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_delete: + ~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:536: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_font_size: + ~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:540: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_list_mode: + ~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:544: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_share: + ~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:548: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_send_to_desktop: + ~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:551: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_alert: + ~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NoteEditActivity.java:554: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_delete_remind: + ~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:323: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.delete: + ~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:339: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.move: + ~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:562: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.btn_new_note: + ~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:784: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_new_folder: { + ~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:788: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_export_text: { + ~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:792: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_sync: { + ~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:804: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_setting: { + ~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:808: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_new_note: { + ~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:812: Warning: Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them in switch case statements [NonConstantResourceId] + case R.id.menu_search: + ~~~~~~~~~~~~~~~~ + + Explanation for issues of type "NonConstantResourceId": + Avoid the usage of resource IDs where constant expressions are required. + + A future version of the Android Gradle Plugin will generate R classes with + non-constant IDs in order to improve the performance of incremental + compilation. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\AndroidManifest.xml:20: Warning: Redundant label can be removed [RedundantLabel] + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\AndroidManifest.xml:83: Warning: Redundant label can be removed [RedundantLabel] + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Explanation for issues of type "RedundantLabel": + When an activity does not have a label attribute, it will use the one from + the application tag. Since the application has already specified the same + label, the label on this activity can be omitted. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\build.gradle:3: Warning: A newer version of com.android.application than 8.7.3 is available: 9.4.1 [AndroidGradlePluginVersion] + id 'com.android.application' version '8.7.3' + ~~~~~~~ + + Explanation for issues of type "AndroidGradlePluginVersion": + This detector looks for usage of the Android Gradle Plugin where the + version you are using is not the current stable release. Using older + versions is fine, and there are cases where you deliberately want to stick + with an older version. However, you may simply not be aware that a more + recent version is available, and that is what this lint check helps find. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\AndroidManifest.xml:6: Warning: This minSdkVersion value (14) is not used; it is always overridden by the value specified in the Gradle build script (14) [GradleOverrides] + + ~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Explanation for issues of type "GradleOverrides": + The value of (for example) minSdkVersion is only used if it is not + specified in the build.gradle build scripts. When specified in the Gradle + build scripts, the manifest value is ignored and can be misleading, so + should be removed to avoid ambiguity. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:51: Warning: Formatting %d followed by words ("selected"): This should probably be a plural rather than a string [PluralsCandidate] + %d selected + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:75: Warning: Formatting %d followed by words ("notes"): This should probably be a plural rather than a string [PluralsCandidate] + Confirm to delete the selected %d notes? + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:77: Warning: Formatting %d followed by words ("notes"): This should probably be a plural rather than a string [PluralsCandidate] + Have moved selected %1$d notes to %2$s folder + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Explanation for issues of type "PluralsCandidate": + This lint check looks for potential errors in internationalization where + you have translated a message which involves a quantity and it looks like + other parts of the string may need grammatical changes. + + For example, rather than something like this: + Try again in %d seconds. + you should be using a plural: + + Try again in %d second + Try again in %d seconds + + This will ensure that in other languages the right set of translations are + provided for the different quantity classes. + + (This check depends on some heuristics, so it may not accurately determine + whether a string really should be a quantity. You can use tools:ignore to + filter out false positives. + + https://developer.android.com/guide/topics/resources/string-resource.html#Plurals + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\gtask\remote\GTaskASyncTask.java:46: Warning: This field leaks a context object [StaticFieldLeak] + private Context mContext; + ~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\gtask\remote\GTaskManager.java:64: Warning: Do not place Android context classes in static fields (static reference to GTaskManager which has field mActivity pointing to Activity); this is a memory leak [StaticFieldLeak] + private static GTaskManager mInstance = null; + ~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\gtask\remote\GTaskSyncService.java:41: Warning: Do not place Android context classes in static fields (static reference to GTaskASyncTask which has field mContext pointing to Context); this is a memory leak [StaticFieldLeak] + private static GTaskASyncTask mSyncTask = null; + ~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:473: Warning: This AsyncTask class should be static or leaks might occur (anonymous android.os.AsyncTask) [StaticFieldLeak] + new AsyncTask>() { + ^ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\src\net\micode\notes\ui\NotesListActivity.java:829: Warning: This AsyncTask class should be static or leaks might occur (anonymous android.os.AsyncTask) [StaticFieldLeak] + new AsyncTask() { + ^ + + Explanation for issues of type "StaticFieldLeak": + A static field will leak contexts. + + Non-static inner classes have an implicit reference to their outer class. + If that outer class is for example a Fragment or Activity, then this + reference means that the long-running handler/loader/task will hold a + reference to the activity which prevents it from getting garbage + collected. + + Similarly, direct field references to activities and fragments from these + longer running instances can cause leaks. + + ViewModel classes should never point to Views or non-application Contexts. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\layout\note_edit.xml:255: Warning: This tag and its children can be replaced by one and a compound drawable [UseCompoundDrawables] + and a compound drawable [UseCompoundDrawables] + and a compound drawable [UseCompoundDrawables] + and a compound drawable [UseCompoundDrawables] + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Explanation for issues of type "Overdraw": + If you set a background drawable on a root view, then you should use a + custom theme where the theme background is null. Otherwise, the theme + background will be painted first, only to have your custom background + completely cover it; this is called "overdraw". + + NOTE: This detector relies on figuring out which layouts are associated + with which activities based on scanning the Java code, and it's currently + doing that using an inexact pattern matching algorithm. Therefore, it can + incorrectly conclude which activity the layout is associated with and then + wrongly complain that a background-theme is hidden. + + If you want your custom background on multiple pages, then you should + consider making a custom theme with your custom background and just using + that theme instead of a root element background. + + Of course it's possible that your custom drawable is translucent and you + want it to be mixed with the background. However, you will get better + performance if you pre-mix the background with your drawable and use that + resulting image or color as a custom theme background instead. + +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\arrays.xml:27: Warning: The resource R.array.menu_share_ways appears to be unused [UnusedResources] + + ~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\drawable-hdpi\delete.png: Warning: The resource R.drawable.delete appears to be unused [UnusedResources] +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:27: Warning: The resource R.string.delete_remind_time_message appears to be unused [UnusedResources] + Delete reminder successfully + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:28: Warning: The resource R.string.set_remind_time_message appears to be unused [UnusedResources] + Set reminder + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:119: Warning: The resource R.string.button_delete appears to be unused [UnusedResources] + Delete + ~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:126: Warning: The resource R.string.search appears to be unused [UnusedResources] + Notes + ~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\strings.xml:129: Warning: The resource R.plurals.search_results_title appears to be unused [UnusedResources] + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +C:\Users\HAO18\Desktop\homeworkgaishu\.work\b-integration\res\values\styles.xml:51: Warning: The resource R.style.HighlightTextAppearancePrimary appears to be unused [UnusedResources] + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..a2df3c47 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,25 @@ +// settings.gradle —— Gradle 构建入口配置 +pluginManagement { + repositories { + // 国内镜像优先,google()/mavenCentral() 作为兜底 + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/central' } + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/public' } + google() + mavenCentral() + } +} + +rootProject.name = "Notes" \ No newline at end of file diff --git a/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/net/micode/notes/gtask/remote/GTaskASyncTask.java index b3b61e72..21a40381 100644 --- a/src/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -17,12 +17,16 @@ package net.micode.notes.gtask.remote; +import android.Manifest; import android.app.Notification; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.AsyncTask; +import android.os.Build; import net.micode.notes.R; import net.micode.notes.ui.NotesListActivity; @@ -33,6 +37,8 @@ public class GTaskASyncTask extends AsyncTask { private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; + private static final String GTASK_SYNC_CHANNEL_ID = "gtask_sync"; + public interface OnCompleteListener { void onComplete(); } @@ -64,21 +70,45 @@ public void publishProgess(String message) { } private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; - PendingIntent pendingIntent; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + NotificationChannel channel = new NotificationChannel(GTASK_SYNC_CHANNEL_ID, + mContext.getString(R.string.app_name), NotificationManager.IMPORTANCE_LOW); + mNotifiManager.createNotificationChannel(channel); + } + + Intent intent; if (tickerId != R.string.ticker_success) { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesPreferenceActivity.class), 0); + intent = new Intent(mContext, NotesPreferenceActivity.class); + } else { + intent = new Intent(mContext, NotesListActivity.class); + } + int pendingFlags = PendingIntent.FLAG_UPDATE_CURRENT; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + pendingFlags |= PendingIntent.FLAG_IMMUTABLE; + } + PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, pendingFlags); + Notification.Builder builder; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + builder = new Notification.Builder(mContext, GTASK_SYNC_CHANNEL_ID); } else { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesListActivity.class), 0); + builder = new Notification.Builder(mContext); + } + Notification notification = builder + .setSmallIcon(R.drawable.notification) + .setTicker(mContext.getString(tickerId)) + .setWhen(System.currentTimeMillis()) + .setDefaults(Notification.DEFAULT_LIGHTS) + .setAutoCancel(true) + .setContentTitle(mContext.getString(R.string.app_name)) + .setContentText(content) + .setContentIntent(pendingIntent) + .getNotification(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU + && mContext.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) + != PackageManager.PERMISSION_GRANTED) { + return; } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } diff --git a/src/net/micode/notes/gtask/remote/GTaskClient.java b/src/net/micode/notes/gtask/remote/GTaskClient.java index c67dfdf3..77a124d8 100644 --- a/src/net/micode/notes/gtask/remote/GTaskClient.java +++ b/src/net/micode/notes/gtask/remote/GTaskClient.java @@ -197,7 +197,7 @@ private String loginGoogleAccount(Activity activity, boolean invalidateToken) { authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN); if (invalidateToken) { accountManager.invalidateAuthToken("com.google", authToken); - loginGoogleAccount(activity, false); + return loginGoogleAccount(activity, false); } } catch (Exception e) { Log.e(TAG, "get auth token failed"); diff --git a/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/net/micode/notes/gtask/remote/GTaskSyncService.java index cca36f76..a2d3366b 100644 --- a/src/net/micode/notes/gtask/remote/GTaskSyncService.java +++ b/src/net/micode/notes/gtask/remote/GTaskSyncService.java @@ -69,6 +69,13 @@ public void onCreate() { @Override public int onStartCommand(Intent intent, int flags, int startId) { + if (intent == null) { + // There is no sync state to restore after the process is recreated. + // Stop instead of dereferencing the null restart intent. + stopSelf(startId); + return START_NOT_STICKY; + } + Bundle bundle = intent.getExtras(); if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) { switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) { @@ -81,7 +88,7 @@ public int onStartCommand(Intent intent, int flags, int startId) { default: break; } - return START_STICKY; + return START_NOT_STICKY; } return super.onStartCommand(intent, flags, startId); } @@ -100,6 +107,7 @@ public IBinder onBind(Intent intent) { public void sendBroadcast(String msg) { mSyncProgress = msg; Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); + intent.setPackage(getPackageName()); intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg); sendBroadcast(intent); diff --git a/src/net/micode/notes/tool/DataUtils.java b/src/net/micode/notes/tool/DataUtils.java index 2a14982e..df86976c 100644 --- a/src/net/micode/notes/tool/DataUtils.java +++ b/src/net/micode/notes/tool/DataUtils.java @@ -35,9 +35,15 @@ import java.util.HashSet; +/** + * B 阶段一阅读标注 胡嘉豪 202430224010 + * 通过 ContentResolver 集中处理便签批量操作、可见性查询和摘要读取。 + * 小组件和提醒界面复用这些方法;调用者仍需处理返回值和 Provider 异常。 + */ public class DataUtils { public static final String TAG = "DataUtils"; public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { + // B 阅读标注:空集合视为无需操作,系统根目录在构建删除操作时被跳过。 if (ids == null) { Log.d(TAG, "the ids is null"); return true; @@ -59,6 +65,7 @@ public static boolean batchDeleteNotes(ContentResolver resolver, HashSet i } try { ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); + // B 阅读标注:这里只检查首个结果,不能据此证明每条删除都影响了记录。 if (results == null || results.length == 0 || results[0] == null) { Log.d(TAG, "delete notes failed, ids:" + ids.toString()); return false; @@ -82,6 +89,7 @@ public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFo public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, long folderId) { + // B 阅读标注:批量移动同时置本地修改标记,以便后续同步识别变更。 if (ids == null) { Log.d(TAG, "the ids is null"); return true; @@ -137,6 +145,7 @@ public static int getUserFolderCount(ContentResolver resolver) { } public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) { + // B 阅读标注:提醒展示前用此方法检查便签类型及回收站状态。 Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null, NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER, @@ -198,6 +207,7 @@ public static boolean checkVisibleFolderName(ContentResolver resolver, String na } public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) { + // B 阅读标注:返回目录下的组件 ID 和类型;无记录或查询为空时可能返回 null。 Cursor c = resolver.query(Notes.CONTENT_NOTE_URI, new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE }, NoteColumns.PARENT_ID + "=?", @@ -231,9 +241,11 @@ public static String getCallNumberByNoteId(ContentResolver resolver, long noteId new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE }, null); - if (cursor != null && cursor.moveToFirst()) { + if (cursor != null) { try { - return cursor.getString(0); + if (cursor.moveToFirst()) { + return cursor.getString(0); + } } catch (IndexOutOfBoundsException e) { Log.e(TAG, "Get call number fails " + e.toString()); } finally { @@ -244,6 +256,7 @@ public static String getCallNumberByNoteId(ContentResolver resolver, long noteId } public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) { + // Q-B-02: finally also closes the Cursor when a matching row returns early. Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, new String [] { CallNote.NOTE_ID }, CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL(" @@ -252,19 +265,21 @@ public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, S null); if (cursor != null) { - if (cursor.moveToFirst()) { - try { + try { + if (cursor.moveToFirst()) { return cursor.getLong(0); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "Get call note id fails " + e.toString()); } + } catch (IndexOutOfBoundsException e) { + Log.e(TAG, "Get call note id fails " + e.toString()); + } finally { + cursor.close(); } - cursor.close(); } return 0; } public static String getSnippetById(ContentResolver resolver, long noteId) { + // B 阅读标注:提醒弹窗从此处取摘要;空结果返回空串,null Cursor 则抛出异常。 Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, new String [] { NoteColumns.SNIPPET }, NoteColumns.ID + "=?", @@ -283,6 +298,7 @@ public static String getSnippetById(ContentResolver resolver, long noteId) { } public static String getFormattedSnippet(String snippet) { + // B 阅读标注:仅保留 trim 后的首行;null 输入仍返回 null。 if (snippet != null) { snippet = snippet.trim(); int index = snippet.indexOf('\n'); diff --git a/src/net/micode/notes/tool/QuickReminder.java b/src/net/micode/notes/tool/QuickReminder.java new file mode 100644 index 00000000..c4fb2979 --- /dev/null +++ b/src/net/micode/notes/tool/QuickReminder.java @@ -0,0 +1,44 @@ +/* Copyright 2026 The Notes contributors. Licensed under the Apache License, Version 2.0. */ +package net.micode.notes.tool; + +import java.util.Calendar; +import java.util.TimeZone; + +/** Pure calendar calculations shared by quick reminders and their boundary tests. */ +public final class QuickReminder { + public enum Preset { IN_TWO_HOURS, TOMORROW_MORNING, NEXT_WEEK } + + private QuickReminder() { } + + /** Returns a minute-aligned future time in the supplied device time zone. */ + public static long calculate(Preset preset, long now, TimeZone zone) { + if (preset == null || zone == null) { + throw new IllegalArgumentException("Preset and time zone are required"); + } + Calendar date = Calendar.getInstance(zone); + date.setTimeInMillis(now); + date.set(Calendar.SECOND, 0); + date.set(Calendar.MILLISECOND, 0); + switch (preset) { + case IN_TWO_HOURS: + date.add(Calendar.HOUR_OF_DAY, 2); + break; + case TOMORROW_MORNING: + date.add(Calendar.DAY_OF_YEAR, 1); + date.set(Calendar.HOUR_OF_DAY, 9); + date.set(Calendar.MINUTE, 0); + break; + case NEXT_WEEK: + // Calendar days preserve local clock time across DST and year boundaries. + date.add(Calendar.DAY_OF_YEAR, 7); + break; + default: + throw new IllegalArgumentException("Unknown reminder preset"); + } + return date.getTimeInMillis(); + } + + public static boolean isFuture(long date, long now) { + return date > now; + } +} diff --git a/src/net/micode/notes/tool/ReminderScheduler.java b/src/net/micode/notes/tool/ReminderScheduler.java new file mode 100644 index 00000000..4ac3d29f --- /dev/null +++ b/src/net/micode/notes/tool/ReminderScheduler.java @@ -0,0 +1,136 @@ +/* Copyright 2026 The Notes contributors. Licensed under the Apache License, Version 2.0. */ +package net.micode.notes.tool; + +import android.Manifest; +import android.app.AlarmManager; +import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.content.ContentUris; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.database.Cursor; +import android.media.AudioAttributes; +import android.media.RingtoneManager; +import android.os.Build; +import android.util.Log; + +import net.micode.notes.R; +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.ui.AlarmAlertActivity; +import net.micode.notes.ui.AlarmReceiver; + +/** One identity and scheduling policy for editing, cancellation, and boot restoration. */ +public final class ReminderScheduler { + private static final String CHANNEL_ID = "note_reminders"; + private static final int NOTIFICATION_ID = 1002; + private static final String EXTRA_ALERT_TIME = "net.micode.notes.ALERT_TIME"; + private static final String TAG = "ReminderScheduler"; + + private ReminderScheduler() { } + + public static boolean canScheduleExactly(Context context) { + AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + return Build.VERSION.SDK_INT < 31 || manager.canScheduleExactAlarms(); + } + + public static void schedule(Context context, long noteId, long date) { + Intent intent = new Intent(context, AlarmReceiver.class); + intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId)); + intent.putExtra(EXTRA_ALERT_TIME, date); + PendingIntent alarm = PendingIntent.getBroadcast(context, 0, intent, + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + if (Build.VERSION.SDK_INT >= 23) { + if (canScheduleExactly(context)) { + try { + manager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, date, alarm); + return; + } catch (SecurityException revokedWhileScheduling) { + Log.w(TAG, "Exact alarm access changed; using the documented inexact fallback"); + } + } + manager.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, date, alarm); + } else if (Build.VERSION.SDK_INT >= 19) { + manager.setExact(AlarmManager.RTC_WAKEUP, date, alarm); + } else { + manager.set(AlarmManager.RTC_WAKEUP, date, alarm); + } + } + + public static void cancel(Context context, long noteId) { + Intent intent = new Intent(context, AlarmReceiver.class); + intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId)); + PendingIntent alarm = PendingIntent.getBroadcast(context, 0, intent, + PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE); + if (alarm != null) { + ((AlarmManager) context.getSystemService(Context.ALARM_SERVICE)).cancel(alarm); + alarm.cancel(); + } + dismissNotification(context, noteId); + } + + public static void dismissNotification(Context context, long noteId) { + ((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE)) + .cancel("note:" + noteId, NOTIFICATION_ID); + } + + /** Reject cancelled, deleted, trashed, rescheduled, or premature broadcasts. */ + public static boolean isCurrentReminder(Context context, Intent intent) { + if (intent == null || intent.getData() == null) { + return false; + } + Cursor cursor = context.getContentResolver().query(intent.getData(), + new String[] { NoteColumns.ALERTED_DATE }, + NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?", + new String[] { String.valueOf(Notes.TYPE_NOTE), + String.valueOf(Notes.ID_TRASH_FOLER) }, null); + if (cursor == null) { + return false; + } + try { + if (!cursor.moveToFirst()) { + return false; + } + long saved = cursor.getLong(0); + long expected = intent.getLongExtra(EXTRA_ALERT_TIME, saved); + return saved > 0 && saved == expected && saved <= System.currentTimeMillis(); + } finally { + cursor.close(); + } + } + + /** Android 8+ uses a visible notification, avoiding blocked background Activity starts. */ + public static void showNotification(Context context, Intent received) { + if (Build.VERSION.SDK_INT < 26) { + return; + } + if (Build.VERSION.SDK_INT >= 33 && context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) + != PackageManager.PERMISSION_GRANTED) { + Log.w(TAG, "Reminder notification permission is not granted"); + return; + } + long noteId = ContentUris.parseId(received.getData()); + NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); + NotificationChannel channel = new NotificationChannel(CHANNEL_ID, + context.getString(R.string.reminder_channel_name), NotificationManager.IMPORTANCE_HIGH); + channel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM), + new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_ALARM).build()); + manager.createNotificationChannel(channel); + Intent open = new Intent(context, AlarmAlertActivity.class).setData(received.getData()); + PendingIntent content = PendingIntent.getActivity(context, 0, open, + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + Notification notification = new Notification.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_reminder_notification) + .setContentTitle(context.getString(R.string.reminder_channel_name)) + .setContentText(DataUtils.getSnippetById(context.getContentResolver(), noteId)) + .setContentIntent(content) + .setCategory(Notification.CATEGORY_REMINDER) + .setAutoCancel(true) + .build(); + manager.notify("note:" + noteId, NOTIFICATION_ID, notification); + } +} diff --git a/src/net/micode/notes/ui/AlarmAlertActivity.java b/src/net/micode/notes/ui/AlarmAlertActivity.java index 85723be0..f118ef77 100644 --- a/src/net/micode/notes/ui/AlarmAlertActivity.java +++ b/src/net/micode/notes/ui/AlarmAlertActivity.java @@ -29,13 +29,14 @@ import android.net.Uri; import android.os.Bundle; import android.os.PowerManager; -import android.provider.Settings; import android.view.Window; import android.view.WindowManager; import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.tool.DataUtils; +import net.micode.notes.tool.ReminderScheduler; +import android.content.ContentUris; import java.io.IOException; @@ -64,16 +65,26 @@ protected void onCreate(Bundle savedInstanceState) { Intent intent = getIntent(); try { - mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); + if (intent.getData() == null) { + finish(); + return; + } + mNoteId = ContentUris.parseId(intent.getData()); mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); + if (mSnippet == null) { + mSnippet = ""; + } mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) : mSnippet; } catch (IllegalArgumentException e) { e.printStackTrace(); + finish(); return; } + ReminderScheduler.dismissNotification(this, mNoteId); + mPlayer = new MediaPlayer(); if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { showActionDialog(); @@ -91,14 +102,10 @@ private boolean isScreenOn() { private void playAlarmSound() { Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - int silentModeStreams = Settings.System.getInt(getContentResolver(), - Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); - - if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { - mPlayer.setAudioStreamType(silentModeStreams); - } else { - mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); + if (url == null) { + url = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); } + mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); try { mPlayer.setDataSource(this, url); mPlayer.prepare(); @@ -150,9 +157,15 @@ public void onDismiss(DialogInterface dialog) { private void stopAlarmSound() { if (mPlayer != null) { - mPlayer.stop(); + // release is valid even if setting up the sound failed before playback started. mPlayer.release(); mPlayer = null; } } + + @Override + protected void onDestroy() { + stopAlarmSound(); + super.onDestroy(); + } } diff --git a/src/net/micode/notes/ui/AlarmInitReceiver.java b/src/net/micode/notes/ui/AlarmInitReceiver.java index f2212025..d7a37974 100644 --- a/src/net/micode/notes/ui/AlarmInitReceiver.java +++ b/src/net/micode/notes/ui/AlarmInitReceiver.java @@ -17,15 +17,14 @@ package net.micode.notes.ui; import android.app.AlarmManager; -import android.app.PendingIntent; import android.content.BroadcastReceiver; -import android.content.ContentUris; import android.content.Context; import android.content.Intent; import android.database.Cursor; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.tool.ReminderScheduler; public class AlarmInitReceiver extends BroadcastReceiver { @@ -40,26 +39,28 @@ public class AlarmInitReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { + if (intent == null || !(Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction()) + || AlarmManager.ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED.equals(intent.getAction()))) { + return; + } long currentDate = System.currentTimeMillis(); Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, PROJECTION, - NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, - new String[] { String.valueOf(currentDate) }, + NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=? AND " + + NoteColumns.PARENT_ID + "<>?", + new String[] { String.valueOf(currentDate), String.valueOf(Notes.TYPE_NOTE), + String.valueOf(Notes.ID_TRASH_FOLER) }, null); if (c != null) { - if (c.moveToFirst()) { - do { - long alertDate = c.getLong(COLUMN_ALERTED_DATE); - Intent sender = new Intent(context, AlarmReceiver.class); - sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); - PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); - AlarmManager alermManager = (AlarmManager) context - .getSystemService(Context.ALARM_SERVICE); - alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); - } while (c.moveToNext()); + try { + while (c.moveToNext()) { + ReminderScheduler.schedule(context, c.getLong(COLUMN_ID), + c.getLong(COLUMN_ALERTED_DATE)); + } + } finally { + c.close(); } - c.close(); } } } diff --git a/src/net/micode/notes/ui/AlarmReceiver.java b/src/net/micode/notes/ui/AlarmReceiver.java index 54e503bd..578fde45 100644 --- a/src/net/micode/notes/ui/AlarmReceiver.java +++ b/src/net/micode/notes/ui/AlarmReceiver.java @@ -19,10 +19,19 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.os.Build; +import net.micode.notes.tool.ReminderScheduler; public class AlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { + if (!ReminderScheduler.isCurrentReminder(context, intent)) { + return; + } + if (Build.VERSION.SDK_INT >= 26) { + ReminderScheduler.showNotification(context, intent); + return; + } intent.setClass(context, AlarmAlertActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); diff --git a/src/net/micode/notes/ui/DateTimePicker.java b/src/net/micode/notes/ui/DateTimePicker.java index 496b0cda..ac8d5e0d 100644 --- a/src/net/micode/notes/ui/DateTimePicker.java +++ b/src/net/micode/notes/ui/DateTimePicker.java @@ -104,13 +104,14 @@ public void onValueChange(NumberPicker picker, int oldVal, int newVal) { isDateChanged = true; } } - int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); - mDate.set(Calendar.HOUR_OF_DAY, newHour); - onDateTimeChanged(); + int newHour = mIs24HourView ? newVal + : newVal % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); if (isDateChanged) { - setCurrentYear(cal.get(Calendar.YEAR)); - setCurrentMonth(cal.get(Calendar.MONTH)); - setCurrentDay(cal.get(Calendar.DAY_OF_MONTH)); + setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), + cal.get(Calendar.DAY_OF_MONTH), newHour, getCurrentMinute()); + } else { + mDate.set(Calendar.HOUR_OF_DAY, newHour); + onDateTimeChanged(); } } }; @@ -175,7 +176,7 @@ public DateTimePicker(Context context, long date, boolean is24HourView) { super(context); mDate = Calendar.getInstance(); mInitialising = true; - mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; + mIsAm = getCurrentHourOfDay() < HOURS_IN_HALF_DAY; inflate(context, R.layout.datetime_picker, this); mDateSpinner = (NumberPicker) findViewById(R.id.date); @@ -264,11 +265,15 @@ public void setCurrentDate(long date) { */ public void setCurrentDate(int year, int month, int dayOfMonth, int hourOfDay, int minute) { - setCurrentYear(year); - setCurrentMonth(month); - setCurrentDay(dayOfMonth); - setCurrentHour(hourOfDay); - setCurrentMinute(minute); + // Assign all fields before Calendar normalizes them (Jan 31 -> Feb 1, leap years). + mDate.clear(); + mDate.set(year, month, dayOfMonth, hourOfDay, minute, 0); + mIsAm = getCurrentHourOfDay() < HOURS_IN_HALF_DAY; + updateDateControl(); + mHourSpinner.setValue(getCurrentHour()); + mMinuteSpinner.setValue(getCurrentMinute()); + updateAmPmControl(); + onDateTimeChanged(); } /** @@ -428,9 +433,8 @@ public void set24HourView(boolean is24HourView) { } mIs24HourView = is24HourView; mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE); - int hour = getCurrentHourOfDay(); updateHourControl(); - setCurrentHour(hour); + mHourSpinner.setValue(getCurrentHour()); updateAmPmControl(); } diff --git a/src/net/micode/notes/ui/DateTimePickerDialog.java b/src/net/micode/notes/ui/DateTimePickerDialog.java index 2c47ba41..4a25b796 100644 --- a/src/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/net/micode/notes/ui/DateTimePickerDialog.java @@ -28,7 +28,16 @@ import android.content.DialogInterface.OnClickListener; import android.text.format.DateFormat; import android.text.format.DateUtils; +import android.os.Bundle; +import android.view.View; +import android.widget.Toast; +import net.micode.notes.tool.QuickReminder; +/** + * B 阶段一阅读标注 胡嘉豪 202430224010 + * 包装日期时间控件,通过监听器向编辑页交付毫秒时间戳。 + * 本类只负责选择与标题展示,保存便签和注册闹钟在模型及编辑页中完成。 + */ public class DateTimePickerDialog extends AlertDialog implements OnClickListener { private Calendar mDate = Calendar.getInstance(); @@ -37,6 +46,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener private DateTimePicker mDateTimePicker; public interface OnDateTimeSetListener { + // B 阅读标注:date 是 Unix 毫秒时间戳,月份转换由 Calendar 和控件处理。 void OnDateTimeSet(AlertDialog dialog, long date); } @@ -47,16 +57,17 @@ public DateTimePickerDialog(Context context, long date) { mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { public void onDateTimeChanged(DateTimePicker view, int year, int month, int dayOfMonth, int hourOfDay, int minute) { - mDate.set(Calendar.YEAR, year); - mDate.set(Calendar.MONTH, month); - mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); - mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); - mDate.set(Calendar.MINUTE, minute); + // B 阅读标注:每次滚轮变化同步 Calendar,并刷新对话框标题。 + // Assign the complete date together: setting February while the + // previous day is January 31 would otherwise normalize into March. + mDate.clear(); + mDate.set(year, month, dayOfMonth, hourOfDay, minute, 0); updateTitle(mDate.getTimeInMillis()); } }); mDate.setTimeInMillis(date); mDate.set(Calendar.SECOND, 0); + mDate.set(Calendar.MILLISECOND, 0); mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); setButton(context.getString(R.string.datetime_dialog_ok), this); setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); @@ -66,6 +77,8 @@ public void onDateTimeChanged(DateTimePicker view, int year, int month, public void set24HourView(boolean is24HourView) { mIs24HourView = is24HourView; + mDateTimePicker.set24HourView(is24HourView); + updateTitle(mDate.getTimeInMillis()); } public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { @@ -77,14 +90,32 @@ private void updateTitle(long date) { DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; + // Q-B-01: keep the title consistent with the picker and the system clock format. + flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_12HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } public void onClick(DialogInterface arg0, int arg1) { + mDateTimePicker.clearFocus(); + if (!QuickReminder.isFuture(mDate.getTimeInMillis(), System.currentTimeMillis())) { + Toast.makeText(getContext(), R.string.reminder_time_in_past, Toast.LENGTH_SHORT).show(); + return; + } if (mOnDateTimeSetListener != null) { mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis()); } + dismiss(); + } + + @Override + protected void onCreate(Bundle state) { + super.onCreate(state); + // AlertDialog's default listener dismisses even when validation fails. + getButton(BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + DateTimePickerDialog.this.onClick(DateTimePickerDialog.this, BUTTON_POSITIVE); + } + }); } -} \ No newline at end of file +} diff --git a/src/net/micode/notes/ui/NoteEditActivity.java b/src/net/micode/notes/ui/NoteEditActivity.java index 96a9ff89..9e1953d4 100644 --- a/src/net/micode/notes/ui/NoteEditActivity.java +++ b/src/net/micode/notes/ui/NoteEditActivity.java @@ -1,37 +1,25 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.ui; import android.app.Activity; -import android.app.AlarmManager; +import android.Manifest; import android.app.AlertDialog; -import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; -import android.content.ContentUris; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Paint; import android.os.Bundle; +import android.os.Build; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.provider.Settings; import android.preference.PreferenceManager; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; +import android.text.TextWatcher; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; @@ -59,6 +47,8 @@ import net.micode.notes.model.WorkingNote.NoteSettingChangedListener; import net.micode.notes.tool.DataUtils; import net.micode.notes.tool.ResourceParser; +import net.micode.notes.tool.QuickReminder; +import net.micode.notes.tool.ReminderScheduler; import net.micode.notes.tool.ResourceParser.TextAppearanceResources; import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener; import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; @@ -68,22 +58,28 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; - - +/** + * 便签编辑页面 Activity + * 负责便签的创建、编辑、显示,支持背景色/字号设置、清单模式、提醒、分享、桌面小部件等功能 + * 同时实现了点击监听、便签设置变更监听、文本编辑行变更监听三个接口 + */ public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { + // 头部视图控件持有者,缓存标题栏上的各个控件引用,避免重复 findViewById private class HeadViewHolder { - public TextView tvModified; + public TextView tvModified; // 显示便签最后修改时间 - public ImageView ivAlertIcon; + public ImageView ivAlertIcon; // 提醒(时钟)图标 - public TextView tvAlertDate; + public TextView tvAlertDate; // 提醒日期/剩余时间文本 - public ImageView ibSetBgColor; + public ImageView ibSetBgColor; // 设置背景色的按钮图标 } + // 背景色选择面板中"色块按钮ID"到"颜色资源常量"的映射表 private static final Map sBgSelectorBtnsMap = new HashMap(); static { sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); @@ -93,6 +89,7 @@ private class HeadViewHolder { sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); } + // "颜色资源常量"到"该颜色选中态标识视图ID"的映射表 private static final Map sBgSelectorSelectionMap = new HashMap(); static { sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); @@ -102,6 +99,7 @@ private class HeadViewHolder { sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); } + // 字号选择面板中"字号按钮ID"到"字号资源常量"的映射表 private static final Map sFontSizeBtnsMap = new HashMap(); static { sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); @@ -110,6 +108,7 @@ private class HeadViewHolder { sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); } + // "字号资源常量"到"该字号选中态标识视图ID"的映射表 private static final Map sFontSelectorSelectionMap = new HashMap(); static { sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); @@ -118,37 +117,48 @@ private class HeadViewHolder { sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); } + // 日志标签,用于 Logcat 输出时标识当前类 private static final String TAG = "NoteEditActivity"; + private static final int REQUEST_REMINDER_NOTIFICATION = 41; + private static final int REQUEST_EXACT_REMINDER = 42; - private HeadViewHolder mNoteHeaderHolder; + private HeadViewHolder mNoteHeaderHolder; // 头部控件持有者实例 - private View mHeadViewPanel; + private View mHeadViewPanel; // 标题栏整体面板 - private View mNoteBgColorSelector; + private View mNoteBgColorSelector; // 背景色选择浮层 - private View mFontSizeSelector; + private View mFontSizeSelector; // 字号选择浮层 - private EditText mNoteEditor; + private EditText mNoteEditor; // 普通模式下的便签编辑框 - private View mNoteEditorPanel; + private View mNoteEditorPanel; // 编辑区域整体面板(用于设置背景) - private WorkingNote mWorkingNote; + private TextView mWordCount; // 底部实时字数统计器 - private SharedPreferences mSharedPrefs; - private int mFontSizeId; + private WorkingNote mWorkingNote; // 当前正在编辑的便签数据模型 + private SharedPreferences mSharedPrefs; // 偏好设置存储(用于持久化字号等) + private int mFontSizeId; // 当前选中的字号资源ID + + // 偏好设置中保存字号的 key private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; + // 桌面快捷方式图标标题的最大长度 private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; - public static final String TAG_CHECKED = String.valueOf('\u221A'); - public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); + public static final String TAG_CHECKED = String.valueOf('\u221A'); // 清单已勾选项前缀标记"√" + public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); // 清单未勾选项前缀标记"□" - private LinearLayout mEditTextList; + private LinearLayout mEditTextList; // 清单模式下的多行编辑列表容器 - private String mUserQuery; - private Pattern mPattern; + private String mUserQuery; // 来自搜索结果的用户查询关键词 + private Pattern mPattern; // 用于高亮匹配的正则表达式 + /** + * Activity 创建入口:加载布局、初始化便签状态与控件资源 + * 若是首次创建(非状态恢复)且便签状态初始化失败,则直接关闭页面 + */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -165,6 +175,7 @@ protected void onCreate(Bundle savedInstanceState) { * Current activity may be killed when the memory is low. Once it is killed, for another time * user load this activity, we should restore the former state */ + // 从被系统回收后的状态恢复:根据保存的 noteId 重新构建 Intent 并初始化便签状态 @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); @@ -179,6 +190,13 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) { } } + /** + * 根据 Intent 的 Action 初始化便签工作状态 + * ACTION_VIEW:从数据库加载已有便签(含从搜索结果跳转的场景) + * ACTION_INSERT_OR_EDIT:新建便签,或解析通话记录便签 + * 其他 Action 不支持,直接关闭页面 + * @return 初始化成功返回 true,失败并已 finish() 返回 false + */ private boolean initActivityState(Intent intent) { /** * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id, @@ -192,11 +210,13 @@ private boolean initActivityState(Intent intent) { /** * Starting from the searched result */ + // 若来自搜索结果,则从搜索附加数据中取出 noteId 和用户查询词 if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); } + // 校验该便签是否存在于数据库中,不存在则提示并跳转到列表页 if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { Intent jump = new Intent(this, NotesListActivity.class); startActivity(jump); @@ -204,6 +224,7 @@ private boolean initActivityState(Intent intent) { finish(); return false; } else { + // 从数据库加载便签数据 mWorkingNote = WorkingNote.load(this, noteId); if (mWorkingNote == null) { Log.e(TAG, "load note failed with note id" + noteId); @@ -211,11 +232,13 @@ private boolean initActivityState(Intent intent) { return false; } } + // 查看已有便签时:隐藏软键盘,窗口自适应大小 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { // New note + // 新建便签:从 Intent 中读取所属目录、小部件信息、背景色等参数 long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); @@ -225,6 +248,7 @@ private boolean initActivityState(Intent intent) { ResourceParser.getDefaultBgId(this)); // Parse call-record note + // 解析通话记录便签:若同时带有通话日期和电话号码,则按记录创建或加载 String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); if (callDate != 0 && phoneNumber != null) { @@ -232,6 +256,7 @@ private boolean initActivityState(Intent intent) { Log.w(TAG, "The call record number is null"); } long noteId = 0; + // 已存在相同通话记录便签则加载,否则新建并转换为通话便签 if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(), phoneNumber, callDate)) > 0) { mWorkingNote = WorkingNote.load(this, noteId); @@ -246,43 +271,58 @@ private boolean initActivityState(Intent intent) { mWorkingNote.convertToCallNote(phoneNumber, callDate); } } else { + // 普通新建空便签 mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, bgResId); } + // 新建/编辑时:窗口自适应大小并自动弹出软键盘 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); } else { + // 不支持的 Action,记录错误并关闭 Log.e(TAG, "Intent not specified action, should not support"); finish(); return false; } + // 注册便签设置变更监听器,设置变化时回调本 Activity mWorkingNote.setOnSettingStatusChangedListener(this); return true; } + /** + * 每次回到前台时重新初始化便签界面,保证显示与数据一致 + */ @Override protected void onResume() { super.onResume(); initNoteScreen(); } + /** + * 初始化便签界面显示:设置字号、内容(普通/清单模式)、背景色、修改时间、提醒信息,并同步字数 + */ private void initNoteScreen() { + // 应用当前字号外观到编辑框 mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); + // 根据是否清单模式选择展示方式:清单切换为多行列表,普通模式直接设文本并高亮搜索词 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); } else { mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mNoteEditor.setSelection(mNoteEditor.getText().length()); } + // 初始隐藏所有背景色的选中标识 for (Integer id : sBgSelectorSelectionMap.keySet()) { findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE); } + // 应用标题栏与编辑区背景 mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); + // 格式化并显示便签的修改日期时间 mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this, mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME @@ -293,31 +333,44 @@ private void initNoteScreen() { * is not ready */ showAlertHeader(); + refreshWordCount(); // 初始化时同步一次字数 } + /** + * 显示/隐藏头部提醒信息:有提醒时根据是否过期显示相应文案 + */ private void showAlertHeader() { if (mWorkingNote.hasClockAlert()) { long time = System.currentTimeMillis(); if (time > mWorkingNote.getAlertDate()) { + // 提醒时间已过,显示已过期 mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); } else { + // 未过期,显示相对剩余时间 mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); } mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); } else { + // 无提醒,隐藏提醒图标与文本 mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); }; } + /** + * 当 Activity 已存在而再次收到新 Intent 时(singleTop),重新初始化便签状态 + */ @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); initActivityState(intent); } + /** + * 保存实例状态:若便签尚未入库则先保存以生成 noteId,再将 id 存入 Bundle 供恢复使用 + */ @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); @@ -333,6 +386,9 @@ protected void onSaveInstanceState(Bundle outState) { Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); } + /** + * 分发触摸事件:点击到背景色/字号选择浮层以外的区域时,自动收起该浮层 + */ @Override public boolean dispatchTouchEvent(MotionEvent ev) { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE @@ -349,21 +405,29 @@ public boolean dispatchTouchEvent(MotionEvent ev) { return super.dispatchTouchEvent(ev); } + /** + * 判断触摸点是否落在指定视图的屏幕范围内 + * @return 在范围内返回 true,否则返回 false + */ private boolean inRangeOfView(View view, MotionEvent ev) { int []location = new int[2]; - view.getLocationOnScreen(location); + view.getLocationOnScreen(location); // 获取视图在屏幕上的左上角坐标 int x = location[0]; int y = location[1]; if (ev.getX() < x || ev.getX() > (x + view.getWidth()) || ev.getY() < y || ev.getY() > (y + view.getHeight())) { - return false; - } + return false; + } return true; } + /** + * 初始化界面控件资源:查找各类视图、设置点击监听、读取偏好字号,并为编辑框绑定字数实时刷新 + */ private void initResources() { + // 标题栏及其内部控件 mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); @@ -373,17 +437,20 @@ private void initResources() { mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); mNoteEditor = (EditText) findViewById(R.id.note_edit_view); mNoteEditorPanel = findViewById(R.id.sv_note_edit); + // 背景色选择浮层及其中每个色块按钮的点击监听 mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector); for (int id : sBgSelectorBtnsMap.keySet()) { ImageView iv = (ImageView) findViewById(id); iv.setOnClickListener(this); } + // 字号选择浮层及每个字号按钮的点击监听 mFontSizeSelector = findViewById(R.id.font_size_selector); for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); view.setOnClickListener(this); }; + // 读取持久化的字号设置 mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); /** @@ -391,12 +458,29 @@ private void initResources() { * The id may larger than the length of resources, in this case, * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} */ + // 防御:保存的字号ID越界时回退为默认值 if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) { mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; } mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); + mWordCount = (TextView) findViewById(R.id.tv_word_count); + // 普通模式下监听编辑器文本变化,实时刷新字数 + mNoteEditor.addTextChangedListener(new TextWatcher() { + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + + public void onTextChanged(CharSequence s, int start, int before, int count) { + } + + public void afterTextChanged(Editable s) { + refreshWordCount(); + } + }); } + /** + * 页面暂停时保存便签内容,并清除浮层设置状态 + */ @Override protected void onPause() { super.onPause(); @@ -406,6 +490,9 @@ protected void onPause() { clearSettingState(); } + /** + * 更新与便签关联的桌面小部件:根据小部件类型发送对应的更新广播 + */ private void updateWidget() { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { @@ -417,31 +504,40 @@ private void updateWidget() { return; } + // 指定要刷新的小部件ID intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() + mWorkingNote.getWidgetId() }); sendBroadcast(intent); setResult(RESULT_OK, intent); } + /** + * 统一点击事件处理: + * 点击背景色按钮展开选择面板;点击色块切换便签背景;点击字号按钮切换并持久化字号 + */ public void onClick(View v) { int id = v.getId(); if (id == R.id.btn_set_bg_color) { + // 展开背景色选择面板,并高亮当前背景色的选中标识 mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); + View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { + // 选中某个颜色:取消旧标识、应用新背景色、收起面板 findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); mNoteBgColorSelector.setVisibility(View.GONE); } else if (sFontSizeBtnsMap.containsKey(id)) { + // 选中某个字号:更新选中态、持久化,并按当前模式刷新编辑区外观 findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE); mFontSizeId = sFontSizeBtnsMap.get(id); mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + // 清单模式需重新构建各行列表以应用新字号 getWorkingText(); switchToListMode(mWorkingNote.getContent()); } else { @@ -452,6 +548,9 @@ public void onClick(View v) { } } + /** + * 返回键处理:若存在展开的浮层则先收起,否则保存便签并退出 + */ @Override public void onBackPressed() { if(clearSettingState()) { @@ -462,6 +561,10 @@ public void onBackPressed() { super.onBackPressed(); } + /** + * 清除设置浮层状态:收起背景色或字号选择面板 + * @return 有浮层被收起返回 true,否则返回 false + */ private boolean clearSettingState() { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) { mNoteBgColorSelector.setVisibility(View.GONE); @@ -473,6 +576,9 @@ private boolean clearSettingState() { return false; } + /** + * 背景色变更回调:高亮新颜色标识并刷新编辑区与标题栏背景 + */ public void onBackgroundColorChanged() { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.VISIBLE); @@ -480,6 +586,9 @@ public void onBackgroundColorChanged() { mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); } + /** + * 准备选项菜单:根据便签类型(是否通话记录)、清单模式、是否有提醒动态构建与显隐菜单项 + */ @Override public boolean onPrepareOptionsMenu(Menu menu) { if (isFinishing()) { @@ -487,16 +596,19 @@ public boolean onPrepareOptionsMenu(Menu menu) { } clearSettingState(); menu.clear(); + // 通话记录便签使用专用菜单,其余使用普通便签菜单 if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_note_edit, menu); } else { getMenuInflater().inflate(R.menu.note_edit, menu); } + // 清单模式与普通模式之间切换菜单标题 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode); } else { menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode); } + // 根据是否已设置提醒,显示"设置提醒"或"删除提醒" if (mWorkingNote.hasClockAlert()) { menu.findItem(R.id.menu_alert).setVisible(false); } else { @@ -505,68 +617,158 @@ public boolean onPrepareOptionsMenu(Menu menu) { return true; } + /** + * 菜单项点击处理:分发新建、删除、字号、清单模式、分享、发送到桌面、设置/删除提醒等操作 + */ @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_note: - createNewNote(); - break; - case R.id.menu_delete: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_note)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); - finish(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.menu_font_size: - mFontSizeSelector.setVisibility(View.VISIBLE); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - break; - case R.id.menu_list_mode: - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - break; - case R.id.menu_share: - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - break; - case R.id.menu_send_to_desktop: - sendToDesktop(); - break; - case R.id.menu_alert: - setReminder(); - break; - case R.id.menu_delete_remind: - mWorkingNote.setAlertDate(0, false); - break; - default: - break; + int itemId = item.getItemId(); + if (itemId == R.id.menu_new_note) { + createNewNote(); + } else if (itemId == R.id.menu_delete) { + // 删除前弹出确认对话框 + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_note)); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + deleteCurrentNote(); + finish(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + } else if (itemId == R.id.menu_font_size) { + // 展开字号选择面板并高亮当前字号 + mFontSizeSelector.setVisibility(View.VISIBLE); + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + } else if (itemId == R.id.menu_list_mode) { + // 在清单模式与普通模式间切换 + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? + TextNote.MODE_CHECK_LIST : 0); + } else if (itemId == R.id.menu_share) { + // 获取当前文本并分享给其他应用 + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); + } else if (itemId == R.id.menu_send_to_desktop) { + sendToDesktop(); + } else if (itemId == R.id.menu_alert) { + setReminder(); + } else if (itemId == R.id.menu_delete_remind) { + // 清除提醒设置 + mWorkingNote.setAlertDate(0, false); } return true; } + /** + * 设置提醒:校验权限后显示快捷选项,并保留自定义日期时间入口 + */ private void setReminder() { - DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); + getWorkingText(); + if (TextUtils.isEmpty(mWorkingNote.getContent())) { + showToast(R.string.error_note_empty_for_clock); + return; + } + if (Build.VERSION.SDK_INT >= 33 && checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) + != PackageManager.PERMISSION_GRANTED) { + requestPermissions(new String[] { Manifest.permission.POST_NOTIFICATIONS }, + REQUEST_REMINDER_NOTIFICATION); + return; + } + if (!ReminderScheduler.canScheduleExactly(this) && Build.VERSION.SDK_INT >= 31) { + new AlertDialog.Builder(this).setTitle(R.string.reminder_exact_title) + .setMessage(R.string.reminder_exact_message) + .setPositiveButton(R.string.reminder_open_settings, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + startActivityForResult(new Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM, + Uri.parse("package:" + getPackageName())), REQUEST_EXACT_REMINDER); + } + }) + .setNegativeButton(R.string.reminder_allow_delay, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + showReminderChoices(); + } + }).setNeutralButton(android.R.string.cancel, null).show(); + return; + } + showReminderChoices(); + } + + @Override + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] results) { + super.onRequestPermissionsResult(requestCode, permissions, results); + if (requestCode == REQUEST_REMINDER_NOTIFICATION) { + if (results.length > 0 && results[0] == PackageManager.PERMISSION_GRANTED) { + setReminder(); + } else { + showToast(R.string.reminder_notification_denied); + } + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == REQUEST_EXACT_REMINDER) { + showReminderChoices(); + } + } + + private void showReminderChoices() { + final QuickReminder.Preset[] presets = QuickReminder.Preset.values(); + int[] names = { R.string.reminder_in_two_hours, R.string.reminder_tomorrow_morning, + R.string.reminder_next_week }; + CharSequence[] items = new CharSequence[presets.length + 1]; + long now = System.currentTimeMillis(); + for (int i = 0; i < presets.length; i++) { + long date = QuickReminder.calculate(presets[i], now, TimeZone.getDefault()); + items[i] = getString(names[i]) + "\n" + DateUtils.formatDateTime(this, date, + DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME); + } + items[presets.length] = getString(R.string.reminder_custom_time); + new AlertDialog.Builder(this).setTitle(R.string.reminder_choose_time) + .setItems(items, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + if (which == presets.length) { + showCustomReminder(); + } else { + // Recalculate at selection time, rather than using an old dialog preview. + applyReminder(QuickReminder.calculate(presets[which], + System.currentTimeMillis(), TimeZone.getDefault())); + } + } + }).setNegativeButton(android.R.string.cancel, null).show(); + } + + private void showCustomReminder() { + long initial = mWorkingNote.getAlertDate() > System.currentTimeMillis() + ? mWorkingNote.getAlertDate() : QuickReminder.calculate( + QuickReminder.Preset.IN_TWO_HOURS, System.currentTimeMillis(), TimeZone.getDefault()); + DateTimePickerDialog d = new DateTimePickerDialog(this, initial); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { - mWorkingNote.setAlertDate(date , true); + applyReminder(date); } }); d.show(); } + private void applyReminder(long date) { + if (!QuickReminder.isFuture(date, System.currentTimeMillis())) { + showToast(R.string.reminder_time_in_past); + return; + } + mWorkingNote.setAlertDate(date, true); + } + /** * Share note to apps that support {@link Intent#ACTION_SEND} action * and {@text/plain} type */ + // 通过 ACTION_SEND 隐式Intent将便签文本以纯文本形式分享出去 private void sendTo(Context context, String info) { Intent intent = new Intent(Intent.ACTION_SEND); intent.putExtra(Intent.EXTRA_TEXT, info); @@ -574,6 +776,9 @@ private void sendTo(Context context, String info) { context.startActivity(intent); } + /** + * 新建便签:先保存当前便签,再关闭本页并以 INSERT_OR_EDIT 启动新的编辑页 + */ private void createNewNote() { // Firstly, save current editing notes saveNote(); @@ -586,6 +791,9 @@ private void createNewNote() { startActivity(intent); } + /** + * 删除当前便签:同步模式下移入回收站,非同步模式下直接删除,并标记为已删除 + */ private void deleteCurrentNote() { if (mWorkingNote.existInDatabase()) { HashSet ids = new HashSet(); @@ -596,10 +804,12 @@ private void deleteCurrentNote() { Log.d(TAG, "Wrong note id, should not happen"); } if (!isSyncMode()) { + // 未开启同步:直接批量删除 if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { Log.e(TAG, "Delete Note error"); } } else { + // 开启同步:移动到回收站文件夹 if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); } @@ -608,28 +818,29 @@ private void deleteCurrentNote() { mWorkingNote.markDeleted(true); } + /** + * 判断当前是否处于同步模式(已配置同步账号) + */ private boolean isSyncMode() { return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; } + /** + * 时钟提醒变更回调:确保便签已入库后,注册或取消系统的 AlarmManager 提醒广播 + */ public void onClockAlertChanged(long date, boolean set) { /** * User could set clock to an unsaved note, so before setting the * alert clock, we should save the note first */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } + // Persist both setting and cancellation immediately, before installing the system alarm. + saveNote(); if (mWorkingNote.getNoteId() > 0) { - Intent intent = new Intent(this, AlarmReceiver.class); - intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); - PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); - AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); showAlertHeader(); if(!set) { - alarmManager.cancel(pendingIntent); + ReminderScheduler.cancel(this, mWorkingNote.getNoteId()); } else { - alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); + ReminderScheduler.schedule(this, mWorkingNote.getNoteId(), date); } } else { /** @@ -642,22 +853,31 @@ public void onClockAlertChanged(long date, boolean set) { } } + /** + * 小部件变更回调:刷新关联的桌面小部件 + */ public void onWidgetChanged() { updateWidget(); } + /** + * 清单模式删除某行回调:移除该行视图,后续行索引前移,并将删除行文本合并到相邻行 + */ public void onEditTextDelete(int index, String text) { int childCount = mEditTextList.getChildCount(); if (childCount == 1) { + // 仅剩一行时不允许删除 return; } + // 将被删行之后的所有行索引依次减 1 for (int i = index + 1; i < childCount; i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i - 1); } mEditTextList.removeViewAt(index); + // 找到合并目标行(上一行或首行),追加文本并将光标定位到末尾 NoteEditText edit = null; if(index == 0) { edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( @@ -672,6 +892,9 @@ public void onEditTextDelete(int index, String text) { edit.setSelection(length); } + /** + * 清单模式回车新增某行回调:在指定位置插入新行视图,聚焦并设置光标,后续行索引顺延 + */ public void onEditTextEnter(int index, String text) { /** * Should not happen, check for debug @@ -685,12 +908,16 @@ public void onEditTextEnter(int index, String text) { NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); edit.requestFocus(); edit.setSelection(0); + // 重新设置插入点之后各行的索引 for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i); } } + /** + * 切换到清单模式:清空列表,按换行拆分内容逐行构建可勾选条目,并在末尾追加一空行 + */ private void switchToListMode(String text) { mEditTextList.removeAllViews(); String[] items = text.split("\n"); @@ -701,16 +928,24 @@ private void switchToListMode(String text) { index++; } } + // 末尾追加空行并聚焦,方便继续输入 mEditTextList.addView(getListItem("", index)); mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); + // 隐藏普通编辑框,显示清单列表 mNoteEditor.setVisibility(View.GONE); mEditTextList.setVisibility(View.VISIBLE); + refreshWordCount(); // 切换到清单模式后刷新字数 } + /** + * 生成带搜索关键词高亮的可显示文本:对用户查询匹配到的片段添加背景色 Span + * @return 处理后的 Spannable 文本 + */ private Spannable getHighlightQueryResult(String fullText, String userQuery) { SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); if (!TextUtils.isEmpty(userQuery)) { + // 用查询词作为正则,逐个匹配位置施加高亮背景 mPattern = Pattern.compile(userQuery); Matcher m = mPattern.matcher(fullText); int start = 0; @@ -725,11 +960,15 @@ private Spannable getHighlightQueryResult(String fullText, String userQuery) { return spannable; } + /** + * 构建清单模式下单个可编辑行视图:设置字号、复选框勾选联动删除线、解析勾选标记、绑定监听与字数刷新 + */ private View getListItem(String item, int index) { View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); + // 勾选状态变化时切换文本删除线样式 cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { @@ -740,6 +979,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { } }); + // 根据行文本前缀(√/□)初始化勾选状态并剥离标记 if (item.startsWith(TAG_CHECKED)) { cb.setChecked(true); edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); @@ -750,12 +990,28 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); } + // 绑定行文本变化监听、索引、高亮文本,并注册字数实时刷新 edit.setOnTextViewChangeListener(this); edit.setIndex(index); edit.setText(getHighlightQueryResult(item, mUserQuery)); + // 清单模式下监听每行文本变化,实时刷新总字数 + edit.addTextChangedListener(new TextWatcher() { + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + + public void onTextChanged(CharSequence s, int start, int before, int count) { + } + + public void afterTextChanged(Editable s) { + refreshWordCount(); + } + }); return view; } + /** + * 行文本内容变化回调:根据该行是否有内容显示或隐藏其复选框 + */ public void onTextChange(int index, boolean hasText) { if (index >= mEditTextList.getChildCount()) { Log.e(TAG, "Wrong index, should not happen"); @@ -768,10 +1024,14 @@ public void onTextChange(int index, boolean hasText) { } } + /** + * 清单模式切换回调:进入清单模式则构建列表;回到普通模式则汇总各行文本并显示到编辑框 + */ public void onCheckListModeChanged(int oldMode, int newMode) { if (newMode == TextNote.MODE_CHECK_LIST) { switchToListMode(mNoteEditor.getText().toString()); } else { + // 汇总各行文本,若没有勾选项则去除未勾选标记 if (!getWorkingText()) { mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); @@ -779,9 +1039,15 @@ public void onCheckListModeChanged(int oldMode, int newMode) { mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); + refreshWordCount(); // 切回普通模式后刷新字数 } } + /** + * 从界面收集当前工作文本写回数据模型 + * 清单模式下逐行拼接(带 √/□ 前缀),普通模式直接取编辑框内容 + * @return 是否存在已勾选项 + */ private boolean getWorkingText() { boolean hasChecked = false; if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { @@ -790,6 +1056,7 @@ private boolean getWorkingText() { View view = mEditTextList.getChildAt(i); NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); if (!TextUtils.isEmpty(edit.getText())) { + // 已勾选加"√"前缀,未勾选加"□"前缀 if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); hasChecked = true; @@ -805,6 +1072,10 @@ private boolean getWorkingText() { return hasChecked; } + /** + * 保存便签:先收集工作文本再写入数据库,成功后设 RESULT_OK 标识创建/编辑状态 + * @return 保存成功返回 true + */ private boolean saveNote() { getWorkingText(); boolean saved = mWorkingNote.saveNote(); @@ -821,6 +1092,9 @@ private boolean saveNote() { return saved; } + /** + * 发送便签到桌面快捷方式:确保入库后构造 INSTALL_SHORTCUT 广播,附带图标与标题 + */ private void sendToDesktop() { /** * Before send message to home, we should make sure that current @@ -832,6 +1106,7 @@ private void sendToDesktop() { } if (mWorkingNote.getNoteId() > 0) { + // 构造快捷方式:点击时以 ACTION_VIEW 打开该便签 Intent sender = new Intent(); Intent shortcutIntent = new Intent(this, NoteEditActivity.class); shortcutIntent.setAction(Intent.ACTION_VIEW); @@ -856,6 +1131,9 @@ private void sendToDesktop() { } } + /** + * 生成桌面快捷方式标题:去除勾选标记并截断到最大长度 + */ private String makeShortcutIconTitle(String content) { content = content.replace(TAG_CHECKED, ""); content = content.replace(TAG_UNCHECKED, ""); @@ -863,11 +1141,37 @@ private String makeShortcutIconTitle(String content) { SHORTCUT_ICON_TITLE_MAX_LEN) : content; } + /** + * 显示短时 Toast 提示 + */ private void showToast(int resId) { showToast(resId, Toast.LENGTH_SHORT); } + /** + * 显示指定时长的 Toast 提示 + */ private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + + // 统计当前便签字数(不含换行)并刷新到底部统计器;兼容清单模式 + private void refreshWordCount() { + if (mWordCount == null) { + return; + } + int count = 0; + if (mWorkingNote != null && mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + // 清单模式:累加各行文本字数 + for (int i = 0; i < mEditTextList.getChildCount(); i++) { + NoteEditText edit = (NoteEditText) mEditTextList.getChildAt(i) + .findViewById(R.id.et_edit_text); + count += edit.getText().toString().replace("\n", "").length(); + } + } else if (mNoteEditor != null) { + // 普通模式:直接统计编辑框文本字数 + count = mNoteEditor.getText().toString().replace("\n", "").length(); + } + mWordCount.setText(getString(R.string.note_word_count, count)); + } } diff --git a/src/net/micode/notes/ui/NotesListActivity.java b/src/net/micode/notes/ui/NotesListActivity.java index e843aecf..d2d95e58 100644 --- a/src/net/micode/notes/ui/NotesListActivity.java +++ b/src/net/micode/notes/ui/NotesListActivity.java @@ -78,77 +78,71 @@ import java.io.InputStreamReader; import java.util.HashSet; +// 主列表页:笔记/文件夹展示、导航、新建、批量删除/移动、搜索、同步入口 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { - private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; + // 两类异步查询 token,用于回调分派 + private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; // 查询文件夹下的笔记/子夹 + private static final int FOLDER_LIST_QUERY_TOKEN = 1; // 查询可移动到的目标文件夹 - private static final int FOLDER_LIST_QUERY_TOKEN = 1; - - private static final int MENU_FOLDER_DELETE = 0; - - private static final int MENU_FOLDER_VIEW = 1; - - private static final int MENU_FOLDER_CHANGE_NAME = 2; + // 文件夹长按上下文菜单项 + private static final int MENU_FOLDER_DELETE = 0; // 删除文件夹 + private static final int MENU_FOLDER_VIEW = 1; // 进入文件夹 + private static final int MENU_FOLDER_CHANGE_NAME = 2; // 重命名文件夹 + // “是否已插入介绍笔记”的偏好键名 private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; + // 列表三种显示状态 private enum ListEditState { NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER }; - private ListEditState mState; - - private BackgroundQueryHandler mBackgroundQueryHandler; - - private NotesListAdapter mNotesListAdapter; - - private ListView mNotesListView; - - private Button mAddNewNote; - - private boolean mDispatch; - - private int mOriginY; - - private int mDispatchY; - - private TextView mTitleBar; - - private long mCurrentFolderId; - - private ContentResolver mContentResolver; - - private ModeCallback mModeCallBack; + private ListEditState mState; // 当前状态 + private BackgroundQueryHandler mBackgroundQueryHandler; // 异步查询器 + private NotesListAdapter mNotesListAdapter; // 列表适配器 + private ListView mNotesListView; // 主列表控件 + private Button mAddNewNote; // 右下角“新建笔记”浮动按钮 + private boolean mDispatch; // 触摸是否需要透传给 ListView + private int mOriginY; // 透传起始 Y + private int mDispatchY; // 透传计算后 Y + private TextView mTitleBar; // 子文件夹顶部标题栏 + private long mCurrentFolderId; // 当前文件夹 id + private ContentResolver mContentResolver; // 内容解析器 + private ModeCallback mModeCallBack; // 多选模式回调 private static final String TAG = "NotesListActivity"; + public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; // 列表滚动速率 - public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; - - private NoteItemData mFocusNoteDataItem; + private NoteItemData mFocusNoteDataItem; // 当前长按聚焦的条目 + // 普通条件:仅显示当前文件夹下的条目 private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; + // 根目录条件:非系统的子条目,或“有内容的通话记录夹” private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>" + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR (" + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " + NoteColumns.NOTES_COUNT + ">0)"; - private final static int REQUEST_CODE_OPEN_NODE = 102; - private final static int REQUEST_CODE_NEW_NODE = 103; + // 从编辑页返回的两个请求码 + private final static int REQUEST_CODE_OPEN_NODE = 102; // 打开已有 + private final static int REQUEST_CODE_NEW_NODE = 103; // 新建 @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.note_list); - initResources(); + setContentView(R.layout.note_list); // 加载列表布局 + initResources(); // 初始化控件/适配器/监听 /** - * Insert an introduction when user firstly use this application + * 首次使用时插入一条介绍笔记 */ setAppInfoFromRawRes(); } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + // 编辑页新建/修改成功返回时重置游标刷新列表(新笔记置顶) if (resultCode == RESULT_OK && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) { mNotesListAdapter.changeCursor(null); @@ -157,19 +151,20 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } } + // 首次运行读取 res/raw/introduction 并保存为一条介绍笔记,成功置位偏好标记避免重复 private void setAppInfoFromRawRes() { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { StringBuilder sb = new StringBuilder(); InputStream in = null; try { - in = getResources().openRawResource(R.raw.introduction); + in = getResources().openRawResource(R.raw.introduction); // 打开对应语言介绍文件 if (in != null) { InputStreamReader isr = new InputStreamReader(in); BufferedReader br = new BufferedReader(isr); char [] buf = new char[1024]; int len = 0; - while ((len = br.read(buf)) > 0) { + while ((len = br.read(buf)) > 0) { // 读入全部内容 sb.append(buf, 0, len); } } else { @@ -190,6 +185,7 @@ private void setAppInfoFromRawRes() { } } + // 以根文件夹、无小部件、红色背景创建并保存 WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER, AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE, ResourceParser.RED); @@ -206,40 +202,44 @@ private void setAppInfoFromRawRes() { @Override protected void onStart() { super.onStart(); - startAsyncNotesListQuery(); + startAsyncNotesListQuery(); // 进前台重新查询当前文件夹 } + // 集中初始化:控件、ListView 页脚/点击/长按监听、适配器、新建按钮点击与触摸透传 private void initResources() { mContentResolver = this.getContentResolver(); mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); - mCurrentFolderId = Notes.ID_ROOT_FOLDER; + mCurrentFolderId = Notes.ID_ROOT_FOLDER; // 默认根文件夹 mNotesListView = (ListView) findViewById(R.id.notes_list); mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), - null, false); - mNotesListView.setOnItemClickListener(new OnListItemClickListener()); - mNotesListView.setOnItemLongClickListener(this); + null, false); // 页脚占位视图 + mNotesListView.setOnItemClickListener(new OnListItemClickListener()); // 条目点击 + mNotesListView.setOnItemLongClickListener(this); // 条目长按 mNotesListAdapter = new NotesListAdapter(this); mNotesListView.setAdapter(mNotesListAdapter); mAddNewNote = (Button) findViewById(R.id.btn_new_note); - mAddNewNote.setOnClickListener(this); - mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); + mAddNewNote.setOnClickListener(this); // 新建笔记 + mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); // 透明区触摸透传 mDispatch = false; mDispatchY = 0; mOriginY = 0; - mTitleBar = (TextView) findViewById(R.id.tv_title_bar); - mState = ListEditState.NOTE_LIST; - mModeCallBack = new ModeCallback(); + mTitleBar = (TextView) findViewById(R.id.tv_title_bar); // 子夹标题栏 + mState = ListEditState.NOTE_LIST; // 初始根列表 + mModeCallBack = new ModeCallback(); // 多选回调 } + // 多选模式回调:管理选择状态、删除/移动菜单、底部全选下拉菜单 private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { - private DropdownMenu mDropDownMenu; - private ActionMode mActionMode; - private MenuItem mMoveMenu; + private DropdownMenu mDropDownMenu; // 底部“已选N项/全选”下拉 + private ActionMode mActionMode; // 当前 ActionMode + private MenuItem mMoveMenu; // “移动”菜单项 + // 进入多选:加载删除/移动菜单、隐藏新建按钮、开启选择模式、绑定底部下拉 public boolean onCreateActionMode(ActionMode mode, Menu menu) { getMenuInflater().inflate(R.menu.note_list_options, menu); menu.findItem(R.id.delete).setOnMenuItemClickListener(this); mMoveMenu = menu.findItem(R.id.move); + // 通话记录夹内或无用户文件夹时隐藏“移动” if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER || DataUtils.getUserFolderCount(mContentResolver) == 0) { mMoveMenu.setVisible(false); @@ -248,16 +248,18 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) { mMoveMenu.setOnMenuItemClickListener(this); } mActionMode = mode; - mNotesListAdapter.setChoiceMode(true); - mNotesListView.setLongClickable(false); - mAddNewNote.setVisibility(View.GONE); + mNotesListAdapter.setChoiceMode(true); // 适配器进入选择模式 + mNotesListView.setLongClickable(false); // 关闭长按 + mAddNewNote.setVisibility(View.GONE); // 隐藏新建按钮 + // 自定义 ActionMode 视图并绑定下拉选择菜单 View customView = LayoutInflater.from(NotesListActivity.this).inflate( R.layout.note_list_dropdown_menu, null); mode.setCustomView(customView); mDropDownMenu = new DropdownMenu(NotesListActivity.this, (Button) customView.findViewById(R.id.selection_menu), R.menu.note_list_dropdown); + // 下拉项点击 -> 切换全选/取消全选 mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){ public boolean onMenuItemClick(MenuItem item) { mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected()); @@ -269,6 +271,7 @@ public boolean onMenuItemClick(MenuItem item) { return true; } + // 依据已选数量更新下拉标题与“全选/取消全选”状态 private void updateMenu() { int selectedCount = mNotesListAdapter.getSelectedCount(); // Update dropdown menu @@ -296,22 +299,26 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) { return false; } + // 退出多选:恢复非选择状态、重新允许长按、显示新建按钮 public void onDestroyActionMode(ActionMode mode) { mNotesListAdapter.setChoiceMode(false); mNotesListView.setLongClickable(true); mAddNewNote.setVisibility(View.VISIBLE); } + // 主动结束多选(删除/移动完成后) public void finishActionMode() { mActionMode.finish(); } + // 勾选状态变化 -> 同步适配器并刷新计数 public void onItemCheckedStateChanged(ActionMode mode, int position, long id, - boolean checked) { + boolean checked) { mNotesListAdapter.setCheckedItem(position, checked); updateMenu(); } + // 处理删除/移动点击:无选中提示;删除走确认框;移动查询目标文件夹 public boolean onMenuItemClick(MenuItem item) { if (mNotesListAdapter.getSelectedCount() == 0) { Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none), @@ -319,33 +326,40 @@ public boolean onMenuItemClick(MenuItem item) { return true; } - switch (item.getItemId()) { - case R.id.delete: - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - batchDelete(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.move: - startQueryDestinationFolders(); - break; - default: - return false; + int itemId = item.getItemId(); + if (itemId == R.id.delete) { + // 批量删除前确认 + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_notes, + mNotesListAdapter.getSelectedCount())); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + batchDelete(); + } + }); + // 修复:点“取消”时一并退出多选模式,使底部删除(垃圾桶)按钮随之消失 + builder.setNegativeButton(android.R.string.cancel, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + mModeCallBack.finishActionMode(); + } + }); + builder.show(); + } else if (itemId == R.id.move) { + startQueryDestinationFolders(); // 查询目标文件夹并弹选择框 + } else { + return false; } return true; } } + // “新建笔记”按钮触摸监听:把按钮不规则(透明)区域的触摸事件透传给下层 ListView private class NewNoteOnTouchListener implements OnTouchListener { public boolean onTouch(View v, MotionEvent event) { @@ -354,10 +368,11 @@ public boolean onTouch(View v, MotionEvent event) { Display display = getWindowManager().getDefaultDisplay(); int screenHeight = display.getHeight(); int newNoteViewHeight = mAddNewNote.getHeight(); - int start = screenHeight - newNoteViewHeight; + int start = screenHeight - newNoteViewHeight; // 按钮屏幕起始 Y int eventY = start + (int) event.getY(); /** * Minus TitleBar's height + * 子文件夹状态顶部有标题栏,需要偏移 */ if (mState == ListEditState.SUB_FOLDER) { eventY -= mTitleBar.getHeight(); @@ -371,6 +386,7 @@ public boolean onTouch(View v, MotionEvent event) { * Note" button. The 94 represents maximum height of the transparent part. * Notice that, if the background of the button changes, the formula should * also change. This is very bad, just for the UI designer's strong requirement. + * 注:用直线方程判定触点是否落在按钮透明区,是则转发给下方 ListView */ if (event.getY() < (event.getX() * (-0.12) + 94)) { View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1 @@ -387,6 +403,7 @@ public boolean onTouch(View v, MotionEvent event) { break; } case MotionEvent.ACTION_MOVE: { + // 透传期间随手指移动换算 ListView 滚动坐标 if (mDispatch) { mDispatchY += (int) event.getY() - mOriginY; event.setLocation(event.getX(), mDispatchY); @@ -395,6 +412,7 @@ public boolean onTouch(View v, MotionEvent event) { break; } default: { + // 抬手等事件,结束透传交给 ListView if (mDispatch) { event.setLocation(event.getX(), mDispatchY); mDispatch = false; @@ -408,15 +426,17 @@ public boolean onTouch(View v, MotionEvent event) { }; + // 发起当前文件夹异步查询:根目录用 ROOT_FOLDER_SELECTION,否则普通条件;按类型+修改时间倒序 private void startAsyncNotesListQuery() { String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) + String.valueOf(mCurrentFolderId) }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } + // 异步查询处理器:按 token 将游标分派给列表刷新或文件夹选择弹窗 private final class BackgroundQueryHandler extends AsyncQueryHandler { public BackgroundQueryHandler(ContentResolver contentResolver) { super(contentResolver); @@ -426,11 +446,11 @@ public BackgroundQueryHandler(ContentResolver contentResolver) { protected void onQueryComplete(int token, Object cookie, Cursor cursor) { switch (token) { case FOLDER_NOTE_LIST_QUERY_TOKEN: - mNotesListAdapter.changeCursor(cursor); + mNotesListAdapter.changeCursor(cursor); // 刷新主列表 break; case FOLDER_LIST_QUERY_TOKEN: if (cursor != null && cursor.getCount() > 0) { - showFolderListMenu(cursor); + showFolderListMenu(cursor); // 弹出目标文件夹选择 } else { Log.e(TAG, "Query folder failed"); } @@ -441,6 +461,7 @@ protected void onQueryComplete(int token, Object cookie, Cursor cursor) { } } + // 用文件夹游标构建“选择目标文件夹”对话框,确认后批量移动并退出多选 private void showFolderListMenu(Cursor cursor) { AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); builder.setTitle(R.string.menu_title_select_folder); @@ -456,12 +477,13 @@ public void onClick(DialogInterface dialog, int which) { mNotesListAdapter.getSelectedCount(), adapter.getFolderName(NotesListActivity.this, which)), Toast.LENGTH_SHORT).show(); - mModeCallBack.finishActionMode(); + mModeCallBack.finishActionMode(); // 移动后退出多选 } }); builder.show(); } + // 新建笔记:ACTION_INSERT_OR_EDIT + 当前文件夹 id private void createNewNote() { Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_INSERT_OR_EDIT); @@ -469,10 +491,11 @@ private void createNewNote() { this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); } + // 批量删除:后台执行,同步模式入回收站、否则直接删;完成后刷新小部件并退出多选 private void batchDelete() { new AsyncTask>() { protected HashSet doInBackground(Void... unused) { - HashSet widgets = mNotesListAdapter.getSelectedWidget(); + HashSet widgets = mNotesListAdapter.getSelectedWidget(); // 收集关联小部件 if (!isSyncMode()) { // if not synced, delete notes directly if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter @@ -481,8 +504,8 @@ protected HashSet doInBackground(Void... unused) { Log.e(TAG, "Delete notes error, should not happens"); } } else { - // in sync mode, we'll move the deleted note into the trash - // folder + // in sync mode, we'll move the deleted note into the trash folder + // 同步模式先移入回收站 if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); @@ -493,6 +516,7 @@ protected HashSet doInBackground(Void... unused) { @Override protected void onPostExecute(HashSet widgets) { + // 主线程刷新被删笔记绑定的桌面小部件 if (widgets != null) { for (AppWidgetAttribute widget : widgets) { if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID @@ -506,10 +530,11 @@ protected void onPostExecute(HashSet widgets) { }.execute(); } + // 删除单个文件夹:同步模式入回收站否则直删;并刷新夹内笔记绑定的小部件 private void deleteFolder(long folderId) { if (folderId == Notes.ID_ROOT_FOLDER) { Log.e(TAG, "Wrong folder id, should not happen " + folderId); - return; + return; // 根文件夹不可删 } HashSet ids = new HashSet(); @@ -533,6 +558,7 @@ private void deleteFolder(long folderId) { } } + // 打开一条笔记:ACTION_VIEW + 笔记 id private void openNode(NoteItemData data) { Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); @@ -540,33 +566,32 @@ private void openNode(NoteItemData data) { this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); } + // 进入文件夹:切换 id、重新查询、更新状态与标题栏(通话夹隐藏新建按钮) private void openFolder(NoteItemData data) { mCurrentFolderId = data.getId(); startAsyncNotesListQuery(); if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { mState = ListEditState.CALL_RECORD_FOLDER; - mAddNewNote.setVisibility(View.GONE); + mAddNewNote.setVisibility(View.GONE); // 通话夹不支持手动新建 } else { mState = ListEditState.SUB_FOLDER; } if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { mTitleBar.setText(R.string.call_record_folder_name); } else { - mTitleBar.setText(data.getSnippet()); + mTitleBar.setText(data.getSnippet()); // 子夹标题即名称 } mTitleBar.setVisibility(View.VISIBLE); } + // 通用点击:仅处理“新建笔记”按钮 public void onClick(View v) { - switch (v.getId()) { - case R.id.btn_new_note: - createNewNote(); - break; - default: - break; + if (v.getId() == R.id.btn_new_note) { + createNewNote(); } } + // 强制显示软键盘(用于文件夹命名框) private void showSoftInput() { InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); if (inputMethodManager != null) { @@ -574,17 +599,20 @@ private void showSoftInput() { } } + // 隐藏指定视图的软键盘 private void hideSoftInput(View view) { InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); } + // 新建(create=true)/重命名(create=false)文件夹对话框:含重名检查、空名禁用确定 private void showCreateOrModifyFolderDialog(final boolean create) { final AlertDialog.Builder builder = new AlertDialog.Builder(this); View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); showSoftInput(); if (!create) { + // 修改:预填当前文件夹名 if (mFocusNoteDataItem != null) { etName.setText(mFocusNoteDataItem.getSnippet()); builder.setTitle(getString(R.string.menu_folder_change_name)); @@ -593,6 +621,7 @@ private void showCreateOrModifyFolderDialog(final boolean create) { return; } } else { + // 新建:清空 etName.setText(""); builder.setTitle(this.getString(R.string.menu_create_folder)); } @@ -606,17 +635,20 @@ public void onClick(DialogInterface dialog, int which) { final Dialog dialog = builder.setView(view).show(); final Button positive = (Button)dialog.findViewById(android.R.id.button1); + // 接管“确定”点击:重名/空名时不关闭,正常时更新或插入文件夹 positive.setOnClickListener(new OnClickListener() { public void onClick(View v) { hideSoftInput(etName); String name = etName.getText().toString(); if (DataUtils.checkVisibleFolderName(mContentResolver, name)) { + // 同名文件夹已存在,提示并让用户重编 Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name), Toast.LENGTH_LONG).show(); etName.setSelection(0, etName.length()); return; } if (!create) { + // 重命名:更新 SNIPPET/TYPE/LOCAL_MODIFIED if (!TextUtils.isEmpty(name)) { ContentValues values = new ContentValues(); values.put(NoteColumns.SNIPPET, name); @@ -624,10 +656,11 @@ public void onClick(View v) { values.put(NoteColumns.LOCAL_MODIFIED, 1); mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID + "=?", new String[] { - String.valueOf(mFocusNoteDataItem.getId()) + String.valueOf(mFocusNoteDataItem.getId()) }); } } else if (!TextUtils.isEmpty(name)) { + // 新建:插入 TYPE_FOLDER 记录 ContentValues values = new ContentValues(); values.put(NoteColumns.SNIPPET, name); values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); @@ -642,6 +675,7 @@ public void onClick(View v) { } /** * When the name edit text is null, disable the positive button + * 输入为空时禁用确定按钮,随文本实时切换 */ etName.addTextChangedListener(new TextWatcher() { public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -666,6 +700,7 @@ public void afterTextChanged(Editable s) { @Override public void onBackPressed() { + // 逐级返回:子夹/通话夹回根列表;根列表才真正退出 switch (mState) { case SUB_FOLDER: mCurrentFolderId = Notes.ID_ROOT_FOLDER; @@ -676,7 +711,7 @@ public void onBackPressed() { case CALL_RECORD_FOLDER: mCurrentFolderId = Notes.ID_ROOT_FOLDER; mState = ListEditState.NOTE_LIST; - mAddNewNote.setVisibility(View.VISIBLE); + mAddNewNote.setVisibility(View.VISIBLE); // 恢复新建按钮 mTitleBar.setVisibility(View.GONE); startAsyncNotesListQuery(); break; @@ -688,6 +723,7 @@ public void onBackPressed() { } } + // 发送 APPWIDGET_UPDATE 广播刷新指定 id/类型的小部件 private void updateWidget(int appWidgetId, int appWidgetType) { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (appWidgetType == Notes.TYPE_WIDGET_2X) { @@ -700,13 +736,14 @@ private void updateWidget(int appWidgetId, int appWidgetType) { } intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - appWidgetId + appWidgetId }); sendBroadcast(intent); setResult(RESULT_OK, intent); } + // 文件夹长按时构建上下文菜单:查看/删除/重命名 private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { if (mFocusNoteDataItem != null) { @@ -720,6 +757,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn @Override public void onContextMenuClosed(Menu menu) { + // 关闭后移除监听,避免误触发 if (mNotesListView != null) { mNotesListView.setOnCreateContextMenuListener(null); } @@ -728,6 +766,7 @@ public void onContextMenuClosed(Menu menu) { @Override public boolean onContextItemSelected(MenuItem item) { + // 处理文件夹上下文菜单三种选择 if (mFocusNoteDataItem == null) { Log.e(TAG, "The long click data item is null"); return false; @@ -737,6 +776,7 @@ public boolean onContextItemSelected(MenuItem item) { openFolder(mFocusNoteDataItem); break; case MENU_FOLDER_DELETE: + // 删除文件夹前二次确认 AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.alert_title_delete)); builder.setIcon(android.R.drawable.ic_dialog_alert); @@ -762,6 +802,7 @@ public void onClick(DialogInterface dialog, int which) { @Override public boolean onPrepareOptionsMenu(Menu menu) { + // 依状态加载不同菜单;根列表还按同步状态切换“同步/取消同步”文案 menu.clear(); if (mState == ListEditState.NOTE_LIST) { getMenuInflater().inflate(R.menu.note_list, menu); @@ -780,50 +821,42 @@ public boolean onPrepareOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_folder: { - showCreateOrModifyFolderDialog(true); - break; - } - case R.id.menu_export_text: { - exportNoteToText(); - break; - } - case R.id.menu_sync: { - if (isSyncMode()) { - if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { - GTaskSyncService.startSync(this); - } else { - GTaskSyncService.cancelSync(this); - } + // 顶部菜单分派:新建文件夹/导出/同步/设置/新建笔记/搜索 + int itemId = item.getItemId(); + if (itemId == R.id.menu_new_folder) { + showCreateOrModifyFolderDialog(true); + } else if (itemId == R.id.menu_export_text) { + exportNoteToText(); + } else if (itemId == R.id.menu_sync) { + if (isSyncMode()) { + // 已配置账号:在同步/取消同步间切换 + if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { + GTaskSyncService.startSync(this); } else { - startPreferenceActivity(); + GTaskSyncService.cancelSync(this); } - break; - } - case R.id.menu_setting: { + } else { + // 未配置跳设置页 startPreferenceActivity(); - break; - } - case R.id.menu_new_note: { - createNewNote(); - break; } - case R.id.menu_search: - onSearchRequested(); - break; - default: - break; + } else if (itemId == R.id.menu_setting) { + startPreferenceActivity(); + } else if (itemId == R.id.menu_new_note) { + createNewNote(); + } else if (itemId == R.id.menu_search) { + onSearchRequested(); } return true; } @Override public boolean onSearchRequested() { + // 触发系统搜索(默认目标 NoteEditActivity) startSearch(null, false, null /* appData */, false); return true; } + // 后台导出全部笔记为文本,按结果码弹出失败/成功提示 private void exportNoteToText() { final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); new AsyncTask() { @@ -835,6 +868,7 @@ protected Integer doInBackground(Void... unused) { @Override protected void onPostExecute(Integer result) { + // 依结果码提示(未挂载/成功/系统错误) if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) { AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); builder.setTitle(NotesListActivity.this @@ -866,22 +900,26 @@ protected void onPostExecute(Integer result) { }.execute(); } + // 是否同步模式:配置了同步账号即为真 private boolean isSyncMode() { return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; } + // 启动偏好设置页(有父 Activity 则从父级启动) private void startPreferenceActivity() { Activity from = getParent() != null ? getParent() : this; Intent intent = new Intent(from, NotesPreferenceActivity.class); from.startActivityIfNeeded(intent, -1); } + // 条目点击:多选模式切换勾选;普通模式按状态进入文件夹或打开笔记 private class OnListItemClickListener implements OnItemClickListener { public void onItemClick(AdapterView parent, View view, int position, long id) { if (view instanceof NotesListItem) { NoteItemData item = ((NotesListItem) view).getItemData(); if (mNotesListAdapter.isInChoiceMode()) { + // 多选:仅笔记条目可勾选 if (item.getType() == Notes.TYPE_NOTE) { position = position - mNotesListView.getHeaderViewsCount(); mModeCallBack.onItemCheckedStateChanged(null, position, id, @@ -890,13 +928,14 @@ public void onItemClick(AdapterView parent, View view, int position, long id) return; } + // 普通模式:按当前状态处理文件夹/系统/笔记 switch (mState) { case NOTE_LIST: if (item.getType() == Notes.TYPE_FOLDER || item.getType() == Notes.TYPE_SYSTEM) { - openFolder(item); + openFolder(item); // 文件夹/系统夹 -> 进入 } else if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); + openNode(item); // 笔记 -> 打开编辑 } else { Log.e(TAG, "Wrong note type in NOTE_LIST"); } @@ -904,7 +943,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) case SUB_FOLDER: case CALL_RECORD_FOLDER: if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); + openNode(item); // 子夹/通话夹内只会是笔记 } else { Log.e(TAG, "Wrong note type in SUB_FOLDER"); } @@ -917,10 +956,11 @@ public void onItemClick(AdapterView parent, View view, int position, long id) } + // 查询可作为移动目标的文件夹:排除回收站与当前夹;非根列表额外包含根夹 private void startQueryDestinationFolders() { String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?"; selection = (mState == ListEditState.NOTE_LIST) ? selection: - "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; + "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN, null, @@ -935,6 +975,7 @@ private void startQueryDestinationFolders() { NoteColumns.MODIFIED_DATE + " DESC"); } + // 条目长按:笔记长按进多选并震动;文件夹长按挂上下文菜单监听 public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { if (view instanceof NotesListItem) { mFocusNoteDataItem = ((NotesListItem) view).getItemData(); @@ -951,4 +992,4 @@ public boolean onItemLongClick(AdapterView parent, View view, int position, l } return false; } -} +} \ No newline at end of file diff --git a/src/net/micode/notes/ui/NotesListAdapter.java b/src/net/micode/notes/ui/NotesListAdapter.java index 51c9cb98..2b425d87 100644 --- a/src/net/micode/notes/ui/NotesListAdapter.java +++ b/src/net/micode/notes/ui/NotesListAdapter.java @@ -31,30 +31,34 @@ import java.util.Iterator; +// 主列表适配器:继承 CursorAdapter,将游标每一行渲染为 NotesListItem,并维护多选状态 public class NotesListAdapter extends CursorAdapter { private static final String TAG = "NotesListAdapter"; private Context mContext; - private HashMap mSelectedIndex; - private int mNotesCount; - private boolean mChoiceMode; + private HashMap mSelectedIndex; // position -> 是否被勾选 + private int mNotesCount; // 当前游标中“笔记”类型条目总数(用于全选判断) + private boolean mChoiceMode; // 是否处于多选模式 + // 用于向 Activity 回传被选笔记所绑定的桌面小部件信息 public static class AppWidgetAttribute { public int widgetId; public int widgetType; }; public NotesListAdapter(Context context) { - super(context, null); + super(context, null); // 游标初始为 null,后续 changeCursor 提供 mSelectedIndex = new HashMap(); mContext = context; mNotesCount = 0; } + // 创建一行视图:每行都是自定义的 NotesListItem @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { return new NotesListItem(context); } + // 绑定数据:用当前游标行构造 NoteItemData,交由 NotesListItem 渲染,并带上选择模式/勾选状态 @Override public void bindView(View view, Context context, Cursor cursor) { if (view instanceof NotesListItem) { @@ -64,20 +68,24 @@ public void bindView(View view, Context context, Cursor cursor) { } } + // 记录/更新某个 position 的勾选状态并刷新列表 public void setCheckedItem(final int position, final boolean checked) { mSelectedIndex.put(position, checked); notifyDataSetChanged(); } + // 是否处于多选模式 public boolean isInChoiceMode() { return mChoiceMode; } + // 进入/退出多选模式:进入前清空历史勾选 public void setChoiceMode(boolean mode) { mSelectedIndex.clear(); mChoiceMode = mode; } + // 全选/取消全选:仅对“笔记”类型条目生效(文件夹不参与勾选) public void selectAll(boolean checked) { Cursor cursor = getCursor(); for (int i = 0; i < getCount(); i++) { @@ -89,6 +97,7 @@ public void selectAll(boolean checked) { } } + // 收集所有被勾选条目对应的笔记 id(过滤掉异常的根文件夹 id) public HashSet getSelectedItemIds() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { @@ -105,6 +114,7 @@ public HashSet getSelectedItemIds() { return itemSet; } + // 收集所有被勾选笔记所绑定的桌面小部件(id+类型),供删除后刷新 public HashSet getSelectedWidget() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { @@ -118,6 +128,7 @@ public HashSet getSelectedWidget() { itemSet.add(widget); /** * Don't close cursor here, only the adapter could close it + * 游标由适配器统一管理,此处不能关闭 */ } else { Log.e(TAG, "Invalid cursor"); @@ -128,6 +139,7 @@ public HashSet getSelectedWidget() { return itemSet; } + // 统计被勾选(值为 true)的条目数量 public int getSelectedCount() { Collection values = mSelectedIndex.values(); if (null == values) { @@ -143,11 +155,13 @@ public int getSelectedCount() { return count; } + // 是否“全选”:有勾选且勾选数等于笔记总数 public boolean isAllSelected() { int checkedCount = getSelectedCount(); return (checkedCount != 0 && checkedCount == mNotesCount); } + // 查询某 position 是否被勾选(无记录视为未选) public boolean isSelectedItem(final int position) { if (null == mSelectedIndex.get(position)) { return false; @@ -157,16 +171,19 @@ public boolean isSelectedItem(final int position) { @Override protected void onContentChanged() { + // 数据集内容变化后重新计算笔记总数 super.onContentChanged(); calcNotesCount(); } @Override public void changeCursor(Cursor cursor) { + // 更换游标后重新计算笔记总数 super.changeCursor(cursor); calcNotesCount(); } + // 遍历当前数据,统计 TYPE_NOTE 条目数量,缓存到 mNotesCount private void calcNotesCount() { mNotesCount = 0; for (int i = 0; i < getCount(); i++) { diff --git a/src/net/micode/notes/ui/NotesListItem.java b/src/net/micode/notes/ui/NotesListItem.java index 1221e808..f572dfb9 100644 --- a/src/net/micode/notes/ui/NotesListItem.java +++ b/src/net/micode/notes/ui/NotesListItem.java @@ -30,17 +30,18 @@ import net.micode.notes.tool.ResourceParser.NoteItemBgResources; +// 列表单行视图:自定义 LinearLayout,加载 note_item 布局,负责一行的展示与背景渲染 public class NotesListItem extends LinearLayout { - private ImageView mAlert; - private TextView mTitle; - private TextView mTime; - private TextView mCallName; - private NoteItemData mItemData; - private CheckBox mCheckBox; + private ImageView mAlert; // 提醒/通话记录图标 + private TextView mTitle; // 标题(笔记摘要或文件夹名+计数) + private TextView mTime; // 相对修改时间 + private TextView mCallName; // 通话记录笔记的联系人姓名 + private NoteItemData mItemData; // 当前行数据(供 Activity 取回) + private CheckBox mCheckBox; // 多选模式的勾选框 public NotesListItem(Context context) { super(context); - inflate(context, R.layout.note_item, this); + inflate(context, R.layout.note_item, this); // 加载单行布局 mAlert = (ImageView) findViewById(R.id.iv_alert_icon); mTitle = (TextView) findViewById(R.id.tv_title); mTime = (TextView) findViewById(R.id.tv_time); @@ -48,7 +49,9 @@ public NotesListItem(Context context) { mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); } + // 核心绑定方法:依据是否多选、条目类型、父级归属来配置各控件 public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { + // 仅多选模式且为笔记条目才显示勾选框 if (choiceMode && data.getType() == Notes.TYPE_NOTE) { mCheckBox.setVisibility(View.VISIBLE); mCheckBox.setChecked(checked); @@ -58,33 +61,38 @@ public void bind(Context context, NoteItemData data, boolean choiceMode, boolean mItemData = data; if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { + // 情况一:这就是“通话记录夹”本身 mCallName.setVisibility(View.GONE); mAlert.setVisibility(View.VISIBLE); mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); mTitle.setText(context.getString(R.string.call_record_folder_name) + context.getString(R.string.format_folder_files_count, data.getNotesCount())); - mAlert.setImageResource(R.drawable.call_record); + mAlert.setImageResource(R.drawable.call_record); // 使用通话记录图标 } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) { + // 情况二:通话记录夹内的某条通话笔记,显示来电姓名作为主标题 mCallName.setVisibility(View.VISIBLE); mCallName.setText(data.getCallName()); mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem); mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock); + mAlert.setImageResource(R.drawable.clock); // 有时钟提醒 mAlert.setVisibility(View.VISIBLE); } else { mAlert.setVisibility(View.GONE); } } else { + // 情况三:普通文件夹或普通笔记 mCallName.setVisibility(View.GONE); mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); if (data.getType() == Notes.TYPE_FOLDER) { + // 文件夹:标题为“名称 + 文件数”,无提醒图标 mTitle.setText(data.getSnippet() + context.getString(R.string.format_folder_files_count, data.getNotesCount())); mAlert.setVisibility(View.GONE); } else { + // 笔记:标题为摘要,必要时显示时钟提醒图标 mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); if (data.hasAlert()) { mAlert.setImageResource(R.drawable.clock); @@ -94,28 +102,31 @@ public void bind(Context context, NoteItemData data, boolean choiceMode, boolean } } } + // 统一显示相对时间(如“5 分钟前”) mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); - setBackground(data); + setBackground(data); // 依据类型/颜色/列表位置选择背景图 } + // 背景选择:笔记依据在列表中的位置(单条/首/尾/中)选不同九宫格;文件夹用统一背景 private void setBackground(NoteItemData data) { - int id = data.getBgColorId(); + int id = data.getBgColorId(); // 笔记颜色(红/黄/蓝/绿/白) if (data.getType() == Notes.TYPE_NOTE) { if (data.isSingle() || data.isOneFollowingFolder()) { - setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); + setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); // 独立一条 } else if (data.isLast()) { - setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id)); + setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id)); // 末尾 } else if (data.isFirst() || data.isMultiFollowingFolder()) { - setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id)); + setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id)); // 首条 } else { - setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); + setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); // 中间 } } else { - setBackgroundResource(NoteItemBgResources.getFolderBgRes()); + setBackgroundResource(NoteItemBgResources.getFolderBgRes()); // 文件夹背景 } } + // 供 Activity 在点击/长按时取回该行数据 public NoteItemData getItemData() { return mItemData; } diff --git a/src/net/micode/notes/ui/NotesPreferenceActivity.java b/src/net/micode/notes/ui/NotesPreferenceActivity.java index 07c5f7ec..e760f882 100644 --- a/src/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/src/net/micode/notes/ui/NotesPreferenceActivity.java @@ -16,6 +16,7 @@ package net.micode.notes.ui; +import android.annotation.SuppressLint; import android.accounts.Account; import android.accounts.AccountManager; import android.app.ActionBar; @@ -27,6 +28,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; +import android.os.Build; import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; @@ -81,13 +83,23 @@ protected void onCreate(Bundle icicle) { mReceiver = new GTaskReceiver(); IntentFilter filter = new IntentFilter(); filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); - registerReceiver(mReceiver, filter); + registerSyncReceiver(filter); mOriAccounts = null; View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); getListView().addHeaderView(header, null, true); } + @SuppressLint("UnspecifiedRegisterReceiverFlag") + private void registerSyncReceiver(IntentFilter filter) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + registerReceiver(mReceiver, filter, Context.RECEIVER_NOT_EXPORTED); + } else { + // Receiver flags are unavailable before API 33; this receiver is app-local by action. + registerReceiver(mReceiver, filter); + } + } + @Override protected void onResume() { super.onResume(); diff --git a/src/net/micode/notes/widget/NoteWidgetProvider.java b/src/net/micode/notes/widget/NoteWidgetProvider.java index ec6f8193..0cfd7ffb 100644 --- a/src/net/micode/notes/widget/NoteWidgetProvider.java +++ b/src/net/micode/notes/widget/NoteWidgetProvider.java @@ -32,6 +32,11 @@ import net.micode.notes.ui.NoteEditActivity; import net.micode.notes.ui.NotesListActivity; +/** + * B 阶段一阅读标注 胡嘉豪 202430224010 + * 两种桌面小组件共用的更新骨架:读取便签、绑定 RemoteViews 和点击行为。 + * 子类提供尺寸对应的布局、背景和类型;本包没有独立的小组件 Service。 + */ public abstract class NoteWidgetProvider extends AppWidgetProvider { public static final String [] PROJECTION = new String [] { NoteColumns.ID, @@ -47,6 +52,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { @Override public void onDeleted(Context context, int[] appWidgetIds) { + // B 阅读标注:删除桌面组件时解除数据库中的绑定,不删除便签内容。 ContentValues values = new ContentValues(); values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); for (int i = 0; i < appWidgetIds.length; i++) { @@ -58,6 +64,7 @@ public void onDeleted(Context context, int[] appWidgetIds) { } private Cursor getNoteWidgetInfo(Context context, int widgetId) { + // B 阅读标注:排除回收站便签;返回的 Cursor 由 update 方法负责关闭。 return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, PROJECTION, NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", @@ -71,6 +78,7 @@ protected void update(Context context, AppWidgetManager appWidgetManager, int[] private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, boolean privacyMode) { + // B 阅读标注:广播回调中逐个刷新组件;数据库查询当前在回调线程执行。 for (int i = 0; i < appWidgetIds.length; i++) { if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { int bgId = ResourceParser.getDefaultBgId(context); @@ -83,6 +91,7 @@ private void update(Context context, AppWidgetManager appWidgetManager, int[] ap Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]); if (c != null && c.moveToFirst()) { if (c.getCount() > 1) { + // B 阅读标注:这里的 return 会终止整批刷新,后续组件也不会更新。 Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]); c.close(); return; @@ -92,6 +101,7 @@ private void update(Context context, AppWidgetManager appWidgetManager, int[] ap intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); intent.setAction(Intent.ACTION_VIEW); } else { + // B 阅读标注:未绑定或便签不可见时,点击组件进入新建便签流程。 snippet = context.getResources().getString(R.string.widget_havenot_content); intent.setAction(Intent.ACTION_INSERT_OR_EDIT); } @@ -101,6 +111,7 @@ private void update(Context context, AppWidgetManager appWidgetManager, int[] ap } RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); + // B 阅读标注:背景来自 ResourceParser 的颜色索引到资源 ID 的映射。 rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); /** @@ -108,14 +119,17 @@ private void update(Context context, AppWidgetManager appWidgetManager, int[] ap */ PendingIntent pendingIntent = null; if (privacyMode) { + // B 阅读标注:隐私分支隐藏摘要;当前公开 update 重载固定传入 false。 rv.setTextViewText(R.id.widget_text, context.getString(R.string.widget_under_visit_mode)); pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent( - context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); + context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT + | PendingIntent.FLAG_IMMUTABLE); } else { rv.setTextViewText(R.id.widget_text, snippet); + // B 阅读标注:以 widgetId 区分点击 PendingIntent,避免多个组件相互覆盖。 pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent); diff --git a/tests/quality/test_gtask_source_regressions.py b/tests/quality/test_gtask_source_regressions.py new file mode 100644 index 00000000..97a25d0c --- /dev/null +++ b/tests/quality/test_gtask_source_regressions.py @@ -0,0 +1,76 @@ +"""Source-level regression checks for the two member-C synchronization fixes. + +These checks intentionally avoid the Android toolchain so they remain fast, +deterministic regression gates alongside the full Gradle build and lint tasks. +""" + +from pathlib import Path +import re +import unittest + + +REPOSITORY_ROOT = Path(__file__).resolve().parents[2] + + +def read_source(relative_path): + return (REPOSITORY_ROOT / relative_path).read_text(encoding="utf-8") + + +class GTaskSourceRegressionTests(unittest.TestCase): + def test_service_checks_restart_intent_before_reading_extras(self): + source = read_source( + "src/net/micode/notes/gtask/remote/GTaskSyncService.java" + ) + method_start = source.index("public int onStartCommand") + method_end = source.index("public void onLowMemory", method_start) + method = source[method_start:method_end] + + null_guard = method.index("if (intent == null)") + extras_read = method.index("intent.getExtras()") + + self.assertLess(null_guard, extras_read) + self.assertIn("stopSelf(startId);", method) + self.assertIn("return START_NOT_STICKY;", method) + self.assertNotIn("return START_STICKY;", method) + + def test_invalidated_token_is_replaced_by_refreshed_token(self): + source = read_source("src/net/micode/notes/gtask/remote/GTaskClient.java") + method_start = source.index("private String loginGoogleAccount") + method_end = source.index("private boolean tryToLoginGtask", method_start) + method = source[method_start:method_end] + + refresh_branch = re.search( + r"if\s*\(invalidateToken\)\s*\{(?P.*?)\n\s*\}", + method, + re.DOTALL, + ) + + self.assertIsNotNone(refresh_branch) + self.assertIn( + "return loginGoogleAccount(activity, false);", + refresh_branch.group("body"), + ) + + def test_sync_notification_uses_supported_builder_and_channel(self): + source = read_source( + "src/net/micode/notes/gtask/remote/GTaskASyncTask.java" + ) + + self.assertNotIn("setLatestEventInfo", source) + self.assertIn("NotificationChannel", source) + self.assertIn("new Notification.Builder", source) + self.assertIn("PendingIntent.FLAG_IMMUTABLE", source) + + def test_sync_progress_broadcast_is_limited_to_this_application(self): + source = read_source( + "src/net/micode/notes/gtask/remote/GTaskSyncService.java" + ) + method_start = source.index("public void sendBroadcast(String msg)") + method_end = source.index("public static void startSync", method_start) + method = source[method_start:method_end] + + self.assertIn("intent.setPackage(getPackageName());", method) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/quality/test_repository_hygiene.py b/tests/quality/test_repository_hygiene.py new file mode 100644 index 00000000..f4d72c3c --- /dev/null +++ b/tests/quality/test_repository_hygiene.py @@ -0,0 +1,96 @@ +"""Toolchain-independent repository quality checks.""" + +from pathlib import Path +import re +import unittest +import xml.etree.ElementTree as ElementTree + + +REPOSITORY_ROOT = Path(__file__).resolve().parents[2] +ANDROID_NAMESPACE = "http://schemas.android.com/apk/res/android" +ANDROID_NAME = f"{{{ANDROID_NAMESPACE}}}name" +ANDROID_EXPORTED = f"{{{ANDROID_NAMESPACE}}}exported" + + +class RepositoryHygieneTests(unittest.TestCase): + def test_android_xml_files_are_well_formed(self): + xml_files = [REPOSITORY_ROOT / "AndroidManifest.xml"] + xml_files.extend(sorted((REPOSITORY_ROOT / "res").rglob("*.xml"))) + self.assertGreater(len(xml_files), 0) + + failures = [] + for xml_file in xml_files: + try: + ElementTree.parse(xml_file) + except ElementTree.ParseError as error: + failures.append(f"{xml_file.relative_to(REPOSITORY_ROOT)}: {error}") + + self.assertEqual([], failures, "\n".join(failures)) + + def test_manifest_components_with_intent_filters_declare_exported(self): + manifest = ElementTree.parse(REPOSITORY_ROOT / "AndroidManifest.xml") + expected = { + ".ui.NotesListActivity": "true", + ".ui.NoteEditActivity": "true", + ".widget.NoteWidgetProvider_2x": "false", + ".widget.NoteWidgetProvider_4x": "false", + ".ui.AlarmInitReceiver": "false", + } + + actual = {} + for tag in ("activity", "receiver", "service"): + for component in manifest.findall(f".//{tag}"): + if component.find("intent-filter") is not None: + actual[component.get(ANDROID_NAME)] = component.get( + ANDROID_EXPORTED + ) + + self.assertEqual(expected, actual) + + def test_all_pending_intents_declare_mutability(self): + java_sources = "\n".join( + path.read_text(encoding="utf-8") + for path in sorted((REPOSITORY_ROOT / "src").rglob("*.java")) + ) + calls = re.findall( + r"PendingIntent\.get(?:Activity|Broadcast|Service)\([^;]+;", + java_sources, + re.DOTALL, + ) + + self.assertGreater(len(calls), 0) + self.assertEqual( + [], + [ + call + for call in calls + if "FLAG_IMMUTABLE" not in call and "pendingFlags" not in call + ], + ) + self.assertIn( + "pendingFlags |= PendingIntent.FLAG_IMMUTABLE", + java_sources, + ) + + def test_no_merge_conflict_markers_in_source_or_resources(self): + markers = ("<<<<<<< ", "=======", ">>>>>>> ") + failures = [] + candidate_files = [ + *REPOSITORY_ROOT.rglob("*.java"), + *REPOSITORY_ROOT.rglob("*.xml"), + ] + + for candidate in candidate_files: + for line_number, line in enumerate( + candidate.read_text(encoding="utf-8").splitlines(), start=1 + ): + if any(line.startswith(marker) for marker in markers): + failures.append( + f"{candidate.relative_to(REPOSITORY_ROOT)}:{line_number}" + ) + + self.assertEqual([], failures, "\n".join(failures)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/reminder/AndroidManifest.xml b/tests/reminder/AndroidManifest.xml new file mode 100644 index 00000000..057ad5a3 --- /dev/null +++ b/tests/reminder/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/reminder/QuickReminderTest.java b/tests/reminder/QuickReminderTest.java new file mode 100644 index 00000000..5bbb66e1 --- /dev/null +++ b/tests/reminder/QuickReminderTest.java @@ -0,0 +1,74 @@ +package net.micode.notes.tool; + +import java.util.Calendar; +import java.util.TimeZone; + +/** Dependency-free JVM unit tests; compile and execute the production calculation class. */ +public final class QuickReminderTest { + private static int passed; + private static final TimeZone CHINA = TimeZone.getTimeZone("Asia/Shanghai"); + private static long at(TimeZone zone, int y, int m, int d, int h, int minute) { + Calendar c = Calendar.getInstance(zone); + c.clear(); + c.set(y, m - 1, d, h, minute); + return c.getTimeInMillis(); + } + private static void check(String name, long actual, long expected) { + if (actual != expected) { + throw new AssertionError(name + ": expected " + expected + ", got " + actual); + } + System.out.println("PASS " + name); + passed++; + } + private static void preset(String name, QuickReminder.Preset p, int[] from, int[] to) { + check(name, QuickReminder.calculate(p, at(CHINA,from[0],from[1],from[2],from[3],from[4]), CHINA), + at(CHINA,to[0],to[1],to[2],to[3],to[4])); + } + public static void main(String[] args) { + QuickReminder.Preset later=QuickReminder.Preset.IN_TWO_HOURS; + QuickReminder.Preset tomorrow=QuickReminder.Preset.TOMORROW_MORNING; + QuickReminder.Preset week=QuickReminder.Preset.NEXT_WEEK; + preset("later-normal",later,new int[]{2026,10,27,14,20},new int[]{2026,10,27,16,20}); + preset("later-cross-midnight",later,new int[]{2026,10,27,23,50},new int[]{2026,10,28,1,50}); + preset("later-cross-year",later,new int[]{2026,12,31,23,50},new int[]{2027,1,1,1,50}); + preset("tomorrow-before-nine",tomorrow,new int[]{2026,10,27,8,0},new int[]{2026,10,28,9,0}); + preset("tomorrow-at-nine",tomorrow,new int[]{2026,10,27,9,0},new int[]{2026,10,28,9,0}); + preset("tomorrow-after-nine",tomorrow,new int[]{2026,10,27,23,50},new int[]{2026,10,28,9,0}); + preset("january-end",tomorrow,new int[]{2026,1,31,12,0},new int[]{2026,2,1,9,0}); + preset("april-end",tomorrow,new int[]{2026,4,30,12,0},new int[]{2026,5,1,9,0}); + preset("non-leap-february",tomorrow,new int[]{2026,2,28,12,0},new int[]{2026,3,1,9,0}); + preset("leap-day",tomorrow,new int[]{2028,2,28,12,0},new int[]{2028,2,29,9,0}); + preset("leap-february-end",tomorrow,new int[]{2028,2,29,12,0},new int[]{2028,3,1,9,0}); + preset("tomorrow-cross-year",tomorrow,new int[]{2026,12,31,23,59},new int[]{2027,1,1,9,0}); + preset("week-keeps-local-time",week,new int[]{2026,10,27,15,42},new int[]{2026,11,3,15,42}); + preset("week-cross-year",week,new int[]{2026,12,28,15,42},new int[]{2027,1,4,15,42}); + long now=at(CHINA,2026,10,27,14,22)+33987; + check("clears-seconds-and-millis",QuickReminder.calculate(later,now,CHINA),at(CHINA,2026,10,27,16,22)); + TimeZone ny=TimeZone.getTimeZone("America/New_York"); + long spring=at(ny,2026,3,7,9,0); + long springNext=QuickReminder.calculate(tomorrow,spring,ny); + check("DST-spring-clock",springNext,at(ny,2026,3,8,9,0)); + check("DST-spring-23-hours",springNext-spring,23L*60*60*1000); + long autumn=at(ny,2026,10,31,9,0); + check("DST-autumn-25-hours",QuickReminder.calculate(tomorrow,autumn,ny)-autumn,25L*60*60*1000); + check("DST-two-elapsed-hours",QuickReminder.calculate(later,at(ny,2026,3,8,1,30),ny),at(ny,2026,3,8,4,30)); + check("DST-week-clock",QuickReminder.calculate(week,at(ny,2026,3,1,9,0),ny),at(ny,2026,3,8,9,0)); + check("past-rejected",QuickReminder.isFuture(now-1,now)?1:0,0); + check("now-rejected",QuickReminder.isFuture(now,now)?1:0,0); + check("future-accepted",QuickReminder.isFuture(now+1,now)?1:0,1); + TimeZone original=TimeZone.getDefault(); + try { + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + check("explicit-zone-independent-of-default",QuickReminder.calculate(tomorrow,now,CHINA),at(CHINA,2026,10,28,9,0)); + } finally {TimeZone.setDefault(original);} + for (int i=0;i<2;i++) { + try { + QuickReminder.calculate(i==0?null:later,now,i==0?CHINA:null); + throw new AssertionError("Null argument accepted"); + } catch (IllegalArgumentException expected) { + System.out.println("PASS null-argument-"+i);passed++; + } + } + System.out.println("RESULT: "+passed+" passed, 0 failed"); + } +} diff --git a/tests/reminder/README.md b/tests/reminder/README.md new file mode 100644 index 00000000..7c8500d6 --- /dev/null +++ b/tests/reminder/README.md @@ -0,0 +1,50 @@ +# B 模块回归测试 + +更新:2026-11-02。已合并 origin/develop 的 cbb6ccd(含 A 字数统计与 C 兼容修复)。生产功能代码位于 `src/`,本目录是独立验收源码。 + +## 时间边界测试 + +JDK 9 以上即可(本次 JDK 21,编译为 Java 8 字节码),不依赖 Android 或第三方测试库: + +```powershell +javac --release 8 -encoding UTF-8 -d ../.work/b-jvm-tests src/net/micode/notes/tool/QuickReminder.java tests/reminder/QuickReminderTest.java +java -cp ../.work/b-jvm-tests net.micode.notes.tool.QuickReminderTest +``` + +共 26 个断言,固定输入时间与时区,覆盖跨天、月末、年末、闰年、夏令时、清零秒与毫秒,以及过去、当前和未来时间。 + +## Android 验收构建 + +现在直接在 Notes 仓库根目录构建实际合并分支。使用团队统一的 AGP 8.7.3、Gradle 8.9、JDK 21、compile/target SDK 34,设置 ANDROID_HOME 或 local.properties 指向 SDK(本次 E:/Sdk)。不再使用固定 C 提交叠加副本。 + +```powershell +.\gradlew.bat clean assembleDebug lintDebug --console=plain +.\gradlew.bat -I tests/reminder/acceptance.gradle assembleDebug assembleDebugAndroidTest --console=plain +``` + +第二条命令按需加载验收配置,通过 debug 专用 Manifest 注册 WidgetHostActivity,承载真实 AppWidgetHost/RemoteViews;生产 Manifest、源码及资源均不被替换。Instrumentation 使用系统框架,无需 AndroidX/JUnit 网络依赖。 + +prepare_integration.py 仅用于可选导出当前已提交分支 HEAD 的验收副本,不再选择历史 C 基线;本轮测试直接使用根目录构建产物,没有调用该导出脚本。 + +在专用 Android API 36 模拟器上安装两个 APK,预先授予通知权限、精确闹钟权限和小组件宿主绑定权限,再执行: + +```powershell +adb shell pm grant net.micode.notes android.permission.POST_NOTIFICATIONS +adb shell appops set net.micode.notes SCHEDULE_EXACT_ALARM allow +adb shell appwidget grantbind --package net.micode.notes --user 0 +adb shell am instrument -w net.micode.notes.test/net.micode.notes.tests.ReminderInstrumentation +``` + +默认模式 51 个断言(原有 37 项,加 14 项字数统计、清单、旋转及提醒共存检查),包含真实 AlarmManager 在后台触发通知。`-e mode inexact`(先撤销精确闹钟权限)有 2 个断言,`-e mode notification_denied`(先 revoke 通知权限,并用 `pm clear-permission-flags net.micode.notes android.permission.POST_NOTIFICATIONS user-set user-fixed` 清除专用测试设备的重复拒绝标记)有 4 个断言。运行后恢复权限。`-e mode trigger` 可仅重跑 4 个取消/触发断言并补抓截图,不额外加入默认验收总数。 + +`-e mode after_restart` / `after_reboot` 各检查 1 个持久化断言,依赖默认模式保存的固定便签。**Instrumentation 启动和结束会强停目标进程**,所以系统闹钟恢复必须在实际重启完成后、再次开始 Instrumentation 之前,用 `dumpsys alarm` 检查。测试前正常打开应用,确认 `stopped=false`,执行真实 `adb reboot`,等待恢复的 `RTC_WAKEUP` 出现;不能只等待 `sys.boot_completed=1`,也不能把强停场景等同普通退出。 + +运行截图保存在应用外部私有目录 `files/b-evidence`,原始记录见 `doc/members/b/test-record.md` 和 `evidence/logs/`。测试会创建名称以 B 开头的便签,只应在专用模拟器上运行。 + +完成默认模式后、权限拒绝模式前,可在专用模拟器复现普通退出和真实设备重启: + +```powershell +python tests/reminder/verify_restarts.py --adb E:/Sdk/platform-tools/adb.exe --serial emulator-5556 --out ../.work/b-merged-restarts-20261102 +``` + +脚本检查普通进程退出后系统闹钟仍在,真实 reboot 后 boot_id 已改变,开机接收器重新注册相同提醒时间戳,最后才执行两个持久化断言。 diff --git a/tests/reminder/acceptance.gradle b/tests/reminder/acceptance.gradle new file mode 100644 index 00000000..67fbc9d3 --- /dev/null +++ b/tests/reminder/acceptance.gradle @@ -0,0 +1,23 @@ +// Opt-in acceptance fixture for the actual checkout, without replacing production sources. +// Usage: gradlew -I tests/reminder/acceptance.gradle assembleDebug assembleDebugAndroidTest +gradle.beforeProject { project -> + project.afterEvaluate { + if (project.plugins.hasPlugin('com.android.application')) { + project.android { + defaultConfig { testInstrumentationRunner 'net.micode.notes.tests.ReminderInstrumentation' } + sourceSets { + debug { + java.srcDir 'tests/reminder/host' + manifest.srcFile 'tests/reminder/host/AndroidManifest.xml' + } + androidTest { + java.srcDirs = ['tests/reminder/android'] + manifest.srcFile 'tests/reminder/AndroidManifest.xml' + } + } + } + project.dependencies.add('androidTestCompileOnly', project.files( + "${project.android.sdkDirectory}/platforms/android-34/optional/android.test.mock.jar")) + } + } +} diff --git a/tests/reminder/android/ReminderInstrumentation.java b/tests/reminder/android/ReminderInstrumentation.java new file mode 100644 index 00000000..b47cbe99 --- /dev/null +++ b/tests/reminder/android/ReminderInstrumentation.java @@ -0,0 +1,462 @@ +package net.micode.notes.tests; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.AlertDialog; +import android.app.Instrumentation; +import android.app.NotificationManager; +import android.appwidget.AppWidgetHost; +import android.appwidget.AppWidgetHostView; +import android.appwidget.AppWidgetManager; +import android.content.ComponentName; +import android.content.ContentProvider; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ProviderInfo; +import android.database.Cursor; +import android.database.MatrixCursor; +import android.graphics.Bitmap; +import android.graphics.Color; +import android.graphics.Rect; +import android.net.Uri; +import android.os.Bundle; +import android.os.SystemClock; +import android.service.notification.StatusBarNotification; +import android.test.mock.MockContentResolver; +import android.view.KeyEvent; +import android.view.MotionEvent; +import android.view.View; +import android.view.accessibility.AccessibilityNodeInfo; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; +import android.widget.LinearLayout; +import android.widget.NumberPicker; +import android.widget.PopupMenu; +import android.widget.TextView; +import net.micode.notes.R; +import net.micode.notes.data.Notes; +import net.micode.notes.model.WorkingNote; +import net.micode.notes.tool.DataUtils; +import net.micode.notes.tool.QuickReminder; +import net.micode.notes.tool.ReminderScheduler; +import net.micode.notes.tool.ResourceParser; +import net.micode.notes.ui.AlarmAlertActivity; +import net.micode.notes.ui.AlarmReceiver; +import net.micode.notes.ui.DateTimePicker; +import net.micode.notes.ui.DateTimePickerDialog; +import net.micode.notes.ui.NoteEditActivity; +import net.micode.notes.widget.NoteWidgetProvider_2x; +import net.micode.notes.widget.NoteWidgetProvider_4x; +import java.io.File; +import java.io.FileOutputStream; +import java.lang.reflect.Field; +import java.util.Calendar; +import java.util.TimeZone; + +/** Real API-36 acceptance tests. Test-only APK: not included in the application sources. */ +@SuppressLint("NewApi") +public class ReminderInstrumentation extends Instrumentation { + private Bundle args; + private Context context; + private int passed; + private final StringBuilder log = new StringBuilder(); + private static final String NOTE_TEXT = "B 快捷提醒运行测试"; + + @Override public void onCreate(Bundle arguments) { + super.onCreate(arguments); + args = arguments == null ? new Bundle() : arguments; + start(); + } + private void check(String name, boolean condition) { + if (!condition) throw new AssertionError(name); + passed++; + log.append("PASS ").append(name).append('\n'); + Bundle progress = new Bundle(); + progress.putString("stream", "PASS " + name + "\n"); + sendStatus(0, progress); + } + private void main(Runnable action) { + runOnMainSync(action); + waitForIdleSync(); + } + private long createNote(String text, int widget, int type) { + WorkingNote note = WorkingNote.createEmptyNote(context, Notes.ID_ROOT_FOLDER, + widget, type, ResourceParser.YELLOW); + note.setWorkingText(text); + if (!note.saveNote()) throw new AssertionError("Cannot save fixture note"); + return note.getNoteId(); + } + private NoteEditActivity edit(long id) { + Intent intent = new Intent(context, NoteEditActivity.class).setAction(Intent.ACTION_VIEW) + .putExtra(Intent.EXTRA_UID, id).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + NoteEditActivity activity = (NoteEditActivity) startActivitySync(intent); + waitForIdleSync(); + main(() -> ((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE)) + .hideSoftInputFromWindow(activity.getWindow().getDecorView().getWindowToken(), 0)); + return activity; + } + private void menu(NoteEditActivity activity, int id) { + main(() -> activity.onOptionsItemSelected(new PopupMenu(activity, + activity.getWindow().getDecorView()).getMenu().add(0, id, 0, "test"))); + } + private void count(NoteEditActivity activity,String name,int expected) { + TextView counter=activity.findViewById(R.id.tv_word_count); + check(name,counter.getText().toString().equals(activity.getString(R.string.note_word_count,expected))); + } + private void wordCountTests(NoteEditActivity activity) throws Exception { + main(() -> { + TextView counter=activity.findViewById(R.id.tv_word_count); + check("merged-word-count-visible",counter!=null && counter.isShown()); + EditText editor=activity.findViewById(R.id.note_edit_view); + editor.setText("");count(activity,"merged-word-count-empty",0); + editor.setText("中文测试");count(activity,"merged-word-count-chinese",4); + editor.setText("中文ABC 12");count(activity,"merged-word-count-mixed",8); + editor.setText("中文\nABC");count(activity,"merged-word-count-excludes-newline",5); + editor.setText("中");count(activity,"merged-word-count-delete",1); + editor.setText("");count(activity,"merged-word-count-clear",0); + editor.setText("甲乙\nABC"); + }); + menu(activity,R.id.menu_list_mode); + main(() -> { + count(activity,"merged-word-count-checklist",5); + LinearLayout list=activity.findViewById(R.id.note_edit_list); + ((EditText)list.getChildAt(0).findViewById(R.id.et_edit_text)).setText("中"); + count(activity,"merged-word-count-checklist-edit",4); + }); + menu(activity,R.id.menu_list_mode); + main(() -> count(activity,"merged-word-count-normal-mode",4)); + main(() -> ((InputMethodManager)context.getSystemService(Context.INPUT_METHOD_SERVICE)) + .hideSoftInputFromWindow(activity.getWindow().getDecorView().getWindowToken(),0)); + getUiAutomation().setRotation(android.app.UiAutomation.ROTATION_FREEZE_90); + SystemClock.sleep(1500); + main(() -> count(activity,"merged-word-count-landscape",4)); + shot("merged-word-count-landscape"); + getUiAutomation().setRotation(android.app.UiAutomation.ROTATION_FREEZE_0); + SystemClock.sleep(1500); + main(() -> { + count(activity,"merged-word-count-portrait",4); + ((EditText)activity.findViewById(R.id.note_edit_view)).setText(NOTE_TEXT); + }); + shot("merged-word-count-portrait"); + } + private AccessibilityNodeInfo find(AccessibilityNodeInfo root, String prefix) { + if (root == null) return null; + if (root.getText() != null && root.getText().toString().startsWith(prefix)) return root; + for (int i=0;i { + DateTimePicker picker = new DateTimePicker(activity); + picker.setCurrentDate(2026,Calendar.JANUARY,31,23,59); + picker.setCurrentDate(2026,Calendar.FEBRUARY,1,9,0); + check("picker-january-to-february",picker.getCurrentMonth()==Calendar.FEBRUARY && picker.getCurrentDay()==1); + picker.setCurrentDate(2028,Calendar.FEBRUARY,29,15,30); + check("picker-leap-day",picker.getCurrentDay()==29 && picker.getCurrentMonth()==Calendar.FEBRUARY); + picker.set24HourView(true); + try { + Field field=DateTimePicker.class.getDeclaredField("mOnHourChangedListener");field.setAccessible(true); + NumberPicker.OnValueChangeListener listener=(NumberPicker.OnValueChangeListener)field.get(picker); + NumberPicker hours=picker.findViewById(R.id.hour); + hours.setValue(18);listener.onValueChange(hours,15,18); + check("picker-24-hour-evening",picker.getCurrentHourOfDay()==18); + picker.setCurrentDate(2027,Calendar.JANUARY,2,0,0); + check("picker-midnight",picker.getCurrentHourOfDay()==0); + picker.setCurrentDate(2027,Calendar.JANUARY,2,12,0); + check("picker-noon",picker.getCurrentHourOfDay()==12); + picker.setCurrentDate(2027,Calendar.JANUARY,2,23,59); + check("picker-last-minute",picker.getCurrentHourOfDay()==23 && picker.getCurrentMinute()==59); + picker.setCurrentDate(2026,Calendar.DECEMBER,31,23,50); + hours.setValue(0);listener.onValueChange(hours,23,0); + check("picker-midnight-cross-year",picker.getCurrentYear()==2027 && picker.getCurrentMonth()==0 && picker.getCurrentDay()==1 && picker.getCurrentHourOfDay()==0); + } catch (ReflectiveOperationException error) {throw new AssertionError(error);} + }); + final DateTimePickerDialog[] holder=new DateTimePickerDialog[1]; + final int[] callbacks={0}; + main(() -> { + DateTimePickerDialog dialog=new DateTimePickerDialog(activity,System.currentTimeMillis()-120000); + holder[0]=dialog; + dialog.setOnDateTimeSetListener((d,date)->callbacks[0]++); + dialog.show(); + dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick(); + check("custom-past-rejected-and-kept-open",callbacks[0]==0 && dialog.isShowing()); + }); + shot("05-past-time-rejected"); + main(() -> { + try { + Field field=DateTimePickerDialog.class.getDeclaredField("mDateTimePicker");field.setAccessible(true); + DateTimePicker picker=(DateTimePicker)field.get(holder[0]); + Calendar date=Calendar.getInstance();date.add(Calendar.DAY_OF_YEAR,1); + date.set(Calendar.HOUR_OF_DAY,15);date.set(Calendar.MINUTE,30); + picker.setCurrentDate(date.getTimeInMillis()); + int titleId=activity.getResources().getIdentifier("alertTitle","id","android"); + holder[0].set24HourView(true); + TextView title=holder[0].findViewById(titleId); + check("dialog-title-24-hour",title.getText().toString().contains("15:30") && picker.is24HourView()); + holder[0].set24HourView(false); + check("dialog-title-12-hour",title.getText().toString().contains("3:30") && !title.getText().toString().contains("15:30") && !picker.is24HourView()); + } catch (ReflectiveOperationException error) {throw new AssertionError(error);} + }); + shot("06-twelve-hour-format"); + main(() -> {holder[0].getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); + check("custom-cancel-no-callback",callbacks[0]==0);}); + main(() -> { + try { + Calendar from=Calendar.getInstance();from.clear();from.set(2027,0,31,15,30); + Calendar target=Calendar.getInstance();target.clear();target.set(2027,1,1,9,0); + DateTimePickerDialog dialog=new DateTimePickerDialog(activity,from.getTimeInMillis()); + final long[] received={0};dialog.setOnDateTimeSetListener((d,date)->received[0]=date); + dialog.show(); + Field field=DateTimePickerDialog.class.getDeclaredField("mDateTimePicker");field.setAccessible(true); + ((DateTimePicker)field.get(dialog)).setCurrentDate(target.getTimeInMillis()); + dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick(); + check("custom-month-end-callback-timestamp",received[0]==target.getTimeInMillis() && !dialog.isShowing()); + }catch(ReflectiveOperationException error){throw new AssertionError(error);} + }); + } + private void quickUiTests(NoteEditActivity activity,long id) throws Exception { + int[] names={R.string.reminder_in_two_hours,R.string.reminder_tomorrow_morning,R.string.reminder_next_week}; + QuickReminder.Preset[] presets=QuickReminder.Preset.values(); + for(int i=0;i count(activity,"merged-word-count-with-reminder",10)); + shot("03-tomorrow-saved"); + } + menu(activity,R.id.menu_delete_remind); + check("quick-cancel-"+i+"-persisted",WorkingNote.load(context,id).getAlertDate()==0); + } + shot("07-cancelled"); + main(() -> count(activity,"merged-word-count-after-reminder-cancel",10)); + Intent stale=new Intent(context,AlarmReceiver.class).setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,id)); + check("cancelled-broadcast-rejected",!ReminderScheduler.isCurrentReminder(context,stale)); + menu(activity,R.id.menu_alert); + click(context.getString(R.string.reminder_custom_time)); + shot("04-custom-time-preserved"); + sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);waitForIdleSync(); + } + private int dp(Activity activity,int value) {return (int)(value*activity.getResources().getDisplayMetrics().density);} + private void widgets(NoteEditActivity editor) throws Exception { + main(editor::finish); + Activity activity=startActivitySync(new Intent(context,WidgetHostActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); + AppWidgetManager manager=AppWidgetManager.getInstance(context); + AppWidgetHost host=new AppWidgetHost(context,4343); + int small=host.allocateAppWidgetId(),large=host.allocateAppWidgetId(); + check("bind-2x2",manager.bindAppWidgetIdIfAllowed(small,new ComponentName(context,NoteWidgetProvider_2x.class))); + check("bind-4x4",manager.bindAppWidgetIdIfAllowed(large,new ComponentName(context,NoteWidgetProvider_4x.class))); + long smallNote=createNote("B 2x2 小组件 原内容",small,Notes.TYPE_WIDGET_2X); + long largeNote=createNote("B 4x4 小组件 内容正常",large,Notes.TYPE_WIDGET_4X); + final AppWidgetHostView[] views=new AppWidgetHostView[2]; + main(() -> { + LinearLayout root=new LinearLayout(activity);root.setOrientation(LinearLayout.VERTICAL); + root.setPadding(dp(activity,12),dp(activity,12),dp(activity,12),dp(activity,12));root.setBackgroundColor(Color.LTGRAY); + TextView title=new TextView(activity);title.setText("B 小组件回归测试宿主\n真实 AppWidgetHost 与 RemoteViews");title.setTextSize(18);title.setTextColor(Color.BLACK); + root.addView(title); + int[] ids={small,large}; + for(int i=0;i<2;i++) { + TextView label=new TextView(activity);label.setText(i==0?"2 × 2 小组件":"4 × 4 小组件");label.setTextColor(Color.BLACK);root.addView(label); + views[i]=host.createView(activity,ids[i],manager.getAppWidgetInfo(ids[i])); + root.addView(views[i],new LinearLayout.LayoutParams(dp(activity,i==0?180:350),dp(activity,i==0?150:240))); + } + activity.setContentView(root);host.startListening(); + }); + sendWidgetUpdate(small,NoteWidgetProvider_2x.class);sendWidgetUpdate(large,NoteWidgetProvider_4x.class); + SystemClock.sleep(1000);waitForIdleSync(); + main(() -> { + check("2x2-content-displayed",((TextView)views[0].findViewById(R.id.widget_text)).getText().toString().contains("原内容")); + check("4x4-content-displayed",((TextView)views[1].findViewById(R.id.widget_text)).getText().toString().contains("内容正常")); + }); + shot("08-widgets-before-edit"); + NoteEditActivity edit=edit(smallNote); + main(() -> {((EditText)edit.findViewById(R.id.note_edit_view)).setText("B 2x2 小组件 更新成功");edit.onBackPressed();}); + SystemClock.sleep(1000);waitForIdleSync(); + main(() -> check("widget-updated-through-editor-save",((TextView)views[0].findViewById(R.id.widget_text)).getText().toString().contains("更新成功"))); + shot("09-widgets-after-edit"); + main(() -> {host.stopListening();host.deleteHost();}); + SystemClock.sleep(500); + check("widget-delete-keeps-note",WorkingNote.load(context,smallNote).getContent().contains("更新成功")); + check("widget-delete-unbinds",WorkingNote.load(context,smallNote).getWidgetId()==AppWidgetManager.INVALID_APPWIDGET_ID); + main(activity::finish); + } + private void sendWidgetUpdate(int id,Class provider) { + context.sendBroadcast(new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE) + .setClass(context,provider).putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,new int[]{id})); + } + private boolean notification(long id) { + for(StatusBarNotification n:((NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE)).getActiveNotifications()) { + if(("note:"+id).equals(n.getTag())) return true; + } + return false; + } + private void trigger(long id) throws Exception { + WorkingNote note=WorkingNote.load(context,id); + long cancelledDue=System.currentTimeMillis()+5000; + note.setAlertDate(cancelledDue,true);note.saveNote(); + ReminderScheduler.schedule(context,id,cancelledDue); + note.setAlertDate(0,false);note.saveNote();ReminderScheduler.cancel(context,id); + SystemClock.sleep(6500); + check("cancelled-alarm-does-not-notify-after-due",!notification(id) && WorkingNote.load(context,id).getAlertDate()==0); + long due=System.currentTimeMillis()+15000; + note.setAlertDate(due,true);note.saveNote(); + ReminderScheduler.schedule(context,id,due); + sendKeyDownUpSync(KeyEvent.KEYCODE_HOME);waitForIdleSync(); + long limit=SystemClock.elapsedRealtime()+35000; + while(!notification(id) && SystemClock.elapsedRealtime()System.currentTimeMillis()); + shot("13-inexact-fallback-saved");main(activity::finish); + } else if (mode.equals("notification_denied")) { + check("notification-permission-not-granted",context.checkSelfPermission(android.Manifest.permission.POST_NOTIFICATIONS)!=android.content.pm.PackageManager.PERMISSION_GRANTED); + long id=createNote("B 通知权限拒绝测试",AppWidgetManager.INVALID_APPWIDGET_ID,Notes.TYPE_WIDGET_INVALIDE); + NoteEditActivity activity=edit(id);menu(activity,R.id.menu_alert); + android.accessibilityservice.AccessibilityServiceInfo info=getUiAutomation().getServiceInfo(); + info.flags|=android.accessibilityservice.AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS; + getUiAutomation().setServiceInfo(info); + java.util.List buttons=java.util.Collections.emptyList(); + for(int attempt=0;attempt<40;attempt++) { + AccessibilityNodeInfo root=getUiAutomation().getRootInActiveWindow(); + if(root!=null) buttons=root.findAccessibilityNodeInfosByViewId( + "com.android.permissioncontroller:id/permission_deny_button"); + if(!buttons.isEmpty())break; + SystemClock.sleep(150); + } + check("notification-deny-button-present",!buttons.isEmpty()); + shot("14-notification-permission-request"); + check("notification-deny-button-clicked",buttons.get(0).performAction(AccessibilityNodeInfo.ACTION_CLICK)); + SystemClock.sleep(700);waitForIdleSync(); + check("denied-notification-does-not-save-reminder",WorkingNote.load(context,id).getAlertDate()==0); + shot("15-notification-denied-no-reminder");main(activity::finish); + } else if (!mode.equals("all")) { + long id=context.getSharedPreferences("b_reminder_test",0).getLong("id",0); + long date=context.getSharedPreferences("b_reminder_test",0).getLong("date",0); + check(mode+"-database-survives",id>0 && date>System.currentTimeMillis() && WorkingNote.load(context,id).getAlertDate()==date); + NoteEditActivity activity=edit(id);shot(mode);main(activity::finish); + } else { + check("exact-alarm-access-granted-for-device-test",ReminderScheduler.canScheduleExactly(context)); + cursorTests(); + long id=createNote(NOTE_TEXT,AppWidgetManager.INVALID_APPWIDGET_ID,Notes.TYPE_WIDGET_INVALIDE); + NoteEditActivity activity=edit(id); + wordCountTests(activity);quickUiTests(activity,id);pickerTests(activity);widgets(activity); + activity=edit(id);trigger(id);prepareRestart(id); + } + result.putInt("failures",0); + } catch(Throwable error) { + result.putInt("failures",1); + log.append("FAIL ").append(android.util.Log.getStackTraceString(error)); + try{shot("failure");}catch(Exception ignored){} + } + result.putInt("passed",passed); + result.putString("stream",log.toString()+"RESULT: "+passed+" passed, "+result.getInt("failures")+" failed\n"); + finish(result.getInt("failures")==0?Activity.RESULT_OK:Activity.RESULT_CANCELED,result); + } +} diff --git a/tests/reminder/host/AndroidManifest.xml b/tests/reminder/host/AndroidManifest.xml new file mode 100644 index 00000000..b3bc1d75 --- /dev/null +++ b/tests/reminder/host/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/reminder/host/WidgetHostActivity.java b/tests/reminder/host/WidgetHostActivity.java new file mode 100644 index 00000000..6e4d096d --- /dev/null +++ b/tests/reminder/host/WidgetHostActivity.java @@ -0,0 +1,6 @@ +package net.micode.notes.tests; + +import android.app.Activity; + +/** Integration-fixture Activity only; prepare_integration.py adds it to the test build. */ +public class WidgetHostActivity extends Activity { } diff --git a/tests/reminder/prepare_integration.py b/tests/reminder/prepare_integration.py new file mode 100644 index 00000000..80406d24 --- /dev/null +++ b/tests/reminder/prepare_integration.py @@ -0,0 +1,79 @@ +"""Optional acceptance snapshot of the current committed merged branch. + +Run from any directory: python tests/reminder/prepare_integration.py +Normal builds run in the repository root. Commit the merge before exporting this HEAD snapshot. +""" +from pathlib import Path +import io +import os +import shutil +import subprocess +from zipfile import ZipFile +from xml.etree import ElementTree as ET + +ROOT=Path(__file__).resolve().parents[2] +BASE='HEAD' +OUT=ROOT.parent/'.work/b-current-snapshot' +def git(*args): + return subprocess.check_output(['git','-C',str(ROOT),*args]) +OUT.mkdir(parents=True,exist_ok=True) +with ZipFile(io.BytesIO(git('archive','--format=zip',BASE))) as archive: + for entry in archive.namelist(): + assert (OUT/entry).resolve().is_relative_to(OUT.resolve()) + archive.extractall(OUT) +tracked=git('diff','--name-only','HEAD','--','src','res').decode().splitlines() +untracked=git('ls-files','--others','--exclude-standard').decode().splitlines() +for relative in sorted(set(tracked+untracked)): + if not relative.startswith(('src/','res/','tests/reminder/')): + continue + source=ROOT/relative + if source.is_file(): + target=OUT/relative + target.parent.mkdir(parents=True,exist_ok=True) + shutil.copyfile(source,target) +# Ensure committed tests are included as well as the first untracked run. +shutil.copytree(ROOT/'tests/reminder',OUT/'tests/reminder',dirs_exist_ok=True) +ns='http://schemas.android.com/apk/res/android' +ET.register_namespace('android',ns) +ET.register_namespace('tools','http://schemas.android.com/tools') +tag='{'+ns+'}name' +baseline=ET.parse(OUT/'AndroidManifest.xml') +member=ET.parse(ROOT/'AndroidManifest.xml') +existing={el.get(tag) for el in baseline.getroot().findall('uses-permission')} +for perm in member.getroot().findall('uses-permission'): + if perm.get(tag) not in existing: + baseline.getroot().insert(0,perm) +for el in baseline.getroot().findall('.//receiver'): + if el.get(tag)=='.ui.AlarmInitReceiver': + intent=el.find('intent-filter') + name='android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED' + if not any(action.get(tag)==name for action in intent.findall('action')): + ET.SubElement(intent,'action',{tag:name}) +baseline.write(OUT/'AndroidManifest.xml',encoding='utf-8',xml_declaration=True) +# A distinct test-only host avoids replacing NoteEditActivity's production layout. +ET.SubElement(baseline.getroot().find('application'),'activity',{ + tag:'net.micode.notes.tests.WidgetHostActivity','{'+ns+'}exported':'false'}) +baseline.write(OUT/'AndroidManifest.xml',encoding='utf-8',xml_declaration=True) +sdk=os.environ.get('ANDROID_HOME') or os.environ.get('ANDROID_SDK_ROOT') or 'E:/Sdk' +sdk=sdk.replace('\\','/').replace(':','\\:') +(OUT/'local.properties').write_text('sdk.dir='+sdk+'\n',encoding='utf-8',newline='\n') +with (OUT/'build.gradle').open('a',encoding='utf-8') as output: + output.write(''' +// Task-local Android acceptance harness; production sources and resources are unchanged. +android { + defaultConfig { testInstrumentationRunner 'net.micode.notes.tests.ReminderInstrumentation' } + sourceSets { + main.java.srcDirs += ['tests/reminder/host'] + androidTest { + manifest.srcFile 'tests/reminder/AndroidManifest.xml' + java.srcDirs = ['tests/reminder/android'] + } + } +} +dependencies { + androidTestCompileOnly files("${android.sdkDirectory}/platforms/android-34/optional/android.test.mock.jar") +} +''') +print('Integration base:',BASE) +print('B overlay:',ROOT) +print('Build output:',OUT) diff --git a/tests/reminder/verify_restarts.py b/tests/reminder/verify_restarts.py new file mode 100644 index 00000000..d7674c80 --- /dev/null +++ b/tests/reminder/verify_restarts.py @@ -0,0 +1,64 @@ +"""Verify ordinary process exit and a real reboot on a dedicated test emulator. + +Run AFTER the main Instrumentation mode and BEFORE the permission-denied modes. +The test creates fixture state; do not run this against a personal device. +""" +from pathlib import Path +import argparse +import json +import re +import subprocess +import time +import xml.etree.ElementTree as ET + +parser=argparse.ArgumentParser() +parser.add_argument('--adb',default='adb') +parser.add_argument('--serial',required=True) +parser.add_argument('--out',required=True) +args=parser.parse_args() +out=Path(args.out).resolve();out.mkdir(parents=True,exist_ok=True) +adb=[args.adb,'-s',args.serial] +def run(*parts): + return subprocess.check_output(adb+list(parts),stderr=subprocess.STDOUT,timeout=25) +def alarm_matches(data,date): + return re.search(r'RTC_WAKEUP #\d+: Alarm\{[^\n]*origWhen '+str(date)+r'[^\n]*net\.micode\.notes',data) is not None +def instrument(mode): + result=run('shell','am','instrument','-w','-e','mode',mode, + 'net.micode.notes.test/net.micode.notes.tests.ReminderInstrumentation').decode() + (out/(mode+'.log')).write_text(result,encoding='utf-8') + assert 'RESULT: 1 passed, 0 failed' in result,result +def open_note(note_id): + run('shell','am','start','-n','net.micode.notes/.ui.NoteEditActivity','-a', + 'android.intent.action.VIEW','--el','android.intent.extra.UID',str(note_id)) + time.sleep(2) + +preferences=ET.fromstring(run('shell','run-as','net.micode.notes','cat','shared_prefs/b_reminder_test.xml')) +fixture={node.get('name'):int(node.get('value')) for node in preferences} +open_note(fixture['id']);run('shell','input','keyevent','3');time.sleep(1) +run('shell','am','kill','net.micode.notes') +alarms=run('shell','dumpsys','alarm').decode() +(out/'alarm-after-app-kill.txt').write_text(alarms,encoding='utf-8') +assert alarm_matches(alarms,fixture['date']),'System alarm missing after ordinary process kill' +instrument('after_restart') +# Instrumentation start/finish kills processes: reopen normally before real BOOT_COMPLETED. +open_note(fixture['id']);run('shell','input','keyevent','3') +assert 'stopped=false' in run('shell','dumpsys','package','net.micode.notes').decode() +boot_before=run('shell','cat','/proc/sys/kernel/random/boot_id').decode().strip() +run('reboot');start=time.monotonic();restored=False;alarms='' +while time.monotonic()-start<150: + time.sleep(2) + try: + alarms=run('shell','dumpsys','alarm').decode() + if alarm_matches(alarms,fixture['date']):restored=True;break + except (subprocess.SubprocessError,UnicodeDecodeError): + pass +(out/'alarm-after-reboot.txt').write_text(alarms,encoding='utf-8') +boot_after=run('shell','cat','/proc/sys/kernel/random/boot_id').decode().strip() +result=dict(note_id=fixture['id'],expected_alert_date=fixture['date'], + ordinary_process_exit_keeps_system_alarm=True,package_not_stopped_before_reboot=True, + boot_id_changed=boot_before!=boot_after,same_timestamp_restored=restored, + wait_seconds=round(time.monotonic()-start,1)) +(out/'restart-results.json').write_text(json.dumps(result,indent=2),encoding='utf-8') +assert restored and boot_before!=boot_after,result +instrument('after_reboot') +print(json.dumps(result)) diff --git "a/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/README.md" "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/README.md" new file mode 100644 index 00000000..02315692 --- /dev/null +++ "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/README.md" @@ -0,0 +1,24 @@ +# MiCode Notes 小组作业——组长工作包 + +本工作包依据课程的 4 份作业材料与 `MiCode/Notes` 的 `master` 分支整理,用于直接启动项目、完成组长第一阶段工作并给另外 3 名组员派工。 + +## 文件说明 + +- `组长工作成果与接续说明.md`:可直接改写进两份报告和汇报 PPT 的项目分析、架构分析、维护方案、测试计划与推进方法。 +- `发给组员的任务通知.md`:一段可直接复制到小组群的任务通知。 +- `便签置顶功能.patch`:组长负责的维护项“便签置顶/取消置顶”源码补丁。 +- `用例图.puml`:系统用例图 PlantUML 源文件。 +- `原始架构包图.puml`:原项目包级架构图 PlantUML 源文件。 +- `置顶功能设计类图.puml`:组长维护项设计类图 PlantUML 源文件。 + +## 建议使用顺序 + +1. 先把 `发给组员的任务通知.md` 发到群里,并把“组员 A/B/C”替换为真实姓名。 +2. 在小组仓库建立 `develop`,四个人分别从 `develop` 建个人分支。 +3. 组长在自己的分支执行 `git apply 便签置顶功能.patch`。 +4. 导入 Android 工程后完成编译适配,再按 `组长工作成果与接续说明.md` 中的用例实测并保存截图。 +5. 将三张 `.puml` 图导出为 PNG,填入报告和 PPT。 + +## 当前完成度边界 + +已经完成源码结构分析、项目开头文稿、三人派工、组长维护项的设计与源码补丁、以及对应测试用例。由于当前命令行网络不能解析 `github.com`,且图形浏览器自动化无法可靠确认页面,未能在本机克隆并编译这个 2012 年的 Eclipse Android 工程;因此补丁目前属于“基于上游源码完成并静态复核”,最终提交前仍要在你们统一的 Android 构建环境中完成编译、安装和真机/模拟器实测。 diff --git "a/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\344\276\277\347\255\276\347\275\256\351\241\266\345\212\237\350\203\275.patch" "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\344\276\277\347\255\276\347\275\256\351\241\266\345\212\237\350\203\275.patch" new file mode 100644 index 00000000..bb05f96f --- /dev/null +++ "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\344\276\277\347\255\276\347\275\256\351\241\266\345\212\237\350\203\275.patch" @@ -0,0 +1,260 @@ +diff --git a/src/net/micode/notes/data/Notes.java b/src/net/micode/notes/data/Notes.java +index f240604..0000000 100644 +--- a/src/net/micode/notes/data/Notes.java ++++ b/src/net/micode/notes/data/Notes.java +@@ -160,6 +160,12 @@ public class Notes { + */ + public static final String GTASK_ID = "gtask_id"; + ++ /** ++ * Whether this note is pinned to the top of its folder ++ *

Type : INTEGER, 1 for pinned and 0 for normal

++ */ ++ public static final String PINNED = "pinned"; ++ + /** + * The version code + *

Type : INTEGER (long)

+diff --git a/src/net/micode/notes/data/NotesDatabaseHelper.java b/src/net/micode/notes/data/NotesDatabaseHelper.java +index 2c65f37..0000000 100644 +--- a/src/net/micode/notes/data/NotesDatabaseHelper.java ++++ b/src/net/micode/notes/data/NotesDatabaseHelper.java +@@ -31,6 +31,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { + private static final String DB_NAME = "note.db"; + +- private static final int DB_VERSION = 4; ++ private static final int DB_VERSION = 5; + + public interface TABLE { + public static final String NOTE = "note"; +@@ -60,6 +60,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + ++ NoteColumns.PINNED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + ")"; + +@@ -322,6 +323,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { + oldVersion++; + } + ++ if (oldVersion == 4) { ++ upgradeToV5(db); ++ oldVersion++; ++ } ++ + if (reCreateTriggers) { + reCreateNoteTableTriggers(db); + reCreateDataTableTriggers(db); +@@ -359,4 +365,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + + " INTEGER NOT NULL DEFAULT 0"); + } ++ ++ private void upgradeToV5(SQLiteDatabase db) { ++ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.PINNED ++ + " INTEGER NOT NULL DEFAULT 0"); ++ } + } +diff --git a/src/net/micode/notes/ui/NoteItemData.java b/src/net/micode/notes/ui/NoteItemData.java +index b3e0d70..0000000 100644 +--- a/src/net/micode/notes/ui/NoteItemData.java ++++ b/src/net/micode/notes/ui/NoteItemData.java +@@ -40,6 +40,7 @@ public class NoteItemData { + NoteColumns.TYPE, + NoteColumns.WIDGET_ID, + NoteColumns.WIDGET_TYPE, ++ NoteColumns.PINNED, + }; + + private static final int ID_COLUMN = 0; +@@ -54,6 +55,7 @@ public class NoteItemData { + private static final int TYPE_COLUMN = 9; + private static final int WIDGET_ID_COLUMN = 10; + private static final int WIDGET_TYPE_COLUMN = 11; ++ private static final int PINNED_COLUMN = 12; + + private long mId; + private long mAlertDate; +@@ -69,6 +71,7 @@ public class NoteItemData { + private int mWidgetType; + private String mName; + private String mPhoneNumber; ++ private boolean mPinned; + + private boolean mIsLastItem; + private boolean mIsFirstItem; +@@ -91,6 +94,7 @@ public class NoteItemData { + mType = cursor.getInt(TYPE_COLUMN); + mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); + mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); ++ mPinned = cursor.getInt(PINNED_COLUMN) > 0; + + mPhoneNumber = ""; + if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { +@@ -214,6 +218,10 @@ public class NoteItemData { + return (mAlertDate > 0); + } + ++ public boolean isPinned() { ++ return mPinned; ++ } ++ + public boolean isCallRecord() { + return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber)); + } +diff --git a/src/net/micode/notes/ui/NotesListActivity.java b/src/net/micode/notes/ui/NotesListActivity.java +index e843aec..0000000 100644 +--- a/src/net/micode/notes/ui/NotesListActivity.java ++++ b/src/net/micode/notes/ui/NotesListActivity.java +@@ -235,10 +235,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt + private DropdownMenu mDropDownMenu; + private ActionMode mActionMode; + private MenuItem mMoveMenu; ++ private MenuItem mPinMenu; + + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + getMenuInflater().inflate(R.menu.note_list_options, menu); + menu.findItem(R.id.delete).setOnMenuItemClickListener(this); ++ mPinMenu = menu.findItem(R.id.pin); ++ mPinMenu.setTitle(mFocusNoteDataItem.isPinned() ++ ? R.string.menu_unpin : R.string.menu_pin); ++ mPinMenu.setOnMenuItemClickListener(this); + mMoveMenu = menu.findItem(R.id.move); + if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER + || DataUtils.getUserFolderCount(mContentResolver) == 0) { +@@ -339,6 +344,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt + case R.id.move: + startQueryDestinationFolders(); + break; ++ case R.id.pin: ++ setSelectedNotesPinned(!mFocusNoteDataItem.isPinned()); ++ break; + default: + return false; + } +@@ -415,6 +423,38 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { + String.valueOf(mCurrentFolderId) +- }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); ++ }, NoteColumns.TYPE + " DESC," + NoteColumns.PINNED + " DESC," ++ + NoteColumns.MODIFIED_DATE + " DESC"); ++ } ++ ++ private void setSelectedNotesPinned(boolean pinned) { ++ HashSet ids = mNotesListAdapter.getSelectedItemIds(); ++ if (ids == null || ids.isEmpty()) { ++ return; ++ } ++ ++ StringBuilder selection = new StringBuilder(NoteColumns.ID).append(" IN ("); ++ String[] selectionArgs = new String[ids.size()]; ++ int index = 0; ++ for (Long id : ids) { ++ if (index > 0) { ++ selection.append(","); ++ } ++ selection.append("?"); ++ selectionArgs[index] = String.valueOf(id); ++ index++; ++ } ++ selection.append(")"); ++ ++ ContentValues values = new ContentValues(); ++ values.put(NoteColumns.PINNED, pinned ? 1 : 0); ++ int updated = mContentResolver.update(Notes.CONTENT_NOTE_URI, values, ++ selection.toString(), selectionArgs); ++ if (updated > 0) { ++ Toast.makeText(this, pinned ? R.string.pinned_success : R.string.unpinned_success, ++ Toast.LENGTH_SHORT).show(); ++ } ++ mModeCallBack.finishActionMode(); ++ startAsyncNotesListQuery(); + } + + private final class BackgroundQueryHandler extends AsyncQueryHandler { +diff --git a/src/net/micode/notes/ui/NotesListItem.java b/src/net/micode/notes/ui/NotesListItem.java +index 1221e80..0000000 100644 +--- a/src/net/micode/notes/ui/NotesListItem.java ++++ b/src/net/micode/notes/ui/NotesListItem.java +@@ -72,6 +72,9 @@ public class NotesListItem extends LinearLayout { + if (data.hasAlert()) { + mAlert.setImageResource(R.drawable.clock); + mAlert.setVisibility(View.VISIBLE); ++ } else if (data.isPinned()) { ++ mAlert.setImageResource(android.R.drawable.btn_star_big_on); ++ mAlert.setVisibility(View.VISIBLE); + } else { + mAlert.setVisibility(View.GONE); + } +@@ -89,6 +92,9 @@ public class NotesListItem extends LinearLayout { + if (data.hasAlert()) { + mAlert.setImageResource(R.drawable.clock); + mAlert.setVisibility(View.VISIBLE); ++ } else if (data.isPinned()) { ++ mAlert.setImageResource(android.R.drawable.btn_star_big_on); ++ mAlert.setVisibility(View.VISIBLE); + } else { + mAlert.setVisibility(View.GONE); + } +diff --git a/res/menu/note_list_options.xml b/res/menu/note_list_options.xml +index daac008..0000000 100644 +--- a/res/menu/note_list_options.xml ++++ b/res/menu/note_list_options.xml +@@ -18,5 +18,10 @@ + ++ ++ + Search + Delete + Move to folder ++ Pin ++ Unpin ++ Note pinned ++ Note unpinned + %d selected + Nothing selected, the operation is invalid + Select all +diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml +index 773d855..0000000 100644 +--- a/res/values-zh-rCN/strings.xml ++++ b/res/values-zh-rCN/strings.xml +@@ -44,6 +44,10 @@ + 搜索 + 删除 + 移动到文件夹 ++ 置顶 ++ 取消置顶 ++ 已置顶 ++ 已取消置顶 + 选中了 %d 项 + 没有选中项,操作无效 + 全选 +diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml +index 0c70448..0000000 100644 +--- a/res/values-zh-rTW/strings.xml ++++ b/res/values-zh-rTW/strings.xml +@@ -45,6 +45,10 @@ + 搜尋 + 刪除 + 移動到文件夾 ++ 置頂 ++ 取消置頂 ++ 已置頂 ++ 已取消置頂 + 選中了 %d 項 + 沒有選中項,操作無效 + 全選 diff --git "a/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\345\216\237\345\247\213\346\236\266\346\236\204\345\214\205\345\233\276.puml" "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\345\216\237\345\247\213\346\236\266\346\236\204\345\214\205\345\233\276.puml" new file mode 100644 index 00000000..88f4d0db --- /dev/null +++ "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\345\216\237\345\247\213\346\236\266\346\236\204\345\214\205\345\233\276.puml" @@ -0,0 +1,28 @@ +@startuml +title MiCode Notes 原始包级架构图 +skinparam packageStyle rectangle + +package "ui\n界面与交互" as ui +package "model\n编辑领域模型" as model +package "data\nProvider + SQLite" as data +package "tool\n数据操作/备份/资源解析" as tool +package "widget\n桌面小组件" as widget +package "gtask\nGoogle Task 同步" as gtask { + package "gtask.data\n同步数据模型" as gdata + package "gtask.remote\n远端通信" as remote +} +package "res\n布局/菜单/字符串/图片" as res + +ui --> model : 编辑/保存便签 +ui --> data : ContentResolver 查询更新 +ui --> tool : 批量操作/导出 +ui ..> res : 加载界面资源 +model --> data : 读写便签与数据行 +tool --> data : 统一数据操作 +widget --> model : 创建/打开便签 +widget --> data : 查询内容 +widget ..> res : 小组件资源 +remote --> gdata : 构造/解析远端节点 +gtask --> data : 本地数据同步 +gtask --> tool : 数据辅助 +@enduml diff --git "a/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\345\217\221\347\273\231\347\273\204\345\221\230\347\232\204\344\273\273\345\212\241\351\200\232\347\237\245.md" "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\345\217\221\347\273\231\347\273\204\345\221\230\347\232\204\344\273\273\345\212\241\351\200\232\347\237\245.md" new file mode 100644 index 00000000..1d5c7468 --- /dev/null +++ "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\345\217\221\347\273\231\347\273\204\345\221\230\347\232\204\344\273\273\345\212\241\351\200\232\347\237\245.md" @@ -0,0 +1,53 @@ +# 可直接发到小组群的任务通知 + +大家好,我们这次选的项目是 MiCode Notes:。作业最终要交两份报告(源码泛读/标注/维护报告、质量分析报告)、维护后的仓库、测试与质量检查证据、汇报 PPT。我们四个人每人负责一个模块和一项维护,最后由我统一集成。 + +统一规则:原始代码先放 `master`,集成放 `develop`,每个人只在自己的分支开发;不要直接改 `master`。每个人的成果都要包括“模块阅读说明 + 关键代码标注 + 维护设计 + 代码提交 + 测试用例与结果 + 运行截图 + commit SHA”,不能只交代码。遇到工程太老编译不了,也要把环境、完整报错、尝试过程和解决办法记录下来。 + +第一阶段请先完成:拉取项目、建立个人分支、列出自己模块的类与职责、选 2~3 个关键类做详细阅读和标注、记录至少 1 个质量问题。完成后在群里发分支名、阅读文档位置和第一次提交 SHA。 + +具体分工如下: + +**组员 A:UI/资源模块 + 编辑页实时字数统计** + +- 分支:`member/a-word-count` +- 阅读范围:`src/net/micode/notes/ui/`、`res/layout/`、`res/menu/`、`res/values*/`。 +- 重点类:`NoteEditActivity`、`NotesListActivity`、`NotesListAdapter`、`NotesListItem`。 +- 维护任务:在便签编辑页增加实时字数统计,输入、删除、切换清单模式后数字要同步更新;补充中英文资源,界面不能遮挡原有按钮。 +- 至少测试:空便签、中文、英文、数字/符号、换行、长文本、横竖屏或重进页面后的显示。 +- 文档要写:页面流程、关键 UI 关系、改动前后截图、测试表、修改文件清单。 + +**组员 B:提醒/小组件/工具模块 + 快捷提醒** + +- 分支:`member/b-quick-reminder` +- 阅读范围:`src/net/micode/notes/widget/`、`src/net/micode/notes/tool/`,以及 `ui` 中设置提醒的相关代码。 +- 重点类:小组件 Provider/Service、`DataUtils`、`ResourceParser`、提醒时间选择相关类。 +- 维护任务:在原有提醒时间设置中增加快捷选项,例如“今天晚些时候”“明天上午 9:00”“一周后”;仍保留原有自定义时间。 +- 至少测试:跨天、月末、年末、已过时间、取消提醒、应用重启、提醒触发;同时检查小组件显示是否受影响。 +- 文档要写:提醒流程图、关键类说明、边界条件、改动前后截图、测试表、修改文件清单。 + +**组员 C:同步/质量与构建模块 + 兼容修复** + +- 分支:`member/c-build-quality` +- 阅读范围:`src/net/micode/notes/gtask/`、`AndroidManifest.xml`、工程配置文件,并负责汇总质量工具结果。 +- 重点类:`GTaskSyncService`、本地/远端节点模型、同步任务类,以及构建入口。 +- 维护任务:先让项目在我们统一的 Android Studio/JDK/SDK 环境中可重复构建;从实际构建、lint 或运行日志中选择一个可复现问题修复。Google Task 接口若已经失效,不要硬写“同步可用”,要把它作为兼容性风险分析。 +- 质量任务:统计 Java/XML 文件和代码行,运行可行的 lint/SonarQube 或替代静态检查,整理缺陷、坏味道、复杂度和安全告警;记录工具版本和命令。 +- 至少测试:干净环境构建、安装启动、核心页面冒烟测试、修复前复现与修复后验证。 +- 文档要写:构建环境表、问题复现步骤、错误日志、修复说明、质量数据表、测试证据、修改文件清单。 + +我的任务是数据/模型/总体架构与集成,维护项为“便签置顶/取消置顶”。我会提供数据库迁移、列表排序、批量置顶、星标显示、设计图和测试用例,并负责合并 `develop`、解决冲突、统一报告和 PPT。 + +第二阶段提交时,每个人在群里按这个格式发: + +```text +姓名: +分支: +完成内容: +关键提交 SHA: +测试通过/失败项: +文档与截图路径: +需要协助的问题: +``` + +任何人准备合并前先从 `develop` 更新并自行解决个人分支冲突,然后发合并请求给我检查。没有测试记录、截图或说明的提交先不合入。 diff --git "a/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\224\250\344\276\213\345\233\276.puml" "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\224\250\344\276\213\345\233\276.puml" new file mode 100644 index 00000000..dc3b636b --- /dev/null +++ "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\224\250\344\276\213\345\233\276.puml" @@ -0,0 +1,33 @@ +@startuml +title MiCode Notes 系统用例图 +left to right direction + +actor 用户 as User +actor "系统时钟" as Clock +actor "Google 账户/任务服务" as Google + +rectangle "MiCode Notes" { + usecase "新建与编辑便签" as UC_Edit + usecase "删除与移动便签" as UC_Manage + usecase "管理文件夹" as UC_Folder + usecase "搜索便签" as UC_Search + usecase "设置与取消提醒" as UC_Alert + usecase "使用桌面小组件" as UC_Widget + usecase "导出文本" as UC_Export + usecase "同步便签" as UC_Sync + usecase "置顶/取消置顶便签\n(本次新增)" as UC_Pin #LightGreen +} + +User --> UC_Edit +User --> UC_Manage +User --> UC_Folder +User --> UC_Search +User --> UC_Alert +User --> UC_Widget +User --> UC_Export +User --> UC_Sync +User --> UC_Pin + +Clock --> UC_Alert +Google --> UC_Sync +@enduml diff --git "a/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\273\204\351\225\277\345\267\245\344\275\234\346\210\220\346\236\234\344\270\216\346\216\245\347\273\255\350\257\264\346\230\216.md" "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\273\204\351\225\277\345\267\245\344\275\234\346\210\220\346\236\234\344\270\216\346\216\245\347\273\255\350\257\264\346\230\216.md" new file mode 100644 index 00000000..64dbbc6c --- /dev/null +++ "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\273\204\351\225\277\345\267\245\344\275\234\346\210\220\346\236\234\344\270\216\346\216\245\347\273\255\350\257\264\346\230\216.md" @@ -0,0 +1,188 @@ +# MiCode Notes 开源软件阅读、标注与维护——组长工作成果与接续说明 + +## 一、作业目标与最终交付物 + +本次作业不是只做一份介绍性 PPT,而是要围绕一个真实开源项目完成“阅读—分析—维护—验证—汇报”的完整过程。结合课程材料,最终至少要形成: + +1. 可浏览、可追溯的小组源码仓库,包含 `master`、`develop` 和成员个人分支; +2. 《开源软件泛读、标注和维护报告》; +3. 《开源软件质量分析报告》; +4. 至少 3 项可说明、可演示、可验证的维护成果; +5. 质量检查结果、测试用例与执行证据; +6. 汇报 PPT,以及仓库链接、提交记录、运行截图等支撑材料。 + +四人小组拟完成 4 项维护,保证即使其中一项因旧工程兼容问题未完全落地,仍有不少于 3 项成果可用于验收: + +- 组长:便签置顶/取消置顶; +- 组员 A:编辑页实时字数统计; +- 组员 B:提醒时间快捷选项; +- 组员 C:现代 Android 环境构建兼容与一项可复现缺陷修复。 + +## 二、项目概况(可直接放进报告) + +### 2.1 项目简介 + +项目名称为 **MiCode Notes(小米便签)**,上游仓库为 。它是一个传统 Android 原生便签应用,主要功能包括便签与文件夹管理、搜索、提醒、桌面小组件、文本导出,以及基于 Google Task 的同步。 + +本次分析基于上游 `master` 分支,读取时对应提交 `81a66024fe48eaa2206b854430856fe3875ff3ba`。仓库共识别到 147 个文件,其中 Java 文件 39 个、XML 文件 38 个;Java 源文件按顶层功能包统计如下: + +| 功能包 | Java 文件数 | 主要职责 | +|---|---:|---| +| `data` | 4 | 数据表常量、SQLite 数据库、ContentProvider、联系人数据访问 | +| `gtask` | 12 | Google Task 本地模型、远端通信和同步服务 | +| `model` | 2 | 便签编辑过程中的领域模型和数据装载 | +| `tool` | 4 | 数据操作、备份导出、资源解析、启动辅助 | +| `ui` | 14 | 列表、编辑、搜索、设置、适配器和自定义视图 | +| `widget` | 3 | 2×2、4×4 桌面小组件及服务 | + +说明:上述是“文件数”,不是代码行数。正式质量报告中应在统一拉取源码后使用 `cloc src` 或同类工具补充有效代码行、注释行和空行数据,避免把字节数误写成代码行数。 + +### 2.2 技术与运行特点 + +- 使用 Java 与 Android XML; +- 使用 Eclipse/ADT 年代的 Android 工程结构,没有现代 Gradle Wrapper; +- 核心数据保存在 SQLite 中,并通过 `NotesProvider` 统一访问; +- 列表查询与数据库操作使用 `ContentResolver`、`AsyncQueryHandler`; +- 同步模块依赖早期 Google Task 接口,现代环境下很可能需要替换或降级处理; +- 代码历史较早,现代 Android SDK 上的构建兼容、安全权限和 API 弃用问题,是质量分析的重要内容。 + +### 2.3 原始架构说明 + +系统可按“界面层—模型层—数据层—基础设施层”理解: + +1. `ui` 接收用户操作并展示便签、文件夹、搜索和设置界面; +2. `model` 封装编辑中的便签状态,并通过数据接口保存; +3. `data` 以 `NotesProvider` 为统一入口,底层由 `NotesDatabaseHelper` 管理 SQLite; +4. `tool` 提供批量移动/删除、备份导出与资源解析; +5. `widget` 复用数据和模型能力,将便签展示在桌面; +6. `gtask` 负责本地便签与远端任务之间的转换、比较和同步。 + +原始架构图见 `原始架构包图.puml`,用例图见 `用例图.puml`。 + +## 三、组长维护项:便签置顶/取消置顶 + +### 3.1 需求描述 + +用户可以在便签列表中长按一条或多条便签,选择“置顶”;置顶便签保持在普通便签之前。再次选择“取消置顶”后,便签恢复按最后修改时间排序。带提醒的置顶便签优先显示时钟图标,普通置顶便签显示星标,从而避免提醒信息被覆盖。 + +### 3.2 验收标准 + +- 支持单条和批量置顶; +- 支持取消置顶; +- 文件夹仍排在便签前面,不改变原有列表分组; +- 同一组内置顶便签在前,置顶状态相同时按修改时间倒序; +- 应用重启后置顶状态仍保留; +- 数据库从版本 4 升级到版本 5 时,旧便签内容不丢失,旧数据默认不置顶; +- 没有提醒的置顶便签显示星标,带提醒的便签仍显示时钟。 + +### 3.3 设计方案 + +本维护项涉及 7 个源码/资源文件和 3 个本地化资源文件: + +| 文件 | 修改内容 | +|---|---| +| `Notes.java` | 在 `NoteColumns` 中新增 `pinned` 字段常量 | +| `NotesDatabaseHelper.java` | 数据库版本 4→5;建表和升级迁移增加 `pinned` 列 | +| `NoteItemData.java` | 查询投影中读取置顶状态,并提供 `isPinned()` | +| `NotesListActivity.java` | 增加置顶操作、批量更新,并把列表排序改为 `TYPE DESC, PINNED DESC, MODIFIED_DATE DESC` | +| `NotesListItem.java` | 对无提醒的置顶便签显示星标 | +| `note_list_options.xml` | 多选操作栏增加“置顶/取消置顶”入口 | +| 3 份 `strings.xml` | 增加英文、简体中文、繁体中文文案 | + +详细关系见 `置顶功能设计类图.puml`,实现内容见 `便签置顶功能.patch`。 + +### 3.4 代码标注要点(可放进“详细阅读/标注”章节) + +1. `Notes.NoteColumns` 是便签表字段的统一契约;新增字段必须同时进入建表 SQL 和升级 SQL。 +2. `NoteItemData.PROJECTION` 的列顺序与下方索引常量严格对应。为避免破坏原有索引,本次把 `PINNED` 追加到投影末尾,索引设为 12。 +3. `NotesListActivity.startAsyncNotesListQuery()` 决定列表排序,先按类型排序可保留系统文件夹/普通文件夹的原有位置,再按置顶和修改时间排序。 +4. 批量操作使用参数化占位符构造 `_id IN (?,...)`,不把 ID 直接拼进 SQL,便于复核并保持查询写法规范。 +5. `NotesListItem.bind()` 中提醒图标优先级高于置顶星标,避免置顶功能遮蔽原有提醒语义。 + +## 四、组长测试计划 + +| 编号 | 前置条件 | 操作 | 期望结果 | 证据 | +|---|---|---|---|---| +| TC-PIN-01 | 有 2 条未置顶便签 | 长按其中一条并选择“置顶” | 该便签移动到普通便签之前并显示星标 | 操作前后截图 | +| TC-PIN-02 | 有 1 条置顶便签 | 长按后选择“取消置顶” | 星标消失,按修改时间重新排序 | 操作前后截图 | +| TC-PIN-03 | 至少有 3 条便签 | 多选 2 条后置顶 | 两条均置顶,未选便签状态不变 | 多选与结果截图 | +| TC-PIN-04 | 置顶便签设置了提醒 | 返回列表 | 显示时钟图标,且仍位于置顶区域 | 列表截图 | +| TC-PIN-05 | 已安装数据库版本 4 的应用并有旧数据 | 覆盖升级到版本 5 | 旧便签仍存在,默认不置顶,无崩溃 | 升级前后截图/日志 | +| TC-PIN-06 | 已有置顶便签 | 结束进程并重新打开 | 置顶状态和排序保持 | 重启后截图 | +| TC-PIN-07 | 新建便签 | 保存并返回列表 | 新便签默认不置顶 | 列表截图 | + +除功能测试外,建议补充以下静态检查: + +- 搜索所有 `NoteItemData.PROJECTION` 使用点,确认没有仍按 12 列长度硬编码的逻辑; +- 检查数据库版本与升级链,重点执行 4→5 升级; +- 检查简中、繁中和默认英文资源均存在,避免 `aapt` 缺少资源; +- 检查批量置顶 0 条、1 条和多条时没有 SQL 语法错误。 + +## 五、质量分析开头(可直接放进质量报告) + +### 5.1 初步优点 + +- 包结构按界面、模型、数据、工具、同步和小组件划分,职责总体清楚; +- 数据访问集中在 ContentProvider,界面层没有直接操作 SQLite; +- 对批量移动、删除、小组件更新等业务已做一定封装; +- 源码规模适中,适合课堂开展全局泛读和重点类详读。 + +### 5.2 初步风险 + +| 风险 | 影响 | 建议检查方式 | +|---|---|---| +| 工程年代久、无 Gradle Wrapper | 新版 Android Studio 不能直接稳定构建 | 记录导入过程、SDK/JDK 版本与全部兼容修改 | +| 早期 Google Task 同步接口 | 登录或网络同步可能不可用 | 将同步独立列为兼容性风险,不承诺无证据的可用性 | +| 旧 API 与旧权限模型 | 新 Android 系统可能编译警告、运行失败 | lint、编译日志、目标版本设备实测 | +| 数据库升级链 | 跨版本升级可能丢数据或崩溃 | 构造旧数据库执行升级测试 | +| 关键逻辑缺少自动化测试 | 回归风险较高 | 优先覆盖数据工具类、数据库迁移和新增功能 | +| UI 类职责较多 | 可维护性和测试性下降 | 用类复杂度、方法长度和依赖关系做量化说明 | + +注意:正式报告中的 SonarQube、Android Lint、测试覆盖率、复杂度和缺陷数量必须来自实际工具结果,不能用估计值代替。 + +## 六、仓库与协作规范 + +建议仓库结构: + +```text +MiCode-Notes-Team/ +├─ src/、res/、AndroidManifest.xml ... # 原项目及维护后的源码 +├─ doc/ +│ ├─ reading/ # 模块阅读与代码标注 +│ ├─ quality/ # 质量工具结果与分析 +│ ├─ maintenance/ # 每项维护设计、截图、测试 +│ └─ meeting/ # 周会/讨论记录 +└─ report/ # 两份报告与 PPT +``` + +分支约定: + +- `master`:先保存未经修改的原始代码基线; +- `develop`:小组集成与阶段验收; +- `member/leader-pin`:组长置顶功能; +- `member/a-word-count`:组员 A 字数统计; +- `member/b-quick-reminder`:组员 B 快捷提醒; +- `member/c-build-quality`:组员 C 构建兼容、质量检查与缺陷修复。 + +提交信息建议采用:`模块: 动词 + 内容`,例如: + +```text +data: add pinned column and v5 migration +ui: support batch pin and unpin actions +doc: add pin feature design and test evidence +``` + +每项维护合入 `develop` 前必须同时具备:需求说明、设计说明、代码提交、测试用例、执行结果、关键截图和提交 SHA。 + +## 七、接下来由组长推进的事项 + +1. 创建小组仓库并保留原始 `master` 基线; +2. 将本工作包放入 `doc/maintenance/leader-pin/`; +3. 应用补丁并完成旧工程的统一构建环境配置; +4. 执行 TC-PIN-01~07,失败就记录现象、环境、日志和修复提交; +5. 每次集成前检查三名组员提交是否包含文档与证据,不只看代码; +6. 最后统一两份报告的术语、截图编号、数据口径和参考链接,再制作 PPT。 + +## 八、当前限制与严谨表述 + +当前成果是根据 GitHub 上游源码完成的静态分析和补丁设计。由于当前命令行环境无法解析 `github.com`,而浏览器自动化也无法可靠确认页面,尚未在本机克隆、编译和运行。正式报告中可写“已完成方案设计与源码修改”,但在你们完成构建、安装和 TC-PIN-01~07 之前,不应写“已通过全部测试”。 diff --git "a/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\275\256\351\241\266\345\212\237\350\203\275\350\256\276\350\256\241\347\261\273\345\233\276.puml" "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\275\256\351\241\266\345\212\237\350\203\275\350\256\276\350\256\241\347\261\273\345\233\276.puml" new file mode 100644 index 00000000..c0e166b0 --- /dev/null +++ "b/\347\273\204\351\225\277\345\267\245\344\275\234\345\214\205/\347\275\256\351\241\266\345\212\237\350\203\275\350\256\276\350\256\241\347\261\273\345\233\276.puml" @@ -0,0 +1,48 @@ +@startuml +title “便签置顶”维护项设计类图 +skinparam classAttributeIconSize 0 + +class NotesListActivity #LightGreen { + - mFocusNoteDataItem : NoteItemData + - mPinMenu : MenuItem + - startAsyncNotesListQuery() + - setSelectedNotesPinned(pinned : boolean) +} + +class NotesListAdapter { + + getSelectedItemIds() : HashSet + + getSelectedCount() : int +} + +class NoteItemData #LightGreen { + - mPinned : boolean + + isPinned() : boolean +} + +class NotesListItem #LightGreen { + + bind(context, data, choiceMode, checked) +} + +class NotesProvider { + + query(...) + + update(...) +} + +class NotesDatabaseHelper #LightGreen { + - DB_VERSION = 5 + - upgradeToV5(db) +} + +interface "Notes.NoteColumns" as NoteColumns #LightGreen { + PINNED = "pinned" +} + +NotesListActivity --> NotesListAdapter : 取得已选 ID +NotesListActivity --> NoteItemData : 判断当前置顶状态 +NotesListActivity --> NotesProvider : ContentResolver 批量更新/查询 +NotesListAdapter --> NoteItemData : 构造列表数据 +NotesListItem --> NoteItemData : 显示时钟或星标 +NotesProvider --> NotesDatabaseHelper : 访问 note 表 +NoteItemData ..> NoteColumns : 查询 pinned 列 +NotesDatabaseHelper ..> NoteColumns : 建表与数据库迁移 +@enduml