pi/babyphone
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

added retries and fixxed status update

Browse Source
This commit is contained in:
pi
2025-11-11 01:39:35 +01:00
parent 62f44a1654
commit 130906a6b0
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/com/example/childmonitor_multiple/ListenService.kt
View File

@@ -95,9 +95,9 @@ class ListenService : Service() {
get() = this@ListenService get() = this@ListenService
} }
private fun buildNotification(name: String?): Notification { private fun buildNotification(name: String?, status: String = getString(R.string.listening)): Notification {
// In this sample, we'll use the same text for the ticker and the expanded notification // In this sample, we'll use the same text for the ticker and the expanded notification
val text = getText(R.string.listening) val text = status
val contentIntent = PendingIntent.getActivity( val contentIntent = PendingIntent.getActivity(
this, 0, this, 0,
Intent(this, ListenActivity::class.java), Intent(this, ListenActivity::class.java),
@@ -151,6 +151,7 @@ class ListenService : Service() {
if (!connected) { if (!connected) {
Log.e(TAG, "Failed to connect after 3 attempts.") Log.e(TAG, "Failed to connect after 3 attempts.")
playAlert() playAlert()
updateNotification(getString(R.string.disconnected))
onError?.invoke() onError?.invoke()
} else { } else {
Log.i(TAG, "Connection established successfully.") Log.i(TAG, "Connection established successfully.")
@@ -205,6 +206,9 @@ class ListenService : Service() {
true true
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Connection lost during streaming", e) Log.e(TAG, "Connection lost during streaming", e)
updateNotification(getString(R.string.disconnected))
playAlert()
onError?.invoke()
false false
} finally { } finally {
try { try {
@@ -215,6 +219,11 @@ class ListenService : Service() {
} }
} }
private fun updateNotification(status: String) {
val n = buildNotification(childDeviceName, status)
notificationManager.notify(ID, n)
}
private fun playAlert() { private fun playAlert() {
val mp = MediaPlayer.create(this, R.raw.upward_beep_chromatic_fifths) val mp = MediaPlayer.create(this, R.raw.upward_beep_chromatic_fifths)
if (mp != null) { if (mp != null) {

23
app/src/main/res/layout/activity_discover_address.xml
View File

@@ -8,7 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.example.childmonitor_multiple.MonitorActivity" > tools:context="com.example.childmonitor_multiple.MonitorActivity">
<TextView <TextView
android:id="@+id/parentDeviceTitle" android:id="@+id/parentDeviceTitle"
@@ -67,7 +67,26 @@
android:inputType="number" android:inputType="number"
android:maxLength="5" android:maxLength="5"
android:hint="@string/examplePort" android:hint="@string/examplePort"
android:nextFocusForward="@+id/connectViaAddressButton"/> android:nextFocusForward="@+id/retryField" />
<TextView
android:id="@+id/retryTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="Retry attempts" />
<EditText
android:id="@+id/retryField"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="20sp"
android:ems="10"
android:inputType="number"
android:maxLength="2"
android:text="3"
android:hint="Default: 3"
android:nextFocusForward="@+id/connectViaAddressButton" />
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"