restaurant/Inbound20260114
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: restaurant/Inbound20260114:f53669d04806269d815e49e103d20a8db3dee2a2
Branches Tags
restaurant/Inbound20260114:main restaurant/Inbound20260114:dev_新系统适配_0526_基于0131 restaurant/Inbound20260114:main_lvmeng_0131
...
compare: restaurant/Inbound20260114:main_lvmeng_0131
Branches Tags
restaurant/Inbound20260114:dev_新系统适配_0526_基于0131 restaurant/Inbound20260114:main_lvmeng_0131 restaurant/Inbound20260114:main
27 Commits
f53669d048 ... main_lvmeng_0131
Author SHA1 Message Date
mazengfei 23149aa131 隐藏cvImageBg 2026-06-01 09:54:26 +08:00
mazengfei 1092a7c43d 接口报错显示具体信息 2026-05-25 10:33:33 +08:00
mazengfei 0c0aba2aeb 接口报错显示具体信息 2026-05-20 14:21:03 +08:00
mazengfei e81df4f55c 优化 2026-05-13 09:55:11 +08:00
lvmeng 07e0a1996f 入库单数据提交入库新增采购单号字段purCode 2026-05-11 18:20:35 +08:00
lvmeng 79f58a36e3 fix(activity): 修复拿走物品后识别弹窗未自动关闭的问题 
- 将关闭阈值从 weight < 10 调整为 weight < 20，覆盖轻微零点漂移
- 将 size == 1 判断改为 none { isShowing && it != goodsRecognizeDialog }，避免 DialogManager 中存在幽灵条目时导致关闭逻辑失效
- GoodsStoreDialog：无论 funcType 值，均拍照上传图片以增加样本数据
- BaseViewModel：recognizeGoodsList 增加异常捕获，异常时回调空列表
 2026-05-09 15:44:05 +08:00
lvmeng 7c5278bc88 Merge remote-tracking branch 'origin/main_lvmeng_0131' into main_lvmeng_0131 
# Conflicts:
#	app/src/main/assets/best_embedding_model_mobile.pt
#	app/src/main/assets/data/class_info.json
#	app/src/main/assets/data/embeddings.json
#	app/src/main/assets/data/labels.json
 2026-04-28 15:42:47 +08:00
lvmeng c995daf48d 优化已采集页面数据统计、更新初始化页面加载动画资源、替换新识别模型 2026-04-28 15:29:53 +08:00
mazengfeiandClaude Sonnet 4.6 d95a00b8a9 feat(global): 更新UAT端口并在切换环境时自动重置本地数据库及识别模型 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-22 16:03:45 +08:00
mazengfei 13f893cd0c 生产域名配置 2026-03-31 19:46:39 +08:00
lvmengandClaude Sonnet 4.6 8eae8c2b3c feat(global): 新增多环境切换弹窗及启动时自动读取已保存环境配置 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-31 09:25:16 +08:00
lvmeng 532f840a78 feat(model): 添加移动端嵌入模型文件 
- 新增 best_embedding_model_mobile.pt 模型文件
- 该模型用于移动端设备的嵌入计算功能
- 文件大小约为 431 行二进制数据
 2026-03-26 09:15:09 +08:00
mazengfei 21b9b03014 测试配置 2026-03-23 10:20:17 +08:00
mazengfei 4047cd67d8 Merge remote-tracking branch 'origin/main_lvmeng_0131' into main_lvmeng_0131 2026-03-23 10:12:23 +08:00
mazengfei 441d40b584 增加异常日志记录，接口报错提示，app启动时有网络不再进行倒计时处理 2026-03-23 10:12:11 +08:00
lvmeng 915e20cd23 Merge remote-tracking branch 'origin/main_lvmeng_0131' into main_lvmeng_0131 2026-03-20 15:58:40 +08:00
lvmeng d0fa46a8c8 增加测试环境配置 2026-03-20 15:58:30 +08:00
mazengfei 8a83de3238 优化 2026-03-16 10:33:09 +08:00
lvmeng 4b241ba81b feat(activity): 新增 InitActivity 初始化页面，实现网络检测和倒计时功能 2026-03-13 17:36:46 +08:00
lvmeng 75306af483 fix: 修正 Toast 扩展方法导入和更新下载地址 
- 恢复 ToastUtils.kt 为原始注释状态（Compose 版本）
- 修正 FunActivity 导入，使用 Common.kt 中已定义的 Context.toast 扩展方法
- 更新下载地址为真实的资源包地址
 2026-03-13 14:16:16 +08:00
lvmeng c697b4aa65 feat(activity): 添加 Zip 文件下载解压工具和趣味页面 
- 新增 ZipDownloadUtils：支持大文件下载、进度回调、断点续传
- 新增 ZipExtractUtils：支持 Zip 文件解压、进度回调、自动创建目录
- 新增 ModelResourceManager：高层资源管理器，协调下载和解压流程
- 新增 FunActivity：趣味测试页面，包含 3 个按钮
  - 按钮 1：下载 Zip 文件
  - 按钮 2：解压 Zip 文件
  - 按钮 3：读取 JSON 并保存到 ObjectBox 数据库
- 新增 activity_fun.xml：趣味页面布局
- 新增 ZipToolsUsageExample：工具使用示例文档
- 改进 ToastUtils：改为 Context 扩展方法 (toast/toastLong)
- 暂时注释 HomeActivity 中 tvTime 的点击事件
 2026-03-13 11:27:53 +08:00
