Skip to content

Commit ceaefda

Browse files
doranteseduardodoranteseduardo
committed
fix: add all fields in the response
1 parent fa48ba4 commit ceaefda

6 files changed

Lines changed: 140 additions & 2 deletions

File tree

‎android/sharedCode/src/main/cpp/arcore/VROARSessionARCore.cpp‎

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1907,21 +1907,90 @@ static std::string rvGeoAnchorToJsonARC(const ReactVisionCCA::GeospatialAnchorRe
19071907
snprintf(buf, sizeof(buf), "%.4f", r.alt); j += "\"alt\":"; j += buf; j += ",";
19081908
j += "\"altitudeMode\":\"" + rvEscJsonARC(r.altitudeMode) + "\",";
19091909
j += "\"name\":\"" + rvEscJsonARC(r.name) + "\",";
1910+
j += "\"description\":\"" + rvEscJsonARC(r.description) + "\",";
1911+
j += "\"createdAt\":\"" + rvEscJsonARC(r.createdAt) + "\",";
1912+
j += "\"updatedAt\":\"" + rvEscJsonARC(r.updatedAt) + "\",";
19101913
j += "\"sceneAssetId\":\"" + rvEscJsonARC(r.sceneAssetId) + "\",";
19111914
j += "\"sceneId\":\"" + rvEscJsonARC(r.sceneId) + "\",";
1915+
j += "\"userAssetId\":\"" + rvEscJsonARC(r.userAssetId) + "\",";
19121916
snprintf(buf, sizeof(buf), "%.2f", r.distanceMeters); j += "\"distanceMeters\":"; j += buf;
1917+
// creatorData
1918+
j += ",\"creatorData\":{";
1919+
j += "\"id\":\"" + rvEscJsonARC(r.creatorData.id) + "\",";
1920+
j += "\"firstName\":\"" + rvEscJsonARC(r.creatorData.firstName) + "\",";
1921+
j += "\"lastName\":\"" + rvEscJsonARC(r.creatorData.lastName) + "\"";
1922+
j += "}";
1923+
// sceneAssetData
19131924
if (r.hasSceneAsset) {
19141925
j += ",\"sceneAssetData\":{";
19151926
j += "\"id\":\"" + rvEscJsonARC(r.sceneAssetData.id) + "\",";
19161927
j += "\"name\":\"" + rvEscJsonARC(r.sceneAssetData.name) + "\",";
1928+
j += "\"assetId\":\"" + rvEscJsonARC(r.sceneAssetData.assetId) + "\",";
19171929
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.scale); j += "\"scale\":"; j += buf; j += ",";
19181930
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.positionX); j += "\"positionX\":"; j += buf; j += ",";
19191931
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.positionY); j += "\"positionY\":"; j += buf; j += ",";
19201932
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.positionZ); j += "\"positionZ\":"; j += buf; j += ",";
19211933
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.rotationX); j += "\"rotationX\":"; j += buf; j += ",";
19221934
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.rotationY); j += "\"rotationY\":"; j += buf; j += ",";
19231935
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.rotationZ); j += "\"rotationZ\":"; j += buf;
1924-
j += ",\"fileUrl\":\"" + rvEscJsonARC(r.sceneAssetData.teamAsset.fileUrl) + "\"";
1936+
j += ",\"teamAsset\":{";
1937+
j += "\"id\":\"" + rvEscJsonARC(r.sceneAssetData.teamAsset.id) + "\",";
1938+
j += "\"name\":\"" + rvEscJsonARC(r.sceneAssetData.teamAsset.name) + "\",";
1939+
j += "\"fileUrl\":\"" + rvEscJsonARC(r.sceneAssetData.teamAsset.fileUrl) + "\",";
1940+
snprintf(buf, sizeof(buf), "%lld", (long long)r.sceneAssetData.teamAsset.fileSize); j += "\"fileSize\":"; j += buf; j += ",";
1941+
j += "\"assetType\":\"" + rvEscJsonARC(r.sceneAssetData.teamAsset.assetType) + "\"";
1942+
j += "}";
1943+
j += "}";
1944+
}
1945+
// sceneData
1946+
if (r.hasScene) {
1947+
j += ",\"sceneData\":{";
1948+
j += "\"id\":\"" + rvEscJsonARC(r.sceneData.id) + "\",";
1949+
j += "\"name\":\"" + rvEscJsonARC(r.sceneData.name) + "\",";
1950+
snprintf(buf, sizeof(buf), "%.10f", r.sceneData.latitude); j += "\"latitude\":"; j += buf; j += ",";
1951+
snprintf(buf, sizeof(buf), "%.10f", r.sceneData.longitude); j += "\"longitude\":"; j += buf; j += ",";
1952+
j += "\"planeDetection\":\"" + rvEscJsonARC(r.sceneData.planeDetection) + "\",";
1953+
j += "\"planeDirection\":\"" + rvEscJsonARC(r.sceneData.planeDirection) + "\",";
1954+
j += "\"createdAt\":\"" + rvEscJsonARC(r.sceneData.createdAt) + "\",";
1955+
j += "\"sceneAssets\":[";
1956+
for (size_t i = 0; i < r.sceneData.sceneAssets.size(); ++i) {
1957+
const auto& sa = r.sceneData.sceneAssets[i];
1958+
if (i > 0) j += ",";
1959+
j += "{";
1960+
j += "\"id\":\"" + rvEscJsonARC(sa.id) + "\",";
1961+
j += "\"name\":\"" + rvEscJsonARC(sa.name) + "\",";
1962+
j += "\"assetId\":\"" + rvEscJsonARC(sa.assetId) + "\",";
1963+
snprintf(buf, sizeof(buf), "%.4f", sa.scale); j += "\"scale\":"; j += buf; j += ",";
1964+
snprintf(buf, sizeof(buf), "%.4f", sa.positionX); j += "\"positionX\":"; j += buf; j += ",";
1965+
snprintf(buf, sizeof(buf), "%.4f", sa.positionY); j += "\"positionY\":"; j += buf; j += ",";
1966+
snprintf(buf, sizeof(buf), "%.4f", sa.positionZ); j += "\"positionZ\":"; j += buf; j += ",";
1967+
snprintf(buf, sizeof(buf), "%.4f", sa.rotationX); j += "\"rotationX\":"; j += buf; j += ",";
1968+
snprintf(buf, sizeof(buf), "%.4f", sa.rotationY); j += "\"rotationY\":"; j += buf; j += ",";
1969+
snprintf(buf, sizeof(buf), "%.4f", sa.rotationZ); j += "\"rotationZ\":"; j += buf;
1970+
j += ",\"teamAsset\":{";
1971+
j += "\"id\":\"" + rvEscJsonARC(sa.teamAsset.id) + "\",";
1972+
j += "\"name\":\"" + rvEscJsonARC(sa.teamAsset.name) + "\",";
1973+
j += "\"fileUrl\":\"" + rvEscJsonARC(sa.teamAsset.fileUrl) + "\",";
1974+
snprintf(buf, sizeof(buf), "%lld", (long long)sa.teamAsset.fileSize); j += "\"fileSize\":"; j += buf; j += ",";
1975+
j += "\"assetType\":\"" + rvEscJsonARC(sa.teamAsset.assetType) + "\"";
1976+
j += "}";
1977+
j += "}";
1978+
}
1979+
j += "]";
1980+
j += "}";
1981+
}
1982+
// userAssetData
1983+
if (r.hasUserAsset) {
1984+
j += ",\"userAssetData\":{";
1985+
j += "\"id\":\"" + rvEscJsonARC(r.userAssetData.id) + "\",";
1986+
j += "\"name\":\"" + rvEscJsonARC(r.userAssetData.name) + "\",";
1987+
j += "\"description\":\"" + rvEscJsonARC(r.userAssetData.description) + "\",";
1988+
j += "\"fileUrl\":\"" + rvEscJsonARC(r.userAssetData.fileUrl) + "\",";
1989+
snprintf(buf, sizeof(buf), "%lld", (long long)r.userAssetData.fileSize); j += "\"fileSize\":"; j += buf; j += ",";
1990+
j += "\"assetType\":\"" + rvEscJsonARC(r.userAssetData.assetType) + "\",";
1991+
j += "\"externalUserId\":\"" + rvEscJsonARC(r.userAssetData.externalUserId) + "\",";
1992+
j += "\"moderationStatus\":\"" + rvEscJsonARC(r.userAssetData.moderationStatus) + "\",";
1993+
j += "\"createdAt\":\"" + rvEscJsonARC(r.userAssetData.createdAt) + "\"";
19251994
j += "}";
19261995
}
19271996
j += "}";

