Skip to content

Make moreAvailable changes to the Android project #5

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

Merged
jdrichards50 merged 2 commits into from
Feb 10, 2021
Merged

Make moreAvailable changes to the Android project #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e212b59
Make same changes to the Android project
jdrichards50 Feb 10, 2021
2960d6f
Change app name from "demo" to "ChartIQ"
jdrichards50 Feb 10, 2021
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
18 changes: 13 additions & 5 deletions chartiq/src/main/java/com/chartiq/sdk/ChartIQHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ class ChartIQHandler(
QuoteFeedParams(symbol, period?.toInt(), interval, start, end, meta, callbackId)
dataSource?.pullInitialData(quoteFeedParams) { data ->
callbackId?.let {
invokePullCallback(callbackId, data)
// set moreAvailable to true as you want to see if there is more historical data after the initial pull
invokePullCallback(callbackId, data, true)
}
}
}
Expand All @@ -109,7 +110,8 @@ class ChartIQHandler(
QuoteFeedParams(symbol, period?.toInt(), interval, start, null, meta, callbackId)
dataSource?.pullUpdateData(quoteFeedParams) { data ->
callbackId?.let {
invokePullCallback(callbackId, data)
// just an update, no need to see if there is more historical data available
invokePullCallback(callbackId, data, false)
}
}
}
Expand All @@ -128,7 +130,13 @@ class ChartIQHandler(
QuoteFeedParams(symbol, period?.toInt(), interval, start, end, meta, callbackId)
dataSource?.pullPaginationData(quoteFeedParams) { data ->
callbackId?.let {
invokePullCallback(callbackId, data)
// Check to see if you need to try and retrieve more historical data.
// This is where you can put your own logic on when to stop retrieving historical data.
// By default if the last pagination request return 0 data then it has probably reached the end.
// If you have spotty data then another idea might be to check the last historical date, this would require you knowing what date to stop at though.
var moreAvailable = true
if(data.size < 1) moreAvailable = false
invokePullCallback(callbackId, data, moreAvailable)
}
}
}
Expand Down Expand Up @@ -445,8 +453,8 @@ class ChartIQHandler(
chartIQView.evaluateJavascript(script, callback)
}

private fun invokePullCallback(callbackId: String, data: List<OHLCParams>) {
executeJavascript(scriptManager.getParseDataScript(data, callbackId))
private fun invokePullCallback(callbackId: String, data: List<OHLCParams>, moreAvailable: Boolean) {
executeJavascript(scriptManager.getParseDataScript(data, callbackId, moreAvailable))
}

override fun getActiveSeries(callback: OnReturnCallback<List<Series>>) {
Expand Down
4 changes: 2 additions & 2 deletions chartiq/src/main/java/com/chartiq/sdk/scriptmanager/ChartIQScriptManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ internal class ChartIQScriptManager : ScriptManager {
override fun getGetEnginePropertyScript(property: String): String =
MOBILE_BRIDGE_NAME_SPACE + "getEngineProperty(\"$property\");"

override fun getParseDataScript(data: List<OHLCParams>, callbackId: String): String =
MOBILE_BRIDGE_NAME_SPACE + "parseData('${Gson().toJson(data)}', \"$callbackId\")"
override fun getParseDataScript(data: List<OHLCParams>, callbackId: String, moreAvailable: Boolean): String =
MOBILE_BRIDGE_NAME_SPACE + "parseData('${Gson().toJson(data)}', \"$callbackId\", $moreAvailable)"

override fun getInvertYAxisScript(): String =
MOBILE_BRIDGE_NAME_SPACE + "getLayoutProperty(\"flipped\");"
Expand Down
2 changes: 1 addition & 1 deletion chartiq/src/main/java/com/chartiq/sdk/scriptmanager/ScriptManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ internal interface ScriptManager {

fun getGetEnginePropertyScript(property: String): String

fun getParseDataScript(data: List<OHLCParams>, callbackId: String): String
fun getParseDataScript(data: List<OHLCParams>, callbackId: String, moreAvailable: Boolean): String

fun getInvertYAxisScript(): String

Expand Down
2 changes: 1 addition & 1 deletion demo/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Demo</string>
<string name="app_name">ChartIQ</string>

<string name="title_chart">Chart</string>
<string name="title_study">Studies</string>
Expand Down