commit cd93cf007fbb95ad31e82a6533f5166ca3c547be Author: dj99k Date: Mon Aug 10 23:13:43 2026 +0900 1st commit 2026-08-10 variableAxleModitor diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..bcf4711 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..ca16a99 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..cdbc250 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..f8c14c4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.kotlin/errors/errors-1785738194155.log b/.kotlin/errors/errors-1785738194155.log new file mode 100644 index 0000000..a8dfe3f --- /dev/null +++ b/.kotlin/errors/errors-1785738194155.log @@ -0,0 +1,48 @@ +kotlin version: 2.2.10 +error message: Failed connecting to the daemon in 4 retries + +error message: Daemon compilation failed: Could not connect to Kotlin compile daemon +java.lang.RuntimeException: Could not connect to Kotlin compile daemon + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:214) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111) + at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:74) + at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:68) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:64) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:61) + at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:102) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:61) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:210) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:205) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:67) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:60) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:167) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:60) + at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:54) + at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:58) + at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174) + at java.base/java.util.concurrent.FutureTask.run(Unknown Source) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:191) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$500(DefaultConditionalExecutionQueue.java:112) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:168) + at org.gradle.internal.Factories$1.create(Factories.java:30) + at org.gradle.internal.work.DefaultWorkerLeaseService.lambda$withLocksAcquired$0(DefaultWorkerLeaseService.java:280) + at org.gradle.internal.work.ResourceLockStatistics$1.measure(ResourceLockStatistics.java:43) + at org.gradle.internal.work.DefaultWorkerLeaseService.withLocksAcquired(DefaultWorkerLeaseService.java:278) + at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:270) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:129) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:134) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:163) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:125) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source) + at java.base/java.util.concurrent.FutureTask.run(Unknown Source) + at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64) + at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:47) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) + at java.base/java.lang.Thread.run(Unknown Source) + + diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..821e34a --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,58 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.example.variableaxlemonitor" + compileSdk { + version = release(37) + } + + defaultConfig { + applicationId = "com.example.variableaxlemonitor" + minSdk = 29 + targetSdk = 37 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + optimization { + enable = false + } + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + buildFeatures { + compose = true + } +} + +dependencies { + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.compose.material.icons.extended) + implementation(libs.androidx.compose.material.icons.core) + testImplementation(libs.junit) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(libs.androidx.junit) + debugImplementation(libs.androidx.compose.ui.test.manifest) + debugImplementation(libs.androidx.compose.ui.tooling) +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/example/variableaxlemonitor/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/variableaxlemonitor/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..2196874 --- /dev/null +++ b/app/src/androidTest/java/com/example/variableaxlemonitor/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.variableaxlemonitor + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.variableaxlemonitor", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..545605d --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/variableaxlemonitor/MainActivity.kt b/app/src/main/java/com/example/variableaxlemonitor/MainActivity.kt new file mode 100644 index 0000000..98140e9 --- /dev/null +++ b/app/src/main/java/com/example/variableaxlemonitor/MainActivity.kt @@ -0,0 +1,624 @@ +package com.example.variableaxlemonitor + +import android.Manifest +import android.annotation.SuppressLint +import android.app.Activity +import android.bluetooth.BluetoothDevice +import android.os.Build +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import androidx.activity.ComponentActivity +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.animation.core.* +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Bluetooth +import androidx.compose.material.icons.filled.ExitToApp +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.TransformOrigin +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.TextUnit +import androidx.compose.ui.window.Dialog +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.navigation.NavController +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import com.example.variableaxlemonitor.ui.theme.VariableAxleMonitorTheme +import com.example.variableaxlemonitor.viewmodel.AxleViewModel +import kotlinx.coroutines.delay +import kotlin.math.cos +import kotlin.math.sin + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + val permissions = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + listOf( + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_CONNECT + ) + } else { + listOf( + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.ACCESS_FINE_LOCATION + ) + } + + val launcher = rememberLauncherForActivityResult( + ActivityResultContracts.RequestMultiplePermissions() + ) { results -> + if (results.values.all { it }) { + Log.d("MainActivity", "All permissions granted") + } else { + Toast.makeText(this, "블루투스 권한이 필요합니다.", Toast.LENGTH_SHORT).show() + } + } + + LaunchedEffect(Unit) { + launcher.launch(permissions.toTypedArray()) + } + + VariableAxleMonitorTheme { + MainApp() + } + } + } +} + +@Composable +fun MainApp() { + val navController = rememberNavController() + val viewModel: AxleViewModel = viewModel() + + NavHost(navController = navController, startDestination = "splash") { + composable("splash") { + SplashScreen(navController) + } + composable("login") { + LoginScreen(navController, viewModel) + } + composable("monitoring") { + MonitoringScreen(viewModel) + } + } +} + +@Composable +fun SplashScreen(navController: NavController) { + LaunchedEffect(Unit) { + delay(2000) // 2초 대기 + navController.navigate("login") { + popUpTo("splash") { inclusive = true } + } + } + + Box( + modifier = Modifier + .fillMaxSize() + .background(Color.White), + contentAlignment = Alignment.Center + ) { + Image( + painter = painterResource(id = R.drawable.variable_axle_load_loading), + contentDescription = "App Title", + modifier = Modifier.fillMaxWidth(0.8f) + ) + } +} + +@Composable +fun LoginScreen(navController: NavController, viewModel: AxleViewModel) { + var user by remember { mutableStateOf("") } + var pass by remember { mutableStateOf("") } + val loginSuccess by viewModel.loginSuccess + + LaunchedEffect(loginSuccess) { + if (loginSuccess) { + navController.navigate("monitoring") { + popUpTo("login") { inclusive = true } + } + } + } + + val context = LocalContext.current + LaunchedEffect(Unit) { + viewModel.loginError.collect { error -> + Toast.makeText(context, error, Toast.LENGTH_SHORT).show() + } + } + + Column( + modifier = Modifier.fillMaxSize().padding(16.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text("Variable Axle Monitor", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(32.dp)) + OutlinedTextField( + value = user, + onValueChange = { user = it }, + label = { Text("ID") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(16.dp)) + OutlinedTextField( + value = pass, + onValueChange = { pass = it }, + label = { Text("Password") }, + visualTransformation = PasswordVisualTransformation(), + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(32.dp)) + Button( + onClick = { viewModel.login(user, pass) }, + modifier = Modifier.fillMaxWidth().height(56.dp) + ) { + Text("Login") + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MonitoringScreen(viewModel: AxleViewModel) { + val axleData by viewModel.axleData.collectAsState() + val isConnected by viewModel.isConnected.collectAsState() + val dataTrigger = viewModel.dataReceivedTrigger + var showDeviceDialog by remember { mutableStateOf(false) } + val lastUpdate by remember(axleData.timestamp) { + derivedStateOf { + if (axleData.timestamp == 0L) "--:--:--" + else SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date(axleData.timestamp)) + } + } + var isBlinking by remember { mutableStateOf(false) } + + LaunchedEffect(dataTrigger) { + dataTrigger.collect { + isBlinking = true + delay(200) + isBlinking = false + } + } + + val context = LocalContext.current + + Scaffold( + topBar = { + CenterAlignedTopAppBar( + title = { + Text( + text = "가변축 모니터링", + fontSize = 32.sp, + fontWeight = FontWeight.Bold + ) + }, + actions = { + Box( + modifier = Modifier + .size(32.dp) + .clip(CircleShape) + .background(if (isBlinking) Color.Green else Color.LightGray.copy(alpha = 0.3f)) + ) + Spacer(modifier = Modifier.width(8.dp)) + IconButton( + onClick = { showDeviceDialog = true }, + modifier = Modifier.size(64.dp) + ) { + Icon( + imageVector = Icons.Default.Bluetooth, + contentDescription = "Bluetooth Status", + tint = if (isConnected) Color.Green else Color.Red, + modifier = Modifier.size(48.dp) + ) + } + IconButton( + onClick = { + viewModel.disconnect() + (context as? Activity)?.finishAffinity() + }, + modifier = Modifier.size(64.dp) + ) { + Icon( + imageVector = Icons.Default.ExitToApp, + contentDescription = "Exit App", + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(48.dp) + ) + } + } + ) + } + ) { innerPadding -> + Column( + modifier = Modifier + .padding(innerPadding) + .fillMaxSize() + .padding(8.dp) + ) { + Column(modifier = Modifier.weight(1f)) { + // Row 1: 압력센서, 속도 + Row(modifier = Modifier.weight(1f)) { + MonitoringCard( + title = "압력 센서", + value = String.format(Locale.US, "%.1f kgf/cm²", axleData.pressure * 0.1f), + iconRes = R.drawable.pressure_sensor_gauge, + isBitmap = true, + iconSize = 150.dp, + modifier = Modifier.weight(1f), + customIcon = { PressureGauge(pressure = axleData.pressure * 0.1f) } + ) + MonitoringCard( + title = "속도(Speed)", + value = "${axleData.speed} km/h", + iconRes = R.drawable.speed_display, + isBitmap = true, + modifier = Modifier.weight(1f), + customIcon = { SpeedGauge(speed = axleData.speed) } + ) + } + + // Row 2: 가변축 하중, 구동축 하중 + Row(modifier = Modifier.weight(1f)) { + MonitoringCard( + title = "가변축 하중", + value = String.format(Locale.US, "%.3f ton", axleData.variableAxleLoad * 0.001f), + iconRes = R.drawable.axle_load_variable, + isBitmap = true, + iconSize = 200.dp, + modifier = Modifier.weight(1f) + ) + MonitoringCard( + title = "구동축 하중", + value = String.format(Locale.US, "%.3f ton", axleData.driveAxleLoad * 0.001f), + iconRes = R.drawable.axle_load_driver, + isBitmap = true, + iconSize = 200.dp, + modifier = Modifier.weight(1f) + ) + } + + // Row 3: 가변축 상태, 하중분배율 + Row(modifier = Modifier.weight(1f)) { + MonitoringCard( + title = "가변축 상태", + value = if (axleData.isDown) "가변축 Down" else "가변축 Up", + iconRes = if (axleData.isDown) R.drawable.axle_down else R.drawable.axle_up, + isBitmap = true, + iconSize = 200.dp, + modifier = Modifier.weight(1f) + ) + val distributionRatio = if (axleData.driveAxleLoad + axleData.variableAxleLoad > 0) { + (axleData.variableAxleLoad.toFloat() / (axleData.driveAxleLoad.toFloat()+axleData.variableAxleLoad.toFloat()) * 100f) + } else 0f + + MonitoringCard( + title = "가변축 하중 분배율", + value = String.format(Locale.US, "%.1f %%", distributionRatio), + iconRes = when { + distributionRatio < 50f -> R.drawable.load_sharing_ratio_d50 + distributionRatio == 50f -> R.drawable.load_sharing_ratio_50 + else -> R.drawable.load_sharing_ratio_u50 + }, + isBitmap = true, + iconSize = 300.dp, + modifier = Modifier.weight(1f) + ) + } + } + + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "마지막 데이터 수신: $lastUpdate", + modifier = Modifier.align(Alignment.End), + fontSize = 11.sp, + color = Color.Gray + ) + } + } + + if (showDeviceDialog) { + LaunchedEffect(Unit) { + viewModel.startScan() + } + + val foundDevices by viewModel.foundDevices.collectAsState() + BluetoothDeviceDialog( + devices = foundDevices, + onDeviceSelected = { device -> + viewModel.stopScan() + viewModel.connectToDevice(device) + showDeviceDialog = false + }, + onDismiss = { + viewModel.stopScan() + showDeviceDialog = false + } + ) + } +} + +@Composable +fun PressureGauge( + pressure: Float, + modifier: Modifier = Modifier +) { + val maxPressure = 12f + // 사용자의 요청에 따라 0은 135도, 12은 -135도로 설정 + val startAngle = 136f //135f + val sweepAngle = 270f //270f + + val animatedPressure by animateFloatAsState( + targetValue = pressure.coerceIn(0f, maxPressure), + animationSpec = tween(durationMillis = 500), + label = "PressureNeedle" + ) + + Box( + modifier = modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + Box( + modifier = Modifier + .fillMaxSize(0.6f) // 게이지 이미지를 부모 영역의 80%로 제한 + .aspectRatio(1f), + contentAlignment = Alignment.Center + ) { + Image( + painter = painterResource(id = R.drawable.pressure_sensor_gauge), + contentDescription = null, + modifier = Modifier.fillMaxSize() + ) + + val angleDeg = startAngle + (animatedPressure / maxPressure) * sweepAngle + + Image( + painter = painterResource(id = R.drawable.pressure_arrow2), + contentDescription = "Pressure Needle", + modifier = Modifier + .fillMaxSize(0.7f) //0.7 + .graphicsLayer( + rotationZ = angleDeg + 90f, + transformOrigin = TransformOrigin(0.5f, 0.5f) + ) + ) + } + } +} + +@Composable +fun SpeedGauge( + speed: Int, + modifier: Modifier = Modifier +) { + val maxSpeed = 160f + // 사용자의 피드백에 따라 수평 왼쪽(180도)을 0으로, 수평 오른쪽(0도)을 160으로 설정 + val startAngle = 180f + val sweepAngle = 180f + + val animatedSpeed by animateFloatAsState( + targetValue = speed.coerceIn(0, maxSpeed.toInt()).toFloat(), + animationSpec = tween(durationMillis = 500), + label = "SpeedNeedle" + ) + + Box( + modifier = modifier + .aspectRatio(1f) + .fillMaxSize(0.8f), // 전체 사이즈 0.8배 축소 + contentAlignment = Alignment.Center + ) { + Image( + painter = painterResource(id = R.drawable.speed_display), + contentDescription = null, + modifier = Modifier.fillMaxSize() + ) + + Canvas(modifier = Modifier.fillMaxSize()) { + // 바늘의 회전 중심축 위치를 사용자가 확인한 0.7f 지점으로 고정 + val center = Offset(size.width / 2, size.height * 0.72f) + val radius = size.minDimension / 2 + + // 시계 방향으로 회전하므로 각도 계산 + val angleDeg = startAngle + (animatedSpeed / maxSpeed) * sweepAngle + val angleRad = Math.toRadians(angleDeg.toDouble()) + + // 바늘의 길이 (게이지 크기에 맞춰 조정) + val needleLength = radius * 0.8f + + // 바늘(화살표) 그리기 - 삼각형 형태 + val needlePath = androidx.compose.ui.graphics.Path().apply { + val endX = center.x + needleLength * cos(angleRad).toFloat() + val endY = center.y + needleLength * sin(angleRad).toFloat() + + // 바늘 뿌리 부분의 각도 (바늘 방향과 수직) + val baseAngleRad = Math.toRadians((angleDeg + 90).toDouble()) + val baseWidth = 8.dp.toPx() // 뿌리 너비 + + val baseLeftX = center.x + baseWidth * cos(baseAngleRad).toFloat() + val baseLeftY = center.y + baseWidth * sin(baseAngleRad).toFloat() + + val baseRightX = center.x - baseWidth * cos(baseAngleRad).toFloat() + val baseRightY = center.y - baseWidth * sin(baseAngleRad).toFloat() + + moveTo(baseLeftX, baseLeftY) + lineTo(endX, endY) + lineTo(baseRightX, baseRightY) + close() + } + + // 바늘 그림자 + drawPath( + path = needlePath, + color = Color.Black.copy(alpha = 0.2f), + style = androidx.compose.ui.graphics.drawscope.Fill + ) + + // 바늘 본체 (빨간색) + drawPath( + path = needlePath, + color = Color.Red, + style = androidx.compose.ui.graphics.drawscope.Fill + ) + + // 중앙 검은 점(캡) 그리기 + drawCircle( + color = Color.DarkGray, + radius = 10.dp.toPx(), + center = center + ) + drawCircle( + color = Color.Black, + radius = 6.dp.toPx(), + center = center + ) + } + } +} + +@Composable +fun MonitoringCard( + modifier: Modifier = Modifier.fillMaxSize(), + title: String, + value: String, + iconRes: Int = 0, + isBitmap: Boolean = false, + iconSize: Dp = 200.dp, + titleFontSize: TextUnit = 32.sp, + valueFontSize: TextUnit = 26.sp, + titleModifier: Modifier = Modifier, + valueModifier: Modifier = Modifier, + iconModifier: Modifier = Modifier, + titlePaddingTop: Dp = 24.dp, + contentSpacing: Dp = 14.dp, + customIcon: @Composable (() -> Unit)? = null +) { + Card( + modifier = modifier.padding(4.dp), + shape = RoundedCornerShape(12.dp), + colors = CardDefaults.cardColors(containerColor = Color.White), + border = BorderStroke(1.dp, Color.LightGray) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.height(titlePaddingTop)) + Text( + text = title, + fontSize = titleFontSize, + fontWeight = FontWeight.Bold, + color = Color(0xFF444444), + modifier = titleModifier + ) + Spacer(modifier = Modifier.height(contentSpacing)) + Text( + text = value, + fontSize = valueFontSize, + fontWeight = FontWeight.ExtraBold, + color = Color.Blue, + modifier = valueModifier + ) + Box( + modifier = Modifier.weight(1f).fillMaxWidth(), + contentAlignment = Alignment.Center + ) { + if (customIcon != null) { + customIcon() + } else if (iconRes != 0) { + if (isBitmap) { + Image( + painter = painterResource(id = iconRes), + contentDescription = title, + modifier = iconModifier.size(iconSize) + ) + } else { + Icon( + painter = painterResource(id = iconRes), + contentDescription = title, + modifier = iconModifier.size(iconSize), + tint = MaterialTheme.colorScheme.secondary + ) + } + } + } + } + } +} + +@Composable +fun BluetoothDeviceDialog( + devices: List, + onDeviceSelected: (BluetoothDevice) -> Unit, + onDismiss: () -> Unit +) { + Dialog(onDismissRequest = onDismiss) { + Surface( + shape = RoundedCornerShape(16.dp), + color = MaterialTheme.colorScheme.surface + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text("블루투스 기기 선택", fontSize = 20.sp, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(16.dp)) + LazyColumn { + items(devices) { device -> + @SuppressLint("MissingPermission") + val deviceName = device.name ?: "알 수 없는 기기" + Text( + text = deviceName, + modifier = Modifier + .fillMaxWidth() + .clickable { onDeviceSelected(device) } + .padding(vertical = 12.dp), + fontSize = 16.sp + ) + HorizontalDivider() + } + } + if (devices.isEmpty()) { + Text("검색된 기기가 없습니다.", modifier = Modifier.padding(vertical = 16.dp)) + } + Spacer(modifier = Modifier.height(16.dp)) + TextButton(onClick = onDismiss, modifier = Modifier.align(Alignment.End)) { + Text("취소") + } + } + } + } +} diff --git a/app/src/main/java/com/example/variableaxlemonitor/bluetooth/BluetoothManager.kt b/app/src/main/java/com/example/variableaxlemonitor/bluetooth/BluetoothManager.kt new file mode 100644 index 0000000..0b41e1b --- /dev/null +++ b/app/src/main/java/com/example/variableaxlemonitor/bluetooth/BluetoothManager.kt @@ -0,0 +1,282 @@ +package com.example.variableaxlemonitor.bluetooth + +import android.annotation.SuppressLint +import android.bluetooth.* +import android.bluetooth.le.ScanCallback +import android.bluetooth.le.ScanResult +import android.content.Context +import android.os.Build +import android.os.Handler +import android.os.Looper +import android.util.Log +import android.widget.Toast +import com.example.variableaxlemonitor.data.AxleData +import kotlinx.coroutines.* +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import java.util.* + +class BluetoothManager(private val context: Context) { + private val TAG = "BluetoothManager" + private val androidBluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as android.bluetooth.BluetoothManager + private val adapter: BluetoothAdapter? = androidBluetoothManager.adapter + private val scanner = adapter?.bluetoothLeScanner + + private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + + // ESP32 BLE UART Service & Characteristic UUIDs + private val SERVICE_UUID = UUID.fromString("6E400001-B5A3-F393-E0A9-E50E24DCCA9E") + private val RX_CHAR_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E") + private val CLIENT_CONFIG_DESCRIPTOR = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb") + + private val _isConnected = MutableStateFlow(false) + val isConnected: StateFlow = _isConnected + + private val _lastMessage = MutableStateFlow("기기 선택 대기 중") + val lastMessage: StateFlow = _lastMessage + + private val _mtu = MutableStateFlow(23) + val mtu: StateFlow = _mtu + + private val _axleData = MutableStateFlow(AxleData()) + val axleData: StateFlow = _axleData + + private val _dataReceivedTrigger = MutableSharedFlow() + val dataReceivedTrigger: SharedFlow = _dataReceivedTrigger + + private val _foundDevices = MutableStateFlow>(emptyList()) + val foundDevices: StateFlow> = _foundDevices + + private var gatt: BluetoothGatt? = null + + private val scanCallback = object : ScanCallback() { + @SuppressLint("MissingPermission") + override fun onScanResult(callbackType: Int, result: ScanResult) { + val device = result.device + // BLE 기기만 필터링 (DEVICE_TYPE_LE 또는 DEVICE_TYPE_DUAL) + if (device.name != null && (device.type == BluetoothDevice.DEVICE_TYPE_LE || device.type == BluetoothDevice.DEVICE_TYPE_DUAL)) { + val currentList = _foundDevices.value + if (currentList.none { it.address == device.address }) { + _foundDevices.value = currentList + device + } + } + } + } + + private val gattCallback = object : BluetoothGattCallback() { + @SuppressLint("MissingPermission") + override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) { + Log.d(TAG, "onConnectionStateChange: status=$status, newState=$newState") + if (status == BluetoothGatt.GATT_SUCCESS) { + if (newState == BluetoothProfile.STATE_CONNECTED) { + _lastMessage.value = "GATT 연결 성공. MTU 요청 중..." + Log.d(TAG, "Connected to GATT server. Requesting MTU...") + Handler(Looper.getMainLooper()).post { + Toast.makeText(context, "블루투스 기기에 연결되었습니다.", Toast.LENGTH_SHORT).show() + } + gatt.requestMtu(512) + } else if (newState == BluetoothProfile.STATE_DISCONNECTED) { + _lastMessage.value = "기기 연결 끊김" + Log.d(TAG, "Disconnected from GATT server.") + _isConnected.value = false + this@BluetoothManager.gatt?.close() + this@BluetoothManager.gatt = null + } + } else { + _lastMessage.value = "연결 오류 (status=$status)" + Log.e(TAG, "GATT error: status=$status") + _isConnected.value = false + gatt.close() + this@BluetoothManager.gatt = null + } + } + + @SuppressLint("MissingPermission") + override fun onMtuChanged(gatt: BluetoothGatt, mtu: Int, status: Int) { + Log.d(TAG, "onMtuChanged: mtu=$mtu, status=$status") + _mtu.value = mtu + _lastMessage.value = "MTU 설정 완료 ($mtu). 서비스 검색 시작..." + // Discover services after MTU is set + gatt.discoverServices() + } + + @SuppressLint("MissingPermission") + override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) { + Log.d(TAG, "onServicesDiscovered: status=$status") + if (status == BluetoothGatt.GATT_SUCCESS) { + _lastMessage.value = "서비스 발견 성공. 특성 찾는 중..." + var foundTarget = false + val service = gatt.getService(SERVICE_UUID) + val characteristic = service?.getCharacteristic(RX_CHAR_UUID) + + if (characteristic != null) { + _lastMessage.value = "UART 특성 발견. 구독 설정 중..." + enableNotifications(gatt, characteristic) + foundTarget = true + } else { + Log.w(TAG, "Target UART UUID not found. Searching for any Notify characteristic...") + for (srv in gatt.services) { + for (char in srv.characteristics) { + if ((char.properties and BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0) { + Log.d(TAG, "Found Notify characteristic: ${char.uuid} in service ${srv.uuid}") + _lastMessage.value = "대체 특성 발견. 구독 설정 중..." + enableNotifications(gatt, char) + foundTarget = true + break + } + } + if (foundTarget) break + } + } + + if (foundTarget) { + _isConnected.value = true + } else { + _lastMessage.value = "데이터 수신 특성을 찾을 수 없음" + Log.e(TAG, "No suitable Notify characteristic found on device.") + } + } else { + _lastMessage.value = "서비스 발견 실패 (status=$status)" + } + } + + override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, value: ByteArray) { + processReceivedData(value) + } + + @Deprecated("Deprecated in Java") + override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) { + @Suppress("DEPRECATION") + processReceivedData(characteristic.value) + } + + override fun onDescriptorWrite(gatt: BluetoothGatt, descriptor: BluetoothGattDescriptor, status: Int) { + Log.d(TAG, "onDescriptorWrite: status=$status, descriptor=${descriptor.uuid}") + if (status == BluetoothGatt.GATT_SUCCESS) { + _lastMessage.value = "통신 준비 완료. 데이터 수신 대기 중..." + } else { + _lastMessage.value = "구독 설정 실패 (status=$status)" + } + } + } + + private fun processReceivedData(value: ByteArray?) { + if (value == null) return + + val received = String(value).trim() + if (received.isNotEmpty()) { + Log.d(TAG, "Extracted line: '$received'") + scope.launch { + parseData(received) + } + } + } + + @SuppressLint("MissingPermission") + private fun enableNotifications(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) { + val success = gatt.setCharacteristicNotification(characteristic, true) + Log.d(TAG, "setCharacteristicNotification(${characteristic.uuid}) success: $success") + + val descriptor = characteristic.getDescriptor(CLIENT_CONFIG_DESCRIPTOR) + if (descriptor != null) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + gatt.writeDescriptor(descriptor, BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE) + } else { + @Suppress("DEPRECATION") + descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE + @Suppress("DEPRECATION") + gatt.writeDescriptor(descriptor) + } + Log.d(TAG, "Writing Descriptor to enable Notifications for ${characteristic.uuid}") + } else { + Log.e(TAG, "Client Config Descriptor not found for ${characteristic.uuid}") + } + } + + @SuppressLint("MissingPermission") + fun startScan() { + Log.d(TAG, "Starting BLE scan...") + // 페어링된 기기 중 BLE 기기만 먼저 추가 + val pairedDevices = adapter?.bondedDevices ?: emptySet() + _foundDevices.value = pairedDevices.filter { + it.type == BluetoothDevice.DEVICE_TYPE_LE || it.type == BluetoothDevice.DEVICE_TYPE_DUAL + } + + scanner?.startScan(scanCallback) + } + + @SuppressLint("MissingPermission") + fun stopScan() { + Log.d(TAG, "Stopping BLE scan.") + scanner?.stopScan(scanCallback) + } + + @SuppressLint("MissingPermission") + fun connect(device: BluetoothDevice) { + Log.d(TAG, "Connecting to ${device.address} via TRANSPORT_LE") + stopScan() + disconnect() + gatt = device.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE) + } + + private suspend fun parseData(line: String) { + // Remove any non-numeric/comma characters except dots and minus + val cleaned = line.replace(Regex("[^0-9,.-]"), "") + if (cleaned.isEmpty()) return + Log.d(TAG, "Parsing Cleaned Line: '$cleaned'") + + val parts = cleaned.split(",").filter { it.isNotEmpty() }.map { it.trim() } + if (parts.size >= 5) { + try { + val pRawStr = parts[0] + val sRawStr = parts[1] + val vRawStr = parts[2] + val dRawStr = parts[3] + val iRawStr = parts[4] + + Log.d(TAG, "Part Strings: P=$pRawStr, S=$sRawStr, V=$vRawStr, D=$dRawStr, I=$iRawStr") + + // Parse as Int first as requested by user + val pInt = pRawStr.toIntOrNull() ?: 0 + val sInt = sRawStr.toIntOrNull() ?: 0 + val vInt = vRawStr.toIntOrNull() ?: 0 + val dInt = dRawStr.toIntOrNull() ?: 0 + val iInt = iRawStr.toIntOrNull() ?: 0 + + val data = AxleData( + pressure = pInt, + speed = sInt, + variableAxleLoad = vInt, + driveAxleLoad = dInt, + isDown = iInt == 1, + timestamp = System.currentTimeMillis() + ) + + Log.d(TAG, "Successfully Parsed Raw Data: $data") + + // Use update block for better StateFlow awareness + _axleData.update { data } + + // Update on Main thread to ensure UI recomposition + withContext(Dispatchers.Main) { + _dataReceivedTrigger.emit(Unit) + } + } catch (e: Exception) { + Log.e(TAG, "Parse error: ${e.message} in '$cleaned'") + } + } else { + Log.w(TAG, "Incomplete data parts (${parts.size}): $cleaned") + } + } + + @SuppressLint("MissingPermission") + fun disconnect() { + Log.d(TAG, "Disconnecting GATT") + gatt?.disconnect() + _isConnected.value = false + } +} diff --git a/app/src/main/java/com/example/variableaxlemonitor/data/AxleData.kt b/app/src/main/java/com/example/variableaxlemonitor/data/AxleData.kt new file mode 100644 index 0000000..6bd97b0 --- /dev/null +++ b/app/src/main/java/com/example/variableaxlemonitor/data/AxleData.kt @@ -0,0 +1,10 @@ +package com.example.variableaxlemonitor.data + +data class AxleData( + val pressure: Int = 0, // Raw Int (e.g., 20) + val speed: Int = 0, // Raw Int (e.g., 30) + val variableAxleLoad: Int = 0, // Raw Int (e.g., 3500) + val driveAxleLoad: Int = 0, // Raw Int (e.g., 6500) + val isDown: Boolean = false, // 0 -> Up, 1 -> Down + val timestamp: Long = 0L // For ensuring UI update on same data +) diff --git a/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Color.kt b/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Color.kt new file mode 100644 index 0000000..8e564dc --- /dev/null +++ b/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.variableaxlemonitor.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Theme.kt b/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Theme.kt new file mode 100644 index 0000000..d8a4fd4 --- /dev/null +++ b/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package com.example.variableaxlemonitor.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun VariableAxleMonitorTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Type.kt b/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Type.kt new file mode 100644 index 0000000..5c406dd --- /dev/null +++ b/app/src/main/java/com/example/variableaxlemonitor/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.variableaxlemonitor.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/com/example/variableaxlemonitor/viewmodel/AxleViewModel.kt b/app/src/main/java/com/example/variableaxlemonitor/viewmodel/AxleViewModel.kt new file mode 100644 index 0000000..80b1ea9 --- /dev/null +++ b/app/src/main/java/com/example/variableaxlemonitor/viewmodel/AxleViewModel.kt @@ -0,0 +1,60 @@ +package com.example.variableaxlemonitor.viewmodel + +import android.app.Application +import android.bluetooth.BluetoothDevice +import androidx.compose.runtime.State +import androidx.compose.runtime.mutableStateOf +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewModelScope +import com.example.variableaxlemonitor.bluetooth.BluetoothManager +import com.example.variableaxlemonitor.data.AxleData +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asSharedFlow +import kotlinx.coroutines.launch + +class AxleViewModel(application: Application) : AndroidViewModel(application) { + private val bluetoothManager = BluetoothManager(application) + + val isConnected: StateFlow = bluetoothManager.isConnected + val lastMessage: StateFlow = bluetoothManager.lastMessage + val mtu: StateFlow = bluetoothManager.mtu + val axleData: StateFlow = bluetoothManager.axleData + + val dataReceivedTrigger: SharedFlow = bluetoothManager.dataReceivedTrigger + + val foundDevices: StateFlow> = bluetoothManager.foundDevices + + private val _loginError = MutableSharedFlow() + val loginError: SharedFlow = _loginError.asSharedFlow() + + private val _loginSuccess = mutableStateOf(false) + val loginSuccess: State = _loginSuccess + + fun login(user: String, pass: String) { + if (user == "mms" && pass == "mms") { + _loginSuccess.value = true + } else { + viewModelScope.launch { + _loginError.emit("User/Password가 맞지않습니다. 다시 시도하십시오.") + } + } + } + + fun startScan() { + bluetoothManager.startScan() + } + + fun stopScan() { + bluetoothManager.stopScan() + } + + fun connectToDevice(device: BluetoothDevice) { + bluetoothManager.connect(device) + } + + fun disconnect() { + bluetoothManager.disconnect() + } +} diff --git a/app/src/main/keepRules/rules.keep b/app/src/main/keepRules/rules.keep new file mode 100644 index 0000000..d7e081a --- /dev/null +++ b/app/src/main/keepRules/rules.keep @@ -0,0 +1,12 @@ +# Add project specific R8 rules here. +# AGP will combine all keep rule files in src/main/keepRules to pass to R8 +# +# For more details, see +# https://d.android.com/r/tools/r8/keep-rules + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} \ No newline at end of file diff --git a/app/src/main/res/drawable/axle.png b/app/src/main/res/drawable/axle.png new file mode 100644 index 0000000..2372eb8 Binary files /dev/null and b/app/src/main/res/drawable/axle.png differ diff --git a/app/src/main/res/drawable/axle1.png b/app/src/main/res/drawable/axle1.png new file mode 100644 index 0000000..8ac9aea Binary files /dev/null and b/app/src/main/res/drawable/axle1.png differ diff --git a/app/src/main/res/drawable/axle2.png b/app/src/main/res/drawable/axle2.png new file mode 100644 index 0000000..4928362 Binary files /dev/null and b/app/src/main/res/drawable/axle2.png differ diff --git a/app/src/main/res/drawable/axle3.png b/app/src/main/res/drawable/axle3.png new file mode 100644 index 0000000..613ad58 Binary files /dev/null and b/app/src/main/res/drawable/axle3.png differ diff --git a/app/src/main/res/drawable/axle4.png b/app/src/main/res/drawable/axle4.png new file mode 100644 index 0000000..04315a9 Binary files /dev/null and b/app/src/main/res/drawable/axle4.png differ diff --git a/app/src/main/res/drawable/axle_down.png b/app/src/main/res/drawable/axle_down.png new file mode 100644 index 0000000..d0862fc Binary files /dev/null and b/app/src/main/res/drawable/axle_down.png differ diff --git a/app/src/main/res/drawable/axle_load.png b/app/src/main/res/drawable/axle_load.png new file mode 100644 index 0000000..bc66fba Binary files /dev/null and b/app/src/main/res/drawable/axle_load.png differ diff --git a/app/src/main/res/drawable/axle_load_driver.png b/app/src/main/res/drawable/axle_load_driver.png new file mode 100644 index 0000000..e321727 Binary files /dev/null and b/app/src/main/res/drawable/axle_load_driver.png differ diff --git a/app/src/main/res/drawable/axle_load_driver_weight.png b/app/src/main/res/drawable/axle_load_driver_weight.png new file mode 100644 index 0000000..195ae0e Binary files /dev/null and b/app/src/main/res/drawable/axle_load_driver_weight.png differ diff --git a/app/src/main/res/drawable/axle_load_variable.png b/app/src/main/res/drawable/axle_load_variable.png new file mode 100644 index 0000000..cee715d Binary files /dev/null and b/app/src/main/res/drawable/axle_load_variable.png differ diff --git a/app/src/main/res/drawable/axle_load_variable_weight.png b/app/src/main/res/drawable/axle_load_variable_weight.png new file mode 100644 index 0000000..447ee19 Binary files /dev/null and b/app/src/main/res/drawable/axle_load_variable_weight.png differ diff --git a/app/src/main/res/drawable/axle_up.png b/app/src/main/res/drawable/axle_up.png new file mode 100644 index 0000000..8b04eeb Binary files /dev/null and b/app/src/main/res/drawable/axle_up.png differ diff --git a/app/src/main/res/drawable/ic_axle_down.xml b/app/src/main/res/drawable/ic_axle_down.xml new file mode 100644 index 0000000..df3a7b0 --- /dev/null +++ b/app/src/main/res/drawable/ic_axle_down.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_axle_drive.xml b/app/src/main/res/drawable/ic_axle_drive.xml new file mode 100644 index 0000000..93e778b --- /dev/null +++ b/app/src/main/res/drawable/ic_axle_drive.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_axle_up.xml b/app/src/main/res/drawable/ic_axle_up.xml new file mode 100644 index 0000000..d727074 --- /dev/null +++ b/app/src/main/res/drawable/ic_axle_up.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_axle_variable.xml b/app/src/main/res/drawable/ic_axle_variable.xml new file mode 100644 index 0000000..78f7d10 --- /dev/null +++ b/app/src/main/res/drawable/ic_axle_variable.xml @@ -0,0 +1,9 @@ + + + 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..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_pressure.xml b/app/src/main/res/drawable/ic_pressure.xml new file mode 100644 index 0000000..a42367a --- /dev/null +++ b/app/src/main/res/drawable/ic_pressure.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_speed.xml b/app/src/main/res/drawable/ic_speed.xml new file mode 100644 index 0000000..e707853 --- /dev/null +++ b/app/src/main/res/drawable/ic_speed.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/load_sharing_ratio.png b/app/src/main/res/drawable/load_sharing_ratio.png new file mode 100644 index 0000000..3737b10 Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio.png differ diff --git a/app/src/main/res/drawable/load_sharing_ratio_.png b/app/src/main/res/drawable/load_sharing_ratio_.png new file mode 100644 index 0000000..8e0cb9a Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio_.png differ diff --git a/app/src/main/res/drawable/load_sharing_ratio_50.png b/app/src/main/res/drawable/load_sharing_ratio_50.png new file mode 100644 index 0000000..f436dd9 Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio_50.png differ diff --git a/app/src/main/res/drawable/load_sharing_ratio_50_.png b/app/src/main/res/drawable/load_sharing_ratio_50_.png new file mode 100644 index 0000000..f436dd9 Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio_50_.png differ diff --git a/app/src/main/res/drawable/load_sharing_ratio_50up.png b/app/src/main/res/drawable/load_sharing_ratio_50up.png new file mode 100644 index 0000000..d061755 Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio_50up.png differ diff --git a/app/src/main/res/drawable/load_sharing_ratio_50up_.png b/app/src/main/res/drawable/load_sharing_ratio_50up_.png new file mode 100644 index 0000000..c954775 Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio_50up_.png differ diff --git a/app/src/main/res/drawable/load_sharing_ratio_d50.png b/app/src/main/res/drawable/load_sharing_ratio_d50.png new file mode 100644 index 0000000..b70013a Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio_d50.png differ diff --git a/app/src/main/res/drawable/load_sharing_ratio_u50.png b/app/src/main/res/drawable/load_sharing_ratio_u50.png new file mode 100644 index 0000000..00d34f7 Binary files /dev/null and b/app/src/main/res/drawable/load_sharing_ratio_u50.png differ diff --git a/app/src/main/res/drawable/pngegg.png b/app/src/main/res/drawable/pngegg.png new file mode 100644 index 0000000..6b16483 Binary files /dev/null and b/app/src/main/res/drawable/pngegg.png differ diff --git a/app/src/main/res/drawable/pressure_arrow.png b/app/src/main/res/drawable/pressure_arrow.png new file mode 100644 index 0000000..b24684b Binary files /dev/null and b/app/src/main/res/drawable/pressure_arrow.png differ diff --git a/app/src/main/res/drawable/pressure_arrow1.png b/app/src/main/res/drawable/pressure_arrow1.png new file mode 100644 index 0000000..4e2f9ee Binary files /dev/null and b/app/src/main/res/drawable/pressure_arrow1.png differ diff --git a/app/src/main/res/drawable/pressure_arrow2.png b/app/src/main/res/drawable/pressure_arrow2.png new file mode 100644 index 0000000..dbbca71 Binary files /dev/null and b/app/src/main/res/drawable/pressure_arrow2.png differ diff --git a/app/src/main/res/drawable/pressure_arrow_.png b/app/src/main/res/drawable/pressure_arrow_.png new file mode 100644 index 0000000..205883c Binary files /dev/null and b/app/src/main/res/drawable/pressure_arrow_.png differ diff --git a/app/src/main/res/drawable/pressure_sensor.png b/app/src/main/res/drawable/pressure_sensor.png new file mode 100644 index 0000000..dcfe93f Binary files /dev/null and b/app/src/main/res/drawable/pressure_sensor.png differ diff --git a/app/src/main/res/drawable/pressure_sensor_gauge.png b/app/src/main/res/drawable/pressure_sensor_gauge.png new file mode 100644 index 0000000..f2fed2e Binary files /dev/null and b/app/src/main/res/drawable/pressure_sensor_gauge.png differ diff --git a/app/src/main/res/drawable/pressure_sensor_gauge1.png b/app/src/main/res/drawable/pressure_sensor_gauge1.png new file mode 100644 index 0000000..fb5d227 Binary files /dev/null and b/app/src/main/res/drawable/pressure_sensor_gauge1.png differ diff --git a/app/src/main/res/drawable/pressure_sensor_gauge5.PNG b/app/src/main/res/drawable/pressure_sensor_gauge5.PNG new file mode 100644 index 0000000..6970e5c Binary files /dev/null and b/app/src/main/res/drawable/pressure_sensor_gauge5.PNG differ diff --git a/app/src/main/res/drawable/pressure_sensor_gauge_.png b/app/src/main/res/drawable/pressure_sensor_gauge_.png new file mode 100644 index 0000000..1e88d35 Binary files /dev/null and b/app/src/main/res/drawable/pressure_sensor_gauge_.png differ diff --git a/app/src/main/res/drawable/speed_display.png b/app/src/main/res/drawable/speed_display.png new file mode 100644 index 0000000..19129d9 Binary files /dev/null and b/app/src/main/res/drawable/speed_display.png differ diff --git a/app/src/main/res/drawable/speed_display_1.png b/app/src/main/res/drawable/speed_display_1.png new file mode 100644 index 0000000..b01e091 Binary files /dev/null and b/app/src/main/res/drawable/speed_display_1.png differ diff --git a/app/src/main/res/drawable/tire_down.png b/app/src/main/res/drawable/tire_down.png new file mode 100644 index 0000000..8e3c177 Binary files /dev/null and b/app/src/main/res/drawable/tire_down.png differ diff --git a/app/src/main/res/drawable/tire_down1.png b/app/src/main/res/drawable/tire_down1.png new file mode 100644 index 0000000..f850a8b Binary files /dev/null and b/app/src/main/res/drawable/tire_down1.png differ diff --git a/app/src/main/res/drawable/tire_down1_.png b/app/src/main/res/drawable/tire_down1_.png new file mode 100644 index 0000000..49127db Binary files /dev/null and b/app/src/main/res/drawable/tire_down1_.png differ diff --git a/app/src/main/res/drawable/tire_down2.png b/app/src/main/res/drawable/tire_down2.png new file mode 100644 index 0000000..0e33bd8 Binary files /dev/null and b/app/src/main/res/drawable/tire_down2.png differ diff --git a/app/src/main/res/drawable/tire_down2_.png b/app/src/main/res/drawable/tire_down2_.png new file mode 100644 index 0000000..ed19dfc Binary files /dev/null and b/app/src/main/res/drawable/tire_down2_.png differ diff --git a/app/src/main/res/drawable/tire_down3.png b/app/src/main/res/drawable/tire_down3.png new file mode 100644 index 0000000..9412da2 Binary files /dev/null and b/app/src/main/res/drawable/tire_down3.png differ diff --git a/app/src/main/res/drawable/tire_down3_.png b/app/src/main/res/drawable/tire_down3_.png new file mode 100644 index 0000000..d0862fc Binary files /dev/null and b/app/src/main/res/drawable/tire_down3_.png differ diff --git a/app/src/main/res/drawable/tire_down_.PNG b/app/src/main/res/drawable/tire_down_.PNG new file mode 100644 index 0000000..823d431 Binary files /dev/null and b/app/src/main/res/drawable/tire_down_.PNG differ diff --git a/app/src/main/res/drawable/tire_up.png b/app/src/main/res/drawable/tire_up.png new file mode 100644 index 0000000..94c3db4 Binary files /dev/null and b/app/src/main/res/drawable/tire_up.png differ diff --git a/app/src/main/res/drawable/tire_up1.png b/app/src/main/res/drawable/tire_up1.png new file mode 100644 index 0000000..6838ec7 Binary files /dev/null and b/app/src/main/res/drawable/tire_up1.png differ diff --git a/app/src/main/res/drawable/tire_up1_.png b/app/src/main/res/drawable/tire_up1_.png new file mode 100644 index 0000000..db1f1b1 Binary files /dev/null and b/app/src/main/res/drawable/tire_up1_.png differ diff --git a/app/src/main/res/drawable/tire_up2.png b/app/src/main/res/drawable/tire_up2.png new file mode 100644 index 0000000..8751ddc Binary files /dev/null and b/app/src/main/res/drawable/tire_up2.png differ diff --git a/app/src/main/res/drawable/tire_up2_.png b/app/src/main/res/drawable/tire_up2_.png new file mode 100644 index 0000000..e688532 Binary files /dev/null and b/app/src/main/res/drawable/tire_up2_.png differ diff --git a/app/src/main/res/drawable/tire_up3.png b/app/src/main/res/drawable/tire_up3.png new file mode 100644 index 0000000..b583507 Binary files /dev/null and b/app/src/main/res/drawable/tire_up3.png differ diff --git a/app/src/main/res/drawable/tire_up3_.png b/app/src/main/res/drawable/tire_up3_.png new file mode 100644 index 0000000..8b04eeb Binary files /dev/null and b/app/src/main/res/drawable/tire_up3_.png differ diff --git a/app/src/main/res/drawable/tire_up_.png b/app/src/main/res/drawable/tire_up_.png new file mode 100644 index 0000000..00ca3d1 Binary files /dev/null and b/app/src/main/res/drawable/tire_up_.png differ diff --git a/app/src/main/res/drawable/variable_axle_load.png b/app/src/main/res/drawable/variable_axle_load.png new file mode 100644 index 0000000..c4afa18 Binary files /dev/null and b/app/src/main/res/drawable/variable_axle_load.png differ diff --git a/app/src/main/res/drawable/variable_axle_load_icon.png b/app/src/main/res/drawable/variable_axle_load_icon.png new file mode 100644 index 0000000..6941fe5 Binary files /dev/null and b/app/src/main/res/drawable/variable_axle_load_icon.png differ diff --git a/app/src/main/res/drawable/variable_axle_load_loading.png b/app/src/main/res/drawable/variable_axle_load_loading.png new file mode 100644 index 0000000..954d44e Binary files /dev/null and b/app/src/main/res/drawable/variable_axle_load_loading.png differ diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..3e9e349 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + VariableAxleMonitor + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..8c91b5c --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +