diff --git a/.github/ISSUE_TEMPLATE/camera_report.yml b/.github/ISSUE_TEMPLATE/camera_report.yml index 283fc7d5..09f4006a 100644 --- a/.github/ISSUE_TEMPLATE/camera_report.yml +++ b/.github/ISSUE_TEMPLATE/camera_report.yml @@ -8,7 +8,7 @@ body: value: | Thanks for testing! Camera reports help other users and show which streams need work. **Remove the password from the URL** (write `user:***`) and do not post public IP addresses. - The app version and build hash are shown in the menu next to **Exit**, for example `v1.28, 1dda076`. + The app version and build hash are shown in the menu next to **Exit**, for example `v2.00, 1dda076`. - type: input id: manufacturer @@ -144,7 +144,7 @@ body: attributes: label: App version and device description: App version from the menu, and the device it ran on - placeholder: "v1.28, 1dda076 on AG-216 (Android 10)" + placeholder: "v2.00, 1dda076 on AG-216 (Android 10)" validations: required: true diff --git a/.github/ISSUE_TEMPLATE/device_report.yml b/.github/ISSUE_TEMPLATE/device_report.yml index 78ff2150..e03793cd 100644 --- a/.github/ISSUE_TEMPLATE/device_report.yml +++ b/.github/ISSUE_TEMPLATE/device_report.yml @@ -7,7 +7,7 @@ body: attributes: value: | Thanks for testing! Reports are collected into the **Verified devices** table in the README. - The app version and build hash are shown in the menu next to **Exit**, for example `v1.28, a9ac8df`. + The app version and build hash are shown in the menu next to **Exit**, for example `v2.00, a9ac8df`. - type: dropdown id: device_type @@ -52,7 +52,7 @@ body: attributes: label: App version description: Shown in the menu next to Exit - placeholder: "v1.28, a9ac8df" + placeholder: "v2.00, a9ac8df" validations: required: true diff --git a/LABORATORY.md b/LABORATORY.md index a0d15991..da99bac7 100644 --- a/LABORATORY.md +++ b/LABORATORY.md @@ -208,6 +208,7 @@ $ADB shell getprop ro.product.model # AG-216 RUN=$(gh run list -R OpenIPC/decoder -b $B -e push -L 1 --json databaseId -q '.[0].databaseId') gh run download $RUN -R OpenIPC/decoder -n decoder-${B//\//-} ``` +- Versions: `v2` is **2.xx** (from 2.00, #152). Every PR that changes the app bumps `android/app/build.gradle` as its last commit before the merge: `versionName` +0.01 (2.00 → 2.01 → …), `versionCode` +1. Docs-only PRs do not. `basic` keeps its 1.07.x line. The installed version shows in the menu (`Exit [v…]`) and in `/stats.json`. - Every build is `com.openipc.decoder` with the release signature. Switching from a debug build needs `adb uninstall` first, which wipes the settings. ### Setting a camera without the UI diff --git a/README.md b/README.md index a7816504..eca868de 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,7 @@ Most devices below were reported with the legacy 1.0x version (`basic` branch); | Tablet | Samsung Tab A7 (SM-T505) | 12 | 4.19.157-perf- | 1.0x | | | Set-top box | A95X F3 AIR | 9 (SlimBOXtv AOSP 9.14, no GAPPS) | 4.9.113 | 1.0x | | | Set-top box | IE X3 Air | 9 (SlimBOXtv AOSP 9.14, no GAPPS) | 4.9.113 | 1.0x | | -| Set-top box | AG-216 | 10 | 4.9.170 | v2 1.28 | v2 test device; decoder budget measured at ≈ 1080p60 in total (two 1080p30 at full rate) | +| Set-top box | AG-216 | 10 | 4.9.170 | v2 2.00 | v2 test device; decoder budget measured at ≈ 1080p60 in total (two 1080p30 at full rate) | | Set-top box | SberBox SBDV-00001 | custom | 4.9.228 | 1.0x | | | Set-top box | X96Q (Allwinner H313) | 10 | 4.9.170 | 1.0x | | | TV | Haier Candy Android TV 2K | 11 | 4.9.243+ | 1.0x | No icon in the device's app list | diff --git a/README.ru.md b/README.ru.md index b673c12b..5ad578a8 100644 --- a/README.ru.md +++ b/README.ru.md @@ -257,7 +257,7 @@ export KEY_PASS=your_key_password | Планшет | Samsung Tab A7 (SM-T505) | 12 | 4.19.157-perf- | 1.0x | | | ТВ-приставка | A95X F3 AIR | 9 (SlimBOXtv AOSP 9.14, без GAPPS) | 4.9.113 | 1.0x | | | ТВ-приставка | IE X3 Air | 9 (SlimBOXtv AOSP 9.14, без GAPPS) | 4.9.113 | 1.0x | | -| ТВ-приставка | AG-216 | 10 | 4.9.170 | v2 1.28 | Тестовое устройство v2; бюджет декодера по замеру ≈ 1080p60 суммарно (два 1080p30 в полном темпе) | +| ТВ-приставка | AG-216 | 10 | 4.9.170 | v2 2.00 | Тестовое устройство v2; бюджет декодера по замеру ≈ 1080p60 суммарно (два 1080p30 в полном темпе) | | ТВ-приставка | SberBox SBDV-00001 | своя | 4.9.228 | 1.0x | | | ТВ-приставка | X96Q (Allwinner H313) | 10 | 4.9.170 | 1.0x | | | Телевизор | Haier Candy Android TV 2K | 11 | 4.9.243+ | 1.0x | Нет значка в списке приложений | diff --git a/README.zh-CN.md b/README.zh-CN.md index e917238a..258f346f 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -257,7 +257,7 @@ export KEY_PASS=your_key_password | 平板 | Samsung Tab A7 (SM-T505) | 12 | 4.19.157-perf- | 1.0x | | | 电视盒子 | A95X F3 AIR | 9（SlimBOXtv AOSP 9.14，无 GAPPS） | 4.9.113 | 1.0x | | | 电视盒子 | IE X3 Air | 9（SlimBOXtv AOSP 9.14，无 GAPPS） | 4.9.113 | 1.0x | | -| 电视盒子 | AG-216 | 10 | 4.9.170 | v2 1.28 | v2 测试设备；实测解码能力约为总计 1080p60（全帧率两路 1080p30） | +| 电视盒子 | AG-216 | 10 | 4.9.170 | v2 2.00 | v2 测试设备；实测解码能力约为总计 1080p60（全帧率两路 1080p30） | | 电视盒子 | SberBox SBDV-00001 | 定制系统 | 4.9.228 | 1.0x | | | 电视盒子 | X96Q（全志 H313） | 10 | 4.9.170 | 1.0x | | | 电视 | Haier Candy Android TV 2K | 11 | 4.9.243+ | 1.0x | 应用列表中没有图标 | diff --git a/android/app/build.gradle b/android/app/build.gradle index baf2f084..7f4c1d22 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "com.openipc.decoder" minSdk 21 targetSdk 36 - versionCode 24 - versionName "1.28" + versionCode 25 + versionName "2.00" buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\"" }