From e96e92d7abf9b4cb82d6d72ed38f2d7a74256a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=8C=AB?= Date: Thu, 3 Sep 2026 12:38:16 +0800 Subject: [PATCH] * --- .gitignore | 28 ++ README.md | 53 ++++ app/build.gradle.kts | 74 +++++ app/proguard-rules.pro | 12 + app/src/main/AndroidManifest.xml | 54 ++++ .../kotlin/com/stec/cmd/CollectFragment.kt | 7 + .../main/kotlin/com/stec/cmd/FeatureMount.kt | 41 +++ .../main/kotlin/com/stec/cmd/HomeFragment.kt | 7 + .../main/kotlin/com/stec/cmd/MainActivity.kt | 59 ++++ .../main/kotlin/com/stec/cmd/MineFragment.kt | 7 + .../com/stec/cmd/PlaceholderFragment.kt | 45 ++++ .../main/kotlin/com/stec/cmd/StatsFragment.kt | 7 + .../kotlin/com/stec/cmd/SteCmdApplication.kt | 31 +++ .../main/kotlin/com/stec/cmd/TaskFragment.kt | 7 + .../kotlin/com/stec/cmd/config/AppModule.kt | 49 ++++ .../com/stec/cmd/config/ConfigRepository.kt | 127 +++++++++ .../res/drawable/ic_launcher_background.xml | 7 + .../res/drawable/ic_launcher_foreground.xml | 13 + app/src/main/res/drawable/ic_nav_collect.xml | 12 + app/src/main/res/drawable/ic_nav_home.xml | 7 + app/src/main/res/drawable/ic_nav_mine.xml | 7 + app/src/main/res/drawable/ic_nav_stats.xml | 7 + app/src/main/res/drawable/ic_nav_task.xml | 7 + app/src/main/res/layout/activity_main.xml | 22 ++ .../main/res/layout/fragment_placeholder.xml | 34 +++ app/src/main/res/menu/bottom_nav_menu.xml | 23 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/values/colors.xml | 9 + app/src/main/res/values/strings.xml | 12 + app/src/main/res/values/themes.xml | 20 ++ .../main/res/xml/network_security_config.xml | 18 ++ ble-protocol/build.gradle.kts | 13 + .../cmd/protocol/ie1000/Ie1000FrameParser.kt | 85 ++++++ .../stec/cmd/protocol/ie1000/Ie1000Reading.kt | 14 + .../cmd/protocol/vm208/Vm208CommandEncoder.kt | 46 ++++ .../cmd/protocol/vm208/Vm208FrameParser.kt | 114 ++++++++ .../stec/cmd/protocol/vm208/Vm208Reading.kt | 38 +++ .../protocol/ie1000/Ie1000FrameParserTest.kt | 67 +++++ .../protocol/vm208/Vm208FrameParserTest.kt | 90 +++++++ build.gradle.kts | 10 + core/ble/build.gradle.kts | 33 +++ .../com/stec/cmd/core/ble/BleConnector.kt | 191 +++++++++++++ .../com/stec/cmd/core/ble/BleScanner.kt | 86 ++++++ .../kotlin/com/stec/cmd/core/ble/BleUuids.kt | 42 +++ .../com/stec/cmd/core/ble/DeviceType.kt | 22 ++ core/common/build.gradle.kts | 30 +++ .../kotlin/com/stec/cmd/core/common/AppLog.kt | 36 +++ .../com/stec/cmd/core/common/AppResult.kt | 48 ++++ .../com/stec/cmd/core/common/UiState.kt | 28 ++ core/database/build.gradle.kts | 38 +++ .../com/stec/cmd/core/database/AppDatabase.kt | 27 ++ .../stec/cmd/core/database/DatabaseModule.kt | 32 +++ .../stec/cmd/core/database/UploadQueueDao.kt | 54 ++++ .../cmd/core/database/UploadQueueEntity.kt | 67 +++++ core/network/build.gradle.kts | 48 ++++ .../com/stec/cmd/core/network/ApiEnvelope.kt | 42 +++ .../com/stec/cmd/core/network/ApiError.kt | 54 ++++ .../stec/cmd/core/network/AuthInterceptor.kt | 37 +++ .../stec/cmd/core/network/NetworkConfig.kt | 38 +++ .../stec/cmd/core/network/NetworkModule.kt | 68 +++++ gradle.properties | 12 + gradle/libs.versions.toml | 99 +++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle.kts | 32 +++ 68 files changed, 2810 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/kotlin/com/stec/cmd/CollectFragment.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/FeatureMount.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/HomeFragment.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/MainActivity.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/MineFragment.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/PlaceholderFragment.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/StatsFragment.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/SteCmdApplication.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/TaskFragment.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/config/AppModule.kt create mode 100644 app/src/main/kotlin/com/stec/cmd/config/ConfigRepository.kt create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_nav_collect.xml create mode 100644 app/src/main/res/drawable/ic_nav_home.xml create mode 100644 app/src/main/res/drawable/ic_nav_mine.xml create mode 100644 app/src/main/res/drawable/ic_nav_stats.xml create mode 100644 app/src/main/res/drawable/ic_nav_task.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/fragment_placeholder.xml create mode 100644 app/src/main/res/menu/bottom_nav_menu.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/network_security_config.xml create mode 100644 ble-protocol/build.gradle.kts create mode 100644 ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParser.kt create mode 100644 ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000Reading.kt create mode 100644 ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208CommandEncoder.kt create mode 100644 ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParser.kt create mode 100644 ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208Reading.kt create mode 100644 ble-protocol/src/test/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParserTest.kt create mode 100644 ble-protocol/src/test/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParserTest.kt create mode 100644 build.gradle.kts create mode 100644 core/ble/build.gradle.kts create mode 100644 core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleConnector.kt create mode 100644 core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleScanner.kt create mode 100644 core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleUuids.kt create mode 100644 core/ble/src/main/kotlin/com/stec/cmd/core/ble/DeviceType.kt create mode 100644 core/common/build.gradle.kts create mode 100644 core/common/src/main/kotlin/com/stec/cmd/core/common/AppLog.kt create mode 100644 core/common/src/main/kotlin/com/stec/cmd/core/common/AppResult.kt create mode 100644 core/common/src/main/kotlin/com/stec/cmd/core/common/UiState.kt create mode 100644 core/database/build.gradle.kts create mode 100644 core/database/src/main/kotlin/com/stec/cmd/core/database/AppDatabase.kt create mode 100644 core/database/src/main/kotlin/com/stec/cmd/core/database/DatabaseModule.kt create mode 100644 core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueDao.kt create mode 100644 core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueEntity.kt create mode 100644 core/network/build.gradle.kts create mode 100644 core/network/src/main/kotlin/com/stec/cmd/core/network/ApiEnvelope.kt create mode 100644 core/network/src/main/kotlin/com/stec/cmd/core/network/ApiError.kt create mode 100644 core/network/src/main/kotlin/com/stec/cmd/core/network/AuthInterceptor.kt create mode 100644 core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkConfig.kt create mode 100644 core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkModule.kt create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c81551b --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +# Gradle +.gradle/ +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +# Android Studio / IntelliJ +.idea/ +*.iml +*.ipr +*.iws +captures/ +.externalNativeBuild/ +.cxx/ + +# 本地环境配置（不进入版本库） +local.properties + +# 密钥与签名（M7-04：SecretKey/SystemCode/keystore 一律不入库） +*.jks +*.keystore +secrets.properties +keystore.properties + +# 日志与临时文件 +*.log +.DS_Store diff --git a/README.md b/README.md new file mode 100644 index 0000000..53eb0c2 --- /dev/null +++ b/README.md @@ -0,0 +1,53 @@ +# 监测数据不落地平台 · 安卓客户端 + +外业监测数据「不落地」采集与上传工具：现场用手机通过蓝牙连接振弦式读数仪（IE-1000）与综合采集仪（VM208），解析采集数据并直接上传至院方监测平台，配合离线队列保证弱网/断网可用。 + +> 本文件为 2026-09-03 重建版（基线文件曾随工作树清理丢失，按任务记录复刻）。 + +## 技术基线 + +| 项 | 选型 | +|---|---| +| 语言 / UI | Kotlin 2.0.21、View 体系 + Material 3 | +| 架构 | MVVM（ViewModel + StateFlow/LiveData） | +| 网络 | Retrofit 2.11 + OkHttp 4.12 + kotlinx.serialization 1.7.3 | +| 本地存储 | Room 2.6.1（离线优先队列）+ DataStore 1.1.1 + EncryptedSharedPreferences | +| 依赖注入 | Hilt 2.52 | +| 蓝牙 | Android 原生 BLE API；协议解析独立纯 Kotlin 模块 | +| 构建 | AGP 8.7.3 / Gradle 8.10.2 / JDK 17 / minSdk 26 / targetSdk 34 | + +## 模块结构 + +``` +app 业务壳：导航、主题、权限、配置注入（M1–M6 页面挂载点） +core + ├ common AppResult / UiState / 日志门面（纯 Kotlin 优先） + ├ network 鉴权三要素拦截器、ApiEnvelope 统一解析、Retrofit 装配 + ├ database Room AppDatabase + 上传队列（离线优先参考实现） + └ ble BLE 扫描（按名称前缀过滤）、GATT 连接封装骨架 +ble-protocol 纯 Kotlin JVM：IE-1000 / VM208 帧解析（零 Android 依赖，可独立单测） +``` + +依赖方向：`app → core:* + ble-protocol`；`core:{network,database,ble} → core:common`；`ble-protocol` 零依赖。 + +## 快速开始 + +1. Android Studio（Ladybug+，JDK 17）打开工程根目录，等待 Gradle Sync； +2. 服务器地址、SecretKey、SystemCode 通过 `app` 壳的配置仓储注入（见 `core:network` 的 `NetworkConfig`），**一律不写入代码库**； +3. 运行：`./gradlew :app:assembleDebug`；协议单测：`./gradlew :ble-protocol:test`。 + +## 配置说明 + +| 配置项 | 说明 | 注入点 | +|---|---|---| +| baseUrl | 平台接口地址（测试环境见接口文档 1.2.4） | ConfigRepository → NetworkConfig | +| SecretKey | 供应商调用密钥（会定期更换，必须可配置） | 同上 | +| SystemCode | 供应商编码（与 SecretKey 一一对应） | 同上 | +| Token | 登录后颁发，登录接口外必带 | TokenProvider（DataStore） | + +## 文档索引 + +- `docs/安卓客户端功能明细表.md` —— 36 个功能点、模块映射、优先级、接口覆盖对照 +- `docs/安卓客户端开发计划表.md` —— 6 阶段 12 周迭代计划、人日估算、里程碑、风险 +- `docs/BLE-IE1000.txt` —— IE-1000 / VM208 蓝牙协议原始说明 +- 接口规范 V4.5 —— 上海城建勘测院《监测数据不落地系统接口文档》（docs/ 下 docx） diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..34391d3 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,74 @@ +// app 业务壳：导航、主题、权限、配置注入；M1–M6 页面经 FeatureMount 挂载 +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) +} + +android { + namespace = "com.stec.cmd" + compileSdk = 34 + + defaultConfig { + applicationId = "com.stec.cmd" + minSdk = 26 + targetSdk = 34 + versionCode = 1 + versionName = "0.1.0-S0" + } + + buildTypes { + release { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + } + + buildFeatures { + viewBinding = true + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } +} + +dependencies { + // core 基础层 + 协议解析（业务模块只允许经 core 层访问能力） + implementation(project(":core:common")) + implementation(project(":core:network")) + implementation(project(":core:database")) + implementation(project(":core:ble")) + implementation(project(":ble-protocol")) + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.activity) + implementation(libs.androidx.fragment.ktx) + implementation(libs.androidx.splashscreen) + implementation(libs.google.material) + + implementation(libs.androidx.lifecycle.runtime) + implementation(libs.androidx.lifecycle.viewmodel) + implementation(libs.androidx.lifecycle.livedata) + + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.security.crypto) + + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..a3af3c3 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,12 @@ +# app 壳混淆规则（release） +# S0 骨架期保持最小规则集，S5 发布阶段随业务实体补全 + +# kotlinx.serialization：保留序列化器生成逻辑（S1 业务 DTO 接入后按类型名细化） +-keepattributes *Annotation*, InnerClasses +-dontnote kotlinx.serialization.AnnotationsKt + +# OkHttp / Retrofit +-dontwarn okhttp3.** +-dontwarn okio.** +-dontwarn javax.annotation.** +-keepattributes Signature, Exceptions diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3b341b1 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/kotlin/com/stec/cmd/CollectFragment.kt b/app/src/main/kotlin/com/stec/cmd/CollectFragment.kt new file mode 100644 index 0000000..5c64630 --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/CollectFragment.kt @@ -0,0 +1,7 @@ +package com.stec.cmd + +import dagger.hilt.android.AndroidEntryPoint + +/** 采集占位（M4+M5 数据采集，S2/S3 挂载扫描与采集页）。 */ +@AndroidEntryPoint +class CollectFragment : PlaceholderFragment() diff --git a/app/src/main/kotlin/com/stec/cmd/FeatureMount.kt b/app/src/main/kotlin/com/stec/cmd/FeatureMount.kt new file mode 100644 index 0000000..ae100ed --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/FeatureMount.kt @@ -0,0 +1,41 @@ +package com.stec.cmd + +/** + * 底部导航 5 Tab 与业务模块（功能明细表编号）的挂载点注册中心。 + * + * S1+ 挂载业务页面的方式：把对应 [MountItem.fragmentClass] 从占位 Fragment + * 换成业务 Fragment 即可，导航壳（MainActivity）零改动；新增 Tab 时扩展 [Tab]。 + * 挂载映射依据《安卓客户端功能明细表》： + * 首页=M2、任务=M3、采集=M4+M5、统计=M6、我的=M1。 + */ +object FeatureMount { + + /** 底部导航 Tab（itemId 与 res/menu/bottom_nav_menu.xml 一一对应）。 */ + enum class Tab(val itemId: Int, val labelRes: Int) { + HOME(R.id.nav_home, R.string.tab_home), + TASK(R.id.nav_task, R.string.tab_task), + COLLECT(R.id.nav_collect, R.string.tab_collect), + STATS(R.id.nav_stats, R.string.tab_stats), + MINE(R.id.nav_mine, R.string.tab_mine), + } + + /** 单个 Tab 的挂载项。 */ + data class MountItem( + val tab: Tab, + val fragmentClass: Class, + val moduleTag: String, + ) + + /** 挂载注册表：S1+ 替换 fragmentClass 即完成业务页挂载。 */ + val mounts: List = listOf( + MountItem(Tab.HOME, HomeFragment::class.java, "M2 项目工作台"), + MountItem(Tab.TASK, TaskFragment::class.java, "M3 任务管理"), + MountItem(Tab.COLLECT, CollectFragment::class.java, "M4+M5 数据采集"), + MountItem(Tab.STATS, StatsFragment::class.java, "M6 统计与上传"), + MountItem(Tab.MINE, MineFragment::class.java, "M1 我的"), + ) + + /** 按 menu itemId 取挂载项；未知 id 返回 null（容错）。 */ + fun byItemId(itemId: Int): MountItem? = + mounts.firstOrNull { it.tab.itemId == itemId } +} diff --git a/app/src/main/kotlin/com/stec/cmd/HomeFragment.kt b/app/src/main/kotlin/com/stec/cmd/HomeFragment.kt new file mode 100644 index 0000000..03c4acc --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/HomeFragment.kt @@ -0,0 +1,7 @@ +package com.stec.cmd + +import dagger.hilt.android.AndroidEntryPoint + +/** 首页占位（M2 项目工作台，S1 挂载项目列表）。 */ +@AndroidEntryPoint +class HomeFragment : PlaceholderFragment() diff --git a/app/src/main/kotlin/com/stec/cmd/MainActivity.kt b/app/src/main/kotlin/com/stec/cmd/MainActivity.kt new file mode 100644 index 0000000..41e2f96 --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/MainActivity.kt @@ -0,0 +1,59 @@ +package com.stec.cmd + +import android.os.Bundle +import android.view.MenuItem +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment +import androidx.fragment.app.commit +import com.stec.cmd.databinding.ActivityMainBinding +import dagger.hilt.android.AndroidEntryPoint + +/** + * 单 Activity 导航壳：BottomNavigationView 5 Tab 切换 Fragment。 + * show/hide 复用实例以保留各 Tab 视图状态；S1 可迁移 Navigation 组件。 + */ +@AndroidEntryPoint +class MainActivity : AppCompatActivity() { + + private lateinit var binding: ActivityMainBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.bottomNav.setOnItemSelectedListener(::selectTab) + if (savedInstanceState == null) { + binding.bottomNav.selectedItemId = FeatureMount.Tab.HOME.itemId + } + } + + private fun selectTab(item: MenuItem): Boolean { + val mount = FeatureMount.byItemId(item.itemId) ?: return false + switchTo(mount) + return true + } + + private fun switchTo(mount: FeatureMount.MountItem) { + val tag = mount.tab.name + val existing = supportFragmentManager.findFragmentByTag(tag) + val target: Fragment = existing ?: createFragment(mount) + + supportFragmentManager.commit { + setReorderingAllowed(true) + supportFragmentManager.fragments.forEach { if (it !== target) hide(it) } + if (existing == null) add(R.id.fragment_container, target, tag) + show(target) + } + supportActionBar?.title = getString(mount.tab.labelRes) + } + + /** 实例化挂载项声明的 Fragment；占位 Fragment 支持模块名参数。 */ + private fun createFragment(mount: FeatureMount.MountItem): Fragment { + val fragment = mount.fragmentClass.getDeclaredConstructor().newInstance() + if (fragment is PlaceholderFragment) { + fragment.arguments = PlaceholderFragment.args(mount.moduleTag) + } + return fragment + } +} diff --git a/app/src/main/kotlin/com/stec/cmd/MineFragment.kt b/app/src/main/kotlin/com/stec/cmd/MineFragment.kt new file mode 100644 index 0000000..39e7945 --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/MineFragment.kt @@ -0,0 +1,7 @@ +package com.stec.cmd + +import dagger.hilt.android.AndroidEntryPoint + +/** 我的占位（M1 登录与配置，S1 挂载登录/配置页）。 */ +@AndroidEntryPoint +class MineFragment : PlaceholderFragment() diff --git a/app/src/main/kotlin/com/stec/cmd/PlaceholderFragment.kt b/app/src/main/kotlin/com/stec/cmd/PlaceholderFragment.kt new file mode 100644 index 0000000..4dc9fa8 --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/PlaceholderFragment.kt @@ -0,0 +1,45 @@ +package com.stec.cmd + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.stec.cmd.databinding.FragmentPlaceholderBinding + +/** + * S0 占位页基类：显示模块编号与挂载说明，S1+ 由各业务 Fragment 替换。 + */ +open class PlaceholderFragment : Fragment() { + + private var _binding: FragmentPlaceholderBinding? = null + private val binding get() = checkNotNull(_binding) + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View { + _binding = FragmentPlaceholderBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + val moduleTag = arguments?.getString(ARG_MODULE_TAG).orEmpty() + binding.moduleTag.text = moduleTag + binding.hint.text = getString(R.string.placeholder_hint) + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + + companion object { + const val ARG_MODULE_TAG = "module_tag" + + fun args(moduleTag: String): Bundle = Bundle().apply { + putString(ARG_MODULE_TAG, moduleTag) + } + } +} diff --git a/app/src/main/kotlin/com/stec/cmd/StatsFragment.kt b/app/src/main/kotlin/com/stec/cmd/StatsFragment.kt new file mode 100644 index 0000000..7b22d31 --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/StatsFragment.kt @@ -0,0 +1,7 @@ +package com.stec.cmd + +import dagger.hilt.android.AndroidEntryPoint + +/** 统计占位（M6 统计与上传，S4 挂载统计表与文件上传）。 */ +@AndroidEntryPoint +class StatsFragment : PlaceholderFragment() diff --git a/app/src/main/kotlin/com/stec/cmd/SteCmdApplication.kt b/app/src/main/kotlin/com/stec/cmd/SteCmdApplication.kt new file mode 100644 index 0000000..723bb2c --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/SteCmdApplication.kt @@ -0,0 +1,31 @@ +package com.stec.cmd + +import android.app.Application +import android.util.Log +import com.stec.cmd.core.common.AppLog +import dagger.hilt.android.HiltAndroidApp + +/** + * 应用入口：装配 Hilt 图并安装日志实现。 + * core:common 的 AppLog 门面不依赖 android.util.Log，LogCat sink 在壳层注入。 + */ +@HiltAndroidApp +class SteCmdApplication : Application() { + + override fun onCreate() { + super.onCreate() + AppLog.install { level, tag, message, throwable -> + when (level) { + AppLog.Level.DEBUG -> Log.d(tag, message, throwable) + AppLog.Level.INFO -> Log.i(tag, message, throwable) + AppLog.Level.WARN -> Log.w(tag, message, throwable) + AppLog.Level.ERROR -> Log.e(tag, message, throwable) + } + } + AppLog.i(TAG, "监测数据不落地平台客户端启动（S0 骨架）") + } + + private companion object { + const val TAG = "SteCmd" + } +} diff --git a/app/src/main/kotlin/com/stec/cmd/TaskFragment.kt b/app/src/main/kotlin/com/stec/cmd/TaskFragment.kt new file mode 100644 index 0000000..557a73e --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/TaskFragment.kt @@ -0,0 +1,7 @@ +package com.stec.cmd + +import dagger.hilt.android.AndroidEntryPoint + +/** 任务占位（M3 任务管理，S2 挂载任务列表）。 */ +@AndroidEntryPoint +class TaskFragment : PlaceholderFragment() diff --git a/app/src/main/kotlin/com/stec/cmd/config/AppModule.kt b/app/src/main/kotlin/com/stec/cmd/config/AppModule.kt new file mode 100644 index 0000000..df3de3e --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/config/AppModule.kt @@ -0,0 +1,49 @@ +package com.stec.cmd.config + +import android.content.Context +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.preferencesDataStore +import com.stec.cmd.core.network.NetworkConfig +import com.stec.cmd.core.network.TokenProvider +import dagger.Binds +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +private val Context.configDataStore: DataStore by preferencesDataStore( + name = "stec_cmd_config", +) + +/** + * app 壳 Hilt 装配： + * - DataStore 实例； + * - [ConfigRepository] 绑定为 core:network 的 [NetworkConfig] / [TokenProvider]， + * 补全 core:network NetworkModule 的依赖图（密钥值由用户配置注入，不入库）。 + */ +@Module +@InstallIn(SingletonComponent::class) +object AppModule { + + @Provides + @Singleton + fun provideConfigDataStore( + @ApplicationContext context: Context, + ): DataStore = context.configDataStore +} + +@Module +@InstallIn(SingletonComponent::class) +abstract class ConfigBindModule { + + @Binds + @Singleton + abstract fun bindNetworkConfig(impl: ConfigRepository): NetworkConfig + + @Binds + @Singleton + abstract fun bindTokenProvider(impl: ConfigRepository): TokenProvider +} diff --git a/app/src/main/kotlin/com/stec/cmd/config/ConfigRepository.kt b/app/src/main/kotlin/com/stec/cmd/config/ConfigRepository.kt new file mode 100644 index 0000000..a832901 --- /dev/null +++ b/app/src/main/kotlin/com/stec/cmd/config/ConfigRepository.kt @@ -0,0 +1,127 @@ +package com.stec.cmd.config + +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.emptyPreferences +import androidx.datastore.preferences.core.stringPreferencesKey +import com.stec.cmd.core.common.AppLog +import com.stec.cmd.core.network.NetworkConfig +import com.stec.cmd.core.network.TokenProvider +import java.io.IOException +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking +import javax.inject.Inject +import javax.inject.Singleton + +/** + * 平台配置仓储（M1-06 前置、M7-04 落地）： + * baseUrl / SecretKey / SystemCode / Token 经 DataStore 持久化 + 内存快照。 + * + * **默认值全空，密钥不进代码库**：S1 在「我的」页面提供配置 UI； + * 未配置时 [NetworkConfig] 各字段为空串，AuthInterceptor 将带空三要素， + * 业务请求由 S1 的配置检查（未配置 → 跳转配置页）拦截。 + * + * 拦截器在 OkHttp 后台线程同步读快照（runBlocking 只在冷启动首读时短暂阻塞， + * 之后 [snapshotStateFlow] 已被预热，直接返回缓存值）。 + */ +@Singleton +class ConfigRepository @Inject constructor( + private val dataStore: DataStore, +) : NetworkConfig, TokenProvider { + + data class Snapshot( + val baseUrl: String = "", + val secretKey: String = "", + val systemCode: String = "", + val token: String = "", + ) { + /** 三要素 + 地址是否已配置完整。 */ + val isReady: Boolean + get() = baseUrl.isNotBlank() && secretKey.isNotBlank() && systemCode.isNotBlank() + } + + private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default) + + private val snapshotFlow = MutableStateFlow(Snapshot()) + + /** 配置快照流：S1 配置页/业务层订阅。 */ + val snapshotStateFlow: StateFlow = snapshotFlow.asStateFlow() + + init { + scope.launch { + dataStore.data + .catch { e -> + if (e is IOException) emit(emptyPreferences()) else throw e + } + .collect { prefs -> + snapshotFlow.value = Snapshot( + baseUrl = prefs[KEY_BASE_URL].orEmpty(), + secretKey = prefs[KEY_SECRET_KEY].orEmpty(), + systemCode = prefs[KEY_SYSTEM_CODE].orEmpty(), + token = prefs[KEY_TOKEN].orEmpty(), + ) + } + } + } + + // ---- NetworkConfig ---- + + override val baseUrl: String get() = snapshot().baseUrl + + override val secretKey: String get() = snapshot().secretKey + + override val systemCode: String get() = snapshot().systemCode + + override val tokenProvider: TokenProvider get() = this + + // ---- TokenProvider ---- + + override fun currentToken(): String = snapshot().token + + // ---- 写入（S1 配置页 / 登录流程调用）---- + + /** 保存三要素与服务器地址。 */ + suspend fun updateConnection(baseUrl: String, secretKey: String, systemCode: String) { + dataStore.edit { prefs -> + prefs[KEY_BASE_URL] = baseUrl.trim().trimEnd('/') + prefs[KEY_SECRET_KEY] = secretKey.trim() + prefs[KEY_SYSTEM_CODE] = systemCode.trim() + } + AppLog.i(TAG, "连接配置已更新") + } + + /** 登录成功保存 Token；登出传空串。 */ + suspend fun updateToken(token: String) { + dataStore.edit { it[KEY_TOKEN] = token } + } + + /** 阻塞读取当前快照（拦截器线程安全：值来自内存缓存）。 */ + private fun snapshot(): Snapshot = + if (snapshotFlow.value != Snapshot()) { + snapshotFlow.value + } else { + // 冷启动首读：预热缓存 + runBlocking { snapshotFlow.first() } + } + + private companion object { + const val TAG = "ConfigRepository" + val KEY_BASE_URL = stringPreferencesKey("base_url") + val KEY_SECRET_KEY = stringPreferencesKey("secret_key") + val KEY_SYSTEM_CODE = stringPreferencesKey("system_code") + val KEY_TOKEN = stringPreferencesKey("token") + } +} + +/** 只读 Token 快照接口的窄化视图（给不需要完整 NetworkConfig 的组件用）。 */ +val ConfigRepository.tokenFlow: Flow get() = snapshotStateFlow diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..29d23ec --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7e3b93 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_nav_collect.xml b/app/src/main/res/drawable/ic_nav_collect.xml new file mode 100644 index 0000000..6f963d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_nav_collect.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_nav_home.xml b/app/src/main/res/drawable/ic_nav_home.xml new file mode 100644 index 0000000..46fa310 --- /dev/null +++ b/app/src/main/res/drawable/ic_nav_home.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/drawable/ic_nav_mine.xml b/app/src/main/res/drawable/ic_nav_mine.xml new file mode 100644 index 0000000..49bb764 --- /dev/null +++ b/app/src/main/res/drawable/ic_nav_mine.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/drawable/ic_nav_stats.xml b/app/src/main/res/drawable/ic_nav_stats.xml new file mode 100644 index 0000000..cd85688 --- /dev/null +++ b/app/src/main/res/drawable/ic_nav_stats.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/drawable/ic_nav_task.xml b/app/src/main/res/drawable/ic_nav_task.xml new file mode 100644 index 0000000..f0a9319 --- /dev/null +++ b/app/src/main/res/drawable/ic_nav_task.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..7d635f5 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_placeholder.xml b/app/src/main/res/layout/fragment_placeholder.xml new file mode 100644 index 0000000..b78aa28 --- /dev/null +++ b/app/src/main/res/layout/fragment_placeholder.xml @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml new file mode 100644 index 0000000..3a49d81 --- /dev/null +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..41eebb3 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,9 @@ + + + + #1E6FD9 + #FFFFFF + #F7F9FC + #FFFFFF + #1E6FD9 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..876da65 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,12 @@ + + + 监测数据不落地 + + 首页 + 任务 + 采集 + 统计 + 我的 + + 占位页 —— 业务功能按 S1–S4 计划经 FeatureMount 挂载 + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..911078a --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..836a8b2 --- /dev/null +++ b/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + 106.15.183.20 + + diff --git a/ble-protocol/build.gradle.kts b/ble-protocol/build.gradle.kts new file mode 100644 index 0000000..e936a52 --- /dev/null +++ b/ble-protocol/build.gradle.kts @@ -0,0 +1,13 @@ +// ble-protocol：纯 Kotlin JVM 模块，零第三方依赖（测试框架除外） +// 职责：IE-1000 / VM208 蓝牙帧的解析与编码，脱离 Android 可独立单测 +plugins { + alias(libs.plugins.kotlin.jvm) +} + +kotlin { + jvmToolchain(17) +} + +dependencies { + testImplementation(libs.junit) +} diff --git a/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParser.kt b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParser.kt new file mode 100644 index 0000000..b0bf100 --- /dev/null +++ b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParser.kt @@ -0,0 +1,85 @@ +package com.stec.cmd.protocol.ie1000 + +/** + * IE-1000 Notify 帧解析器（协议原文见 docs/BLE-IE1000.txt）。 + * + * 帧格式（固定 12 字节）： + * ``` + * 'Y'(0x59) P0 P1 P2 P3 'T'(0x54) T0 T1 T2 T3 0x0D 0x0A + * ``` + * 其中压力 4 字节、温度 4 字节均为小端 IEEE-754 float。 + * 协议示例：`59 D8 BE 50 41 54 00 00 E8 41 0D 0A` → 压力 13.04、温度 29.0。 + * + * BLE Notify 每次回调的字节数不定，解析器内部维护字节缓冲， + * [feed] 可按任意分片反复调用，按 `0D 0A` 定界切帧； + * 切出但不合规格式的帧（长度/帧头不符）整体丢弃后继续重同步。 + */ +class Ie1000FrameParser { + + private val buffer = ArrayDeque() + + /** 追加收到的字节，返回本轮累计解析出的完整读数列表。 */ + fun feed(data: ByteArray): List { + for (b in data) buffer.addLast(b) + val readings = mutableListOf() + while (true) { + val frame = nextFrame() ?: break + parseFrame(frame)?.let(readings::add) + } + return readings + } + + /** 清空内部缓冲（断连或采集会话重置时调用）。 */ + fun reset() { + buffer.clear() + } + + /** 从缓冲头部取出一条以 `0D 0A` 结尾的帧（含结束符）；不足一条返回 null。 */ + private fun nextFrame(): List? { + var index = 0 + var end = -1 + while (index + 1 < buffer.size) { + if (buffer.elementAt(index) == CR && buffer.elementAt(index + 1) == LF) { + end = index + break + } + index++ + } + if (end == -1) return null + val frame = ArrayList(end + 2) + repeat(end + 2) { frame.add(buffer.removeFirst()) } + return frame + } + + private fun parseFrame(frame: List): Ie1000Reading? { + if (frame.size != FRAME_LENGTH) return null + if (frame[0] != HEADER_PRESSURE || frame[5] != HEADER_TEMPERATURE) return null + val pressure = Float.fromBits(frame.leIntAt(offset = 1)) + val temperature = Float.fromBits(frame.leIntAt(offset = 6)) + return Ie1000Reading( + pressure = pressure, + temperature = temperature, + receivedAtMillis = System.currentTimeMillis(), + ) + } + + /** 小端序读取 4 字节为 Int（位模式，交由 [Float.fromBits] 解释）。 */ + private fun List.leIntAt(offset: Int): Int = + (this[offset].toInt() and 0xFF) or + ((this[offset + 1].toInt() and 0xFF) shl 8) or + ((this[offset + 2].toInt() and 0xFF) shl 16) or + ((this[offset + 3].toInt() and 0xFF) shl 24) + + companion object { + const val FRAME_LENGTH = 12 + + /** 压力段帧头 'Y'。 */ + val HEADER_PRESSURE: Byte = 'Y'.code.toByte() + + /** 温度段帧头 'T'。 */ + val HEADER_TEMPERATURE: Byte = 'T'.code.toByte() + + private const val CR: Byte = 0x0D + private const val LF: Byte = 0x0A + } +} diff --git a/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000Reading.kt b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000Reading.kt new file mode 100644 index 0000000..5fe4c71 --- /dev/null +++ b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/ie1000/Ie1000Reading.kt @@ -0,0 +1,14 @@ +package com.stec.cmd.protocol.ie1000 + +/** + * IE-1000 振弦式读数仪单帧采集读数。 + * + * @property pressure 压力值（float 原值，量程单位依设备标定） + * @property temperature 温度值（℃） + * @property receivedAtMillis 本机接收时刻（epoch 毫秒） + */ +data class Ie1000Reading( + val pressure: Float, + val temperature: Float, + val receivedAtMillis: Long, +) diff --git a/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208CommandEncoder.kt b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208CommandEncoder.kt new file mode 100644 index 0000000..1149837 --- /dev/null +++ b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208CommandEncoder.kt @@ -0,0 +1,46 @@ +package com.stec.cmd.protocol.vm208 + +/** + * VM208 下行命令编码器（写 UUID，协议 6.1）。 + * + * 激励设置命令格式：`0F 0F 06 0A XX XX 0D 0A`， + * 其中 `XX XX` 为设置值的大端 16 位表示。 + * 例：设置 100（0x0064）→ 整条命令 `0F 0F 06 0A 00 64 0D 0A`； + * 设备通过 Notify 原样回显该命令作为应答。 + */ +object Vm208CommandEncoder { + + /** + * 编码激励设置命令。 + * + * @param excitation 激励设置值，须在 0..65535 + * @return 8 字节完整命令帧 + * @throws IllegalArgumentException 超出 16 位范围 + */ + fun encodeExcitation(excitation: Int): ByteArray { + require(excitation in 0..0xFFFF) { "激励值超出 16 位范围: $excitation" } + return byteArrayOf( + 0x0F, 0x0F, 0x06, 0x0A, + ((excitation shr 8) and 0xFF).toByte(), + (excitation and 0xFF).toByte(), + 0x0D, 0x0A, + ) + } + + /** + * 解析设备回显的激励命令应答帧。 + * + * @return 应答中的激励值；帧长或帧头不符返回 null + */ + fun decodeExcitationAck(frame: ByteArray): Int? { + if (frame.size != COMMAND_LENGTH) return null + if (frame[0] != 0x0F.toByte() || frame[1] != 0x0F.toByte()) return null + if (frame[2] != 0x06.toByte() || frame[3] != 0x0A.toByte()) return null + if (frame[6] != 0x0D.toByte() || frame[7] != 0x0A.toByte()) return null + val high = frame[4].toInt() and 0xFF + val low = frame[5].toInt() and 0xFF + return (high shl 8) or low + } + + const val COMMAND_LENGTH = 8 +} diff --git a/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParser.kt b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParser.kt new file mode 100644 index 0000000..03cfe64 --- /dev/null +++ b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParser.kt @@ -0,0 +1,114 @@ +package com.stec.cmd.protocol.vm208 + +/** + * VM208 Notify 帧解析器（协议原文见 docs/BLE-IE1000.txt）。 + * + * 振弦数据报文格式（ASCII 字段 + 固定结束符）： + * ``` + * CC F12345 T334 E14039 SG AA 0x0D 0x0A + * ``` + * - `CC` 报文头、`AA` 报文尾、`0D 0A` 结束符号； + * - `F12345`：频率原值 12345 → 12345/10 = 1234.5 Hz； + * - `T334`：温度原值 334 → 334/10 = 33.4 ℃； + * - `E14039`：电压原值 14039 → 14039/100 = 140 V； + * - `SG`：S 后跟 1 位质量字母（G 好 / Q 一般 / N 没元件）。 + * + * 与 [com.stec.cmd.protocol.ie1000.Ie1000FrameParser] 相同的缓冲策略： + * [feed] 支持任意分片，按 `0D 0A` 切帧，字段缺失或非数字的脏帧整体丢弃。 + */ +class Vm208FrameParser { + + private val buffer = ArrayDeque() + + /** 追加收到的字节，返回本轮累计解析出的完整读数列表。 */ + fun feed(data: ByteArray): List { + for (b in data) buffer.addLast(b) + val readings = mutableListOf() + while (true) { + val frame = nextFrame() ?: break + parseFrame(frame)?.let(readings::add) + } + return readings + } + + /** 清空内部缓冲（断连或采集会话重置时调用）。 */ + fun reset() { + buffer.clear() + } + + private fun nextFrame(): List? { + var index = 0 + var end = -1 + while (index + 1 < buffer.size) { + if (buffer.elementAt(index) == CR && buffer.elementAt(index + 1) == LF) { + end = index + break + } + index++ + } + if (end == -1) return null + val frame = ArrayList(end + 2) + repeat(end + 2) { frame.add(buffer.removeFirst()) } + return frame + } + + private fun parseFrame(frame: List): Vm208Reading? { + if (frame.size < MIN_FRAME_LENGTH) return null + if (frame[0] != HEADER_CC || frame[frame.size - 3] != TAIL_AA) return null + val text = frame.toByteArray().toString(Charsets.US_ASCII) + val frequency = fieldOf(text, FIELD_FREQUENCY)?.div(SCALE_FREQUENCY) ?: return null + val temperature = fieldOf(text, FIELD_TEMPERATURE)?.div(SCALE_TEMPERATURE) ?: return null + val voltage = fieldOf(text, FIELD_VOLTAGE)?.div(SCALE_VOLTAGE) ?: return null + val qualityCode = qualityCodeOf(text) ?: return null + return Vm208Reading( + frequency = frequency, + temperature = temperature, + voltage = voltage, + quality = Vm208Quality.fromCode(qualityCode), + receivedAtMillis = System.currentTimeMillis(), + ) + } + + /** 取 `X` 字段后直到下一字母或报文尾的 ASCII 内容并按整数解析；缺失/非法返回 null。 */ + private fun fieldOf(text: String, field: Char): Double? = + fieldRaw(text, field)?.toDoubleOrNull() + + private fun fieldRaw(text: String, field: Char): String? { + val start = text.indexOf(field) + if (start < 0) return null + var end = start + 1 + while (end < text.length && text[end].isDigit()) end++ + if (end == start + 1) return null + return text.substring(start + 1, end) + } + + /** 取 S 质量字段后的 1 个字母（G/Q/N，其余交由 UNKNOWN 兜底）；缺字段返回 null。 */ + private fun qualityCodeOf(text: String): Char? { + val start = text.indexOf(FIELD_QUALITY) + if (start < 0 || start + 1 >= text.length) return null + return text[start + 1] + } + + companion object { + /** 最短帧：CC F1 T1 E1 Sx AA CR LF = 9 字节。 */ + const val MIN_FRAME_LENGTH = 9 + + /** 报文头 'C''C' 的首字节。 */ + val HEADER_CC: Byte = 'C'.code.toByte() + + /** 报文尾 'A''A' 的首字节（其后为 0D 0A 结束符）。 */ + val TAIL_AA: Byte = 'A'.code.toByte() + + private const val FIELD_FREQUENCY = 'F' + private const val FIELD_TEMPERATURE = 'T' + private const val FIELD_VOLTAGE = 'E' + private const val FIELD_QUALITY = 'S' + + private const val SCALE_FREQUENCY = 10.0 + private const val SCALE_TEMPERATURE = 10.0 + private const val SCALE_VOLTAGE = 100.0 + + private const val CR: Byte = 0x0D + private const val LF: Byte = 0x0A + } +} diff --git a/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208Reading.kt b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208Reading.kt new file mode 100644 index 0000000..87aedb9 --- /dev/null +++ b/ble-protocol/src/main/kotlin/com/stec/cmd/protocol/vm208/Vm208Reading.kt @@ -0,0 +1,38 @@ +package com.stec.cmd.protocol.vm208 + +/** VM208 帧内 S 字段携带的元件质量状态。 */ +enum class Vm208Quality(val code: Char) { + /** 元件质量好。 */ + GOOD('G'), + + /** 元件一般。 */ + FAIR('Q'), + + /** 没有元件。 */ + NONE('N'), + + /** 非约定字母的兜底，避免脏帧导致崩溃。 */ + UNKNOWN('?'); + + companion object { + fun fromCode(code: Char): Vm208Quality = + entries.firstOrNull { it.code == code } ?: UNKNOWN + } +} + +/** + * VM208 综合采集仪单帧采集读数。 + * + * @property frequency 频率（Hz，帧内原值 / 10） + * @property temperature 温度（℃，帧内原值 / 10） + * @property voltage 电压（V，帧内原值 / 100） + * @property quality 元件质量状态 + * @property receivedAtMillis 本机接收时刻（epoch 毫秒） + */ +data class Vm208Reading( + val frequency: Double, + val temperature: Double, + val voltage: Double, + val quality: Vm208Quality, + val receivedAtMillis: Long, +) diff --git a/ble-protocol/src/test/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParserTest.kt b/ble-protocol/src/test/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParserTest.kt new file mode 100644 index 0000000..f3b2442 --- /dev/null +++ b/ble-protocol/src/test/kotlin/com/stec/cmd/protocol/ie1000/Ie1000FrameParserTest.kt @@ -0,0 +1,67 @@ +package com.stec.cmd.protocol.ie1000 + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +/** 用协议文档示例字节做冒烟验证。 */ +class Ie1000FrameParserTest { + + private val parser = Ie1000FrameParser() + + /** + * 协议示例帧：59 D8 BE 50 41 54 00 00 E8 41 0D 0A。 + * 压力段小端 float 0x4150BED8 = 13.0465927…（文档标注 13.04 为截断写法）； + * 温度段 0x41E80000 = 29.0 精确。 + */ + private val sample = byteArrayOf( + 0x59.toByte(), 0xD8.toByte(), 0xBE.toByte(), 0x50.toByte(), 0x41.toByte(), + 0x54.toByte(), 0x00, 0x00, 0xE8.toByte(), 0x41.toByte(), + 0x0D, 0x0A, + ) + + @Test + fun `整帧一次喂入解析出协议示例读数`() { + val readings = parser.feed(sample) + + assertEquals(1, readings.size) + assertEquals(13.0466f, readings[0].pressure, 0.001f) + assertEquals(29.0f, readings[0].temperature, 0.001f) + } + + @Test + fun `逐字节分片喂入仍可切帧（残包容错）`() { + val readings = sample.flatMap { listOf(it) }.map { parser.feed(byteArrayOf(it)) } + .reduce { acc, list -> acc + list } + + assertEquals(1, readings.size) + assertEquals(13.0466f, readings[0].pressure, 0.001f) + } + + @Test + fun `粘包两帧一次解析`() { + val doubled = sample + sample + + val readings = parser.feed(doubled) + + assertEquals(2, readings.size) + } + + @Test + fun `脏帧被丢弃后继续重同步`() { + val dirty = byteArrayOf(0x01, 0x02, 0x0D, 0x0A) // 长度不足的垃圾帧 + val readings = parser.feed(dirty + sample) + + assertEquals(1, readings.size) + assertEquals(13.0466f, readings[0].pressure, 0.001f) + } + + @Test + fun `帧头错误的完整帧被丢弃`() { + val badHeader = sample.copyOf().also { it[0] = 0x58 } // 'X' 而非 'Y' + + val readings = parser.feed(badHeader) + + assertTrue(readings.isEmpty()) + } +} diff --git a/ble-protocol/src/test/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParserTest.kt b/ble-protocol/src/test/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParserTest.kt new file mode 100644 index 0000000..77359b3 --- /dev/null +++ b/ble-protocol/src/test/kotlin/com/stec/cmd/protocol/vm208/Vm208FrameParserTest.kt @@ -0,0 +1,90 @@ +package com.stec.cmd.protocol.vm208 + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +/** 用协议文档示例帧做冒烟验证。 */ +class Vm208FrameParserTest { + + private val parser = Vm208FrameParser() + + /** + * 协议示例报文：CC F12345 T334 E14039 SG AA 0D 0A + * → 频率 1234.5 Hz、温度 33.4 ℃、电压 140 V、质量 GOOD。 + */ + private fun sampleFrame(): ByteArray = + "CC F12345 T334 E14039 SG AA".toByteArray(Charsets.US_ASCII) + byteArrayOf(0x0D, 0x0A) + + @Test + fun `整帧解析出协议示例读数`() { + val readings = parser.feed(sampleFrame()) + + assertEquals(1, readings.size) + assertEquals(1234.5, readings[0].frequency, 1e-9) + assertEquals(33.4, readings[0].temperature, 1e-9) + assertEquals(140.0, readings[0].voltage, 1e-9) + assertEquals(Vm208Quality.GOOD, readings[0].quality) + } + + @Test + fun `分片喂入仍可切帧`() { + val frame = sampleFrame() + val mid = frame.size / 2 + val readings = parser.feed(frame.copyOfRange(0, mid)) + parser.feed(frame.copyOfRange(mid, frame.size)) + + assertEquals(1, readings.size) + assertEquals(Vm208Quality.GOOD, readings[0].quality) + } + + @Test + fun `状态字母映射 Q 与 N`() { + val qFrame = "CC F12345 T334 E14039 SQ AA".toByteArray(Charsets.US_ASCII) + byteArrayOf(0x0D, 0x0A) + val nFrame = "CC F12345 T334 E14039 SN AA".toByteArray(Charsets.US_ASCII) + byteArrayOf(0x0D, 0x0A) + + val readings = parser.feed(qFrame + nFrame) + + assertEquals(2, readings.size) + assertEquals(Vm208Quality.FAIR, readings[0].quality) + assertEquals(Vm208Quality.NONE, readings[1].quality) + } + + @Test + fun `未知状态字母映射 UNKNOWN 而非崩溃`() { + val xFrame = "CC F12345 T334 E14039 SX AA".toByteArray(Charsets.US_ASCII) + byteArrayOf(0x0D, 0x0A) + + val readings = parser.feed(xFrame) + + assertEquals(1, readings.size) + assertEquals(Vm208Quality.UNKNOWN, readings[0].quality) + } + + @Test + fun `缺字段脏帧被丢弃`() { + val dirty = "CC F12345 AA".toByteArray(Charsets.US_ASCII) + byteArrayOf(0x0D, 0x0A) + + val readings = parser.feed(dirty + sampleFrame()) + + assertEquals(1, readings.size) + } + + @Test + fun `激励命令编码与应答回解析`() { + val command = Vm208CommandEncoder.encodeExcitation(100) + + assertEquals(8, command.size) + assertEquals("0F0F060A00640D0A", command.joinToString("") { "%02X".format(it) }) + assertEquals(100, Vm208CommandEncoder.decodeExcitationAck(command)) + assertNull(Vm208CommandEncoder.decodeExcitationAck(command.copyOf(7))) + } + + @Test + fun `激励值越界抛出`() { + try { + Vm208CommandEncoder.encodeExcitation(0x10000) + throw AssertionError("应抛出 IllegalArgumentException") + } catch (expected: IllegalArgumentException) { + // 预期路径 + } + } +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..c97dfc9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,10 @@ +// 根构建脚本：只声明插件版本（apply false），各模块按需 apply +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.jvm) apply false + alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.ksp) apply false + alias(libs.plugins.hilt) apply false +} diff --git a/core/ble/build.gradle.kts b/core/ble/build.gradle.kts new file mode 100644 index 0000000..34269ea --- /dev/null +++ b/core/ble/build.gradle.kts @@ -0,0 +1,33 @@ +// core:ble 蓝牙层：设备扫描（名称前缀过滤）+ GATT 连接封装骨架 +// 权限申请由 app 壳负责（Android 12L 分版见 app 模块），本模块假定权限已授予 +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +android { + namespace = "com.stec.cmd.core.ble" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } +} + +dependencies { + implementation(project(":core:common")) + + implementation(libs.androidx.core.ktx) + implementation(libs.kotlinx.coroutines.android) + + testImplementation(libs.junit) +} diff --git a/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleConnector.kt b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleConnector.kt new file mode 100644 index 0000000..facd8de --- /dev/null +++ b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleConnector.kt @@ -0,0 +1,191 @@ +package com.stec.cmd.core.ble + +import android.annotation.SuppressLint +import android.bluetooth.BluetoothGatt +import android.bluetooth.BluetoothGattCallback +import android.bluetooth.BluetoothGattCharacteristic +import android.bluetooth.BluetoothGattDescriptor +import android.bluetooth.BluetoothManager +import android.bluetooth.BluetoothProfile +import android.content.Context +import android.os.Build +import androidx.annotation.RequiresPermission +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.withTimeout + +/** 连接状态机（骨架期最小集，自动重连策略 S3 扩展）。 */ +sealed interface GattState { + data object Connecting : GattState + data object Connected : GattState + data object ServicesDiscovered : GattState + data class Disconnected(val status: Int) : GattState +} + +/** + * 单设备 GATT 连接会话骨架。 + * + * 用法（S2/S3 业务侧）： + * ``` + * val session = connector.connect(scanned) + * session.state.filter { it is GattState.ServicesDiscovered }.first() + * session.notifyBytes(BleUuids.profileOf(scanned.type)).collect { bytes -> + * val readings = parser.feed(bytes) + * } + * ``` + */ +@SuppressLint("MissingPermission") +class BleSession internal constructor( + context: Context, + address: String, +) { + private val bluetoothManager = + context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager + + private val gatt: BluetoothGatt? = + bluetoothManager.adapter?.getRemoteDevice(address)?.let { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + it.connectGatt(context, false, callback, BluetoothGatt.TRANSPORT_LE) + } else { + it.connectGatt(context, false, callback) + } + } + + private val _state = MutableStateFlow(GattState.Connecting) + + /** 连接状态流；Disconnected 后会话即终结。 */ + val state: StateFlow = _state + + /** 等待服务发现完成（连接后调用一次）。 */ + @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT) + suspend fun awaitServicesDiscovered(timeoutMillis: Long = DEFAULT_TIMEOUT) { + withTimeout(timeoutMillis) { + state.filter { it != GattState.Connecting && it != GattState.Connected }.first() + } + } + + /** + * 订阅 Notify 特征（写 CCCD 开启通知），返回原始字节流。 + * 每帧 `0D 0A` 定界由 ble-protocol 解析器负责，本流按 Notify 回调原样发射。 + */ + @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT) + fun notifyBytes(profile: BleUuids.Profile): Flow { + val gatt = checkNotNull(gatt) { "GATT 未初始化" } + val characteristic = checkNotNull( + gatt.getService(profile.service)?.getCharacteristic(profile.notifyCharacteristic), + ) { "Notify 特征不存在: ${profile.notifyCharacteristic}" } + return callbackFlow { + val listener = object : BluetoothGattCallback() { + @Deprecated("API 33 起走带 characteristic 参数的新回调；骨架期两版共存") + override fun onCharacteristicChanged( + gatt: BluetoothGatt, + characteristic: BluetoothGattCharacteristic, + ) { + if (characteristic.uuid == profile.notifyCharacteristic) { + trySend(characteristic.value ?: ByteArray(0)) + } + } + } + check(gatt.setCharacteristicNotification(characteristic, true)) { + "开启 Notify 失败: ${profile.notifyCharacteristic}" + } + gatt.writeDescriptor( + characteristic.getDescriptor(DESCRIPTOR_CCCD)?.apply { + value = ENABLE_NOTIFICATION_VALUE + }, + ) + // 单回调实例仅做字节监听（连接生命周期由主 callback 管理） + awaitClose { + runCatching { + gatt.setCharacteristicNotification(characteristic, false) + } + } + } + } + + /** 写特征（VM208 激励命令下发）。返回是否写入成功。 */ + @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT) + suspend fun write(profile: BleUuids.Profile, data: ByteArray, timeoutMillis: Long = DEFAULT_TIMEOUT): Boolean { + val gatt = checkNotNull(gatt) { "GATT 未初始化" } + val characteristic = gatt.getService(profile.service) + ?.getCharacteristic(profile.writeCharacteristic) + ?: return false + val done = CompletableDeferred() + writeListener.completeWith = done + characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT + characteristic.value = data + if (!gatt.writeCharacteristic(characteristic)) { + done.complete(false) + } + return withTimeout(timeoutMillis) { done.await() } + } + + /** 主动断开并释放 GATT 资源。 */ + @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT) + fun disconnect() { + gatt?.disconnect() + } + + private val callback = object : BluetoothGattCallback() { + override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) { + when (newState) { + BluetoothProfile.STATE_CONNECTED -> { + _state.value = GattState.Connected + gatt.discoverServices() + } + + BluetoothProfile.STATE_DISCONNECTED -> { + _state.value = GattState.Disconnected(status) + gatt.close() + } + } + } + + override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) { + if (status == BluetoothGatt.GATT_SUCCESS) { + _state.value = GattState.ServicesDiscovered + } else { + _state.value = GattState.Disconnected(status) + } + } + + override fun onCharacteristicWrite( + gatt: BluetoothGatt, + characteristic: BluetoothGattCharacteristic, + status: Int, + ) { + writeListener.completeWith.complete(status == BluetoothGatt.GATT_SUCCESS) + } + } + + /** write 挂起桥：把主 callback 的 onCharacteristicWrite 结果转给调用协程。 */ + private val writeListener = object { + lateinit var completeWith: CompletableDeferred + } + + private companion object { + const val DEFAULT_TIMEOUT = 10_000L + + /** Client Characteristic Config 描述符（Notify 开关）。 */ + val DESCRIPTOR_CCCD: java.util.UUID = java.util.UUID.fromString( + "00002902-0000-1000-8000-00805f9b34fb", + ) + val ENABLE_NOTIFICATION_VALUE = byteArrayOf(0x01, 0x00) + } +} + +/** + * GATT 连接入口：按扫描结果建立会话。 + * S0 骨架不引 Hilt，由 app/S3 按需构造或包装。 + */ +class BleConnector(private val context: Context) { + + @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT) + fun connect(scanned: ScannedDevice): BleSession = BleSession(context, scanned.address) +} diff --git a/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleScanner.kt b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleScanner.kt new file mode 100644 index 0000000..65dd098 --- /dev/null +++ b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleScanner.kt @@ -0,0 +1,86 @@ +package com.stec.cmd.core.ble + +import android.Manifest +import android.annotation.SuppressLint +import android.bluetooth.BluetoothManager +import android.bluetooth.le.ScanCallback +import android.bluetooth.le.ScanResult +import android.bluetooth.le.ScanSettings +import android.content.Context +import android.os.Build +import androidx.annotation.RequiresPermission +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow + +/** 一次扫描命中：已按名称前缀过滤为目标设备。 */ +data class ScannedDevice( + val name: String, + val address: String, + val rssi: Int, + val type: DeviceType, +) + +/** 扫描失败（硬件不可用/扫描过频等），code 为 ScanCallback.SCAN_FAILED_* 常量。 */ +class BleScanFailed(val code: Int) : Exception("BLE 扫描失败: code=$code") + +/** + * BLE 扫描器：按设备名前缀过滤 IE-1000 / VM208。 + * + * 前缀过滤在内存中做（广播名偶有截断，[ScanFilter.setDeviceNamePrefix] + * 在部分机型不可靠），全量回调后按 [DeviceType.fromDeviceName] 筛选。 + * 权限由 app 壳申请（12L+ 为 BLUETOOTH_SCAN/CONNECT，旧版为 SCAN + 定位）。 + */ +class BleScanner(context: Context) { + + private val bluetoothManager = + context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager + + /** + * 开始扫描，命中流自动去重（同地址只保留最近一次）。 + * 收集端取消或调用 [close] 时停止扫描。 + */ + @SuppressLint("MissingPermission") + @RequiresPermission(Manifest.permission.BLUETOOTH_SCAN) + fun scan( + types: Set = DeviceType.entries.toSet(), + ): Flow { + val scanner = bluetoothManager.adapter?.bluetoothLeScanner + ?: throw BleScanFailed(UNAVAILABLE_ADAPTER) + return callbackFlow { + val settings = ScanSettings.Builder() + .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY) + .build() + val callback = object : ScanCallback() { + private val seen = HashMap() + + override fun onScanResult(callbackType: Int, result: ScanResult) { + val name = result.scanRecord?.deviceName ?: result.device?.name + val type = DeviceType.fromDeviceName(name) ?: return + if (type !in types) return + val device = ScannedDevice( + name = name, + address = result.device.address, + rssi = result.rssi, + type = type, + ) + // 同地址覆盖发射：UI 层按 address 收敛列表 + seen[device.address] = device + trySend(device) + } + + override fun onScanFailed(errorCode: Int) { + close(BleScanFailed(errorCode)) + } + } + scanner.startScan(null, settings, callback) + awaitClose { + runCatching { scanner.stopScan(callback) } + } + } + } + + private companion object { + const val UNAVAILABLE_ADAPTER = -100 + } +} diff --git a/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleUuids.kt b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleUuids.kt new file mode 100644 index 0000000..c9ecdbd --- /dev/null +++ b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/BleUuids.kt @@ -0,0 +1,42 @@ +package com.stec.cmd.core.ble + +import java.util.UUID + +/** + * 两类设备的 GATT UUID 汇总（协议原文 docs/BLE-IE1000.txt）。 + * + * ⚠ VM208 服务 UUID 原文档仅 31 位十六进制（`0000fee2000010a0800000602f9b3698`）， + * 不足标准 128 位（32 位）。此处按末位补 0 占位： + * **S2 真机联调时须用 nRF Connect 实测校准**，确认后再更新本文件。 + */ +object BleUuids { + + /** 单设备的 GATT 档案：服务 + 写特征 + Notify 特征。 */ + data class Profile( + val service: UUID, + val writeCharacteristic: UUID, + val notifyCharacteristic: UUID, + ) + + /** IE-1000 振弦式读数仪。 */ + val IE1000: Profile = Profile( + service = uuid("0000fee6-0000-2000-6000-006012345678"), + writeCharacteristic = uuid("FE000000-0000-0000-0000-000000000580"), + notifyCharacteristic = uuid("FE000000-0000-0000-0000-000000000581"), + ) + + /** VM208 综合采集仪（服务 UUID 见类注释⚠）。 */ + val VM208: Profile = Profile( + service = uuid("0000fee2-0000-10a0-8000-0602f9b36980"), + writeCharacteristic = uuid("a44bc439-abfd-45a2-4254-2d4d31129700"), + notifyCharacteristic = uuid("a44bc439-abfd-45a2-4254-2d4d31129701"), + ) + + /** 按设备类型取档案。 */ + fun profileOf(type: DeviceType): Profile = when (type) { + DeviceType.IE1000 -> IE1000 + DeviceType.VM208 -> VM208 + } + + private fun uuid(value: String): UUID = UUID.fromString(value) +} diff --git a/core/ble/src/main/kotlin/com/stec/cmd/core/ble/DeviceType.kt b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/DeviceType.kt new file mode 100644 index 0000000..c6e9733 --- /dev/null +++ b/core/ble/src/main/kotlin/com/stec/cmd/core/ble/DeviceType.kt @@ -0,0 +1,22 @@ +package com.stec.cmd.core.ble + +/** + * 平台支持的采集设备类型（协议原文见 docs/BLE-IE1000.txt）。 + * + * 蓝牙名以**前缀**匹配： + * - IE-1000 振弦式读数仪，广播名 `IE-1000`； + * - VM208 综合采集仪，广播名 `VM208 xxxxxx`（带序列号后缀）。 + */ +enum class DeviceType(val namePrefix: String) { + IE1000("IE-1000"), + VM208("VM208"); + + companion object { + + /** 按广播名前缀识别设备类型；无法识别返回 null（外场杂散设备直接忽略）。 */ + fun fromDeviceName(name: String?): DeviceType? { + if (name.isNullOrEmpty()) return null + return entries.firstOrNull { name.startsWith(it.namePrefix) } + } + } +} diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts new file mode 100644 index 0000000..7d82d49 --- /dev/null +++ b/core/common/build.gradle.kts @@ -0,0 +1,30 @@ +// core:common 通用基础层：AppResult / UiState / 日志门面 +// 代码保持纯 Kotlin（不引 Android API），便于 JVM 单测与被所有 core 模块复用 +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +android { + namespace = "com.stec.cmd.core.common" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } +} + +dependencies { + api(libs.kotlinx.coroutines.core) + + testImplementation(libs.junit) +} diff --git a/core/common/src/main/kotlin/com/stec/cmd/core/common/AppLog.kt b/core/common/src/main/kotlin/com/stec/cmd/core/common/AppLog.kt new file mode 100644 index 0000000..cdaa6c0 --- /dev/null +++ b/core/common/src/main/kotlin/com/stec/cmd/core/common/AppLog.kt @@ -0,0 +1,36 @@ +package com.stec.cmd.core.common + +/** + * 轻量日志门面：core 层不依赖 android.util.Log， + * app 壳启动时注入 LogCat 实现（AppLog.sink = ...），测试环境可不注入或注入内存实现。 + */ +object AppLog { + + enum class Level { DEBUG, INFO, WARN, ERROR } + + fun interface Sink { + fun log(level: Level, tag: String, message: String, throwable: Throwable?) + } + + @Volatile + private var sink: Sink? = null + + /** app 启动时调用一次；传 null 恢复为静默（适用于单元测试）。 */ + fun install(sink: Sink?) { + this.sink = sink + } + + fun d(tag: String, message: String) = dispatch(Level.DEBUG, tag, message, null) + + fun i(tag: String, message: String) = dispatch(Level.INFO, tag, message, null) + + fun w(tag: String, message: String, throwable: Throwable? = null) = + dispatch(Level.WARN, tag, message, throwable) + + fun e(tag: String, message: String, throwable: Throwable? = null) = + dispatch(Level.ERROR, tag, message, throwable) + + private fun dispatch(level: Level, tag: String, message: String, throwable: Throwable?) { + sink?.log(level, tag, message, throwable) + } +} diff --git a/core/common/src/main/kotlin/com/stec/cmd/core/common/AppResult.kt b/core/common/src/main/kotlin/com/stec/cmd/core/common/AppResult.kt new file mode 100644 index 0000000..046af76 --- /dev/null +++ b/core/common/src/main/kotlin/com/stec/cmd/core/common/AppResult.kt @@ -0,0 +1,48 @@ +package com.stec.cmd.core.common + +/** + * 全工程统一的结果封装：UI 层与数据层之间只通过 [AppResult] 传递成败， + * 具体业务异常（网络/数据库/协议）由各 core 模块定义并在此统一消费。 + */ +sealed interface AppResult { + + /** 成功，携带业务数据。 */ + data class Success(val data: T) : AppResult + + /** 失败，携带原始异常与可选的人类可读说明。 */ + data class Error( + val error: Throwable, + val message: String? = error.message, + ) : AppResult + + /** 加载中（首屏/刷新语义由 UI 层区分）。 */ + data object Loading : AppResult + + companion object { + /** 同步块结果捕获：块内抛出的任意异常转为 [Error]。 */ + inline fun of(block: () -> T): AppResult = try { + Success(block()) + } catch (t: Throwable) { + Error(t) + } + } +} + +/** 成功值映射，失败/加载态原样透传。 */ +inline fun AppResult.map(transform: (T) -> R): AppResult = when (this) { + is AppResult.Success -> AppResult.Success(transform(data)) + is AppResult.Error -> this + is AppResult.Loading -> this +} + +/** 成功时的副作用钩子，返回值不变。 */ +inline fun AppResult.onSuccess(block: (T) -> Unit): AppResult { + if (this is AppResult.Success) block(data) + return this +} + +/** 失败时的副作用钩子，返回值不变。 */ +inline fun AppResult.onError(block: (AppResult.Error) -> Unit): AppResult { + if (this is AppResult.Error) block(this) + return this +} diff --git a/core/common/src/main/kotlin/com/stec/cmd/core/common/UiState.kt b/core/common/src/main/kotlin/com/stec/cmd/core/common/UiState.kt new file mode 100644 index 0000000..14841aa --- /dev/null +++ b/core/common/src/main/kotlin/com/stec/cmd/core/common/UiState.kt @@ -0,0 +1,28 @@ +package com.stec.cmd.core.common + +/** + * 页面级视图状态：MVVM 中 ViewModel 对 UI 暴露的最小状态机。 + * 与 [AppResult] 解耦——AppResult 描述一次调用，UiState 描述一个页面。 + */ +sealed interface UiState { + + /** 初始空闲态（尚未发起加载）。 */ + data object Idle : UiState + + /** 加载中。 */ + data object Loading : UiState + + /** 内容就绪。 */ + data class Success(val data: T) : UiState + + /** + * 失败态。 + * + * @property message 用户可读的错误说明 + * @property retryable 是否允许重试（429/403 等限流场景由业务层定） + */ + data class Error( + val message: String, + val retryable: Boolean = true, + ) : UiState +} diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts new file mode 100644 index 0000000..d58a19c --- /dev/null +++ b/core/database/build.gradle.kts @@ -0,0 +1,38 @@ +// core:database 本地存储：Room AppDatabase + 上传队列（离线优先参考实现） +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) +} + +android { + namespace = "com.stec.cmd.core.database" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } +} + +dependencies { + implementation(project(":core:common")) + + api(libs.androidx.room.runtime) + api(libs.androidx.room.ktx) + ksp(libs.androidx.room.compiler) + + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) + + testImplementation(libs.junit) +} diff --git a/core/database/src/main/kotlin/com/stec/cmd/core/database/AppDatabase.kt b/core/database/src/main/kotlin/com/stec/cmd/core/database/AppDatabase.kt new file mode 100644 index 0000000..a891329 --- /dev/null +++ b/core/database/src/main/kotlin/com/stec/cmd/core/database/AppDatabase.kt @@ -0,0 +1,27 @@ +package com.stec.cmd.core.database + +import androidx.room.Database +import androidx.room.RoomDatabase + +/** + * 应用数据库骨架。 + * + * S0 仅注册上传队列一张表作为离线优先参考实现； + * S1+ 新业务实体（任务缓存、测点、统计数据等）在 entities 中追加并升 version。 + * 骨架期 exportSchema=false（无迁移需求）；开启迁移管理时再导出 schema。 + */ +@Database( + entities = [ + UploadQueueEntity::class, + ], + version = 1, + exportSchema = false, +) +abstract class AppDatabase : RoomDatabase() { + + abstract fun uploadQueueDao(): UploadQueueDao + + companion object { + const val DATABASE_NAME = "stec-cmd.db" + } +} diff --git a/core/database/src/main/kotlin/com/stec/cmd/core/database/DatabaseModule.kt b/core/database/src/main/kotlin/com/stec/cmd/core/database/DatabaseModule.kt new file mode 100644 index 0000000..326c546 --- /dev/null +++ b/core/database/src/main/kotlin/com/stec/cmd/core/database/DatabaseModule.kt @@ -0,0 +1,32 @@ +package com.stec.cmd.core.database + +import android.content.Context +import androidx.room.Room +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +/** 数据库 Hilt 装配：全工程共享一个 AppDatabase。 */ +@Module +@InstallIn(SingletonComponent::class) +object DatabaseModule { + + @Provides + @Singleton + fun provideAppDatabase( + @ApplicationContext context: Context, + ): AppDatabase = Room.databaseBuilder( + context, + AppDatabase::class.java, + AppDatabase.DATABASE_NAME, + ).build() + + @Provides + @Singleton + fun provideUploadQueueDao( + database: AppDatabase, + ): UploadQueueDao = database.uploadQueueDao() +} diff --git a/core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueDao.kt b/core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueDao.kt new file mode 100644 index 0000000..95a5d28 --- /dev/null +++ b/core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueDao.kt @@ -0,0 +1,54 @@ +package com.stec.cmd.core.database + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import kotlinx.coroutines.flow.Flow + +/** + * 上传队列 DAO：演示离线优先的入队/取待传/回写状态闭环。 + * S1+ 各数据类型 DAO 照此挂载到 [AppDatabase]。 + */ +@Dao +interface UploadQueueDao { + + /** 入队一条待上传数据。 */ + @Insert + suspend fun enqueue(entity: UploadQueueEntity): Long + + /** 按入队顺序观察待上传（含失败待重试）队列。 */ + @Query( + "SELECT * FROM upload_queue " + + "WHERE status IN (:statuses) ORDER BY created_at ASC", + ) + fun observeByStatuses(vararg statuses: Int): Flow> + + /** 一次性取待上传列表（上传调度器使用）。 */ + @Query( + "SELECT * FROM upload_queue " + + "WHERE status IN (:statuses) ORDER BY created_at ASC LIMIT :limit", + ) + suspend fun takePending(statuses: List, limit: Int = DEFAULT_BATCH): List + + /** 标记上传中。 */ + @Query("UPDATE upload_queue SET status = :status WHERE id = :id") + suspend fun updateStatus(id: Long, status: Int) + + /** 标记成功并记录时间。 */ + @Query("UPDATE upload_queue SET status = :status, uploaded_at = :uploadedAt WHERE id = :id") + suspend fun markSuccess(id: Long, status: Int, uploadedAt: Long) + + /** 失败重试：状态回待传并累计重试次数。 */ + @Query( + "UPDATE upload_queue SET status = :status, retry_count = retry_count + 1 WHERE id = :id", + ) + suspend fun markRetry(id: Long, status: Int) + + /** 清理已成功且早于截止时间的记录（队列瘦身）。 */ + @Query("DELETE FROM upload_queue WHERE status = :status AND uploaded_at IS NOT NULL AND uploaded_at < :before") + suspend fun purgeSuccessBefore(status: Int, before: Long): Int + + companion object { + private const val DEFAULT_BATCH = 50 + } +} diff --git a/core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueEntity.kt b/core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueEntity.kt new file mode 100644 index 0000000..c983ddc --- /dev/null +++ b/core/database/src/main/kotlin/com/stec/cmd/core/database/UploadQueueEntity.kt @@ -0,0 +1,67 @@ +package com.stec.cmd.core.database + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey + +/** + * 采集数据上传队列（离线优先参考实现，对应功能明细 M4-07）。 + * + * 设计口径：所有采集数据先入本队列再尝试上传，网络失败留在队列内自动补传； + * S1+ 各数据类型（水平位移/测斜/轴力/水位…）照此模式挂载自己的实体， + * payloadJson 统一存接口文档约定的上传 JSON 结构。 + */ +@Entity(tableName = "upload_queue") +data class UploadQueueEntity( + /** 自增主键。 */ + @PrimaryKey(autoGenerate = true) + @ColumnInfo(name = "id") + val id: Long = 0L, + + /** 设备类型：IE1000 / VM208（见 core:ble DeviceType）。 */ + @ColumnInfo(name = "device_type") + val deviceType: String, + + /** 设备蓝牙标识（蓝牙名或 MAC）。 */ + @ColumnInfo(name = "device_id") + val deviceId: String, + + /** 业务数据类型（水平位移/测斜/轴力/水位等，S1+ 扩展枚举）。 */ + @ColumnInfo(name = "data_type") + val dataType: String, + + /** 按接口文档组装好的上传 JSON。 */ + @ColumnInfo(name = "payload_json") + val payloadJson: String, + + /** 队列状态，见 [UploadStatus]。 */ + @ColumnInfo(name = "status") + val status: Int = UploadStatus.PENDING, + + /** 已重试次数（429/403 限流退避依据）。 */ + @ColumnInfo(name = "retry_count") + val retryCount: Int = 0, + + /** 入队时间（epoch 毫秒）。 */ + @ColumnInfo(name = "created_at") + val createdAt: Long, + + /** 上传成功时间（epoch 毫秒），未上传为 null。 */ + @ColumnInfo(name = "uploaded_at") + val uploadedAt: Long? = null, +) + +/** 队列状态常量（S0 用 Int 避免 Room TypeConverter 样板，S1 可按需替换为枚举）。 */ +object UploadStatus { + /** 待上传。 */ + const val PENDING = 0 + + /** 上传中。 */ + const val UPLOADING = 1 + + /** 上传成功（保留一段时间后由清理任务删除）。 */ + const val SUCCESS = 2 + + /** 失败待重试。 */ + const val FAILED = 3 +} diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts new file mode 100644 index 0000000..1782f0e --- /dev/null +++ b/core/network/build.gradle.kts @@ -0,0 +1,48 @@ +// core:network 网络框架：鉴权三要素拦截器、统一响应解析、Retrofit/OkHttp 装配 +// NetworkConfig 的实现由 app 壳提供（配置不进代码库，见 M7-04） +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.serialization) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) +} + +android { + namespace = "com.stec.cmd.core.network" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + } + + buildFeatures { + // NetworkModule 依据 BuildConfig.DEBUG 决定是否装配 BODY 级日志拦截器 + buildConfig = true + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } +} + +dependencies { + implementation(project(":core:common")) + + // 网络能力对外暴露（业务模块直接声明 Retrofit Service） + api(libs.retrofit) + api(libs.okhttp) + api(libs.kotlinx.serialization.json) + implementation(libs.retrofit.converter.kotlinx) + implementation(libs.okhttp.logging) + + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) + + testImplementation(libs.junit) +} diff --git a/core/network/src/main/kotlin/com/stec/cmd/core/network/ApiEnvelope.kt b/core/network/src/main/kotlin/com/stec/cmd/core/network/ApiEnvelope.kt new file mode 100644 index 0000000..292d2a8 --- /dev/null +++ b/core/network/src/main/kotlin/com/stec/cmd/core/network/ApiEnvelope.kt @@ -0,0 +1,42 @@ +package com.stec.cmd.core.network + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +/** + * 平台统一响应包裹（接口文档 1.1 返回状态值约定）。 + * + * - code 为**字符串**："200" 成功、"500" 失败、"429" 频繁请求超限、"403" 连续报错超限； + * - msg：执行成功/失败提示信息； + * - data：业务数据，失败时为 null。 + */ +@Serializable +data class ApiEnvelope( + val code: String, + @SerialName("msg") val message: String? = null, + val data: T? = null, +) { + /** 是否业务成功（code = "200"）。 */ + val isSuccess: Boolean get() = code == CODE_SUCCESS + + /** 取业务数据；失败或无数据时抛出对应 [ApiError]。 */ + fun bodyOrThrow(): T { + if (!isSuccess) throw ApiError.fromCode(code, message) + @Suppress("UNCHECKED_CAST") + return data as? T ?: throw ApiError.EmptyBodyError(message) + } + + companion object { + /** 接口请求成功。 */ + const val CODE_SUCCESS = "200" + + /** 接口请求失败。 */ + const val CODE_SERVER_ERROR = "500" + + /** 同一条数据一分钟内频繁请求，超过允许最大次数。 */ + const val CODE_TOO_MANY_REQUESTS = "429" + + /** 同一条数据连续报错，超过允许出错最大次数。 */ + const val CODE_FORBIDDEN = "403" + } +} diff --git a/core/network/src/main/kotlin/com/stec/cmd/core/network/ApiError.kt b/core/network/src/main/kotlin/com/stec/cmd/core/network/ApiError.kt new file mode 100644 index 0000000..69ad29c --- /dev/null +++ b/core/network/src/main/kotlin/com/stec/cmd/core/network/ApiError.kt @@ -0,0 +1,54 @@ +package com.stec.cmd.core.network + +/** + * 平台接口错误体系：UI 层只需捕获 [ApiError] 并按子类给出提示。 + * + * 语义对齐接口文档 1.1： + * - 500 → [ServerError] 业务失败； + * - 429 → [TooManyRequests] 一分钟内同一条数据频繁请求超限； + * - 403 → [Locked] 同一条数据连续报错超限（平台锁定，非 HTTP 403 权限语义）; + * - HTTP 层失败（超时/断网）→ [NetworkError]。 + */ +sealed class ApiError( + message: String?, + cause: Throwable? = null, +) : Exception(message, cause) { + + /** 服务器业务失败（响应 code = 500）。 */ + class ServerError( + val code: String, + message: String?, + ) : ApiError(message) + + /** 请求过频（响应 code = 429）。 */ + class TooManyRequests( + message: String?, + ) : ApiError(message ?: DEFAULT_TOO_MANY_MESSAGE) + + /** 连续报错被平台锁定（响应 code = 403）。 */ + class Locked( + message: String?, + ) : ApiError(message ?: DEFAULT_LOCKED_MESSAGE) + + /** 成功码但 data 缺失（服务端契约异常）。 */ + class EmptyBodyError( + message: String?, + ) : ApiError(message ?: "响应成功但缺少数据") + + /** 网络/超时等传输层失败。 */ + class NetworkError( + cause: Throwable, + ) : ApiError(cause.message, cause) + + companion object { + private const val DEFAULT_TOO_MANY_MESSAGE = "操作过于频繁，请稍后再试" + private const val DEFAULT_LOCKED_MESSAGE = "连续失败次数过多，请稍后再试" + + /** 按响应体 code 映射业务错误。 */ + fun fromCode(code: String, message: String?): ApiError = when (code) { + ApiEnvelope.CODE_TOO_MANY_REQUESTS -> TooManyRequests(message) + ApiEnvelope.CODE_FORBIDDEN -> Locked(message) + else -> ServerError(code, message) + } + } +} diff --git a/core/network/src/main/kotlin/com/stec/cmd/core/network/AuthInterceptor.kt b/core/network/src/main/kotlin/com/stec/cmd/core/network/AuthInterceptor.kt new file mode 100644 index 0000000..1b0440c --- /dev/null +++ b/core/network/src/main/kotlin/com/stec/cmd/core/network/AuthInterceptor.kt @@ -0,0 +1,37 @@ +package com.stec.cmd.core.network + +import okhttp3.Interceptor +import okhttp3.Response +import javax.inject.Inject + +/** + * 鉴权三要素拦截器（接口文档 1.2）：为每个请求注入请求头。 + * + * - `SecretKey`：供应商密钥，必带； + * - `SystemCode`：供应商编码，必带； + * - `Token`：登录后颁发；[TokenProvider.currentToken] 为 null 时跳过， + * 登录/验证码等未登录接口天然不携带。 + */ +class AuthInterceptor @Inject constructor( + private val config: NetworkConfig, +) : Interceptor { + + override fun intercept(chain: Interceptor.Chain): Response { + val request = chain.request().newBuilder() + .header(HEADER_SECRET_KEY, config.secretKey) + .header(HEADER_SYSTEM_CODE, config.systemCode) + .apply { + config.tokenProvider.currentToken()?.let { token -> + header(HEADER_TOKEN, token) + } + } + .build() + return chain.proceed(request) + } + + private companion object { + const val HEADER_SECRET_KEY = "SecretKey" + const val HEADER_SYSTEM_CODE = "SystemCode" + const val HEADER_TOKEN = "Token" + } +} diff --git a/core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkConfig.kt b/core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkConfig.kt new file mode 100644 index 0000000..c925456 --- /dev/null +++ b/core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkConfig.kt @@ -0,0 +1,38 @@ +package com.stec.cmd.core.network + +/** + * 网络配置抽象：baseUrl 与鉴权三要素的提供者。 + * + * 接口文档 1.2 约定： + * - SecretKey：供应商调用密钥，会定期更换，必须做成配置项（M7-04）； + * - SystemCode：供应商编码，与 SecretKey 一一对应； + * - Token：登录后颁发，除登录接口外必须携带。 + * + * 实现由 app 壳注入（Hilt @Binds），值来自加密配置存储，禁止硬编码进代码库。 + */ +interface NetworkConfig { + + /** 平台接口基地址（例：https://jcd.stec.p-q.co/）。 */ + val baseUrl: String + + /** 供应商调用密钥。 */ + val secretKey: String + + /** 供应商编码。 */ + val systemCode: String + + /** Token 快照提供者。 */ + val tokenProvider: TokenProvider +} + +/** + * Token 快照提供者。 + * + * 拦截器在 OkHttp 后台线程同步读取，实现方应返回内存缓存值 + * （app 侧登录/登出/刷新时更新缓存 + 持久化），避免每次请求读盘。 + */ +interface TokenProvider { + + /** 当前 Token；未登录返回 null（此时请求不携带 Token 头）。 */ + fun currentToken(): String? +} diff --git a/core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkModule.kt b/core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkModule.kt new file mode 100644 index 0000000..3d3a1c8 --- /dev/null +++ b/core/network/src/main/kotlin/com/stec/cmd/core/network/NetworkModule.kt @@ -0,0 +1,68 @@ +package com.stec.cmd.core.network + +import dagger.Module +import dagger.Provides +import kotlinx.serialization.json.Json +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.kotlinx.serialization.asConverterFactory +import java.util.concurrent.TimeUnit +import javax.inject.Singleton + +/** + * 网络层 Hilt 装配。 + * + * [NetworkConfig] 的实现由 app 壳通过 @Binds 提供（配置不进代码库）； + * Retrofit Service 接口在 S1+ 各业务模块中声明后直接注入使用。 + */ +@Module +@InstallIn(SingletonComponent::class) +object NetworkModule { + + @Provides + @Singleton + fun provideJson(): Json = Json { + ignoreUnknownKeys = true + coerceInputValues = true + encodeDefaults = true + } + + @Provides + @Singleton + fun provideOkHttpClient( + config: NetworkConfig, + ): OkHttpClient { + val builder = OkHttpClient.Builder() + .connectTimeout(CONNECT_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .readTimeout(READ_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .writeTimeout(WRITE_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .addInterceptor(AuthInterceptor(config)) + + // 外业调试期保留 BODY 级日志；发布构建由 proguard 移除该拦截器装配 + if (BuildConfig.DEBUG) { + val logging = HttpLoggingInterceptor().apply { + level = HttpLoggingInterceptor.Level.BODY + } + builder.addInterceptor(logging) + } + return builder.build() + } + + @Provides + @Singleton + fun provideRetrofit( + client: OkHttpClient, + json: Json, + config: NetworkConfig, + ): Retrofit = Retrofit.Builder() + .baseUrl(config.baseUrl) + .client(client) + .addConverterFactory(json.asConverterFactory("application/json".toMediaType())) + .build() + + private const val CONNECT_TIMEOUT_SECONDS = 15L + private const val READ_TIMEOUT_SECONDS = 30L + private const val WRITE_TIMEOUT_SECONDS = 30L +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c09ed3 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,12 @@ +# Gradle 守护进程 JVM 参数 +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# 官方代码风格，避免平台差异 +org.gradle.kotlin.dsl.skipMetadataVersionCheck=false + +# AndroidX +android.useAndroidX=true +# 每个模块独立 R 类，加速构建 +android.nonTransitiveRClass=true + +# Kotlin 代码风格 +kotlin.code.style=official diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..42f9119 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,99 @@ +# 版本目录（Version Catalog）：全工程唯一版本事实源 +# 选型原则：全部采用相互兼容的已知稳定版（AGP 8.7.3 需 Gradle ≥ 8.9，wrapper 为 8.10.2） + +[versions] +# 构建链 +agp = "8.7.3" +kotlin = "2.0.21" +ksp = "2.0.21-1.0.28" + +# 依赖注入 +hilt = "2.52" + +# 持久化 +room = "2.6.1" +datastore = "1.1.1" +securityCrypto = "1.1.0-alpha06" + +# 网络 +retrofit = "2.11.0" +okhttp = "4.12.0" +kotlinxSerialization = "1.7.3" + +# 协程与生命周期 +coroutines = "1.9.0" +lifecycle = "2.8.7" + +# AndroidX UI +coreKtx = "1.13.1" +appcompat = "1.7.0" +activity = "1.9.3" +fragment = "1.8.5" +navigation = "2.8.4" +material = "1.12.0" +splashscreen = "1.0.1" + +# 测试 +junit = "4.13.2" +androidxJunit = "1.2.1" +espresso = "3.6.1" + +[libraries] +# AndroidX 基础 +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +androidx-activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" } +androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" } +androidx-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splashscreen" } + +# 生命周期 +androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" } +androidx-lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" } + +# 导航 +androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" } +androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" } + +# Room +androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } + +# DataStore + 加密存储 +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } +androidx-security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "securityCrypto" } + +# Material +google-material = { group = "com.google.android.material", name = "material", version.ref = "material" } + +# Hilt +hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } +hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } + +# 网络 +retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +retrofit-converter-kotlinx = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" } +okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } +okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } + +# 序列化 +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } + +# 协程 +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } + +# 测试 +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..d95bf61 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..640d686 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..07d1f5a --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,32 @@ +// 监测数据不落地平台 · 安卓客户端 —— 工程模块注册与仓库配置 +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + // 依赖仓库统一在此声明，模块级 build 文件禁止再配 repositories + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "SteCmdAndroid" + +include(":app") +include(":core:common") +include(":core:network") +include(":core:database") +include(":core:ble") +include(":ble-protocol")