chatgui: verify FFmpeg DLL deployment + fix dependency resolution order
This commit is contained in:
1 parent
9d4538935d
commit
01987a75d0
5 files changed
+52
-14
No files matched your search
+2
-2
@@ -392,12 +392,12 @@ private fun MemberDetailCard(
|
||||
fontSize = 13.sp, color = Color.DarkGray)
|
||||
}
|
||||
}
|
||||
if (detail.bgpPresence) {
|
||||
if (detail.bgpPresence && detail.bgpNodes > 0) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(Modifier.size(8.dp).clip(CircleShape).background(Color(0xFF4CAF50)))
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text("BGP: ${detail.bgpNodes} nodes" +
|
||||
(if (detail.bestRtt > 0) " ${detail.bestRtt}ms" else ""),
|
||||
(if (detail.bestRtt > 0) " ${detail.bestRtt / 10}ms" else ""),
|
||||
fontSize = 13.sp, color = Color.DarkGray)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -345,7 +345,7 @@ class ChatViewModel : ViewModel() {
|
||||
4 -> { if (repo != null) { LogManager.addLog("INFO", "VM", "CHANNEL_UPDATED — refreshChannels"); refreshChannels() } else { LogManager.addLog("WARN", "VM", "CHANNEL_UPDATED skipped — repo is NULL") } }
|
||||
12 -> LogManager.addLog("INFO", "VM", "service started")
|
||||
13 -> LogManager.addLog("INFO", "VM", "service stopped")
|
||||
16 -> { /* NODEINFO_UPDATED: [node_id:8][presence:1][up:1][best_rtt:2] */
|
||||
16 -> { /* NODEINFO_UPDATED: [node_id:8][presence:1][up:1][best_rtt:2][bgp_rtt:2][bgp_nodes:2] */
|
||||
if (data == null || data.size < 12) return
|
||||
val ns = parseNodeStatus(data) ?: return
|
||||
_nodeStatuses.value = _nodeStatuses.value + (ns.nodeId to ns)
|
||||
|
||||
@@ -168,14 +168,19 @@ static void nodeinfo_event_cb(struct TOPO_GROUP* group, struct TOPO_GROUP_NODE*
|
||||
(void)group; (void)arg;
|
||||
if (!nq || !g_event_handler) return;
|
||||
uint16_t best_rtt = topo_get_chain_rtt(nq);
|
||||
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "nodeinfo_cb: nid=%016llx pres=%02x up=%02x rtt=%u(0x%04X) paths=%zu",
|
||||
uint8_t hc = 0;
|
||||
topo_node_best_hop_list(nq, &hc, NULL);
|
||||
uint16_t bgp_nodes = (hc > 0) ? (uint16_t)(hc - 1) : 0;
|
||||
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "nodeinfo_cb: nid=%016llx pres=%02x up=%02x rtt=%u(0x%04X) hc=%u bgp_nodes=%u paths=%zu",
|
||||
(unsigned long long)nq->node_id, nq->conn_presence, nq->conn_up,
|
||||
best_rtt, best_rtt, nq->paths ? queue_entry_count(nq->paths) : 0);
|
||||
uint8_t data[12];
|
||||
best_rtt, best_rtt, hc, bgp_nodes, nq->paths ? queue_entry_count(nq->paths) : 0);
|
||||
uint8_t data[16];
|
||||
memcpy(data, &nq->node_id, 8);
|
||||
data[8] = nq->conn_presence;
|
||||
data[9] = nq->conn_up;
|
||||
memcpy(data + 10, &best_rtt, 2);
|
||||
memcpy(data + 12, &best_rtt, 2);
|
||||
memcpy(data + 14, &bgp_nodes, 2);
|
||||
g_event_handler(CHAT_EVT_NODEINFO_UPDATED, data, sizeof(data));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user