From 7b8e897e8a654d8a0214dafd72bc2a8fa736e45b Mon Sep 17 00:00:00 2001
From: ua1zbe <ua1zbe@yandex.ru>
Date: Wed, 19 Aug 2026 08:57:39 +0300
Subject: [PATCH] =?UTF-8?q?RX-=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20(=D0=BF=D0=BE=D1=82=D0=B5=D1=80=D0=B8/?=
 =?UTF-8?q?=D0=B4=D0=B6=D0=B8=D1=82=D1=82=D0=B5=D1=80)=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE=D0=BC=20=D1=8D=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5,=20=D0=B3=D0=B0=D0=BB=D0=BE=D1=87=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D1=81=D0=BA=D1=80=D1=8B=D1=82=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/ua1zbe/svxremote/AudioSettingsActivity.kt |  5 +++++
 app/src/main/java/ru/ua1zbe/svxremote/MainActivity.kt | 11 +++++++++++
 app/src/main/java/ru/ua1zbe/svxremote/SvxService.kt   |  6 +++++-
 .../main/java/ru/ua1zbe/svxremote/audio/OpusEngine.kt |  4 +++-
 app/src/main/java/ru/ua1zbe/svxremote/prefs/Prefs.kt  |  8 ++++++++
 app/src/main/res/layout/activity_audio_settings.xml   |  9 +++++++++
 app/src/main/res/layout/activity_main.xml             | 11 +++++++++++
 app/src/main/res/values/strings.xml                   |  2 ++
 8 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ru/ua1zbe/svxremote/AudioSettingsActivity.kt b/app/src/main/java/ru/ua1zbe/svxremote/AudioSettingsActivity.kt
index 2c2f662..a5b3b02 100644
--- a/app/src/main/java/ru/ua1zbe/svxremote/AudioSettingsActivity.kt
+++ b/app/src/main/java/ru/ua1zbe/svxremote/AudioSettingsActivity.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.os.Bundle
 import android.widget.ArrayAdapter
 import android.widget.Button
+import android.widget.CheckBox
 import android.widget.SeekBar
 import android.widget.Spinner
 import android.widget.TextView
