mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

message status icons approximately work - still a problem on first send though

pull/40/head
geeksville 2020-05-31 11:23:25 -07:00
rodzic 7506d712ff
commit 0b66d813ef
4 zmienionych plików z 83 dodań i 48 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
app/src/main/java/com/geeksville/mesh/MainActivity.kt
Wyświetl plik

@ -502,6 +502,7 @@ class MainActivity : AppCompatActivity(), Logging,
filter.addAction(MeshService.ACTION_MESH_CONNECTED)
filter.addAction(MeshService.ACTION_NODE_CHANGE)
filter.addAction(MeshService.ACTION_RECEIVED_DATA)
filter.addAction((MeshService.ACTION_MESSAGE_STATUS))
registerReceiver(meshServiceReceiver, filter)
receiverRegistered = true;
}

13
app/src/main/java/com/geeksville/mesh/model/MessagesState.kt
Wyświetl plik

@ -40,11 +40,14 @@ class MessagesState(private val ui: UIViewModel) : Logging {
val msgs = messages.value!!
msgs.find { it.id == id }?.let { p ->
if (p.status != status) {
p.status = status
// Trigger an expensive complete redraw FIXME
messages.value = msgs
}
// Note: it seems that the service is keeping only a reference to our original packet (so it has already updated p.status)
// This seems to be an AIDL optimization when both the service and the client are in the same process. But we still want to trigger
// a GUI update
// if (p.status != status) {
p.status = status
// Trigger an expensive complete redraw FIXME
messages.value = msgs
// }
}
}

110
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
Wyświetl plik

