From 43dae198db854b7024b7afbc33580e8e784d333a Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 29 Oct 2026 17:21:41 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20Android=20=E6=89=AB=E7=A0=81=E5=8F=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E3=80=81=E5=8F=91=E5=B8=83=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=81=A5=E5=A3=AE=E6=80=A7=E4=B8=8E=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Android 扫码台:设置页新增「设为默认桌面 / 解除默认桌面 / 回到盒子桌面 / 打开系统设置」等现场免 adb 操作 - android_client/build.ps1:gradle 的 javac 提示走 stderr,改成 2>&1 逐行 Write-Host,避免被当成构建失败 - deploy-lib.cjs:ssh 加 ServerAliveInterval/CountMax 与 -n,避免发布脚本卡在远端命令结束前不退出 - set-password.js:重置密码时补写 password_changed_at(否则旧 JWT 不失效) - .gitignore:忽略 video_split/(调试用的视频拆帧产物) - 文档同步:README / backend README(微信网关、成员扫码绑定、平台管理员、顶栏下载入口、已下线的自建微信表)/ database README / desktop README Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .gitignore | 3 + AndroidStation/README.md | 73 ++- .../app/src/main/AndroidManifest.xml | 9 + .../com/gztbyc/scancenter/MainActivity.java | 23 +- .../gztbyc/scancenter/SettingsActivity.java | 231 +++++++- .../scancenter/core/service/ScanServer.java | 107 +++- .../core/service/StationService.java | 54 +- .../core/speech/BarcodeSpeaker.java | 118 +++- .../scancenter/receiver/BootReceiver.java | 57 +- .../src/main/res/layout/activity_settings.xml | 71 +++ .../app/src/main/res/values/strings.xml | 27 +- README.md | 33 +- backend/README.md | 502 ++++++++++++------ backend/android_client/build.ps1 | 5 +- backend/database/README.md | 8 + backend/scripts/deploy/deploy-lib.cjs | 6 + backend/scripts/set-password.js | 8 +- desktop/README.md | 162 +++++- 18 files changed, 1282 insertions(+), 215 deletions(-) diff --git a/.gitignore b/.gitignore index 8f32af1..bd16388 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,6 @@ desktop.ini # ---------- 内置 ffmpeg(exe 体积大不进仓库;打包前按 desktop/native/ffmpeg/README.md 放好) ---------- desktop/native/ffmpeg/*.exe + +# ---------- 调试用的视频拆帧产物(video_split/frame_*.jpg,别提交) ---------- +video_split/ diff --git a/AndroidStation/README.md b/AndroidStation/README.md index 9081aae..2e02e40 100644 --- a/AndroidStation/README.md +++ b/AndroidStation/README.md @@ -29,6 +29,12 @@ (协议见 [`docs/udp-48899-protocol.md`](docs/udp-48899-protocol.md))。 - **扫码上报**:`ScanServer` 监听 TCP 8087,桌面端连上后,主界面收到的每一条扫码结果 都会按行推送过去。桌面端下发的扫码枪串口设置指令会被读取并丢弃(本机是 USB HID)。 +- **下游播报(面单摄像头)**:桌面端识别到条码后,只给型号是 `AndroidStation`(安卓扫描通道)的通道 + 在同一 TCP 连接上下发 `0x1E + {"cmd":"scan","id":"…","code":"…"} + "\n"` 控制帧;本机**先蜂鸣一声**(方波 2.7kHz/90ms, + 和语音拼在同一段 PCM 里一次播出来)**再播报后四位 + 开始打包**,并在主界面显示这条条码, + 然后**回执** `0x1E + {"cmd":"ack","id":"…"} + "\n"`(id 必须原样回显;桌面端据此确认通知成功,超时会重发)。 + 播报/显示都不会把条码回推给桌面端(避免回路)。 + 网口扫码枪没有语音能力,桌面端不给它们发;但**扫码记录与通知无关**,安卓端离线也照样落库上传。 - **兼容桌面端添加通道**:响应 JCMD `10001 / 10003 / 10005 / 10017`,报出一条 `packcenter / TCP-SERVER / 8087` 的 SOCK 条目;桌面端写 `SYS.HostName` 会更新设备名, 写 `SOCK.LocalPort` 会改本地服务端口。`20003` 只确认,不重启本机。 @@ -36,8 +42,10 @@ ## 主界面 -- 设备名称 / MAC / IP / 型号版本 / 服务与发现状态 / 累计扫码。 -- 最近 8 条扫码记录(**每 5 秒才刷新一次**,不参与扫码热路径)。 +- 设备名称 / MAC / IP / 型号版本 / 服务与发现状态 / 累计扫码(面单摄像头下发的会单独计「面单 N」)。 +- 最近 8 条扫码记录(**每 5 秒才刷新一次**,不参与扫码热路径); + 桌面端下发的面单条码会**立刻**刷新界面,并带 `[面单]` 前缀,最近条码下面写「面单摄像头识别:时间」, + 现场据此确认「摄像头认的是不是这张面单」(只显示、只播报,不回推桌面端)。 - USB 扫码枪是键盘设备:在 Activity 层统一收键,连续可打印字符攒成一条条码, 回车/Tab 立即提交;没有后缀时停手 **50ms** 自动提交。 - 底部「服务设置」「清空记录」两个按钮可用遥控器操作。 @@ -51,6 +59,18 @@ 按键 → 追加缓冲 → 提交 → StationService 入队 → 后台写线程 → 桌面端 ``` +#### 语音播报「开头被吞」的处理(踩过的坑) + +实测这段临时 WAV 起播时开头会被吃掉一小段(起播延迟 + 音频输出通道切换), +表现是「后四位」里第一个/前两个数字、或者**蜂鸣声**听不到。所以: + +- PCM 最前面垫静音 `LEAD_IN_MS = 300`,尾部垫 120ms(避免还没播完就被 `release`); +- **蜂鸣必须排在静音之后**(`300ms 静音 → 嘀 160ms → 40ms → 后四位`): + 只垫 60ms 就让蜂鸣起播时,蜂鸣正好落在起播损耗窗口里,经常整个被吞; +- **先 `start()` 新的 MediaPlayer,再停/收掉上一句**:反过来会让音频输出通道在起播瞬间被拆, + 开头更容易被吞; +- `setVolume(1f, 1f)` 兜一下某些 ROM 的淡入。 + - **按键/扫码回调里不同步刷新任何 UI、不写日志**;界面由 1 秒的时钟和 5 秒一次的状态刷新兜底。 - socket 写入只在 `station-scan-write` 单线程里做,避免主线程 `NetworkOnMainThreadException`, 同时保证多条扫码按顺序发出。 @@ -151,13 +171,58 @@ npm run android:publish # 构建 + 上传 + 刷新 nginx - 这是**普通用户应用**:只需要 `INTERNET`、`RECEIVE_BOOT_COMPLETED`、 `MODIFY_AUDIO_SETTINGS` 三个普通权限,`/data` 直接安装即可。 -- 不依赖 Device Owner / 设备管理员 / lock task / 系统应用 / 任何 ADB 赋权。 +- 不依赖 Device Owner / 设备管理员 / lock task / 系统应用(kiosk 方式见下文,也是纯普通应用)。 - `BootReceiver` 监听 `BOOT_COMPLETED`,开机后自动拉起 `MainActivity`。 + 开机后还会用 `AlarmManager` 在 **6 秒 / 15 秒**各补一次「切回前台」(`FLAG_ACTIVITY_REORDER_TO_FRONT`)。 ⚠️ Android 的既定行为:**新装后必须手动启动一次**,应用才脱离 stopped 状态, 之后重启才会收到开机广播。 +- ⚠️ **电视盒子 ROM 会拦后台启动 Activity**:实测 G96max H616(Android 10)即使 targetSdk=28, + 开机广播拉起界面也会被拒(`logcat` 里 `Background activity start … isBgStartWhitelisted: false`), + 结果是服务起来了、界面被盒子自带桌面 `com.swe.dgbluancher` 顶到后台。 + 这种机器要**把它设成盒子桌面(kiosk)**,由系统自己启动: + + ```bash + # 设成桌面(开机直接进扫码界面,不会再被桌面抢前台) + adb shell cmd package set-home-activity com.gztbyc.scancenter/.MainActivity + # 校验:isDefault=true / com.gztbyc.scancenter/.MainActivity + adb shell cmd package resolve-activity -a android.intent.action.MAIN -c android.intent.category.HOME + # 想还原成盒子自带桌面 + adb shell cmd package set-home-activity com.swe.dgbluancher/.MainActivity + # 设成桌面后要进系统设置:adb shell am start -a android.settings.SETTINGS + ``` + + 普通手机/平板(不设 HOME)只靠 `BOOT_COMPLETED` 就够。 - 主界面不在后台驻留额外服务;扫码服务随应用进程生命周期运行。 -## 约定 +## 服务设置 + +设备名、扫码服务端口(TCP)、发现端口(UDP)、两个启停开关,以及 **「开机 / 桌面」** 一栏: + +- **设为默认桌面**:调用 `RoleManager.createRequestRoleIntent(ROLE_HOME)`,由**系统自己**弹 + 「要将扫码终端设为您的默认主屏幕应用吗?」的确认框(`取消` / `设为默认应用`)。 + 不需要 adb、不需要 root,也**不用先把默认桌面清掉**; +- **解除默认桌面**:**Android 不允许应用自己放弃 HOME 角色**(只有系统/设备管理员能 `removeRoleHolder`), + 所以点它弹一个框,给三条路: + 1. 打开系统「主屏幕应用」页 → 选回盒子自带桌面(个别 ROM 这页一开就闪退,见下); + 2. **卸载本应用**(`ACTION_DELETE` 系统卸载确认框)→ 桌面角色自动释放,盒子回自带桌面,需要时再装; + 3. 取消(改用下面的「回到盒子桌面」); +- **回到盒子桌面**:不改默认设置,直接把机器上**另一个**桌面应用拉到前台(临时用一下); +- **打开系统设置**:设成桌面后现场唯一的系统入口; +- 状态行会显示当前是「扫码终端」还是「盒子自带桌面」,按钮按状态自动置灰。 + +⚠️ 已知 ROM 缺陷:**G96max H616(Android 10)的系统「主屏幕应用 / 默认应用」页会闪退** +(`java.lang.NullPointerException: android.app.ActionBar.setDisplayHomeAsUpEnabled … null object reference`), +只有 `com.android.tv.settings` 的「设置」首页能开。这种机器上解除桌面只能走 +**卸载本应用**,或者用 adb: + +```bash +adb shell cmd package set-home-activity com.swe.dgbluancher/.MainActivity # 还原成盒子自带桌面 +``` + +为什么要设桌面:部分电视盒子 ROM 禁止应用在后台拉起界面 +(`logcat`:`Background activity start … isBgStartWhitelisted: false`),开机广播收到也切不到前台。 +Android 10 以下没有 RoleManager 时,这一栏会提示去「设置 → 应用 → 默认应用 → 主屏幕应用」手动选择。 + - 依赖仓库走阿里云镜像,Gradle 分发走腾讯云镜像,改动仓库配置时保持国内源优先。 - 主界面以遥控器为主:可点击控件必须方向键可达,并在 `res/drawable/bg_button.xml` diff --git a/AndroidStation/app/src/main/AndroidManifest.xml b/AndroidStation/app/src/main/AndroidManifest.xml index 98e1065..7e06934 100644 --- a/AndroidStation/app/src/main/AndroidManifest.xml +++ b/AndroidStation/app/src/main/AndroidManifest.xml @@ -46,6 +46,15 @@ + + + diff --git a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/MainActivity.java b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/MainActivity.java index 09adefb..8fa9291 100644 --- a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/MainActivity.java +++ b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/MainActivity.java @@ -205,18 +205,20 @@ public class MainActivity extends AppCompatActivity { StationIdentity.MODEL, StationIdentity.version())); infoServiceView.setText(serviceStatusText()); infoDiscoveryView.setText(discoveryStatusText()); - infoTotalView.setText(getString(R.string.main_total_value, service.totalScans())); + infoTotalView.setText(service.remoteScans() > 0 + ? getString(R.string.main_total_value_remote, service.totalScans(), service.remoteScans()) + : getString(R.string.main_total_value, service.totalScans())); - String code = service.lastCode(); - if (code.isEmpty()) { + StationService.ScanEntry latest = service.latestEntry(); + if (latest == null) { lastCodeView.setText(R.string.main_waiting); lastTimeView.setText(""); } else { - lastCodeView.setText(code); - long atMs = service.lastScanAt(); - lastTimeView.setText(getString(R.string.main_last_time, - clockFormat.format(new Date(atMs)))); + lastCodeView.setText(latest.code); + lastTimeView.setText(getString( + latest.remote ? R.string.main_last_time_camera : R.string.main_last_time, + clockFormat.format(new Date(latest.atMs)))); } List history = service.history(); @@ -232,8 +234,11 @@ public class MainActivity extends AppCompatActivity { text.append('\n'); } text.append(clockFormat.format(new Date(entry.atMs))) - .append(" ") - .append(entry.code); + .append(" "); + if (entry.remote) { + text.append(getString(R.string.main_recent_remote_tag)).append(' '); + } + text.append(entry.code); } recentView.setText(text.toString()); } diff --git a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/SettingsActivity.java b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/SettingsActivity.java index eb9dd28..6f47e07 100644 --- a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/SettingsActivity.java +++ b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/SettingsActivity.java @@ -1,6 +1,14 @@ package com.gztbyc.scancenter; +import android.app.role.RoleManager; +import android.content.ComponentName; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.provider.Settings; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -8,6 +16,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.SwitchCompat; @@ -15,19 +24,32 @@ import com.gztbyc.scancenter.core.StationIdentity; import com.gztbyc.scancenter.core.StationSettings; import com.gztbyc.scancenter.core.service.StationService; +import static com.gztbyc.scancenter.util.L.e; +import static com.gztbyc.scancenter.util.L.i; + /** - * 服务设置:只配置设备名、扫码服务端口、发现端口和启停开关。 + * 服务设置:设备名、扫码服务端口、发现端口、启停开关,以及「设为盒子桌面」。 * *

