diff --git a/docs/plans/PROGRESS.md b/docs/plans/PROGRESS.md index 5cc6375..0a1d1f1 100644 --- a/docs/plans/PROGRESS.md +++ b/docs/plans/PROGRESS.md @@ -5909,4 +5909,30 @@ $ pnpm build:pro Build successful. Please see dist-pro directory ``` -`release/v1.0.0` 保持 `8e9435e` 不变;`develop` 已包含该修复。 \ No newline at end of file +`release/v1.0.0` 保持 `8e9435e` 不变;`develop` 已包含该修复。 + +## 2026-10-19 ReelShort:develop 合并进 release/v1.0.0(K27.16) + +- 合并提交 `35364c9 chore(release): 合并 develop 到 release/v1.0.0`,已推送。 +- 冲突/取舍:地址取 release(`http://39.162.50.99:8081`,含双网络 probe);保留 + `usesCleartextTraffic="true"` 与 `main.dart` 的 `probeAndApplyBaseUrl()`; + `server_endpoint.dart`、`auth_session_store.dart`、`pubspec.yaml`(`shared_preferences ^2.5.5` + + platform_interface + foundation override)采用 develop 版本;K22–K27 UI/播放器/发现页改动全部进入 release。 +- 首次 `flutter build apk` 因与并行的 `flutter run` 争用 Gradle 锁挂起 15 分钟; + 终止进程并 `./gradlew --stop` 后重新构建通过。 + +门禁原始输出: + +```text +$ flutter analyze lib test +No issues found! + +$ flutter test +00:30 +355 ~5: All tests passed! + +$ flutter build apk --debug +Running Gradle task 'assembleDebug'... 23.4s +✓ Built build/app/outputs/flutter-apk/app-debug.apk +``` + +真机验证由用户执行。 \ No newline at end of file