@ -36,7 +36,9 @@ import kotlinx.coroutines.*
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonConfiguration
import java.util.*
import java.util.concurrent.TimeUnit
import kotlin.math.absoluteValue
/**
@ -746,47 +748,54 @@ class MeshService : Service(), Logging {
/// Update our model and resend as needed for a MeshPacket we just received from the radio
private fun handleReceivedData(packet: MeshPacket) {
val data = packet.decoded.data
val bytes = data.payload.toByteArray()
val fromId = toNodeID(packet.from)
val dataPacket = toDataPacket(packet)
myNodeInfo?.let { myInfo ->
val data = packet.decoded.data
val bytes = data.payload.toByteArray()
val fromId = toNodeID(packet.from)
val dataPacket = toDataPacket(packet)
if (dataPacket != null) {
debug("Received data from $fromId ${bytes.size}")
if (dataPacket != null) {
dataPacket.status = MessageStatus.RECEIVED
rememberDataPacket(dataPacket)
if (myInfo.myNodeNum == packet.from)
debug("Ignoring retransmission of our packet ${bytes.size}")
else {
debug("Received data from $fromId ${bytes.size}")
when (data.typValue) {
MeshProtos.Data.Type.CLEAR_TEXT_VALUE -> {
debug("Received CLEAR_TEXT from $fromId")
dataPacket.status = MessageStatus.RECEIVED
rememberDataPacket(dataPacket)
recentReceivedText = dataPacket
updateNotification()
broadcastReceivedData(dataPacket)
}
when (data.typValue) {
MeshProtos.Data.Type.CLEAR_TEXT_VALUE -> {
debug("Received CLEAR_TEXT from $fromId")
MeshProtos.Data.Type.CLEAR_READACK_VALUE ->
warn(
"TODO ignoring CLEAR_READACK from $fromId"
recentReceivedText = dataPacket
updateNotification()
broadcastReceivedData(dataPacket)
}
MeshProtos.Data.Type.CLEAR_READACK_VALUE ->
warn(
"TODO ignoring CLEAR_READACK from $fromId"
)
MeshProtos.Data.Type.OPAQUE_VALUE ->
broadcastReceivedData(dataPacket)
else -> TODO()
}
GeeksvilleApplication.analytics.track(
"num_data_receive",
DataPair(1)
)
MeshProtos.Data.Type.OPAQUE_VALUE ->
broadcastReceivedData(dataPacket)
else -> TODO()
GeeksvilleApplication.analytics.track(
"data_receive",
DataPair("num_bytes", bytes.size),
DataPair("type", data.typValue)
)
}
}
GeeksvilleApplication.analytics.track(
"num_data_receive",
DataPair(1)
)
GeeksvilleApplication.analytics.track(
"data_receive",
DataPair("num_bytes", bytes.size),
DataPair("type", data.typValue)
)
}
}
@ -916,7 +925,6 @@ class MeshService : Service(), Logging {
radioConfig = MeshProtos.RadioConfig.parseFrom(connectedRadio.readRadioConfig())
// Ask for the current node DB
connectedRadio.restartNodeInfo()
@ -933,6 +941,9 @@ class MeshService : Service(), Logging {
haveNodeDB = true // we've done our initial node db initialization
processEarlyPackets() // handle any packets that showed up while we were booting
// broadcast an intent with our new connection state
broadcastConnection()
reportConnection() // this is just analytics
onNodeDBChanged()
}
@ -1015,6 +1026,9 @@ class MeshService : Service(), Logging {
debug("device sleep timeout cancelled")
}
}
// broadcast an intent with our new connection state
broadcastConnection()
}
fun startDisconnect() {
@ -1027,6 +1041,9 @@ class MeshService : Service(), Logging {
DataPair("num_online", numOnlineNodes)
)
GeeksvilleApplication.analytics.track("num_nodes", DataPair(numNodes))
// broadcast an intent with our new connection state
broadcastConnection()
}
fun startConnect() {
@ -1038,7 +1055,6 @@ class MeshService : Service(), Logging {
else
startConfig()
reportConnection()
} catch (ex: InvalidProtocolBufferException) {
errormsg(
"Invalid protocol buffer sent by device - update device software and try again",
@ -1073,16 +1089,20 @@ class MeshService : Service(), Logging {
startDisconnect()
}
// broadcast an intent with our new connection state
// Update the android notification in the status bar
updateNotification()
}
/**
* broadcast our current connection status
*/
private fun broadcastConnection() {
val intent = Intent(ACTION_MESH_CONNECTED)
intent.putExtra(
EXTRA_CONNECTED,
connectionState.toString()
)
explicitBroadcast(intent)
// Update the android notification in the status bar
updateNotification()
}
/**
@ -1252,6 +1272,9 @@ class MeshService : Service(), Logging {
haveNodeDB = true // we now have nodes from real hardware
processEarlyPackets() // send receive any packets that were queued up
// broadcast an intent with our new connection state
broadcastConnection()
onNodeDBChanged()
reportConnection()
}
@ -1367,8 +1390,15 @@ class MeshService : Service(), Logging {
if (currentPacketId == 0L) {
logAssert(it.packetIdBits == 8 || it.packetIdBits == 32) // Only values I'm expecting (though we don't require this)
val devicePacketId = if (it.currentPacketId == 0L) {
// Old devices don't send their current packet ID, in that case just pick something random and it will probably be fine ;-)
val random = Random(System.currentTimeMillis())
random.nextLong().absoluteValue
} else
it.currentPacketId
// Not inited - pick a number on the opposite side of what the device is using
currentPacketId = it.currentPacketId + numPacketIds / 2
currentPacketId = devicePacketId + numPacketIds / 2
} else {
currentPacketId++
}

7
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
Wyświetl plik

@ -151,12 +151,13 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
private var messages = arrayOf<DataPacket>()
/// Called when our node DB changes
fun onMessagesChanged(nodesIn: Collection<DataPacket>) {
messages = nodesIn.toTypedArray()
fun onMessagesChanged(msgIn: Collection<DataPacket>) {
messages = msgIn.toTypedArray()
notifyDataSetChanged() // FIXME, this is super expensive and redraws all messages
// scroll to the last line
messageListView.scrollToPosition(this.itemCount - 1)
if (itemCount != 0)
messageListView.scrollToPosition(itemCount - 1)
}
}