From 00c3ba9b4cd559e3c0f1df383ea8df7ee7c4506b Mon Sep 17 00:00:00 2001 From: rizky_denianto Date: Tue, 14 Apr 2026 23:23:47 +0700 Subject: [PATCH] Mengubah daftar respon dari map ke jsarray --- android/src/main/java/BluclasPlugin.kt | 12 +++++++----- src/commands.rs | 2 +- src/desktop.rs | 9 ++------- src/mobile.rs | 4 +--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/android/src/main/java/BluclasPlugin.kt b/android/src/main/java/BluclasPlugin.kt index 3509a88..e36b125 100644 --- a/android/src/main/java/BluclasPlugin.kt +++ b/android/src/main/java/BluclasPlugin.kt @@ -11,6 +11,7 @@ import app.tauri.annotation.InvokeArg import app.tauri.annotation.Permission import app.tauri.annotation.TauriPlugin import app.tauri.plugin.Invoke +import app.tauri.plugin.JSArray import app.tauri.plugin.JSObject import app.tauri.plugin.Plugin import java.io.OutputStream @@ -45,11 +46,12 @@ class BluclasPlugin(private val activity: Activity) : Plugin(activity) { return } - val daftarRes = adapter.bondedDevices.map { i -> - mapOf( - "nama" to (i.name ?: "Unknown"), - "alamat" to i.address - ) + val daftarRes = JSArray() + adapter.bondedDevices.map { i -> + val res = JSObject() + res.put("nama", i.name ?: "Unknown") + res.put("alamat", i.address) + daftarRes.put(res) } val objekDaftarRes = JSObject() diff --git a/src/commands.rs b/src/commands.rs index e06a01c..9900ebd 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -7,7 +7,7 @@ use crate::Result; #[command] pub(crate) async fn daftar_perangkat( app: AppHandle, -) -> Result { +) -> Result { return app.bluclas().daftar_perangkat(); } diff --git a/src/desktop.rs b/src/desktop.rs index 3598916..14e0453 100644 --- a/src/desktop.rs +++ b/src/desktop.rs @@ -14,13 +14,8 @@ pub fn init( pub struct Bluclas(AppHandle); impl Bluclas { - pub fn daftar_perangkat( - &self, - ) -> crate::Result { - return Ok(SDaftarPerangkatBlueclasClassicResponDaftarPerangkat { - nama: String::new(), - alamat: String::new(), - }); + pub fn daftar_perangkat(&self) -> crate::Result { + return Ok(SBlueclasClassicResponDaftarPerangkat { data: vec![] }); } pub fn kirim(&self, _: SBlueclasClassicMuatanKirim) -> crate::Result<()> { diff --git a/src/mobile.rs b/src/mobile.rs index 613aefd..d9045ad 100644 --- a/src/mobile.rs +++ b/src/mobile.rs @@ -25,9 +25,7 @@ pub fn init( pub struct Bluclas(PluginHandle); impl Bluclas { - pub fn daftar_perangkat( - &self, - ) -> crate::Result { + pub fn daftar_perangkat(&self) -> crate::Result { return self .0 .run_mobile_plugin("daftarPerangkat", ())