From c75722426932850cb72d5f72d1a988e7fac74794 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Fri, 6 Jun 2025 20:43:32 +0000 Subject: [PATCH] feat: add MeshServiceExample project to repo (#2038) Co-authored-by: niccellular <79813408+niccellular@users.noreply.github.com> --- .gitmodules | 5 +- .../detekt-baseline-meshserviceexample.xml | 102 ++++++ gradle/libs.versions.toml | 1 + mesh_service_example/.gitignore | 1 + mesh_service_example/build.gradle.kts | 103 ++++++ mesh_service_example/proguard-rules.pro | 21 ++ .../ExampleInstrumentedTest.java | 26 ++ .../src/main/AndroidManifest.xml | 32 ++ .../com/geeksville/mesh/IMeshService.aidl | 171 +++++++++ .../java/com/geeksville/mesh/DataPacket.kt | 216 ++++++++++++ .../java/com/geeksville/mesh/MyNodeInfo.kt | 43 +++ .../main/java/com/geeksville/mesh/NodeInfo.kt | 241 +++++++++++++ .../com/geeksville/mesh/util/Extensions.kt | 75 ++++ .../com/geeksville/mesh/util/LocationUtils.kt | 327 ++++++++++++++++++ .../meshserviceexample/MainActivity.java | 184 ++++++++++ mesh_service_example/src/main/proto | 1 + .../res/drawable/ic_launcher_background.xml | 170 +++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++ .../src/main/res/layout/activity_main.xml | 40 +++ .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../src/main/res/values-night/themes.xml | 7 + .../src/main/res/values/colors.xml | 5 + .../src/main/res/values/strings.xml | 3 + .../src/main/res/values/themes.xml | 9 + .../src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../meshserviceexample/ExampleUnitTest.java | 17 + settings.gradle.kts | 2 +- 39 files changed, 1874 insertions(+), 2 deletions(-) create mode 100644 config/detekt/detekt-baseline-meshserviceexample.xml create mode 100644 mesh_service_example/.gitignore create mode 100644 mesh_service_example/build.gradle.kts create mode 100644 mesh_service_example/proguard-rules.pro create mode 100644 mesh_service_example/src/androidTest/java/com/meshtastic/android/meshserviceexample/ExampleInstrumentedTest.java create mode 100644 mesh_service_example/src/main/AndroidManifest.xml create mode 100644 mesh_service_example/src/main/aidl/com/geeksville/mesh/IMeshService.aidl create mode 100644 mesh_service_example/src/main/java/com/geeksville/mesh/DataPacket.kt create mode 100644 mesh_service_example/src/main/java/com/geeksville/mesh/MyNodeInfo.kt create mode 100644 mesh_service_example/src/main/java/com/geeksville/mesh/NodeInfo.kt create mode 100644 mesh_service_example/src/main/java/com/geeksville/mesh/util/Extensions.kt create mode 100644 mesh_service_example/src/main/java/com/geeksville/mesh/util/LocationUtils.kt create mode 100644 mesh_service_example/src/main/java/com/meshtastic/android/meshserviceexample/MainActivity.java create mode 160000 mesh_service_example/src/main/proto create mode 100644 mesh_service_example/src/main/res/drawable/ic_launcher_background.xml create mode 100644 mesh_service_example/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 mesh_service_example/src/main/res/layout/activity_main.xml create mode 100644 mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 mesh_service_example/src/main/res/values-night/themes.xml create mode 100644 mesh_service_example/src/main/res/values/colors.xml create mode 100644 mesh_service_example/src/main/res/values/strings.xml create mode 100644 mesh_service_example/src/main/res/values/themes.xml create mode 100644 mesh_service_example/src/main/res/xml/backup_rules.xml create mode 100644 mesh_service_example/src/main/res/xml/data_extraction_rules.xml create mode 100644 mesh_service_example/src/test/java/com/meshtastic/android/meshserviceexample/ExampleUnitTest.java diff --git a/.gitmodules b/.gitmodules index 5b0a38e1e..8ce701868 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,9 @@ -[submodule "app/src/main/proto"] +[submodule "app proto submodule"] path = app/src/main/proto url = https://github.com/meshtastic/protobufs.git +[submodule "mesh_service_example proto submodule"] + path = mesh_service_example/src/main/proto + url = https://github.com/meshtastic/protobufs.git [submodule "design"] path = design url = https://github.com/meshtastic/design.git diff --git a/config/detekt/detekt-baseline-meshserviceexample.xml b/config/detekt/detekt-baseline-meshserviceexample.xml new file mode 100644 index 000000000..b577057f4 --- /dev/null +++ b/config/detekt/detekt-baseline-meshserviceexample.xml @@ -0,0 +1,102 @@ + + + + + + + CommentSpacing:NodeInfo.kt$NodeInfo$/// @return a nice human readable string for the distance, or null for unknown + CommentSpacing:NodeInfo.kt$NodeInfo$/// @return bearing to the other position in degrees + CommentSpacing:NodeInfo.kt$NodeInfo$/// @return distance in meters to some other node (or null if unknown) + CommentSpacing:NodeInfo.kt$NodeInfo$/// return the position if it is valid, else null + CommentSpacing:NodeInfo.kt$Position$/// @return bearing to the other position in degrees + CommentSpacing:NodeInfo.kt$Position$/// @return distance in meters to some other node (or null if unknown) + CommentSpacing:NodeInfo.kt$Position.Companion$/// Convert to a double representation of degrees + FinalNewline:DataPacket.kt$com.geeksville.mesh.DataPacket.kt + FinalNewline:MyNodeInfo.kt$com.geeksville.mesh.MyNodeInfo.kt + FinalNewline:NodeInfo.kt$com.geeksville.mesh.NodeInfo.kt + FunctionParameterNaming:LocationUtils.kt$_degIn: Double + FunctionParameterNaming:LocationUtils.kt$lat_a: Double + FunctionParameterNaming:LocationUtils.kt$lat_b: Double + FunctionParameterNaming:LocationUtils.kt$lng_a: Double + FunctionParameterNaming:LocationUtils.kt$lng_b: Double + ImplicitDefaultLocale:LocationUtils.kt$GPSFormat$String.format( "%s%s %.6s %.7s", UTM.zone, UTM.toMGRS().band, UTM.easting, UTM.northing ) + ImplicitDefaultLocale:LocationUtils.kt$GPSFormat$String.format( "%s%s %s%s %05d %05d", MGRS.zone, MGRS.band, MGRS.column, MGRS.row, MGRS.easting, MGRS.northing ) + ImplicitDefaultLocale:LocationUtils.kt$GPSFormat$String.format("%.5f %.5f", p.latitude, p.longitude) + ImplicitDefaultLocale:LocationUtils.kt$GPSFormat$String.format("%s°%s'%.5s\"%s", a[0], a[1], a[2], a[3]) + ImplicitDefaultLocale:NodeInfo.kt$NodeInfo$String.format("%d%%", batteryLevel) + MagicNumber:DataPacket.kt$DataPacket.CREATOR$16 + MagicNumber:Extensions.kt$1000 + MagicNumber:Extensions.kt$1440000 + MagicNumber:Extensions.kt$24 + MagicNumber:Extensions.kt$2880 + MagicNumber:Extensions.kt$60 + MagicNumber:LocationUtils.kt$0.8 + MagicNumber:LocationUtils.kt$110540 + MagicNumber:LocationUtils.kt$111320 + MagicNumber:LocationUtils.kt$180 + MagicNumber:LocationUtils.kt$1e-7 + MagicNumber:LocationUtils.kt$360 + MagicNumber:LocationUtils.kt$360.0 + MagicNumber:LocationUtils.kt$3600.0 + MagicNumber:LocationUtils.kt$60 + MagicNumber:LocationUtils.kt$60.0 + MagicNumber:LocationUtils.kt$6366000 + MagicNumber:LocationUtils.kt$GPSFormat$3 + MagicNumber:NodeInfo.kt$DeviceMetrics.Companion$1000 + MagicNumber:NodeInfo.kt$EnvironmentMetrics.Companion$1000 + MagicNumber:NodeInfo.kt$NodeInfo$0.114 + MagicNumber:NodeInfo.kt$NodeInfo$0.299 + MagicNumber:NodeInfo.kt$NodeInfo$0.587 + MagicNumber:NodeInfo.kt$NodeInfo$0x0000FF + MagicNumber:NodeInfo.kt$NodeInfo$0x00FF00 + MagicNumber:NodeInfo.kt$NodeInfo$0xFF0000 + MagicNumber:NodeInfo.kt$NodeInfo$1000 + MagicNumber:NodeInfo.kt$NodeInfo$1000.0 + MagicNumber:NodeInfo.kt$NodeInfo$15 + MagicNumber:NodeInfo.kt$NodeInfo$16 + MagicNumber:NodeInfo.kt$NodeInfo$1609 + MagicNumber:NodeInfo.kt$NodeInfo$1609.34 + MagicNumber:NodeInfo.kt$NodeInfo$255 + MagicNumber:NodeInfo.kt$NodeInfo$3.281 + MagicNumber:NodeInfo.kt$NodeInfo$60 + MagicNumber:NodeInfo.kt$NodeInfo$8 + MagicNumber:NodeInfo.kt$Position$180 + MagicNumber:NodeInfo.kt$Position$90 + MagicNumber:NodeInfo.kt$Position$90.0 + MagicNumber:NodeInfo.kt$Position.Companion$1000 + MagicNumber:NodeInfo.kt$Position.Companion$1e-7 + MagicNumber:NodeInfo.kt$Position.Companion$1e7 + MatchingDeclarationName:LocationUtils.kt$GPSFormat + MaxLineLength:DataPacket.kt$DataPacket$val dataType: Int + MaxLineLength:NodeInfo.kt$NodeInfo$prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.IMPERIAL_VALUE && dist < 1609 -> "%.0f ft".format(dist.toDouble()*3.281) + MaxLineLength:NodeInfo.kt$NodeInfo$prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.IMPERIAL_VALUE && dist >= 1609 -> "%.1f mi".format(dist / 1609.34) + MaxLineLength:NodeInfo.kt$NodeInfo$prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.METRIC_VALUE && dist < 1000 -> "%.0f m".format(dist.toDouble()) + MaxLineLength:NodeInfo.kt$NodeInfo$prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.METRIC_VALUE && dist >= 1000 -> "%.1f km".format(dist / 1000.0) + MaxLineLength:NodeInfo.kt$Position$/** + MaxLineLength:NodeInfo.kt$Position$return "Position(lat=${latitude.anonymize}, lon=${longitude.anonymize}, alt=${altitude.anonymize}, time=${time})" + MultiLineIfElse:NodeInfo.kt$MeshUser$hwModel.name.replace('_', '-').replace('p', '.').lowercase() + MultiLineIfElse:NodeInfo.kt$MeshUser$null + NewLineAtEndOfFile:DataPacket.kt$com.geeksville.mesh.DataPacket.kt + NewLineAtEndOfFile:MyNodeInfo.kt$com.geeksville.mesh.MyNodeInfo.kt + NewLineAtEndOfFile:NodeInfo.kt$com.geeksville.mesh.NodeInfo.kt + NoConsecutiveBlankLines:NodeInfo.kt$ + SpacingAroundOperators:NodeInfo.kt$NodeInfo$* + StringTemplate:NodeInfo.kt$Position$${time} + TooManyFunctions:LocationUtils.kt$com.geeksville.mesh.util.LocationUtils.kt + + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 06b229a80..1774a20a4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,6 +50,7 @@ zxing-core = "3.5.3" [libraries] agp = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" } +activity = { group = "androidx.activity", name = "activity" } actvity-ktx = { group = "androidx.activity", name = "activity-ktx" } activity-compose = { group = "androidx.activity", name = "activity-compose" } appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } diff --git a/mesh_service_example/.gitignore b/mesh_service_example/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/mesh_service_example/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/mesh_service_example/build.gradle.kts b/mesh_service_example/build.gradle.kts new file mode 100644 index 000000000..d6ef127ac --- /dev/null +++ b/mesh_service_example/build.gradle.kts @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2025 Meshtastic LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + alias(libs.plugins.kotlin.serialization) + alias(libs.plugins.compose) + alias(libs.plugins.protobuf) + alias(libs.plugins.detekt) +} + +android { + namespace = "com.meshtastic.android.meshserviceexample" + compileSdk = Configs.COMPILE_SDK + + defaultConfig { + applicationId = "com.meshtastic.android.meshserviceexample" + minSdk = 26 + targetSdk = Configs.TARGET_SDK + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = "11" // match Java 11 + } + buildFeatures { + aidl = true + } +} + +// per protobuf-gradle-plugin docs, this is recommended for android +protobuf { + protoc { + artifact = libs.protobuf.protoc.get().toString() + } + generateProtoTasks { + all().forEach { task -> + task.builtins { + create("java") + create("kotlin") + } + } + } +} + +dependencies { + implementation(libs.appcompat) + implementation(libs.material) + implementation(libs.activity) + implementation(libs.constraintlayout) + testImplementation(libs.junit) + androidTestImplementation(libs.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.bundles.androidx) + implementation(libs.bundles.protobuf) + + implementation(libs.kotlinx.serialization.json) + + // OSM + implementation(libs.bundles.osm) + implementation(libs.osmdroid.geopackage) { + exclude(group = "com.j256.ormlite") + } + detektPlugins(libs.detekt.formatting) +} + +detekt { + config.setFrom("../config/detekt/detekt.yml") + baseline = file("../config/detekt/detekt-baseline-meshserviceexample.xml") +} diff --git a/mesh_service_example/proguard-rules.pro b/mesh_service_example/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/mesh_service_example/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/mesh_service_example/src/androidTest/java/com/meshtastic/android/meshserviceexample/ExampleInstrumentedTest.java b/mesh_service_example/src/androidTest/java/com/meshtastic/android/meshserviceexample/ExampleInstrumentedTest.java new file mode 100644 index 000000000..d895cb7c1 --- /dev/null +++ b/mesh_service_example/src/androidTest/java/com/meshtastic/android/meshserviceexample/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.meshtastic.android.meshserviceexample; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.meshtastic.android.meshserviceexample", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/mesh_service_example/src/main/AndroidManifest.xml b/mesh_service_example/src/main/AndroidManifest.xml new file mode 100644 index 000000000..58fcd216b --- /dev/null +++ b/mesh_service_example/src/main/AndroidManifest.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mesh_service_example/src/main/aidl/com/geeksville/mesh/IMeshService.aidl b/mesh_service_example/src/main/aidl/com/geeksville/mesh/IMeshService.aidl new file mode 100644 index 000000000..a73a9a14c --- /dev/null +++ b/mesh_service_example/src/main/aidl/com/geeksville/mesh/IMeshService.aidl @@ -0,0 +1,171 @@ +// com.geeksville.mesh.IMeshService.aidl +package com.geeksville.mesh; + +// Declare any non-default types here with import statements +parcelable DataPacket; +parcelable NodeInfo; +parcelable MeshUser; +parcelable Position; +parcelable MyNodeInfo; + +/** +This is the public android API for talking to meshtastic radios. + +To connect to meshtastic you should bind to it per https://developer.android.com/guide/components/bound-services + +The intent you use to reach the service should look like this: + + val intent = Intent().apply { + setClassName( + "com.geeksville.mesh", + "com.geeksville.mesh.service.MeshService" + ) + } + +In Android 11+ you *may* need to add the following to the client app's manifest to allow binding of the mesh service: + + + +For additional information, see https://developer.android.com/guide/topics/manifest/queries-element + + +Once you have bound to the service you should register your broadcast receivers per https://developer.android.com/guide/components/broadcasts#context-registered-receivers + + // com.geeksville.mesh.x broadcast intents, where x is: + + // RECEIVED. - will **only** deliver packets for the specified port number. If a wellknown portnums.proto name for portnum is known it will be used + // (i.e. com.geeksville.mesh.RECEIVED.TEXT_MESSAGE_APP) else the numeric portnum will be included as a base 10 integer (com.geeksville.mesh.RECEIVED.4403 etc...) + + // NODE_CHANGE for new IDs appearing or disappearing + // CONNECTION_CHANGED for losing/gaining connection to the packet radio + // MESSAGE_STATUS_CHANGED for any message status changes (for sent messages only, payload will contain a message ID and a MessageStatus) + +Note - these calls might throw RemoteException to indicate mesh error states +*/ +interface IMeshService { + /// Tell the service where to send its broadcasts of received packets + /// This call is only required for manifest declared receivers. If your receiver is context-registered + /// you don't need this. + void subscribeReceiver(String packageName, String receiverName); + + /** + * Set the user info for this node + */ + void setOwner(in MeshUser user); + + void setRemoteOwner(in int requestId, in byte []payload); + void getRemoteOwner(in int requestId, in int destNum); + + /// Return my unique user ID string + String getMyId(); + + /// Return a unique packet ID + int getPacketId(); + + /* + Send a packet to a specified node name + + typ is defined in mesh.proto Data.Type. For now juse use 0 to mean opaque bytes. + + destId can be null to indicate "broadcast message" + + messageStatus and id of the provided message will be updated by this routine to indicate + message send status and the ID that can be used to locate the message in the future + */ + void send(inout DataPacket packet); + + /** + Get the IDs of everyone on the mesh. You should also subscribe for NODE_CHANGE broadcasts. + */ + List getNodes(); + + /// This method is only intended for use in our GUI, so the user can set radio options + /// It returns a DeviceConfig protobuf. + byte []getConfig(); + /// It sets a Config protobuf via admin packet + void setConfig(in byte []payload); + + /// Set and get a Config protobuf via admin packet + void setRemoteConfig(in int requestId, in int destNum, in byte []payload); + void getRemoteConfig(in int requestId, in int destNum, in int configTypeValue); + + /// Set and get a ModuleConfig protobuf via admin packet + void setModuleConfig(in int requestId, in int destNum, in byte []payload); + void getModuleConfig(in int requestId, in int destNum, in int moduleConfigTypeValue); + + /// Set and get the Ext Notification Ringtone string via admin packet + void setRingtone(in int destNum, in String ringtone); + void getRingtone(in int requestId, in int destNum); + + /// Set and get the Canned Message Messages string via admin packet + void setCannedMessages(in int destNum, in String messages); + void getCannedMessages(in int requestId, in int destNum); + + /// This method is only intended for use in our GUI, so the user can set radio options + /// It sets a Channel protobuf via admin packet + void setChannel(in byte []payload); + + /// Set and get a Channel protobuf via admin packet + void setRemoteChannel(in int requestId, in int destNum, in byte []payload); + void getRemoteChannel(in int requestId, in int destNum, in int channelIndex); + + /// Send beginEditSettings admin packet to nodeNum + void beginEditSettings(); + + /// Send commitEditSettings admin packet to nodeNum + void commitEditSettings(); + + /// delete a specific nodeNum from nodeDB + void removeByNodenum(in int requestID, in int nodeNum); + + /// Send position packet with wantResponse to nodeNum + void requestPosition(in int destNum, in Position position); + + /// Send setFixedPosition admin packet (or removeFixedPosition if Position is empty) + void setFixedPosition(in int destNum, in Position position); + + /// Send traceroute packet with wantResponse to nodeNum + void requestTraceroute(in int requestId, in int destNum); + + /// Send Shutdown admin packet to nodeNum + void requestShutdown(in int requestId, in int destNum); + + /// Send Reboot admin packet to nodeNum + void requestReboot(in int requestId, in int destNum); + + /// Send FactoryReset admin packet to nodeNum + void requestFactoryReset(in int requestId, in int destNum); + + /// Send NodedbReset admin packet to nodeNum + void requestNodedbReset(in int requestId, in int destNum); + + /// Returns a ChannelSet protobuf + byte []getChannelSet(); + + /** + Is the packet radio currently connected to the phone? Returns a ConnectionState string. + */ + String connectionState(); + + /// If a macaddress we will try to talk to our device, if null we will be idle. + /// Any current connection will be dropped (even if the device address is the same) before reconnecting. + /// Users should not call this directly, only used internally by the MeshUtil activity + /// Returns true if the device address actually changed, or false if no change was needed + boolean setDeviceAddress(String deviceAddr); + + /// Get basic device hardware info about our connected radio. Will never return NULL. Will return NULL + /// if no my node info is available (i.e. it will not throw an exception) + MyNodeInfo getMyNodeInfo(); + + /// Start updating the radios firmware + void startFirmwareUpdate(); + + /// Return a number 0-100 for firmware update progress. -1 for completed and success, -2 for failure + int getUpdateStatus(); + + /// Start providing location (from phone GPS) to mesh + void startProvideLocation(); + + /// Stop providing location (from phone GPS) to mesh + void stopProvideLocation(); +} diff --git a/mesh_service_example/src/main/java/com/geeksville/mesh/DataPacket.kt b/mesh_service_example/src/main/java/com/geeksville/mesh/DataPacket.kt new file mode 100644 index 000000000..a6f8b7461 --- /dev/null +++ b/mesh_service_example/src/main/java/com/geeksville/mesh/DataPacket.kt @@ -0,0 +1,216 @@ +/* + * Copyright (c) 2025 Meshtastic LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.geeksville.mesh + +import android.os.Parcel +import android.os.Parcelable +import kotlinx.parcelize.Parcelize +import kotlinx.serialization.Serializable + +/** + * Generic [Parcel.readParcelable] Android 13 compatibility extension. + */ +private inline fun Parcel.readParcelableCompat(loader: ClassLoader?): T? { + return if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU) { + @Suppress("DEPRECATION") + readParcelable(loader) + } else { + readParcelable(loader, T::class.java) + } +} + +@Parcelize +enum class MessageStatus : Parcelable { + UNKNOWN, // Not set for this message + RECEIVED, // Came in from the mesh + QUEUED, // Waiting to send to the mesh as soon as we connect to the device + ENROUTE, // Delivered to the radio, but no ACK or NAK received + DELIVERED, // We received an ack + ERROR // We received back a nak, message not delivered +} + +/** + * A parcelable version of the protobuf MeshPacket + Data subpacket. + */ +@Serializable +data class DataPacket( + var to: String? = ID_BROADCAST, // a nodeID string, or ID_BROADCAST for broadcast + val bytes: ByteArray?, + val dataType: Int, // A port number for this packet (formerly called DataType, see portnums.proto for new usage instructions) + var from: String? = ID_LOCAL, // a nodeID string, or ID_LOCAL for localhost + var time: Long = System.currentTimeMillis(), // msecs since 1970 + var id: Int = 0, // 0 means unassigned + var status: MessageStatus? = MessageStatus.UNKNOWN, + var hopLimit: Int = 0, + var channel: Int = 0, // channel index + var wantAck: Boolean = true, // If true, the receiver should send an ack back +) : Parcelable { + + /** + * If there was an error with this message, this string describes what was wrong. + */ + var errorMessage: String? = null + + /** + * Syntactic sugar to make it easy to create text messages + */ + constructor(to: String?, channel: Int, text: String) : this( + to = to, + bytes = text.encodeToByteArray(), + dataType = Portnums.PortNum.TEXT_MESSAGE_APP_VALUE, + channel = channel + ) + + /** + * If this is a text message, return the string, otherwise null + */ + val text: String? + get() = if (dataType == Portnums.PortNum.TEXT_MESSAGE_APP_VALUE) { + bytes?.decodeToString() + } else { + null + } + + val alert: String? + get() = if (dataType == Portnums.PortNum.ALERT_APP_VALUE) { + bytes?.decodeToString() + } else { + null + } + + constructor(to: String?, channel: Int, waypoint: MeshProtos.Waypoint) : this( + to = to, + bytes = waypoint.toByteArray(), + dataType = Portnums.PortNum.WAYPOINT_APP_VALUE, + channel = channel + ) + + val waypoint: MeshProtos.Waypoint? + get() = if (dataType == Portnums.PortNum.WAYPOINT_APP_VALUE) { + MeshProtos.Waypoint.parseFrom(bytes) + } else { + null + } + + // Autogenerated comparision, because we have a byte array + + constructor(parcel: Parcel) : this( + parcel.readString(), + parcel.createByteArray(), + parcel.readInt(), + parcel.readString(), + parcel.readLong(), + parcel.readInt(), + parcel.readParcelableCompat(MessageStatus::class.java.classLoader), + parcel.readInt(), + parcel.readInt(), + parcel.readInt() == 1, + ) + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as DataPacket + + if (from != other.from) return false + if (to != other.to) return false + if (channel != other.channel) return false + if (time != other.time) return false + if (id != other.id) return false + if (dataType != other.dataType) return false + if (!bytes!!.contentEquals(other.bytes!!)) return false + if (status != other.status) return false + if (hopLimit != other.hopLimit) return false + if (wantAck != other.wantAck) return false + + return true + } + + override fun hashCode(): Int { + var result = from.hashCode() + result = 31 * result + to.hashCode() + result = 31 * result + time.hashCode() + result = 31 * result + id + result = 31 * result + dataType + result = 31 * result + bytes!!.contentHashCode() + result = 31 * result + status.hashCode() + result = 31 * result + hopLimit + result = 31 * result + channel + result = 31 * result + wantAck.hashCode() + return result + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.writeString(to) + parcel.writeByteArray(bytes) + parcel.writeInt(dataType) + parcel.writeString(from) + parcel.writeLong(time) + parcel.writeInt(id) + parcel.writeParcelable(status, flags) + parcel.writeInt(hopLimit) + parcel.writeInt(channel) + parcel.writeInt(if (wantAck) 1 else 0) + } + + override fun describeContents(): Int { + return 0 + } + + // Update our object from our parcel (used for inout parameters + fun readFromParcel(parcel: Parcel) { + to = parcel.readString() + parcel.createByteArray() + parcel.readInt() + from = parcel.readString() + time = parcel.readLong() + id = parcel.readInt() + status = parcel.readParcelableCompat(MessageStatus::class.java.classLoader) + hopLimit = parcel.readInt() + channel = parcel.readInt() + wantAck = parcel.readInt() == 1 + } + + companion object CREATOR : Parcelable.Creator { + // Special node IDs that can be used for sending messages + + /** the Node ID for broadcast destinations */ + const val ID_BROADCAST = "^all" + + /** The Node ID for the local node - used for from when sender doesn't know our local node ID */ + const val ID_LOCAL = "^local" + + // special broadcast address + const val NODENUM_BROADCAST = (0xffffffff).toInt() + + // Public-key cryptography (PKC) channel index + const val PKC_CHANNEL_INDEX = 8 + + fun nodeNumToDefaultId(n: Int): String = "!%08x".format(n) + fun idToDefaultNodeNum(id: String?): Int? = runCatching { id?.toLong(16)?.toInt() }.getOrNull() + + override fun createFromParcel(parcel: Parcel): DataPacket { + return DataPacket(parcel) + } + + override fun newArray(size: Int): Array { + return arrayOfNulls(size) + } + } +} \ No newline at end of file diff --git a/mesh_service_example/src/main/java/com/geeksville/mesh/MyNodeInfo.kt b/mesh_service_example/src/main/java/com/geeksville/mesh/MyNodeInfo.kt new file mode 100644 index 000000000..15e265cc9 --- /dev/null +++ b/mesh_service_example/src/main/java/com/geeksville/mesh/MyNodeInfo.kt @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2025 Meshtastic LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.geeksville.mesh + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +// MyNodeInfo sent via special protobuf from radio +@Parcelize +data class MyNodeInfo( + val myNodeNum: Int, + val hasGPS: Boolean, + val model: String?, + val firmwareVersion: String?, + val couldUpdate: Boolean, // this application contains a software load we _could_ install if you want + val shouldUpdate: Boolean, // this device has old firmware + val currentPacketId: Long, + val messageTimeoutMsec: Int, + val minAppVersion: Int, + val maxChannels: Int, + val hasWifi: Boolean, + val channelUtilization: Float, + val airUtilTx: Float, + val deviceId: String?, +) : Parcelable { + /** A human readable description of the software/hardware version */ + val firmwareString: String get() = "$model $firmwareVersion" +} \ No newline at end of file diff --git a/mesh_service_example/src/main/java/com/geeksville/mesh/NodeInfo.kt b/mesh_service_example/src/main/java/com/geeksville/mesh/NodeInfo.kt new file mode 100644 index 000000000..f1570782e --- /dev/null +++ b/mesh_service_example/src/main/java/com/geeksville/mesh/NodeInfo.kt @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2025 Meshtastic LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.geeksville.mesh + +import android.graphics.Color +import android.os.Parcelable +import com.geeksville.mesh.util.GPSFormat +import com.geeksville.mesh.util.bearing +import com.geeksville.mesh.util.latLongToMeter +import com.geeksville.mesh.util.anonymize +import kotlinx.parcelize.Parcelize + +// +// model objects that directly map to the corresponding protobufs +// + +@Parcelize +data class MeshUser( + val id: String, + val longName: String, + val shortName: String, + val hwModel: MeshProtos.HardwareModel, + val isLicensed: Boolean = false, + val role: Int = 0, +) : Parcelable { + + override fun toString(): String { + return "MeshUser(id=${id.anonymize}, " + + "longName=${longName.anonymize}, " + + "shortName=${shortName.anonymize}, " + + "hwModel=$hwModelString, " + + "isLicensed=$isLicensed, " + + "role=$role)" + } + + /** Create our model object from a protobuf. + */ + constructor(p: MeshProtos.User) : this( + p.id, + p.longName, + p.shortName, + p.hwModel, + p.isLicensed, + p.roleValue + ) + + /** a string version of the hardware model, converted into pretty lowercase and changing _ to -, and p to dot + * or null if unset + * */ + val hwModelString: String? + get() = + if (hwModel == MeshProtos.HardwareModel.UNSET) null + else hwModel.name.replace('_', '-').replace('p', '.').lowercase() +} + +@Parcelize +data class Position( + val latitude: Double, + val longitude: Double, + val altitude: Int, + val time: Int = currentTime(), // default to current time in secs (NOT MILLISECONDS!) + val satellitesInView: Int = 0, + val groundSpeed: Int = 0, + val groundTrack: Int = 0, // "heading" + val precisionBits: Int = 0, +) : Parcelable { + + companion object { + /// Convert to a double representation of degrees + fun degD(i: Int) = i * 1e-7 + fun degI(d: Double) = (d * 1e7).toInt() + + fun currentTime() = (System.currentTimeMillis() / 1000).toInt() + } + + /** Create our model object from a protobuf. If time is unspecified in the protobuf, the provided default time will be used. + */ + constructor(position: MeshProtos.Position, defaultTime: Int = currentTime()) : this( + // We prefer the int version of lat/lon but if not available use the depreciated legacy version + degD(position.latitudeI), + degD(position.longitudeI), + position.altitude, + if (position.time != 0) position.time else defaultTime, + position.satsInView, + position.groundSpeed, + position.groundTrack, + position.precisionBits + ) + + /// @return distance in meters to some other node (or null if unknown) + fun distance(o: Position) = latLongToMeter(latitude, longitude, o.latitude, o.longitude) + + /// @return bearing to the other position in degrees + fun bearing(o: Position) = bearing(latitude, longitude, o.latitude, o.longitude) + + // If GPS gives a crap position don't crash our app + fun isValid(): Boolean { + return latitude != 0.0 && longitude != 0.0 && + (latitude >= -90 && latitude <= 90.0) && + (longitude >= -180 && longitude <= 180) + } + + fun gpsString(gpsFormat: Int): String = when (gpsFormat) { + ConfigProtos.Config.DisplayConfig.GpsCoordinateFormat.DEC_VALUE -> GPSFormat.DEC(this) + ConfigProtos.Config.DisplayConfig.GpsCoordinateFormat.DMS_VALUE -> GPSFormat.DMS(this) + ConfigProtos.Config.DisplayConfig.GpsCoordinateFormat.UTM_VALUE -> GPSFormat.UTM(this) + ConfigProtos.Config.DisplayConfig.GpsCoordinateFormat.MGRS_VALUE -> GPSFormat.MGRS(this) + else -> GPSFormat.DEC(this) + } + + override fun toString(): String { + return "Position(lat=${latitude.anonymize}, lon=${longitude.anonymize}, alt=${altitude.anonymize}, time=${time})" + } +} + + +@Parcelize +data class DeviceMetrics( + val time: Int = currentTime(), // default to current time in secs (NOT MILLISECONDS!) + val batteryLevel: Int = 0, + val voltage: Float, + val channelUtilization: Float, + val airUtilTx: Float, + val uptimeSeconds: Int, +) : Parcelable { + companion object { + fun currentTime() = (System.currentTimeMillis() / 1000).toInt() + } + + /** Create our model object from a protobuf. + */ + constructor(p: TelemetryProtos.DeviceMetrics, telemetryTime: Int = currentTime()) : this( + telemetryTime, + p.batteryLevel, + p.voltage, + p.channelUtilization, + p.airUtilTx, + p.uptimeSeconds, + ) +} + +@Parcelize +data class EnvironmentMetrics( + val time: Int = currentTime(), // default to current time in secs (NOT MILLISECONDS!) + val temperature: Float, + val relativeHumidity: Float, + val barometricPressure: Float, + val gasResistance: Float, + val voltage: Float, + val current: Float, + val iaq: Int, +) : Parcelable { + companion object { + fun currentTime() = (System.currentTimeMillis() / 1000).toInt() + } +} + +@Parcelize +data class NodeInfo( + val num: Int, // This is immutable, and used as a key + var user: MeshUser? = null, + var position: Position? = null, + var snr: Float = Float.MAX_VALUE, + var rssi: Int = Int.MAX_VALUE, + var lastHeard: Int = 0, // the last time we've seen this node in secs since 1970 + var deviceMetrics: DeviceMetrics? = null, + var channel: Int = 0, + var environmentMetrics: EnvironmentMetrics? = null, + var hopsAway: Int = 0 +) : Parcelable { + + val colors: Pair + get() { // returns foreground and background @ColorInt for each 'num' + val r = (num and 0xFF0000) shr 16 + val g = (num and 0x00FF00) shr 8 + val b = num and 0x0000FF + val brightness = ((r * 0.299) + (g * 0.587) + (b * 0.114)) / 255 + return (if (brightness > 0.5) Color.BLACK else Color.WHITE) to Color.rgb(r, g, b) + } + + val batteryLevel get() = deviceMetrics?.batteryLevel + val voltage get() = deviceMetrics?.voltage + val batteryStr get() = if (batteryLevel in 1..100) String.format("%d%%", batteryLevel) else "" + + /** + * true if the device was heard from recently + */ + val isOnline: Boolean + get() { + val now = System.currentTimeMillis() / 1000 + val timeout = 15 * 60 + return (now - lastHeard <= timeout) + } + + /// return the position if it is valid, else null + val validPosition: Position? + get() { + return position?.takeIf { it.isValid() } + } + + /// @return distance in meters to some other node (or null if unknown) + fun distance(o: NodeInfo?): Int? { + val p = validPosition + val op = o?.validPosition + return if (p != null && op != null) p.distance(op).toInt() else null + } + + /// @return bearing to the other position in degrees + fun bearing(o: NodeInfo?): Int? { + val p = validPosition + val op = o?.validPosition + return if (p != null && op != null) p.bearing(op).toInt() else null + } + + /// @return a nice human readable string for the distance, or null for unknown + fun distanceStr(o: NodeInfo?, prefUnits: Int = 0) = distance(o)?.let { dist -> + when { + dist == 0 -> null // same point + prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.METRIC_VALUE && dist < 1000 -> "%.0f m".format(dist.toDouble()) + prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.METRIC_VALUE && dist >= 1000 -> "%.1f km".format(dist / 1000.0) + prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.IMPERIAL_VALUE && dist < 1609 -> "%.0f ft".format(dist.toDouble()*3.281) + prefUnits == ConfigProtos.Config.DisplayConfig.DisplayUnits.IMPERIAL_VALUE && dist >= 1609 -> "%.1f mi".format(dist / 1609.34) + else -> null + } + } +} \ No newline at end of file diff --git a/mesh_service_example/src/main/java/com/geeksville/mesh/util/Extensions.kt b/mesh_service_example/src/main/java/com/geeksville/mesh/util/Extensions.kt new file mode 100644 index 000000000..917794dad --- /dev/null +++ b/mesh_service_example/src/main/java/com/geeksville/mesh/util/Extensions.kt @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2025 Meshtastic LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.geeksville.mesh.util + +import android.widget.EditText +import com.geeksville.mesh.ConfigProtos + +/** + * When printing strings to logs sometimes we want to print useful debugging information about users + * or positions. But we don't want to leak things like usernames or locations. So this function + * if given a string, will return a string which is a maximum of three characters long, taken from the tail + * of the string. Which should effectively hide real usernames and locations, + * but still let us see if values were zero, empty or different. + */ +val Any?.anonymize: String + get() = this.anonymize() + +/** + * A version of anonymize that allows passing in a custom minimum length + */ +fun Any?.anonymize(maxLen: Int = 3) = + if (this != null) ("..." + this.toString().takeLast(maxLen)) else "null" + +// A toString that makes sure all newlines are removed (for nice logging). +fun Any.toOneLineString() = this.toString().replace('\n', ' ') + +fun ConfigProtos.Config.toOneLineString(): String { + val redactedFields = """(wifi_psk:|public_key:|private_key:|admin_key:)\s*".*""" + return this.toString() + .replace(redactedFields.toRegex()) { "${it.groupValues[1]} \"[REDACTED]\"" } + .replace('\n', ' ') +} + +// Return a one line string version of an object (but if a release build, just say 'might be PII) +fun Any.toPIIString() = this.toOneLineString() + +fun ByteArray.toHexString() = joinToString("") { "%02x".format(it) } + +fun formatAgo(lastSeenUnix: Int, currentTimeMillis: Long = System.currentTimeMillis()): String { + val currentTime = (currentTimeMillis / 1000).toInt() + val diffMin = (currentTime - lastSeenUnix) / 60 + return when { + diffMin < 1 -> "now" + diffMin < 60 -> diffMin.toString() + " min" + diffMin < 2880 -> (diffMin / 60).toString() + " h" + diffMin < 1440000 -> (diffMin / (60 * 24)).toString() + " d" + else -> "?" + } +} + +// Allows usage like email.onEditorAction(EditorInfo.IME_ACTION_NEXT, { confirm() }) +fun EditText.onEditorAction(actionId: Int, func: () -> Unit) { + setOnEditorActionListener { _, receivedActionId, _ -> + + if (actionId == receivedActionId) { + func() + } + true + } +} diff --git a/mesh_service_example/src/main/java/com/geeksville/mesh/util/LocationUtils.kt b/mesh_service_example/src/main/java/com/geeksville/mesh/util/LocationUtils.kt new file mode 100644 index 000000000..bb4567e63 --- /dev/null +++ b/mesh_service_example/src/main/java/com/geeksville/mesh/util/LocationUtils.kt @@ -0,0 +1,327 @@ +/* + * Copyright (c) 2025 Meshtastic LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.geeksville.mesh.util + +import com.geeksville.mesh.MeshProtos +import com.geeksville.mesh.Position +import mil.nga.grid.features.Point +import mil.nga.mgrs.MGRS +import mil.nga.mgrs.utm.UTM +import org.osmdroid.util.BoundingBox +import org.osmdroid.util.GeoPoint +import kotlin.math.abs +import kotlin.math.acos +import kotlin.math.atan2 +import kotlin.math.cos +import kotlin.math.log2 +import kotlin.math.pow +import kotlin.math.sin +import kotlin.math.PI + +/******************************************************************************* + * Revive some of my old Gaggle source code... + * + * GNU Public License, version 2 + * All other distribution of Gaggle must conform to the terms of the GNU Public License, version 2. The full + * text of this license is included in the Gaggle source, see assets/manual/gpl-2.0.txt. + ******************************************************************************/ + +object GPSFormat { + fun DEC(p: Position): String { + return String.format("%.5f %.5f", p.latitude, p.longitude).replace(",", ".") + } + + fun DMS(p: Position): String { + val lat = degreesToDMS(p.latitude, true) + val lon = degreesToDMS(p.longitude, false) + fun string(a: Array) = String.format("%s°%s'%.5s\"%s", a[0], a[1], a[2], a[3]) + return string(lat) + " " + string(lon) + } + + fun UTM(p: Position): String { + val UTM = UTM.from(Point.point(p.longitude, p.latitude)) + return String.format( + "%s%s %.6s %.7s", + UTM.zone, + UTM.toMGRS().band, + UTM.easting, + UTM.northing + ) + } + + fun MGRS(p: Position): String { + val MGRS = MGRS.from(Point.point(p.longitude, p.latitude)) + return String.format( + "%s%s %s%s %05d %05d", + MGRS.zone, + MGRS.band, + MGRS.column, + MGRS.row, + MGRS.easting, + MGRS.northing + ) + } + + fun toDEC(latitude: Double, longitude: Double): String { + return "%.5f %.5f".format(latitude, longitude).replace(",", ".") + } + + fun toDMS(latitude: Double, longitude: Double): String { + val lat = degreesToDMS(latitude, true) + val lon = degreesToDMS(longitude, false) + fun string(a: Array) = "%s°%s'%.5s\"%s".format(a[0], a[1], a[2], a[3]) + return string(lat) + " " + string(lon) + } + + fun toUTM(latitude: Double, longitude: Double): String { + val UTM = UTM.from(Point.point(longitude, latitude)) + return "%s%s %.6s %.7s".format(UTM.zone, UTM.toMGRS().band, UTM.easting, UTM.northing) + } + + fun toMGRS(latitude: Double, longitude: Double): String { + val MGRS = MGRS.from(Point.point(longitude, latitude)) + return "%s%s %s%s %05d %05d".format( + MGRS.zone, + MGRS.band, + MGRS.column, + MGRS.row, + MGRS.easting, + MGRS.northing + ) + } +} + +/** + * Format as degrees, minutes, secs + * + * @param degIn + * @param isLatitude + * @return a string like 120deg + */ +fun degreesToDMS( + _degIn: Double, + isLatitude: Boolean +): Array { + var degIn = _degIn + val isPos = degIn >= 0 + val dirLetter = + if (isLatitude) if (isPos) 'N' else 'S' else if (isPos) 'E' else 'W' + degIn = abs(degIn) + val degOut = degIn.toInt() + val minutes = 60 * (degIn - degOut) + val minwhole = minutes.toInt() + val seconds = (minutes - minwhole) * 60 + return arrayOf( + degOut.toString(), minwhole.toString(), + seconds.toString(), + dirLetter.toString() + ) +} + +fun degreesToDM(_degIn: Double, isLatitude: Boolean): Array { + var degIn = _degIn + val isPos = degIn >= 0 + val dirLetter = + if (isLatitude) if (isPos) 'N' else 'S' else if (isPos) 'E' else 'W' + degIn = abs(degIn) + val degOut = degIn.toInt() + val minutes = 60 * (degIn - degOut) + val seconds = 0 + return arrayOf( + degOut.toString(), minutes.toString(), + seconds.toString(), + dirLetter.toString() + ) +} + +fun degreesToD(_degIn: Double, isLatitude: Boolean): Array { + var degIn = _degIn + val isPos = degIn >= 0 + val dirLetter = + if (isLatitude) if (isPos) 'N' else 'S' else if (isPos) 'E' else 'W' + degIn = abs(degIn) + val degOut = degIn + val minutes = 0 + val seconds = 0 + return arrayOf( + degOut.toString(), minutes.toString(), + seconds.toString(), + dirLetter.toString() + ) +} + +/** + * A not super efficent mapping from a starting lat/long + a distance at a + * certain direction + * + * @param lat + * @param longitude + * @param distMeters + * @param theta + * in radians, 0 == north + * @return an array with lat and long + */ +fun addDistance( + lat: Double, + longitude: Double, + distMeters: Double, + theta: Double +): DoubleArray { + val dx = distMeters * sin(theta) // theta measured clockwise + // from due north + val dy = distMeters * cos(theta) // dx, dy same units as R + val dLong = dx / (111320 * cos(lat)) // dx, dy in meters + val dLat = dy / 110540 // result in degrees long/lat + return doubleArrayOf(lat + dLat, longitude + dLong) +} + +/** + * @return distance in meters along the surface of the earth (ish) + */ +fun latLongToMeter( + lat_a: Double, + lng_a: Double, + lat_b: Double, + lng_b: Double +): Double { + val pk = (180 / PI) + val a1 = lat_a / pk + val a2 = lng_a / pk + val b1 = lat_b / pk + val b2 = lng_b / pk + val t1 = cos(a1) * cos(a2) * cos(b1) * cos(b2) + val t2 = cos(a1) * sin(a2) * cos(b1) * sin(b2) + val t3 = sin(a1) * sin(b1) + var tt = acos(t1 + t2 + t3) + if (java.lang.Double.isNaN(tt)) tt = 0.0 // Must have been the same point? + return 6366000 * tt +} + +// Same as above, but takes Mesh Position proto. +fun positionToMeter(a: MeshProtos.Position, b: MeshProtos.Position): Double { + return latLongToMeter( + a.latitudeI * 1e-7, + a.longitudeI * 1e-7, + b.latitudeI * 1e-7, + b.longitudeI * 1e-7 + ) +} + +/** + * Convert degrees/mins/secs to a single double + * + * @param degrees + * @param minutes + * @param seconds + * @param isPostive + * @return + */ +fun DMSToDegrees( + degrees: Int, + minutes: Int, + seconds: Float, + isPostive: Boolean +): Double { + return (if (isPostive) 1 else -1) * (degrees + minutes / 60.0 + seconds / 3600.0) +} + +fun DMSToDegrees( + degrees: Double, + minutes: Double, + seconds: Double, + isPostive: Boolean +): Double { + return (if (isPostive) 1 else -1) * (degrees + minutes / 60.0 + seconds / 3600.0) +} + +/** + * Computes the bearing in degrees between two points on Earth. + * + * @param lat1 + * Latitude of the first point + * @param lon1 + * Longitude of the first point + * @param lat2 + * Latitude of the second point + * @param lon2 + * Longitude of the second point + * @return Bearing between the two points in degrees. A value of 0 means due + * north. + */ +fun bearing( + lat1: Double, + lon1: Double, + lat2: Double, + lon2: Double +): Double { + val lat1Rad = Math.toRadians(lat1) + val lat2Rad = Math.toRadians(lat2) + val deltaLonRad = Math.toRadians(lon2 - lon1) + val y = sin(deltaLonRad) * cos(lat2Rad) + val x = cos(lat1Rad) * sin(lat2Rad) - (sin(lat1Rad) * cos(lat2Rad) * cos(deltaLonRad)) + return radToBearing(atan2(y, x)) +} + +/** + * Converts an angle in radians to degrees + */ +fun radToBearing(rad: Double): Double { + return (Math.toDegrees(rad) + 360) % 360 +} + +/** + * Calculates the zoom level required to fit the entire [BoundingBox] inside the map view. + * @return The zoom level as a Double value. + */ +fun BoundingBox.requiredZoomLevel(): Double { + val topLeft = GeoPoint(this.latNorth, this.lonWest) + val bottomRight = GeoPoint(this.latSouth, this.lonEast) + val latLonWidth = topLeft.distanceToAsDouble(GeoPoint(topLeft.latitude, bottomRight.longitude)) + val latLonHeight = topLeft.distanceToAsDouble(GeoPoint(bottomRight.latitude, topLeft.longitude)) + val requiredLatZoom = log2(360.0 / (latLonHeight / 111320)) + val requiredLonZoom = log2(360.0 / (latLonWidth / 111320)) + return maxOf(requiredLatZoom, requiredLonZoom) * 0.8 +} + +/** + * Creates a new bounding box with adjusted dimensions based on the provided [zoomFactor]. + * @return A new [BoundingBox] with added [zoomFactor]. Example: + * ``` + * // Setting the zoom level directly using setZoom() + * map.setZoom(14.0) + * val boundingBoxZoom14 = map.boundingBox + * + * // Using zoomIn() results the equivalent BoundingBox with setZoom(15.0) + * val boundingBoxZoom15 = boundingBoxZoom14.zoomIn(1.0) + * ``` + */ +fun BoundingBox.zoomIn(zoomFactor: Double): BoundingBox { + val center = GeoPoint((latNorth + latSouth) / 2, (lonWest + lonEast) / 2) + val latDiff = latNorth - latSouth + val lonDiff = lonEast - lonWest + + val newLatDiff = latDiff / (2.0.pow(zoomFactor)) + val newLonDiff = lonDiff / (2.0.pow(zoomFactor)) + + return BoundingBox( + center.latitude + newLatDiff / 2, + center.longitude + newLonDiff / 2, + center.latitude - newLatDiff / 2, + center.longitude - newLonDiff / 2 + ) +} diff --git a/mesh_service_example/src/main/java/com/meshtastic/android/meshserviceexample/MainActivity.java b/mesh_service_example/src/main/java/com/meshtastic/android/meshserviceexample/MainActivity.java new file mode 100644 index 000000000..16f0282e0 --- /dev/null +++ b/mesh_service_example/src/main/java/com/meshtastic/android/meshserviceexample/MainActivity.java @@ -0,0 +1,184 @@ +package com.meshtastic.android.meshserviceexample; + +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.ServiceConnection; +import android.os.Build; +import android.os.Bundle; +import android.os.IBinder; +import android.util.Log; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.activity.EdgeToEdge; +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.geeksville.mesh.IMeshService; +import com.geeksville.mesh.MessageStatus; +import com.geeksville.mesh.NodeInfo; + +import java.util.Objects; + +public class MainActivity extends AppCompatActivity { + + private static final String TAG = "MeshServiceExample"; + private IMeshService meshService; + private ServiceConnection serviceConnection; + private BroadcastReceiver meshtasticReceiver; + private boolean isMeshServiceBound = false; + + @RequiresApi(api = Build.VERSION_CODES.TIRAMISU) + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_main); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + + TextView mainTextView = findViewById(R.id.mainTextView); + ImageView statusImageView = findViewById(R.id.statusImageView); + + // Now you can call methods on meshService + serviceConnection = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + meshService = IMeshService.Stub.asInterface(service); + Log.i(TAG, "Connected to MeshService"); + isMeshServiceBound = true; + statusImageView.setImageResource(android.R.color.holo_green_light); + } + + @Override + public void onServiceDisconnected(ComponentName name) { + meshService = null; + isMeshServiceBound = false; + } + }; + + meshtasticReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (intent == null || intent.getAction() == null) { + Log.w(TAG, "Received null intent or action"); + return; + } + // Handle the received broadcast + String action = intent.getAction(); + Log.d(TAG, "Received broadcast: " + action); + + switch (Objects.requireNonNull(action)) { + case "com.geeksville.mesh.NODE_CHANGE": + // handle node changed + try { + NodeInfo ni = intent.getParcelableExtra("com.geeksville.mesh.NodeInfo"); + Log.d(TAG, "NodeInfo: " + ni); + mainTextView.setText("NodeInfo: " + ni); + } catch (Exception e) { + e.printStackTrace(); + return; + } + break; + case "com.geeksville.mesh.MESSAGE_STATUS": + int id = intent.getIntExtra("com.geeksville.mesh.PacketId", 0); + MessageStatus status = intent.getParcelableExtra("com.geeksville.mesh.Status"); + Log.d(TAG, "Message Status ID: " + id + " Status: " + status); + break; + case "com.geeksville.mesh.MESH_CONNECTED": { + String extraConnected = intent.getStringExtra("com.geeksville.mesh.Connected"); + boolean connected = extraConnected.equals("CONNECTED"); + Log.d(TAG, "Received ACTION_MESH_CONNECTED: " + extraConnected); + if (connected) { + statusImageView.setImageResource(android.R.color.holo_green_light); + } + break; + } + case "com.geeksville.mesh.MESH_DISCONNECTED": { + String extraConnected = intent.getStringExtra("com.geeksville.mesh.Disconnected"); + boolean disconnected = extraConnected.equals("DISCONNECTED"); + Log.d(TAG, "Received ACTION_MESH_DISTCONNECTED: " + extraConnected); + if (disconnected) { + statusImageView.setImageResource(android.R.color.holo_red_light); + } + break; + } + case "com.geeksville.mesh.RECEIVED.POSITION_APP": { + // handle position app data + try { + NodeInfo ni = intent.getParcelableExtra("com.geeksville.mesh.NodeInfo"); + Log.d(TAG, "Position App NodeInfo: " + ni); + mainTextView.setText("Position App NodeInfo: " + ni); + } catch (Exception e) { + e.printStackTrace(); + return; + } + break; + } + default: + Log.w(TAG, "Unknown action: " + action); + } + } + }; + + IntentFilter filter = new IntentFilter(); + filter.addAction("com.geeksville.mesh.NODE_CHANGE"); + filter.addAction("com.geeksville.mesh.RECEIVED.NODEINFO_APP"); + filter.addAction("com.geeksville.mesh.RECEIVED.POSITION_APP"); + filter.addAction("com.geeksville.mesh.MESH_CONNECTED"); + filter.addAction("com.geeksville.mesh.MESH_DISCONNECTED"); + registerReceiver(meshtasticReceiver, filter, Context.RECEIVER_EXPORTED); + Log.d(TAG, "Registered meshtasticPacketReceiver"); + + while (!bindMeshService()) { + try { + // Wait for the service to bind + Thread.sleep(1000); + } catch (InterruptedException e) { + Log.e(TAG, "Binding interrupted", e); + break; + } + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + unbindMeshService(); + } + + private boolean bindMeshService() { + try { + Log.i(TAG, "Attempting to bind to Mesh Service..."); + Intent intent = new Intent("com.geeksville.mesh.Service"); + intent.setClassName("com.geeksville.mesh", "com.geeksville.mesh.service.MeshService"); + return bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE); + } catch (Exception e) { + Log.e(TAG, "Failed to bind", e); + } + return false; + } + + private void unbindMeshService() { + if (isMeshServiceBound) { + try { + unbindService(serviceConnection); + } catch (IllegalArgumentException e) { + Log.w(TAG, "MeshService not registered or already unbound: " + e.getMessage()); + } + isMeshServiceBound = false; + meshService = null; + } + } + +} \ No newline at end of file diff --git a/mesh_service_example/src/main/proto b/mesh_service_example/src/main/proto new file mode 160000 index 000000000..24c7a3d28 --- /dev/null +++ b/mesh_service_example/src/main/proto @@ -0,0 +1 @@ +Subproject commit 24c7a3d287a4bd269ce191827e5dabd8ce8f57a7 diff --git a/mesh_service_example/src/main/res/drawable/ic_launcher_background.xml b/mesh_service_example/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..07d5da9cb --- /dev/null +++ b/mesh_service_example/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mesh_service_example/src/main/res/drawable/ic_launcher_foreground.xml b/mesh_service_example/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..2b068d114 --- /dev/null +++ b/mesh_service_example/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/mesh_service_example/src/main/res/layout/activity_main.xml b/mesh_service_example/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..7b1f2aa1d --- /dev/null +++ b/mesh_service_example/src/main/res/layout/activity_main.xml @@ -0,0 +1,40 @@ + + + + + + + + + + \ No newline at end of file diff --git a/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher.xml b/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 000000000..6f3b755bf --- /dev/null +++ b/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 000000000..6f3b755bf --- /dev/null +++ b/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/mesh_service_example/src/main/res/values-night/themes.xml b/mesh_service_example/src/main/res/values-night/themes.xml new file mode 100644 index 000000000..42a68d940 --- /dev/null +++ b/mesh_service_example/src/main/res/values-night/themes.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/mesh_service_example/src/main/res/values/colors.xml b/mesh_service_example/src/main/res/values/colors.xml new file mode 100644 index 000000000..c8524cd96 --- /dev/null +++ b/mesh_service_example/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/mesh_service_example/src/main/res/values/strings.xml b/mesh_service_example/src/main/res/values/strings.xml new file mode 100644 index 000000000..fcec4106c --- /dev/null +++ b/mesh_service_example/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + MeshServiceExample + \ No newline at end of file diff --git a/mesh_service_example/src/main/res/values/themes.xml b/mesh_service_example/src/main/res/values/themes.xml new file mode 100644 index 000000000..e8f8fe799 --- /dev/null +++ b/mesh_service_example/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + +