From 20c8842f957950cd89aeded1d1cc3cf55f1c38e0 Mon Sep 17 00:00:00 2001 From: Vineyro Date: Fri, 18 Apr 2025 11:54:28 +0700 Subject: [PATCH] ble api update --- .idea/compiler.xml | 2 +- .idea/deploymentTargetSelector.xml | 4 +- .idea/misc.xml | 2 +- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 1 - .../java/llc/arma/ble/app/ui/MainActivity.kt | 213 +++--- .../arma/ble/app/ui/common/PrimaryButton.kt | 110 ++++ .../arma/ble/app/ui/common/TxLevelSelector.kt | 68 ++ .../llc/arma/ble/app/ui/mapper/BleMapper.kt | 15 +- .../arma/ble/app/ui/mapper/BleViewMapper.kt | 13 +- .../java/llc/arma/ble/app/ui/model/BleView.kt | 11 +- .../llc/arma/ble/app/ui/screen/BleInfoView.kt | 39 +- .../ble/app/ui/screen/ble/BleListContract.kt | 2 +- .../ble/app/ui/screen/ble/BleListScreen.kt | 45 +- .../llc/arma/ble/app/ui/screen/ble/Filter.kt | 132 +--- .../ui/screen/connection/ConnectionScreen.kt | 56 +- .../accelerometer/AccelerometerContract.kt | 9 +- .../accelerometer/AccelerometerScreen.kt | 100 ++- .../accelerometer/AccelerometerViewModel.kt | 33 +- .../accelerometer/view/AccelEdit.kt | 81 +-- .../accelerometer/view/AccelFftAxisEdit.kt | 83 ++- .../accelerometer/view/AccelFftModeEdit.kt | 65 +- .../accelerometer/view/AccelFrequencyEdit.kt | 65 +- .../view/AccelRealtimeViewEdit.kt | 69 +- .../accelerometer/view/AccelScaleEdit.kt | 92 +-- .../accelerometer/view/AccelViewEdit.kt | 100 +-- .../view/AccelerometerSpectre.kt | 12 +- .../accelerometer/view/AcceleromterAccel.kt | 8 +- .../accelerometer/view/AcceleromterHistory.kt | 51 +- .../accelerometer/view/DisplayState.kt | 263 +++----- .../accelerometer/view/HistoryEdit.kt | 31 +- .../accelerometer/view/IntervalEdit.kt | 37 +- .../accelerometer/view/PowerEdit.kt | 107 ---- .../accelerometer/view/ReadIntervalEdit.kt | 65 ++ .../inspection/accelerometer/view/Write.kt | 297 ++------- .../screen/inspection/beacon/BeaconScreen.kt | 15 +- .../inspection/beacon/view/DisplayState.kt | 142 +--- .../inspection/beacon/view/PowerEdit.kt | 107 ---- .../ui/screen/inspection/beacon/view/Write.kt | 159 +---- .../ui/screen/inspection/host/HostScreen.kt | 13 +- .../inspection/host/view/DisplayState.kt | 72 +-- .../inspection/host/view/HostHistory.kt | 36 +- .../inspection/host/view/IntervalEdit.kt | 37 +- .../screen/inspection/host/view/PowerEdit.kt | 107 ---- .../inspection/host/view/ReadIntervalEdit.kt | 53 +- .../ui/screen/inspection/host/view/Write.kt | 159 +---- .../host/view/table/BleTableEditScreen.kt | 115 +--- .../inspection/host/view/table/Write.kt | 237 ++----- .../thermometer/ThermometerScreen.kt | 39 +- .../thermometer/view/DisplayState.kt | 51 +- .../thermometer/view/IntervalEdit.kt | 42 +- .../inspection/thermometer/view/PowerEdit.kt | 67 +- .../thermometer/view/TemperatureHistory.kt | 2 - .../inspection/thermometer/view/Write.kt | 273 ++------ .../arma/ble/app/ui/screen/locale/Locale.kt | 147 +++++ .../arma/ble/app/ui/screen/main/MainScreen.kt | 4 + .../screen/password/ChangePasswordScreen.kt | 72 +-- .../app/ui/screen/password/view/Display.kt | 69 +- .../java/llc/arma/ble/app/ui/theme/Theme.kt | 3 +- .../ble/data/repository/BleRepositoryImpl.kt | 605 ++++++++++-------- .../repository/GetAccelerometerHistory.kt | 8 +- .../ble/data/repository/ReadHostHistory.kt | 4 - .../data/repository/ReadTemperatureHistory.kt | 2 +- .../ble/data/repository/XlsxRepositoryImpl.kt | 6 - .../extensions/BleScanResultExtensions.kt | 13 +- .../java/llc/arma/ble/domain/model/Ble.kt | 10 +- .../java/llc/arma/ble/domain/model/BleInfo.kt | 1 + .../arma/ble/domain/usecase/GetBleBySerial.kt | 4 +- build.gradle | 4 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 43504 bytes gradle/wrapper/gradle-wrapper.properties | 7 +- gradlew | 297 +++++---- gradlew.bat | 37 +- 74 files changed, 1928 insertions(+), 3378 deletions(-) create mode 100644 app/src/main/java/llc/arma/ble/app/ui/common/PrimaryButton.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/common/TxLevelSelector.kt delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/view/PowerEdit.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/view/ReadIntervalEdit.kt delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/PowerEdit.kt delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/host/view/PowerEdit.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/locale/Locale.kt diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56..b86273d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 5b6e61e..e1d52e3 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@