@@ -78,11 +79,15 @@ class AudioSettingsActivity : Activity() {
         seekRxBuffer.setOnSeekBarChangeListener(listener)
         seekJitter.setOnSeekBarChangeListener(listener)
 
+        val chkRxStats = findViewById<CheckBox>(R.id.chk_rx_stats)
+        chkRxStats.isChecked = Prefs.rxStatsEnabled(this)
+
         findViewById<Button>(R.id.btn_audio_save).setOnClickListener {
             Prefs.setMicGain(this, 1.0f + seekMicGain.progress * 0.1f)
             Prefs.setRxBufferMs(this, 100 + seekRxBuffer.progress * 20)
             Prefs.setRxJitterMs(this, seekJitter.progress * 20)
             Prefs.setTxBitrateKbps(this, bitrates[spinBitrate.selectedItemPosition])
+            Prefs.setRxStatsEnabled(this, chkRxStats.isChecked)
             Toast.makeText(this, getString(R.string.saved), Toast.LENGTH_SHORT).show()
             finish()
         }
diff --git a/app/src/main/java/ru/ua1zbe/svxremote/MainActivity.kt b/app/src/main/java/ru/ua1zbe/svxremote/MainActivity.kt
index 12e8b23..48fc57e 100644
--- a/app/src/main/java/ru/ua1zbe/svxremote/MainActivity.kt
+++ b/app/src/main/java/ru/ua1zbe/svxremote/MainActivity.kt
@@ -62,6 +62,7 @@ class MainActivity : Activity(), SvxService.Listener {
     private lateinit var connectZone: View
     private lateinit var rxMeter: SMeterView
     private lateinit var micMeter: SMeterView
+    private lateinit var lblRxStats: TextView
     private lateinit var pttButton: PttButton
     private lateinit var btnSettings: ImageButton
     private lateinit var btnMonitor: ImageButton
@@ -142,6 +143,8 @@ class MainActivity : Activity(), SvxService.Listener {
         rxMeter = findViewById(R.id.rx_meter)
         micMeter = findViewById(R.id.mic_meter)
         micMeter.setColor(0xFFF85149.toInt())
+        lblRxStats = findViewById(R.id.lbl_rx_stats)
+        lblRxStats.visibility = if (Prefs.rxStatsEnabled(this)) View.VISIBLE else View.GONE
         pttButton = findViewById(R.id.ptt_button)
         btnSettings = findViewById(R.id.btn_settings)
         btnMonitor = findViewById(R.id.btn_monitor)
@@ -498,6 +501,14 @@ class MainActivity : Activity(), SvxService.Listener {
         }
     }
 
+    override fun onRxStats(lossPct: Double, jitterMs: Double) {
+        mainHandler.post {
+            if (!Prefs.rxStatsEnabled(this)) return@post
+            lblRxStats.visibility = View.VISIBLE
+            lblRxStats.text = getString(R.string.rx_stats_fmt, lossPct, jitterMs.toInt())
+        }
+    }
+
     /** Сбросить таймер молчания: группа жива — продолжаем её слушать. */
     private fun resetMonitorIdle() {
         monitorIdleTask?.let { mainHandler.removeCallbacks(it) }
diff --git a/app/src/main/java/ru/ua1zbe/svxremote/SvxService.kt b/app/src/main/java/ru/ua1zbe/svxremote/SvxService.kt
index 13789fb..6c56a5b 100644
--- a/app/src/main/java/ru/ua1zbe/svxremote/SvxService.kt
+++ b/app/src/main/java/ru/ua1zbe/svxremote/SvxService.kt
@@ -31,12 +31,16 @@ class SvxService : Service(), ReflectorClient.Callbacks {
         fun onAudioFlush()
         fun onError(detail: String)
         fun onLevel(source: Int, level: Float)
+        fun onRxStats(lossPct: Double, jitterMs: Double)
     }
 
     var listener: Listener? = null
 
     private val engine by lazy {
-        OpusEngine { source, level -> listener?.onLevel(source, level) }
+        OpusEngine(
+            onLevel = { source, level -> listener?.onLevel(source, level) },
+            onRxStats = { lossPct, jitterMs -> listener?.onRxStats(lossPct, jitterMs) }
+        )
     }
     val client: ReflectorClient by lazy { ReflectorClient(this) }
 
diff --git a/app/src/main/java/ru/ua1zbe/svxremote/audio/OpusEngine.kt b/app/src/main/java/ru/ua1zbe/svxremote/audio/OpusEngine.kt
index 4203a44..8f9c5ae 100644
--- a/app/src/main/java/ru/ua1zbe/svxremote/audio/OpusEngine.kt
+++ b/app/src/main/java/ru/ua1zbe/svxremote/audio/OpusEngine.kt
@@ -20,7 +20,8 @@ import kotlin.math.log10
  * SVXLink: моно, 8 кГц, 16 бит PCM, кадры 20 мс. Поток уровня сигнала 0..1.
  */
 class OpusEngine(
-    private val onLevel: (source: Int, level: Float) -> Unit
+    private val onLevel: (source: Int, level: Float) -> Unit,
+    private val onRxStats: ((lossPct: Double, jitterMs: Double) -> Unit)? = null
 ) {
 
     companion object {
@@ -370,6 +371,7 @@ class OpusEngine(
         jitterAccum = 0.0
         jitterN = 0
         lastEvalTime = now
+        onRxStats?.invoke(lossPct, jitterMs)
     }
 
     /** Джиттер-гейт открыт: накопили кадры или вышло 300 мс с первого пакета. */
diff --git a/app/src/main/java/ru/ua1zbe/svxremote/prefs/Prefs.kt b/app/src/main/java/ru/ua1zbe/svxremote/prefs/Prefs.kt
index 80e6726..57ce7f5 100644
--- a/app/src/main/java/ru/ua1zbe/svxremote/prefs/Prefs.kt
+++ b/app/src/main/java/ru/ua1zbe/svxremote/prefs/Prefs.kt
@@ -170,4 +170,12 @@ object Prefs {
     fun setTxBitrateKbps(context: Context, kbps: Int) {
         sp(context).edit().putInt("tx_bitrate_kbps", kbps.coerceIn(0, 32)).apply()
     }
+
+    /** Показывать строку статистики приёма (потери/джиттер) на главном экране. */
+    fun rxStatsEnabled(context: Context): Boolean =
+        sp(context).getBoolean("rx_stats_enabled", false)
+
+    fun setRxStatsEnabled(context: Context, enabled: Boolean) {
+        sp(context).edit().putBoolean("rx_stats_enabled", enabled).apply()
+    }
 }
diff --git a/app/src/main/res/layout/activity_audio_settings.xml b/app/src/main/res/layout/activity_audio_settings.xml
index 90de46e..241d704 100644
--- a/app/src/main/res/layout/activity_audio_settings.xml
+++ b/app/src/main/res/layout/activity_audio_settings.xml
@@ -135,6 +135,15 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp" />
 
+        <CheckBox
+            android:id="@+id/chk_rx_stats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:text="@string/audio_rx_stats"
+            android:textColor="@color/text_primary"
+            android:textSize="15sp" />
+
         <Button
             android:id="@+id/btn_audio_save"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a02dc39..c5c951b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -181,6 +181,17 @@
                 android:layout_height="52dp"
                 android:layout_weight="1" />
         </LinearLayout>
+
+        <!-- Статистика приёма (скрытые настройки, по умолчанию выключено) -->
+        <TextView
+            android:id="@+id/lbl_rx_stats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:textColor="@color/text_secondary"
+            android:textSize="13sp"
+            android:visibility="gone" />
     </LinearLayout>
 
     <!-- Последний говоривший -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2da9e90..753f606 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,8 @@
     <string name="audio_tx_bitrate">Скорость передачи (Opus)</string>
     <string name="audio_tx_bitrate_auto">Авто</string>
     <string name="audio_tx_bitrate_fmt">%1$d кбит/с</string>
+    <string name="audio_rx_stats">Показывать статистику приёма (потери/джиттер)</string>
+    <string name="rx_stats_fmt">RX: потери %1$.1f%%, джиттер %2$d мс</string>
     <string name="toast_node_joined">Подключился: %1$s%2$s</string>
     <string name="toast_node_left">Отключился: %1$s%2$s</string>
     <string name="node_tg_suffix"> (группа %1$d)</string>