Compare commits

...

2 Commits

6 changed files with 105 additions and 23 deletions

View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:allowBackup="true"

View File

@@ -52,6 +52,9 @@ interface MaintenanceDao {
@Query("DELETE FROM maintenance_activities")
suspend fun clearAllActivities()
@androidx.room.Delete
suspend fun deleteActivities(activities: List<MaintenanceActivity>)
@Query("DELETE FROM os_update_history")
suspend fun clearAllHistory()

View File

@@ -21,6 +21,10 @@ class MaintenanceRepository(
) {
private val sheetsSyncService = com.example.data.remote.GoogleSheetsSyncService(context)
private val networkMonitor = com.example.util.NetworkMonitor(context)
val isNetworkConnected: Flow<Boolean> = networkMonitor.isConnected
fun isCurrentlyConnected(): Boolean = networkMonitor.isCurrentlyConnected()
val allActivities: Flow<List<MaintenanceActivity>> = dao.getAllActivities()
@@ -34,6 +38,10 @@ class MaintenanceRepository(
dao.getUserAccess(email)
}
suspend fun getUnsyncedActivities(): List<MaintenanceActivity> = withContext(Dispatchers.IO) {
dao.getUnsyncedActivities()
}
/**
* Updates progress of an OS, auto-generates a history record, and marks as unsynced (offline-first).
*/
@@ -250,10 +258,15 @@ class MaintenanceRepository(
}
}
// 7. Save updated OS activities to local Room DB
// 7. Save updated OS activities to local Room DB incrementally (preserves UI list state)
if (reconciledActivities.isNotEmpty()) {
dao.clearAllActivities() // Clear old ones since project sheet is the unique source of truth
dao.insertActivities(reconciledActivities)
val remoteOsSet = reconciledActivities.map { it.numeroOs }.toSet()
val localActivities = dao.getAllActivitiesList()
val staleActivities = localActivities.filter { it.numeroOs !in remoteOsSet }
if (staleActivities.isNotEmpty()) {
dao.deleteActivities(staleActivities)
}
android.util.Log.d("MaintenanceRepository", "Reconciled and saved ${reconciledActivities.size} OS activities from Google Sheet.")
}

View File

@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
@@ -102,6 +103,8 @@ fun MaintenanceDashboardScreen(
var showProfileDropdown by remember { mutableStateOf(false) }
var showAdvancedFilters by remember { mutableStateOf(false) }
val listState = rememberLazyListState()
val pendingCount = remember(allActivities) {
allActivities.count { it.status != ActivityStatus.CONCLUIDO }
}
@@ -562,6 +565,7 @@ fun MaintenanceDashboardScreen(
}
} else {
LazyColumn(
state = listState,
modifier = Modifier
.weight(1f)
.fillMaxWidth(),

View File

@@ -192,6 +192,7 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
)
// Reactive Flow for the current activity's edit history
@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
val selectedActivityHistory: StateFlow<List<OSUpdateHistory>> = _selectedActivity
.flatMapLatest { activity ->
if (activity != null) {
@@ -212,26 +213,20 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
savedUser?.let {
checkUserAccessLevel(it.email)
}
// Automatically check and pull service orders from Sheets on first launch.
// Monitor network state and trigger auto-sync on connection or when pending items exist
viewModelScope.launch {
val currentList = repository.allActivities.first()
if (currentList.isEmpty()) {
_internetAvailable.value = true
_isSyncing.value = true
_syncStatusMessage.value = "Conectando ao servidor Cargill para baixar ordens de serviço..."
when (val result = repository.synchronizeWithBackend()) {
is SyncResult.Success -> {
_syncStatusMessage.value = "Sincronização inicial concluída! ${result.syncedItems} OSs sincronizadas."
_currentUser.value?.let { user ->
checkUserAccessLevel(user.email)
}
}
is SyncResult.Error -> {
_syncStatusMessage.value = "Falha na sincronização inicial: ${result.message}"
var isFirstEmission = true
repository.isNetworkConnected.collect { isConnected ->
_internetAvailable.value = isConnected
if (isConnected) {
val pending = repository.getUnsyncedActivities()
val currentList = repository.allActivities.first()
if (pending.isNotEmpty() || currentList.isEmpty() || !isFirstEmission) {
syncNow()
}
}
_isSyncing.value = false
isFirstEmission = false
}
}
}
@@ -269,8 +264,7 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
}
fun toggleInternet(available: Boolean) {
// App is always online.
_internetAvailable.value = true
_internetAvailable.value = available
}
fun clearMessages() {
@@ -287,14 +281,15 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
val result = repository.importCsvFromUri(context, uri)
result.onSuccess { count ->
_importStatusMessage.value = "Sucesso: $count ordens de serviço importadas/atualizadas!"
if (_internetAvailable.value) {
syncNow()
}
}.onFailure { error ->
_importStatusMessage.value = "Erro na importação: ${error.localizedMessage}"
}
}
}
/**
* Performs synchronized check.
*/
@@ -303,6 +298,9 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
_syncStatusMessage.value = "Sincronização impossível: Sem conectividade de rede na área atual."
return
}
if (_isSyncing.value) {
return
}
viewModelScope.launch {
_isSyncing.value = true
@@ -374,6 +372,10 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
_selectedActivity.value = updatedList.find { it.numeroOs == numeroOs }
}
}
// Auto-trigger sync attempt if internet is available
if (_internetAvailable.value) {
syncNow()
}
}
}

View File

@@ -0,0 +1,59 @@
package com.example.util
import android.content.Context
import android.net.ConnectivityManager
import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkRequest
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.distinctUntilChanged
class NetworkMonitor(context: Context) {
private val connectivityManager =
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val isConnected: Flow<Boolean> = callbackFlow {
val callback = object : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) {
trySend(true)
}
override fun onLost(network: Network) {
trySend(isCurrentlyConnected())
}
override fun onUnavailable() {
trySend(false)
}
}
// Send initial state immediately
trySend(isCurrentlyConnected())
val request = NetworkRequest.Builder()
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.build()
try {
connectivityManager.registerNetworkCallback(request, callback)
} catch (e: Exception) {
trySend(isCurrentlyConnected())
}
awaitClose {
try {
connectivityManager.unregisterNetworkCallback(callback)
} catch (e: Exception) {
// Ignore if unregister fails on teardown
}
}
}.distinctUntilChanged()
fun isCurrentlyConnected(): Boolean {
val activeNetwork = connectivityManager.activeNetwork ?: return false
val capabilities = connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
}
}