‎android/sharedCode/src/main/jniLibs/arm64-v8a/libreactvisioncca.so‎

4.47 KB
Binary file not shown.

‎android/sharedCode/src/main/jniLibs/armeabi-v7a/libreactvisioncca.so‎

1.5 KB
Binary file not shown.

‎ios/Libraries/reactvisioncca/arm64/libreactvisioncca.a‎

5.13 KB
Binary file not shown.

‎ios/Libraries/reactvisioncca/arm64_simulator/libreactvisioncca.a‎

10.8 KB
Binary file not shown.

‎ios/ViroKit/VROARSessioniOS.cpp‎

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,21 +1875,90 @@ static std::string rvGeoAnchorToJson(const ReactVisionCCA::GeospatialAnchorRecor
18751875
snprintf(buf, sizeof(buf), "%.4f", r.alt); j += "\"alt\":"; j += buf; j += ",";
18761876
j += "\"altitudeMode\":\"" + rvEscJson(r.altitudeMode) + "\",";
18771877
j += "\"name\":\"" + rvEscJson(r.name) + "\",";
1878+
j += "\"description\":\"" + rvEscJson(r.description) + "\",";
1879+
j += "\"createdAt\":\"" + rvEscJson(r.createdAt) + "\",";
1880+
j += "\"updatedAt\":\"" + rvEscJson(r.updatedAt) + "\",";
18781881
j += "\"sceneAssetId\":\"" + rvEscJson(r.sceneAssetId) + "\",";
18791882
j += "\"sceneId\":\"" + rvEscJson(r.sceneId) + "\",";
1883+
j += "\"userAssetId\":\"" + rvEscJson(r.userAssetId) + "\",";
18801884
snprintf(buf, sizeof(buf), "%.2f", r.distanceMeters); j += "\"distanceMeters\":"; j += buf;
1885+
// creatorData
1886+
j += ",\"creatorData\":{";
1887+
j += "\"id\":\"" + rvEscJson(r.creatorData.id) + "\",";
1888+
j += "\"firstName\":\"" + rvEscJson(r.creatorData.firstName) + "\",";
1889+
j += "\"lastName\":\"" + rvEscJson(r.creatorData.lastName) + "\"";
1890+
j += "}";
1891+
// sceneAssetData
18811892
if (r.hasSceneAsset) {
18821893
j += ",\"sceneAssetData\":{";
18831894
j += "\"id\":\"" + rvEscJson(r.sceneAssetData.id) + "\",";
18841895
j += "\"name\":\"" + rvEscJson(r.sceneAssetData.name) + "\",";
1896+
j += "\"assetId\":\"" + rvEscJson(r.sceneAssetData.assetId) + "\",";
18851897
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.scale); j += "\"scale\":"; j += buf; j += ",";
18861898
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.positionX); j += "\"positionX\":"; j += buf; j += ",";
18871899
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.positionY); j += "\"positionY\":"; j += buf; j += ",";
18881900
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.positionZ); j += "\"positionZ\":"; j += buf; j += ",";
18891901
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.rotationX); j += "\"rotationX\":"; j += buf; j += ",";
18901902
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.rotationY); j += "\"rotationY\":"; j += buf; j += ",";
18911903
snprintf(buf, sizeof(buf), "%.4f", r.sceneAssetData.rotationZ); j += "\"rotationZ\":"; j += buf;
1892-
j += ",\"fileUrl\":\"" + rvEscJson(r.sceneAssetData.teamAsset.fileUrl) + "\"";
1904+
j += ",\"teamAsset\":{";
1905+
j += "\"id\":\"" + rvEscJson(r.sceneAssetData.teamAsset.id) + "\",";
1906+
j += "\"name\":\"" + rvEscJson(r.sceneAssetData.teamAsset.name) + "\",";
1907+
j += "\"fileUrl\":\"" + rvEscJson(r.sceneAssetData.teamAsset.fileUrl) + "\",";
1908+
snprintf(buf, sizeof(buf), "%lld", (long long)r.sceneAssetData.teamAsset.fileSize); j += "\"fileSize\":"; j += buf; j += ",";
1909+
j += "\"assetType\":\"" + rvEscJson(r.sceneAssetData.teamAsset.assetType) + "\"";
1910+
j += "}";
1911+
j += "}";
1912+
}
1913+
// sceneData
1914+
if (r.hasScene) {
1915+
j += ",\"sceneData\":{";
1916+
j += "\"id\":\"" + rvEscJson(r.sceneData.id) + "\",";
1917+
j += "\"name\":\"" + rvEscJson(r.sceneData.name) + "\",";
1918+
snprintf(buf, sizeof(buf), "%.10f", r.sceneData.latitude); j += "\"latitude\":"; j += buf; j += ",";
1919+
snprintf(buf, sizeof(buf), "%.10f", r.sceneData.longitude); j += "\"longitude\":"; j += buf; j += ",";
1920+
j += "\"planeDetection\":\"" + rvEscJson(r.sceneData.planeDetection) + "\",";
1921+
j += "\"planeDirection\":\"" + rvEscJson(r.sceneData.planeDirection) + "\",";
1922+
j += "\"createdAt\":\"" + rvEscJson(r.sceneData.createdAt) + "\",";
1923+
j += "\"sceneAssets\":[";
1924+
for (size_t i = 0; i < r.sceneData.sceneAssets.size(); ++i) {
1925+
const auto& sa = r.sceneData.sceneAssets[i];
1926+
if (i > 0) j += ",";
1927+
j += "{";
1928+
j += "\"id\":\"" + rvEscJson(sa.id) + "\",";
1929+
j += "\"name\":\"" + rvEscJson(sa.name) + "\",";
1930+
j += "\"assetId\":\"" + rvEscJson(sa.assetId) + "\",";
1931+
snprintf(buf, sizeof(buf), "%.4f", sa.scale); j += "\"scale\":"; j += buf; j += ",";
1932+
snprintf(buf, sizeof(buf), "%.4f", sa.positionX); j += "\"positionX\":"; j += buf; j += ",";
1933+
snprintf(buf, sizeof(buf), "%.4f", sa.positionY); j += "\"positionY\":"; j += buf; j += ",";
1934+
snprintf(buf, sizeof(buf), "%.4f", sa.positionZ); j += "\"positionZ\":"; j += buf; j += ",";
1935+
snprintf(buf, sizeof(buf), "%.4f", sa.rotationX); j += "\"rotationX\":"; j += buf; j += ",";
1936+
snprintf(buf, sizeof(buf), "%.4f", sa.rotationY); j += "\"rotationY\":"; j += buf; j += ",";
1937+
snprintf(buf, sizeof(buf), "%.4f", sa.rotationZ); j += "\"rotationZ\":"; j += buf;
1938+
j += ",\"teamAsset\":{";
1939+
j += "\"id\":\"" + rvEscJson(sa.teamAsset.id) + "\",";
1940+
j += "\"name\":\"" + rvEscJson(sa.teamAsset.name) + "\",";
1941+
j += "\"fileUrl\":\"" + rvEscJson(sa.teamAsset.fileUrl) + "\",";
1942+
snprintf(buf, sizeof(buf), "%lld", (long long)sa.teamAsset.fileSize); j += "\"fileSize\":"; j += buf; j += ",";
1943+
j += "\"assetType\":\"" + rvEscJson(sa.teamAsset.assetType) + "\"";
1944+
j += "}";
1945+
j += "}";
1946+
}
1947+
j += "]";
1948+
j += "}";
1949+
}
1950+
// userAssetData
1951+
if (r.hasUserAsset) {
1952+
j += ",\"userAssetData\":{";
1953+
j += "\"id\":\"" + rvEscJson(r.userAssetData.id) + "\",";
1954+
j += "\"name\":\"" + rvEscJson(r.userAssetData.name) + "\",";
1955+
j += "\"description\":\"" + rvEscJson(r.userAssetData.description) + "\",";
1956+
j += "\"fileUrl\":\"" + rvEscJson(r.userAssetData.fileUrl) + "\",";
1957+
snprintf(buf, sizeof(buf), "%lld", (long long)r.userAssetData.fileSize); j += "\"fileSize\":"; j += buf; j += ",";
1958+
j += "\"assetType\":\"" + rvEscJson(r.userAssetData.assetType) + "\",";
1959+
j += "\"externalUserId\":\"" + rvEscJson(r.userAssetData.externalUserId) + "\",";
1960+
j += "\"moderationStatus\":\"" + rvEscJson(r.userAssetData.moderationStatus) + "\",";
1961+
j += "\"createdAt\":\"" + rvEscJson(r.userAssetData.createdAt) + "\"";
18931962
j += "}";
18941963
}
18951964
j += "}";

0 commit comments

Comments
 (0)