Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Indoors #383

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[WIP] Indoors #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20e3efa
indoors first pass on android
lmeier Jul 16, 2024
ed02da1
only call ble if API>=21
ShiCheng-Lu Jul 24, 2024
ab9f9dc
gate indoor survey call with Android API version check
ShiCheng-Lu Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apply plugin: "org.jetbrains.dokka"
apply plugin: 'io.radar.mvnpublish'

ext {
radarVersion = '3.14.0'
radarVersion = '3.16.0-beta.1'
}

String buildNumber = ".${System.currentTimeMillis()}"
Expand Down
101 changes: 65 additions & 36 deletions sdk/src/main/java/io/radar/sdk/Radar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,13 @@ object Radar {
)
}

// interface RadarIndoorSurveyCallback {
// fun onComplete(
// status: RadarStatus,
// indoorsPayload: String
// )
// }

/**
* The status types for a request. See [](https://radar.com/documentation/sdk/android#foreground-tracking).
*/
Expand Down Expand Up @@ -431,6 +438,7 @@ object Radar {
private var verifiedReceiver: RadarVerifiedReceiver? = null
internal lateinit var logger: RadarLogger
internal lateinit var apiClient: RadarApiClient
internal lateinit var indoorSurveyManager: RadarIndoorSurveyManager
internal lateinit var locationManager: RadarLocationManager
internal lateinit var beaconManager: RadarBeaconManager
private lateinit var logBuffer: RadarLogBuffer
Expand Down Expand Up @@ -544,6 +552,10 @@ object Radar {
this.logger.d("Using Huawei location services")
}

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !this::indoorSurveyManager.isInitialized) {
this.indoorSurveyManager = RadarIndoorSurveyManager(this.context, logger, locationManager, apiClient)
}

val application = this.context as? Application
if (fraud) {
RadarSettings.setSharing(this.context, false)
Expand Down Expand Up @@ -825,8 +837,8 @@ object Radar {
return
}

val callTrackApi = { beacons: Array<RadarBeacon>? ->
apiClient.track(location, stopped, true, RadarLocationSource.FOREGROUND_LOCATION, false, beacons, callback = object : RadarApiClient.RadarTrackApiCallback {
val callTrackApi = { beacons: Array<RadarBeacon>?, indoorsPayload: String ->
apiClient.track(location, stopped, true, RadarLocationSource.FOREGROUND_LOCATION, false, beacons, indoorsPayload, callback = object : RadarApiClient.RadarTrackApiCallback {
override fun onComplete(
status: RadarStatus,
res: JSONObject?,
Expand All @@ -846,45 +858,62 @@ object Radar {
})
}

if (beacons && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
apiClient.searchBeacons(location, 1000, 10, object : RadarApiClient.RadarSearchBeaconsApiCallback {
override fun onComplete(status: RadarStatus, res: JSONObject?, beacons: Array<RadarBeacon>?, uuids: Array<String>?, uids: Array<String>?) {
if (!uuids.isNullOrEmpty() || !uids.isNullOrEmpty()) {
beaconManager.startMonitoringBeaconUUIDs(uuids, uids)

beaconManager.rangeBeaconUUIDs(uuids, uids, false, object : RadarBeaconCallback {
override fun onComplete(status: RadarStatus, beacons: Array<RadarBeacon>?) {
if (status != RadarStatus.SUCCESS || beacons == null) {
callTrackApi(null)

return
}

callTrackApi(beacons)
}
})
} else if (beacons != null) {
beaconManager.startMonitoringBeacons(beacons)

beaconManager.rangeBeacons(beacons, false, object : RadarBeaconCallback {
override fun onComplete(status: RadarStatus, beacons: Array<RadarBeacon>?) {
if (status != RadarStatus.SUCCESS || beacons == null) {
callTrackApi(null)

return
}

callTrackApi(beacons)
}
})
logger.i("calling RadarIndoorsSurvey", RadarLogType.SDK_CALL)
// todo: call indoors survey here
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
indoorSurveyManager.start("WHEREAMI", 10, location, true, callback = object : RadarIndoorSurveyManager.RadarIndoorSurveyCallback {
override fun onComplete(status: RadarStatus, payload: String) {
if (status != RadarStatus.SUCCESS) {
callTrackApi(null, "")
} else {
callTrackApi(arrayOf());
callTrackApi(null, payload)
}
}
}, false)
})
} else {
callTrackApi(null)
callTrackApi(null, "")
}


// if (beacons && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// apiClient.searchBeacons(location, 1000, 10, object : RadarApiClient.RadarSearchBeaconsApiCallback {
// override fun onComplete(status: RadarStatus, res: JSONObject?, beacons: Array<RadarBeacon>?, uuids: Array<String>?, uids: Array<String>?) {
// if (!uuids.isNullOrEmpty() || !uids.isNullOrEmpty()) {
// beaconManager.startMonitoringBeaconUUIDs(uuids, uids)

// beaconManager.rangeBeaconUUIDs(uuids, uids, false, object : RadarBeaconCallback {
// override fun onComplete(status: RadarStatus, beacons: Array<RadarBeacon>?) {
// if (status != RadarStatus.SUCCESS || beacons == null) {
// callTrackApi(null)

// return
// }

// callTrackApi(beacons)
// }
// })
// } else if (beacons != null) {
// beaconManager.startMonitoringBeacons(beacons)

// beaconManager.rangeBeacons(beacons, false, object : RadarBeaconCallback {
// override fun onComplete(status: RadarStatus, beacons: Array<RadarBeacon>?) {
// if (status != RadarStatus.SUCCESS || beacons == null) {
// callTrackApi(null)

// return
// }

// callTrackApi(beacons)
// }
// })
// } else {
// callTrackApi(arrayOf());
// }
// }
// }, false)
// } else {
// callTrackApi(null)
// }
}
})
}
Expand Down
5 changes: 4 additions & 1 deletion sdk/src/main/java/io/radar/sdk/RadarApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ internal class RadarApiClient(
)
}

internal fun track(location: Location, stopped: Boolean, foreground: Boolean, source: RadarLocationSource, replayed: Boolean, beacons: Array<RadarBeacon>?, verified: Boolean = false, integrityToken: String? = null, integrityException: String? = null, encrypted: Boolean? = false, callback: RadarTrackApiCallback? = null) {
internal fun track(location: Location, stopped: Boolean, foreground: Boolean, source: RadarLocationSource, replayed: Boolean, beacons: Array<RadarBeacon>?, indoorsWhereAmIScan: String? = null, verified: Boolean = false, integrityToken: String? = null, integrityException: String? = null, encrypted: Boolean? = false, callback: RadarTrackApiCallback? = null) {
val publishableKey = RadarSettings.getPublishableKey(context)
if (publishableKey == null) {
callback?.onComplete(RadarStatus.ERROR_PUBLISHABLE_KEY)
Expand Down Expand Up @@ -341,6 +341,9 @@ internal class RadarApiClient(
params.putOpt("sharing", RadarUtils.isScreenSharing(context))
params.putOpt("encrypted", encrypted)
}
if (indoorsWhereAmIScan != null) {
params.putOpt("indoorsWhereAmIScan", indoorsWhereAmIScan)
}
params.putOpt("appId", context.packageName)
} catch (e: JSONException) {
callback?.onComplete(RadarStatus.ERROR_BAD_REQUEST)
Expand Down
Loading