按现场要求不提供改 IP 的入口:设备地址由网络分配,应用只负责应答发现和推扫码数据。 + * + *

「设为盒子桌面」用 Android 10 的 {@link RoleManager#createRequestRoleIntent}: + * 由系统弹自己的确认框(不需要 adb、不需要 root、也不用先把默认桌面清掉)。 + * 为什么要这个:部分电视盒子 ROM(实测 G96max H616)禁止应用在后台拉起界面, + * 开机广播收到了界面也切不到前台,只有设成桌面才会由系统直接进入。 */ public class SettingsActivity extends AppCompatActivity { + private static final int REQUEST_HOME_ROLE = 1001; + private EditText nameField; private EditText servicePortField; private EditText discoveryPortField; private SwitchCompat serviceSwitch; private SwitchCompat discoverySwitch; private TextView statusView; + private TextView homeStatusView; + private Button setHomeButton; + private Button clearHomeButton; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -40,6 +62,9 @@ public class SettingsActivity extends AppCompatActivity { serviceSwitch = findViewById(R.id.sw_service_enabled); discoverySwitch = findViewById(R.id.sw_discovery_enabled); statusView = findViewById(R.id.tv_settings_status); + homeStatusView = findViewById(R.id.tv_home_status); + setHomeButton = findViewById(R.id.btn_set_home); + clearHomeButton = findViewById(R.id.btn_clear_home); nameField.setText(StationSettings.deviceName(this)); servicePortField.setText(String.valueOf(StationSettings.servicePort(this))); @@ -63,6 +88,36 @@ public class SettingsActivity extends AppCompatActivity { } }); + setHomeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + requestHomeRole(); + } + }); + + clearHomeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + showClearHomeDialog(); + } + }); + + Button freeLauncher = findViewById(R.id.btn_free_launcher); + freeLauncher.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + openOtherLauncher(); + } + }); + + Button systemSettings = findViewById(R.id.btn_system_settings); + systemSettings.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + openSystemSettings(); + } + }); + serviceSwitch.setOnCheckedChangeListener((button, checked) -> renderStatus()); discoverySwitch.setOnCheckedChangeListener((button, checked) -> renderStatus()); renderStatus(); @@ -72,6 +127,180 @@ public class SettingsActivity extends AppCompatActivity { protected void onResume() { super.onResume(); renderStatus(); + renderHomeStatus(); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode != REQUEST_HOME_ROLE) { + return; + } + // 角色变更是异步落库的,等一小会儿再读 + homeStatusView.postDelayed(new Runnable() { + @Override + public void run() { + renderHomeStatus(); + if (isHomeRoleHeld()) { + Toast.makeText(SettingsActivity.this, R.string.settings_home_done, Toast.LENGTH_SHORT).show(); + } + } + }, 400); + } + + /** 当前是否已经是默认桌面 */ + private boolean isHomeRoleHeld() { + if (Build.VERSION.SDK_INT < 29) { + return false; + } + RoleManager roles = getSystemService(RoleManager.class); + return roles != null && roles.isRoleAvailable(RoleManager.ROLE_HOME) && roles.isRoleHeld(RoleManager.ROLE_HOME); + } + + private void renderHomeStatus() { + if (homeStatusView == null || setHomeButton == null) { + return; + } + if (Build.VERSION.SDK_INT < 29) { + homeStatusView.setText(R.string.settings_home_unsupported); + setHomeButton.setEnabled(false); + if (clearHomeButton != null) clearHomeButton.setEnabled(true); + return; + } + RoleManager roles = getSystemService(RoleManager.class); + if (roles == null || !roles.isRoleAvailable(RoleManager.ROLE_HOME)) { + homeStatusView.setText(R.string.settings_home_unsupported); + setHomeButton.setEnabled(false); + if (clearHomeButton != null) clearHomeButton.setEnabled(true); + return; + } + boolean held = roles.isRoleHeld(RoleManager.ROLE_HOME); + homeStatusView.setText(held ? R.string.settings_home_is_default : R.string.settings_home_not_default); + setHomeButton.setEnabled(!held); + // 解除:安卓不允许应用自己放弃 HOME 角色,只能走系统页面或卸载(见 showClearHomeDialog) + if (clearHomeButton != null) clearHomeButton.setEnabled(held); + } + + /** + * 解除默认桌面:把三条路摆出来让人选。 + * + *

为什么不能一键解除:Android 只给系统/设备管理员 {@code removeRoleHolder} 的能力, + * 普通应用只能「申请」角色,不能「放弃」角色。 + */ + private void showClearHomeDialog() { + new AlertDialog.Builder(this) + .setTitle(R.string.settings_clear_home_title) + .setMessage(R.string.settings_clear_home_message) + .setPositiveButton(R.string.settings_clear_home_open_settings, (dialog, which) -> openHomeSettings()) + .setNeutralButton(R.string.settings_clear_home_uninstall, (dialog, which) -> uninstallSelf()) + .setNegativeButton(R.string.settings_clear_home_cancel, null) + .show(); + } + + /** 兜底:走系统卸载确认框;卸载后桌面角色自动释放,盒子回自带桌面 */ + private void uninstallSelf() { + try { + startActivity(new Intent(Intent.ACTION_DELETE, Uri.parse("package:" + getPackageName()))); + } + catch (Exception error) { + e("打开卸载确认框失败", error); + Toast.makeText(this, getString(R.string.settings_home_failed, String.valueOf(error.getMessage())), + Toast.LENGTH_LONG).show(); + } + } + + /** 不改默认设置,直接切到盒子自带的那个桌面去看一眼 */ + private void openOtherLauncher() { + PackageManager pm = getPackageManager(); + Intent query = new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME); + for (ResolveInfo info : pm.queryIntentActivities(query, 0)) { + if (info.activityInfo == null) { + continue; + } + String pkg = info.activityInfo.packageName; + if (pkg == null || pkg.equals(getPackageName())) { + continue; + } + try { + Intent launch = new Intent(Intent.ACTION_MAIN) + .setComponent(new ComponentName(pkg, info.activityInfo.name)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(launch); + Toast.makeText(this, R.string.settings_back_to_launcher_done, Toast.LENGTH_SHORT).show(); + i("已切到其它桌面", pkg); + return; + } + catch (Exception error) { + e("切到其它桌面失败", pkg, error); + } + } + Toast.makeText(this, R.string.settings_no_other_launcher, Toast.LENGTH_LONG).show(); + } + + /** + * 打开系统「主屏幕应用」选择页。 + * + *

个别盒子 ROM 的这个页面一打开就闪退(实测 G96max H616: + * {@code NullPointerException: ActionBar … on a null object reference}), + * 所以失败时依次退到「默认应用」页和系统设置首页。 + */ + private void openHomeSettings() { + String[] actions = { + Settings.ACTION_HOME_SETTINGS, + Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS, + Settings.ACTION_SETTINGS, + }; + for (String action : actions) { + try { + startActivity(new Intent(action)); + Toast.makeText(this, + Settings.ACTION_HOME_SETTINGS.equals(action) + ? R.string.settings_home_clear_opened + : R.string.settings_home_settings_missing, + Toast.LENGTH_LONG).show(); + i("已打开系统设置页", action); + return; + } + catch (Exception error) { + e("打开系统设置页失败", action, error); + } + } + Toast.makeText(this, getString(R.string.settings_home_failed, "没有可用的系统设置页"), + Toast.LENGTH_LONG).show(); + } + + /** 让系统弹「将扫码终端设为默认主屏幕应用?」的确认框 */ + private void requestHomeRole() { + if (Build.VERSION.SDK_INT < 29) { + openSystemSettings(); + return; + } + RoleManager roles = getSystemService(RoleManager.class); + if (roles == null) { + openSystemSettings(); + return; + } + try { + startActivityForResult(roles.createRequestRoleIntent(RoleManager.ROLE_HOME), REQUEST_HOME_ROLE); + Toast.makeText(this, R.string.settings_home_requested, Toast.LENGTH_SHORT).show(); + i("已请求设为默认桌面(等系统确认)"); + } + catch (Exception error) { + e("请求设为默认桌面失败", error); + openSystemSettings(); + } + } + + /** 退路:直接打开系统设置(设成桌面后现场就靠这个进来) */ + private void openSystemSettings() { + try { + startActivity(new Intent(Settings.ACTION_SETTINGS)); + } + catch (Exception error) { + e("打开系统设置失败", error); + Toast.makeText(this, getString(R.string.settings_home_failed, String.valueOf(error.getMessage())), + Toast.LENGTH_LONG).show(); + } } private void saveSettings() { diff --git a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/ScanServer.java b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/ScanServer.java index 2f7b7b9..74dcb2f 100644 --- a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/ScanServer.java +++ b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/ScanServer.java @@ -2,6 +2,9 @@ package com.gztbyc.scancenter.core.service; import com.gztbyc.scancenter.BuildConfig; +import org.json.JSONObject; + +import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.OutputStream; import java.net.InetSocketAddress; @@ -25,6 +28,9 @@ import static com.gztbyc.scancenter.util.L.w; * 设备监听、桌面端主动连接。每收到一条扫码结果,按行(CRLF 结尾) * 写给所有已连接的客户端;客户端下发的扫码枪设置指令(二进制)只读取并丢弃 * —— 本机的扫码枪是 USB HID,不需要这些串口指令。 + * + *

另外解析桌面端下发的 0x1E 控制帧({"cmd":"scan","code":"..."} = + * 桌面端识别到条码、通知本机「扫码成功」):只做离线语音播报,**不回推桌面端**。 */ public final class ScanServer { @@ -287,6 +293,12 @@ public final class ScanServer { private final class Client implements Runnable { + /** 桌面端控制帧起始字节(RS,不会出现在条码和扫码枪设置指令里) */ + private static final int CONTROL_MARK = 0x1E; + + /** 单条控制帧上限(防止异常数据把内存撑大) */ + private static final int MAX_CONTROL_BYTES = 2048; + final Socket socket; final String remoteIp; final AtomicBoolean closed = new AtomicBoolean(false); @@ -326,17 +338,44 @@ public final class ScanServer { @Override public void run() { byte[] buffer = new byte[512]; - boolean logged = false; + boolean loggedSettings = false; + ByteArrayOutputStream control = null; try { while (running && !closed.get()) { int read = input.read(buffer); if (read < 0) { break; } - if (!logged) { - logged = true; - // 桌面端连上后会下发扫码枪设置(串口指令),本机是 USB HID,忽略 - i("已忽略桌面端下发的扫码枪设置指令", remoteIp, read + " 字节"); + + for (int index = 0; index < read; index++) { + int value = buffer[index] & 0xFF; + + // 本机是 USB HID:二进制扫码枪设置指令照旧忽略; + // 0x1E 开头的控制帧是桌面端给的「播报」指令(面单摄像头识别结果) + if (control == null) { + if (value == CONTROL_MARK) { + control = new ByteArrayOutputStream(128); + } + else if (value != '\n' && value != '\r' && !loggedSettings) { + loggedSettings = true; + i("已忽略桌面端下发的扫码枪设置指令", remoteIp, read + " 字节"); + } + continue; + } + + if (value == '\n' || value == '\r') { + if (control.size() > 0) { + handleControl(new String(control.toByteArray(), StandardCharsets.UTF_8)); + } + control = null; + } + else if (control.size() < MAX_CONTROL_BYTES) { + control.write(value); + } + else { + // 超长帧直接丢弃,避免异常客户端把内存撑大 + control = null; + } } } } @@ -348,6 +387,64 @@ public final class ScanServer { } } + /** 处理桌面端控制帧:`{cmd:"scan", id, code}` = 扫码成功 → 播报 + 回执(只播报,不回推) */ + private void handleControl(String json) { + try { + JSONObject object = new JSONObject(json); + String cmd = object.optString("cmd", ""); + if (!"scan".equals(cmd) && !"speak".equals(cmd)) { + return; + } + String code = object.optString("code", "").trim(); + if (code.length() < 4 || code.length() > 64) { + return; + } + StationService.instance().announceRemote(code); + i("收到桌面端扫码成功通知,已播报", remoteIp, code); + + // 回执:桌面端据此确认「通知成功」(等不到回执它会重发一次) + sendAck(object.optString("id", "").trim()); + } + catch (Exception failure) { + w("桌面端控制帧解析失败", describe(failure)); + } + } + + /** + * 回执帧:0x1E + {"cmd":"ack","id":"..."} + '\n',和扫码结果走同一条上行连接。 + * + * id 必须**原样回显**:桌面端是拿自己生成的 id 去比对回执的, + * 之前把非字母数字字符过滤掉(`-` 被吃掉)会让桌面端永远等不到回执。 + * 用 JSONObject 拼,转义由它负责,长度只做个上限防滥用。 + */ + private void sendAck(String rawId) { + String raw = rawId == null ? "" : rawId.trim(); + if (raw.isEmpty()) { + return; + } + String id = raw.length() > 64 ? raw.substring(0, 64) : raw; + + byte[] body; + try { + JSONObject ack = new JSONObject(); + ack.put("cmd", "ack"); + ack.put("id", id); + body = ack.toString().getBytes(StandardCharsets.UTF_8); + } + catch (Exception failure) { + w("播报回执拼包失败", describe(failure)); + return; + } + + byte[] frame = new byte[body.length + 2]; + frame[0] = (byte) CONTROL_MARK; + System.arraycopy(body, 0, frame, 1, body.length); + frame[frame.length - 1] = (byte) '\n'; + if (!write(frame)) { + w("播报回执发送失败", remoteIp); + } + } + void close() { if (!closed.compareAndSet(false, true)) { return; diff --git a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/StationService.java b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/StationService.java index 342cd35..172bd99 100644 --- a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/StationService.java +++ b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/service/StationService.java @@ -28,9 +28,13 @@ public final class StationService { public final String code; public final long atMs; - ScanEntry(String code, long atMs) { + /** true = 桌面端下发的(面单摄像头识别),false = 本机 USB 扫码枪 */ + public final boolean remote; + + ScanEntry(String code, long atMs, boolean remote) { this.code = code; this.atMs = atMs; + this.remote = remote; } } @@ -49,6 +53,7 @@ public final class StationService { private String lastCode = ""; private long lastScanAt; private long totalScans; + private long remoteScans; private StationService() { } @@ -162,7 +167,7 @@ public final class StationService { lastCode = code; lastScanAt = now; totalScans++; - history.addFirst(new ScanEntry(code, now)); + history.addFirst(new ScanEntry(code, now, false)); while (history.size() > MAX_HISTORY) { history.removeLast(); } @@ -173,12 +178,43 @@ public final class StationService { BarcodeSpeaker.instance().announce(code); } + /** + * 桌面端通知「扫码成功」(面单摄像头识别到的条码):播报 + **显示在界面上**,但**不回推**。 + * + * 这条码的记录已经由桌面端写进待上报队列,本机只负责让现场听到语音、看到条码 + * (这样打包的人能确认「摄像头认的是不是这张面单」); + * 所以绝不能调用 {@link #pushBarcode(String)} —— 那会把这条码再推回桌面端,形成回路, + * 也会让「本地扫码」和「摄像头识别」互相干扰。 + * + * 历史里会带上 {@link ScanEntry#remote} 标记,界面显示成「面单」来源; + * 累计扫码数只统计本机扫码枪,面单摄像头单独计数。 + */ + public void announceRemote(String code) { + if (code == null || code.isEmpty()) { + return; + } + long now = System.currentTimeMillis(); + synchronized (history) { + lastCode = code; + lastScanAt = now; + remoteScans++; + history.addFirst(new ScanEntry(code, now, true)); + while (history.size() > MAX_HISTORY) { + history.removeLast(); + } + } + BarcodeSpeaker.instance().announce(code, true); + // 这条码是给人看的,必须立刻刷界面(界面的 1 秒兜底刷新太慢) + notifyState(); + } + public void clearHistory() { synchronized (history) { history.clear(); lastCode = ""; lastScanAt = 0L; totalScans = 0L; + remoteScans = 0L; } notifyState(); } @@ -201,6 +237,20 @@ public final class StationService { } } + /** 面单摄像头(桌面端下发)识别的条数 */ + public long remoteScans() { + synchronized (history) { + return remoteScans; + } + } + + /** 最新一条(本机扫码或面单摄像头),没有返回 null */ + public ScanEntry latestEntry() { + synchronized (history) { + return history.isEmpty() ? null : history.peekFirst(); + } + } + public List history() { synchronized (history) { return new ArrayList(history); diff --git a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/speech/BarcodeSpeaker.java b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/speech/BarcodeSpeaker.java index 486ac64..0d405fa 100644 --- a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/speech/BarcodeSpeaker.java +++ b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/core/speech/BarcodeSpeaker.java @@ -57,6 +57,24 @@ public final class BarcodeSpeaker { /** 同一个条码在这个时间内不重复播报(连续扫描的重复帧) */ private static final long REPEAT_QUIET_MS = 2500L; + /** 模拟蜂鸣器:方波 2.7kHz / 160ms,后面再停 40ms 接语音(桌面端下发的面单条码用) */ + private static final int BEEP_MS = 160; + private static final int BEEP_FREQ_HZ = 2700; + private static final int BEEP_GAP_MS = 40; + private static final double BEEP_AMPLITUDE = 0.4; + + /** + * 起播/收尾要垫的静音。 + * + *

实测:这段 WAV 起播时开头会被吃掉一小段(起播延迟 + 音频通道切换), + * 表现为「后四位」里第一个/前两个数字、或者蜂鸣声听不到。垫静音后吃掉的只是静音。 + * + *

蜂鸣也排在静音**之后**:之前只垫 60ms 就让蜂鸣起播,结果蜂鸣经常整个被吞掉 + * (语音因为在后面反而正常),所以蜂鸣必须放在起播损耗窗口之外。 + */ + private static final int LEAD_IN_MS = 300; + private static final int TAIL_MS = 120; + /** 启动后延迟多久播欢迎语(等 Activity/服务都就绪) */ private static final long WELCOME_DELAY_MS = 1200L; @@ -97,6 +115,7 @@ public final class BarcodeSpeaker { private long lastAnnouncedAt; private boolean cacheCleaned; private boolean welcomeScheduled; + private byte[] beepCache; private BarcodeSpeaker() { } @@ -185,6 +204,18 @@ public final class BarcodeSpeaker { *

只做很轻的判重和入队;拼 PCM、写 WAV、起播都在 {@code station-speech} 线程。 */ public void announce(String code) { + announce(code, false); + } + + /** + * 播报一条条码,可选**先蜂鸣一声**(模拟扫码枪的蜂鸣器)。 + * + *

蜂鸣直接拼在同一段 PCM 前面(方波 + 静音间隔),一次播放出来: + * 不用 ToneGenerator/额外音轨,rk3288 上不会有"蜂鸣和语音抢音频通道"的问题。 + * + * @param beepFirst 桌面端下发的面单条码用 true:先「嘀」一下再播后四位,和手持枪手感一致 + */ + public void announce(String code, boolean beepFirst) { Context ctx = context; if (ctx == null || code == null || code.isEmpty()) { return; @@ -206,16 +237,84 @@ public final class BarcodeSpeaker { worker.execute(new Runnable() { @Override public void run() { - byte[] pcm = buildPcm(tail); - if (pcm.length == 0) { + byte[] speech = buildPcm(tail); + if (speech.length == 0) { w("没有可用的语音种子", tail); return; } - playPcm(pcm, tail); + byte[] body = beepFirst ? prependBeep(speech) : speech; + // 前后垫静音:起播(/收尾)会吃掉开头一小段,垫了静音就只吃静音, + // 不会把蜂鸣或第一位数字吞掉 + byte[] pcm = padSilence(body, LEAD_IN_MS, TAIL_MS); + playPcm(pcm, beepFirst ? "beep+" + tail : tail); } }); } + /** 前后补静音(调用方已在 speech 线程) */ + private static byte[] padSilence(byte[] pcm, int leadMs, int tailMs) { + int leadBytes = SAMPLE_RATE * Math.max(0, leadMs) / 1000 * BYTES_PER_FRAME; + int tailBytes = SAMPLE_RATE * Math.max(0, tailMs) / 1000 * BYTES_PER_FRAME; + if (leadBytes == 0 && tailBytes == 0) { + return pcm; + } + byte[] padded = new byte[leadBytes + pcm.length + tailBytes]; + System.arraycopy(pcm, 0, padded, leadBytes, pcm.length); + return padded; + } + + /** 把蜂鸣 PCM 拼到语音前面(调用方已在 speech 线程) */ + private byte[] prependBeep(byte[] speech) { + byte[] beep = beepPcm(); + if (beep.length == 0) { + return speech; + } + byte[] merged = new byte[beep.length + speech.length]; + System.arraycopy(beep, 0, merged, 0, beep.length); + System.arraycopy(speech, 0, merged, beep.length, speech.length); + return merged; + } + + /** 蜂鸣 PCM(方波 + 尾部静音),只生成一次 */ + private byte[] beepPcm() { + synchronized (lock) { + if (beepCache != null) { + return beepCache; + } + } + + int frames = SAMPLE_RATE * BEEP_MS / 1000; + int gapFrames = SAMPLE_RATE * BEEP_GAP_MS / 1000; + byte[] pcm = new byte[(frames + gapFrames) * BYTES_PER_FRAME]; + int halfPeriod = Math.max(1, SAMPLE_RATE / Math.max(1, BEEP_FREQ_HZ) / 2); + int fadeFrames = Math.max(1, SAMPLE_RATE / 1000); // 1ms 淡入淡出,去掉爆音 + double amplitude = Short.MAX_VALUE * BEEP_AMPLITUDE; + + int offset = 0; + for (int index = 0; index < frames; index++) { + double value = ((index / halfPeriod) & 1) == 0 ? amplitude : -amplitude; + int remaining = frames - 1 - index; + if (index < fadeFrames) { + value = value * index / fadeFrames; + } + else if (remaining < fadeFrames) { + value = value * remaining / fadeFrames; + } + + short sample = (short) Math.max(Short.MIN_VALUE, Math.min(Short.MAX_VALUE, Math.round(value))); + for (int channel = 0; channel < CHANNELS; channel++) { + pcm[offset++] = (byte) (sample & 0xFF); + pcm[offset++] = (byte) ((sample >> 8) & 0xFF); + } + } + // 剩余的是静音间隔(数组默认 0) + + synchronized (lock) { + beepCache = pcm; + } + return pcm; + } + private void playPcm(byte[] pcm, String label) { Context ctx = context; if (ctx == null) { @@ -236,6 +335,9 @@ public final class BarcodeSpeaker { .build()); created.setDataSource(file.getAbsolutePath()); created.prepare(); + // 明确拉满音量:有些 ROM 会在新音频流起播时做淡入/被别的流压一点音量, + // 显式设置后至少不会被我们自己的上一个播放残留影响 + created.setVolume(1f, 1f); final int myGeneration; MediaPlayer oldPlayer; @@ -262,8 +364,14 @@ public final class BarcodeSpeaker { }); } - releasePlayer(oldPlayer, oldFile); - created.start(); + // 先起播,再收掉上一句:反过来的话上一句一出流,音频输出通道被拆, + // 新的一句紧跟着起播就会被吃掉开头(表现为第一位数字听不到)。 + try { + created.start(); + } + finally { + releasePlayer(oldPlayer, oldFile); + } long durationMs = pcm.length * 1000L / (SAMPLE_RATE * BYTES_PER_FRAME); i("语音播报", label, durationMs + "ms"); diff --git a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/receiver/BootReceiver.java b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/receiver/BootReceiver.java index 9796bc6..b1d3d1d 100644 --- a/AndroidStation/app/src/main/java/com/gztbyc/scancenter/receiver/BootReceiver.java +++ b/AndroidStation/app/src/main/java/com/gztbyc/scancenter/receiver/BootReceiver.java @@ -1,8 +1,11 @@ package com.gztbyc.scancenter.receiver; +import android.app.AlarmManager; +import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.os.Build; import com.gztbyc.scancenter.MainActivity; @@ -23,6 +26,11 @@ import static com.gztbyc.scancenter.util.L.w; * 所以清单里静态注册仍然有效。 * * + *

为什么要「补几次」:实测 G96max H616 这类电视盒子,开机时系统桌面会晚一步 + * 起来,把刚拉起的主界面顶到后台(日志里能看到 `BootReceiver` 成功拉起,但前台变成 + * `com.swe.dgbluancher`)。所以启动后再用 {@link AlarmManager} 定时补两次, + * 把界面抢回前台 —— 界面上只有一个状态页,重复拉起是幂等的(singleTop)。 + * *

⚠️ 应用新装且从未启动过时处于 stopped 状态,系统不会给它发开机广播, * 必须手动启动一次之后才会生效。这是 Android 的既定行为,不是 bug。 */ @@ -32,10 +40,21 @@ public class BootReceiver extends BroadcastReceiver { private static final String ACTION_QUICKBOOT = "android.intent.action.QUICKBOOT_POWERON"; private static final String ACTION_HTC_QUICKBOOT = "com.htc.intent.action.QUICKBOOT_POWERON"; + /** 自己给自己排的「再切一次前台」闹钟 */ + private static final String ACTION_RELAUNCH = "com.gztbyc.scancenter.action.RELAUNCH"; + + /** 开机后多久补一次前台(毫秒);0 = 立即 */ + private static final long[] RELAUNCH_DELAYS_MS = { 6000L, 15000L }; + @Override public void onReceive(Context context, Intent intent) { String action = intent == null ? "" : intent.getAction(); + if (ACTION_RELAUNCH.equals(action)) { + launch(context, "补切前台"); + return; + } + if (!Intent.ACTION_BOOT_COMPLETED.equals(action) && !ACTION_QUICKBOOT.equals(action) && !ACTION_HTC_QUICKBOOT.equals(action)) { @@ -43,17 +62,51 @@ public class BootReceiver extends BroadcastReceiver { } i("收到开机广播,准备自启动", action); + launch(context, "开机"); + + for (long delay : RELAUNCH_DELAYS_MS) { + schedule(context, delay); + } + } + + private void launch(Context context, String reason) { try { Intent launch = new Intent(context, MainActivity.class); // 从 Receiver 启动 Activity 必须带 NEW_TASK,否则直接抛异常 launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + // 从桌面/别的界面抢回前台时,用 REORDER_TO_FRONT 不会重建界面 + launch.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); context.startActivity(launch); - i("开机自启动已拉起设备端主界面"); + i("开机自启动已拉起设备端主界面", reason); } catch (Exception error) { // 自启动失败不该让进程崩掉:用户手动点图标仍然能进 - w("开机自启动失败,需要手动启动应用"); + w("开机自启动失败,需要手动启动应用", reason); e("开机自启动异常", error); } } + + /** 用闹钟延迟再拉起一次(进程被杀也能触发,比 Handler 稳) */ + private void schedule(Context context, long delayMs) { + try { + AlarmManager alarm = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + if (alarm == null) { + return; + } + Intent intent = new Intent(context, BootReceiver.class).setAction(ACTION_RELAUNCH); + PendingIntent pending = PendingIntent.getBroadcast( + context, (int) delayMs, intent, PendingIntent.FLAG_UPDATE_CURRENT); + long at = System.currentTimeMillis() + delayMs; + if (Build.VERSION.SDK_INT >= 23) { + alarm.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, at, pending); + } + else { + alarm.setExact(AlarmManager.RTC_WAKEUP, at, pending); + } + } + catch (Exception error) { + w("排补切前台闹钟失败", delayMs); + e("补切前台闹钟异常", error); + } + } } diff --git a/AndroidStation/app/src/main/res/layout/activity_settings.xml b/AndroidStation/app/src/main/res/layout/activity_settings.xml index aeb560c..3ef960d 100644 --- a/AndroidStation/app/src/main/res/layout/activity_settings.xml +++ b/AndroidStation/app/src/main/res/layout/activity_settings.xml @@ -152,6 +152,77 @@ android:textSize="14sp" /> + + + + + + + + + + + +