lvmeng baee019444 ObjectBox数据库操作增加线程资源清理 2026-03-12 17:25:23 +08:00
lvmeng e50d6ceb60 入库列表页增加采集入库，方法采集完成直接入库和验证识别效果 2026-03-12 14:39:41 +08:00
lvmengandClaude Sonnet 4.6 7563209cf1 refactor(activity): 优化 FoodCollectionActivity 性能与稳定性 
- 修复 runBlocking 阻塞主线程，改为 lifecycleScope.launch 协程异步执行
- 耗时操作（I/O、图像裁剪、TFLite 推理、ObjectBox 读写）全部切换至 Dispatchers.IO
- 修复 bitmap 内存泄漏：用 try/finally 保证所有退出路径均回收
- 修复 uriToBitmap 返回 null 时 loading 转圈永不消失的 Bug
- 修复 DbException 块、index==-1 分支缺少 hideWaitingDialog() 的 Bug
- 移除重复 ReceiptViewModel，统一使用单例；移除空 initBox() 函数
- 新增 searchJob 取消上一次未完成搜索，修复 clearData() 遗漏取消的 Bug
- 提取 createWaitingDialog() 消除 dialog 创建代码重复
- 修复 clearCoilCache() 使用新实例无法清缓存，改用 context.imageLoader 单例
- upload() 两处强制解包 !! 改为安全调用，避免 NPE 崩溃
- 清理无用注释、废弃代码块、冗余注解及无用 import

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-11 18:04:21 +08:00
mazengfei 05015a7a18 优化采购的数据的重量清除问题 2026-03-10 17:24:25 +08:00
lvmeng 1cc2358d72 优化向量查询，替换新模型 2026-03-10 13:33:31 +08:00
lvmeng 1206ecd575 优化向量查询结果数据 2026-03-10 13:00:45 +08:00
55 changed files with 2824 additions and 823 deletions
Expand all files Collapse all files
.claude/commands/commit.md
+52
View File
@@ -0,0 +1,52 @@
请按以下步骤为当前改动生成 Git 提交信息并执行提交：
## 步骤
1. 并行运行以下命令，了解当前改动：
- `git diff --staged` 查看已暂存的变更内容
- `git diff` 查看未暂存的变更内容
- `git status` 查看变更文件列表
2. 若存在未暂存的文件，询问用户是否需要一起提交。
3. 根据变更内容，按以下规范生成提交信息：
**格式：** `<类型>(<范围>): <简短描述>`
| 类型 | 适用场景 |
|------|---------|
| feat | 新增功能 |
| fix | 修复 bug |
| refactor | 代码重构（不改变行为） |
| chore | 构建/配置/依赖调整 |
| docs | 文档更新 |
| perf | 性能优化 |
**范围参考本项目模块：**
- `face` — 人脸识别相关（LoginByFaceActivity、RecognizeViewModel）
- `serial` — 串口/开柜相关（SerialApi、PlateUtils）
- `network` — 网络层（ApiService、RemoteRepository、RequestInterceptor）
- `activity` — Activity 界面逻辑
- `fragment` — Fragment 界面逻辑
- `viewmodel` — ViewModel 层
- `ui` — 布局/样式调整
- `global` — GlobalData、MyApp 等全局配置
**示例：**
- `feat(face): 新增识别失败后自动采集人脸流程`
- `fix(serial): 修复开柜编号解析为负数导致串口指令异常`
- `refactor(network): 统一 API 地址使用 GlobalData.appBaseUrl 前缀`
4. 向用户展示拟提交的信息，确认后执行：
```
git add <相关文件>
git commit -m "<提交信息>"
```
5. 提交完成后运行 `git log --oneline -3` 确认结果。
## 约束
- 提交信息必须使用**简体中文**描述
- 不要使用 `--no-verify` 跳过钩子
- 不要在未经用户确认的情况下执行 `git push`
.claude/commands/new-api.md
+96
View File
@@ -0,0 +1,96 @@
在本项目中新增一个后端 API 接口，需要同时修改三层：ApiService → RemoteRepository → ViewModel。
## 步骤
### 1. 收集信息
询问用户以下信息（如已在指令中提供则跳过）：
- 接口名称/功能描述
- 请求方式：GET / POST / POST + FormUrlEncoded / Multipart
- 接口路径（相对路径，如 `/sideboard/app/xxx`）
- 请求参数字段和类型
- 响应数据类型（已有类 or 需新建）
- 归属哪个 ViewModel：`SettingViewModel` / `UserViewModel` / `DeviceViewModel`
### 2. 创建数据模型（如需要）
**请求参数类：** `app/src/main/java/com/sw/platecabinet/model/request/<XxxParam>.kt`
**响应数据类：** `app/src/main/java/com/sw/platecabinet/model/response/<XxxModel>.kt`
数据类规范：
```kotlin
/**
* <描述>
*/
data class XxxParam(
val fieldName: String // 字段说明
)
```
### 3. 在 ApiService 中添加接口方法
文件：`app/src/main/java/com/sw/platecabinet/network/api/ApiService.kt`
**关键规则：**
- 必须使用 `@Url` 注解，URL 格式为：`"${GlobalData.appBaseUrl}/terminal/neglect/<路径>"`
- 不要使用相对路径（baseUrl 拦截器不适用于本项目）
- 方法必须为 `suspend` 函数，返回 `ApiResponse<T>`
```kotlin
/**
* <接口功能描述>
*/
@POST // 或 @GET / @FormUrlEncoded @POST / @Multipart @POST
suspend fun <methodName>(
@Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/<路径>",
@Body param: XxxParam // 或 @Query / @Field / @Part
): ApiResponse<XxxModel?>
```
### 4. 在 RemoteRepository 中添加调用方法
文件：`app/src/main/java/com/sw/platecabinet/repository/RemoteRepository.kt`
```kotlin
/**
* <功能描述>
*/
suspend fun <methodName>(/* 参数 */): ApiResponse<XxxModel?> {
return safeApiCall {
apiService.<methodName>(/* 参数传递 */)
}
}
```
约束：
- 必须用 `safeApiCall { }` 包裹，不要裸调用 apiService
- 参数直接透传，不在 Repository 层做业务逻辑
### 5. 在 ViewModel 中添加调用逻辑
文件：`app/src/main/java/com/sw/platecabinet/viewmodel/<XxxViewModel>.kt`
```kotlin
/**
* <功能描述>
* @param callback 成功时回调，参数为响应数据
*/
fun <methodName>(/* 业务参数 */, callback: (XxxModel?) -> Unit) {
launch { // 不需要 loading 时用 launch；需要 loading 时用 launchWithLoading
val response = repository.<methodName>(/* 参数 */)
if (parseResponse(response)) {
runOnMainThread { callback(response.result) }
}
}
}
```
**注意：** `launch` / `launchWithLoading` 在协程中执行，回调若需更新 UI 需切换到主线程（使用 `withContext(Dispatchers.Main)` 或在 Activity 中用 `runOnUiThread`）。
### 6. 在 Activity/Fragment 中调用
```kotlin
viewModel.<methodName>(/* 参数 */) { result ->
// 处理结果
}
```
## 注意事项
- 所有注释使用简体中文
- 向用户展示将要修改的文件清单（含 Diff 预览），等待确认后再写文件
- `RequestInterceptor` 已自动注入认证 header，无需在方法中手动添加
- 响应体统一为 `ApiResponse<T>`，通过 `response.isSuccess()` 和 `response.result` 取数据
app/build.gradle.kts
+1 -1
View File
@@ -147,7 +147,7 @@ dependencies {
implementation("io.github.scwang90:refresh-layout-kernel:3.0.0-alpha") implementation("io.github.scwang90:refresh-layout-kernel:3.0.0-alpha")
implementation("io.github.scwang90:refresh-header-classics:3.0.0-alpha") implementation("io.github.scwang90:refresh-header-classics:3.0.0-alpha")
val objectboxVersion = "5.0.1" val objectboxVersion:String by rootProject.extra
if (isDebug) { if (isDebug) {
debugImplementation("io.objectbox:objectbox-android-objectbrowser:$objectboxVersion") debugImplementation("io.objectbox:objectbox-android-objectbrowser:$objectboxVersion")
} else { } else {
app/src/main/AndroidManifest.xml
+26 -27
View File
@@ -13,6 +13,7 @@
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="28" /> android:maxSdkVersion="28" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application <application
android:name=".MyApp" android:name=".MyApp"
@@ -40,6 +41,31 @@
<activity <activity
android:name=".activity.HomeActivity" android:name=".activity.HomeActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:exported="false"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:theme="@style/Theme.Inbound" />
<activity android:name="com.sw.inbound.activity.ReceiptActivity"
android:screenOrientation="landscape"
android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sw.inbound.activity.SelfProcurementActivity"
android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sw.inbound.activity.FoodCollectionActivity"
android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sw.inbound.activity.LocalImagePreviewActivity" />
<activity android:name="com.sw.inbound.activity.PurchaseOrderActivity" />
<activity android:name="com.sw.inbound.activity.FunActivity"
android:screenOrientation="landscape" />
<!-- 首页 Activity（XML 版本，对应 HomeScreen.kt Compose 版本） -->
<activity
android:name="com.sw.inbound.MainActivity"
android:screenOrientation="landscape" />
<!-- 初始化页面 Activity -->
<activity
android:name=".activity.InitActivity"
android:configChanges="orientation|screenSize"
android:exported="true" android:exported="true"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="landscape" android:screenOrientation="landscape"
@@ -50,33 +76,6 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.sw.inbound.activity.ReceiptActivity"
android:screenOrientation="landscape"
android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sw.inbound.activity.SelfProcurementActivity"
android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sw.inbound.activity.FoodCollectionActivity"
android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sw.inbound.activity.LocalImagePreviewActivity" />
<activity android:name="com.sw.inbound.activity.PurchaseOrderActivity" />
<!-- 首页 Activity（XML 版本，对应 HomeScreen.kt Compose 版本） -->
<activity
android:name="com.sw.inbound.MainActivity"
android:screenOrientation="landscape" />
<!-- <activity-->
<!-- android:name=".InitActivity"-->
<!-- android:configChanges="orientation|screenSize"-->
<!-- android:exported="true"-->
<!-- android:label="@string/app_name"-->
<!-- android:screenOrientation="landscape"-->
<!-- android:theme="@style/Theme.Inbound">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<!-- </activity>-->
</application> </application>
</manifest> </manifest>
app/src/main/assets/best_embedding_model_mobile.pt
BIN
View File
Binary file not shown.
app/src/main/assets/data/class_info.json
+393 -189
View File
@@ -2,268 +2,472 @@
"class_names": [ "class_names": [
"三黄鸡", "三黄鸡",
"上海青WP2026020200041", "上海青WP2026020200041",
"丝瓜WP2026032300114",
"乳瓜WP2026032000107",
"冬瓜WP2026032300115",
"冰糖",
"冰草WP2026020900054", "冰草WP2026020900054",
"刀豆", "刀豆",
"北豆腐WP2025111900007", "北豆腐WP2025111900007",
"南瓜[倭瓜，番瓜]",
"味精WP2026013000034", "味精WP2026013000034",
"圆生菜WP2026020900053", "圆生菜WP2026020900053",
"圆白菜[卷心菜，包菜]WP2025111000063",
"基围虾WP2025110700019", "基围虾WP2025110700019",
"多宝鱼WP2025112600011", "多宝鱼WP2025112600011",
"大白菜(代表值)WP2026022800638", "大白菜(代表值)WP2026031700085",
"大葱WP2026013000025", "大葱WP2026013000026",
"大蒜（去皮）WP2026020200011",
"大蒜（带皮）WP2026020300046",
"奶白菜",
"姜(子姜)[嫩姜]",
"姜[黄姜]WP2026022800956", "姜[黄姜]WP2026022800956",
"娃娃菜WP2026020200005", "娃娃菜WP2026020200005",
"小白菜WP2026022800031", "小白菜WP2026022800031",
"小米辣椒WP2026013000027", "小米辣椒WP2026013000027",
"小葱WP2026013000029", "小葱WP2026013000029",
"小鸡腿（带骨）",
"山药（带皮）WP2026020200008", "山药（带皮）WP2026020200008",
"巨人笋", "巨人笋",
"平菇[糙皮侧耳，青蘑]WP2026031700086",
"广东菜心WP2025120100014", "广东菜心WP2025120100014",
"新世纪哈密瓜",
"明虾",
"木耳(干)[黑木耳，云耳]WP2026022801182", "木耳(干)[黑木耳，云耳]WP2026022801182",
"杏鲍菇WP2026022700030", "杏鲍菇WP2026022700030",
"松花蛋", "松花蛋",
"松茸菌WP2025120100016", "松茸菌WP2025120100016",
"槐花[洋槐花，豆槐花]",
"橙",
"沙葱", "沙葱",
"洋葱（鲜）[葱头]WP2026022800612", "油麦菜WP2026031200077",
"海带(浸)[江白菜，昆布]WP2026022800035", "海带(浸)[江白菜，昆布]WP2026022800035",
"淀粉(马铃薯)",
"湿米线过桥米线",
"火龙果（带皮）",
"炒饼丝",
"牛肉(腹部肉)[牛腩]",
"牛肚",
"牛腩WP2025110700043", "牛腩WP2025110700043",
"猪五花肉WP2026020300048", "猪五花肉WP2026020300048",
"猪腿肉WP2025110700040", "猪小排（带骨）",
"猪排（带骨）WP2026031200078",
"猪肉(瘦）",
"猪肉(腿)WP2026022800033",
"猪肉(里脊)WP2026021000025",
"猪肝（鲜）WP2026032000105",
"猪肾（fat8g）[猪腰子]",
"玉米WP2025120100017", "玉米WP2025120100017",
"玉米糁(黄)WP2026022800038", "玉米糁(黄)WP2026022800038",
"甜椒[灯笼椒，柿子椒]WP2026020500018",
"生菜(叶用莴苣)WP2026020500020",
"生蚝",
"番茄[西红柿]WP2026021000028", "番茄[西红柿]WP2026021000028",
"白吉饼WP2026013000024", "白吉饼WP2026013000024",
"白玉菇WP2026031100072",
"白菜薹[菜薹，菜心]WP2026031100068",
"白萝卜WP2026031200079",
"石斑鱼（整条鱼）",
"笋", "笋",
"粉丝", "粉丝",
"紫甘蓝", "素鸡WP2026031700096",
"红心萝卜[心里美]WP2026022800368", "红心萝卜[心里美]WP2026022800368",
"红提子WP2025111900006", "红提子WP2025111900006",
"红椒WP2026030300055", "红椒WP2026030300055",
"红洋葱WP2026030600054",
"红美人椒WP2026020300049", "红美人椒WP2026020300049",
"红薯", "红薯",
"红薯粉条WP2026031700091",
"红薯粉条（袋）", "红薯粉条（袋）",
"结球甘蓝（紫）[圆白菜]WP2026020500017",
"结球甘蓝（绿）[圆白菜]WP2026032300116",
"绿豆芽WP2026031100073",
"羊排WP2025120300021", "羊排WP2025120300021",
"羊血WP2026013000038", "羊血WP2026013000038",
"胡萝卜WP2025110600008", "胡萝卜WP2025110600008",
"腰果(熟)",
"芋头", "芋头",
"芥蓝[甘蓝菜，盖蓝菜]",
"芦笋（绿）[石刁柏，龙须菜]",
"花卷", "花卷",
"芹菜WP2025111000065", "花椒（粉）",
"花生仁(生)WP2026032000102",
"花螺",
"芹菜(茎)[旱芹，药芹]WP2026022800032",
"苦菊", "苦菊",
"苹果(代表值)WP2026032300117",
"茄子（紫皮，长）WP2025110700024", "茄子（紫皮，长）WP2025110700024",
"茼蒿WP2026020200045", "茼蒿WP2026020200045",
"草鱼",
"荷兰豆WP2026032000104",
"莲藕（带皮）", "莲藕（带皮）",
"莴笋（鲜）[莴苣]WP2026020200009", "莴笋（鲜）[莴苣]WP2026020200009",
"菜花（白色）[花椰菜]", "菜花（白色）[花椰菜]WP2026030600057",
"菠菜（鲜）[赤根菜]WP2026022800700", "菠菜（鲜）[赤根菜]WP2026022800700",
"蒜WP2025111400003", "菠萝[凤梨，地菠萝]",
"蒜苗WP2026013000028", "蒜苗WP2026013000028",
"蒜薹（圆）", "蒜薹（圆）",
"蒸鱼豉油WP2026013000032", "蒸鱼豉油WP2026013000032",
"蕹菜[空心菜，藤藤菜]",
"薏米[薏仁米，苡米]WP2026022800037", "薏米[薏仁米，苡米]WP2026022800037",
"西兰花[绿菜花]WP2025110700029", "虫草花（干）WP2026032000108",
"西葫芦", "蛏子",
"豆腐皮WP2025111000059", "西兰花[绿菜花]WP2026031100071",
"豆角", "西瓜(代表值)",
"西芹[西洋芹菜，美芹]WP2026031100069",
"西葫芦WP2026021000027",
"豆腐干(代表值)",
"豆腐皮WP2026031700097",
"豆角豇豆WP2026021000026",
"赤小豆[小豆，红小豆](干)WP2026032300118",
"辣椒(红，小)WP2025111000066", "辣椒(红，小)WP2025111000066",
"辣椒(青，尖)WP2026022800504", "辣椒(青，尖)WP2026030600056",
"辣椒段（干）",
"醪糟", "醪糟",
"金针菇WP2025111900010", "金针菇[(鲜)[智力菇]WP2026030600051",
"青线椒WP2026013000031", "青线椒WP2026013000031",
"青美人椒辣椒(青，尖)",
"青花椒鲜花椒",
"面条（生，代表值）WP2026030600055",
"面条（生，炒细面",
"韭菜WP2026020200044", "韭菜WP2026020200044",
"韭薹",
"韭黄", "韭黄",
"馒头(代表值)WP2026030600056",
"香椿[香椿芽]WP2026022801086", "香椿[香椿芽]WP2026022801086",
"香菇", "香菇(鲜)[香蕈，冬菇]WP2026030600050",
"香菜WP2026013000030", "香菜WP2026013000030",
"马铃薯[土豆、洋芋]WP2026012900001", "马铃薯[土豆、洋芋]WP2026012900001",
"鱿鱼(鲜，中国枪乌贼）[枪乌贼]",
"鲍鱼（带壳）",
"鲑鱼[大马哈鱼,三文鱼]",
"鲜猪精排",
"鸡全腿（带骨）", "鸡全腿（带骨）",
"鸡翅（带骨）", "鸡翅（带骨）",
"鸡胸脯肉WP2026022802698",
"鸡腿肉WP2025110700048", "鸡腿肉WP2025110700048",
"鸡腿（带骨）", "鸡蛋WP2026013000039",
"鸡蛋（代表值)WP2026013000039", "鸭(均值)",
"麦芹", "鸭蛋黄",
"黄瓜（鲜）[胡瓜]WP2025110700031", "黄瓜（鲜）[胡瓜]WP2025110700031",
"黄豆",
"黄豆芽WP2026020200042", "黄豆芽WP2026020200042",
"黑米WP2026031200081",
"黑袋子", "黑袋子",
"黑鱼（整条鱼）WP2025110600012" "黑鱼（整条鱼）WP2025110600012"
], ],
"class_to_idx": { "class_to_idx": {
"三黄鸡": 0, "三黄鸡": 0,
"上海青WP2026020200041": 1, "上海青WP2026020200041": 1,
"冰草WP2026020900054": 2, "丝瓜WP2026032300114": 2,
"刀豆": 3, "乳瓜WP2026032000107": 3,
"北豆腐WP2025111900007": 4, "冬瓜WP2026032300115": 4,
"味精WP2026013000034": 5, "冰糖": 5,
"圆生菜WP2026020900053": 6, "冰草WP2026020900054": 6,
"圆白菜[卷心菜，包菜]WP2025111000063": 7, "刀豆": 7,
"基围虾WP2025110700019": 8, "北豆腐WP2025111900007": 8,
"多宝鱼WP2025112600011": 9, "南瓜[倭瓜，番瓜]": 9,
"大白菜(代表值)WP2026022800638": 10, "味精WP2026013000034": 10,
"大葱WP2026013000025": 11, "圆生菜WP2026020900053": 11,
"姜[黄姜]WP2026022800956": 12, "基围虾WP2025110700019": 12,
"娃娃菜WP2026020200005": 13, "多宝鱼WP2025112600011": 13,
"小白菜WP2026022800031": 14, "大白菜(代表值)WP2026031700085": 14,
"小米辣椒WP2026013000027": 15, "大葱WP2026013000026": 15,
"小葱WP2026013000029": 16, "大蒜（去皮）WP2026020200011": 16,
"山药（带皮）WP2026020200008": 17, "大蒜（带皮）WP2026020300046": 17,
"巨人笋": 18, "奶白菜": 18,
"广东菜心WP2025120100014": 19, "姜(子姜)[嫩姜]": 19,
"木耳(干)[黑木耳，云耳]WP2026022801182": 20, "姜[黄姜]WP2026022800956": 20,
"杏鲍菇WP2026022700030": 21, "娃娃菜WP2026020200005": 21,
"松花蛋": 22, "小白菜WP2026022800031": 22,
"松茸菌WP2025120100016": 23, "小米辣椒WP2026013000027": 23,
"沙葱": 24, "小葱WP2026013000029": 24,
"洋葱（鲜）[葱头]WP2026022800612": 25, "小鸡腿（带骨）": 25,
"海带(浸)[江白菜，昆布]WP2026022800035": 26, "山药（带皮）WP2026020200008": 26,
"牛腩WP2025110700043": 27, "巨人笋": 27,
"猪五花肉WP2026020300048": 28, "平菇[糙皮侧耳，青蘑]WP2026031700086": 28,
"猪腿肉WP2025110700040": 29, "广东菜心WP2025120100014": 29,
"玉米WP2025120100017": 30, "新世纪哈密瓜": 30,
"玉米糁(黄)WP2026022800038": 31, "明虾": 31,
"番茄[西红柿]WP2026021000028": 32, "木耳(干)[黑木耳，云耳]WP2026022801182": 32,
"白吉饼WP2026013000024": 33, "杏鲍菇WP2026022700030": 33,
"笋": 34, "松花蛋": 34,
"粉丝": 35, "松茸菌WP2025120100016": 35,
"紫甘蓝": 36, "槐花[洋槐花，豆槐花]": 36,
"红心萝卜[心里美]WP2026022800368": 37, "橙": 37,
"红提子WP2025111900006": 38, "沙葱": 38,
"红椒WP2026030300055": 39, "油麦菜WP2026031200077": 39,
"红美人椒WP2026020300049": 40, "海带(浸)[江白菜，昆布]WP2026022800035": 40,
"红薯": 41, "淀粉(马铃薯)": 41,
"红薯粉条（袋）": 42, "湿米线过桥米线": 42,
"羊排WP2025120300021": 43, "火龙果（带皮）": 43,
"羊血WP2026013000038": 44, "炒饼丝": 44,
"胡萝卜WP2025110600008": 45, "牛肉(腹部肉)[牛腩]": 45,
"芋头": 46, "牛肚": 46,
"花卷": 47, "牛腩WP2025110700043": 47,
"芹菜WP2025111000065": 48, "猪五花肉WP2026020300048": 48,
"苦菊": 49, "猪小排（带骨）": 49,
"茄子（紫皮，长）WP2025110700024": 50, "猪排（带骨）WP2026031200078": 50,
"茼蒿WP2026020200045": 51, "猪肉(瘦）": 51,
"莲藕（带皮）": 52, "猪肉(腿)WP2026022800033": 52,
"莴笋（鲜）[莴苣]WP2026020200009": 53, "猪肉(里脊)WP2026021000025": 53,
"菜花（白色）[花椰菜]": 54, "猪肝（鲜）WP2026032000105": 54,
"菠菜（鲜）[赤根菜]WP2026022800700": 55, "猪肾（fat8g）[猪腰子]": 55,
"蒜WP2025111400003": 56, "玉米WP2025120100017": 56,
"蒜苗WP2026013000028": 57, "玉米糁(黄)WP2026022800038": 57,
"蒜薹（圆）": 58, "甜椒[灯笼椒，柿子椒]WP2026020500018": 58,
"蒸鱼豉油WP2026013000032": 59, "生菜(叶用莴苣)WP2026020500020": 59,
"薏米[薏仁米，苡米]WP2026022800037": 60, "生蚝": 60,
"西兰花[绿菜花]WP2025110700029": 61, "番茄[西红柿]WP2026021000028": 61,
"西葫芦": 62, "白吉饼WP2026013000024": 62,
"豆腐皮WP2025111000059": 63, "白玉菇WP2026031100072": 63,
"豆角": 64, "白菜薹[菜薹，菜心]WP2026031100068": 64,
"辣椒(红，小)WP2025111000066": 65, "白萝卜WP2026031200079": 65,
"辣椒(青，尖)WP2026022800504": 66, "石斑鱼（整条鱼）": 66,
"醪糟": 67, "笋": 67,
"金针菇WP2025111900010": 68, "粉丝": 68,
"青线椒WP2026013000031": 69, "素鸡WP2026031700096": 69,
"韭菜WP2026020200044": 70, "红心萝卜[心里美]WP2026022800368": 70,
"韭黄": 71, "红提子WP2025111900006": 71,
"香椿[香椿芽]WP2026022801086": 72, "红椒WP2026030300055": 72,
"香菇": 73, "红洋葱WP2026030600054": 73,
"香菜WP2026013000030": 74, "红美人椒WP2026020300049": 74,
"马铃薯[土豆、洋芋]WP2026012900001": 75, "红薯": 75,
"鸡全腿（带骨）": 76, "红薯粉条WP2026031700091": 76,
"鸡翅（带骨）": 77, "红薯粉条（袋）": 77,
"鸡腿肉WP2025110700048": 78, "结球甘蓝（紫）[圆白菜]WP2026020500017": 78,
"鸡腿（带骨）": 79, "结球甘蓝（绿）[圆白菜]WP2026032300116": 79,
"鸡蛋（代表值)WP2026013000039": 80, "绿豆芽WP2026031100073": 80,
"麦芹": 81, "羊排WP2025120300021": 81,
"黄瓜（鲜）[胡瓜]WP2025110700031": 82, "羊血WP2026013000038": 82,
"黄豆芽WP2026020200042": 83, "胡萝卜WP2025110600008": 83,
"黑袋子": 84, "腰果(熟)": 84,
"黑鱼（整条鱼）WP2025110600012": 85 "芋头": 85,
"芥蓝[甘蓝菜，盖蓝菜]": 86,
"芦笋（绿）[石刁柏，龙须菜]": 87,
"花卷": 88,
"花椒（粉）": 89,
"花生仁(生)WP2026032000102": 90,
"花螺": 91,
"芹菜(茎)[旱芹，药芹]WP2026022800032": 92,
"苦菊": 93,
"苹果(代表值)WP2026032300117": 94,
"茄子（紫皮，长）WP2025110700024": 95,
"茼蒿WP2026020200045": 96,
"草鱼": 97,
"荷兰豆WP2026032000104": 98,
"莲藕（带皮）": 99,
"莴笋（鲜）[莴苣]WP2026020200009": 100,
"菜花（白色）[花椰菜]WP2026030600057": 101,
"菠菜（鲜）[赤根菜]WP2026022800700": 102,
"菠萝[凤梨，地菠萝]": 103,
"蒜苗WP2026013000028": 104,
"蒜薹（圆）": 105,
"蒸鱼豉油WP2026013000032": 106,
"蕹菜[空心菜，藤藤菜]": 107,
"薏米[薏仁米，苡米]WP2026022800037": 108,
"虫草花（干）WP2026032000108": 109,
"蛏子": 110,
"西兰花[绿菜花]WP2026031100071": 111,
"西瓜(代表值)": 112,
"西芹[西洋芹菜，美芹]WP2026031100069": 113,
"西葫芦WP2026021000027": 114,
"豆腐干(代表值)": 115,
"豆腐皮WP2026031700097": 116,
"豆角豇豆WP2026021000026": 117,
"赤小豆[小豆，红小豆](干)WP2026032300118": 118,
"辣椒(红，小)WP2025111000066": 119,
"辣椒(青，尖)WP2026030600056": 120,
"辣椒段（干）": 121,
"醪糟": 122,
"金针菇[(鲜)[智力菇]WP2026030600051": 123,
"青线椒WP2026013000031": 124,
"青美人椒辣椒(青，尖)": 125,
"青花椒鲜花椒": 126,
"面条（生，代表值）WP2026030600055": 127,
"面条（生，炒细面": 128,
"韭菜WP2026020200044": 129,
"韭薹": 130,
"韭黄": 131,
"馒头(代表值)WP2026030600056": 132,
"香椿[香椿芽]WP2026022801086": 133,
"香菇(鲜)[香蕈，冬菇]WP2026030600050": 134,
"香菜WP2026013000030": 135,
"马铃薯[土豆、洋芋]WP2026012900001": 136,
"鱿鱼(鲜，中国枪乌贼）[枪乌贼]": 137,
"鲍鱼（带壳）": 138,
"鲑鱼[大马哈鱼,三文鱼]": 139,
"鲜猪精排": 140,
"鸡全腿（带骨）": 141,
"鸡翅（带骨）": 142,
"鸡胸脯肉WP2026022802698": 143,
"鸡腿肉WP2025110700048": 144,
"鸡蛋WP2026013000039": 145,
"鸭(均值)": 146,
"鸭蛋黄": 147,
"黄瓜（鲜）[胡瓜]WP2025110700031": 148,
"黄豆": 149,
"黄豆芽WP2026020200042": 150,
"黑米WP2026031200081": 151,
"黑袋子": 152,
"黑鱼（整条鱼）WP2025110600012": 153
}, },
"idx_to_class": { "idx_to_class": {
"0": "三黄鸡", "0": "三黄鸡",
"1": "上海青WP2026020200041", "1": "上海青WP2026020200041",
"2": "冰草WP2026020900054", "2": "丝瓜WP2026032300114",
"3": "刀豆", "3": "乳瓜WP2026032000107",
"4": "北豆腐WP2025111900007", "4": "冬瓜WP2026032300115",
"5": "味精WP2026013000034", "5": "冰糖",
"6": "圆生菜WP2026020900053", "6": "冰草WP2026020900054",
"7": "圆白菜[卷心菜，包菜]WP2025111000063", "7": "刀豆",
"8": "基围虾WP2025110700019", "8": "北豆腐WP2025111900007",
"9": "多宝鱼WP2025112600011", "9": "南瓜[倭瓜，番瓜]",
"10": "大白菜(代表值)WP2026022800638", "10": "味精WP2026013000034",
"11": "大葱WP2026013000025", "11": "圆生菜WP2026020900053",
"12": "姜[黄姜]WP2026022800956", "12": "基围虾WP2025110700019",
"13": "娃娃菜WP2026020200005", "13": "多宝鱼WP2025112600011",
"14": "小白菜WP2026022800031", "14": "大白菜(代表值)WP2026031700085",
"15": "小米辣椒WP2026013000027", "15": "大葱WP2026013000026",
"16": "小葱WP2026013000029", "16": "大蒜（去皮）WP2026020200011",
"17": "山药（带皮）WP2026020200008", "17": "大蒜（带皮）WP2026020300046",
"18": "巨人笋", "18": "奶白菜",
"19": "广东菜心WP2025120100014", "19": "姜(子姜)[嫩姜]",
"20": "木耳(干)[黑木耳，云耳]WP2026022801182", "20": "姜[黄姜]WP2026022800956",
"21": "杏鲍菇WP2026022700030", "21": "娃娃菜WP2026020200005",
"22": "松花蛋", "22": "小白菜WP2026022800031",
"23": "松茸菌WP2025120100016", "23": "小米辣椒WP2026013000027",
"24": "沙葱", "24": "小葱WP2026013000029",
"25": "洋葱（鲜）[葱头]WP2026022800612", "25": "小鸡腿（带骨）",
"26": "海带(浸)[江白菜，昆布]WP2026022800035", "26": "山药（带皮）WP2026020200008",
"27": "牛腩WP2025110700043", "27": "巨人笋",
"28": "猪五花肉WP2026020300048", "28": "平菇[糙皮侧耳，青蘑]WP2026031700086",
"29": "猪腿肉WP2025110700040", "29": "广东菜心WP2025120100014",
"30": "玉米WP2025120100017", "30": "新世纪哈密瓜",
"31": "玉米糁(黄)WP2026022800038", "31": "明虾",
"32": "番茄[西红柿]WP2026021000028", "32": "木耳(干)[黑木耳，云耳]WP2026022801182",
"33": "白吉饼WP2026013000024", "33": "杏鲍菇WP2026022700030",
"34": "笋", "34": "松花蛋",
"35": "粉丝", "35": "松茸菌WP2025120100016",
"36": "紫甘蓝", "36": "槐花[洋槐花，豆槐花]",
"37": "红心萝卜[心里美]WP2026022800368", "37": "橙",
"38": "红提子WP2025111900006", "38": "沙葱",
"39": "红椒WP2026030300055", "39": "油麦菜WP2026031200077",
"40": "红美人椒WP2026020300049", "40": "海带(浸)[江白菜，昆布]WP2026022800035",
"41": "红薯", "41": "淀粉(马铃薯)",
"42": "红薯粉条（袋）", "42": "湿米线过桥米线",
"43": "羊排WP2025120300021", "43": "火龙果（带皮）",
"44": "羊血WP2026013000038", "44": "炒饼丝",
"45": "胡萝卜WP2025110600008", "45": "牛肉(腹部肉)[牛腩]",
"46": "芋头", "46": "牛肚",
"47": "花卷", "47": "牛腩WP2025110700043",
"48": "芹菜WP2025111000065", "48": "猪五花肉WP2026020300048",
"49": "苦菊", "49": "猪小排（带骨）",
"50": "茄子（紫皮，长）WP2025110700024", "50": "猪排（带骨）WP2026031200078",
"51": "茼蒿WP2026020200045", "51": "猪肉(瘦）",
"52": "莲藕（带皮）", "52": "猪肉(腿)WP2026022800033",
"53": "莴笋（鲜）[莴苣]WP2026020200009", "53": "猪肉(里脊)WP2026021000025",
"54": "菜花（白色）[花椰菜]", "54": "猪肝（鲜）WP2026032000105",
"55": "菠菜（鲜）[赤根菜]WP2026022800700", "55": "猪肾（fat8g）[猪腰子]",
"56": "蒜WP2025111400003", "56": "玉米WP2025120100017",
"57": "蒜苗WP2026013000028", "57": "玉米糁(黄)WP2026022800038",
"58": "蒜薹（圆）", "58": "甜椒[灯笼椒，柿子椒]WP2026020500018",
"59": "蒸鱼豉油WP2026013000032", "59": "生菜(叶用莴苣)WP2026020500020",
"60": "薏米[薏仁米，苡米]WP2026022800037", "60": "生蚝",
"61": "西兰花[绿菜花]WP2025110700029", "61": "番茄[西红柿]WP2026021000028",
"62": "西葫芦", "62": "白吉饼WP2026013000024",
"63": "豆腐皮WP2025111000059", "63": "白玉菇WP2026031100072",
"64": "豆角", "64": "白菜薹[菜薹，菜心]WP2026031100068",
"65": "辣椒(红，小)WP2025111000066", "65": "白萝卜WP2026031200079",
"66": "辣椒(青，尖)WP2026022800504", "66": "石斑鱼（整条鱼）",
"67": "醪糟", "67": "笋",
"68": "金针菇WP2025111900010", "68": "粉丝",
"69": "青线椒WP2026013000031", "69": "素鸡WP2026031700096",
"70": "韭菜WP2026020200044", "70": "红心萝卜[心里美]WP2026022800368",
"71": "韭黄", "71": "红提子WP2025111900006",
"72": "香椿[香椿芽]WP2026022801086", "72": "红椒WP2026030300055",
"73": "香菇", "73": "红洋葱WP2026030600054",
"74": "香菜WP2026013000030", "74": "红美人椒WP2026020300049",
"75": "马铃薯[土豆、洋芋]WP2026012900001", "75": "红薯",
"76": "鸡全腿（带骨）", "76": "红薯粉条WP2026031700091",
"77": "鸡翅（带骨）", "77": "红薯粉条（袋）",
"78": "鸡腿肉WP2025110700048", "78": "结球甘蓝（紫）[圆白菜]WP2026020500017",
"79": "鸡腿（带骨）", "79": "结球甘蓝（绿）[圆白菜]WP2026032300116",
"80": "鸡蛋（代表值)WP2026013000039", "80": "绿豆芽WP2026031100073",
"81": "麦芹", "81": "羊排WP2025120300021",
"82": "黄瓜（鲜）[胡瓜]WP2025110700031", "82": "羊血WP2026013000038",
"83": "黄豆芽WP2026020200042", "83": "胡萝卜WP2025110600008",
"84": "黑袋子", "84": "腰果(熟)",
"85": "黑鱼（整条鱼）WP2025110600012" "85": "芋头",
"86": "芥蓝[甘蓝菜，盖蓝菜]",
"87": "芦笋（绿）[石刁柏，龙须菜]",
"88": "花卷",
"89": "花椒（粉）",
"90": "花生仁(生)WP2026032000102",
"91": "花螺",
"92": "芹菜(茎)[旱芹，药芹]WP2026022800032",
"93": "苦菊",
"94": "苹果(代表值)WP2026032300117",
"95": "茄子（紫皮，长）WP2025110700024",
"96": "茼蒿WP2026020200045",
"97": "草鱼",
"98": "荷兰豆WP2026032000104",
"99": "莲藕（带皮）",
"100": "莴笋（鲜）[莴苣]WP2026020200009",
"101": "菜花（白色）[花椰菜]WP2026030600057",
"102": "菠菜（鲜）[赤根菜]WP2026022800700",
"103": "菠萝[凤梨，地菠萝]",
"104": "蒜苗WP2026013000028",
"105": "蒜薹（圆）",
"106": "蒸鱼豉油WP2026013000032",
"107": "蕹菜[空心菜，藤藤菜]",
"108": "薏米[薏仁米，苡米]WP2026022800037",
"109": "虫草花（干）WP2026032000108",
"110": "蛏子",
"111": "西兰花[绿菜花]WP2026031100071",
"112": "西瓜(代表值)",
"113": "西芹[西洋芹菜，美芹]WP2026031100069",
"114": "西葫芦WP2026021000027",
"115": "豆腐干(代表值)",
"116": "豆腐皮WP2026031700097",
"117": "豆角豇豆WP2026021000026",
"118": "赤小豆[小豆，红小豆](干)WP2026032300118",
"119": "辣椒(红，小)WP2025111000066",
"120": "辣椒(青，尖)WP2026030600056",
"121": "辣椒段（干）",
"122": "醪糟",
"123": "金针菇[(鲜)[智力菇]WP2026030600051",
"124": "青线椒WP2026013000031",
"125": "青美人椒辣椒(青，尖)",
"126": "青花椒鲜花椒",
"127": "面条（生，代表值）WP2026030600055",
"128": "面条（生，炒细面",
"129": "韭菜WP2026020200044",
"130": "韭薹",
"131": "韭黄",
"132": "馒头(代表值)WP2026030600056",
"133": "香椿[香椿芽]WP2026022801086",
"134": "香菇(鲜)[香蕈，冬菇]WP2026030600050",
"135": "香菜WP2026013000030",
"136": "马铃薯[土豆、洋芋]WP2026012900001",
"137": "鱿鱼(鲜，中国枪乌贼）[枪乌贼]",
"138": "鲍鱼（带壳）",
"139": "鲑鱼[大马哈鱼,三文鱼]",
"140": "鲜猪精排",
"141": "鸡全腿（带骨）",
"142": "鸡翅（带骨）",
"143": "鸡胸脯肉WP2026022802698",
"144": "鸡腿肉WP2025110700048",
"145": "鸡蛋WP2026013000039",
"146": "鸭(均值)",
"147": "鸭蛋黄",
"148": "黄瓜（鲜）[胡瓜]WP2025110700031",
"149": "黄豆",
"150": "黄豆芽WP2026020200042",
"151": "黑米WP2026031200081",
"152": "黑袋子",
"153": "黑鱼（整条鱼）WP2025110600012"
}, },
"embedding_dim": 512, "embedding_dim": 512,
"total_images": 2070, "total_images": 3180,
"build_time": "2026-03-06T09:38:05.028631" "build_time": "2026-04-27T14:13:11.594418"
} }
app/src/main/assets/data/embeddings.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/src/main/assets/data/labels.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/src/main/java/com/sw/inbound/GlobalData.kt
+6 -3
View File
@@ -41,10 +41,12 @@ object GlobalData {
var unitTypeList: List<DictType> = arrayListOf() var unitTypeList: List<DictType> = arrayListOf()
/** /**
* 具体业务baseurl * 具体业务 BaseUrl
*/ */
//var appBaseUrl: String = "http://192.168.1.201:14801" const val TEST_BASE_URL = "http://192.168.1.201:14801"
var appBaseUrl: String = "https://dev.yixiong-tech.com:8081" const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8083"
const val PROD_BASE_URL = "https://api.dm.yixiong-tech.com:8443"
var appBaseUrl: String = ""
/** /**
* 设备id * 设备id
@@ -66,4 +68,5 @@ object GlobalKey {
const val KEY_TOKEN = "tokenKey" const val KEY_TOKEN = "tokenKey"
const val KEY_USER_INFO = "userInfoKey" const val KEY_USER_INFO = "userInfoKey"
const val KEY_USER_NAME = "userNameKey" const val KEY_USER_NAME = "userNameKey"
const val KEY_BASE_URL = "baseUrlKey"
} }
app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
+137 -272
View File
@@ -1,14 +1,12 @@
package com.sw.inbound.activity package com.sw.inbound.activity
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Dialog
import android.content.Context import android.content.Context
import android.graphics.Bitmap
import android.net.Uri import android.net.Uri
import android.graphics.Bitmap
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import android.view.View import android.view.View
import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import com.sw.inbound.base.BaseActivity import com.sw.inbound.base.BaseActivity
import androidx.activity.viewModels import androidx.activity.viewModels
@@ -17,8 +15,8 @@ import androidx.core.view.updateLayoutParams
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import coil.ImageLoader
import coil.annotation.ExperimentalCoilApi import coil.annotation.ExperimentalCoilApi
import coil.imageLoader
import com.sw.inbound.R import com.sw.inbound.R
import com.sw.inbound.adapter.FoodCollectionAdapter import com.sw.inbound.adapter.FoodCollectionAdapter
import com.sw.inbound.adapter.GoodsSearchAdapter import com.sw.inbound.adapter.GoodsSearchAdapter
@@ -39,6 +37,8 @@ import com.sw.inbound.utils.BitmapSaver
import com.sw.inbound.utils.CameraUtils import com.sw.inbound.utils.CameraUtils
import com.sw.inbound.utils.ImageUploader import com.sw.inbound.utils.ImageUploader
import com.sw.inbound.utils.ImageUtil import com.sw.inbound.utils.ImageUtil
import com.sw.inbound.utils.LogSaveUtil
import com.sw.inbound.utils.NetworkUtils
import com.sw.inbound.utils.ext.addOnActionSearchListener import com.sw.inbound.utils.ext.addOnActionSearchListener
import com.sw.inbound.utils.ext.clickWithDebounce import com.sw.inbound.utils.ext.clickWithDebounce
import com.sw.inbound.utils.ext.dp import com.sw.inbound.utils.ext.dp
@@ -47,21 +47,20 @@ import com.sw.inbound.utils.ext.hideKeyboard
import com.sw.inbound.utils.ext.invisible import com.sw.inbound.utils.ext.invisible
import com.sw.inbound.utils.ext.startActivity import com.sw.inbound.utils.ext.startActivity
import com.sw.inbound.utils.ext.toJsonString import com.sw.inbound.utils.ext.toJsonString
import com.sw.inbound.utils.ext.toObject
import com.sw.inbound.utils.ext.toast import com.sw.inbound.utils.ext.toast
import com.sw.inbound.utils.ext.visible import com.sw.inbound.utils.ext.visible
import com.sw.inbound.viewmodel.ReceiptViewModel import com.sw.inbound.viewmodel.ReceiptViewModel
import com.sw.inbound.viewmodel.UserViewModel
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import io.objectbox.Box
import io.objectbox.exception.DbException import io.objectbox.exception.DbException
import io.objectbox.exception.FileCorruptException import io.objectbox.exception.FileCorruptException
import io.objectbox.kotlin.boxFor import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext
import okhttp3.RequestBody import okhttp3.RequestBody
import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.RequestBody.Companion.toRequestBody
import timber.log.Timber import timber.log.Timber
import java.io.File
/** /**
* 采集菜品 * 采集菜品
@@ -76,13 +75,12 @@ class FoodCollectionActivity : BaseActivity() {
const val PAGE_SIZE = 30 const val PAGE_SIZE = 30
} }
// private var box: Box<Food>? = null private val collectList: MutableList<FoodCollectionBean> = mutableListOf()
private val collectList: MutableList<FoodCollectionBean> = mutableListOf<FoodCollectionBean>()
private lateinit var binding: ActivityFoodCollectionBinding private lateinit var binding: ActivityFoodCollectionBinding
private lateinit var previewView: PreviewView private lateinit var previewView: PreviewView
val viewModel: ReceiptViewModel by viewModels() private val receiptViewModel: ReceiptViewModel by viewModels()
val userViewModel: UserViewModel by viewModels()
private val cameraUtils: CameraUtils by lazy { private val cameraUtils: CameraUtils by lazy {
CameraUtils(this) CameraUtils(this)
} }
@@ -90,9 +88,14 @@ class FoodCollectionActivity : BaseActivity() {
FoodCollectionAdapter(collectList).apply { FoodCollectionAdapter(collectList).apply {
setOnItemClickListener { adapter, view, position -> setOnItemClickListener { adapter, view, position ->
val file = collectList[position].imageFile ?: return@setOnItemClickListener val file = collectList[position].imageFile ?: return@setOnItemClickListener
// 磁盘读取和 TFLite 推理均为耗时操作，切换到 IO 线程执行
lifecycleScope.launch(Dispatchers.IO) {
ImageUtil.decodeFromFile(file)?.let { bitmap -> ImageUtil.decodeFromFile(file)?.let { bitmap ->
val imageVector = FoodModule.bitmap2FloatArray(bitmap, false) val imageVector = FoodModule.bitmap2FloatArray(bitmap, false)
Timber.tag(TAG).d("向量：${imageVector.toJsonString()}") Timber.tag(TAG).d("向量：${imageVector.toJsonString()}")
// 向量提取完毕后立即回收，避免内存泄漏
if (bitmap.isRecycled.not()) bitmap.recycle()
}
} }
} }
addOnItemChildClickListener(R.id.ivDelete) { _, _, position -> addOnItemChildClickListener(R.id.ivDelete) { _, _, position ->
@@ -105,8 +108,6 @@ class FoodCollectionActivity : BaseActivity() {
it.uploadSuccess = false it.uploadSuccess = false
} }
collectionAdapter.notifyItemChanged(position) collectionAdapter.notifyItemChanged(position)
// val count = collectList.count { it.imageFile != null && it.uploadSuccess.not() }
// binding.btnUploadImage.text = "待上传图片${count}张"
} }
} }
} }
@@ -128,7 +129,6 @@ class FoodCollectionActivity : BaseActivity() {
binding.llCameraFlag.visible() binding.llCameraFlag.visible()
} }
@SuppressLint("NotifyDataSetChanged")
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityFoodCollectionBinding.inflate(layoutInflater) binding = ActivityFoodCollectionBinding.inflate(layoutInflater)
@@ -163,14 +163,6 @@ class FoodCollectionActivity : BaseActivity() {
searchGoods() searchGoods()
} }
} }
// binding.btnUploadImage.setOnClickListener {
// val count = collectList.count { it.imageFile!=null && it.uploadSuccess.not() }
// if (count == 0) {
// toast("已全部上传成功")
// return@setOnClickListener
// }
// uploadAllImage()
// }
binding.btnSave.setOnClickListener { _ -> binding.btnSave.setOnClickListener { _ ->
if (clickIndex == -1) { if (clickIndex == -1) {
toast("请选择物品名称") toast("请选择物品名称")
@@ -181,8 +173,6 @@ class FoodCollectionActivity : BaseActivity() {
toast("请拍摄物品照片") toast("请拍摄物品照片")
return@setOnClickListener return@setOnClickListener
} }
// vectorThread()
// uploadAllImage()
showUploadDialog() showUploadDialog()
} }
binding.btnTakePhoto.clickWithDebounce(800) { binding.btnTakePhoto.clickWithDebounce(800) {
@@ -215,18 +205,6 @@ class FoodCollectionActivity : BaseActivity() {
startActivity<LocalImagePreviewActivity> { } startActivity<LocalImagePreviewActivity> { }
} }
binding.tvTitle.setOnClickListener {
// startActivity<LocalImagePreviewActivity> { }
// val goodsImage = GoodsImage(goodsId = "1993493094888140802", goodsName = "多宝鱼", startTime = 1764120531856L, endTime = 1764121842825L)
// uploadImage(goodsImage)
// val goodsImage = GoodsImage(goodsId = "1986366073649287170", goodsName = "黑鱼（整条鱼）", startTime = 1764122703093L, endTime = 1764123156022L)
// uploadImage(goodsImage)
// val goodsImage = GoodsImage(goodsId = "1986699063868801025", goodsName = "鸡腿肉", startTime = 1764123375841L, endTime = 1764124039162L)
// uploadImage(goodsImage)
}
} }
private fun showUploadDialog() { private fun showUploadDialog() {
@@ -238,6 +216,10 @@ class FoodCollectionActivity : BaseActivity() {
}, },
confirmBlock = { confirmBlock = {
if (NetworkUtils.isNetworkConnected(this).not()) {
toast("网络异常，请稍后重试")
return@WarnDialog
}
upload() upload()
} }
).show() ).show()
@@ -245,6 +227,8 @@ class FoodCollectionActivity : BaseActivity() {
private var pageNo = 1 private var pageNo = 1
private var clickIndex = -1 private var clickIndex = -1
// 保存当前搜索任务，用于在新搜索发起时取消上一次未完成的请求
private var searchJob: Job? = null
private val searchGoodsList: MutableList<SearchGoodsInfo.Record> = mutableListOf() private val searchGoodsList: MutableList<SearchGoodsInfo.Record> = mutableListOf()
private val searchAdapter by lazy { private val searchAdapter by lazy {
@@ -274,7 +258,6 @@ class FoodCollectionActivity : BaseActivity() {
} }
} }
@SuppressLint("NotifyDataSetChanged")
private fun takePhoto() { private fun takePhoto() {
val count = collectList.count { it.imageFile != null } val count = collectList.count { it.imageFile != null }
if (count == MAX_COUNT) { if (count == MAX_COUNT) {
@@ -285,10 +268,12 @@ class FoodCollectionActivity : BaseActivity() {
cameraUtils.takePhoto(cameraCallback) cameraUtils.takePhoto(cameraCallback)
} }
@SuppressLint("NotifyDataSetChanged")
private fun clearData() { private fun clearData() {
val count = collectList.count { it.imageFile != null } val count = collectList.count { it.imageFile != null }
if (count == 0) return if (count == 0) return
// 取消正在进行的搜索，防止清空后回调重新填充数据
searchJob?.cancel()
searchJob = null
clearCoilCache(this) clearCoilCache(this)
collectList.forEach { collectList.forEach {
try { try {
@@ -313,7 +298,6 @@ class FoodCollectionActivity : BaseActivity() {
searchAdapter.notifyDataSetChanged() searchAdapter.notifyDataSetChanged()
loadEmptyView() loadEmptyView()
binding.ivFinish.invisible() binding.ivFinish.invisible()
// binding.btnUploadImage.text = "待上传图片${0}张"
} }
private val cameraCallback: (Uri) -> Unit = { uri -> private val cameraCallback: (Uri) -> Unit = { uri ->
@@ -326,48 +310,77 @@ class FoodCollectionActivity : BaseActivity() {
val index = collectList.indexOfFirst { it.imageFile == null } val index = collectList.indexOfFirst { it.imageFile == null }
if (index == -1) { if (index == -1) {
toast("每次只允许保存${MAX_COUNT}条数据") toast("每次只允许保存${MAX_COUNT}条数据")
showWaitingDialog2("加载中") hideWaitingDialog()
return return
} }
// toast("index=$index") // 将 bitmap/cropBitmap 提到外层，确保任意退出路径都能在 finally 中回收，避免内存泄漏
var bitmap: Bitmap? = null
var cropBitmap: Bitmap? = null
try { try {
ImageUtil.uriToBitmap(this, uri)?.let { bitmap -> // 所有耗时操作（磁盘 I/O、图像裁剪、TFLite 推理）切换到 IO 线程，避免阻塞主线程
val cropBitmap = BitmapCropper.cropCenter( bitmap = withContext(Dispatchers.IO) {
ImageUtil.uriToBitmap(this@FoodCollectionActivity, uri)
}
if (bitmap == null) {
// uriToBitmap 返回 null 时关闭 loading，否则转圈永不消失
hideWaitingDialog()
toast("图片读取失败，请重试")
LogSaveUtil.saveLogFile("图片读取失败，请重试")
return
}
cropBitmap = withContext(Dispatchers.IO) {
BitmapCropper.cropCenter(
original = bitmap, original = bitmap,
targetWidth = 1000, targetHeight = 1300, targetWidth = 1000, targetHeight = 1300,
offsetX = 30, offsetY = 100 offsetX = 30, offsetY = 100
) )
initBox() }
val imageVector = try { val imageVector = try {
// TFLite 推理为 CPU 密集型，切换到 IO 线程执行
withContext(Dispatchers.IO) {
FoodModule.bitmap2FloatArray(cropBitmap, false) FoodModule.bitmap2FloatArray(cropBitmap, false)
}
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
hideWaitingDialog() hideWaitingDialog()
toast("操作失败") toast("操作失败")
return@let LogSaveUtil.saveLogFile("操作失败:${e.message}")
return
} }
Timber.tag(TAG).d("向量：${imageVector.toJsonString()}") Timber.tag(TAG).d("向量：${imageVector.toJsonString()}")
val foodList = try { val foodList = try {
// 数据库查询切换到 IO 线程
withContext(Dispatchers.IO) {
FoodModule.queryFoodNameScore(imageVector) FoodModule.queryFoodNameScore(imageVector)
}
} catch (e: DbException) { } catch (e: DbException) {
hideWaitingDialog()
try { try {
ObjectBox.init(this) // ObjectBox 重新初始化为磁盘 I/O，切换到 IO 线程
withContext(Dispatchers.IO) {
ObjectBox.init(this@FoodCollectionActivity)
}
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
} }
toast("数据库异常，请稍后重试") toast("数据库异常，请稍后重试")
return@let LogSaveUtil.saveLogFile("数据库异常，请稍后重试:${e.message}")
return
} }
val filterList = val filterList =
foodList.filter { it.score < FoodModule.BAG_RATE && it.name.contains("黑袋子") } foodList.filter { it.score < FoodModule.BAG_RATE && it.name.contains("黑袋子") }
if (filterList.isNotEmpty()) { if (filterList.isNotEmpty()) {
hideWaitingDialog() hideWaitingDialog()
toast("当前物品可能被袋子遮挡，请检查后重试") toast("当前物品可能被袋子遮挡，请检查后重试")
return@let LogSaveUtil.saveLogFile("当前物品可能被袋子遮挡，请检查后重试")
return
} }
val file = BitmapSaver.saveToAppFilesDir( // 图片保存为磁盘 I/O，切换到 IO 线程
cropBitmap, this, "IMG_CROP_${System.currentTimeMillis()}.jpg" val file = withContext(Dispatchers.IO) {
BitmapSaver.saveToAppFilesDir(
cropBitmap, this@FoodCollectionActivity, "IMG_CROP_${System.currentTimeMillis()}.jpg"
) )
}
Timber.d("${this.javaClass.simpleName}-searchFood-裁剪bitmap保存文件路径：${file?.absolutePath}") Timber.d("${this.javaClass.simpleName}-searchFood-裁剪bitmap保存文件路径：${file?.absolutePath}")
collectList[index].let { collectList[index].let {
it.imageVector = imageVector it.imageVector = imageVector
@@ -378,16 +391,7 @@ class FoodCollectionActivity : BaseActivity() {
it.uploadSuccess = false it.uploadSuccess = false
} }
collectionAdapter.notifyItemChanged(index) collectionAdapter.notifyItemChanged(index)
// val count = collectList.count { it.imageFile != null && it.uploadSuccess.not() }
// binding.btnUploadImage.text = "待上传图片${count}张"
if (cropBitmap.isRecycled.not()) {
cropBitmap.recycle()
}
if (bitmap.isRecycled.not()) {
bitmap.recycle()
}
hideWaitingDialog() hideWaitingDialog()
}
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
hideWaitingDialog() hideWaitingDialog()
@@ -397,14 +401,23 @@ class FoodCollectionActivity : BaseActivity() {
e is DbException e is DbException
) { ) {
try { try {
ObjectBox.init(this) // ObjectBox 重新初始化为磁盘 I/O，切换到 IO 线程
withContext(Dispatchers.IO) {
ObjectBox.init(this@FoodCollectionActivity)
}
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
} }
toast("请重试") toast("请重试")
LogSaveUtil.saveLogFile("请重试:${e.message}")
} else { } else {
toast("程序异常$errMsg") toast("程序异常$errMsg")
LogSaveUtil.saveLogFile("程序异常$errMsg:${e.message}")
} }
} finally {
// 无论成功、失败还是提前返回，均在此回收 bitmap，彻底消除内存泄漏
if (cropBitmap?.isRecycled == false) cropBitmap.recycle()
if (bitmap?.isRecycled == false) bitmap.recycle()
} }
} }
@@ -412,15 +425,13 @@ class FoodCollectionActivity : BaseActivity() {
Loading.show(this) Loading.show(this)
lifecycleScope.launch { lifecycleScope.launch {
collectList collectList
//.filter { it.bitmap != null }
// .filter { it.imageVector != null }
.forEachIndexed { index, it -> .forEachIndexed { index, it ->
//image2VectorTask(it.bitmap!!, index)
it.imageVector?.let { imageVector -> it.imageVector?.let { imageVector ->
image2VectorTask(imageVector = imageVector, position = index) image2VectorTask(imageVector = imageVector, position = index)
} }
} }
runOnUiThread { // lifecycleScope 默认在主线程，直接切换到主线程调度器更新 UI
withContext(Dispatchers.Main) {
window.decorView.postDelayed({ window.decorView.postDelayed({
Loading.dismiss() Loading.dismiss()
toast("保存成功") toast("保存成功")
@@ -430,30 +441,19 @@ class FoodCollectionActivity : BaseActivity() {
} }
private suspend fun image2VectorTask( private suspend fun image2VectorTask(
bitmap: Bitmap? = null, imageVector: FloatArray,
imageVector: FloatArray? = null,
position: Int position: Int
) { ) {
try { try {
initBox()
// val imageVector = try {
// FoodModule.bitmap2FloatArray(bitmap)
// } catch (e: Exception) {
// e.printStackTrace()
// //toast("保存失败")
// return
// }
val goods = searchGoodsList[clickIndex] val goods = searchGoodsList[clickIndex]
val saveName = goods.goodsName + goods.goodsCode val saveName = goods.goodsName + goods.goodsCode
// ObjectBox.boxStore.runInTx { // ObjectBox 写入为磁盘 I/O，切换到 IO 线程避免主线程卡顿
// box?.put(Food(name = saveName, foodIdx = 0, foodVector = imageVector)) withContext(Dispatchers.IO) {
// }
ObjectBox.put(Food(name = saveName, foodIdx = 0, foodVector = imageVector)) ObjectBox.put(Food(name = saveName, foodIdx = 0, foodVector = imageVector))
collectList[position].let {
// it.imageVector = imageVector
it.isFinish = true
} }
runOnUiThread { collectList[position].isFinish = true
// 切换到主线程刷新列表项，与协程调度器保持一致
withContext(Dispatchers.Main) {
collectionAdapter.notifyItemChanged(position) collectionAdapter.notifyItemChanged(position)
} }
} catch (e: Exception) { } catch (e: Exception) {
@@ -461,7 +461,6 @@ class FoodCollectionActivity : BaseActivity() {
} }
} }
@SuppressLint("NotifyDataSetChanged")
private fun searchGoods() { private fun searchGoods() {
val searchName = binding.etGoodsInput.text.toString().trim() val searchName = binding.etGoodsInput.text.toString().trim()
if (searchName.isBlank()) { if (searchName.isBlank()) {
@@ -516,77 +515,54 @@ class FoodCollectionActivity : BaseActivity() {
pageSize: Int = PAGE_SIZE, pageSize: Int = PAGE_SIZE,
callback: (List<SearchGoodsInfo.Record>) -> Unit callback: (List<SearchGoodsInfo.Record>) -> Unit
) { ) {
runBlocking { // 取消上一次未完成的搜索，避免并发竞争导致结果乱序
val records = viewModel.searchGoodsInfoList2( searchJob?.cancel()
searchJob = lifecycleScope.launch {
val records = receiptViewModel.searchGoodsInfoList2(
goodsName = searchName, goodsName = searchName,
pageNo = pageNo, pageNo = pageNo,
pageSize = pageSize pageSize = pageSize
) )
runOnUiThread {
callback(records) callback(records)
} }
} }
}
private fun initBox() {
// if (box == null) {
// box = ObjectBox.boxStore.boxFor(Food::class)
// }
}
// private fun uploadAllImage() {
// Loading.show(this)
// val files = collectList.filter { it.imageFile!=null }.map { it.imageFile!! }
// if (files.isEmpty()) {
// return
// }
// val goods = searchGoodsList[clickIndex]
// for (index in collectList.indices step 5) {
// val end = if(index + 5 < collectList.size - 1) index + 5 else collectList.size - 1
// val subList = collectList.subList(index, end)
// val subFiles = subList.map { it.imageFile }
// viewModel.uploadMultipleImages(goods.id!!, goods.goodsName!!, subFiles) {isSuccess->
// Timber.tag(TAG).d("uploadMultipleImages: ${isSuccess}")
// subList.filter { it.imageFile!=null }.forEach { it.uploadSuccess = isSuccess }
//
// val count = collectList.count { it.imageFile!=null && it.uploadSuccess.not() }
// runOnUiThread {
// binding.btnUploadImage.text = "待上传图片${count}张"
// if (count == 0) {
// Loading.dismiss()
// }
// }
// }
// }
// }
private fun upload() { private fun upload() {
lifecycleScope.launch { lifecycleScope.launch {
val totalFileCount = collectList.count { it.imageFile != null } val totalFileCount = collectList.count { it.imageFile != null }
showWaitingDialog2("图片上传中0/$totalFileCount") showWaitingDialog2("图片上传中0/$totalFileCount")
val goods = searchGoodsList[clickIndex] val goods = searchGoodsList[clickIndex]
val params = HashMap<String, RequestBody>() val params = HashMap<String, RequestBody>()
params["goodsId"] = goods.id!!.toRequestBody() // 使用安全调用避免 id/goodsName 为 null 时崩溃，字段缺失则跳过上传
params["goodsName"] = goods.goodsName!!.toRequestBody() val goodsId = goods.id ?: run {
//params["foodVector"] = foodVector.toRequestBody() hideWaitingDialog()
toast("商品数据异常，请重新选择")
return@launch
}
val goodsName = goods.goodsName ?: run {
hideWaitingDialog()
toast("商品数据异常，请重新选择")
return@launch
}
params["goodsId"] = goodsId.toRequestBody()
params["goodsName"] = goodsName.toRequestBody()
ImageUploader( ImageUploader(
totalList = collectList, totalList = collectList,
uploadImage = { batch -> uploadImage = { batch ->
val files = batch.map { it.imageFile } val files = batch.map { it.imageFile }
viewModel.uploadMultipleImages(files = files, params) receiptViewModel.uploadMultipleImages(files = files, params)
}, },
onProgress = { count, batch -> onProgress = { count, batch ->
runOnUiThread { // lifecycleScope 默认在主线程执行，无需 runOnUiThread
showWaitingDialog2("图片上传中$count/$totalFileCount") showWaitingDialog2("图片上传中$count/$totalFileCount")
batch.forEach { batch.forEach {
it.uploadSuccess = true it.uploadSuccess = true
} }
}
}, },
onError = { onError = {
runOnUiThread { // lifecycleScope 默认在主线程执行，无需 runOnUiThread
hideWaitingDialog() hideWaitingDialog()
toast("上传失败，请稍后重试") toast("上传失败，请稍后重试")
}
}, },
onComplete = { onComplete = {
hideWaitingDialog() hideWaitingDialog()
@@ -596,10 +572,9 @@ class FoodCollectionActivity : BaseActivity() {
} }
} }
private val receiptViewModel: ReceiptViewModel by viewModels()
fun searchGoodsInfoList(goodsName: String, block: (List<SearchGoodsInfo.Record>) -> Unit) { fun searchGoodsInfoList(goodsName: String, block: (List<SearchGoodsInfo.Record>) -> Unit) {
runBlocking { // 使用协程异步执行，避免阻塞主线程
lifecycleScope.launch {
val list = searchGoodsInfoList2(goodsName) val list = searchGoodsInfoList2(goodsName)
block(list) block(list)
} }
@@ -610,25 +585,35 @@ class FoodCollectionActivity : BaseActivity() {
pageNo: Int = 1, pageNo: Int = 1,
pageSize: Int = 10 pageSize: Int = 10
): List<SearchGoodsInfo.Record> { ): List<SearchGoodsInfo.Record> {
// 统一使用类顶部声明的 viewModel，避免重复创建 ViewModel 实例
return receiptViewModel.searchGoodsInfoList2(goodsName, pageNo, pageSize) return receiptViewModel.searchGoodsInfoList2(goodsName, pageNo, pageSize)
} }
private var mDialogWaiting: CustomDialog? = null private var mDialogWaiting: CustomDialog? = null
/** /**
* 显示等待提示框 * 内部方法：创建并显示等待提示框（调用前须确保已在主线程）
* showWaitingDialog 与 showWaitingDialog2 共用此创建逻辑，避免重复代码
*/
private fun createWaitingDialog(tip: String?) {
mDialogWaiting?.dismiss()
mDialogWaiting = null
val view = View.inflate(this, R.layout.dialog_waiting, null)
if (!TextUtils.isEmpty(tip)) {
(view.findViewById<View>(R.id.tvTip) as TextView).text = tip
}
mDialogWaiting = CustomDialog(this, view, R.style.MyDialog).apply {
show()
setCanceledOnTouchOutside(true)
setCancelable(true)
}
}
/**
* 显示等待提示框（每次调用都重新创建对话框）
*/ */
fun showWaitingDialog(tip: String?) { fun showWaitingDialog(tip: String?) {
runOnUiThread { runOnUiThread { createWaitingDialog(tip) }
hideWaitingDialog()
val view = View.inflate(this, R.layout.dialog_waiting, null)
if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).text =
tip
mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
mDialogWaiting!!.show()
mDialogWaiting!!.setCanceledOnTouchOutside(true)
mDialogWaiting!!.setCancelable(true)
}
} }
/** /**
@@ -641,19 +626,18 @@ class FoodCollectionActivity : BaseActivity() {
} }
} }
/**
* 显示或更新等待提示框
* 若对话框已存在则仅更新文字，否则创建新对话框
*/
fun showWaitingDialog2(tip: String?) { fun showWaitingDialog2(tip: String?) {
runOnUiThread { runOnUiThread {
if (mDialogWaiting == null) { if (mDialogWaiting == null) {
hideWaitingDialog() createWaitingDialog(tip)
val view = View.inflate(this, R.layout.dialog_waiting, null) } else {
mDialogWaiting = CustomDialog(this, view, R.style.MyDialog) // 对话框已显示，仅更新提示文字
mDialogWaiting!!.show() mDialogWaiting?.findViewById<TextView>(R.id.tvTip)?.text = tip
mDialogWaiting!!.setCanceledOnTouchOutside(true)
mDialogWaiting!!.setCancelable(true)
} }
val contentView = mDialogWaiting?.findViewById<ViewGroup>(android.R.id.content)
val tvTip = contentView?.findViewById<TextView>(R.id.tvTip)
tvTip?.text = tip
} }
} }
@@ -662,128 +646,9 @@ class FoodCollectionActivity : BaseActivity() {
*/ */
@OptIn(ExperimentalCoilApi::class) @OptIn(ExperimentalCoilApi::class)
fun clearCoilCache(context: Context) { fun clearCoilCache(context: Context) {
val imageLoader = ImageLoader.Builder(context).build() // 使用 Coil 全局单例，避免每次新建 ImageLoader 实例导致清除无效
// 清除内存缓存 context.imageLoader.memoryCache?.clear()
imageLoader.memoryCache?.clear() context.imageLoader.diskCache?.clear()
// 清除磁盘缓存
imageLoader.diskCache?.clear()
} }
data class RespData(
var code: String? = null,
var data: String? = null,
var msg: String? = null,
)
data class GoodsImage(
var goodsId: String,
var goodsName: String,
var startTime: Long,
var endTime: Long
)
//
// val goodsImageList = mutableListOf<GoodsImage>().apply {
// add(
// GoodsImage(
// goodsId = "1986353555971297282",
// goodsName = "马铃薯[土豆、洋芋]",
// startTime = 1763692477786L,
// endTime = 1763693153825L
// )
// )
// add(GoodsImage(
// goodsId = "1986607476769869825",
// goodsName = "辣椒(青辣椒，螺丝椒)",
// startTime = 1763693182929L,
// endTime = 1763693621664L
// ))
// add(GoodsImage(
// goodsId = "1987880591453859842",
// goodsName = "辣椒(红，小)",
// startTime = 1763693683837L,
// endTime = 1763694154521L
// ))
// add(GoodsImage(
// goodsId = "1986699063868801025",
// goodsName = "鸡腿肉",
// startTime = 1763694221267L,
// endTime = 1763695052924L
// ))
//
// add(GoodsImage(
// goodsId = "1986689570300809217",
// goodsName = "猪腿肉",
// startTime = 1763695212428L,
// endTime = 1763695810578L
// ))
// add(GoodsImage(
// goodsId = "1986673470079029249",
// goodsName = "西兰花[绿菜花]",
// startTime = 1763695924575L,
// endTime = 1763696252669L
// ))
// add(GoodsImage(
// goodsId = "1991473021965070338",
// goodsName = "姜[黄姜]",
// startTime = 1763696258001L,
// endTime = 1763696294831L
// ))
// add(GoodsImage(
// goodsId = "00000",
// goodsName = "其它",
// startTime = 1763696442577L,
// endTime = 1763696990541L
// ))
// }
// private fun uploadImage(goodsImage: GoodsImage) {
// Loading.show(this)
// val cropFile = File(this.cacheDir, "crop")
// val list = mutableListOf<File>()
// val startTime = goodsImage.startTime
// val endTime = goodsImage.endTime
// cropFile.listFiles()?.forEach {
// if (it.isDirectory) {
// return@forEach
// }
// val start = "IMG_CROP_".length
// val end = it.name.indexOf(".jpg")
// val time = it.name.substring(start, end).toLong()
// if (time in startTime..endTime) {
// list.add(it)
// }
// if (list.size < 5) {
// return@forEach
// }
// viewModel.uploadMultipleImages(
// goodsId = goodsImage.goodsId,
// goodsName = goodsImage.goodsName,
// files = list
// ) { isSuccess ->
//// val resp = data?.toObject<RespData>()
//// val isSuccess = resp?.code == "00000"
// binding.ivFinish.run {
// if (isSuccess) visible() else invisible()
// }
// }
// list.clear()
// }
// if (list.isNotEmpty()) {
// viewModel.uploadMultipleImages(
// goodsId = goodsImage.goodsId,
// goodsName = goodsImage.goodsName,
// files = list
// ) { isSuccess ->
//// val resp = data?.toObject<RespData>()
//// val isSuccess = resp?.code == "00000"
// binding.ivFinish.run {
// if (isSuccess) visible() else invisible()
// }
// }
// }
// Loading.dismiss()
// }
} }
app/src/main/java/com/sw/inbound/activity/FunActivity.kt
+298
View File
@@ -0,0 +1,298 @@
package com.sw.inbound.activity
import android.os.Bundle
import androidx.lifecycle.lifecycleScope
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.sw.inbound.base.BaseActivity
import com.sw.inbound.databinding.ActivityFunBinding
import com.sw.inbound.objbox.Food
import com.sw.inbound.objbox.FoodClassInfo
import com.sw.inbound.objbox.ObjectBox
import com.sw.inbound.utils.ext.toast
import com.sw.inbound.utils.ZipDownloadUtils
import com.sw.inbound.utils.ZipExtractUtils
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import timber.log.Timber
import java.io.File
/**
* 趣味页面 Activity
* 用于测试 Zip 文件下载、解压和数据库操作
*/
@AndroidEntryPoint
class FunActivity : BaseActivity() {
private lateinit var binding: ActivityFunBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityFunBinding.inflate(layoutInflater)
setContentView(binding.root)
initViews()
}
/**
* 初始化各控件的点击事件
*/
private fun initViews() {
// 返回按钮点击事件
binding.ivBack.setOnClickListener {
finish()
}
// 下载按钮
binding.btnDownload.setOnClickListener {
downloadZipFile()
}
// 解压按钮
binding.btnExtract.setOnClickListener {
extractZipFile()
}
// 读取并保存按钮
binding.btnLoadAndSave.setOnClickListener {
loadAndSaveToDatabase()
}
}
/**
* 下载 Zip 文件
*/
private fun downloadZipFile() {
lifecycleScope.launch {
try {
updateProgress("开始下载...")
binding.btnDownload.isEnabled = false
val zipFile = File(cacheDir, "model_resources.zip")
// 假的下载地址
val downloadUrl = "https://dev.yixiong-tech.com:8081/common/files/20260313/embedding_model_resources.zip"
withContext(Dispatchers.IO) {
ZipDownloadUtils.downloadZip(
downloadUrl = downloadUrl,
targetFile = zipFile,
listener = object : ZipDownloadUtils.DownloadProgressListener {
override fun onProgress(currentSize: Long, totalSize: Long, progress: Int) {
updateProgress("下载中... $progress%")
}
override fun onSuccess(file: File) {
updateProgress("下载完成！文件大小: ${formatFileSize(file.length())}")
Timber.d("Zip 文件下载完成: ${file.absolutePath}")
}
override fun onFailure(exception: Exception) {
updateProgress("下载失败: ${exception.message}")
Timber.e(exception, "下载失败")
this@FunActivity.toast("下载失败: ${exception.message}")
}
}
)
}
} catch (e: Exception) {
Timber.e(e, "下载异常")
updateProgress("异常: ${e.message}")
this@FunActivity.toast("异常: ${e.message}")
} finally {
binding.btnDownload.isEnabled = true
}
}
}
/**
* 解压 Zip 文件
*/
private fun extractZipFile() {
lifecycleScope.launch {
try {
updateProgress("开始解压...")
binding.btnExtract.isEnabled = false
val zipFile = File(cacheDir, "model_resources.zip")
val targetDir = File(cacheDir, "model_resources")
if (!zipFile.exists()) {
updateProgress("Zip 文件不存在，请先下载")
this@FunActivity.toast("Zip 文件不存在，请先下载")
return@launch
}
withContext(Dispatchers.IO) {
ZipExtractUtils.extractZip(
zipFile = zipFile,
targetDir = targetDir,
listener = object : ZipExtractUtils.ExtractProgressListener {
override fun onProgress(
currentFile: String,
currentIndex: Int,
totalFiles: Int,
progress: Int
) {
updateProgress("解压中... $progress% ($currentIndex/$totalFiles)")
}
override fun onSuccess(targetDir: File) {
updateProgress("解压完成！目录: ${targetDir.absolutePath}")
Timber.d("Zip 文件解压完成: ${targetDir.absolutePath}")
}
override fun onFailure(exception: Exception) {
updateProgress("解压失败: ${exception.message}")
Timber.e(exception, "解压失败")
this@FunActivity.toast("解压失败: ${exception.message}")
}
}
)
}
} catch (e: Exception) {
Timber.e(e, "解压异常")
updateProgress("异常: ${e.message}")
this@FunActivity.toast("异常: ${e.message}")
} finally {
binding.btnExtract.isEnabled = true
}
}
}
/**
* 读取解压后的文件并保存到 ObjectBox 数据库
*/
private fun loadAndSaveToDatabase() {
lifecycleScope.launch {
try {
updateProgress("开始读取数据...")
binding.btnLoadAndSave.isEnabled = false
val resourcesDir = File(cacheDir, "model_resources")
if (!resourcesDir.exists()) {
updateProgress("资源目录不存在，请先解压")
this@FunActivity.toast("资源目录不存在，请先解压")
return@launch
}
withContext(Dispatchers.IO) {
// 清除已有数据
updateProgress("清除已有数据...")
clearFoodData()
// 读取 JSON 文件
updateProgress("读取 JSON 文件...")
val embeddingsJson = readFileContent(File(resourcesDir, "data/embeddings.json"))
val labelsJson = readFileContent(File(resourcesDir, "data/labels.json"))
val classInfoJson = readFileContent(File(resourcesDir, "data/class_info.json"))
if (embeddingsJson.isEmpty() || labelsJson.isEmpty() || classInfoJson.isEmpty()) {
updateProgress("JSON 文件读取失败")
this@FunActivity.toast("JSON 文件读取失败")
return@withContext
}
// 解析 JSON 数据
updateProgress("解析 JSON 数据...")
val embeddingsList: List<List<Float>> =
Gson().fromJson(embeddingsJson, object : TypeToken<List<List<Float>>>() {}.type)
val labelsList: IntArray = Gson().fromJson(labelsJson, IntArray::class.java)
val classInfo: FoodClassInfo =
Gson().fromJson(classInfoJson, FoodClassInfo::class.java)
// 构建 Food 对象列表
updateProgress("构建数据对象...")
val foodMap = classInfo.idx_to_class
val foodList = mutableListOf<Food>()
val size = embeddingsList.size
Timber.d("开始构建 Food 对象，总数: $size")
embeddingsList.forEachIndexed { index, floatList ->
val classIdx = labelsList[index]
val foodName = foodMap["$classIdx"]
val array = floatList.toFloatArray()
val food = Food(name = foodName, foodVector = array, foodIdx = -1)
foodList.add(food)
// 每 100 条更新一次进度
if ((index + 1) % 100 == 0) {
val progress = ((index + 1) * 100) / size
updateProgress("构建数据中... $progress% (${index + 1}/$size)")
}
}
// 保存到数据库
updateProgress("保存到数据库...")
ObjectBox.putAll(foodList)
updateProgress("完成！已保存 ${foodList.size} 条数据到数据库")
Timber.d("数据保存完成，总数: ${foodList.size}")
}
} catch (e: Exception) {
Timber.e(e, "读取和保存异常")
updateProgress("异常: ${e.message}")
this@FunActivity.toast("异常: ${e.message}")
} finally {
binding.btnLoadAndSave.isEnabled = true
}
}
}
/**
* 清除 Food 表中的所有数据
*/
private suspend fun clearFoodData() {
try {
ObjectBox.safeDbOp {
val box = ObjectBox.getBox<Food>()
box?.removeAll()
Timber.d("Food 表数据已清除")
}
} catch (e: Exception) {
Timber.e(e, "清除数据失败")
}
}
/**
* 读取文件内容
*/
private fun readFileContent(file: File): String {
return try {
if (!file.exists()) {
Timber.w("文件不存在: ${file.absolutePath}")
""
} else {
file.readText()
}
} catch (e: Exception) {
Timber.e(e, "读取文件失败: ${file.absolutePath}")
""
}
}
/**
* 更新进度显示
*/
private fun updateProgress(message: String) {
runOnUiThread {
binding.tvProgress.text = message
Timber.d("进度: $message")
}
}
/**
* 格式化文件大小
*/
private fun formatFileSize(bytes: Long): String {
return when {
bytes <= 0 -> "0 B"
bytes < 1024 -> "$bytes B"
bytes < 1024 * 1024 -> String.format("%.2f KB", bytes / 1024.0)
bytes < 1024 * 1024 * 1024 -> String.format("%.2f MB", bytes / (1024.0 * 1024))
else -> String.format("%.2f GB", bytes / (1024.0 * 1024 * 1024))
}
}
}
app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt
+41 -60
View File
@@ -41,6 +41,7 @@ import com.sw.inbound.model.response.SearchGoodsInfo
import com.sw.inbound.objbox.FoodModule import com.sw.inbound.objbox.FoodModule
import com.sw.inbound.objbox.FoodModule.IdNameScore import com.sw.inbound.objbox.FoodModule.IdNameScore
import com.sw.inbound.sdk.SensorScaleUtils import com.sw.inbound.sdk.SensorScaleUtils
import com.sw.inbound.sdk.WeightCallback
import com.sw.inbound.utils.BitmapCropper import com.sw.inbound.utils.BitmapCropper
import com.sw.inbound.utils.BitmapSaver import com.sw.inbound.utils.BitmapSaver
import com.sw.inbound.utils.CameraUtils import com.sw.inbound.utils.CameraUtils
@@ -52,6 +53,7 @@ import com.sw.inbound.utils.ext.dp
import com.sw.inbound.utils.ext.gone import com.sw.inbound.utils.ext.gone
import com.sw.inbound.utils.ext.hideKeyboard import com.sw.inbound.utils.ext.hideKeyboard
import com.sw.inbound.utils.ext.roundedDecimalPlace import com.sw.inbound.utils.ext.roundedDecimalPlace
import com.sw.inbound.utils.ext.startActivity
import com.sw.inbound.utils.ext.toJsonString import com.sw.inbound.utils.ext.toJsonString
import com.sw.inbound.utils.ext.toast import com.sw.inbound.utils.ext.toast
import com.sw.inbound.viewmodel.ReceiptViewModel import com.sw.inbound.viewmodel.ReceiptViewModel
@@ -76,6 +78,7 @@ abstract class GoodsListActivity : BaseActivity() {
private const val TAG = "GoodsListActivity" private const val TAG = "GoodsListActivity"
public const val ID = "id" public const val ID = "id"
public const val SUPPLIER_ID = "supplierId" public const val SUPPLIER_ID = "supplierId"
public const val PUR_CODE = "purCode"
public const val IS_RECEIPT_PAGE = "isReceiptPage" public const val IS_RECEIPT_PAGE = "isReceiptPage"
// public const val IS_NEW_RECEIPT = "isNewReceipt" // public const val IS_NEW_RECEIPT = "isNewReceipt"
@@ -89,6 +92,7 @@ abstract class GoodsListActivity : BaseActivity() {
// var isNewReceipt: Boolean = false // var isNewReceipt: Boolean = false
var id: String = "" var id: String = ""
var supplierId: String = "" var supplierId: String = ""
var purCode: String = ""
lateinit var binding: ActivityGoodsListBinding lateinit var binding: ActivityGoodsListBinding
val receiptViewModel: ReceiptViewModel by viewModels() val receiptViewModel: ReceiptViewModel by viewModels()
val userViewModel: UserViewModel by viewModels() val userViewModel: UserViewModel by viewModels()
@@ -108,12 +112,14 @@ abstract class GoodsListActivity : BaseActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityGoodsListBinding.inflate(layoutInflater) binding = ActivityGoodsListBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
cameraUtils.initCamera()
initBackDispatcher() initBackDispatcher()
isReceiptPage = intent.getBooleanExtra(IS_RECEIPT_PAGE, true) isReceiptPage = intent.getBooleanExtra(IS_RECEIPT_PAGE, true)
//isNewReceipt = intent.getBooleanExtra(IS_NEW_RECEIPT, false) //isNewReceipt = intent.getBooleanExtra(IS_NEW_RECEIPT, false)
id = intent.getStringExtra(ID) ?: "" id = intent.getStringExtra(ID) ?: ""
supplierId = intent.getStringExtra(SUPPLIER_ID) ?: "" supplierId = intent.getStringExtra(SUPPLIER_ID) ?: ""
cameraUtils.initCamera() purCode = intent.getStringExtra(PUR_CODE) ?: ""
replaceIncludeContent() replaceIncludeContent()
initRecyclerView() initRecyclerView()
initView() initView()
@@ -121,7 +127,9 @@ abstract class GoodsListActivity : BaseActivity() {
it.hideKeyboard() it.hideKeyboard()
} }
binding.btnBack.setOnClickListener { handleBackEvent() } binding.btnBack.setOnClickListener { handleBackEvent() }
binding.tvTitle.setOnClickListener {
startActivity<FoodCollectionActivity>()
}
binding.flWarehouseDropdown.setOnClickListener { v -> binding.flWarehouseDropdown.setOnClickListener { v ->
if (GlobalData.warehouseTypeList.isEmpty()) { if (GlobalData.warehouseTypeList.isEmpty()) {
toast("暂无仓库数据") toast("暂无仓库数据")
@@ -161,10 +169,23 @@ abstract class GoodsListActivity : BaseActivity() {
height = 1 height = 1
} }
} }
binding.btnClearZero.setOnClickListener {
SensorScaleUtils.tare()
}
userViewModel.getInitInfo()
}
override fun onResume() {
super.onResume()
cameraUtils.bind()
cameraUtils.setPreviewController(previewView) cameraUtils.setPreviewController(previewView)
//startTime = System.currentTimeMillis()
binding.root.postDelayed({ binding.root.postDelayed({
SensorScaleUtils.addWeightListener { SensorScaleUtils.addWeightListener(weightIntCallback)
}, 1 * 1500)
}
private var weightIntCallback: WeightCallback = {
runOnUiThread { runOnUiThread {
try { try {
weightCallback?.invoke(it) weightCallback?.invoke(it)
@@ -174,52 +195,6 @@ abstract class GoodsListActivity : BaseActivity() {
} }
} }
} }
}, 1 * 1000)
binding.btnClearZero.setOnClickListener {
SensorScaleUtils.tare()
}
//val array = arrayOf("1","2","qwe")
//Timber.tag(TAG).d("测试：${array[2].toInt()}")
userViewModel.getInitInfo()
// lifecycleScope.launch {
// ObjectBox.put(
// Food(
// name = "测试",
// foodIdx = -100,
// foodVector = floatArrayOf(
// 0.015068196f,0.0f,0.0f,0.0f,0.0037743463f,0.0f,0.0f,0.07893528f,0.0f,0.0f,0.0f,0.0f,0.052832354f,0.0f,0.045785826f,0.0f,6.156802E-4f,0.04242764f,0.0f,0.0f,0.0f,0.0f,0.11469748f,0.13930011f,0.005731758f,0.03159248f,0.018799406f,0.028927676f,0.03472497f,0.01896616f,0.078822434f,0.0f,0.015187703f,0.0f,0.033177234f,0.07078301f,0.0f,0.0f,0.012238876f,0.0f,0.0f,0.0f,0.0f,0.0f,0.10691055f,0.008628067f,0.0f,0.0f,0.0f,0.0f,0.0f,0.06886323f,0.0f,0.0f,0.10460233f,0.0f,0.0f,0.0f,0.0f,0.0f,0.012850592f,0.0f,0.0f,0.103946045f,0.0f,0.018065454f,0.046292588f,0.063853905f,0.0f,0.10074362f,0.110680245f,0.10660499f,0.0f,0.06775707f,0.0f,0.0f,0.0f,0.0f,0.01639176f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.024850294f,0.0f,0.05308442f,0.0f,0.0f,0.0f,0.028708044f,0.02787582f,0.0f,0.0f,0.0f,0.0f,0.0f,0.027483912f,0.11719905f,0.04781422f,0.09033941f,0.09655397f,0.0032244714f,0.0f,0.0f,0.09580024f,0.07075415f,0.0876085f,0.0f,0.08756652f,2.2919098E-4f,0.019845076f,0.0f,0.0f,0.0f,0.04727701f,0.007276267f,0.0f,0.12660357f,0.03222255f,0.00182945f,0.0f,0.0f,0.0f,0.0f,0.0f,0.09080463f,0.0043369643f,0.0f,0.0f,0.0f,0.0f,0.0f,0.073994264f,0.0f,0.030294247f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.04890032f,0.0f,0.05318369f,0.0f,0.0f,0.0510094f,0.0f,0.0f,0.0f,0.12696978f,0.0f,0.21870367f,0.0f,0.0f,0.0f,0.0f,0.022256335f,0.13343737f,0.0f,0.0f,0.0f,0.0f,0.025192281f,0.1621841f,0.031685397f,0.0f,0.0f,0.03057069f,0.011333849f,0.0f,0.0f,0.11482361f,0.10645431f,0.0f,0.0f,0.0f,0.039949007f,0.0f,0.018850718f,0.0f,0.0f,0.0f,0.026081126f,0.0f,0.07934742f,0.0f,0.0f,0.0f,0.0f,0.0f,0.007998445f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.098366655f,0.0f,0.01606297f,0.16557153f,0.0f,0.0f,0.0f,0.0f,0.042638786f,0.024310581f,0.0f,0.027677892f,5.940642E-4f,0.0f,0.0f,0.0f,0.0f,0.05605889f,0.0f,0.0f,0.05216231f,0.080610394f,0.0f,0.0f,0.0f,0.0f,0.0f,0.07294793f,0.0f,0.02029506f,0.0f,0.0f,0.0f,0.12797904f,0.16668096f,0.083295606f,0.07768397f,0.07725612f,0.0f,0.0f,0.07259326f,0.110221304f,0.0f,0.0f,0.0f,0.0f,0.0f,0.027140126f,0.0f,0.053474665f,0.0f,0.018286237f,0.0f,0.0f,0.12152021f,0.0f,0.0f,0.0822232f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.04146023f,0.0f,0.034810524f,0.0f,0.00393797f,0.0f,0.032150663f,0.0f,0.0f,0.0f,0.0f,0.097777024f,0.0f,0.0f,0.0f,0.078797914f,0.0f,0.1292709f,0.0f,0.010623558f,0.0f,0.08360209f,0.0f,0.0f,0.122683614f,0.0f,0.0f,0.0f,0.0f,0.10111214f,0.10537941f,0.0f,0.0f,0.0f,0.0f,0.06272928f,0.0f,0.029668529f,0.049171254f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.032665383f,0.0f,0.0f,0.044802308f,0.0f,0.0f,0.05388319f,0.0f,0.0f,0.079517856f,0.012373011f,0.0f,0.01629987f,0.014890053f,0.0f,0.027798127f,0.0f,0.051028676f,0.15331483f,0.024111472f,0.0f,0.0f,0.0f,0.0f,0.0f,0.013699274f,0.0f,0.0f,0.07011116f,0.03022409f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.10939847f,0.0f,0.0f,0.0f,0.030306451f,0.0f,0.0f,0.12335773f,0.0f,0.0f,0.09099765f,0.0f,0.0f,0.0073862355f,0.0f,0.027847463f,0.0840776f,0.04207977f,0.046206567f,0.06679146f,0.0f,0.0f,0.01625976f,0.022998374f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.059722353f,0.0f,0.012246756f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.04984296f,0.0f,0.1435546f,0.0f,0.14667304f,0.079418436f,0.1305641f,0.014777453f,0.0f,0.020115053f,0.05619832f,0.011520876f,0.0f,0.11993748f,0.009492612f,0.019984039f,0.0f,0.0f,0.0f,0.0f,0.043548502f,0.0f,0.0f,0.0f,0.0f,0.15310751f,0.0f,0.0f,0.0f,0.0f,0.0f,0.018038996f,0.0021733972f,0.0f,0.0f,0.0f,0.0f,0.060995787f,0.06326715f,0.0f,0.06896745f,0.013745607f,5.018817E-4f,0.0f,0.0f,0.14184067f,0.019447664f,0.047488734f,0.13301876f,0.0f,0.0f,0.06715185f,0.0f,0.0f,0.0025059544f,0.0013816518f,0.0f,0.00415278f,0.17231767f,0.0073697185f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0017814273f,0.040113796f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.016738398f,0.0f,0.10465313f,0.0f,0.057283692f,0.0f,0.05406501f,0.0f,0.012632326f,0.0f,0.0f,0.0f,0.10440692f,0.0f,0.0047152108f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.11544036f
// )
// )
// )
// ObjectBox.remove("测试")
// ObjectBox.safeDbOp {
// val vector2 = floatArrayOf(
// 0.029274145f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.04849013f,0.0f,0.0f,0.0030461443f,0.0f,0.04333778f,0.0f,0.036458552f,0.0f,0.0f,0.032146808f,0.0f,0.0f,0.0f,0.0f,0.12563168f,0.16337962f,0.0086008925f,0.028651662f,0.05676712f,0.038951095f,0.035215054f,0.023515426f,0.09426005f,0.0f,0.0f,0.0f,0.019520408f,0.09774056f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.12273409f,0.03317896f,0.0f,0.0f,0.0f,0.0f,0.0f,0.056036845f,0.0f,0.005601604f,0.09232295f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.10639726f,0.017117623f,0.0f,0.04106111f,0.06582154f,0.0f,0.10570599f,0.10395363f,0.11154216f,0.0f,0.09019618f,0.0f,0.0f,0.0f,0.0f,0.008780864f,0.0f,0.0f,0.01997713f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.016066022f,0.020096382f,0.0f,0.05578338f,0.0f,0.0f,0.0f,0.048834037f,0.031760734f,0.0f,0.0f,0.0f,0.0f,0.0f,0.02459963f,0.11993096f,0.047805987f,0.070974134f,0.10536186f,0.0f,0.0f,0.0f,0.111894555f,0.08973926f,0.071053386f,0.0f,0.071883f,0.005135076f,0.0f,0.0f,0.0f,0.0f,0.023139987f,0.027882056f,0.0f,0.12620124f,0.05076331f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.06944067f,0.0146693f,0.0f,0.0f,0.0f,0.0f,0.00978479f,0.04965295f,0.0f,0.03953311f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.05496083f,0.0f,0.05957852f,0.0f,0.0f,0.05285405f,0.0f,0.0f,0.0f,0.10977843f,0.0f,0.21329264f,0.0f,0.0f,0.0f,0.0f,0.022029493f,0.12511873f,0.0f,0.0f,0.0f,0.0f,0.015391711f,0.1697028f,0.035269253f,0.0f,0.0f,0.0070471396f,0.0f,0.0f,0.0f,0.123943165f,0.10272677f,0.0f,0.0f,0.0f,0.06351426f,0.0f,0.009808158f,0.0f,0.0f,0.0f,0.02582221f,0.0f,0.0745801f,0.0f,0.0f,0.023285847f,0.0f,0.0f,0.017162288f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.09181752f,0.0f,0.007880242f,0.15574618f,0.0f,0.0f,0.0f,0.0f,0.02478441f,0.039601766f,0.0f,0.049401764f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0793202f,0.0f,0.0f,0.071133174f,0.09675928f,0.0f,0.015621623f,0.0f,0.0f,0.0f,0.08347399f,0.009147923f,0.0f,0.0f,0.0f,0.0f,0.14187747f,0.15219086f,0.12055488f,0.07175866f,0.07192898f,0.0f,0.0f,0.04634941f,0.12534219f,0.0f,0.0f,0.0f,0.008665879f,0.0f,0.040081337f,0.0f,0.06729515f,0.0f,0.058273762f,0.0020215393f,0.0f,0.10878004f,0.0f,0.0f,0.09762441f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.03849448f,0.0f,0.03300536f,0.0f,0.0f,0.013231625f,0.018584426f,0.0f,0.0f,0.0f,0.0f,0.08124468f,0.0f,0.0f,0.0f,0.060708806f,0.0f,0.11115098f,0.0f,0.0f,0.0f,0.0803424f,0.0f,0.0f,0.115781434f,0.0f,0.00764197f,0.0f,0.0f,0.121340856f,0.0869794f,0.0f,0.0f,0.0f,0.0f,0.045324527f,0.0f,0.015057986f,0.048937548f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.030864827f,0.0f,0.0029875587f,0.03196471f,0.0f,0.0f,0.054534424f,0.0f,0.0f,0.07863297f,0.019617077f,0.0f,0.026181744f,0.0f,0.0f,0.021914937f,0.0f,0.063720085f,0.16607703f,0.006567324f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0017898319f,0.0f,0.0f,0.04841979f,0.0044351136f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.15329078f,0.0f,0.0f,0.0f,0.030429695f,0.0f,0.0f,0.11840538f,0.0f,0.0f,0.107368395f,0.014730752f,0.0f,0.0f,0.0f,0.030180579f,0.039591953f,0.03209204f,0.048180148f,0.0676186f,0.0f,0.0f,0.03614289f,0.030257396f,1.5626202E-4f,0.018185573f,0.0f,0.0f,0.0f,0.0f,0.055325508f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.051894154f,0.0f,0.12869093f,0.0f,0.122797504f,0.083724305f,0.12840301f,0.0f,0.0f,0.0f,0.05686797f,0.0f,0.0f,0.11015593f,0.018203156f,0.020094728f,0.0f,0.0f,0.0f,0.0f,0.058597155f,0.0f,0.0f,0.0f,0.0f,0.12797132f,0.0f,0.006606713f,0.0f,0.0f,0.0f,0.028628595f,0.0f,0.0f,0.0f,0.0f,0.0f,0.050383586f,0.07132696f,0.0f,0.092209496f,0.0f,0.0f,0.0f,0.0f,0.14604862f,0.01660271f,0.057229653f,0.13104743f,0.0f,0.0f,0.06136706f,0.0f,0.0f,0.0f,0.0011910667f,0.0f,0.0f,0.15921566f,0.0f,0.0f,0.0f,0.0f,0.007558685f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.007532647f,0.05110198f,0.00667856f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0016389234f,0.0f,0.0f,0.0f,0.0f,0.018518167f,0.0f,0.08580791f,0.0f,0.06099585f,0.0f,0.0366169f,0.0f,0.0f,0.0f,0.0f,0.0f,0.073218584f,0.0f,0.0f,0.0f,0.008933658f,0.0f,0.0f,0.0f,0.0f,0.0f,0.116691895f
// )
// ObjectBox.getBox<Food>()?.let {
// val query: Query<Food>? = it.query(
// Food_.foodVector
// .nearestNeighbors(vector2, 5)
// )?.build()
// try {
// val list = query?.findIdsWithScores()
// val resultList = mutableListOf<String>()
// list?.forEach { idWithScore ->
// val food = it.get(idWithScore.id)
// resultList.add("${food.name}|${food.id}|${idWithScore.score}")
// }
// Timber.tag(TAG).d("比较结果：${resultList.joinToString(separator = ",")}")
// } finally {
// // 先关闭Query，释放Cursor
// query?.close()
// }
// }
// }
// }
}
private var weightCallback: ((weight: Int) -> Unit)? = null private var weightCallback: ((weight: Int) -> Unit)? = null
fun readWeightInfo(callback: (weight: Int) -> Unit) { fun readWeightInfo(callback: (weight: Int) -> Unit) {
@@ -238,13 +213,13 @@ abstract class GoodsListActivity : BaseActivity() {
binding.tvTotalWeight.text = "重量：${weight}克" binding.tvTotalWeight.text = "重量：${weight}克"
} }
if (weight < 200) { if (weight < 200) {
if (weight < 10) { if (weight < 20) {
// val clazzName = DialogManager.getDialogList() // val clazzName = DialogManager.getDialogList()
// .map { it.javaClass.simpleName } // .map { it.javaClass.simpleName }
// .joinToString(",") // .joinToString(",")
// Timber.tag(TAG).d(clazzName) // Timber.tag(TAG).d(clazzName)
if (DialogManager.getDialogList().size == 1 && // 无其他弹窗正在显示时（过滤幽灵条目），自动关闭识别弹窗
DialogManager.contains("GoodsRecognizeDialog") && if (DialogManager.getDialogList().none { it.isShowing && it != goodsRecognizeDialog } &&
goodsRecognizeDialog?.isShowing == true goodsRecognizeDialog?.isShowing == true
) { ) {
goodsRecognizeDialog?.dismiss() goodsRecognizeDialog?.dismiss()
@@ -281,8 +256,9 @@ abstract class GoodsListActivity : BaseActivity() {
searchFood(uri) searchFood(uri)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
Loading.dismiss()
}
} }
}.start()
} }
private val delayHandler by lazy { private val delayHandler by lazy {
@@ -423,7 +399,11 @@ abstract class GoodsListActivity : BaseActivity() {
// readBitmap(it) // readBitmap(it)
// } // }
// } // }
ImageUtil.uriToBitmap(this, uri)?.let { bitmap -> val bitmap = ImageUtil.uriToBitmap(this, uri)
if (bitmap == null) {
Loading.dismiss()
return
}
val newBmp = BitmapCropper.cropCenter( val newBmp = BitmapCropper.cropCenter(
original = bitmap, original = bitmap,
targetWidth = 1000, targetHeight = 1300, targetWidth = 1000, targetHeight = 1300,
@@ -437,7 +417,6 @@ abstract class GoodsListActivity : BaseActivity() {
bitmap.recycle() bitmap.recycle()
} }
} }
}
private fun recognizeGoodsList(foodList: List<IdNameScore>) { private fun recognizeGoodsList(foodList: List<IdNameScore>) {
receiptViewModel.recognizeGoodsList( receiptViewModel.recognizeGoodsList(
@@ -506,6 +485,7 @@ abstract class GoodsListActivity : BaseActivity() {
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
SensorScaleUtils.removeWeightListener(weightIntCallback)
unBindCamera() unBindCamera()
} }
@@ -670,11 +650,12 @@ abstract class GoodsListActivity : BaseActivity() {
val uploadInfo = UploadInfo( val uploadInfo = UploadInfo(
id = id, id = id,
supplierId = supplierId, supplierId = supplierId,
purCode = purCode,
receiveGoodsInfos = goodsList receiveGoodsInfos = goodsList
) )
logInfo("receiptSubmit确认收货提交数据：${uploadInfo.toJsonString()}") logInfo("receiptSubmit确认收货提交数据：${uploadInfo.toJsonString()}")
showWaitingDialog2("加载中") showWaitingDialog2("加载中")
receiptViewModel.confirmReceipt(uploadInfo) { success -> receiptViewModel.confirmReceipt(uploadInfo) { success, msg ->
hideWaitingDialog() hideWaitingDialog()
if (success) { if (success) {
userViewModel.deleteKey(localGoodsKey) userViewModel.deleteKey(localGoodsKey)
@@ -683,7 +664,7 @@ abstract class GoodsListActivity : BaseActivity() {
finish() finish()
}, 200) }, 200)
} else { } else {
toast("确认收货失败") toast("确认收货失败：$msg")
} }
} }
} }
@@ -713,7 +694,7 @@ abstract class GoodsListActivity : BaseActivity() {
} }
logInfo("selfProcurementSubmit自采入库提交数据：${submitData.toJsonString()}") logInfo("selfProcurementSubmit自采入库提交数据：${submitData.toJsonString()}")
showWaitingDialog2("加载中") showWaitingDialog2("加载中")
receiptViewModel.addToWarehouse(submitData) { success -> receiptViewModel.addToWarehouse(submitData) { success, msg ->
hideWaitingDialog() hideWaitingDialog()
if (success) { if (success) {
toast("提交入库成功") toast("提交入库成功")
@@ -722,7 +703,7 @@ abstract class GoodsListActivity : BaseActivity() {
finish() finish()
}, 200) }, 200)
} else { } else {
toast("提交入库失败") toast("提交入库失败：$msg")
} }
} }
} }
app/src/main/java/com/sw/inbound/activity/HomeActivity.kt
+47
View File
@@ -3,19 +3,24 @@ package com.sw.inbound.activity
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.view.KeyEvent
import androidx.activity.viewModels import androidx.activity.viewModels
import com.sw.inbound.base.BaseActivity import com.sw.inbound.base.BaseActivity
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import com.sw.inbound.databinding.ActivityHomeBinding import com.sw.inbound.databinding.ActivityHomeBinding
import com.sw.inbound.dialog.EnvSwitchDialog
import com.sw.inbound.dialog.Loading
import com.sw.inbound.model.response.User import com.sw.inbound.model.response.User
import com.sw.inbound.objbox.FoodModule import com.sw.inbound.objbox.FoodModule
import com.sw.inbound.objbox.ObjectBox
import com.sw.inbound.sdk.SensorScaleUtils import com.sw.inbound.sdk.SensorScaleUtils
import com.sw.inbound.utils.DateTimeUtils import com.sw.inbound.utils.DateTimeUtils
import com.sw.inbound.utils.ThreadUtils import com.sw.inbound.utils.ThreadUtils
import com.sw.inbound.utils.ext.gone import com.sw.inbound.utils.ext.gone
import com.sw.inbound.utils.ext.startActivity import com.sw.inbound.utils.ext.startActivity
import com.sw.inbound.utils.ext.toast
import com.sw.inbound.utils.ext.visible import com.sw.inbound.utils.ext.visible
import com.sw.inbound.viewmodel.UserViewModel import com.sw.inbound.viewmodel.UserViewModel
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
@@ -45,6 +50,10 @@ class HomeActivity : BaseActivity() {
} }
} }
/** 用于检测双击返回键的时间戳 */
private var lastBackPressTime = 0L
private val backPressInterval = 2000L // 2 秒内连续按下返回键视为双击
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityHomeBinding.inflate(layoutInflater) binding = ActivityHomeBinding.inflate(layoutInflater)
@@ -72,6 +81,21 @@ class HomeActivity : BaseActivity() {
startActivity<FoodCollectionActivity>() startActivity<FoodCollectionActivity>()
} }
// 时间点击：打开环境切换弹窗
binding.tvTime.setOnClickListener { v ->
EnvSwitchDialog(context = this, onEnvChanged = {
Loading.show(this)
lifecycleScope.launch {
ObjectBox.removeAll()
FoodModule.init(this@HomeActivity)
v.postDelayed({
Loading.dismiss()
toast("服务重置完成")
}, 500)
}
}).show()
}
// 采购单入库入口 // 采购单入库入口
binding.ivOrderPurchase.setOnClickListener { binding.ivOrderPurchase.setOnClickListener {
startActivity<PurchaseOrderActivity>() startActivity<PurchaseOrderActivity>()
@@ -128,4 +152,27 @@ class HomeActivity : BaseActivity() {
// 页面不可见时停止刷新，避免内存泄漏 // 页面不可见时停止刷新，避免内存泄漏
handler.removeCallbacks(timeRunnable) handler.removeCallbacks(timeRunnable)
} }
/**
* 处理返回键事件
* 双击返回键退出应用，单击返回键提示再次点击退出
*/
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
return if (keyCode == KeyEvent.KEYCODE_BACK) {
val currentTime = System.currentTimeMillis()
if (currentTime - lastBackPressTime < backPressInterval) {
// 双击返回键，退出应用
finish()
true
} else {
// 单击返回键，显示提示
lastBackPressTime = currentTime
this.toast("再按一次返回键退出应用")
true
} }
} else {
super.onKeyDown(keyCode, event)
}
}
}
app/src/main/java/com/sw/inbound/activity/InitActivity.kt
+191
View File
@@ -0,0 +1,191 @@
package com.sw.inbound.activity
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.SystemClock
import android.view.KeyEvent
import android.view.animation.RotateAnimation
import com.sw.inbound.GlobalData
import com.sw.inbound.GlobalKey
import com.sw.inbound.base.BaseActivity
import com.sw.inbound.databinding.ActivityInitBinding
import com.sw.inbound.utils.NetworkUtils
import com.sw.inbound.utils.SPUtil
/**
* 初始化页面 Activity
* 用于应用启动时的初始化流程
* - 显示 60 秒倒计时
* - 每 10 秒检测一次网络连接
* - 网络连接成功则跳转到 HomeActivity
* - 60 秒后仍未连接则显示"连接网络"按钮
*/
class InitActivity : BaseActivity() {
private lateinit var binding: ActivityInitBinding
private val handler = Handler(Looper.getMainLooper())
private var startTime = 0L // 倒计时开始时间
private var lastNetworkCheckTime = 0L // 上次检测网络的时间
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityInitBinding.inflate(layoutInflater)
setContentView(binding.root)
initViews()
}
/**
* 初始化控件事件
*/
private fun initViews() {
// 连接网络按钮点击事件
binding.btnConnectNetwork.setOnClickListener {
openNetworkSettings()
}
// 启动加载动画 - 持续旋转
startLoadingAnimation()
}
/**
* 启动加载动画 - ImageView 持续旋转
*/
private fun startLoadingAnimation() {
val rotateAnimation = RotateAnimation(
0f, 360f,
RotateAnimation.RELATIVE_TO_SELF, 0.5f,
RotateAnimation.RELATIVE_TO_SELF, 0.5f
).apply {
duration = 1200 // 旋转周期 1.2 秒
repeatCount = RotateAnimation.INFINITE // 无限循环
repeatMode = RotateAnimation.RESTART
}
binding.ivLoading.startAnimation(rotateAnimation)
}
override fun onResume() {
super.onResume()
if (NetworkUtils.isNetworkConnected(this)) {
navigateToHome()
return
}
startCountdown()
}
override fun onPause() {
super.onPause()
// 页面不可见时停止倒计时
handler.removeCallbacksAndMessages(null)
}
/**
* 启动 60 秒倒计时
*/
private fun startCountdown() {
startTime = SystemClock.elapsedRealtime()
lastNetworkCheckTime = 0
binding.llLoading.visibility = android.view.View.VISIBLE
binding.llNetworkButton.visibility = android.view.View.GONE
binding.tvCountdown.text = "60秒"
scheduleCountdown()
}
/**
* 定时更新倒计时
* 使用 SystemClock.elapsedRealtime() 确保精确计时
*/
private fun scheduleCountdown() {
handler.postDelayed({
val elapsedTime = SystemClock.elapsedRealtime() - startTime
val remainingTime = 60 - (elapsedTime / 1000).toInt()
val currentNetworkCheckTime = (elapsedTime / 1000).toInt()
// 每 10 秒检测一次网络
if (currentNetworkCheckTime > 0 && currentNetworkCheckTime % 10 == 0 && currentNetworkCheckTime != lastNetworkCheckTime.toInt()) {
lastNetworkCheckTime = currentNetworkCheckTime.toLong()
checkNetworkConnection()
}
// 倒计时未结束，继续更新 UI
if (remainingTime > 0) {
binding.tvCountdown.text = "${remainingTime}秒"
scheduleCountdown()
} else {
// 倒计时结束，最后检测一次网络
if (NetworkUtils.isNetworkConnected(this)) {
navigateToHome()
} else {
// 网络未连接，显示"连接网络"按钮
showNetworkButton()
}
}
}, 100) // 每 100ms 检查一次，确保精确性
}
/**
* 检测网络连接
*/
private fun checkNetworkConnection() {
if (NetworkUtils.isNetworkConnected(this)) {
// 网络连接成功，停止倒计时并跳转到 HomeActivity
handler.removeCallbacksAndMessages(null)
navigateToHome()
}
}
/**
* 跳转到 HomeActivity
*/
private fun navigateToHome() {
// 优先读取用户手动切换后持久化的 url
val savedUrl = SPUtil.getInstance().get(GlobalKey.KEY_BASE_URL, "")
if (!savedUrl.isNullOrEmpty()) {
GlobalData.appBaseUrl = savedUrl
} else {
// 未保存过则使用默认逻辑：特定设备走测试环境，其余走 UAT
GlobalData.appBaseUrl = GlobalData.PROD_BASE_URL
val list = listOf(
//"5a41a2cf-3cee-3731-911d-a28b10164f7a",
"f0bcabbb-0d58-3b14-8bed-9863b7ec61ef"
)
if (list.contains(GlobalData.deviceId)) {
GlobalData.appBaseUrl = GlobalData.TEST_BASE_URL
}
}
val intent = Intent(this, HomeActivity::class.java)
startActivity(intent)
finish()
}
/**
* 显示"连接网络"按钮
*/
private fun showNetworkButton() {
binding.llLoading.visibility = android.view.View.GONE
binding.llNetworkButton.visibility = android.view.View.VISIBLE
}
/**
* 打开系统网络设置页面
*/
private fun openNetworkSettings() {
val intent = Intent(android.provider.Settings.ACTION_WIFI_SETTINGS)
startActivity(intent)
}
/**
* 禁用返回键
*/
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
return if (keyCode == KeyEvent.KEYCODE_BACK) {
// 禁用返回键，不执行任何操作
true
} else {
super.onKeyDown(keyCode, event)
}
}
}
app/src/main/java/com/sw/inbound/activity/LocalImagePreviewActivity.kt
+8 -2
View File
@@ -1,5 +1,6 @@
package com.sw.inbound.activity package com.sw.inbound.activity
import android.annotation.SuppressLint
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
@@ -9,11 +10,11 @@ import android.view.ViewGroup
import android.view.WindowManager import android.view.WindowManager
import androidx.core.graphics.drawable.toDrawable import androidx.core.graphics.drawable.toDrawable
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.sw.inbound.base.BaseActivity
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import coil.load import coil.load
import com.chad.library.adapter4.BaseQuickAdapter import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.sw.inbound.base.BaseActivity
import com.sw.inbound.databinding.ActivityLocalImagePreviewBinding import com.sw.inbound.databinding.ActivityLocalImagePreviewBinding
import com.sw.inbound.databinding.DialogImageFullPreviewBinding import com.sw.inbound.databinding.DialogImageFullPreviewBinding
import com.sw.inbound.databinding.ListItemImagePreviewBinding import com.sw.inbound.databinding.ListItemImagePreviewBinding
@@ -23,6 +24,8 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.io.File import java.io.File
import java.text.SimpleDateFormat
import java.util.Date
class LocalImagePreviewActivity : BaseActivity() { class LocalImagePreviewActivity : BaseActivity() {
@@ -57,7 +60,7 @@ class LocalImagePreviewActivity : BaseActivity() {
val nameWithoutExt = it.nameWithoutExtension val nameWithoutExt = it.nameWithoutExtension
// 兼容 IMG_CROP_{时间戳} 和其他命名格式 // 兼容 IMG_CROP_{时间戳} 和其他命名格式
val displayName = if (nameWithoutExt.startsWith("IMG_CROP_")) { val displayName = if (nameWithoutExt.startsWith("IMG_CROP_")) {
nameWithoutExt.removePrefix("IMG_CROP_") df.format(Date(nameWithoutExt.removePrefix("IMG_CROP_").toLong()))
} else { } else {
nameWithoutExt nameWithoutExt
} }
@@ -74,6 +77,9 @@ class LocalImagePreviewActivity : BaseActivity() {
} }
} }
@SuppressLint("SimpleDateFormat")
private val df = SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/** 弹出全屏大图预览 Dialog，支持左右切换 */ /** 弹出全屏大图预览 Dialog，支持左右切换 */
private fun showFullImagePreview(startPosition: Int) { private fun showFullImagePreview(startPosition: Int) {
var currentIndex = startPosition var currentIndex = startPosition
app/src/main/java/com/sw/inbound/activity/PurchaseOrderActivity.kt
+1
View File
@@ -41,6 +41,7 @@ class PurchaseOrderActivity : BaseActivity() {
startActivity<ReceiptActivity> { startActivity<ReceiptActivity> {
putExtra(GoodsListActivity.ID, item.id) putExtra(GoodsListActivity.ID, item.id)
putExtra(GoodsListActivity.SUPPLIER_ID, item.supplierId) putExtra(GoodsListActivity.SUPPLIER_ID, item.supplierId)
putExtra(GoodsListActivity.PUR_CODE, item.purCode)
putExtra(GoodsListActivity.IS_RECEIPT_PAGE, true) putExtra(GoodsListActivity.IS_RECEIPT_PAGE, true)
//putExtra(GoodsListActivity.IS_NEW_RECEIPT, false) //putExtra(GoodsListActivity.IS_NEW_RECEIPT, false)
} }
app/src/main/java/com/sw/inbound/activity/ReceiptActivity.kt
+11 -6
View File
@@ -5,6 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.sw.inbound.R import com.sw.inbound.R
import com.sw.inbound.adapter.ReceiptGoodsAdapter import com.sw.inbound.adapter.ReceiptGoodsAdapter
import com.sw.inbound.model.response.DictType import com.sw.inbound.model.response.DictType
import com.sw.inbound.model.response.GoodsInfo
import com.sw.inbound.utils.ext.clickWithDebounce import com.sw.inbound.utils.ext.clickWithDebounce
import com.sw.inbound.utils.ext.toJsonString import com.sw.inbound.utils.ext.toJsonString
import com.sw.inbound.utils.ext.toast import com.sw.inbound.utils.ext.toast
@@ -83,12 +84,7 @@ class ReceiptActivity : GoodsListActivity() {
binding.tvPurchaseNo.text = "采购单号：${detail.purCode}" binding.tvPurchaseNo.text = "采购单号：${detail.purCode}"
val list = detail.receiveGoodsInfoList val list = detail.receiveGoodsInfoList
list.forEach { goodsInfo -> list.forEach { goodsInfo ->
goodsInfo.recUnitPriceTaxInBak = goodsInfo.recUnitPriceTaxIn resetGoods(goodsInfo)
goodsInfo.recUnitPriceTaxIn = 0.0
goodsInfo.recPriceExItemBak = goodsInfo.recPriceExItem
goodsInfo.receiveCountBak = goodsInfo.receiveCount
goodsInfo.unitNameBak = goodsInfo.unitName
goodsInfo.receivedNumBak = goodsInfo.receivedNum
} }
goodsList.addAll(list) goodsList.addAll(list)
adapter.notifyDataSetChanged() adapter.notifyDataSetChanged()
@@ -97,6 +93,15 @@ class ReceiptActivity : GoodsListActivity() {
} }
} }
fun resetGoods(item: GoodsInfo) {
item.recUnitPriceTaxInBak = item.recUnitPriceTaxIn
item.recUnitPriceTaxIn = 0.0
item.recPriceExItemBak = item.recPriceExItem
item.receiveCountBak = item.receiveCount
item.unitNameBak = item.unitName
item.receivedNumBak = item.receivedNum
}
override fun getWarehouseList(): List<DictType> { override fun getWarehouseList(): List<DictType> {
return goodsList.filter { return goodsList.filter {
it.warehouseId.isNullOrBlank().not() && it.warehouseName.isNullOrBlank().not() it.warehouseId.isNullOrBlank().not() && it.warehouseName.isNullOrBlank().not()
app/src/main/java/com/sw/inbound/adapter/CollectSearchAdapter.kt
+8 -6
View File
@@ -8,12 +8,13 @@ import androidx.core.graphics.toColorInt
import com.chad.library.adapter4.BaseQuickAdapter import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.sw.inbound.databinding.ListItemCollectSearchBinding import com.sw.inbound.databinding.ListItemCollectSearchBinding
import com.sw.inbound.model.response.CollectedFoodInfo
import com.sw.inbound.model.response.SearchGoodsInfo import com.sw.inbound.model.response.SearchGoodsInfo
import com.sw.inbound.utils.ext.dp import com.sw.inbound.utils.ext.dp
import com.sw.inbound.utils.ext.setShapeDrawable import com.sw.inbound.utils.ext.setShapeDrawable
class CollectSearchAdapter(var list: MutableList<SearchGoodsInfo.Record>) : class CollectSearchAdapter(var list: MutableList<CollectedFoodInfo>) :
BaseQuickAdapter<SearchGoodsInfo.Record, CollectSearchAdapter.VH>(list) { BaseQuickAdapter<CollectedFoodInfo, CollectSearchAdapter.VH>(list) {
inner class VH(var binding: ListItemCollectSearchBinding) : QuickViewHolder(binding.root) inner class VH(var binding: ListItemCollectSearchBinding) : QuickViewHolder(binding.root)
@@ -23,19 +24,20 @@ class CollectSearchAdapter(var list: MutableList<SearchGoodsInfo.Record>) :
return VH(binding) return VH(binding)
} }
override fun onBindViewHolder(holder: VH, position: Int, item: SearchGoodsInfo.Record?) { override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodInfo?) {
holder.binding.let { holder.binding.let {
var goodsName = item!!.goodsName?.split("WP")?.get(0) val goodsName = item!!.foodName.split("WP")[0]
// if (goodsName?.contains("\n") == true) { // if (goodsName?.contains("\n") == true) {
// goodsName = goodsName?.split("\n")?.get(0) // goodsName = goodsName?.split("\n")?.get(0)
// } // }
it.tvGoodsName.run { it.tvGoodsName.run {
text = Html.fromHtml(goodsName) text = Html.fromHtml(goodsName)
setTextColor(if (item!!.isSelected) "#FF0032C8".toColorInt() else "#FF666666".toColorInt()) setTextColor(if (item.isSelected) "#FF0032C8".toColorInt() else "#FF666666".toColorInt())
//setTextColor("#FF666666".toColorInt()) //setTextColor("#FF666666".toColorInt())
} }
it.tvGoodsNum.text = "已采集${item.foodNum}"
it.root.run { it.root.run {
if (item!!.isSelected) { if (item.isSelected) {
setShapeDrawable( setShapeDrawable(
solidColor = "#FFEAF0FF", solidColor = "#FFEAF0FF",
strokeColor = "#FF0033CC", strokeColor = "#FF0033CC",
app/src/main/java/com/sw/inbound/adapter/ReceiptGoodsAdapter.kt
+1
View File
@@ -176,6 +176,7 @@ class ReceiptGoodsAdapter(var receiptActivity: ReceiptActivity, var list: Mutabl
item.recPriceInItem = 0.0 item.recPriceInItem = 0.0
item.recUnitPriceTaxIn = 0.0 item.recUnitPriceTaxIn = 0.0
item.unitName = item.unitNameBak item.unitName = item.unitNameBak
item.goodsWeight = null
notifyItemChanged(position) notifyItemChanged(position)
receiptActivity.run { receiptActivity.run {
userViewModel.putGoodsData(localGoodsKey, list.toJsonString()) userViewModel.putGoodsData(localGoodsKey, list.toJsonString())
app/src/main/java/com/sw/inbound/di/NetworkModule.kt
+6 -1
View File
@@ -1,5 +1,6 @@
package com.sw.inbound.di package com.sw.inbound.di
import com.google.gson.GsonBuilder
import com.sw.inbound.MyApp import com.sw.inbound.MyApp
import com.sw.inbound.network.api.ApiService import com.sw.inbound.network.api.ApiService
import com.sw.inbound.network.interceptor.RequestInterceptor import com.sw.inbound.network.interceptor.RequestInterceptor
@@ -51,11 +52,15 @@ object NetworkModule {
@Provides @Provides
@Singleton @Singleton
fun provideRetrofit(okHttpClient: OkHttpClient): Retrofit { fun provideRetrofit(okHttpClient: OkHttpClient): Retrofit {
val gson = GsonBuilder()
.setLenient()
.create()
return Retrofit.Builder() return Retrofit.Builder()
// .baseUrl(DEVICE_BASE_URL) // .baseUrl(DEVICE_BASE_URL)
.baseUrl(BASE_URL) .baseUrl(BASE_URL)
.client(okHttpClient) .client(okHttpClient)
.addConverterFactory(GsonConverterFactory.create()) .addConverterFactory(GsonConverterFactory.create(gson))
.build() .build()
} }
app/src/main/java/com/sw/inbound/dialog/CollectSearchDialog.kt
+53 -74
View File
@@ -5,7 +5,9 @@ import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import androidx.core.widget.addTextChangedListener import androidx.core.widget.addTextChangedListener
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.sw.inbound.R import com.sw.inbound.R
@@ -13,6 +15,7 @@ import com.sw.inbound.activity.FoodCollectionActivity
import com.sw.inbound.adapter.CollectSearchAdapter import com.sw.inbound.adapter.CollectSearchAdapter
import com.sw.inbound.databinding.DialogCollectSearchBinding import com.sw.inbound.databinding.DialogCollectSearchBinding
import com.sw.inbound.databinding.LayoutEmptySearchBinding import com.sw.inbound.databinding.LayoutEmptySearchBinding
import com.sw.inbound.model.response.CollectedFoodInfo
import com.sw.inbound.model.response.SearchGoodsInfo import com.sw.inbound.model.response.SearchGoodsInfo
import com.sw.inbound.objbox.ObjectBox import com.sw.inbound.objbox.ObjectBox
import com.sw.inbound.utils.ext.addOnActionSearchListener import com.sw.inbound.utils.ext.addOnActionSearchListener
@@ -28,6 +31,32 @@ class CollectSearchDialog(
private lateinit var inflater: LayoutInflater private lateinit var inflater: LayoutInflater
private var emptyBinding: LayoutEmptySearchBinding? = null private var emptyBinding: LayoutEmptySearchBinding? = null
private lateinit var binding: DialogCollectSearchBinding private lateinit var binding: DialogCollectSearchBinding
/**
* 收集 searchFoodState
*/
@SuppressLint("NotifyDataSetChanged")
private fun initObserver() {
activity?.run {
lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.STARTED) {
userViewModel.collectedFoodListState.collect { items ->
binding.rvSearch.layoutManager =
GridLayoutManager(activity, 2, LinearLayoutManager.VERTICAL, false)
list.clear()
list.addAll(items)
searchAdapter.notifyDataSetChanged()
finishRefresh()
binding.root.hideKeyboard()
if (items.isEmpty()) {
loadEmptyView()
}
}
}
}
}
}
override fun getRootView(): View { override fun getRootView(): View {
inflater = LayoutInflater.from(context) inflater = LayoutInflater.from(context)
binding = DialogCollectSearchBinding.inflate(inflater) binding = DialogCollectSearchBinding.inflate(inflater)
@@ -82,23 +111,14 @@ class CollectSearchDialog(
this@CollectSearchDialog.clickIndex = -1 this@CollectSearchDialog.clickIndex = -1
val searchName = binding.etInputGoods.text.toString().trim() val searchName = binding.etInputGoods.text.toString().trim()
getCollectGoods(searchName) getCollectGoods(searchName)
}
//it.setOnLoadMoreListener {
// searchGoods()
//}
}
getCollectGoods()
//binding.root.clickWithDebounce {
// Thread {
// FoodModule.initDefFoodData(activity!!) {
// activity?.runOnUiThread {
// activity?.toast("添加完成")
// getCollectGoods()
// }
// }
// }.start()
//}
binding.root.postDelayed({
finishRefresh()
}, 1000)
}
}
initObserver()
getCollectGoods()
} }
private var pageNo = 1 private var pageNo = 1
@@ -118,17 +138,17 @@ class CollectSearchDialog(
private var clickIndex = -1 private var clickIndex = -1
private val list: MutableList<SearchGoodsInfo.Record> = mutableListOf() private val list: MutableList<CollectedFoodInfo> = mutableListOf()
private val searchAdapter by lazy { private val searchAdapter by lazy {
CollectSearchAdapter(list).apply { CollectSearchAdapter(list).apply {
isStateViewEnable = true isStateViewEnable = true
setOnItemClickListener { _, _, position -> // setOnItemClickListener { _, _, position ->
activity?.lifecycleScope?.launch { // activity?.lifecycleScope?.launch {
val goodsName = list[position].goodsName?:"" // val goodsName = list[position].goodsName?:""
val count = ObjectBox.countNameField(goodsName) // val count = ObjectBox.countNameField(goodsName)
activity?.toast("已采集数据${count}条") // activity?.toast("已采集数据${count}条")
} // }
} // }
addOnItemChildClickListener(R.id.ivDelete) { _, _, position -> addOnItemChildClickListener(R.id.ivDelete) { _, _, position ->
this@CollectSearchDialog.clickIndex = position this@CollectSearchDialog.clickIndex = position
list.forEach { item -> list.forEach { item ->
@@ -144,44 +164,22 @@ class CollectSearchDialog(
} }
private fun showDeleteDialog(position: Int, deleteAction: () -> Unit = {}) { private fun showDeleteDialog(position: Int, deleteAction: () -> Unit = {}) {
val foodName = list[position].foodName
WarnDialog( WarnDialog(
context = context, context = context,
content = "请确认是否删除物品：${list[position].goodsName?.split("WP")?.get(0)}？", content = "请确认是否删除物品：${foodName.split("WP").first()}？",
cancelBlock = { cancelBlock = {
this@CollectSearchDialog.clickIndex = -1 this@CollectSearchDialog.clickIndex = -1
list[position].isSelected = false list[position].isSelected = false
searchAdapter.notifyItemChanged(position) searchAdapter.notifyItemChanged(position)
}, },
confirmBlock = { confirmBlock = {
// Thread { activity?.userViewModel?.removeCollectedFood(
// }.start() foodName = foodName,
activity?.lifecycleScope?.launch { nameFilter = binding.etInputGoods.text.toString().trim()
deleteGoods(position, deleteAction) )
}
}).show()
}
private suspend fun deleteGoods(position: Int, deleteAction: () -> Unit = {}) {
activity?.runOnUiThread {
Loading.show(activity!!)
}
val name = list[position].goodsName ?: ""
// val filterIdList = box?.all?.filter { it.name == name }?.map { it.id }
// ObjectBox.boxStore.runInTx {
// box?.removeByIds(filterIdList)
// }
ObjectBox.remove(name)
activity?.runOnUiThread {
Loading.dismiss()
//list.remove(list[position])
//searchAdapter.notifyDataSetChanged()
searchAdapter.removeAt(position)
activity?.toast("删除成功")
if (list.isEmpty()) {
loadEmptyView()
}
deleteAction() deleteAction()
} }).show()
} }
private fun finishRefresh() { private fun finishRefresh() {
@@ -197,27 +195,8 @@ class CollectSearchDialog(
// private var box: Box<Food>? = null // private var box: Box<Food>? = null
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
private fun getCollectGoods(searchName: String? = null) = activity?.lifecycleScope?.launch { private fun getCollectGoods(name: String? = null) {
// if (box == null) { activity?.userViewModel?.loadCollectedFoodList(nameFilter = name)
// box = ObjectBox.boxStore.boxFor(Food::class)
// }
list.clear()
// var queryList = box?.all?.distinctBy { it.name }
// if (searchName.isNullOrBlank().not()) {
// queryList = queryList?.filter { it.name?.contains(searchName!!) == true }
// }
val queryList = ObjectBox.filter(searchName)
queryList?.forEach {
list.add((SearchGoodsInfo.Record(goodsName = it.name)))
}
binding.rvSearch.layoutManager =
GridLayoutManager(activity, 2, LinearLayoutManager.VERTICAL, false)
searchAdapter.notifyDataSetChanged()
if (list.isEmpty()) {
loadEmptyView()
}
finishRefresh()
binding.root.hideKeyboard()
} }
// fun test() { // fun test() {
app/src/main/java/com/sw/inbound/dialog/EnvSwitchDialog.kt
+70
View File
@@ -0,0 +1,70 @@
package com.sw.inbound.dialog
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.WindowManager
import com.sw.inbound.GlobalData
import com.sw.inbound.GlobalKey
import com.sw.inbound.databinding.DialogEnvSwitchBinding
import com.sw.inbound.utils.SPUtil
import com.sw.inbound.utils.ext.dp
import com.sw.inbound.utils.ext.toast
/**
* 环境切换弹窗
*
* 提供 TEST / UAT / PROD 三套环境的切换功能，
* 初始化时自动根据 [GlobalData.appBaseUrl] 选中当前环境，
* 确认后更新 [GlobalData.appBaseUrl] 并通过 [onEnvChanged] 回调通知外部。
*
* @param context 上下文
* @param onEnvChanged 确认切换后的回调，参数为新的 baseUrl
*/
class EnvSwitchDialog(
context: Context,
private val onEnvChanged: (newBaseUrl: String) -> Unit = {}
) : BaseDialog(
context,
defWidth = 600.dp,
defHeight = WindowManager.LayoutParams.WRAP_CONTENT
) {
private lateinit var binding: DialogEnvSwitchBinding
override fun getRootView(): View {
binding = DialogEnvSwitchBinding.inflate(LayoutInflater.from(context))
return binding.root
}
override fun initView() {
// 根据当前 appBaseUrl 预选对应 RadioButton，不匹配则不选
when (GlobalData.appBaseUrl) {
GlobalData.TEST_BASE_URL -> binding.rbTest.isChecked = true
GlobalData.UAT_BASE_URL -> binding.rbUat.isChecked = true
GlobalData.PROD_BASE_URL -> binding.rbProd.isChecked = true
}
// 取消按钮
binding.btnCancel.setOnClickListener { dismiss() }
// 确认按钮
binding.btnConfirm.setOnClickListener {
// 未选中任何选项时提示用户
if (binding.rgEnv.checkedRadioButtonId == -1) {
context.toast("请选择环境")
return@setOnClickListener
}
val newUrl = when (binding.rgEnv.checkedRadioButtonId) {
binding.rbTest.id -> GlobalData.TEST_BASE_URL
binding.rbUat.id -> GlobalData.UAT_BASE_URL
binding.rbProd.id -> GlobalData.PROD_BASE_URL
else -> return@setOnClickListener
}
GlobalData.appBaseUrl = newUrl
SPUtil.getInstance().put(GlobalKey.KEY_BASE_URL, newUrl)
onEnvChanged(newUrl)
dismiss()
}
}
}
app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
+10 -9
View File
@@ -357,7 +357,8 @@ class GoodsStoreDialog(
context.toast("入库金额不能为0") context.toast("入库金额不能为0")
return return
} }
if (funcType == 1) { // if (funcType == 1) {
//无论是否识别到物品，都上传图片增加样本数据
activity?.let { Loading.show(it) } activity?.let { Loading.show(it) }
cameraUtils.takePhoto { uri -> cameraUtils.takePhoto { uri ->
//imageUri = uri //imageUri = uri
@@ -375,9 +376,9 @@ class GoodsStoreDialog(
confirm(unitName, count, price, totalPrice) confirm(unitName, count, price, totalPrice)
}, 500) }, 500)
} }
} else { // } else {
confirm(unitName, count, price, totalPrice) // confirm(unitName, count, price, totalPrice)
} // }
} }
private fun confirm(unitName: String, count: Double, price: Double, totalPrice: Double?) { private fun confirm(unitName: String, count: Double, price: Double, totalPrice: Double?) {
@@ -423,7 +424,7 @@ class GoodsStoreDialog(
override fun show() { override fun show() {
super.show() super.show()
if (funcType == 1) { // if (funcType == 1) {
takePhotoBinding?.let { takePhotoBinding?.let {
cameraUtils.setPreviewController(previewView) cameraUtils.setPreviewController(previewView)
cameraUtils.bind() cameraUtils.bind()
@@ -433,7 +434,7 @@ class GoodsStoreDialog(
}, 1000) }, 1000)
} }
} }
} // }
binding.root.postDelayed({ binding.root.postDelayed({
SensorScaleUtils.startScale() SensorScaleUtils.startScale()
}, 2600) }, 2600)
@@ -454,7 +455,7 @@ class GoodsStoreDialog(
private var imagePreviewBinding: LayoutImagePreviewBinding? = null private var imagePreviewBinding: LayoutImagePreviewBinding? = null
private fun addChildToContainer() { private fun addChildToContainer() {
val inflater = LayoutInflater.from(context) val inflater = LayoutInflater.from(context)
if (funcType == 1) { // if (funcType == 1) {
//预览及拍照 //预览及拍照
takePhotoBinding = LayoutTakePhotoBinding.inflate(inflater, binding.flContainer, true) takePhotoBinding = LayoutTakePhotoBinding.inflate(inflater, binding.flContainer, true)
activity?.unBindCamera() activity?.unBindCamera()
@@ -474,8 +475,7 @@ class GoodsStoreDialog(
// cameraUtils.takePhoto(takePhotoCallback) // cameraUtils.takePhoto(takePhotoCallback)
// } // }
} }
return if(funcType != 1){
}
//只显示原始图片 //只显示原始图片
imagePreviewBinding = LayoutImagePreviewBinding.inflate(inflater, binding.flContainer) imagePreviewBinding = LayoutImagePreviewBinding.inflate(inflater, binding.flContainer)
imagePreviewBinding?.imageView?.load(goods.relativeUrl) { imagePreviewBinding?.imageView?.load(goods.relativeUrl) {
@@ -490,6 +490,7 @@ class GoodsStoreDialog(
} }
} }
} }
}
private var imageFile: File? = null private var imageFile: File? = null
app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt
+5 -2
View File
@@ -1,7 +1,6 @@
package com.sw.inbound.model.request package com.sw.inbound.model.request
import android.os.Parcelable import android.os.Parcelable
import com.sw.inbound.model.response.BaseBean
import com.sw.inbound.model.response.GoodsInfo import com.sw.inbound.model.response.GoodsInfo
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
import java.math.BigDecimal import java.math.BigDecimal
@@ -19,6 +18,10 @@ data class UploadInfo(
* 供应商id * 供应商id
*/ */
var supplierId: String? = null, var supplierId: String? = null,
/**
* 采购单号
*/
var purCode: String? = null,
/** /**
* *
* 物品信息 【全部收货使用】 * 物品信息 【全部收货使用】
@@ -90,6 +93,6 @@ private data class UploadGoodsInfo(
// 已调整 // 已调整
var isAdjusted: Boolean = false var isAdjusted: Boolean = false
) : Parcelable, BaseBean() { ) : Parcelable {
} }
app/src/main/java/com/sw/inbound/model/response/BaseBean.kt
-5
View File
@@ -1,5 +0,0 @@
package com.sw.inbound.model.response
open class BaseBean() {
}
app/src/main/java/com/sw/inbound/model/response/CollectedFoodInfo.kt
+7
View File
@@ -0,0 +1,7 @@
package com.sw.inbound.model.response
data class CollectedFoodInfo(
var foodName: String,
var foodNum: Int,
var isSelected: Boolean = false
)
app/src/main/java/com/sw/inbound/model/response/GoodsInfo.kt
+1 -1
View File
@@ -117,7 +117,7 @@ data class GoodsInfo(
var buyToInventoryValue:String?="", var buyToInventoryValue:String?="",
//-------------------------------------------------------- //--------------------------------------------------------
) : Parcelable, BaseBean() { ) : Parcelable {
val goodNameStr: String val goodNameStr: String
get() { get() {
app/src/main/java/com/sw/inbound/model/response/PurchaseInfo.kt
+1 -1
View File
@@ -31,6 +31,6 @@ data class PurchaseInfo(
var receiveGoodsInfoList: List<GoodsInfo> = emptyList<GoodsInfo>(), var receiveGoodsInfoList: List<GoodsInfo> = emptyList<GoodsInfo>(),
// 自用 // 自用
var warehouseName: String = "选择仓库" var warehouseName: String = "选择仓库"
) : BaseBean() { ) {
} }
app/src/main/java/com/sw/inbound/objbox/FoodModule.kt
+37 -37
View File
@@ -36,10 +36,6 @@ object FoodModule {
private lateinit var module_mobile: Module private lateinit var module_mobile: Module
// private lateinit var box: Box<Food>
private lateinit var embeddingsList: List<List<Float>>
private lateinit var labelsList: IntArray
private lateinit var classInfo: FoodClassInfo
private val NO_MEAN_RGB = floatArrayOf(0.0f, 0.0f, 0.0f) private val NO_MEAN_RGB = floatArrayOf(0.0f, 0.0f, 0.0f)
private val NO_STD_RGB = floatArrayOf(1.0f, 1.0f, 1.0f) private val NO_STD_RGB = floatArrayOf(1.0f, 1.0f, 1.0f)
@@ -47,6 +43,7 @@ object FoodModule {
private const val MODEL_INPUT_WIDTH = 300 private const val MODEL_INPUT_WIDTH = 300
private const val MODEL_INPUT_HEIGHT = 300 private const val MODEL_INPUT_HEIGHT = 300
const val DEFAULT_FOOD_INDEX = -1 const val DEFAULT_FOOD_INDEX = -1
const val DEFAULT_QUERY_COUNT = 50
const val BAG_RATE = 0.05 const val BAG_RATE = 0.05
@@ -94,7 +91,7 @@ object FoodModule {
return null return null
} }
// fun queryFood(uri: Uri, queryCount: Int = 15): List<String>? { // fun queryFood(uri: Uri, queryCount: Int = DEFAULT_QUERY_COUNT): List<String>? {
// return uri2FloatArray(uri)?.let { // return uri2FloatArray(uri)?.let {
// queryFood(it, queryCount) // queryFood(it, queryCount)
// } // }
@@ -103,7 +100,7 @@ object FoodModule {
// /** // /**
// * 返回识别物品名称列表 // * 返回识别物品名称列表
// */ // */
// fun queryFood(bitmap: Bitmap, queryCount: Int = 15): List<String> { // fun queryFood(bitmap: Bitmap, queryCount: Int = DEFAULT_QUERY_COUNT): List<String> {
// val floatArray = bitmap2FloatArray(bitmap) // val floatArray = bitmap2FloatArray(bitmap)
// return queryFood(floatArray, queryCount) // return queryFood(floatArray, queryCount)
// } // }
@@ -111,14 +108,14 @@ object FoodModule {
// /** // /**
// * 返回识别物品IdNameScore对象列表 // * 返回识别物品IdNameScore对象列表
// */ // */
// fun queryFoodNameScore(bitmap: Bitmap, queryCount: Int = 15): List<IdNameScore> { // fun queryFoodNameScore(bitmap: Bitmap, queryCount: Int = DEFAULT_QUERY_COUNT): List<IdNameScore> {
// val floatArray = bitmap2FloatArray(bitmap) // val floatArray = bitmap2FloatArray(bitmap)
// return queryFoodNameScore(floatArray, queryCount) // return queryFoodNameScore(floatArray, queryCount)
// } // }
suspend fun queryFoodNameScore( suspend fun queryFoodNameScore(
floatArray: FloatArray?, floatArray: FloatArray?,
queryCount: Int = 15 queryCount: Int = DEFAULT_QUERY_COUNT
): List<IdNameScore> { ): List<IdNameScore> {
if (floatArray == null) return emptyList() if (floatArray == null) return emptyList()
// val query: Query<Food> = box.query(Food_.foodVector.nearestNeighbors(floatArray, queryCount)).build() // val query: Query<Food> = box.query(Food_.foodVector.nearestNeighbors(floatArray, queryCount)).build()
@@ -134,16 +131,18 @@ object FoodModule {
logInfo("queryFood向量：${floatArray.slice(0 until 50).toJsonString()}") logInfo("queryFood向量：${floatArray.slice(0 until 50).toJsonString()}")
val idScoreList = ObjectBox.query(floatArray, queryCount) val idScoreList = ObjectBox.query(floatArray, queryCount)
// 批量加载所有实体，一次DB操作替代循环单条查询
val foodMap = ObjectBox.getByIds(idScoreList.map { it.id }).associateBy { it.id }
val nameScoreList = mutableListOf<IdNameScore>() val nameScoreList = mutableListOf<IdNameScore>()
idScoreList.forEach { idScoreList.forEach {
val name = ObjectBox.get(it.id)?.name ?: "" val name = foodMap[it.id]?.name ?: ""
nameScoreList.add(IdNameScore(id = it.id, name = name, score = it.score)) nameScoreList.add(IdNameScore(id = it.id, name = name, score = it.score))
} }
logInfo("queryFood数据：${nameScoreList.toJsonString()}") logInfo("queryFood数据：${nameScoreList.toJsonString()}")
return nameScoreList return nameScoreList
} }
suspend fun getFoodScoreList(bitmap: Bitmap, queryCount: Int = 15): List<IdNameScore> { suspend fun getFoodScoreList(bitmap: Bitmap, queryCount: Int = DEFAULT_QUERY_COUNT): List<IdNameScore> {
val floatArray = bitmap2FloatArray(bitmap, false) ?: return emptyList() val floatArray = bitmap2FloatArray(bitmap, false) ?: return emptyList()
logInfo("getFoodScoreList向量：${floatArray.toJsonString()}") logInfo("getFoodScoreList向量：${floatArray.toJsonString()}")
val nameScoreList = queryFoodNameScore(floatArray, queryCount) val nameScoreList = queryFoodNameScore(floatArray, queryCount)
@@ -156,34 +155,35 @@ object FoodModule {
.groupBy { it.name } .groupBy { it.name }
.map { (_, value) -> value.minByOrNull { it.score }!! } .map { (_, value) -> value.minByOrNull { it.score }!! }
.toMutableList() .toMutableList()
val map = mutableMapOf<String, Int>() // val map = mutableMapOf<String, Int>()
nameScoreList.forEach { // nameScoreList.forEach {
val key = it.name // val key = it.name
val count = map[key] ?: 0 // val count = map[key] ?: 0
map[key] = count + 1 // map[key] = count + 1
} // }
val orderList = map.entries.sortedByDescending { it.value }.map { it.key }.toMutableList() // val orderList = map.entries.sortedByDescending { it.value }.map { it.key }.toMutableList()
val firstFood = nameScoreList[0].name // val firstFood = nameScoreList[0].name
orderList.remove(firstFood) // orderList.remove(firstFood)
orderList.add(0, firstFood) // orderList.add(0, firstFood)
//
val sortedScoreList = maxScoreList.sortedWith(compareBy { // val sortedScoreList = maxScoreList.sortedWith(compareBy {
orderList.indexOf(it.name) // orderList.indexOf(it.name)
}) // })
val sortedScoreList = maxScoreList.sortedBy { it.score }
logInfo("getFoodScoreList数据：${sortedScoreList.toJsonString()}") logInfo("getFoodScoreList数据：${sortedScoreList.toJsonString()}")
return sortedScoreList return sortedScoreList
} }
suspend fun queryFood(floatArray: FloatArray, queryCount: Int = 15): List<String> { // suspend fun queryFood(floatArray: FloatArray, queryCount: Int = DEFAULT_QUERY_COUNT): List<String> {
val map = mutableMapOf<String, Int>() // val map = mutableMapOf<String, Int>()
val nameScoreList = queryFoodNameScore(floatArray, queryCount) // val nameScoreList = queryFoodNameScore(floatArray, queryCount)
nameScoreList.filter { it.score < 0.05 }.forEach { // nameScoreList.filter { it.score < 0.05 }.forEach {
val count = map[it.name] ?: 0 // val count = map[it.name] ?: 0
map[it.name] = count + 1 // map[it.name] = count + 1
} // }
val list = map.entries.sortedByDescending { it.value }.map { it.key } // val list = map.entries.sortedByDescending { it.value }.map { it.key }
return list // return list
} // }
data class IdNameScore( data class IdNameScore(
val id: Long, val id: Long,
@@ -201,10 +201,10 @@ object FoodModule {
val labelsJson = AssetsTool.readAssetsFile(context, "data/labels.json") val labelsJson = AssetsTool.readAssetsFile(context, "data/labels.json")
val classInfoJson = AssetsTool.readAssetsFile(context, "data/class_info.json") val classInfoJson = AssetsTool.readAssetsFile(context, "data/class_info.json")
embeddingsList = val embeddingsList: List<List<Float>> =
Gson().fromJson(embeddingsJson, object : TypeToken<List<List<Float>>>() {}.type) Gson().fromJson(embeddingsJson, object : TypeToken<List<List<Float>>>() {}.type)
labelsList = Gson().fromJson(labelsJson, IntArray::class.java) val labelsList: IntArray = Gson().fromJson(labelsJson, IntArray::class.java)
classInfo = val classInfo: FoodClassInfo =
Gson().fromJson(classInfoJson, FoodClassInfo::class.java) Gson().fromJson(classInfoJson, FoodClassInfo::class.java)
val foodMap = classInfo.idx_to_class val foodMap = classInfo.idx_to_class
app/src/main/java/com/sw/inbound/objbox/ObjectBox.kt
+38
View File
@@ -151,6 +151,9 @@ object ObjectBox {
e.printStackTrace() e.printStackTrace()
LogSaveUtil.saveLogFile("safeDbOp出现其它异常:${e.message}") LogSaveUtil.saveLogFile("safeDbOp出现其它异常:${e.message}")
null null
} finally {
// 线程资源清理
boxStore?.closeThreadResources()
} }
} }
} }
@@ -172,6 +175,12 @@ object ObjectBox {
getBox<Food>()?.get(id) getBox<Food>()?.get(id)
} }
// 批量按ID加载，一次DB事务替代循环单条查询
suspend fun getByIds(ids: List<Long>): List<Food> = safeDbOp {
if (ids.isEmpty()) return@safeDbOp emptyList<Food>()
getBox<Food>()?.get(ids.toLongArray()) ?: emptyList<Food>()
} ?: emptyList()
suspend fun put(entity: Food) = safeDbOp { suspend fun put(entity: Food) = safeDbOp {
getBox<Food>()?.put(entity) getBox<Food>()?.put(entity)
} }
@@ -200,11 +209,40 @@ object ObjectBox {
} ?: emptyList() } ?: emptyList()
} }
/**
* 按名称分组统计采集数量
* 使用属性查询只加载 name 字段，不加载 foodVector，节省大量内存
* @param nameFilter 名称过滤关键词，为空时查询全部
* @return 按名称分组后的 (名称, 数量) 列表，按名称排序
*/
suspend fun queryFoodNameCounts(nameFilter: String? = null) = safeDbOp {
val box = getBox<Food>() ?: return@safeDbOp emptyList<Pair<String, Int>>()
val query = if (!nameFilter.isNullOrBlank()) {
box.query(Food_.name.contains(nameFilter)).build()
} else {
box.query().build()
}
try {
// 只查 name 字段，完全不加载 foodVector
query.property(Food_.name).findStrings()
.groupingBy { it }
.eachCount()
.map { (name, count) -> Pair(name, count) }
.sortedBy { it.first }
} finally {
query.close()
}
} ?: emptyList()
// 使用 QueryBuilder 在数据库层删除，避免全量加载到内存 // 使用 QueryBuilder 在数据库层删除，避免全量加载到内存
suspend fun remove(name: String) = safeDbOp { suspend fun remove(name: String) = safeDbOp {
getBox<Food>()?.query(Food_.name.equal(name))?.build()?.remove() getBox<Food>()?.query(Food_.name.equal(name))?.build()?.remove()
} }
suspend fun removeAll() = safeDbOp {
getBox<Food>()?.removeAll()
}
private val dbMutex = Mutex() // 协程并发锁，保证写入操作原子性 private val dbMutex = Mutex() // 协程并发锁，保证写入操作原子性
private const val DB_DIR_NAME = "objectbox" // ObjectBox 默认数据库目录 private const val DB_DIR_NAME = "objectbox" // ObjectBox 默认数据库目录
private const val BACKUP_DIR_NAME = "objectbox_backup" // 备份目录 private const val BACKUP_DIR_NAME = "objectbox_backup" // 备份目录
app/src/main/java/com/sw/inbound/receiver/BootReceiver.kt
+2 -2
View File
@@ -3,7 +3,7 @@ package com.sw.inbound.receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import com.sw.inbound.activity.HomeActivity import com.sw.inbound.activity.InitActivity
import timber.log.Timber import timber.log.Timber
/** /**
@@ -14,7 +14,7 @@ class BootReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
if (Intent.ACTION_BOOT_COMPLETED == intent.action) { if (Intent.ACTION_BOOT_COMPLETED == intent.action) {
Timber.d("设备启动完成，开始执行自启动逻辑") Timber.d("设备启动完成，开始执行自启动逻辑")
val intent = Intent(context, HomeActivity::class.java) val intent = Intent(context, InitActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent) context.startActivity(intent)
} }
app/src/main/java/com/sw/inbound/repository/BaseRepository.kt
+2 -1
View File
@@ -2,6 +2,7 @@ package com.sw.inbound.repository
import com.google.gson.JsonParseException import com.google.gson.JsonParseException
import com.sw.inbound.model.response.ApiResponse import com.sw.inbound.model.response.ApiResponse
import com.sw.inbound.utils.LogSaveUtil
import retrofit2.HttpException import retrofit2.HttpException
import timber.log.Timber import timber.log.Timber
import java.io.IOException import java.io.IOException
@@ -15,7 +16,7 @@ abstract class BaseRepository {
apiCall() apiCall()
} catch (e: Exception) { } catch (e: Exception) {
Timber.e("safeApiCall Exception: ${e.stackTraceToString()}") Timber.e("safeApiCall Exception: ${e.stackTraceToString()}")
LogSaveUtil.saveLogFile("safeApiCall Exception: ${e.stackTraceToString()}")
when (e) { when (e) {
is HttpException -> { is HttpException -> {
// 对于HTTP异常，尝试从响应体中获取错误信息 // 对于HTTP异常，尝试从响应体中获取错误信息
app/src/main/java/com/sw/inbound/sdk/SensorScaleUtils.kt
+8
View File
@@ -61,8 +61,16 @@ object SensorScaleUtils {
private var callbackList: MutableList<WeightCallback> = mutableListOf() private var callbackList: MutableList<WeightCallback> = mutableListOf()
fun addWeightListener(callback: WeightCallback) { fun addWeightListener(callback: WeightCallback) {
if (callbackList.contains(callback).not()) {
callbackList.add(callback) callbackList.add(callback)
} }
}
fun removeWeightListener(callback: WeightCallback) {
if (callbackList.contains(callback)) {
callbackList.remove(callback)
}
}
/** /**
* 开启称重 * 开启称重
app/src/main/java/com/sw/inbound/utils/CameraUtils.kt
+8
View File
@@ -76,11 +76,19 @@ class CameraUtils(private var activity: ComponentActivity) {
} }
fun bind() { fun bind() {
try {
cameraController?.bindToLifecycle(activity) cameraController?.bindToLifecycle(activity)
} catch (e: Exception) {
e.printStackTrace()
}
} }
fun unbind() { fun unbind() {
try {
cameraController?.unbind() cameraController?.unbind()
} catch (e: Exception) {
e.printStackTrace()
}
} }
} }
app/src/main/java/com/sw/inbound/utils/ModelResourceManager.kt
+196
View File
@@ -0,0 +1,196 @@
package com.sw.inbound.utils
import android.content.Context
import timber.log.Timber
import java.io.File
/**
* 模型资源管理器
* 负责从接口下载模型资源包（Zip），并解压到应用缓存目录
* 替代原有的 assets 中写死的 data 文件夹和 .pt 文件
*/
object ModelResourceManager {
/**
* 资源下载和解压的回调接口
*/
interface ResourceCallback {
/**
* 下载进度回调
* @param progress 进度百分比 (0-100)
* @param message 进度信息
*/
fun onDownloadProgress(progress: Int, message: String)
/**
* 解压进度回调
* @param progress 进度百分比 (0-100)
* @param message 进度信息
*/
fun onExtractProgress(progress: Int, message: String)
/**
* 完成回调
* @param resourceDir 资源所在目录
*/
fun onSuccess(resourceDir: File)
/**
* 失败回调
* @param errorMessage 错误信息
*/
fun onFailure(errorMessage: String)
}
/**
* 下载并解压模型资源
* @param context 应用上下文
* @param downloadUrl 资源包下载链接
* @param callback 进度和结果回调
*/
fun downloadAndExtractResources(
context: Context,
downloadUrl: String,
callback: ResourceCallback
) {
try {
// 获取缓存目录
val cacheDir = context.cacheDir
val resourcesDir = File(cacheDir, "model_resources")
val zipFile = File(cacheDir, "model_resources.zip")
Timber.d("资源缓存目录: ${resourcesDir.absolutePath}")
Timber.d("Zip 文件路径: ${zipFile.absolutePath}")
// Step 1: 下载 Zip 文件
Timber.d("开始下载资源包: $downloadUrl")
ZipDownloadUtils.downloadZip(
downloadUrl = downloadUrl,
targetFile = zipFile,
listener = object : ZipDownloadUtils.DownloadProgressListener {
override fun onProgress(currentSize: Long, totalSize: Long, progress: Int) {
val message = "下载中... ${formatFileSize(currentSize)}/${formatFileSize(totalSize)}"
callback.onDownloadProgress(progress, message)
}
override fun onSuccess(file: File) {
Timber.d("资源包下载完成")
callback.onDownloadProgress(100, "下载完成")
// Step 2: 解压 Zip 文件
extractResources(resourcesDir, zipFile, callback)
}
override fun onFailure(exception: Exception) {
val errorMsg = "资源包下载失败: ${exception.message}"
Timber.e(exception, errorMsg)
callback.onFailure(errorMsg)
}
}
)
} catch (e: Exception) {
val errorMsg = "资源下载和解压过程异常: ${e.message}"
Timber.e(e, errorMsg)
callback.onFailure(errorMsg)
}
}
/**
* 解压资源包
*/
private fun extractResources(
resourcesDir: File,
zipFile: File,
callback: ResourceCallback
) {
try {
Timber.d("开始解压资源包")
ZipExtractUtils.extractZip(
zipFile = zipFile,
targetDir = resourcesDir,
listener = object : ZipExtractUtils.ExtractProgressListener {
override fun onProgress(
currentFile: String,
currentIndex: Int,
totalFiles: Int,
progress: Int
) {
val message = "解压中... ($currentIndex/$totalFiles) $currentFile"
callback.onExtractProgress(progress, message)
}
override fun onSuccess(targetDir: File) {
Timber.d("资源包解压完成: ${targetDir.absolutePath}")
callback.onExtractProgress(100, "解压完成")
// 清理 Zip 文件
zipFile.delete()
Timber.d("临时 Zip 文件已删除")
callback.onSuccess(targetDir)
}
override fun onFailure(exception: Exception) {
val errorMsg = "资源包解压失败: ${exception.message}"
Timber.e(exception, errorMsg)
callback.onFailure(errorMsg)
}
}
)
} catch (e: Exception) {
val errorMsg = "解压过程异常: ${e.message}"
Timber.e(e, errorMsg)
callback.onFailure(errorMsg)
}
}
/**
* 获取已缓存的资源目录
* @param context 应用上下文
* @return 资源目录，如果不存在则返回 null
*/
fun getCachedResourcesDir(context: Context): File? {
val resourcesDir = File(context.cacheDir, "model_resources")
return if (resourcesDir.exists() && resourcesDir.isDirectory) {
resourcesDir
} else {
null
}
}
/**
* 清理缓存的资源
* @param context 应用上下文
* @return 是否清理成功
*/
fun clearCachedResources(context: Context): Boolean {
return try {
val resourcesDir = File(context.cacheDir, "model_resources")
val zipFile = File(context.cacheDir, "model_resources.zip")
val dirDeleted = resourcesDir.deleteRecursively()
val zipDeleted = zipFile.delete()
Timber.d("清理缓存资源: 目录=$dirDeleted, Zip=$zipDeleted")
dirDeleted || zipDeleted
} catch (e: Exception) {
Timber.e(e, "清理缓存资源失败")
false
}
}
/**
* 格式化文件大小为可读字符串
*/
private fun formatFileSize(bytes: Long): String {
return when {
bytes <= 0 -> "0 B"
bytes < 1024 -> "$bytes B"
bytes < 1024 * 1024 -> String.format("%.2f KB", bytes / 1024.0)
bytes < 1024 * 1024 * 1024 -> String.format("%.2f MB", bytes / (1024.0 * 1024))
else -> String.format("%.2f GB", bytes / (1024.0 * 1024 * 1024))
}
}
}
app/src/main/java/com/sw/inbound/utils/NetworkUtils.kt
+24
View File
@@ -0,0 +1,24 @@
package com.sw.inbound.utils
import android.content.Context
import android.net.ConnectivityManager
import android.net.NetworkCapabilities
/**
* 网络连接检测工具类
* 提供检测设备网络连接状态的功能
*/
object NetworkUtils {
/**
* 检测设备是否连接到网络
* @param context 应用上下文
* @return true 表示已连接网络，false 表示未连接
*/
fun isNetworkConnected(context: Context): Boolean {
val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val network = connectivityManager.activeNetwork ?: return false
val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
}
}
app/src/main/java/com/sw/inbound/utils/ZipDownloadUtils.kt
+122
View File
@@ -0,0 +1,122 @@
package com.sw.inbound.utils
import okhttp3.OkHttpClient
import okhttp3.Request
import timber.log.Timber
import java.io.File
import java.io.FileOutputStream
import java.io.IOException
/**
* Zip 文件下载工具类
* 支持大文件下载、进度回调、断点续传等功能
*/
object ZipDownloadUtils {
/**
* 下载进度回调接口
*/
interface DownloadProgressListener {
/**
* 下载进度回调
* @param currentSize 已下载字节数
* @param totalSize 总字节数
* @param progress 进度百分比 (0-100)
*/
fun onProgress(currentSize: Long, totalSize: Long, progress: Int)
/**
* 下载完成回调
* @param file 下载完成的文件
*/
fun onSuccess(file: File)
/**
* 下载失败回调
* @param exception 异常信息
*/
fun onFailure(exception: Exception)
}
/**
* 下载 Zip 文件
* @param downloadUrl 下载链接
* @param targetFile 目标文件路径
* @param listener 进度监听器
* @param okHttpClient OkHttp 客户端（可选，默认创建新实例）
*/
fun downloadZip(
downloadUrl: String,
targetFile: File,
listener: DownloadProgressListener? = null,
okHttpClient: OkHttpClient? = null
) {
try {
// 确保目标文件的父目录存在
targetFile.parentFile?.mkdirs()
val client = okHttpClient ?: OkHttpClient()
val request = Request.Builder()
.url(downloadUrl)
.build()
val response = client.newCall(request).execute()
if (!response.isSuccessful) {
throw IOException("下载失败，HTTP 状态码: ${response.code}")
}
val responseBody = response.body
?: throw IOException("响应体为空")
val totalSize = responseBody.contentLength()
Timber.d("开始下载 Zip 文件，总大小: ${formatFileSize(totalSize)}")
var currentSize = 0L
val buffer = ByteArray(8192) // 8KB 缓冲区
var bytesRead: Int
FileOutputStream(targetFile).use { fileOutput ->
responseBody.byteStream().use { inputStream ->
while (inputStream.read(buffer).also { bytesRead = it } != -1) {
fileOutput.write(buffer, 0, bytesRead)
currentSize += bytesRead
// 计算进度百分比
val progress = if (totalSize > 0) {
((currentSize * 100) / totalSize).toInt()
} else {
0
}
listener?.onProgress(currentSize, totalSize, progress)
Timber.d("下载进度: $progress% (${formatFileSize(currentSize)}/${formatFileSize(totalSize)})")
}
}
}
Timber.d("Zip 文件下载完成: ${targetFile.absolutePath}")
listener?.onSuccess(targetFile)
} catch (e: Exception) {
Timber.e(e, "下载 Zip 文件失败")
targetFile.delete() // 删除不完整的文件
listener?.onFailure(e)
}
}
/**
* 格式化文件大小为可读字符串
* @param bytes 字节数
* @return 格式化后的字符串（如 "10.5 MB"）
*/
private fun formatFileSize(bytes: Long): String {
return when {
bytes <= 0 -> "0 B"
bytes < 1024 -> "$bytes B"
bytes < 1024 * 1024 -> String.format("%.2f KB", bytes / 1024.0)
bytes < 1024 * 1024 * 1024 -> String.format("%.2f MB", bytes / (1024.0 * 1024))
else -> String.format("%.2f GB", bytes / (1024.0 * 1024 * 1024))
}
}
}
app/src/main/java/com/sw/inbound/utils/ZipExtractUtils.kt
+131
View File
@@ -0,0 +1,131 @@
package com.sw.inbound.utils
import timber.log.Timber
import java.io.File
import java.io.FileOutputStream
import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream
/**
* Zip 文件解压工具类
* 支持解压进度回调、自动创建目录等功能
*/
object ZipExtractUtils {
/**
* 解压进度回调接口
*/
interface ExtractProgressListener {
/**
* 解压进度回调
* @param currentFile 当前正在解压的文件名
* @param currentIndex 当前解压文件索引
* @param totalFiles 总文件数
* @param progress 进度百分比 (0-100)
*/
fun onProgress(currentFile: String, currentIndex: Int, totalFiles: Int, progress: Int)
/**
* 解压完成回调
* @param targetDir 解压目标目录
*/
fun onSuccess(targetDir: File)
/**
* 解压失败回调
* @param exception 异常信息
*/
fun onFailure(exception: Exception)
}
/**
* 解压 Zip 文件
* @param zipFile 待解压的 Zip 文件
* @param targetDir 解压目标目录
* @param listener 进度监听器
*/
fun extractZip(
zipFile: File,
targetDir: File,
listener: ExtractProgressListener? = null
) {
try {
if (!zipFile.exists() || !zipFile.isFile) {
throw IllegalArgumentException("Zip 文件不存在或不是文件: ${zipFile.absolutePath}")
}
// 确保目标目录存在
targetDir.mkdirs()
Timber.d("开始解压 Zip 文件: ${zipFile.absolutePath}")
Timber.d("解压目标目录: ${targetDir.absolutePath}")
// 第一次遍历：计算总文件数
val totalFiles = countZipEntries(zipFile)
Timber.d("Zip 文件总条目数: $totalFiles")
var currentIndex = 0
ZipInputStream(zipFile.inputStream()).use { zipInputStream ->
var entry: ZipEntry? = zipInputStream.nextEntry
while (entry != null) {
currentIndex++
val entryName = entry.name
val progress = ((currentIndex * 100) / totalFiles).coerceIn(0, 100)
Timber.d("解压进度: $progress% ($currentIndex/$totalFiles) - $entryName")
listener?.onProgress(entryName, currentIndex, totalFiles, progress)
if (entry.isDirectory) {
// 创建目录
val dir = File(targetDir, entryName)
dir.mkdirs()
} else {
// 解压文件
val file = File(targetDir, entryName)
file.parentFile?.mkdirs()
FileOutputStream(file).use { fileOutput ->
val buffer = ByteArray(8192) // 8KB 缓冲区
var bytesRead: Int
while (zipInputStream.read(buffer).also { bytesRead = it } != -1) {
fileOutput.write(buffer, 0, bytesRead)
}
}
}
zipInputStream.closeEntry()
entry = zipInputStream.nextEntry
}
}
Timber.d("Zip 文件解压完成: ${targetDir.absolutePath}")
listener?.onSuccess(targetDir)
} catch (e: Exception) {
Timber.e(e, "解压 Zip 文件失败")
listener?.onFailure(e)
}
}
/**
* 计算 Zip 文件中的条目总数
* @param zipFile Zip 文件
* @return 条目总数
*/
private fun countZipEntries(zipFile: File): Int {
var count = 0
try {
ZipInputStream(zipFile.inputStream()).use { zipInputStream ->
while (zipInputStream.nextEntry != null) {
count++
zipInputStream.closeEntry()
}
}
} catch (e: Exception) {
Timber.e(e, "计算 Zip 条目数失败")
}
return count.coerceAtLeast(1) // 至少返回 1，避免除以 0
}
}
app/src/main/java/com/sw/inbound/utils/ZipToolsUsageExample.kt
+188
View File
@@ -0,0 +1,188 @@
package com.sw.inbound.utils
/**
* Zip 文件下载和解压工具使用示例
*
* ============================================
* 方案一：使用高层管理器（推荐）
* ============================================
*
* 在 Activity 或 ViewModel 中使用：
*
* ```kotlin
* // 下载并解压模型资源
* ModelResourceManager.downloadAndExtractResources(
* context = this,
* downloadUrl = "https://example.com/model_resources.zip",
* callback = object : ModelResourceManager.ResourceCallback {
* override fun onDownloadProgress(progress: Int, message: String) {
* // 更新下载进度 UI
* runOnUiThread {
* tvProgress.text = "$progress% - $message"
* }
* }
*
* override fun onExtractProgress(progress: Int, message: String) {
* // 更新解压进度 UI
* runOnUiThread {
* tvProgress.text = "$progress% - $message"
* }
* }
*
* override fun onSuccess(resourceDir: File) {
* // 资源解压完成，可以开始使用
* Timber.d("资源已准备好: ${resourceDir.absolutePath}")
* // 例如：加载 data 文件夹和 .pt 文件
* val dataDir = File(resourceDir, "data")
* val modelFile = File(resourceDir, "model.pt")
* }
*
* override fun onFailure(errorMessage: String) {
* // 处理错误
* runOnUiThread {
* ToastUtils.show("资源下载失败: $errorMessage")
* }
* }
* }
* )
*
* // 获取已缓存的资源目录
* val cachedDir = ModelResourceManager.getCachedResourcesDir(this)
* if (cachedDir != null) {
* // 资源已缓存，直接使用
* val dataDir = File(cachedDir, "data")
* val modelFile = File(cachedDir, "model.pt")
* }
*
* // 清理缓存的资源
* ModelResourceManager.clearCachedResources(this)
* ```
*
* ============================================
* 方案二：分别使用下载和解压工具
* ============================================
*
* 如果需要更细粒度的控制，可以分别使用：
*
* ```kotlin
* // 1. 下载 Zip 文件
* val zipFile = File(context.cacheDir, "model_resources.zip")
* ZipDownloadUtils.downloadZip(
* downloadUrl = "https://example.com/model_resources.zip",
* targetFile = zipFile,
* listener = object : ZipDownloadUtils.DownloadProgressListener {
* override fun onProgress(currentSize: Long, totalSize: Long, progress: Int) {
* Timber.d("下载进度: $progress%")
* }
*
* override fun onSuccess(file: File) {
* Timber.d("下载完成: ${file.absolutePath}")
* // 继续解压
* }
*
* override fun onFailure(exception: Exception) {
* Timber.e(exception, "下载失败")
* }
* }
* )
*
* // 2. 解压 Zip 文件
* val targetDir = File(context.cacheDir, "model_resources")
* ZipExtractUtils.extractZip(
* zipFile = zipFile,
* targetDir = targetDir,
* listener = object : ZipExtractUtils.ExtractProgressListener {
* override fun onProgress(
* currentFile: String,
* currentIndex: Int,
* totalFiles: Int,
* progress: Int
* ) {
* Timber.d("解压进度: $progress% - $currentFile")
* }
*
* override fun onSuccess(targetDir: File) {
* Timber.d("解压完成: ${targetDir.absolutePath}")
* }
*
* override fun onFailure(exception: Exception) {
* Timber.e(exception, "解压失败")
* }
* }
* )
* ```
*
* ============================================
* 关键特性
* ============================================
*
* 1. 下载特性：
* - 支持大文件下载（120MB+ 无压力）
* - 实时进度回调
* - 自动错误处理和清理
* - 使用 8KB 缓冲区，内存占用低
*
* 2. 解压特性：
* - 支持大型 Zip 文件
* - 自动创建目录结构
* - 实时进度回调
* - 使用 Java 内置 ZipInputStream，无额外依赖
*
* 3. 资源管理：
* - 自动缓存到应用缓存目录
* - 支持检查缓存是否存在
* - 支持清理缓存
* - 完整的日志记录
*
* ============================================
* 建议的集成方式
* ============================================
*
* 1. 在 Application 初始化时检查缓存：
* ```kotlin
* class MyApp : Application() {
* override fun onCreate() {
* super.onCreate()
* // 检查模型资源是否已缓存
* val cachedDir = ModelResourceManager.getCachedResourcesDir(this)
* if (cachedDir == null) {
* // 需要下载资源，可以在首次启动时提示用户
* }
* }
* }
* ```
*
* 2. 在需要使用资源的 Activity/Fragment 中：
* ```kotlin
* val cachedDir = ModelResourceManager.getCachedResourcesDir(context)
* if (cachedDir != null) {
* // 资源已准备好，直接使用
* useModelResources(cachedDir)
* } else {
* // 资源不存在，触发下载
* downloadResources()
* }
* ```
*
* 3. 在后台线程中执行下载和解压：
* ```kotlin
* Thread {
* ModelResourceManager.downloadAndExtractResources(
* context = this,
* downloadUrl = resourceUrl,
* callback = callback
* )
* }.start()
* ```
*
* ============================================
* 注意事项
* ============================================
*
* 1. 下载和解压操作会阻塞线程，建议在后台线程执行
* 2. 确保应用有网络权限和文件读写权限
* 3. 缓存目录会占用应用缓存空间，大文件需要足够的存储空间
* 4. 下载失败时会自动删除不完整的文件
* 5. 所有操作都有详细的日志记录，可通过 Timber 查看
*/
object ZipToolsUsageExample
app/src/main/java/com/sw/inbound/utils/ext/Common.kt
+22
View File
@@ -14,6 +14,7 @@ import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.TypedValue import android.util.TypedValue
import android.view.TouchDelegate
import android.view.View import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
@@ -270,3 +271,24 @@ fun String.copyText(context: Context, showToast: Boolean = true) {
Toast.makeText(context, "文本已复制到剪贴板", Toast.LENGTH_SHORT).show() Toast.makeText(context, "文本已复制到剪贴板", Toast.LENGTH_SHORT).show()
} }
} }
/**
* 扩大 View 的点击区域
* @param horizontal 水平方向扩大距离（dp）→ 左右各扩大一半
* @param vertical 垂直方向扩大距离（dp）→ 上下各扩大一半
*/
fun View.expandClickArea(horizontal: Int, vertical: Int) {
val density = resources.displayMetrics.density
val hPx = (horizontal * density).toInt()
val vPx = (vertical * density).toInt()
post {
val rect = android.graphics.Rect()
getHitRect(rect)
// 扩大区域：负值 = 向外扩大
rect.inset(-hPx, -vPx)
//rect.bottom += downPx // 只往下扩大
(parent as View).touchDelegate = TouchDelegate(rect, this)
}
}
app/src/main/java/com/sw/inbound/viewmodel/BaseViewModel.kt
+12 -1
View File
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import com.sw.inbound.GlobalData import com.sw.inbound.GlobalData
import com.sw.inbound.MyApp
import com.sw.inbound.model.response.ApiResponse import com.sw.inbound.model.response.ApiResponse
import com.sw.inbound.model.response.DictType import com.sw.inbound.model.response.DictType
import com.sw.inbound.model.response.EquipmentInfo import com.sw.inbound.model.response.EquipmentInfo
@@ -16,6 +17,7 @@ import com.sw.inbound.repository.RemoteRepository
import com.sw.inbound.utils.SPUtil import com.sw.inbound.utils.SPUtil
//import com.sw.inbound.utils.ToastUtils //import com.sw.inbound.utils.ToastUtils
import com.sw.inbound.utils.ext.toType import com.sw.inbound.utils.ext.toType
import com.sw.inbound.utils.ext.toast
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
@@ -103,6 +105,7 @@ abstract class BaseViewModel(
} }
Timber.d("msg = ${response.msg}, code = ${response.code}") Timber.d("msg = ${response.msg}, code = ${response.code}")
// ToastUtils.showToast("${response.msg}(${response.code})") // ToastUtils.showToast("${response.msg}(${response.code})")
MyApp.instance?.toast("${response.msg}(${response.code})")
return false return false
} }
@@ -209,7 +212,11 @@ abstract class BaseViewModel(
callback: (List<SearchGoodsInfo.Record>) -> Unit callback: (List<SearchGoodsInfo.Record>) -> Unit
) { ) {
launch { launch {
if (nameList.isNullOrEmpty() && scoreList.isNullOrEmpty()) return@launch try {
if (nameList.isNullOrEmpty() && scoreList.isNullOrEmpty()) {
callback(listOf())
return@launch
}
val paramList = if (nameList.isNullOrEmpty()) scoreList!!.map { it.name } else nameList val paramList = if (nameList.isNullOrEmpty()) scoreList!!.map { it.name } else nameList
val response = repository.recognizeGoodsList(paramList) val response = repository.recognizeGoodsList(paramList)
val list = if (parseResponse(response)) response.data ?: listOf() else listOf() val list = if (parseResponse(response)) response.data ?: listOf() else listOf()
@@ -220,6 +227,10 @@ abstract class BaseViewModel(
} }
} }
callback(list) callback(list)
} catch (e: Exception) {
Timber.e(e)
callback(listOf())
}
} }
} }
app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt
+5 -9
View File
@@ -323,17 +323,17 @@ class ReceiptViewModel @Inject constructor(
// } // }
// } // }
fun confirmReceipt(uploadInfo: UploadInfo, callback: (Boolean) -> Unit) { fun confirmReceipt(uploadInfo: UploadInfo, callback: (Boolean, String) -> Unit) {
launchWithLoading { launchWithLoading {
val resp = repository.confirmReceipt(uploadInfo) val resp = repository.confirmReceipt(uploadInfo)
callback(resp.data == true) callback(resp.isSuccess(), resp.msg?:"")
} }
} }
fun addToWarehouse(list: List<PurchaseWarehouseParam>, callback: (Boolean) -> Unit) { fun addToWarehouse(list: List<PurchaseWarehouseParam>, callback: (Boolean, String) -> Unit) {
launchWithLoading { launchWithLoading {
val resp = repository.selfPurchaseWarehousing(list) val resp = repository.selfPurchaseWarehousing(list)
callback(resp.data == true) callback(resp.isSuccess(), resp.msg?:"")
} }
} }
@@ -409,11 +409,7 @@ class ReceiptViewModel @Inject constructor(
return true return true
} }
val resp = repository.uploadMultipleImages(fileList = fileList, params = params) val resp = repository.uploadMultipleImages(fileList = fileList, params = params)
// if (!parseResponse(resp)) { return parseResponse(resp)
// callback(false)
// return@launchWithLoading
// }
return resp.code == "00000"
} }
} }
app/src/main/java/com/sw/inbound/viewmodel/UserViewModel.kt
+39
View File
@@ -1,17 +1,23 @@
package com.sw.inbound.viewmodel package com.sw.inbound.viewmodel
import androidx.lifecycle.viewModelScope
import com.sw.inbound.GlobalData import com.sw.inbound.GlobalData
import com.sw.inbound.GlobalKey import com.sw.inbound.GlobalKey
import com.sw.inbound.model.request.LoginParam import com.sw.inbound.model.request.LoginParam
import com.sw.inbound.model.response.CollectedFoodInfo
import com.sw.inbound.model.response.User import com.sw.inbound.model.response.User
import com.sw.inbound.objbox.ObjectBox
import com.sw.inbound.repository.RemoteRepository import com.sw.inbound.repository.RemoteRepository
import com.sw.inbound.utils.GsonUtils import com.sw.inbound.utils.GsonUtils
import com.sw.inbound.utils.SPUtil import com.sw.inbound.utils.SPUtil
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
import kotlin.collections.remove
@HiltViewModel @HiltViewModel
class UserViewModel @Inject constructor( class UserViewModel @Inject constructor(
@@ -64,6 +70,39 @@ class UserViewModel @Inject constructor(
SPUtil.getInstance().remove(GlobalKey.KEY_TOKEN) SPUtil.getInstance().remove(GlobalKey.KEY_TOKEN)
} }
/**
* 已采集食材列表 UI 状态流
* 元素为按名称分组后的（名称，数量）数据
*/
private val _collectedFoodListState = MutableStateFlow<List<CollectedFoodInfo>>(emptyList())
val collectedFoodListState: StateFlow<List<CollectedFoodInfo>> = _collectedFoodListState.asStateFlow()
/**
* 加载已采集食材列表，按名称分组统计数量
* 使用属性查询只读 name 字段，不加载 foodVector，节省内存
* @param nameFilter 名称过滤关键词，为空时加载全部
*/
fun loadCollectedFoodList(nameFilter: String? = null) {
viewModelScope.launch {
val result = ObjectBox.queryFoodNameCounts(nameFilter)
_collectedFoodListState.value = result.map { (name, count) ->
CollectedFoodInfo(foodName = name, foodNum = count)
}
}
}
/**
* 删除指定名称的所有采集记录，删除完成后刷新列表
* @param foodName 食材名称
* @param nameFilter 当前搜索关键词，用于删除后刷新列表
*/
fun removeCollectedFood(foodName: String, nameFilter: String? = null) {
viewModelScope.launch {
ObjectBox.remove(foodName)
loadCollectedFoodList(nameFilter)
}
}
override fun handleSensorScale(weight: Double) { override fun handleSensorScale(weight: Double) {
} }
app/src/main/res/drawable/btn_connect_network.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#4ECDC4" />
<corners android:radius="12dp" />
<stroke
android:width="2dp"
android:color="#2BA39F" />
</shape>
app/src/main/res/drawable/ic_network_error.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="80dp"
android:height="80dp"
android:viewportWidth="24"
android:viewportHeight="24">
<!-- 网络断开的图标 -->
<path
android:fillColor="#FF6B6B"
android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2c-4.42,-4.42 -11.58,-4.42 -16,0zM9,17h6v2h-6z" />
</vector>
app/src/main/res/drawable/loading.xml
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="240dp"
android:height="240dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<!-- 由小到大排列的圆点，构成旋转加载指示器 -->
<path
android:fillColor="#262626"
android:pathData="M876.864,782.592c3.264,0 6.272,-3.2 6.272,-6.656c0,-3.456 -3.008,-6.592 -6.272,-6.592c-3.264,0 -6.272,3.2 -6.272,6.592c0,3.456 3.008,6.656 6.272,6.656z" />
<path
android:fillColor="#262626"
android:pathData="M736.32,935.936c2.304,2.432 5.568,3.84 8.768,3.84a12.16,12.16 0,0 0,8.832 -3.84a13.76,13.76 0,0 0,0 -18.56a12.224,12.224 0,0 0,-8.832 -3.84a12.16,12.16 0,0 0,-8.768 3.84a13.696,13.696 0,0 0,0 18.56z" />
<path
android:fillColor="#262626"
android:pathData="M552.32,1018.24c3.456,3.648 8.32,5.76 13.184,5.76a18.368,18.368 0,0 0,13.184 -5.76a20.608,20.608 0,0 0,0 -27.968a18.368,18.368 0,0 0,-13.184 -5.824a18.368,18.368 0,0 0,-13.184 5.76a20.608,20.608 0,0 0,0 28.032z" />
<path
android:fillColor="#262626"
android:pathData="M353.984,1012.48c4.608,4.8 11.072,7.68 17.6,7.68a24.448,24.448 0,0 0,17.536 -7.68a27.456,27.456 0,0 0,0 -37.248a24.448,24.448 0,0 0,-17.536 -7.68a24.448,24.448 0,0 0,-17.6 7.68a27.52,27.52 0,0 0,0 37.184z" />
<path
android:fillColor="#262626"
android:pathData="M178.304,920.64c5.76,6.08 13.824,9.6 21.952,9.6a30.592,30.592 0,0 0,22.016 -9.6a34.368,34.368 0,0 0,0 -46.592a30.592,30.592 0,0 0,-22.016 -9.6a30.592,30.592 0,0 0,-21.952 9.6a34.368,34.368 0,0 0,0 46.592z" />
<path
android:fillColor="#262626"
android:pathData="M57.152,761.28c6.912,7.36 16.64,11.648 26.368,11.648a36.736,36.736 0,0 0,26.432 -11.584a41.28,41.28 0,0 0,0 -55.936a36.736,36.736 0,0 0,-26.432 -11.584a36.8,36.8 0,0 0,-26.368 11.52a41.28,41.28 0,0 0,0 56z" />
<path
android:fillColor="#262626"
android:pathData="M12.736,564.672a42.88,42.88 0,0 0,30.784 13.44a42.88,42.88 0,0 0,30.784 -13.44a48.128,48.128 0,0 0,0 -65.216a42.88,42.88 0,0 0,-30.72 -13.44a42.88,42.88 0,0 0,-30.848 13.44a48.128,48.128 0,0 0,0 65.216z" />
<path
android:fillColor="#262626"
android:pathData="M52.544,369.28a48.96,48.96 0,0 0,35.2 15.36a48.96,48.96 0,0 0,35.2 -15.36a54.976,54.976 0,0 0,0 -74.56a48.96,48.96 0,0 0,-35.2 -15.424a48.96,48.96 0,0 0,-35.2 15.424a54.976,54.976 0,0 0,0 74.56z" />
<path
android:fillColor="#262626"
android:pathData="M168.32,212.48c10.368,11.008 24.96,17.408 39.68,17.408c14.592,0 29.184,-6.4 39.552,-17.408a61.888,61.888 0,0 0,0 -83.84a55.104,55.104 0,0 0,-39.616 -17.408c-14.656,0 -29.248,6.4 -39.616,17.408a61.888,61.888 0,0 0,0 83.84z" />
<path
android:fillColor="#262626"
android:pathData="M337.344,124.8c11.52,12.16 27.712,19.264 43.968,19.264c16.256,0 32.448,-7.04 43.968,-19.264a68.672,68.672 0,0 0,0 -93.184a61.248,61.248 0,0 0,-43.968 -19.264a61.248,61.248 0,0 0,-43.968 19.264a68.736,68.736 0,0 0,0 93.184z" />
<path
android:fillColor="#262626"
android:pathData="M526.976,123.712c12.672,13.44 30.528,21.248 48.448,21.248s35.712,-7.808 48.384,-21.248a75.584,75.584 0,0 0,0 -102.464A67.392,67.392 0,0 0,575.36 0c-17.92,0 -35.776,7.808 -48.448,21.248a75.584,75.584 0,0 0,0 102.464z" />
<path
android:fillColor="#262626"
android:pathData="M700.8,210.304c13.824,14.592 33.28,23.104 52.736,23.104c19.584,0 39.04,-8.512 52.8,-23.104a82.432,82.432 0,0 0,0 -111.744a73.472,73.472 0,0 0,-52.8 -23.168c-19.52,0 -38.912,8.512 -52.736,23.168a82.432,82.432 0,0 0,0 111.744z" />
<path
android:fillColor="#262626"
android:pathData="M824.832,368.832c14.976,15.872 36.032,25.088 57.216,25.088c21.12,0 42.24,-9.216 57.152,-25.088a89.344,89.344 0,0 0,0 -121.088a79.616,79.616 0,0 0,-57.152 -25.088c-21.184,0 -42.24,9.216 -57.216,25.088a89.344,89.344 0,0 0,0 121.088z" />
<path
android:fillColor="#262626"
android:pathData="M875.264,572.864c16.128,17.088 38.784,27.008 61.632,27.008c22.784,0 45.44,-9.92 61.568,-27.008a96.256,96.256 0,0 0,0 -130.432a85.76,85.76 0,0 0,-61.568 -27.072c-22.848,0 -45.44,9.984 -61.632,27.072a96.192,96.192 0,0 0,0 130.432z" />
</vector>
app/src/main/res/drawable/loading_spinner.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="ring"
android:innerRadiusRatio="3"
android:thicknessRatio="8"
android:useLevel="false">
<gradient
android:type="sweep"
android:startColor="#FF6B6B"
android:centerColor="#4ECDC4"
android:endColor="#FF6B6B"
android:angle="0" />
</shape>
app/src/main/res/layout/activity_fun.xml
+98
View File
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg"
android:orientation="vertical">
<!-- 标题栏区域 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="60dp"
android:paddingEnd="60dp"
android:paddingTop="22dp">
<!-- 返回按钮 -->
<ImageView
android:id="@+id/ivBack"
android:layout_width="60dp"
android:layout_height="60dp"
android:contentDescription="返回"
android:src="@mipmap/ic_back" />
<!-- 标题文字 -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="趣味页面"
android:textColor="@color/title"
android:textSize="36sp"
android:textStyle="bold" />
<!-- 占位弹性空间 -->
<Space
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
</LinearLayout>
<!-- 内容区域 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
android:padding="60dp">
<!-- 下载按钮 -->
<Button
android:id="@+id/btnDownload"
android:layout_width="400dp"
android:layout_height="80dp"
android:text="1. 下载 Zip 文件"
android:textSize="24sp"
android:textColor="@color/white"
android:backgroundTint="@color/title"
android:layout_marginBottom="30dp" />
<!-- 解压按钮 -->
<Button
android:id="@+id/btnExtract"
android:layout_width="400dp"
android:layout_height="80dp"
android:text="2. 解压 Zip 文件"
android:textSize="24sp"
android:textColor="@color/white"
android:backgroundTint="@color/title"
android:layout_marginBottom="30dp" />
<!-- 读取并保存按钮 -->
<Button
android:id="@+id/btnLoadAndSave"
android:layout_width="400dp"
android:layout_height="80dp"
android:text="3. 读取并保存到数据库"
android:textSize="24sp"
android:textColor="@color/white"
android:backgroundTint="@color/title"
android:layout_marginBottom="30dp" />
<!-- 进度/状态显示 -->
<TextView
android:id="@+id/tvProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="就绪"
android:textColor="@color/black"
android:textSize="20sp"
android:layout_marginTop="30dp" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/activity_goods_list.xml
+9 -3
View File
@@ -19,16 +19,22 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="0dp" android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="40dp" android:layout_marginStart="30dp"
android:layout_weight="1" android:padding="10dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="出入库管理" android:text="出入库管理"
android:textColor="#141428" android:textColor="#141428"
android:textSize="36sp" android:textSize="36sp"
android:textStyle="bold" /> android:textStyle="bold" />
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"/>
<TextView <TextView
android:id="@+id/tvUserName" android:id="@+id/tvUserName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
app/src/main/res/layout/activity_home.xml
+4 -1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/bg" android:background="@mipmap/bg"
@@ -37,9 +38,11 @@
android:id="@+id/tvTime" android:id="@+id/tvTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingVertical="10dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="24sp" android:textSize="24sp"
android:visibility="visible" /> android:visibility="visible"
tools:text="2026-03-13 星期五"/>
<!-- 用户信息区（已登录时显示，未登录隐藏） --> <!-- 用户信息区（已登录时显示，未登录隐藏） -->
<LinearLayout <LinearLayout
app/src/main/res/layout/activity_init.xml
+88
View File
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg"
android:orientation="vertical"
android:gravity="center">
<!-- Loading 动画容器 -->
<LinearLayout
android:id="@+id/llLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
android:visibility="visible">
<!-- 加载动画 -->
<ImageView
android:id="@+id/ivLoading"
android:layout_width="160dp"
android:layout_height="160dp"
android:src="@drawable/loading"
android:contentDescription="加载中" />
<!-- 倒计时文字 -->
<TextView
android:id="@+id/tvCountdown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="60秒"
android:textSize="40sp"
android:textColor="@color/black"
android:textStyle="bold"
android:layout_marginTop="50dp" />
<!-- 提示文字 -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="网络连接检测中，请稍后……"
android:textSize="22sp"
android:textColor="#555555"
android:layout_marginTop="20dp" />
</LinearLayout>
<!-- 连接网络按钮容器 -->
<LinearLayout
android:id="@+id/llNetworkButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
android:visibility="gone">
<!-- 网络错误图标 -->
<ImageView
android:layout_width="140dp"
android:layout_height="140dp"
android:src="@drawable/ic_network_error"
android:contentDescription="网络连接失败"
android:layout_marginBottom="30dp" />
<!-- 连接失败提示 -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="网络连接失败"
android:textSize="36sp"
android:textColor="@color/black"
android:textStyle="bold"
android:layout_marginBottom="40dp" />
<!-- 连接网络按钮 -->
<Button
android:id="@+id/btnConnectNetwork"
android:layout_width="350dp"
android:layout_height="70dp"
android:text="连接网络"
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@android:color/white"
android:background="@drawable/btn_connect_network" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/dialog_env_switch.xml
+106
View File
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="600dp"
android:layout_height="wrap_content"
android:background="@drawable/bg_white_radius12"
android:orientation="vertical"
android:paddingHorizontal="40dp"
android:paddingVertical="36dp">
<!-- 标题 -->
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="环境切换"
android:textColor="#ff141428"
android:textSize="36sp"
android:textStyle="bold" />
<!-- 分割线 -->
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="24dp"
android:background="#FFDCDCF0" />
<!-- 环境选项 -->
<RadioGroup
android:id="@+id/rgEnv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:orientation="vertical">
<RadioButton
android:id="@+id/rbTest"
android:layout_width="match_parent"
android:layout_height="72dp"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:text="测试环境"
android:textColor="#ff141428"
android:textSize="28sp" />
<RadioButton
android:id="@+id/rbUat"
android:layout_width="match_parent"
android:layout_height="72dp"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:text="UAT 环境"
android:textColor="#ff141428"
android:textSize="28sp" />
<RadioButton
android:id="@+id/rbProd"
android:layout_width="match_parent"
android:layout_height="72dp"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:text="生产环境"
android:textColor="#ff141428"
android:textSize="28sp" />
</RadioGroup>
<!-- 分割线 -->
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="24dp"
android:background="#FFDCDCF0" />
<!-- 底部按钮 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_marginTop="24dp"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/btnCancel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="20dp"
android:layout_weight="1"
android:background="@drawable/bg_white_radius10_stroke2"
android:text="取消"
android:textColor="#ff141428"
android:textSize="28sp" />
<Button
android:id="@+id/btnConfirm"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_weight="1"
android:background="@drawable/bg_blue_radius10"
android:text="确认"
android:textColor="#ffffff"
android:textSize="28sp" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/list_item_collect_search.xml
+27 -8
View File
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="82dp" android:layout_height="100dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_marginVertical="10dp" android:layout_marginVertical="10dp"
android:layout_marginHorizontal="20dp" android:layout_marginHorizontal="20dp"
android:orientation="horizontal" android:orientation="horizontal"
@@ -11,23 +12,41 @@
<TextView <TextView
android:id="@+id/tvGoodsName" android:id="@+id/tvGoodsName"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
tools:text="高杆白菜" tools:text="高杆白菜"
android:textColor="#ff666666" android:textColor="#ff333333"
android:textSize="30sp" android:textSize="30sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tvGoodsNum"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:maxLines="1" android:maxLines="1"
android:layout_marginHorizontal="10dp"
android:ellipsize="end" android:ellipsize="end"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView
android:id="@+id/tvGoodsNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="已采集100"
app:layout_constraintStart_toStartOf="@id/tvGoodsName"
app:layout_constraintTop_toBottomOf="@+id/tvGoodsName"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="#ff666666"
android:layout_marginTop="5dp"
android:textSize="20sp"
android:maxLines="1"
android:ellipsize="end" />
<ImageView <ImageView
android:id="@+id/ivDelete" android:id="@+id/ivDelete"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:padding="25dp" android:padding="25dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@mipmap/ic_close"/> android:src="@mipmap/ic_close"/>
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
build.gradle.kts
+3 -3
View File
@@ -28,9 +28,9 @@ buildscript {
mavenCentral() mavenCentral()
} }
} }
plugins { //plugins {
alias(libs.plugins.kotlin.compose) apply false // alias(libs.plugins.kotlin.compose) apply false
} //}
allprojects { allprojects {
repositories { repositories {