From 04df66f736203b083401b6975ebf2a796313e25b Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Fri, 9 Feb 2024 10:56:12 -0800 Subject: [PATCH 01/33] Added button for Bluetooth Scan Page See Issue [#1046](https://github.com/e-mission/e-mission-docs/issues/1046#issuecomment-1924743636) for more details. This commit adds the Dev-Zone settings option, which will eventually link to the Bluetooth Scanner page. TODO: - Add i18next translation for control.bluetooth --- www/js/control/ProfileSettings.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/js/control/ProfileSettings.tsx b/www/js/control/ProfileSettings.tsx index 56c19efe9..7b2151a6a 100644 --- a/www/js/control/ProfileSettings.tsx +++ b/www/js/control/ProfileSettings.tsx @@ -460,8 +460,11 @@ const ProfileSettings = () => { textKey="control.email-log" iconName="email" action={() => sendEmail('loggerDB')}> - + {alert(`Not Implemented!`)}}> Date: Fri, 9 Feb 2024 15:17:50 -0800 Subject: [PATCH 02/33] Added barebones BluetoothScanPage The button added in settings now will open a Modal "Page" that will (eventually) contain the bluetooth devices within scanning distance! --- www/js/bluetooth/BluetoothScanPage.tsx | 62 ++++++++++++++++++++++ www/js/control/BluetoothScanSettingRow.tsx | 27 ++++++++++ www/js/control/ProfileSettings.tsx | 6 +-- 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 www/js/bluetooth/BluetoothScanPage.tsx create mode 100644 www/js/control/BluetoothScanSettingRow.tsx diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx new file mode 100644 index 000000000..80f5c7a1c --- /dev/null +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -0,0 +1,62 @@ +import React, { useContext } from 'react'; +import { useTranslation } from 'react-i18next'; +import { AppContext } from '../App'; +import { StyleSheet, Text, Modal, ScrollView, SafeAreaView, Pressable } from 'react-native'; + +/** + * The implementation of this scanner page follows the design of + * `www/js/survey/enketo/EnketoModal.tsx`! + * + * Future work may include refractoring these files to be implementations of a + * single base "pop-up page" component + */ +const BluetoothScanPage = ({...props}: any) => { + const { t } = useTranslation(); + const context = useContext(AppContext); // May not be necessary + + const BlueScanContent = ( +
+
+ { // TODO: Fix background color of button + + } +
+ + {'Add Scanner Components here!'} + +
+ ); + + return ( + <> + + + + +
{BlueScanContent}
+ + + + + + ); +}; + +const s = StyleSheet.create({ + dismissBtn: { + height: 38, + fontSize: 11, + color: '#222', + marginRight: 'auto', + display: 'flex', + alignItems: 'center', + padding: 0, + }, +}); + +export default BluetoothScanPage; diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx new file mode 100644 index 000000000..1f7757559 --- /dev/null +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -0,0 +1,27 @@ +import React, { useState } from 'react'; +import SettingRow from './SettingRow'; +import BluetoothScanPage from '../bluetooth/BluetoothScanPage'; + +const BluetoothScanSettingRow = ({}) => { + const [bluePageVisible, setBluePageVisible] = useState(false); + + function openPopover() { + // TODO: Add logic to check for conifig here, or in settings + setBluePageVisible(true) + }; + + return ( + <> + + setBluePageVisible(false)} + /> + + ); +}; + +export default BluetoothScanSettingRow; \ No newline at end of file diff --git a/www/js/control/ProfileSettings.tsx b/www/js/control/ProfileSettings.tsx index 7b2151a6a..32c5bcddd 100644 --- a/www/js/control/ProfileSettings.tsx +++ b/www/js/control/ProfileSettings.tsx @@ -6,6 +6,7 @@ import ExpansionSection from './ExpandMenu'; import SettingRow from './SettingRow'; import ControlDataTable from './ControlDataTable'; import DemographicsSettingRow from './DemographicsSettingRow'; +import BluetoothScanSettingRow from './BluetoothScanSettingRow'; import PopOpCode from './PopOpCode'; import ReminderTime from './ReminderTime'; import useAppConfig from '../useAppConfig'; @@ -461,10 +462,7 @@ const ProfileSettings = () => { iconName="email" action={() => sendEmail('loggerDB')}> - {alert(`Not Implemented!`)}}> + Date: Fri, 9 Feb 2024 15:35:52 -0800 Subject: [PATCH 03/33] Ran Prettier It seems I accidentally turned off my local VSCode Prettier... Fixing that now --- www/js/bluetooth/BluetoothScanPage.tsx | 53 +++++++++++----------- www/js/control/BluetoothScanSettingRow.tsx | 23 ++++------ www/js/control/ProfileSettings.tsx | 2 +- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 80f5c7a1c..ae6a36a8a 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -4,45 +4,44 @@ import { AppContext } from '../App'; import { StyleSheet, Text, Modal, ScrollView, SafeAreaView, Pressable } from 'react-native'; /** - * The implementation of this scanner page follows the design of - * `www/js/survey/enketo/EnketoModal.tsx`! - * - * Future work may include refractoring these files to be implementations of a + * The implementation of this scanner page follows the design of + * `www/js/survey/enketo/EnketoModal.tsx`! + * + * Future work may include refractoring these files to be implementations of a * single base "pop-up page" component */ -const BluetoothScanPage = ({...props}: any) => { +const BluetoothScanPage = ({ ...props }: any) => { const { t } = useTranslation(); const context = useContext(AppContext); // May not be necessary const BlueScanContent = (
-
- { // TODO: Fix background color of button - - } -
- - {'Add Scanner Components here!'} - +
+ { + // TODO: Fix background color of button + + } +
+ {'Add Scanner Components here!'}
); return ( <> - - - - -
{BlueScanContent}
- - - - + + + + +
{BlueScanContent}
+ + + + ); }; diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index 1f7757559..59beff0c9 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -5,23 +5,20 @@ import BluetoothScanPage from '../bluetooth/BluetoothScanPage'; const BluetoothScanSettingRow = ({}) => { const [bluePageVisible, setBluePageVisible] = useState(false); - function openPopover() { - // TODO: Add logic to check for conifig here, or in settings - setBluePageVisible(true) - }; + function openPopover() { + // TODO: Add logic to check for conifig here, or in settings + setBluePageVisible(true); + } return ( <> - - setBluePageVisible(false)} - /> + + setBluePageVisible(false)} /> ); }; -export default BluetoothScanSettingRow; \ No newline at end of file +export default BluetoothScanSettingRow; diff --git a/www/js/control/ProfileSettings.tsx b/www/js/control/ProfileSettings.tsx index 32c5bcddd..5d857dd99 100644 --- a/www/js/control/ProfileSettings.tsx +++ b/www/js/control/ProfileSettings.tsx @@ -462,7 +462,7 @@ const ProfileSettings = () => { iconName="email" action={() => sendEmail('loggerDB')}> - + Date: Sat, 10 Feb 2024 13:33:15 -0500 Subject: [PATCH 04/33] Added in the new bluetooth plugin so that it will automatically download on build. --- package.cordovabuild.json | 4 +++- setup/setup_shared_native.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.cordovabuild.json b/package.cordovabuild.json index 0fc1e31b2..9c0c1acb4 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -96,7 +96,8 @@ "cordova-plugin-androidx-adapter": {}, "phonegap-plugin-barcodescanner": { "ANDROID_SUPPORT_V4_VERSION": "27.+" - } + }, + "cordova-plugin-bluetooth-serial": {} } }, "dependencies": { @@ -132,6 +133,7 @@ "cordova-plugin-ionic-webview": "5.0.0", "cordova-plugin-local-notification-12": "github:e-mission/cordova-plugin-local-notification-12#v0.1.4-fix-android-action", "cordova-plugin-x-socialsharing": "6.0.4", + "cordova-plugin-bluetooth-serial": "0.4.7", "core-js": "^2.5.7", "enketo-core": "^6.1.7", "enketo-transformer": "^4.0.0", diff --git a/setup/setup_shared_native.sh b/setup/setup_shared_native.sh index 00c72a375..f7cba2aaf 100644 --- a/setup/setup_shared_native.sh +++ b/setup/setup_shared_native.sh @@ -23,7 +23,7 @@ sed -i -e "s|/usr/bin/env node|/usr/bin/env node --unhandled-rejections=strict|" npx cordova prepare -EXPECTED_COUNT=23 +EXPECTED_COUNT=24 INSTALLED_COUNT=`npx cordova plugin list | wc -l` echo "Found $INSTALLED_COUNT plugins, expected $EXPECTED_COUNT" if [ $INSTALLED_COUNT -lt $EXPECTED_COUNT ]; From 2cf78822827a977294cb6b0b32916897cdeae69e Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Sat, 10 Feb 2024 17:25:56 -0500 Subject: [PATCH 05/33] Roughly implemented the bluetooth scanner into the bluetooth page. Created bluetoothScanner.ts which houses the plugin scan request. I then added in functionality to the BluetoothScanPage to output the data that we get from the scan function. --- www/js/bluetooth/BluetoothScanPage.tsx | 33 +++++++++++++++++++++++++- www/js/bluetooth/blueoothScanner.ts | 23 ++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 www/js/bluetooth/blueoothScanner.ts diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index ae6a36a8a..e885392fb 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -1,7 +1,8 @@ -import React, { useContext } from 'react'; +import React, { useContext, useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { AppContext } from '../App'; import { StyleSheet, Text, Modal, ScrollView, SafeAreaView, Pressable } from 'react-native'; +import { gatherData } from './blueoothScanner'; /** * The implementation of this scanner page follows the design of @@ -13,6 +14,23 @@ import { StyleSheet, Text, Modal, ScrollView, SafeAreaView, Pressable } from 're const BluetoothScanPage = ({ ...props }: any) => { const { t } = useTranslation(); const context = useContext(AppContext); // May not be necessary + const [logs, setLogs] = useState([]); + + useEffect(() => { + + }, []); + + // Function to run Bluetooth test and update logs + const runBluetoothTest = async () => { + try { + setLogs(["Loading..."]); + const newLogs = await gatherData(); + setLogs(newLogs); + } catch (error) { + console.error(error); + // Handle error + } + }; const BlueScanContent = (
@@ -28,6 +46,16 @@ const BluetoothScanPage = ({ ...props }: any) => { } {'Add Scanner Components here!'} + + +

Console Output:

+ {logs.map((log, index) => ( +

{log}

+ ))}
); @@ -56,6 +84,9 @@ const s = StyleSheet.create({ alignItems: 'center', padding: 0, }, + btn: { + display: 'flex' + } }); export default BluetoothScanPage; diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts new file mode 100644 index 000000000..594860442 --- /dev/null +++ b/www/js/bluetooth/blueoothScanner.ts @@ -0,0 +1,23 @@ +function gatherData(): Promise { + return new Promise((resolve, reject) => { + let logs: string[] = []; + + window['bluetoothSerial'].discoverUnpaired( + (devices) => { + logs.push("Successfully scanned, results..."); + devices.forEach(function (device) { + logs.push("ID: " + device.id + " Name: " + device.name); + }); + resolve(logs); + }, + (failure) => { + logs.push("Failed!"); + logs.push("ERROR: " + failure); + console.debug("ERROR: " + failure); + reject(new Error(failure)); + } + ); + }); +} + + export { gatherData }; \ No newline at end of file From 7fe3958aeadc9781d8d89dc641c434d11731cb98 Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Mon, 12 Feb 2024 12:16:58 -0800 Subject: [PATCH 06/33] Updated Scanner UI - Formatted buttons - Added `BluetoothCard.tsx` - Centered buttons & Device Info - Fixed "Dismiss" Button, updated to arrow --- www/js/bluetooth/BluetoothCard.tsx | 33 +++++++++++ www/js/bluetooth/BluetoothScanPage.tsx | 82 +++++++++++++------------- www/js/bluetooth/blueoothScanner.ts | 46 ++++++++------- 3 files changed, 97 insertions(+), 64 deletions(-) create mode 100644 www/js/bluetooth/BluetoothCard.tsx diff --git a/www/js/bluetooth/BluetoothCard.tsx b/www/js/bluetooth/BluetoothCard.tsx new file mode 100644 index 000000000..76c14e892 --- /dev/null +++ b/www/js/bluetooth/BluetoothCard.tsx @@ -0,0 +1,33 @@ +import React from 'react'; +import { useTranslation } from 'react-i18next'; +import { Card, List } from 'react-native-paper'; +import { StyleSheet } from 'react-native'; + +type Props = any; +const BluetoothCard = ({ deviceName, deviceData }: Props) => { + const { t } = useTranslation(); + return ( + + } + /> + + ); +}; + +export const cardStyles = StyleSheet.create({ + card: { + position: 'relative', + alignSelf: 'center', + marginVertical: 10, + }, + cardContent: { + flex: 1, + width: '100%', + }, +}); + +export default BluetoothCard; diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index e885392fb..b3d479caf 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -1,8 +1,11 @@ import React, { useContext, useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { AppContext } from '../App'; -import { StyleSheet, Text, Modal, ScrollView, SafeAreaView, Pressable } from 'react-native'; -import { gatherData } from './blueoothScanner'; +import { StyleSheet, Modal, ScrollView, SafeAreaView, View } from 'react-native'; +import gatherBluetoothData from './blueoothScanner'; +import { logDebug } from '../plugin/logger'; +import BluetoothCard from './BluetoothCard'; +import { Appbar, useTheme, Button } from 'react-native-paper'; /** * The implementation of this scanner page follows the design of @@ -13,48 +16,48 @@ import { gatherData } from './blueoothScanner'; */ const BluetoothScanPage = ({ ...props }: any) => { const { t } = useTranslation(); - const context = useContext(AppContext); // May not be necessary const [logs, setLogs] = useState([]); - - useEffect(() => { - - }, []); + const { colors } = useTheme(); // Function to run Bluetooth test and update logs const runBluetoothTest = async () => { try { - setLogs(["Loading..."]); - const newLogs = await gatherData(); + const newLogs = await gatherBluetoothData(); setLogs(newLogs); } catch (error) { - console.error(error); + logDebug(error); // Handle error } }; const BlueScanContent = (
-
- { - // TODO: Fix background color of button - - } -
- {'Add Scanner Components here!'} - - -

Console Output:

+ + { + props.onDismiss?.(); + }} + /> + + + + + + + {logs.map((log, index) => ( -

{log}

+ ))}
); @@ -64,9 +67,7 @@ const BluetoothScanPage = ({ ...props }: any) => { - -
{BlueScanContent}
- +
{BlueScanContent}
@@ -75,18 +76,15 @@ const BluetoothScanPage = ({ ...props }: any) => { }; const s = StyleSheet.create({ - dismissBtn: { + btnContainer: { + padding: 16, + justifyContent: 'center', + }, + btn: { height: 38, fontSize: 11, - color: '#222', - marginRight: 'auto', - display: 'flex', - alignItems: 'center', - padding: 0, + margin: 4, }, - btn: { - display: 'flex' - } }); export default BluetoothScanPage; diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index 594860442..c311a6476 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -1,23 +1,25 @@ -function gatherData(): Promise { - return new Promise((resolve, reject) => { - let logs: string[] = []; - - window['bluetoothSerial'].discoverUnpaired( - (devices) => { - logs.push("Successfully scanned, results..."); - devices.forEach(function (device) { - logs.push("ID: " + device.id + " Name: " + device.name); - }); - resolve(logs); - }, - (failure) => { - logs.push("Failed!"); - logs.push("ERROR: " + failure); - console.debug("ERROR: " + failure); - reject(new Error(failure)); - } - ); - }); +import { logDebug } from '../plugin/logger'; + +export function gatherBluetoothData(): Promise { + return new Promise((resolve, reject) => { + let logs: string[] = []; + + window['bluetoothSerial'].discoverUnpaired( + (devices: Array) => { + logs.push('Successfully scanned, results...'); + devices.forEach(function (device) { + logs.push('ID: ' + device.id + ' Name: ' + device.name); + }); + resolve(logs); + }, + (err: string) => { + logs.push('Failed!'); + logs.push('ERROR: ' + err); + logDebug('ERROR: ' + err); + reject(new Error(err)); + }, + ); + }); } - - export { gatherData }; \ No newline at end of file + +export default gatherBluetoothData; From 07e4e17729b6eba9c6c32b66f40aeef7c648fdfb Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:41:53 -0800 Subject: [PATCH 07/33] Added translation support to Bluetooth Scanner Added english translations for scanner components --- www/i18n/en.json | 13 ++++++++++++- www/js/bluetooth/BluetoothCard.tsx | 2 -- www/js/bluetooth/BluetoothScanPage.tsx | 15 +++++++-------- www/js/bluetooth/blueoothScanner.ts | 16 +++++++++++----- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/www/i18n/en.json b/www/i18n/en.json index 9a1fadec7..4aec6165d 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -29,6 +29,7 @@ "user-data": "User data", "erase-data": "Erase data", "dev-zone": "Developer zone", + "bluetooth-scan": "Scan for Bluetooth", "refresh": "Refresh", "end-trip-sync": "End trip + sync", "check-consent": "Check consent", @@ -230,6 +231,15 @@ "list-datepicker-close": "Close", "list-datepicker-set": "Set", + "bluetooth": { + "scan-debug-title": "Bluetooth Scanner", + "scan-for-bluetooth": "Scan for Devices", + "device-info": { + "id": "ID", + "name": "Name" + } + }, + "service": { "reading-server": "Reading from server...", "reading-unprocessed-data": "Reading unprocessed data..." @@ -409,7 +419,8 @@ "while-repopulating-entry": "While repopulating timeline entry: ", "while-loading-metrics": "While loading metrics: ", "while-log-messages": "While getting messages from the log ", - "while-max-index": "While getting max index " + "while-max-index": "While getting max index ", + "while-scanning-bluetooth": "While scanning for Bluetooth Devices: " }, "consent-text": { "title": "NREL OPENPATH PRIVACY POLICY/TERMS OF USE", diff --git a/www/js/bluetooth/BluetoothCard.tsx b/www/js/bluetooth/BluetoothCard.tsx index 76c14e892..cda146f76 100644 --- a/www/js/bluetooth/BluetoothCard.tsx +++ b/www/js/bluetooth/BluetoothCard.tsx @@ -1,11 +1,9 @@ import React from 'react'; -import { useTranslation } from 'react-i18next'; import { Card, List } from 'react-native-paper'; import { StyleSheet } from 'react-native'; type Props = any; const BluetoothCard = ({ deviceName, deviceData }: Props) => { - const { t } = useTranslation(); return ( { const newLogs = await gatherBluetoothData(); setLogs(newLogs); } catch (error) { - logDebug(error); - // Handle error + logWarn(error); + // TODO: Handle error further } }; @@ -41,7 +40,7 @@ const BluetoothScanPage = ({ ...props }: any) => { props.onDismiss?.(); }} /> - + diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index c311a6476..efad6aea7 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -1,21 +1,27 @@ -import { logDebug } from '../plugin/logger'; +import { logWarn } from '../plugin/logger'; +import { useTranslation } from 'react-i18next'; export function gatherBluetoothData(): Promise { + const { t } = useTranslation(); + return new Promise((resolve, reject) => { let logs: string[] = []; window['bluetoothSerial'].discoverUnpaired( (devices: Array) => { - logs.push('Successfully scanned, results...'); devices.forEach(function (device) { - logs.push('ID: ' + device.id + ' Name: ' + device.name); + logs.push( + `${t('bluetooth.device-info.id')}: ${device.id} ${t('bluetooth.device-info.name')}: ${ + device.name + }`, + ); }); resolve(logs); }, (err: string) => { - logs.push('Failed!'); + logs.push(t('errors.while-scanning-bluetooth')); logs.push('ERROR: ' + err); - logDebug('ERROR: ' + err); + logWarn('ERROR: ' + err); reject(new Error(err)); }, ); From 86957d92e2ac19678667f72cd46aa303d339c90a Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:08:55 -0800 Subject: [PATCH 08/33] Changed "Scan once" button to "Toggle Scanning" --- www/i18n/en.json | 1 + www/js/bluetooth/BluetoothScanPage.tsx | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/www/i18n/en.json b/www/i18n/en.json index 4aec6165d..ac4c87469 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -234,6 +234,7 @@ "bluetooth": { "scan-debug-title": "Bluetooth Scanner", "scan-for-bluetooth": "Scan for Devices", + "is-scanning": "Scanning...", "device-info": { "id": "ID", "name": "Name" diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index b570ae44b..40826adf9 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { StyleSheet, Modal, ScrollView, SafeAreaView, View } from 'react-native'; import gatherBluetoothData from './blueoothScanner'; @@ -16,6 +16,7 @@ import { Appbar, useTheme, Button } from 'react-native-paper'; const BluetoothScanPage = ({ ...props }: any) => { const { t } = useTranslation(); const [logs, setLogs] = useState([]); + const [isScanning, setIsScanning] = useState(false); const { colors } = useTheme(); // Function to run Bluetooth test and update logs @@ -29,6 +30,20 @@ const BluetoothScanPage = ({ ...props }: any) => { } }; + useEffect(() => { + let intervalId; + if (isScanning) { + intervalId = setInterval(runBluetoothTest, 5000); + } else { + clearInterval(intervalId); + } + return () => clearInterval(intervalId); + }, [isScanning]); + + const handleToggle = () => { + setIsScanning(!isScanning); + }; + const BlueScanContent = (
{ style={s.btn}> {t('consent.permissions')} - From 6023c7f39d108991486afd8c58fe2b242a27c5b5 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Tue, 13 Feb 2024 15:38:35 -0500 Subject: [PATCH 09/33] Refactored the permissions for the bluetooth scanner so that there is now proper error handling. --- www/js/bluetooth/BluetoothScanPage.tsx | 7 ------- www/js/control/BluetoothScanSettingRow.tsx | 12 ++++++++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index b570ae44b..a5dc1188d 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -43,13 +43,6 @@ const BluetoothScanPage = ({ ...props }: any) => { - diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index 59beff0c9..efbae279a 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -1,13 +1,21 @@ import React, { useState } from 'react'; import SettingRow from './SettingRow'; import BluetoothScanPage from '../bluetooth/BluetoothScanPage'; +import { displayError } from '../plugin/logger'; const BluetoothScanSettingRow = ({}) => { const [bluePageVisible, setBluePageVisible] = useState(false); - function openPopover() { + async function openPopover() { // TODO: Add logic to check for conifig here, or in settings - setBluePageVisible(true); + + // Check and prompt for bluetooth scan permission + try { + let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); + if (response == "OK") setBluePageVisible(true) + } catch (e) { + displayError(e, "Insufficient Permissions"); + } } return ( From 4a5d8537efe5e5cbbc5ec605d300694483fcf328 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Tue, 13 Feb 2024 15:46:09 -0500 Subject: [PATCH 10/33] Got rid of unused permissions button now --- www/js/bluetooth/BluetoothScanPage.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 40826adf9..777aaa95d 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -58,13 +58,6 @@ const BluetoothScanPage = ({ ...props }: any) => { - -
-
- -
- - -
- - - diff --git a/www/i18n/intro/consent-fr.html b/www/i18n/intro/consent-fr.html deleted file mode 100644 index 74c8ab056..000000000 --- a/www/i18n/intro/consent-fr.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -
-
-
- -
-
- -
-
-
-
- - - \ No newline at end of file diff --git a/www/i18n/intro/consent-lo.html b/www/i18n/intro/consent-lo.html deleted file mode 100644 index 47721fbd4..000000000 --- a/www/i18n/intro/consent-lo.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -
- -
-
- -
-
- -
-
-
-
- - - diff --git a/www/i18n/intro/consent-text-es.html b/www/i18n/intro/consent-text-es.html deleted file mode 100644 index fd970fb11..000000000 --- a/www/i18n/intro/consent-text-es.html +++ /dev/null @@ -1,139 +0,0 @@ -
-

POLÍTICA DE PRIVACIDAD/TÉRMINOS DE USO DE NREL OPENPATH

-
-
-

Introducción y Propósito

-

-{{template_text.short_textual_description}} -

-Estos datos se recopilan a través de OpenPATH, una plataforma de código abierto de NREL. -La aplicación para teléfonos inteligentes, NREL OpenPATH ("Aplicación"), combina datos de -sensores de teléfonos inteligentes, etiquetas semánticas de usuario y una breve -encuesta demográfica. -

-NREL es un laboratorio nacional del Departamento de Energía de EE. UU., Oficina de -Eficiencia Energética y Energía Renovable, operado por Alliance for Sustainable -Energy, LLC bajo el contrato principal No. DE-AC36-08GO28308. Esta política de privacidad -se aplica a la aplicación proporcionada por Alliance for Sustainable Energy, LLC. Esta aplicación -se proporciona únicamente con el fin de recopilar datos de comportamiento de viaje para el -{{ui_config.intro.program_or_study}} y para la investigación para informar la política pública. Ninguno de los datos recogidos por -la aplicación nunca se venderá ni se utilizará con fines comerciales, incluidos -publicidad. -

-SI NO ESTÁ DE ACUERDO CON LOS TÉRMINOS DE ESTA POLÍTICA DE PRIVACIDAD, ELIMINAR LA APLICACIÓN -

- -

Por qué recopilamos esta información

-{{template_text.why_we_collect}} - -

Qué información recopilamos

-

-La aplicación nunca solicitará información de identificación personal (PII) como -nombre, correo electrónico, dirección, o número de teléfono. -

-Recopila datos del sensor del teléfono relacionados con su ubicación (incluido el fondo -ubicación), acelerómetro, actividad generada por el dispositivo y reconocimiento de modo, App -el tiempo de uso y el uso de la batería. La aplicación creará un "diario de viaje" basado en -sus datos de ubicación de fondo para determinar sus patrones de viaje y ubicación -historia. -

-También le pedirá que anote periódicamente estos viajes detectados con semántica -etiquetas, como el modo de viaje, el propósito y el modo reemplazado. -

-También te solicitará información sociodemográfica como tu edad aproximada, -género, y tipo de hogar. Los factores sociodemográficos se pueden utilizar para -comprender la influencia del estilo de vida en el comportamiento de viaje, así como generalizar -los resultados a una población más amplia. -

-Para la mayor transparencia, la aplicación se basa en una plataforma de código abierto, -OpenPATH de NREL. puede inspeccionar los datos que recopila OpenPATH en segundo plano en -https://github.com/e-mission/e-mission-data-collection.git, -la canalización de análisis en https://github.com/e-mission/e-mission-server.git -y las métricas del tablero en https://github.com/e-mission/em-public-dashboard.git -

- -

Cómo asociamos la información contigo

-
-Los administradores del programa le proporcionarán un 'opcode' que utilizará -para iniciar sesión en el sistema. Esta larga cadena aleatoria se utilizará -para todas las comunicaciones posteriores con el servidor. Si olvida o pierde -su opcode, puede solicitarlo proporcionando su nombre y/o dirección de correo -electrónico al administrador del programa. No se comunique con el personal de -NREL con solicitudes de recuperación de opcode, ya que no tenemos acceso a la -conexión entre su nombre/correo electrónico y su código de operación. Los datos -que NREL recopila automáticamente (datos del sensor del teléfono, datos -semidemográficos, etc.) solo se asociarán con su 'opcode' -
-
-Está iniciando sesión con un 'opcode' generado aleatoriamente por la -plataforma. Esta larga cadena aleatoria se utilizará para todas las -comunicaciones posteriores con el servidor. Solo usted conoce el opcode que -está asociado con usted. No existe la opción "Olvidé mi contraseña", y el -personal de NREL no puede recuperar su opcode, incluso si proporciona su nombre -o dirección de correo electrónico. Esto significa que, a menos que almacene su -opcode en un lugar seguro, no tendrá acceso a sus datos anteriores si cambia de -teléfono o desinstala y reinstala la aplicación. -
- -

Quién puede ver la información

-

-Las métricas agregadas derivadas de los patrones de viaje estarán disponibles en un tablero público para proporcionar transparencia sobre el impacto del programa. Estas métricas se centrarán en resúmenes de información, como recuentos, distancias y duraciones, y no mostrarán ubicaciones u horas de viaje individuales. -

-Las tarifas de etiquetado individual y la información del nivel de viaje solo estarán disponibles para: -

    -
  • 🧑 Administradores del {{ui_config.intro.deployment_partner_name}} para {{template_text.raw_data_use}}, y -
  • 💻 Desarrolladores de OpenPATH para la depuración -
-

- -Los datos también se archivarán periódicamente en Transportation Secure de NREL. -Data Center (TSDC) después de un retraso de 3 a 6 meses. Entonces se hará -disponible para investigación legítima a través del TSDC existente que preserva la privacidad -procedimientos de operación. Más información sobre los procedimientos está disponible en el -sitio web y en esta publicación y hoja informativa. -

- -

Tus derechos

-

-

-Debe realizar un seguimiento de sus patrones de viaje utilizando la aplicación como condición de -participación en el Programa. Si desea retirarse del Programa, debe -debe comunicarse con el administrador del programa, -{{ui_config.intro.program_admin_contact}} para analizar las opciones de finalización. Si usted -desea permanecer en el programa pero no usar la aplicación, comuníquese con su programa -administrador para negociar un procedimiento de recopilación de datos alternativo antes -desinstalar la aplicación. Si desinstala la aplicación sin la aprobación del -administrador del programa, es posible que no tenga acceso a los beneficios proporcionados por el -programa. -
-
-La participación en el Estudio es completamente voluntaria. tienes derecho a -negarse a participar o retirarse en cualquier momento del estudio sin -proporcionar notificación a NREL o al punto de contacto. Si no desea -participar en el Estudio o interrumpir su participación en el Estudio, -por favor, elimine la aplicación. -
-

-Si desea que se destruyan sus datos, comuníquese con K. Shankari -(k.shankari@nrel.gov) solicitando la eliminación. -Debe incluir su token en la solicitud de eliminación. porque nosotros no -conecte su identidad con su token, no podemos eliminar su información -sin obtener el token como parte de la solicitud de eliminación. Entonces lo haremos -destruir todos los datos asociados con esa solicitud de eliminación, tanto en línea como -conjuntos de datos archivados. -

- -

Preguntas

-Si tiene alguna pregunta sobre los objetivos y resultados de la recopilación de datos, por favor -comuníquese con el punto de contacto principal para el estudio, K. Shankari -(k.shankari@nrel.gov). Si tiene alguna pregunta técnica sobre el funcionamiento de la aplicación, -comuníquese con K. Shankari de NREL (k.shankari@nrel.gov). - -

Consentimiento

-Seleccione el botón a continuación para indicar que ha leído y está de acuerdo con este -Política de privacidad, acepta la recopilación de su información y desea -participar en el {{ui_config.intro.program_or_study}}. - diff --git a/www/i18n/intro/consent-text-fr.html b/www/i18n/intro/consent-text-fr.html deleted file mode 100644 index 3aefeb0de..000000000 --- a/www/i18n/intro/consent-text-fr.html +++ /dev/null @@ -1,116 +0,0 @@ -
-

NREL OPENPATH PRIVACY POLICY/TERMS OF USE

-

TODO: traduire en français

-
-
-

Introduction and Purpose

- Transportation is the largest contributor to US Greenhouse Gas GHG emissions. - As the nation's premier facility for energy-efficient transportation R&D - solutions, NREL’s sustainable transportation and mobility research takes a - whole-system, human-centric approach to solve complex energy challenges and - slash greenhouse gas emissions. As part of this approach we would like to - collect long-term travel behavior data that tells us how, where and why people - travel. - - This data is being collected through OpenPATH, an NREL open-sourced platform. - The smart phone application, NREL OpenPATH (“App”), combines data from - smartphone sensors, semantic user labels and a short demographic survey. - - NREL is a national laboratory of the U.S. Department of Energy, Office of - Energy Efficiency and Renewable Energy, operated by Alliance for Sustainable - Energy, LLC under Prime Contract No. DE-AC36-08GO28308. This Privacy Policy - applies to the App provided by Alliance for Sustainable Energy, LLC. This App - is provided solely for the purposes of collecting travel behavior data for the - Study and for research to inform public policy. None of the data collected by - the App will never be sold or used for any commercial purposes, including - advertising. - - IF YOU DO NOT AGREE WITH THE TERMS OF THIS PRIVACY POLICY, PLEASE DELETE THE APP - -

Why we collect this information

- NREL can use this information to understand how travel patterns change in - response to federal, state and local interventions. The interventions can - include programs, incentives and infrastructure changes. Since this data will - be collected for a long time, changes can be directly observed instead of - inferred from other data sources. This data can also serve as a control of - unmodified behavior for programs that target a small sample of the population. - -

What information we collect

- The App will never ask for any Personally Identifying Information (PII) such as - name, email address or phone number. - - It collects phone sensor data pertaining to your location (including background - location), accelerometer, device-generated activity and mode recognition, App - usage time, and battery usage. The App will create a “travel diary” based on - your background location data to determine your travel patterns and location - history. - - It will also ask you to periodically annotate these sensed trips with semantic - labels, such as the trip mode, purpose, and replaced mode. - - It will also request sociodemographic information such as your approximate age, - gender and household type. The sociodemographic factors can be used to - understand the influence of lifestyle on travel behavior, as well as generalize - the results to a broader population. - - For the greatest transparency, the App is based on an open source platform, - NREL’s OpenPATH. you can inspect the data that OpenPATH collects in the background at - https://github.com/e-mission/e-mission-data-collection.git, - the analysis pipeline at https://github.com/e-mission/e-mission-server.git - and the dashboard metrics at https://github.com/e-mission/em-public-dashboard.git - -

How we associate information with you

- A randomly generated token will be generated by the App during onboarding and - used for all further communication with the server. Only you know the token - that is associated with you. There is no “Forgot password” option, and NREL - staff cannot retrieve your token, even if you provide your name or email - address. This means that, unless you store your token in a safe place, you will - not have access to your prior data if you switch phones or uninstall and - reinstall the App. - -

Who gets to see the information

- Aggregate metrics derived from the travel patterns will be made available on a public dashboard to provide transparency into the impact of the program. These metrics will focus on information summaries such as counts, distances and durations, and will not display individual travel locations or times. - - Real-time detailed travel patterns will only be made available to: -
    -
  • Program administrators from NREL Center for Integrated Mobility Sciences (CIMS) to monitor the Study, send personalized surveys or provide recommendations to participants, and -
  • OpenPATH developers for debugging -
- - The data will also be periodically archived in NREL’s Transportation Secure - Data Center (TSDC) after a delay of 3 to 6 months. It will then be made - available for legitimate research through existing, privacy-preserving TSDC - operating procedures. Further information on the procedures is available on the - website and in this publication and fact sheet. - -

Your rights

- Participation in the Study is completely voluntary. You have the right to - decline to participate or to withdraw at any point in the Study without - providing notice to NREL or the point of contact. If you do not wish to - participate in the Study or to discontinue your participation in the Study, - please delete the App. - - If you would like to have your data destroyed, please contact K. Shankari - (k.shankari@nrel.gov) requesting deletion. - You must include your token in the request for deletion. Because we do not - connect your identity with your token, we cannot delete your information - without obtaining the token as part of the deletion request. We will then - destroy all data associated with that deletion request, both in the online and - archived datasets. - -

Questions

- If you have any questions about the data collection goals and results, please - contact the primary point of contact for the study, K. Shankari - (k.shankari@nrel.gov). If you have any technical questions about app operation, - please contact NREL’s K. Shankari (k.shankari@nrel.gov). - - -

Consent

- Please select the button below to indicate that you have read and agree to this - Privacy Policy, consent to the collection of your information, and want to - participate in the Study. -
- \ No newline at end of file diff --git a/www/i18n/intro/consent-text-lo.html b/www/i18n/intro/consent-text-lo.html deleted file mode 100644 index 969be5d35..000000000 --- a/www/i18n/intro/consent-text-lo.html +++ /dev/null @@ -1,118 +0,0 @@ -
-

ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ/ເງື່ອນໄຂການໃຊ້ງານ NREL OPENPATH

-
-
-

ຈຸດປະສົງຂອງການສຶກສາ

-

- {{template_text.short_textual_description}} -

- ຂໍ້​ມູນ​ນີ້​ແມ່ນ​ໄດ້​ຖືກ​ເກັບ​ກໍາ​ໂດຍ​ຜ່ານ OpenPATH​, ເປັນ​ເວ​ທີ​ແຫຼ່ງ​ເປີດ NREL​. - ແອັບພລິເຄຊັນໂທລະສັບອັດສະລິຍະ, NREL OpenPATH (“App”), ລວມຂໍ້ມູນຈາກ - ເຊັນເຊີໂທລະສັບສະຫຼາດ, ປ້າຍຊື່ຜູ້ໃຊ້ semantic ແລະການສໍາຫຼວດປະຊາກອນສັ້ນ. -

- NREL ເປັນຫ້ອງທົດລອງແຫ່ງຊາດຂອງກະຊວງພະລັງງານສະຫະລັດ, ຫ້ອງການຂອງ - ພະລັງງານປະສິດທິພາບ ແລະພະລັງງານທົດແທນ, ດໍາເນີນການໂດຍ Alliance for Sustainable - ພະລັງງານ, LLC ພາຍໃຕ້ສັນຍາ Prime No. DE-AC36-08GO28308. ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວນີ້ - ນຳໃຊ້ກັບແອັບທີ່ສະໜອງໃຫ້ໂດຍພັນທະມິດເພື່ອພະລັງງານແບບຍືນຍົງ, LLC. App ນີ້ - ແມ່ນສະຫນອງໃຫ້ພຽງແຕ່ສໍາລັບຈຸດປະສົງຂອງການເກັບກໍາຂໍ້ມູນພຶດຕິກໍາການເດີນທາງສໍາລັບ - {{ui_config.intro.program_or_study}} ແລະເພື່ອການຄົ້ນຄວ້າເພື່ອແຈ້ງນະໂຍບາຍສາທາລະນະ. - ບໍ່ມີຂໍ້ມູນໃດໆທີ່ເກັບໄດ້ໂດຍ App ຈະບໍ່ຖືກຂາຍ ຫຼືໃຊ້ສໍາລັບອັນໃດ ຈຸດປະສົງທາງການຄ້າ, ລວມທັງການໂຄສະນາ. -

- ຖ້າເຈົ້າບໍ່ເຫັນດີກັບເງື່ອນໄຂຂອງນະໂຍບາຍຄວາມເປັນສ່ວນຕົວນີ້, ກະລຸນາລຶບແອັບອອກ -

- -

ເປັນຫຍັງພວກເຮົາເກັບກໍາຂໍ້ມູນນີ້

- {{template_text.why_we_collect}} - -

ການເກັບກຳຂໍ້ມູນ

-

- ລະບົບ ຈະບໍ່ ເກັບກຳຂໍ້ມູນທີ່ສາມາດລະບຸຕົວຕົນໄດ້ແບບດັ້ງເດີມ (ເຊັ່ນ: ບໍ່ມີຊື່, ອີເມວ ຫຼືເບີໂທລະສັບ) -

- ລະບົບນີ້ຈະນໍາໃຊ້ ເພື່ອເປັນການເກັບກໍາຂໍ້ມູນໃນການຕິດຕາມ ການເດີນທາງ ເພື່ອໃຫ້ເຂົ້າເຖີງຮູບແບບການເດີນທາງຂອງການນໍາໃຊ້ພາຫະນະ. -

- ມັນຍັງຈະຂໍໃຫ້ເຈົ້າບັນທຶກການເດີນທາງທີ່ມີຄວາມຮູ້ສຶກເຫຼົ່ານີ້ເປັນໄລຍະໆດ້ວຍ semantic - ປ້າຍຊື່, ເຊັ່ນ: ຮູບແບບການເດີນທາງ, ຈຸດປະສົງ, ແລະຮູບແບບການທົດແທນ. -

- ມັນຍັງຈະຮ້ອງຂໍຂໍ້ມູນທາງດ້ານສັງຄົມເຊັ່ນ: ອາຍຸໂດຍປະມານຂອງທ່ານ, - ເພດ, ແລະປະເພດຄົວເຮືອນ. ປັດໄຈທາງດ້ານສັງຄົມນິຍົມສາມາດຖືກນໍາໃຊ້ເພື່ອ - ເຂົ້າໃຈອິດທິພົນຂອງວິຖີຊີວິດກ່ຽວກັບພຶດຕິກໍາການເດີນທາງ, ເຊັ່ນດຽວກັນກັບ generalize - ຜົນໄດ້ຮັບຕໍ່ປະຊາກອນທີ່ກວ້າງຂວາງ. -

- ເພື່ອຄວາມໂປ່ງໃສທີ່ສຸດ, App ແມ່ນອີງໃສ່ເວທີແຫຼ່ງເປີດ, - OpenPATH ຂອງ NREL. ທ່ານ​ສາ​ມາດ​ກວດ​ສອບ​ຂໍ້​ມູນ​ທີ່ OpenPATH ເກັບ​ກໍາ​ຂໍ້​ມູນ​ໃນ​ພື້ນ​ຖານ​ທີ່​ - https://github.com/e-mission/e-mission-data-collection.git, - ທໍ່ການວິເຄາະທີ່ https://github.com/e-mission/e-mission-server.git - ແລະການວັດແທກ dashboard ຢູ່ https://github.com/e-mission/em-public-dashboard.git -

- -

ພວກເຮົາເຊື່ອມໂຍງຂໍ້ມູນກັບທ່ານແນວໃດ

-
- ເຂົ້າສູ່ລະບົບ ທີ່ບໍ່ເປີດເຜີຍຊື່ (ລະຫັດ OP) ໂທເກນທີ່ສ້າງຂຶ້ນແບບສຸ່ມເປັນເອກະລັກ (ລະຫັດ OP) ນີ້ແມ່ນຕົວລະບຸຂອງທ່ານໃນລະບົບ. ບໍ່ມີໃຜນອກເໜືອໄປຈາກເຈົ້າຮູ້ວ່າເຈົ້າກ່ຽວຂ້ອງກັບ (ລະຫັດ OP) ນີ້. ຖ້າທ່ານຕ້ອງການຕິດຕໍ່ສື່ສານກັບທີມງານຄົ້ນ ຄ້ວາກ່ຽວກັບຂໍ້ມູນທີ່ເກັບກໍາກ່ຽວກັບທ່ານ, ກະລຸນາກຽມພ້ອມທີ່ຈະສະຫນອງ (ລະຫັດ OP) ນີ້. -
-
- ໂທເຄັນທີ່ສ້າງຂຶ້ນແບບສຸ່ມຂ້າງເທິງ, ເລີ່ມຕົ້ນດ້ວຍ nrelop_, ຖືກນໍາໃຊ້ເພື່ອເຂົ້າສູ່ລະບົບ. - ບັນທຶກ token ຂອງທ່ານໃນກໍລະນີທີ່ທ່ານເສຍ ຫຼືປ່ຽນໂທລະສັບ. ຖ້າທ່ານສູນເສຍ token ຂອງທ່ານ, NREL - ບໍ່ສາມາດດຶງມັນມາໃຫ້ທ່ານໄດ້. ເນື່ອງຈາກພວກເຮົາບໍ່ມີຄວາມສາມາດໃນການຈັບຄູ່ token ກັບຜູ້ໃຊ້ແຕ່ລະຄົນ. - OPcode ແມ່ນໂທເຄັນທີ່ສ້າງຂຶ້ນແບບສຸ່ມ. ບັນທຶກລະຫັດ (token) ຂອງທ່ານໃນກໍລະນີທີ່ທ່ານເຮັດເສຍ ຫຼື ປ່ຽນໂທລະສັບ. - ຖ້າທ່ານເຮັດໂທເຄັນຂອງທ່ານເສຍ, ກະລຸນາຕິດຕໍ່ຜູ້ຮັບຜິດຊອບໂຄງການຂອງທ່ານເພື່ອຂໍຄວາມຊ່ວຍເຫຼືອ. NREL - ບໍ່ສາມາດດຶງມັນມາໃຫ້ທ່ານໄດ້ ເນື່ອງຈາກພວກເຮົາບໍ່ມີ. ຄວາມສາມາດໃນການຈັບຄູ່ token ກັບຜູ້ໃຊ້ສ່ວນບຸກຄົນ. -
- -

ຄວາມເປັນສ່ວນຕົວຂອງຂໍ້ມູນ ແລະຄວາມປອດໄພ

-

- ການວັດແທກລວມທີ່ມາຈາກຮູບແບບການເດີນທາງຈະຖືກເຮັດໃຫ້ຢູ່ໃນ dashboard ສາທາລະນະເພື່ອໃຫ້ຄວາມໂປ່ງໃສຕໍ່ຜົນກະທົບຂອງໂຄງການ. metrics ເຫຼົ່ານີ້ຈະເນັ້ນໃສ່ການສະຫຼຸບຂໍ້ມູນເຊັ່ນ: ການນັບ, ໄລຍະທາງ ແລະໄລຍະເວລາ, ແລະຈະບໍ່ສະແດງສະຖານທີ່ທ່ອງທ່ຽວ ຫຼືເວລາຂອງແຕ່ລະຄົນ. -

- ຂໍ້ມູນດິບຈາກການສຶກສານີ້ຈະມີໃຫ້ພຽງແຕ່: -

    -
  • 🧑 ຜູ້ບໍລິຫານໂຄງການຈາກ {{ui_config.intro.deployment_partner_name}} to {{template_text.raw_data_use}}, and -
  • 💻 ຜູ້ພັດທະນາ NREL OpenPATH ສຳລັບການດີບັກ. -
-

- ຂໍ້ມູນທີ່ເກັບກຳໄດ້ຈະຖືກເກັບໄວ້ໃນກຸ່ມຂະໜາດກາງທີ່ຮັບຮອງຈາກ FEDRAMP ຢູ່ທີ່ NREL ແລະເຂົ້າລະຫັດທັງໃນການຜ່ານແດນ - ແລະໃນທີ່ເຫຼືອ. ຂໍ້ມູນຈາກການສຶກສານີ້ຈະຖືກເກັບໄວ້ແຍກຕ່າງຫາກຈາກຂໍ້ມູນການສຶກສາອື່ນໆໂດຍການນໍາໃຊ້ OpenPATH ເວີຊັນ - NREL-hosted. ເວທີ on the - website and in this publication and fact sheet. -

- -

ສິດທິຂອງທ່ານ

-

-

- ທ່ານຖືກກໍານົດໃຫ້ຕິດຕາມຮູບແບບການເດີນທາງຂອງທ່ານໂດຍໃຊ້ App ເປັນເງື່ອນໄຂຂອງ - ການມີສ່ວນຮ່ວມໃນໂຄງການ. ຖ້າທ່ານຕ້ອງການຖອນຕົວອອກຈາກໂຄງການ, ທ່ານ - ຄວນຕິດຕໍ່ຜູ້ບໍລິຫານໂຄງການ, {{ui_config.intro.program_admin_contact}} ເພື່ອປຶກສາຫາລືກ່ຽວກັບທາງເລືອກການຢຸດເຊົາ. ຖ້າ​ເຈົ້າ - ຕ້ອງການຢູ່ໃນໂຄງການແຕ່ບໍ່ໄດ້ໃຊ້ app, ກະລຸນາຕິດຕໍ່ໂຄງການຂອງທ່ານ ຜູ້ບໍລິຫານເພື່ອເຈລະຈາຂັ້ນຕອນການເກັບກຳຂໍ້ມູນທາງເລືອກກ່ອນ - ຖອນການຕິດຕັ້ງແອັບຯ. ຖ້າ​ຫາກ​ທ່ານ​ຖອນ​ການ​ຕິດ​ຕັ້ງ app ໂດຍ​ບໍ່​ມີ​ການ​ອະ​ນຸ​ມັດ​ຈາກ​ - ຜູ້ບໍລິຫານໂຄງການ, ທ່ານອາດຈະບໍ່ມີການເຂົ້າເຖິງຜົນປະໂຫຍດທີ່ສະຫນອງໃຫ້ໂດຍ ໂຄງການ. -
-
- ການມີສ່ວນຮ່ວມໃນ {{ui_config.intro.program_or_study}} ແມ່ນສົມບູນ - ສະໝັກໃຈ. ທ່ານມີສິດທີ່ຈະປະຕິເສດການເຂົ້າຮ່ວມ ຫຼືຖອນຕົວໃນເວລາໃດກໍ່ຕາມ - ຈຸດໃນການສຶກສາໂດຍບໍ່ມີການແຈ້ງໃຫ້ NREL ຫຼືຈຸດຕິດຕໍ່. ຖ້າ - ທ່ານບໍ່ຕ້ອງການທີ່ຈະເຂົ້າຮ່ວມໃນການສຶກສາຫຼືຢຸດເຊົາການຂອງທ່ານ - ການມີສ່ວນຮ່ວມໃນການສຶກສາ, ກະລຸນາລຶບ App. -
-

- ຖ້າທ່ານຕ້ອງການໃຫ້ຂໍ້ມູນຂອງທ່ານຖືກທໍາລາຍ, ກະລຸນາຕິດຕໍ່ K. Shankari - (k.shankari@nrel.gov) ຮ້ອງຂໍການລຶບ. - ທ່ານຕ້ອງລວມ token ຂອງທ່ານໃນຄໍາຮ້ອງຂໍການລຶບ. ເນື່ອງຈາກວ່າພວກເຮົາບໍ່ - ເຊື່ອມຕໍ່ຕົວຕົນຂອງທ່ານກັບ token ຂອງທ່ານ, ພວກເຮົາບໍ່ສາມາດລຶບຂໍ້ມູນຂອງທ່ານໄດ້ - ໂດຍບໍ່ມີການໄດ້ຮັບ token ເປັນສ່ວນຫນຶ່ງຂອງຄໍາຮ້ອງຂໍການລຶບ. ພວກເຮົາຈະຫຼັງຈາກນັ້ນ - ທໍາລາຍຂໍ້ມູນທັງຫມົດທີ່ກ່ຽວຂ້ອງກັບຄໍາຮ້ອງຂໍການລຶບນັ້ນ, ທັງຢູ່ໃນອອນໄລນ໌ແລະ ຊຸດຂໍ້ມູນທີ່ເກັບໄວ້. -

- -

ຄຳຖາມ

- ຖ້າທ່ານມີຄໍາຖາມໃດໆກ່ຽວກັບເປົ້າຫມາຍການເກັບກໍາຂໍ້ມູນແລະຜົນໄດ້ຮັບ, ກະລຸນາ - ຕິດ​ຕໍ່​ພົວ​ພັນ​ຕົ້ນ​ຕໍ​ຂອງ​ການ​ສໍາ​ລັບ​ການ​ສຶກ​ສາ​, - {{ui_config.intro.program_admin_contact}}. ຖ້າທ່ານມີຄໍາຖາມດ້ານວິຊາການໃດໆ - ກ່ຽວ​ກັບ​ການ​ດໍາ​ເນີນ​ງານ app​, ກະ​ລຸ​ນາ​ຕິດ​ຕໍ່​ຫາ K. Shankari ຂອງ NREL (k.shankari@nrel.gov​)​. - - -

ຂ້ອຍຍອມຮັບ

- ກະລຸນາເລືອກປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຊີ້ບອກວ່າທ່ານໄດ້ອ່ານ ແລະຕົກລົງເຫັນດີກັບເລື່ອງນີ້ - ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ, ຍິນຍອມທີ່ຈະເກັບກໍາຂໍ້ມູນຂອງທ່ານ, ແລະຕ້ອງການທີ່ຈະ - ເຂົ້າຮ່ວມໃນ {{ui_config.intro.program_or_study}}. -
- \ No newline at end of file diff --git a/www/i18n/intro/sensor_explanation-fr.html b/www/i18n/intro/sensor_explanation-fr.html deleted file mode 100644 index a74392eb6..000000000 --- a/www/i18n/intro/sensor_explanation-fr.html +++ /dev/null @@ -1,22 +0,0 @@ - -
-

Autorisations

-
-
- - - -
-
- -
-
- -
-
-
- -
- - - \ No newline at end of file diff --git a/www/i18n/intro/summary-es.html b/www/i18n/intro/summary-es.html deleted file mode 100644 index c55b7a04f..000000000 --- a/www/i18n/intro/summary-es.html +++ /dev/null @@ -1,24 +0,0 @@ - - -
-

{{template_text.deployment_name}}

-
- -
- {{ui_config.intro.deployment_partner_name}} {{template_text.deployment_name}}: -
-
    -
  1. ✔️ {{template_text.summary_line_1}} -
    -
  2. ✔️ {{template_text.summary_line_2}} -
    -
  3. ✔️ {{template_text.summary_line_3}} -
-
- - - - - diff --git a/www/i18n/intro/summary-fr.html b/www/i18n/intro/summary-fr.html deleted file mode 100644 index aca070602..000000000 --- a/www/i18n/intro/summary-fr.html +++ /dev/null @@ -1,22 +0,0 @@ - -
-

Open Access Study

-
-
- L'Open Access Study est une enquête proposée par The National Renewable Energy Laboratory (NREL). -
-
    -
  1. Elle permet aux utilisateurs de tracer leur mode de déplacement et de mesurer les dépenses associées en énergie et émissions de GES
    2. -
    -
  2. Elle agrège les données de part modale, de fréquence de trajet et d'empreinte carbone et les rend disponibles sur un tableau de bord public
    3. -
    -
  3. Elle sert de groupe de contrôle pour évaluer le changement de comportements des autres programmes.
    4. -
-
- - - - - diff --git a/www/i18n/intro/summary-lo.html b/www/i18n/intro/summary-lo.html deleted file mode 100644 index 7deb97c0e..000000000 --- a/www/i18n/intro/summary-lo.html +++ /dev/null @@ -1,24 +0,0 @@ - - -
-

{{template_text.deployment_name}}

-
- -
- {{ui_config.intro.deployment_partner_name}} {{template_text.deployment_name}}: -
-
    -
  1. ✔️ {{template_text.summary_line_1}} -
    -
  2. ✔️ {{template_text.summary_line_2}} -
    -
  3. ✔️ {{template_text.summary_line_3}} -
-
- - - - - diff --git a/www/i18n/it.json b/www/i18n/it.json deleted file mode 100644 index 05c3deaae..000000000 --- a/www/i18n/it.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "loading": "Caricamento...", - "map-refresh": "Aggiorna", - "map-fixmap": "Centra la mappa", - - "weekdays-all": "Tutto", - "weekdays-select": "Seleziona giorno", - - "post-trip-prompt": { - "notification-option-mute": "Silenzia", - "notification-option-snooze": "Posticipa", - "notification-option-choose": "Scegli", - "notification-title": "Come e perché sei arrivato qui?", - "choose-mode": "Scegli modo", - "skip": "Ignora", - "snoozed-reminder": "Promemoria posticipato", - "snoozed-reapper-message": "Ricomparirà tra 30 minuti", - "platform-specific-message-ios": "Scorri a sinistra o tocca per aggiungere informazioni sul viaggio.", - "platform-specific-message-android": "Vedi le opzioni o tocca per aggiungere informazioni sul viaggio.", - "platform-specific-message-other": "Tocca per aggiungere informazioni sul viaggio.", - "notifications-muted": "Notifiche di fine viaggio silenziate", - "notifications-reenabled": "Possono essere riabilitate da Profilo -> Sviluppatori o immediatamente.", - "muted": "Silenziato", - "unmute": "Riattiva", - "keep-muted": "Mantieni silenziato" - }, - - "post-trip-map-display-tour-incident": "Fai zoom il più possibile sulla posizione dell'incidente e clicca sulla linea blu per segnare un ☻ o un ☹", - - "tour-next": "Prossimo", - "tour-previous": "Precedente", - "tour-finish": "Fine", - - "trip-confirm": { - "recenttrip": "Spostamenti da: {{startTime}} → a: {{endTime}}", - "continue": "Continua", - "done": "Fatto", - "services-please-fill-in": "Compila le {{text}} non elencate.", - "services-cancel": "Annulla", - "services-save": "Salva" - }, - - "place-common-place": "Luoghi frequenti", - "place-successor-trips": "Luoghi successivi", - "place-trips-to": "{{trips}} viaggi verso", - "place-usually-starts": "Parte di solito alle: {{hour}}:00", - "place-usually-takes": "Di solito impiega: {{duration}}", - "trip-start-hours": "Ora di inizio", - "trip-start-duration": "Durata", - - "control": { - "profile": "Profilo", - "tracking": "Tracking attivo", - "enable-opgeofence": "Inizio viaggio sperimentale", - "medium-accuracy": "Precisione media", - "dark-theme": "Tema scuro", - "force-sync": "Forza la sincronizzazione", - "share": "Condividi", - "check-ui-updates": "Controlla aggiornamenti", - "download-json-dump": "Scarica i dati in json", - "email-log": "Invia i log per email", - "user-data": "I miei dati", - "erase-data": "Cancella i miei dati", - "dev-zone": "Sviluppatori", - "refresh": "Aggiorna", - "end-trip-sync": "Termina viaggio e sincronizza", - "check-consent": "Verifica i consensi", - "invalidate-cached-docs": "Invalida i dati in cache", - "nuke-all": "Cancella buffer e cache", - "set-ui-channel": "Imposta canale interfaccia utente", - "check-log": "Apri il log", - "check-sensed-data": "Dati raccoli", - "check-map": "Controlla la mappa", - "collection": "Raccolta", - "sync": "Sincronizza", - "transition-notify": "Notifica una transizione", - "app-version": "Versione dell'App" - }, - - "general-settings": { - "choose-date": "Scegli data", - "nuke-ui-state-only": "Solo interfaccia utente", - "nuke-native-cache-only": "Solo cache nativa", - "nuke-everything": "Tutto", - "clear-data": "Cancella i dati", - "cancel": "Annulla", - "user-data-erased": "Dati cancellati.", - "consent-not-found": "Consenso per la raccolta dati non trovato. Acconsenti adesso?", - "no-consent-message": "OK! Nota che non avrai statistiche personalizzate senza consenso!", - "consent-found": "Consenso trovato!", - "consented-to": "Consenso fornito per il protocollo {{protocol_id}}, {{approval_date}}", - "consented-ok": "OK", - "share-message": "Unisciti a me per rendere i mezzi di trasporto più ecologici. \nScarica l'applicaizone emission:", - "share-subject": "Emission - UC Berkeley Research Project", - "share-url": "https://bic2cal.eecs.berkeley.edu/#download" - }, - - "metrics": { - "cancel": "Annulla", - "confirm": "Conferma", - "get": "Ok", - "range": "Range", - "filter": "Filtra", - "from": "da :", - "to": "a :", - "last-week": "Settimana precedente", - "frequency": "Frequenza:", - "pandafreqoptions-daily": "per GIORNO", - "pandafreqoptions-weekly": "per SETTIMANA", - "pandafreqoptions-biweekly": "BI-SETTIMANALE", - "pandafreqoptions-monthly": "MENSILE", - "pandafreqoptions-yearly": "ANNUALE", - "freqoptions-daily": "par GIORNO", - "freqoptions-monthly": "MENSILE", - "freqoptions-yearly": "ANNUALE", - "select-pandafrequency": "Frequenza delle statistiche", - "select-frequency": "Frequenza delle statistiche", - "chart-xaxis-date": "Data", - "chart-no-data": "Dati non disponibili", - "trips-yaxis-number": "Numero", - "calorie-data-change": " cambia", - "carbon-data-change": " cambia", - "carbon-data-calculating": "Calcolo...", - "carbon-data-unknown": "Sconosiuto", - "calorie-data-unknown": "Sconosciuto...", - "calorie-data-change-increase": " di aumento in una settimana", - "calorie-data-change-decrease": " di diminuzione in una settimana", - "carbon-data-change-increase": " di aumento in una settimana", - "carbon-data-change-decrease": " di diminuzione in una settimana", - "pick-a-date": "Scegli la data" - }, - - "diary": { - "current-trip": "Viaggio in corso", - "current-yesterday": "Ieri", - "current-weekago": "Settimana precedente", - "history": "Storico", - "began": "A partire da {{startTime}}", - "report-incident": "Riporta un Incidente", - "draft": "BOZZA", - "distance-in-time": "{{distance}} km in {{time}}", - "distance": "Distanza", - "time": "Durata", - "mode": "Modalità", - "purpose": "Motivo", - "choose-mode": "Modalità principale", - "choose-purpose": "Motivo principale", - "how-did-you-get-here": "Modalità principale?", - "why-did-you-come-here": "Motivo principale?", - "list-pick-a-date": "Data" - }, - - "user-gender": "Genere", - "gender-male": "Uomo", - "gender-female": "Donna", - "user-height": "Altezza", - "user-weight": "Peso", - "user-age": "Età", - - "main-metrics": { - "dashboard": "Dashboard", - "summary": "Riassunto", - "chart": "Grafico", - "change-data": "Cambia data", - "distance": "Distanza", - "trips": "Viaggi", - "duration": "Durata", - "speed": "Velocità", - "footprint": "Impronta", - "optimal": "Ottimale :", - "average": "Media :", - "worst": "Peggiore :", - "lastweek": "Settimana precedente :", - "calories": "Calorie", - "calibrate": "Calibra", - "no-summary-data": "Dati riassuntivi non disponibili", - "median-speed": "Velocità media", - "equals-cookies": "pari a {cookies, plural, =0{0 biscotti} one {1 biscotto} other {# biscotti}}", - "equals-icecream": "pari a {icecream, plural, =0{0 gelati alla vaniglia} one {1 gelato alla vaniglia} other {# gelati alla vaniglia}}", - "equals-bananas": "pari a {bananas, plural, =0{0 banane} one {1 banana} other {# banane}}" - }, - - "main-diary": "Diario", - - "main-heatmap": { - "title": "Heatmap", - "counts": "Conteggio", - "stress": "Stress", - "from": "Da :", - "to": "a :", - "get": "Vai !", - "all": "TUTTO", - "none": "NIENTE", - "bicycling": "BICI", - "walking": "A PIEDI", - "in-vehicle": "VEICOLO", - "select-travel-mode": "Seleziona una modalità", - "cancel": "Annula", - "tour-datepicker": "Questa mappa mostra i dati di tutti gli utenti. Scegli la data e filtra per ora e giorno della settimana. ", - "tour-mode": "Clicca qui per filtrare per mezzo di trasporto. Di default sono mostrati tutti i mezzi di trasporto.", - "tour-get": "Clicca qui per generare la mappa." - }, - - "details": { - "speed": "Velocità", - "time": "Durata", - "tour-detail-content": "Fai zoom il più possibile sulla posizione dell'incidente e clicca sulla linea blu per segnare un ☻ o un ☹", - "tour-sectionList-content": "Viaggi, orari e modalità", - "tour-sectionPct-content": "% del tempo per ogni modalità per questo viaggio" - }, - - "list-explainDraft-alert": "Questo viaggio non è stato ancora analizzato. Se questo stato permane contattare il proprio amministratore di sistema.", - "list-datepicker-today": "Oggi", - "list-datepicker-close": "Chiudi", - "list-datepicker-set": "Imposta", - "list-tour-datepicker-button": "Scegli il giorno da mostrare.", - "list-tour-diary-entry": "Clicca sulla mappa per vedere altri dettagli.", - "list-tour-map-fix-button": "Clicca qui per aggiornare la mappa.", - - "service": { - "reading-server": "Caricamento dal server...", - "reading-cache": "Caricamento dalla cache...", - "reading-unprocessed-data": "Lettura dati non processati..." - }, - - "post-trip-manual-incident-time": "Giorno e ora dell'incidente", - - "recent": { - "email-account-not-configured": "L'account email non è configurato.", - "email-account-mail-app": "Devi avere un account email configurato.", - "going-to-email": "Invio dei dati per email da {{parentDir}}/userCacheDB" - }, - - "consent": { - "button-accept": "Accetto", - "button-decline": "Rifiuto" - }, - - "updatecheck": { - "downloading-update": "Aggiornamento interfaccia utente", - "extracting-update": "Estrazione aggiornamento", - "done": "Aggiornamento completo. Ricarico...", - "download-new-ui": "Scaricare l'aggiornamento?", - "download-not-now": "Non adesso", - "download-apply": "Scarica" - } -} diff --git a/www/i18n/lo.json b/www/i18n/lo.json deleted file mode 100644 index f3e5e70e3..000000000 --- a/www/i18n/lo.json +++ /dev/null @@ -1,487 +0,0 @@ -{ - "loading": "ກຳລັງໂຫລດ...", - "pull-to-refresh": "ດຶງເພື່ອໂຫລດຫນ້າຈໍຄືນ", - - "weekdays-all": "ເລືອກທັງຫມົດ", - "weekdays-select": "ເລືອກມື້", - - "trip-confirm": { - "services-please-fill-in": "ກະລຸນາຕື່ມຂໍ້ມູນໃສ່ ທີ່ບໍ່ມີໃນລາຍການ. {{text}}.", - "services-cancel": "ຍົກເລີກ", - "services-save": "ບັນທຶກ" - }, - - "control": { - "profile-tab": "ໂປຣໄຟລ໌", - "edit-demographics": "ແກ້ໄຂຂໍ້ມູນປະຊາກອນ", - "tracking": "ການຕິດຕາມ", - "app-status": "ການຕິດຕາມ", - "incorrect-app-status": "ກະລຸນາອັບເດດສິດອະນຸຍາດ", - "fix-app-status": "ຄລິກເພື່ອກວດເບິ່ງຄືນ ແລະ ແກ້ໄຂສະຖານະການປະຕິບັດງານ", - "fix": "ແກ້ໄຂ", - "medium-accuracy": "ຄວາມຖືກຕ້ອງ ລະດັບປານກາງ", - "force-sync": "ການເຊື່ອມຕໍ່", - "share": "ແບ່ງປັນຂໍ້ມູນ", - "download-json-dump": "ດາວໂຫຼດ json dump", - "email-log": "ເຂົ້າອີເມວ", - "upload-log": "ອັບໂຫລດຂໍ້ມູນ", - "view-privacy": "ເບິ່ງນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ", - "user-data": "ຂໍ້ມູນຜູ້ໃຊ້", - "erase-data": "ລຶບຂໍ້ມູນ", - "dev-zone": "ຂອບເຂດຂອງນັກນັກພັດທະນາ", - "refresh": "ໂຫຼດຫນ້າຈໍຄືນ", - "end-trip-sync": "ສິ້ນສຸດການເດີນທາງ + ການປະມວນຜົນຂໍ້ມູນໃນລະບົບ", - "check-consent": "ກວດສອບການຍິນຍອມ", - "invalidate-cached-docs": "ເອກະສານທີ່ເກັບໄວ້ບໍ່ຖືກຕ້ອງ", - "nuke-all": "Nuke all buffers ແລະ cache", - "test-notification": "ທົດສອບການແຈ້ງເຕືອນທ້ອງຖິ່ນ", - "check-log": "ກວດຄືນການບັນທຶກ", - "log-title": "ບັນທຶກ", - "check-sensed-data": "ກວດຄືນຂໍ້ມູນ", - "sensed-title":"ຂໍ້ມູນຄວາມຮູ້ສຶກ: ການຫັນປ່ຽນ", - "collection": "ການເກັບກໍາ", - "sync": "Sync ການປະມວນຜົນຂໍ້ມູນໃນຕົວລະບົບ", - "button-accept": "ຂ້ອຍຍອມຮັບ", - "view-qrc": "ລະຫັດການການອະນຸຍາດເຂົ້າລະບົບຂອງຂ້ອຍ", - "app-version": "ລຸ້ນຂອງແອບ", - "reminders-time-of-day": "ເວລາຂອງມື້ສໍາລັບການແຈ້ງເຕືອນ ({{time}})", - "upcoming-notifications": "ການແຈ້ງເຕືອນທີ່ຈະມາເຖິງ", - "dummy-notification" : "ການແຈ້ງເຕືອນ Dummy ໃນ 5 ວິນາທີ", - "log-out" : "ອອກ​ຈາກ​ລະ​ບົບ" - }, - - "general-settings": { - "choose-date": "ເລືອກວັນທີເພື່ອດາວໂຫຼດຂໍ້ມູນ", - "choose-dataset": "ເລືອກຂໍ້ມູນສຳລັບການຄຳນວນຄາບອນ", - "carbon-dataset": "ຊຸດຂໍ້ມູນຄາບອນ", - "nuke-ui-state-only": "ສະຖານະ UI ເທົ່ານັ້ນ", - "nuke-native-cache-only": "ຖານຄວາມຈຳເດີມເທົ່ານັ້ນ", - "nuke-everything": "ທຸກຢ່າງ", - "clear-data": "ລຶບຂໍ້ມູນ", - "are-you-sure": "ເຈົ້າ​ແນ່​ໃຈ​ບໍ່?", - "log-out-warning": "ເຈົ້າຈະຖືກອອກຈາກລະບົບ ແລະຂໍ້ມູນປະຈຳຕົວຂອງເຈົ້າຈະບໍ່ຖືກບັນທຶກໄວ້. ຂໍ້ມູນທີ່ບໍ່ໄດ້ຊິ້ງອາດຈະສູນເສຍໄປ.", - "cancel": "ຍົກເລີກ", - "confirm": "ພິສູດເຫັນຈິງ", - "user-data-erased": "ຂໍ້ມູນຜູ້ໃຊ້ຖືກລຶບ.", - "consent-not-found": "ການຍິນຍອມສຳລັບການເກັບກຳຂໍ້ມູນບໍ່ພົບ, ຍິນຍອມດຽວນີ້ບໍ?", - "no-consent-logout": "ການຍິນຍອມສຳລັບການເກັບກຳຂໍ້ມູນບໍ່ພົບ,ກະລຸນາບັນທຶກ opcode ຂອງເຈົ້າ, ອອກຈາກລະບົບ, ແລະເຂົ້າສູ່ລະບົບດ້ວຍ opcode ດຽວກັນ. ທ່ານຈະບໍ່ໄດ້ຮັບສະຖິຕິຂໍ້ມູນ ສ່ວນບຸກຄົນຈົນກວ່າທ່ານເຫັນດີຈະເປີດເຜີຍດວ້ຍຕົວທ່ານເອງ!", - "no-consent-message": "ຕົກລົງ! ທ່ານຈະບໍ່ໄດ້ຮັບສະຖິຕິຂໍ້ມູນ ສ່ວນບຸກຄົນຈົນກວ່າທ່ານເຫັນດີຈະເປີດເຜີຍດວ້ຍຕົວທ່ານເອງ!", - "consent-found": "ການຍິນຍອມຂໍ້ມູນ!", - "consented-to": "ຍິນຍອມ {{protocol_id}}, {{approval_date}}", - "consented-ok": "ກົດຕົກລົງ", - "qrcode": "ລະຫັດການອະນຸຍາເຂົ້າລະບົບ", - "qrcode-share-title": "ທ່ານສາມາດບັນທຶກລະຫັດການອະນຸຍາດເຂົ້າລະບົບ ຫລືເອີ້ນວ່າ OPcode ຂອງທ່ານເພື່ອເຂົ້າສູ່ລະບົບໄດ້ງ່າຍໃນອະນາຄົດ!" - }, - - "metrics": { - "dashboard-tab": "ໜ້າຕາງສະແດງຜົນລວມ", - "cancel": "ຍົກເລີກ", - "confirm": "ຢືນຢັນ", - "get": "ຢືນຢັນ", - "range": "ໄລຍະ", - "filter": "ການກັ່ນຕອງ", - "from": "ຈາກ:", - "to": "ເຖິງ:", - "last-week": "ອາທິດທີ່ຜ່ານມາ", - "frequency": "ຄວາມຖີ່:", - "pandafreqoptions-daily": "ປະຈໍາວັນ", - "pandafreqoptions-weekly": "ປະຈຳອາທິດ", - "pandafreqoptions-biweekly": "ສອງອາທິດ", - "pandafreqoptions-monthly": "ປະຈໍາເດືອນ", - "pandafreqoptions-yearly": "ປີ", - "freqoptions-daily": "ປະຈໍາວັນ", - "freqoptions-monthly": "ປະຈໍາເດືອນ", - "freqoptions-yearly": "ປີ", - "select-pandafrequency": "ເລືອກສະຫຼູບຄວາມຖີ່ສະຫຼຸບ", - "select-frequency": "ເລືອກສະຫຼູບຄວາມຖີ່", - "chart-xaxis-date": "ວັນທີ", - "chart-no-data": "ບໍ່ມີຂໍ້ມູນ", - "trips-yaxis-number": "ຈໍານວນ", - "calorie-data-change": "ປ່ຽນ", - "calorie-data-unknown": "ບໍ່ຮູ້ຈັກ...", - "greater-than": "ຫລາຍກວ່າ", - "greater": "ຫລາຍກວ່າ", - "or": "ຫຼື", - "less-than": "ຫນ້ອຍກວ່າ", - "less": "ຫນ້ອຍ", - "week-before": "vs. ອາທິດກ່ອນໜ້ານີ້", - "this-week": "ອາ​ທິດ​ນີ້", - "pick-a-date": "ເລືອກວັນທີ", - "trips": "ການເດີນທາງ", - "hours": "ຊົ່ວ​ໂມງ", - "minutes": "ນາທີ", - "custom": "ສາມາດກຳນົດເອງ" - }, - - "diary": { - "label-tab": "ຈຸດບົງບອກ", - "distance-in-time": "{{distance}} {{distsuffix}} ໃນ {{time}}, ໄລຍະທາງ ຕົງເວລາ", - "distance": "ໄລຍະທາງ", - "time": "ເວລາ", - "mode": "ໂໝດ", - "replaces": "ປ່ຽນແທນ", - "purpose": "ຈຸດປະສົງ", - "survey": "ລາຍລະອຽດ", - "untracked-time-range": "ບໍ່ໄດ້ຕິດຕາມ: {{start}} - {{end}}", - "unlabeled": "ບໍ່ມີປ້າຍກຳກັບ", - "invalid-ebike": "ລົດຈັກໄຟຟ້າ ຜິດພາດ", - "to-label": "ປ້າຍກຳກັບ", - "show-all": "ການເດີນທາງທັງໝົດ", - "no-trips-found": "ບໍ່ພົບການເດີນທາງ", - "choose-mode": "ໂໝດ ຫລື ຮູບແບບ", - "choose-replaced-mode": "ປ່ຽນໂໝດ ຫລື ຮູບແບບ", - "choose-purpose": "ເລືອກຈຸດປະສົງ", - "choose-survey": "ເພີ່ມລາຍລະອຽດການເດີນທາງ", - "select-mode-scroll": "ໂໝດ (ເລື່ອນສໍາລັບເພີ່ມເຕີມ)", - "select-replaced-mode-scroll": "ປ່ຽນແທນ (ເລື່ອນສໍາລັບເພີ່ມເຕີມ)", - "select-purpose-scroll": "ຈຸດປະສົງ (ເລື່ອນສໍາລັບເພີ່ມເຕີມ)", - "delete-entry-confirm": "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບລາຍການນີ້?", - "detected": "ກວດພົບ:", - "labeled-mode": "ໂໝດທີມີປ້າຍກຳກັບ", - "detected-modes": "ໂໝດທີ່ກວດພົບ", - "today": "ມື້ນີ້", - "no-more-travel": "ບໍ່ມີການເດີນທາງເພີ່ມເຕີມທີ່ຈະສະແດງ", - "show-more-travel": "ສະແດງການເດີນທາງເພີ່ມເຕີມ", - "show-older-travel": "ສະແດງໃຫ້ເຫັນການເດີນທາງທີ່ຜ່ານມາ", - "no-travel": "ບໍ່ມີການເດີນທາງເພື່ອສະແດງ", - "no-travel-hint": "ເພື່ອເບິ່ງເພີ່ມເຕີມ, ປ່ຽນຕົວກອງຂ້າງເທິງ ຫຼືໄປບັນທຶກການເດີນທາງ!" - }, - - "multilabel":{ - "walk": "ດ້ວຍການຍ່າງ", - "e-bike": "ວຍລົດຈັກໄຟຟ້າ", - "bike": "ລົດຖີບ", - "bikeshare": "ດ້ວຍລົດຖີບທີ່ໃຫ້ເຊົ່າ", - "scootershare": "ດ້ວຍລົດຈັກສະກູດເຕີ້ໃຫ້ເຊົ່າ ", - "drove_alone": "ເດີນທາງ ດ້ວຍລົດໃຫ່ຍ ເຊີ່ງເປັນລົດທີ່ຂັບເອງ", - "shared_ride": "ເດີນທາງດ້ວຍລົດໃຫ່ຍ ຮ່ວມກັບລົດຄົນອຶ່ນ", - "hybrid_drove_alone": "ລົດປະສົມຂັບຄົນດຽວ", - "hybrid_shared_ride": "ລົດປະສົມທີ່ໃຊ້ຮ່ວມກັນ", - "e_car_drove_alone": "ດ້ວຍການຂັບລົດໄຟຟ້າໄປເອງ", - "e_car_shared_ride": "ດ້ວຍການຈ້າງລົດໄຟຟ້າໄປ", - "taxi": "ແທັກຊີ", - "bus": "ລົດເມ", - "train": "ລົດໄຟ", - "free_shuttle": "ລົດຮັບສົ່ງຟຣີ", - "air": "ຍົນ", - "not_a_trip": "ບໍ່ແມ່ນການເດີນທາງ", - "no_travel": "ບໍ່ມີການເດີນທາງ", - "home": "ບ້ານ", - "work": "ໄປເຮັດວຽກ", - "at_work": "ຢູ່ບ່ອນເຮັດວຽກ", - "school": "ໄປໂຮງຮຽນ", - "transit_transfer": "ການຖ່າຍໂອນການເດີນທາງ", - "shopping": "ຊອບປິ້ງ", - "meal": "ອາຫານ", - "pick_drop_person": "ໄປຮັບ ຫລື ສົນ ຄົນ", - "pick_drop_item": "ໄປຮັບ ຫລື ສົ່ງສິນຄ້າ", - "personal_med": "ໄປຫາໝໍ", - "access_recreation": "ເຂົ້າເຖິງການພັກຜ່ອນ", - "exercise": "ພັກຜ່ອນ/ອອກກຳລັງກາຍ", - "entertainment": "ບັນເທີງ/ສັງຄົມ", - "religious": "ຈຸດປະສົງທາງສາດສະໜາ", - "other": "ອື່ນໆ" - }, - - "main-metrics": { - "summary": "ສັງລວມ", - "chart": "ຕາຕະລາງ", - "change-data": "ປ່ຽນວັນທີ:", - "distance": "ໄລຍະທາງ", - "trips": "ການເດີນທາງ", - "duration": "ໄລຍະເວລາ", - "fav-mode": "ໂຫມດ ຫລື ຮູບແບບ ທີ່ມັກ", - "speed": "ຄວາມໄວ", - "footprint": "ການປ່ອຍຄາບອນຂອງຂ້ອຍ", - "estimated-emissions": "Estimated CO₂ emissions", - "how-it-compares": "ການປຽບທຽບ Ballpark", - "optimal": "ດີທີ່ສຸດ (ເລືອກຮູບແບບທີ່ສົມບູນແບບສໍາລັບການເດີນທາງ ທັງຫມົດ)", - "average": "ສະເລ່ຍກຸ່ມ", - "worst-case" : "ກໍ​ລະ​ນີ​ທີ່​ຮ້າຍ​ແຮງ​ທີ່​ສຸດ", - "label-to-squish": "ການເດີນທາງປ້າຍກຳກັບເພື່ອຫຍໍ້ຂອບເຂດໃຫ້ເປັນຕົວເລກດຽວ", - "range-uncertain-footnote": "²ເນື່ອງຈາກຄວາມບໍ່ແນ່ນອນຂອງການເດີນທາງທີ່ບໍ່ມີປ້າຍກຳກັບ, ການຄາດຄະເນອາດຈະຕົກຢູ່ບ່ອນໃດກໍໄດ້ພາຍໃນຂອບເຂດທີ່ສະແດງ. ຕິດປ້າຍກຳກັບການເດີນທາງຫຼາຍຂຶ້ນເພື່ອການປະເມີນທີ່ດີຂຶ້ນ.", - "lastweek": "ອາທິດສຸດທ້າຍຂອງຂ້ອຍ:", - "us-2030-goal": "ເປົ້າໝາຍຮອດ ປີ 2030", - "us-2050-goal": "ເປົ້າໝາຍຮອດ ປີ 2050", - "us-goals-footnote": "¹ຂໍ້ແນະນຳໂດຍອີງໃສ່ເປົ້າໝາຍການເສື່ອມທາດຄາບອນຂອງສະຫະລັດ, ປັບຂະໜາດເປັນການປ່ອຍອາຍພິດທີ່ກ່ຽວຂ້ອງກັບການເດີນທາງຕໍ່ຫົວຄົນ.", - "past-week" : "ອາທິດທີ່ຜ່ານມາ", - "prev-week" : "ອາທິດກ່ອນ", - "no-summary-data": "ບໍ່ມີຂໍ້ມູນສະຫຼຸບ", - "mean-speed": "ຄວາມໄວສະເລ່ຍຂອງຂ້ອຍ", - "user-totals": "ທັງໝົດ", - "group-totals": "ລວມກຸ່ມ", - "active-minutes": "ນາທີທີ່ມີການໃຊ້ງານຢູ່ ຫລື ເຄື່ອນໄຫວ", - "weekly-active-minutes": "ນາທີປະຈໍາອາທິດຂອງການເດີນທາງຢ່າງຫ້າວຫັນ", - "daily-active-minutes": "ນາທີເປັນລາຍວັນຂອງການເດີນທາງ ທີ່ໃຊ້ງານຢູ່ ຫລື ເຄື່ອນໄຫວ", - "active-minutes-table": "ຕາຕະລາງການວັດແທກນາທີ ທີ່ໃຊ້ງານຢູ່ ຫລື ເຄື່ອນໄຫວ", - "weekly-goal": "ເປົ້າໝາຍປະຈຳອາທິດ³", - "weekly-goal-footnote": "³ເປົ້າຫມາຍປະຈໍາອາທິດໂດຍອີງໃສ່ຄໍາແນະນໍາ CDC ຂອງກິດຈະກໍາປານກາງ 150 ນາທີຕໍ່ອາທິດ.", - "labeled": "ຕິດປ້າຍກໍາກັບ", - "unlabeled": "ບໍ່ມີປ້າຍກຳກັບ²", - "footprint-label": "ການປ່ອຍຄາບອນ (ກິໂລ CO₂)" - }, - - "details": { - "speed": "ຄວາມໄວ", - "time": "ເວລາ" - }, - - "list-datepicker-today": "ມື້ນີ້", - "list-datepicker-close": "ປິດ", - "list-datepicker-set": "ຕັ້ງຄ່າ", - - "service": { - "reading-server": "ກຳລັງອ່ານຂໍ້ມູນຈາກເຊີບເວີ...", - "reading-unprocessed-data": "ກຳລັງອ່ານຂໍ້ມູນທີ່ຍັງບໍ່ໄດ້ປະມວນຜົນ..." - }, - - "email-service": { - "email-account-not-configured": "ບັນຊີອີເມວບໍ່ໄດ້ຖືກຕັ້ງຄ່າ, ບໍ່ສາມາດສົ່ງອີເມວໄດ້", - "email-account-mail-app": "ທ່ານຕ້ອງມີແອັບ ໃນໂທລະສັບຂອງທ່ານທີ່ກຳນົດຄ່າດ້ວຍທີ່ຢູ່ອີເມວ. ຖ້າບໍ່ດັ່ງນັ້ນ, ແມ່ນບໍ່ສາມາດໃຊ້ງານໄດ້", - "going-to-email": "ໄປທີ່ຖານຂໍ້ມູນອີເມວຈາກ {{parentDir}}", - "email-log":{ - "subject-logs": "ບັນທຶກການປ່ອຍອາຍພິດ", - "body-please-fill-in-what-is-wrong": "ກະລຸນາຕື່ມໃນສິ່ງທີ່ຜິດພາດ" - }, - "no-email-address-configured": "ບໍ່ມີທີ່ຢູ່ອີເມວທີ່ຕັ້ງຄ່າໄວ້.", - "email-data":{ - "subject-data-dump-from-to": "ການຖິ້ມຂໍ້ມູນຈາກ {{start}} ຫາ {{end}}", - "body-data-consists-of-list-of-entries": "ຂໍ້ມູນປະກອບດ້ວຍລາຍການລາຍການ.\nຮູບແບບການເຂົ້າແມ່ນຢູ່ທີ່ https://github.com/e-mission/e-mission-server/tree/ master/emission/core/wrapper \nສາມາດໂຫຼດຂໍ້ມູນໄດ້ພາຍໃນເຄື່ອງໂດຍໃຊ້ຄຳແນະນຳທີ່ https://github.com/e-mission/e-mission-server#loading-test-data \n ແລະສາມາດຈັດການໄດ້ໂດຍໃຊ້ຕົວຢ່າງທີ່ https http://github.com/e-mission/e-mission-server/blob/master/Timeseries_Sample.ipynb" - } - }, - - "upload-service": { - "upload-database": "ກຳລັງອັບໂຫລດຂໍ້ມູນ {{db}}", - "upload-from-dir": "ຈາກໄດເລກະທໍລີ {{parentDir}}", - "upload-to-server": "ເຖິງເຊີເວີ {{serverURL}}", - "please-fill-in-what-is-wrong": "ກະລຸນາຕື່ມສິ່ງທີ່ຜິດພາດ", - "upload-success": "ສໍາເລັດການອັບໂຫຼດ", - "upload-progress": "ສົ່ງ {{filesizemb | number}} MB ໄປໃຫ້ {{serverURL}}", - "upload-details": "ສົ່ງ {{filesizemb | number}} MB ໄປໃຫ້ {{serverURL}}" - }, - - "intro": { - "proceed": "ດໍາເນີນການ", - "appstatus": { - "fix": "ແກ້ໄຂ", - "refresh": "ໂຫຼດຫນ້າຈໍຄືນ", - "overall-description": "ແອັບນີ້ເຮັດວຽກໃນພື້ນຫຼັງເພື່ອສ້າງບັນທຶກການເດີນທາງໃຫ້ທ່ານໂດຍອັດຕະໂນມັດ. ເພື່ອໃຫ້ແນ່ໃຈວ່າການຕັ້ງຄ່າທັງໝົດຂ້າງລຸ່ມນີ້ແມ່ນສີຂຽວເພື່ອໃຫ້ແອັບສາມາດເຮັດວຽກໄດ້ຢ່າງຖືກຕ້ອງ!", - "overall-loc-name": "ສະຖານທີ່", - "explanation-title" : "ສິ່ງເຫຼົ່ານີ້ຖືກນໍາໃຊ້ເພື່ອຫຍັງ?", - "overall-loc-description": "ພວກເຮົານໍາໃຊ້ການອະນຸຍາດຈຸດສະຖານທີ່ ເພື່ອຕິດຕາມຈຸດ ທີ່ທ່ານໄປ, ເຖິງແມ່ນວ່າໃນເວລາທີ່ app ໄດ້ຖືກປິດ. ປ້ອງກັນບໍ່ໃຫ້ລະບົບໄຟ​", - "locsettings": { - "name": "ການຕັ້ງຄ່າສະຖານທີ່", - "description": { - "android-lt-9": "ການບໍລິການສະຖານທີ່ຄວນຖືກເປີດໃຊ້ ແລະຕັ້ງເປັນຄວາມຖືກຕ້ອງສູງ. ອັນນີ້ເຮັດໃຫ້ພວກເຮົາສາມາດບັນທຶກເສັ້ນທາງຂອງການເດີນທາງໄດ້ຢ່າງຖືກຕ້ອງ", - "android-gte-9": "ການບໍລິການສະຖານທີ່ຄວນຈະຖືກເປີດໃຊ້. ນີ້ອະນຸຍາດໃຫ້ພວກເຮົາເຂົ້າເຖິງຂໍ້ມູນສະຖານທີ່ ແລະສ້າງບັນທຶກການເດີນທາງ", - "ios": "ການບໍລິການສະຖານທີ່ຄວນຈະຖືກເປີດໃຊ້. ນີ້ອະນຸຍາດໃຫ້ພວກເຮົາເຂົ້າເຖິງຂໍ້ມູນສະຖານທີ່ແລະສ້າງບັນທຶກການເດີນທາງ" - } - }, - "locperms": { - "name": "ການອະນຸຍາດສະຖານທີ່", - "description": { - "android-lt-6": "ເປີດໃຊ້ງານໃນລະຫວ່າງການຕິດຕັ້ງການປະຕິບັດງານ.", - "android-6-9": "ກະລຸນາເລືອກ 'ອະນຸຍາດ'", - "android-10": "ກະລຸນາເລືອກ 'ອະນຸຍາດຕະຫຼອດເວລາ'", - "android-11": "ຢູ່ໃນໜ້າການຕັ້ງຄ່າການປະຕິບັດງານ, ເລືອກການອະນຸຍາດ 'ຈຸດສະຖານທີ່' ແລະ ໃຫ້ຕັ້ງເປັນ 'ອະນຸຍາດຕະຫຼອດເວລາ'", - "android-gte-12": "ໜ້າການຕັ້ງຄ່າການປະຕິບັດງານ, ເລືອກການອະນຸຍາດ 'ຈຸດທີ່ຕັ້ງ' ແລະ ໃຫ້ຕັ້ງເປັນ 'ອະນຸຍາດຕະຫຼອດເວລາ' ແລະ 'ມີຄວາມຊັດເຈນ'", - "ios-lt-13": "ກະລຸນາເລືອກ 'ອະນຸຍາດຕະຫຼອດເວລາ'", - "ios-gte-13": "ຢູ່ໃນໜ້າການຕັ້ງຄ່າການປະຕິບັດງານ, ກະລຸນາເລືອກ 'ທຸກເວລາ' ແລະ 'ຈະແຈ້ງ' ແລະ ກັບຄືນຫນ້າຫຼັກ ເພື່ອສືບຕໍ່." - } - }, - "overall-fitness-name-android": "ການເຄື່ອນໄຫວທາງດ້ານຮ່າງກາຍ", - "overall-fitness-name-ios": "ການເຄື່ອນໄຫວ ແລະ ຟິດເນສ", - "overall-fitness-description": "ຟິດເນສ ຫລື ການອອກໍາລັງການ ໂດຍກໍານົດເປັນໂໝດການຍ່າງ, ການຂີ່ລົດຖີບ ແລະ ໂໝດທີ່ເດີນທາງດ້ວຍພາຫະນະທີ່ໃຊ້ ເຄື່ອງຈັກຂັບເຄື່ອນ. ພວກເຮົາໃຊ້ຂໍ້ມູນນີ້ເພື່ອແຍກສ່ວນຕ່າງໆຂອງການເດີນທາງຫຼາຍຮູບແບບເຊັ່ນ: ການໂດຍສານ. ພວກເຮົາຍັງໃຊ້ມັນເພື່ອກວດສອບ. ການເດີນທາງທີ່ເປັນໄປໄດ້ - ຖ້າ ຈຸດສະຖານທີ່ ຢູ່ຕ່າງເມືອງ ແຕ່ເຮັດການກວດສອບແລ້ວ, ເຖີ່ງຢ່າງໃດກໍຕາມພວກເຮົາສາມາດຄາດເດົາໄດ້ວ່າການເດີນທາງບໍ່ຖືກຕ້ອງ.", - "fitnessperms": { - "name": "ການອະນຸຍາດອອກກຳລັງກາຍ", - "description": { - "android": "ກະລຸນາອະນຸຍາດ.", - "ios": "ກະລຸນາອະນຸຍາດ." - } - }, - "overall-notification-name": "ການແຈ້ງເຕືອນ", - "overall-notification-description": "ພວກເຮົາຕ້ອງການໃຊ້ການແຈ້ງເຕືອນເພື່ອແຈ້ງໃຫ້ທ່ານຮູ້ວ່າການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ. ພວກເຮົາຍັງໃຊ້ການແຈ້ງເຕືອນການຊຸກຍູ້ທີ່ເບິ່ງບໍ່ເຫັນເປັນຊົ່ວໂມງເພື່ອປຸກແອັບຯ ແລະອະນຸຍາດໃຫ້ມັນອັບໂຫລດຂໍ້ມູນ ແລະກວດສອບສະຖານະແອັບຯໄດ້. ພວກເຮົາຍັງໃຊ້ການແຈ້ງເຕືອນເພື່ອເຕືອນໃຫ້ທ່ານໃສ່ປ້າຍກຳກັບການເດີນທາງຂອງທ່ານ. ", - "notificationperms": { - "app-enabled-name": "ການແຈ້ງເຕືອນແອັບ", - "description": { - "android-enable": "ຢູ່ໃນໜ້າການຕັ້ງຄ່າແອັບ, ໃຫ້ແນ່ໃຈວ່າການແຈ້ງເຕືອນ ແລະຊ່ອງທາງທັງໝົດຖືກເປີດໃຊ້ງານ.", - "ios-enable": "ກະລຸນາຕັ້ງຄ່າເປັນ ການອະນຸຍາດ, ໃນປ໊ອບອັບຫຼືຫນ້າການຕັ້ງຄ່າແອັບຯຖ້າຈໍາເປັນ" - } - }, - "overall-background-restrictions-name": "ຂໍ້ຈໍາກັດພື້ນຫລັງ", - "overall-background-restrictions-description": "ແອັບນີ້ແມ່ນເຮັດວຽກຢູ່ໃນພື້ນຫຼັງເກືອບທຸກເວລາເພື່ອເຮັດງ່າຍຂຶ້ນ. ທ່ານພຽງແຕ່ເປີດມັນເປັນຊ່ວງໄລຍະເພື່ອສັນຍາລັກ ກຳກັບການເດີນທາງ. ບາງຄັ້ງລະບົບ Android ຈຳກັດແອັບບໍ່ໃຫ້ເຮັດວຽກໃນພື້ນຫຼັງ. ອັນນີ້ກໍເພື່ອປ້ອງກັນບໍ່ໃຫ້ພວກເຮົາສ້າງບັນທຶກການເດີນທາງທີ່ຖືກຕ້ອງ. ກະລຸນາລຶບອອກ. ຂໍ້ຈໍາກັດພື້ນຖານກ່ຽວກັບ app ນີ້.", - "unusedapprestrict": { - "name": "ການປະຕິບັດງານ ບໍ່ໄດ້ໃຊ້ຖືກປິດໃຊ້ງານ", - "description": { - "android-disable-lt-12": "ຢູ່ໃນໜ້າຕາງການຕັ້ງຄ່າແອັບ, ໃຫ້ໄປທີ່ 'ການອະນຸຍາດ' ແລະໃຫ້ແນ່ໃຈວ່າການອະນຸຍາດແອັບຈະບໍ່ຖືກຕັ້ງຄືນໃໝ່ໂດຍອັດຕະໂນມັດ.", - "android-disable-12": "ຢູ່ໃນໜ້າການຕັ້ງຄ່າການປະຕິບັດງານ, ໃຫ້ປິດ 'ລຶບການອະນຸຍາດອອກ ແລະສ້າງພື້ນທີ່ຫວ່າງ", - "android-disable-gte-13": "ຢູ່ໃນໜ້າການຕັ້ງຄ່າການປະຕິບັດງານ, ປິດ 'ຢຸດການເຄື່ອນໄຫວແອັບໄວ້ຊົ່ວຄາວຖ້າບໍ່ໄດ້ໃຊ້.'", - "ios": "ກະລຸນາອະນຸຍາດ." - } - } - }, - "ignorebatteryopt": { - "name": "ບໍ່ເພີ່ມປະສິດທິພາບແບບເຕີລີ", - "description": "ກະລຸນາອະນຸຍາດ." - }, - "permissions": { - "locationPermExplanation-ios-lt-13": "ກະລຸນາເລືອກ 'ອະນຸຍາດສະເໝີ'. ອັນນີ້ແມ່ນເພື່ອໃຫ້ເຂົ້າໃຈການເດີນທາງ ເຖິງແມ່ນວ່າບໍ່ໄດ້ໃຊ້ແອັບດັ່ງກ່າວ", - "locationPermExplanation-ios-gte-13": "ກະລຸນາເລືອກ 'ຕະຫລອດເວລາ' ແລະ 'ແໝັ້ນຍໍາ ' ໃນຫນ້າຕາງການຕັ້ງຄ່າ app ແລ້ວ ກັບຄືນທີ່ນີ້ເພື່ອສືບຕໍ່" - } - }, - "allow_background": { - "samsung": "ປິດການໃຊ້ງານ 'ໂໝດປະຢັດພະລັງງານປານກາງ" - }, - "consent": { - "permissions" : "ການອະນຸຍາດ", - "button-accept": "ຍອມຮັບ", - "button-decline": "ປະຕິເສດ" - }, - "login": { - "make-sure-save-your-opcode": "ໃຫ້ແນ່ໃຈວ່າບັນທຶກ OP ລະຫັດ ຂອງທ່ານ!", - "cannot-retrieve":"NREL ບໍ່ສາມາດເອົາມັນມາໃຫ້ທ່ານໄດ້ໃນພາຍຫຼັງ!", - "save":"ບັນທຶກໄວ້", - "continue": "ສືບຕໍ່", - "enter-existing-token": "ໃສ່ ສັນຍາລັກ ທີ່ມີຢູ່ແລ້ວທີ່ເຈົ້າມີ", - "button-accept": "ຕົກລົງ", - "button-decline": "ຍົກເລີັັກ" - }, - "survey": { - "loading-prior-survey": "ກຳລັງໂຫຼດຄຳຕອບແບບສຳຫຼວດກ່ອນໜ້າ...", - "prev-survey-found": "ພົບເຫັນຄໍາຕອບຂອງການສໍາຫຼວດທີ່ຜ່ານມາ", - "use-prior-response": "ໃຊ້ຄໍາຕອບກ່ອນ", - "edit-response": "ແກ້ໄຂຄໍາຕອບ", - "move-on": "ກ້າວຕໍ່ໄປ", - "survey": "ສໍາຫຼວດ", - "save": "ບັນທຶກ", - "back": "ກັບ", - "next": "ຕໍ່ໄປ", - "powered-by": "ສິດທິໂດຍ", - "dismiss": "ຍົກເລີກ", - "return-to-beginning": "ກັບຄືນ ຫາຈຸດເລີ່ມຕົ້ນ", - "go-to-end": "ໄປໃຫ້ສຸດ", - "enketo-form-errors": "ແບບຟອມມີຂໍ້ຜິດພາດ. ກະລຸນາເບິ່ງຊ່ອງຂໍ້ມູນທີ່ໝາຍເປັນສີແດງ.", - "enketo-timestamps-invalid": "ເວລາທີ່ທ່ານລະບຸນັ້ນບໍ່ຖືກຕ້ອງ. ກະລຸນາກວດສອບວ່າເວລາເລີ່ມຕົ້ນແມ່ນກ່ອນເວລາສິ້ນສຸດ." - }, - "join": { - "welcome-to-app": "ຍິນ​ດີ​ຕ້ອນ​ຮັບ​ສູ່ລະບົບ {{appName}}!", - "app-name" : "NREL OpenPATH", - "to-proceed-further": "ເພື່ອດຳເນີນການຕໍ່ໄປ, ກະລຸນາສະແກນ ຫຼືວາງລະຫັດການເຂົ້າເຖິງທີ່ສະໜອງໃຫ້ໂດຍຜູ້ບໍລິຫານໂຄງການຂອງທ່ານຜ່ານເວັບໄຊ, ອີເມວ, ຂໍ້ຄວາມ ຫຼືການພິມອອກ.", - "code-hint": "ລະຫັດເລີ່ມຕົ້ນດ້ວຍ 'nrelop' ແລະອາດຈະຢູ່ໃນບາໂຄດ ຫຼືຮູບແບບຂໍ້ຄວາມ.", - "scan-code": "ສະແກນລະຫັດ", - "paste-code":"ກົດວາງ ລະຫັດ", - "scan-hint": "ສະແກນບາໂຄດດ້ວຍກ້ອງຖ່າຍຮູບໂທລະສັບຂອງທ່ານ", - "paste-hint": "ຫຼື, ວາງລະຫັດເປັນຂໍ້ຄວາມ", - "more-info": "ຂໍ້​ມູນ​ເພີ່ມ​ເຕີມ", - "about-app-title": "ກ່ຽວກັບ {{appName}}", - "about-app-para-1": "ເວທີເປີດຫ້ອງທົດລອງນໍາໃຊ້ Agile Trip Heuristics (NREL ການເດີນທາງ) ຊ່ວຍໃຫ້ທ່ານສາມາດຕິດຕາມຮູບແບບການເດີນທາງຂອງເຂົາເຈົ້າ - ລົດ, ລົດເມ, ລົດຖີບ, ການຍ່າງ, ແລະອື່ນໆ - ແລະວັດແທກການໃຊ້ພະລັງງານທີ່ກ່ຽວຂ້ອງແລະການປ່ອຍອາຍຄາບອນ.", - "about-app-para-2": "ການປະຕິບັດງານນີ້ເຮັດໃຫ້ຊຸມຊົນເຂົ້າໃຈການເລືອກ ແລະຮູບແບບການເດີນທາງຂອງເຂົາເຈົ້າ, ທົດລອງທາງເລືອກເພື່ອເຮັດໃຫ້ເຂົາເຈົ້າມີຄວາມຍືນຍົງຫຼາຍຂຶ້ນ, ແລະປະເມີນຜົນໄດ້ຮັບ. ຜົນໄດ້ຮັບດັ່ງກ່າວສາມາດແຈ້ງນະໂຍບາຍ ແລະ ແຜນການການຂົນສົ່ງທີ່ມີປະສິດທິຜົນ ແລະ ຖືກນໍາໃຊ້ເພື່ອສ້າງຕົວເມືອງທີ່ມີຄວາມຍືນຍົງ ແລະເຂົ້າເຖິງໄດ້ຫຼາຍຂຶ້ນ.", - "about-app-para-3": "ມັນເຮັດແນວນັ້ນໂດຍການສ້າງ diary ອັດຕະໂນມັດຂອງການເດີນທາງທັງຫມົດຂອງທ່ານ, ໃນທຸກຮູບແບບການຂົນສົ່ງ. ມັນອ່ານເຊັນເຊີຫຼາຍ, ລວມທັງທີ່ຕັ້ງ, ໃນພື້ນຫລັງ, ແລະເປີດ ແລະ ປິດການຕິດຕາມ GPS ອັດຕະໂນມັດສໍາລັບການໃຊ້ພະລັງງານຫນ້ອຍທີ່ສຸດ. ທາງເລືອກຂອງຮູບແບບການເດີນທາງ. ຂໍ້ມູນ ແລະ ຮູບແບບການສະແດງຮອຍກາກບອນແມ່ນການສຶກສາສະເພາະ.", - "tips-title": "ຄໍາແນະນໍາສໍາລັບການປະຕິບັດງານທີ່ຖືກຕ້ອງ", - "all-green-status": "ໃຫ້ແນ່ໃຈວ່າການກວດສອບສະຖານະທັງຫມົດແມ່ນໃຫ້ເປັນ ສີຂຽວ ແມ່ນສາມາດໃຊ້ງານໄດ້", - "dont-force-kill": "ບໍ່ໃຫ້ປິດລະບົບປະຕິບັດການໃຊ້ງານ", - "background-restrictions": "ຢູ່ໃນໂທລະສັບ Samsung ແລະ Huawei, ໃຫ້ແນ່ໃຈວ່າການຈໍາກັດພື້ນຫລັງ ຖືກປິດ", - "close": "ປິດ" - }, - "config": { - "unable-read-saved-config": "ບໍ່ສາມາດອ່ານການຕັ້ງຄ່າທີ່ບັນທຶກໄວ້", - "unable-to-store-config": "ບໍ່ສາມາດເກັບຮັກສາການຕັ້ງຄ່າທີ່ດາວໂຫລດໄດ້", - "not-enough-parts-old-style": "OPລະຫັດ {{token}} ບໍ່ມີອັກສອນ '_' ຢ່າງໜ້ອຍສອງຕົວ", - "no-nrelop-start": "OPລະຫັດ {{token}} ບໍ່ສາມາດຂື້ນຕົ້ນດ້ວຍ 'nrelop'", - "not-enough-parts": "OPລະຫັດ {{token}} ບໍ່ມີອັກສອນ '_' ຢ່າງໜ້ອຍສາມຕົວ", - "invalid-subgroup": "OPລະຫັດ {{token}}, ກຸ່ມຍ່ອຍ {{subgroup}} ບໍ່ພົບໃນບັນຊີລາຍຊື່ {{config_subgroups}}", - "invalid-subgroup-no-default": "OPລະຫັດ ບໍ່ຖືກຕ້ອງ, ບໍ່ມີກຸ່ມຍ່ອຍ, ຄາດວ່າ 'ກຸ່ມຍ່ອຍ' ເລີ່ມຕົ້ນ", - "unable-download-config": "ບໍ່ສາມາດດາວໂຫຼດສຶກສາການຕັ້ງຄ່າ", - "invalid-opcode-format": "ຮູບແບບ OPລະຫັດ ບໍ່ຖືກຕ້ອງ", - "error-loading-config-app-start": "ເກີດຂໍ້ຜິດພາດໃນການໂຫລດການກຳນົດຄ່າ ເມື່ອແອບເລີ່ມການປະຕິບັດງານ", - "survey-missing-formpath": "ຜິດພາດໃນຂະນະທີ່ດຶງຂໍ້ມູນໃນ config: survey_info.surveys ມີແບບສຳຫຼວດທີ່ບໍ່ມີ formPath" - }, - "errors": { - "registration-check-token": "ການລົງທະບຽນຜູ້ໃຊ້ຜິດພາດ. ກະລຸນາກວດເບິ່ງໂທເຄັນຂອງທ່ານແລະລອງໃໝ່ອີກ.", - "not-registered-cant-contact": "ຜູ້ໃຊ້ບໍ່ໄດ້ລົງທະບຽນ, ດັ່ງນັ້ນເຄື່ອງແມ່ຂ່າຍບໍ່ສາມາດຕິດຕໍ່ໄດ້.", - "while-initializing-label": "ໃນຂະນະທີ່ເລີ່ມຕົ້ນແຖບປ້າຍກຳກັບ: ", - "while-loading-pipeline-range": "ເກີດຄວາມຜິດພາດໃນລະຫວ່າງການໂຫຼດໄລຍະທໍ່", - "while-populating-composite": "ເກີດຂໍ້ຜິດພາດໃນລະຫວ່າງການເພີ່ມຂໍ້ມູນການເດີນທາງແບບປະສົມ", - "while-loading-another-week": "ເກີດຂໍ້ຜິດພາດໃນລະຫວ່າງການໂຫຼດການເດີນທາງຂອງ {{when}} ອາທິດ", - "while-loading-specific-week": "ເກີດຄວາມຜິດພາດໃນລະຫວ່າງການໂຫຼດການເດີນທາງໃນອາທິດຂອງ {{day}}", - "while-updating-timeline": "ໃນຂະນະທີ່ອັບເດດທາມລາຍ: ", - "while-refreshing-label": "ໃນຂະນະທີ່ໂຫຼດແຖບປ້າຍກຳກັບຄືນໃໝ່: ", - "while-repopulating-entry": "ໃນຂະນະທີ່ກຳລັງສ້າງລາຍການທາມລາຍຄືນໃໝ່: ", - "while-loading-metrics": "ໃນຂະນະທີ່ກໍາລັງໂຫລດ metrics: ", - "while-log-messages": "ໃນຂະນະທີ່ໄດ້ຮັບຂໍ້ຄວາມຈາກບັນທຶກ ", - "while-max-index" : "ໃນຂະນະທີ່ໄດ້ຮັບດັດຊະນີສູງສຸດ " - }, - "consent-text": { - "title":"ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ/ເງື່ອນໄຂການໃຊ້ງານ NREL OPENPATH", - "introduction":{ - "header":"ຈຸດປະສົງຂອງການສຶກສາ", - "what-is-openpath":"ຂໍ້​ມູນ​ນີ້​ແມ່ນ​ໄດ້​ຖືກ​ເກັບ​ກໍາ​ໂດຍ​ຜ່ານ OpenPATH​, ເປັນ​ເວ​ທີ​ແຫຼ່ງ​ເປີດ NREL​. ແອັບພລິເຄຊັນໂທລະສັບອັດສະລິຍະ, NREL OpenPATH (“App”), ລວມຂໍ້ມູນຈາກ ເຊັນເຊີໂທລະສັບສະຫຼາດ, ປ້າຍຊື່ຜູ້ໃຊ້ semantic ແລະການສໍາຫຼວດປະຊາກອນສັ້ນ.", - "what-is-NREL":"NREL ເປັນຫ້ອງທົດລອງແຫ່ງຊາດຂອງກະຊວງພະລັງງານສະຫະລັດ, ຫ້ອງການຂອງ ພະລັງງານປະສິດທິພາບ ແລະພະລັງງານທົດແທນ, ດໍາເນີນການໂດຍ Alliance for Sustainable ພະລັງງານ, LLC ພາຍໃຕ້ສັນຍາ Prime No. DE-AC36-08GO28308. ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວນີ້ ນຳໃຊ້ກັບແອັບທີ່ສະໜອງໃຫ້ໂດຍພັນທະມິດເພື່ອພະລັງງານແບບຍືນຍົງ, LLC. App ນີ້ ແມ່ນສະຫນອງໃຫ້ພຽງແຕ່ສໍາລັບຈຸດປະສົງຂອງການເກັບກໍາຂໍ້ມູນພຶດຕິກໍາການເດີນທາງສໍາລັບ {{program_or_study}} ແລະເພື່ອການຄົ້ນຄວ້າເພື່ອແຈ້ງນະໂຍບາຍສາທາລະນະ. ບໍ່ມີຂໍ້ມູນໃດໆທີ່ເກັບໄດ້ໂດຍ App ຈະບໍ່ຖືກຂາຍ ຫຼືໃຊ້ສໍາລັບອັນໃດ ຈຸດປະສົງທາງການຄ້າ, ລວມທັງການໂຄສະນາ.", - "if-disagree":"ຖ້າເຈົ້າບໍ່ເຫັນດີກັບເງື່ອນໄຂຂອງນະໂຍບາຍຄວາມເປັນສ່ວນຕົວນີ້, ກະລຸນາລຶບແອັບອອກ" - }, - "why":{ - "header":"ເປັນຫຍັງພວກເຮົາເກັບກໍາຂໍ້ມູນນີ້" - }, - "what":{ - "header":"ການເກັບກຳຂໍ້ມູນ", - "no-pii":"ລະບົບ ຈະບໍ່ ເກັບກຳຂໍ້ມູນທີ່ສາມາດລະບຸຕົວຕົນໄດ້ແບບດັ້ງເດີມ (ເຊັ່ນ: ບໍ່ມີຊື່, ອີເມວ ຫຼືເບີໂທລະສັບ)", - "phone-sensor":"ລະບົບນີ້ຈະນໍາໃຊ້ ເພື່ອເປັນການເກັບກໍາຂໍ້ມູນໃນການຕິດຕາມ ການເດີນທາງ ເພື່ອໃຫ້ເຂົ້າເຖີງຮູບແບບການເດີນທາງຂອງການນໍາໃຊ້ພາຫະນະ.", - "labeling":"ມັນຍັງຈະຂໍໃຫ້ເຈົ້າບັນທຶກການເດີນທາງທີ່ມີຄວາມຮູ້ສຶກເຫຼົ່ານີ້ເປັນໄລຍະໆດ້ວຍ semantic ປ້າຍຊື່, ເຊັ່ນ: ຮູບແບບການເດີນທາງ, ຈຸດປະສົງ, ແລະຮູບແບບການທົດແທນ.", - "demographics":"ມັນຍັງຈະຮ້ອງຂໍຂໍ້ມູນທາງດ້ານສັງຄົມເຊັ່ນ: ອາຍຸໂດຍປະມານຂອງທ່ານ, ເພດ, ແລະປະເພດຄົວເຮືອນ. ປັດໄຈທາງດ້ານສັງຄົມນິຍົມສາມາດຖືກນໍາໃຊ້ເພື່ອ ເຂົ້າໃຈອິດທິພົນຂອງວິຖີຊີວິດກ່ຽວກັບພຶດຕິກໍາການເດີນທາງ, ເຊັ່ນດຽວກັນກັບ generalize ຜົນໄດ້ຮັບຕໍ່ປະຊາກອນທີ່ກວ້າງຂວາງ.", - "open-source-data":"ເພື່ອຄວາມໂປ່ງໃສທີ່ສຸດ, App ແມ່ນອີງໃສ່ເວທີແຫຼ່ງເປີດ, OpenPATH ຂອງ NREL. ທ່ານ​ສາ​ມາດ​ກວດ​ສອບ​ຂໍ້​ມູນ​ທີ່ OpenPATH ເກັບ​ກໍາ​ຂໍ້​ມູນ​ໃນ​ພື້ນ​ຖານ​ທີ່​", - "open-source-analysis":"ທໍ່ການວິເຄາະທີ່", - "open-source-dashboard":"ແລະການວັດແທກ dashboard ຢູ່", - "on-nrel-site": "ເພື່ອຄວາມໂປ່ງໃສທີ່ສຸດ, App ແມ່ນອີງໃສ່ເວທີແຫຼ່ງເປີດ, OpenPATH ຂອງ NREL. ທ່ານສາມາດກວດສອບຂໍ້ມູນທີ່ OpenPATH ເກັບກໍາໃນພື້ນຫລັງ, ທໍ່ການວິເຄາະ, ແລະຕົວຊີ້ວັດ dashboard ຜ່ານການເຊື່ອມຕໍ່ຢູ່ໃນເວັບໄຊທ໌ NREL OpenPATH." - }, - "opcode":{ - "header":"ພວກເຮົາເຊື່ອມໂຍງຂໍ້ມູນກັບທ່ານແນວໃດ", - "not-autogen":"ເຂົ້າສູ່ລະບົບ ທີ່ບໍ່ເປີດເຜີຍຊື່ (ລະຫັດ OP) ໂທເກນທີ່ສ້າງຂຶ້ນແບບສຸ່ມເປັນເອກະລັກ (ລະຫັດ OP) ນີ້ແມ່ນຕົວລະບຸຂອງທ່ານໃນລະບົບ. ບໍ່ມີໃຜນອກເໜືອໄປຈາກເຈົ້າຮູ້ວ່າເຈົ້າກ່ຽວຂ້ອງກັບ (ລະຫັດ OP) ນີ້. ຖ້າທ່ານຕ້ອງການຕິດຕໍ່ສື່ສານກັບທີມງານຄົ້ນ ຄ້ວາກ່ຽວກັບຂໍ້ມູນທີ່ເກັບກໍາກ່ຽວກັບທ່ານ, ກະລຸນາກຽມພ້ອມທີ່ຈະສະຫນອງ (ລະຫັດ OP) ນີ້.", - "autogen":"ໂທເຄັນທີ່ສ້າງຂຶ້ນແບບສຸ່ມຂ້າງເທິງ, ເລີ່ມຕົ້ນດ້ວຍ nrelop_, ຖືກນໍາໃຊ້ເພື່ອເຂົ້າສູ່ລະບົບ. ບັນທຶກ token ຂອງທ່ານໃນກໍລະນີທີ່ທ່ານເສຍ ຫຼືປ່ຽນໂທລະສັບ. ຖ້າທ່ານສູນເສຍ token ຂອງທ່ານ, NREL ບໍ່ສາມາດດຶງມັນມາໃຫ້ທ່ານໄດ້. ເນື່ອງຈາກພວກເຮົາບໍ່ມີຄວາມສາມາດໃນການຈັບຄູ່ token ກັບຜູ້ໃຊ້ແຕ່ລະຄົນ. OPcode ແມ່ນໂທເຄັນທີ່ສ້າງຂຶ້ນແບບສຸ່ມ. ບັນທຶກລະຫັດ (token) ຂອງທ່ານໃນກໍລະນີທີ່ທ່ານເຮັດເສຍ ຫຼື ປ່ຽນໂທລະສັບ. ຖ້າທ່ານເຮັດໂທເຄັນຂອງທ່ານເສຍ, ກະລຸນາຕິດຕໍ່ຜູ້ຮັບຜິດຊອບໂຄງການຂອງທ່ານເພື່ອຂໍຄວາມຊ່ວຍເຫຼືອ. NREL ບໍ່ສາມາດດຶງມັນມາໃຫ້ທ່ານໄດ້ ເນື່ອງຈາກພວກເຮົາບໍ່ມີ. ຄວາມສາມາດໃນການຈັບຄູ່ token ກັບຜູ້ໃຊ້ສ່ວນບຸກຄົນ." - }, - "who-sees":{ - "header":"ຄວາມເປັນສ່ວນຕົວຂອງຂໍ້ມູນ ແລະຄວາມປອດໄພ", - "public-dash":"ການວັດແທກລວມທີ່ມາຈາກຮູບແບບການເດີນທາງຈະຖືກເຮັດໃຫ້ຢູ່ໃນ dashboard ສາທາລະນະເພື່ອໃຫ້ຄວາມໂປ່ງໃສຕໍ່ຜົນກະທົບຂອງໂຄງການ. metrics ເຫຼົ່ານີ້ຈະເນັ້ນໃສ່ການສະຫຼຸບຂໍ້ມູນເຊັ່ນ: ການນັບ, ໄລຍະທາງ ແລະໄລຍະເວລາ, ແລະຈະບໍ່ສະແດງສະຖານທີ່ທ່ອງທ່ຽວ ຫຼືເວລາຂອງແຕ່ລະຄົນ.", - "individual-info":"ຂໍ້ມູນດິບຈາກການສຶກສານີ້ຈະມີໃຫ້ພຽງແຕ່:", - "program-admins":"ຜູ້ບໍລິຫານໂຄງການຈາກ {{deployment_partner_name}} to {{raw_data_use}}, and", - "nrel-devs":"ຜູ້ພັດທະນາ NREL OpenPATH ສຳລັບການດີບັກ.", - "TSDC-info":" ຂໍ້ມູນທີ່ເກັບກຳໄດ້ຈະຖືກເກັບໄວ້ໃນກຸ່ມຂະໜາດກາງທີ່ຮັບຮອງຈາກ FEDRAMP ຢູ່ທີ່ NREL ແລະເຂົ້າລະຫັດທັງໃນການຜ່ານແດນ ແລະໃນທີ່ເຫຼືອ. ຂໍ້ມູນຈາກການສຶກສານີ້ຈະຖືກເກັບໄວ້ແຍກຕ່າງຫາກຈາກຂໍ້ມູນການສຶກສາອື່ນໆໂດຍການນໍາໃຊ້ OpenPATH ເວີຊັນ NREL-hosted. ເວທີ ", - "on-website":"ຢູ່ໃນເວັບໄຊທ໌", - "and-in":" ແລະໃນ ", - "this-pub":"ສິ່ງພິມນີ້", - "and":" ແລະ ", - "fact-sheet":"ເອກະສານຄວາມຈິງ", - "on-nrel-site": " ໂດຍຜ່ານການເຊື່ອມຕໍ່ຢູ່ໃນເວັບໄຊທ໌ NREL OpenPATH." - }, - "rights":{ - "header":"ສິດທິຂອງທ່ານ", - "app-required":" ທ່ານຖືກກໍານົດໃຫ້ຕິດຕາມຮູບແບບການເດີນທາງຂອງທ່ານໂດຍໃຊ້ App ເປັນເງື່ອນໄຂຂອງ ການມີສ່ວນຮ່ວມໃນໂຄງການ. ຖ້າທ່ານຕ້ອງການຖອນຕົວອອກຈາກໂຄງການ, ທ່ານ ຄວນຕິດຕໍ່ຜູ້ບໍລິຫານໂຄງການ, {{program_admin_contact}} ເພື່ອປຶກສາຫາລືກ່ຽວກັບທາງເລືອກການຢຸດເຊົາ. ຖ້າ​ເຈົ້າ ຕ້ອງການຢູ່ໃນໂຄງການແຕ່ບໍ່ໄດ້ໃຊ້ app, ກະລຸນາຕິດຕໍ່ໂຄງການຂອງທ່ານ ຜູ້ບໍລິຫານເພື່ອເຈລະຈາຂັ້ນຕອນການເກັບກຳຂໍ້ມູນທາງເລືອກກ່ອນ ຖອນການຕິດຕັ້ງແອັບຯ. ຖ້າ​ຫາກ​ທ່ານ​ຖອນ​ການ​ຕິດ​ຕັ້ງ app ໂດຍ​ບໍ່​ມີ​ການ​ອະ​ນຸ​ມັດ​ຈາກ​ ຜູ້ບໍລິຫານໂຄງການ, ທ່ານອາດຈະບໍ່ມີການເຂົ້າເຖິງຜົນປະໂຫຍດທີ່ສະຫນອງໃຫ້ໂດຍ ໂຄງການ.", - "app-not-required":"ການມີສ່ວນຮ່ວມໃນ {{program_or_study}} ແມ່ນສົມບູນ ສະໝັກໃຈ. ທ່ານມີສິດທີ່ຈະປະຕິເສດການເຂົ້າຮ່ວມ ຫຼືຖອນຕົວໃນເວລາໃດກໍ່ຕາມ ຈຸດໃນການສຶກສາໂດຍບໍ່ມີການແຈ້ງໃຫ້ NREL ຫຼືຈຸດຕິດຕໍ່. ຖ້າ ທ່ານບໍ່ຕ້ອງການທີ່ຈະເຂົ້າຮ່ວມໃນການສຶກສາຫຼືຢຸດເຊົາການຂອງທ່ານ ການມີສ່ວນຮ່ວມໃນການສຶກສາ, ກະລຸນາລຶບ App.", - "destroy-data-pt1":"ຖ້າທ່ານຕ້ອງການໃຫ້ຂໍ້ມູນຂອງທ່ານຖືກທໍາລາຍ, ກະລຸນາຕິດຕໍ່ K. Shankari", - "destroy-data-pt2":"ຮ້ອງຂໍການລຶບ. ທ່ານຕ້ອງລວມ token ຂອງທ່ານໃນຄໍາຮ້ອງຂໍການລຶບ. ເນື່ອງຈາກວ່າພວກເຮົາບໍ່ ເຊື່ອມຕໍ່ຕົວຕົນຂອງທ່ານກັບ token ຂອງທ່ານ, ພວກເຮົາບໍ່ສາມາດລຶບຂໍ້ມູນຂອງທ່ານໄດ້ ໂດຍບໍ່ມີການໄດ້ຮັບ token ເປັນສ່ວນຫນຶ່ງຂອງຄໍາຮ້ອງຂໍການລຶບ. ພວກເຮົາຈະຫຼັງຈາກນັ້ນ ທໍາລາຍຂໍ້ມູນທັງຫມົດທີ່ກ່ຽວຂ້ອງກັບຄໍາຮ້ອງຂໍການລຶບນັ້ນ, ທັງຢູ່ໃນອອນໄລນ໌ແລະ ຊຸດຂໍ້ມູນທີ່ເກັບໄວ້." - }, - "questions":{ - "header":"ຄຳຖາມ", - "for-questions":"ຖ້າທ່ານມີຄໍາຖາມໃດໆກ່ຽວກັບເປົ້າຫມາຍການເກັບກໍາຂໍ້ມູນແລະຜົນໄດ້ຮັບ, ກະລຸນາ ຕິດ​ຕໍ່​ພົວ​ພັນ​ຕົ້ນ​ຕໍ​ຂອງ​ການ​ສໍາ​ລັບ​ການ​ສຶກ​ສາ​, {{program_admin_contact}}. ຖ້າທ່ານມີຄໍາຖາມດ້ານວິຊາການໃດໆ ກ່ຽວ​ກັບ​ການ​ດໍາ​ເນີນ​ງານ app​, ກະ​ລຸ​ນາ​ຕິດ​ຕໍ່​ຫາ K. Shankari ຂອງ NREL (k.shankari@nrel.gov​)​." - }, - "consent":{ - "header":"ຂ້ອຍຍອມຮັບ", - "press-button-to-consent":"ກະລຸນາເລືອກປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຊີ້ບອກວ່າທ່ານໄດ້ອ່ານ ແລະຕົກລົງເຫັນດີກັບເລື່ອງນີ້ ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ, ຍິນຍອມທີ່ຈະເກັບກໍາຂໍ້ມູນຂອງທ່ານ, ແລະຕ້ອງການທີ່ຈະ ເຂົ້າຮ່ວມໃນ {{program_or_study}}." - } - }, - "react-native-paper-dates": { - "save": "ບັນທຶກ", - "selectSingle": "ເລືອກວັນທີ", - "selectMultiple": "ເລືອກວັນທີ", - "selectRange": "ເລືອກໄລຍະເວລາ", - "notAccordingToDateFormat": "(inputFormat) => ຮູບແບບວັນທີຈະຕ້ອງເປັນ ${inputFormat}", - "mustBeHigherThan": "(date) => ຈະຕ້ອງຕໍ່ມາ ${date}", - "mustBeLowerThan": "(date) => ຕ້ອງກ່ອນໜ້ານັ້ນ ${date}", - "mustBeBetween": "(startDate, endDate) => ຕ້ອງຢູ່ລະຫວ່າງ ${startDate} - ${endDate}", - "dateIsDisabled": "ມື້ແມ່ນບໍ່ອະນຸຍາດໃຫ້", - "previous": "ທີ່ຜ່ານມາ", - "next": "ຕໍ່ໄປ", - "typeInDate": "ພິມວັນທີ", - "pickDateFromCalendar": "ເລືອກວັນທີຈາກປະຕິທິນ", - "close": "ປິດ" - } -} diff --git a/www/i18n/trip_confirm_options-es.json b/www/i18n/trip_confirm_options-es.json deleted file mode 100644 index 30899fc2e..000000000 --- a/www/i18n/trip_confirm_options-es.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "MODE" : [ - {"text":"Caminando", "value":"walk", "met_equivalent": "WALKING", "co2PerMeter": 0}, - {"text":"e-bicicleta","value":"e-bike", "met": { - "ALL": {"range": [0, -1], "mets": 4.9} - }, "co2PerMeter": 0.00728}, - {"text":"Bicicleta","value":"bike", "met_equivalent": "BICYCLING", "co2PerMeter": 0}, - {"text":"Bicicleta compartida","value":"bikeshare", "met_equivalent": "BICYCLING", "co2PerMeter": 0}, - {"text":"Motoneta compartida","value":"scootershare", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.00894}, - {"text":"Coche de Gas, Condujo solo","value":"drove_alone", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.22031}, - {"text":"Coche de Gas, Condujo con otros","value":"shared_ride", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.11015}, - {"text":"e-coche, Condujo solo","value":"e_car_drove_alone", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.08216}, - {"text":"e-coche, Condujo con ontras","value":"e_car_shared_ride", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.04108}, - {"text":"Taxi/Uber/Lyft","value":"taxi", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.30741}, - {"text":"Autobús","value":"bus", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.20727}, - {"text":"Tren","value":"train", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.12256}, - {"text":"Colectivo gratuito","value":"free_shuttle", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.20727}, - {"text":"Avión","value":"air", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.09975}, - {"text":"No es un viaje","value":"not_a_trip", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}, - {"text":"Otros","value":"other", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}], - "REPLACED_MODE" : [ - {"text":"Sin viaje", "value":"no_travel"}, - {"text":"Caminando", "value":"walk"}, - {"text":"Bicicleta normal","value":"bike"}, - {"text":"Bicicleta compartida","value":"bikeshare"}, - {"text":"Motoneta compartida","value":"scootershare"}, - {"text":"Coche de Gas, Condujo solo","value":"drove_alone"}, - {"text":"Coche de Gas, Condujo con otros","value":"shared_ride"}, - {"text":"e-coche, Condujo solo","value":"e_car_drove_alone"}, - {"text":"e-coche, Condujo con otros","value":"e_car_shared_ride"}, - {"text":"Taxi/Uber/Lyft","value":"taxi"}, - {"text":"Autobús","value":"bus"}, - {"text":"Tren","value":"train"}, - {"text":"Colectivo gratuito","value":"free_shuttle"}, - {"text":"Otros","value":"other"}], - "PURPOSE" : [ - {"text":"Inicio", "value":"home"}, - {"text":"Trabajo","value":"work"}, - {"text":"En el trabajo","value":"at_work"}, - {"text":"Escuela","value":"school"}, - {"text":"Transbordo", "value":"transit_transfer"}, - {"text":"Compras","value":"shopping"}, - {"text":"Comida","value":"meal"}, - {"text":"Recoger/ Entregar Individuo","value":"pick_drop_person"}, - {"text":"Recoger/ Entregar Objeto","value":"pick_drop_item"}, - {"text":"Personal/ Médico","value":"personal_med"}, - {"text":"Acceder a Recreación","value":"access_recreation"}, - {"text":"Recreación/ Ejercicio","value":"exercise"}, - {"text":"Entretenimiento/ Social","value":"entertainment"}, - {"text":"Religioso", "value":"religious"}, - {"text":"Otros","value":"other"}] -} diff --git a/www/i18n/trip_confirm_options-fr.json b/www/i18n/trip_confirm_options-fr.json deleted file mode 100644 index feb304e31..000000000 --- a/www/i18n/trip_confirm_options-fr.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "MODE" : [ - {"text":"Marche", "value":"walk"}, - {"text":"Vélo","value":"bike"}, - {"text":"Voiture solo","value":"drove_alone"}, - {"text":"Covoiturage","value":"shared_ride"}, - {"text":"Taxis","value":"taxi"}, - {"text":"Bus","value":"bus"}, - {"text":"Train/RER","value":"train"}, - {"text":"Métro","value":"subway"}, - {"text":"Tram","value":"tramway"}, - {"text":"Navette","value":"free_shuttle"}, - {"text":"Autre","value":"other_mode"}], - "PURPOSE" : [ - {"text":"Domicile", "value":"home"}, - {"text":"Travail","value":"work"}, - {"text":"École","value":"school"}, - {"text":"Correspondance TC", "value":"transit_transfer"}, - {"text":"Achats","value":"shopping"}, - {"text":"Repas","value":"meal"}, - {"text":"Dépose","value":"pick_drop"}, - {"text":"Personnel","value":"personal_med"}, - {"text":"Sport","value":"exercise"}, - {"text":"Loisir","value":"entertainment"}, - {"text":"Autre","value":"other_purpose"}] - } - diff --git a/www/i18n/trip_confirm_options-it.json b/www/i18n/trip_confirm_options-it.json deleted file mode 100644 index 7b8ae2aa0..000000000 --- a/www/i18n/trip_confirm_options-it.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "modeOptions" : [ - {"text":"A piedi", "value":"walk"}, - {"text":"Bici","value":"bike"}, - {"text":"In macchina da solo","value":"drove_alone"}, - {"text":"In macchina con altri","value":"shared_ride"}, - {"text":"Taxi","value":"taxi"}, - {"text":"Bus","value":"bus"}, - {"text":"Treno","value":"train"}, - {"text":"Navetta","value":"free_shuttle"}, - {"text":"Altro","value":"other_mode"}], - "purposeOptions" : [ - {"text":"Casa", "value":"home"}, - {"text":"Lavoro","value":"work"}, - {"text":"Scuola","value":"school"}, - {"text":"Cambio mezzo", "value":"transit_transfer"}, - {"text":"Shopping","value":"shopping"}, - {"text":"Pasto","value":"meal"}, - {"text":"Carico/ scarico","value":"pick_drop"}, - {"text":"Personale","value":"personal_med"}, - {"text":"Svago/ Sport","value":"exercise"}, - {"text":"Divertimento","value":"entertainment"}, - {"text":"Altro","value":"other_purpose"}] - } - \ No newline at end of file diff --git a/www/i18n/trip_confirm_options-lo.json b/www/i18n/trip_confirm_options-lo.json deleted file mode 100644 index 362122e44..000000000 --- a/www/i18n/trip_confirm_options-lo.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "MODE" : [ - {"text":"ດ້ວຍການຍ່າງ", "value":"walk", "met_equivalent": "WALKING", "co2PerMeter": 0}, - {"text":"ດ້ວຍລົດຈັກໄຟຟ້າ","value":"e-bike", "met": { - "ALL": {"range": [0, -1], "mets": 4.9} - }, "co2PerMeter": 0.00728}, - {"text":"ດ້ວຍລົດຖີບ","value":"bike", "met_equivalent": "BICYCLING", "co2PerMeter": 0}, - {"text":"ດ້ວຍລົດຖີບທີ່ໃຫ້ເຊົ່າ","value":"bikeshare", "met_equivalent": "BICYCLING", "co2PerMeter": 0}, - {"text":"ດ້ວຍລົດຈັກສະກູດເຕີ້ໃຫ້ເຊົ່າ ","value":"scootershare", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.00894}, - {"text":"ດ້ວຍລົດທີ່ນໍາໃຊ້ແກັດ","value":"drove_alone", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.22031}, - {"text":"ດ້ວຍລົດທີ່ນໍາໃຊ້ແກັດ ທີ່ເປັນລົດໃຫ້ເຊົ່າ ມາຂັບເປັນລົດໂດຍສານ","value":"shared_ride", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.11015}, - {"text":"ດ້ວຍລົດໃຫ່ຍໄຟຟ້າ","value":"e_car_drove_alone", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.08216}, - {"text":"ດ້ວຍລົດໄຟຟ້າ","value":"e_car_shared_ride", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.04108}, - {"text":"ແທັກຊີ","value":"taxi", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.30741}, - {"text":"ລົດເມ","value":"bus", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.20727}, - {"text":"ລົດໄຟ","value":"train", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.12256}, - {"text":"ລົດຮັບສົ່ງຟຣີ","value":"free_shuttle", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.20727}, - {"text":"ຍົນ","value":"air", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.09975}, - {"text":"ບໍ່ແມ່ນການເດີນທາງ","value":"not_a_trip", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}, - {"text":"ອື່ນໆ","value":"other", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}], - "REPLACED_MODE" : [ - {"text":"ບໍ່ມີການເດີນທາງ", "value":"no_travel"}, - {"text":"ດ້ວຍການຍ່າງ", "value":"walk"}, - {"text":"ດ້ວຍລົດຖີບ","value":"bike"}, - {"text":"ດ້ວຍລົດຖີບທີ່ໃຫ້ເຊົ່າ","value":"bikeshare"}, - {"text":"ດ້ວຍລົດຈັກສະກູດເຕີ້ໃຫ້ເຊົ່າ ","value":"scootershare"}, - {"text":"ດ້ວຍລົດທີ່ນໍາໃຊ້ແກັດ","value":"drove_alone"}, - {"text":"ດ້ວຍລົດທີ່ນໍາໃຊ້ແກັດ ທີ່ເປັນລົດໃຫ້ເຊົ່າ ມາຂັບເປັນລົດໂດຍສານ","value":"shared_ride"}, - {"text":"ດ້ວຍລົດໃຫ່ຍໄຟຟ້າ","value":"e_car_drove_alone"}, - {"text":"ດ້ວຍລົດໄຟຟ້າ","value":"e_car_shared_ride"}, - {"text":"ແທັກຊີ","value":"taxi"}, - {"text":"ລົດເມ","value":"bus"}, - {"text":"ລົດໄຟ","value":"train"}, - {"text":"ລົດຮັບສົ່ງຟຣີ","value":"free_shuttle"}, - {"text":"ອື່ນໆ","value":"other"}], - "PURPOSE" : [ - {"text":"ບ້ານ", "value":"home"}, - {"text":"ໄປເຮັດວຽກ","value":"work"}, - {"text":"ບ່ອນເຮັດວຽກ","value":"at_work"}, - {"text":"ໄປໂຮງຮຽນ","value":"school"}, - {"text":"ການຖ່າຍໂອນການເດີນທາງ", "value":"transit_transfer"}, - {"text":"ຊອບປິ້ງ","value":"shopping"}, - {"text":"ອາຫານ","value":"meal"}, - {"text":"ໄປຮັບ ຫລື ສົນ ຄົນໄປຮັບ ຫລື ສົນ ຄົນ","value":"pick_drop_person"}, - {"text":"ໄປຮັບ ຫລື ສົ່ງສິນຄ້າ","value":"pick_drop_item"}, - {"text":"ໄປຫາໝໍ","value":"personal_med"}, - {"text":"ເຂົ້າເຖິງການພັກຜ່ອນ","value":"access_recreation"}, - {"text":"ພັກຜ່ອນ/ອອກກຳລັງກາຍ","value":"exercise"}, - {"text":"ບັນເທີງ/ສັງຄົມ","value":"entertainment"}, - {"text":"ຈຸດປະສົງທາງສາດສະໜາ", "value":"religious"}, - {"text":"ອື່ນໆ","value":"other"}] - } - \ No newline at end of file diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 777aaa95d..a5dc1188d 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { StyleSheet, Modal, ScrollView, SafeAreaView, View } from 'react-native'; import gatherBluetoothData from './blueoothScanner'; @@ -16,7 +16,6 @@ import { Appbar, useTheme, Button } from 'react-native-paper'; const BluetoothScanPage = ({ ...props }: any) => { const { t } = useTranslation(); const [logs, setLogs] = useState([]); - const [isScanning, setIsScanning] = useState(false); const { colors } = useTheme(); // Function to run Bluetooth test and update logs @@ -30,20 +29,6 @@ const BluetoothScanPage = ({ ...props }: any) => { } }; - useEffect(() => { - let intervalId; - if (isScanning) { - intervalId = setInterval(runBluetoothTest, 5000); - } else { - clearInterval(intervalId); - } - return () => clearInterval(intervalId); - }, [isScanning]); - - const handleToggle = () => { - setIsScanning(!isScanning); - }; - const BlueScanContent = (
{ - From b4cafd492899f7c7679afbe09c869b0793b6f77d Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:37:22 -0800 Subject: [PATCH 12/33] Fixed scan button, ran prettier --- www/i18n/en.json | 1 + www/js/bluetooth/BluetoothScanPage.tsx | 26 +++++++++++++++++++--- www/js/control/BluetoothScanSettingRow.tsx | 4 ++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/www/i18n/en.json b/www/i18n/en.json index 4aec6165d..ac4c87469 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -234,6 +234,7 @@ "bluetooth": { "scan-debug-title": "Bluetooth Scanner", "scan-for-bluetooth": "Scan for Devices", + "is-scanning": "Scanning...", "device-info": { "id": "ID", "name": "Name" diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index a5dc1188d..777aaa95d 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { StyleSheet, Modal, ScrollView, SafeAreaView, View } from 'react-native'; import gatherBluetoothData from './blueoothScanner'; @@ -16,6 +16,7 @@ import { Appbar, useTheme, Button } from 'react-native-paper'; const BluetoothScanPage = ({ ...props }: any) => { const { t } = useTranslation(); const [logs, setLogs] = useState([]); + const [isScanning, setIsScanning] = useState(false); const { colors } = useTheme(); // Function to run Bluetooth test and update logs @@ -29,6 +30,20 @@ const BluetoothScanPage = ({ ...props }: any) => { } }; + useEffect(() => { + let intervalId; + if (isScanning) { + intervalId = setInterval(runBluetoothTest, 5000); + } else { + clearInterval(intervalId); + } + return () => clearInterval(intervalId); + }, [isScanning]); + + const handleToggle = () => { + setIsScanning(!isScanning); + }; + const BlueScanContent = (
{ - diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index efbae279a..5af6ff25f 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -12,9 +12,9 @@ const BluetoothScanSettingRow = ({}) => { // Check and prompt for bluetooth scan permission try { let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); - if (response == "OK") setBluePageVisible(true) + if (response == 'OK') setBluePageVisible(true); } catch (e) { - displayError(e, "Insufficient Permissions"); + displayError(e, 'Insufficient Permissions'); } } From 2b366ebf5cef26992581335056d076d91af22596 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Mon, 19 Feb 2024 15:34:46 -0500 Subject: [PATCH 13/33] Fixed weird react hook error by passing in the translation hook into our bluetooth scanner --- www/js/bluetooth/BluetoothScanPage.tsx | 3 ++- www/js/bluetooth/blueoothScanner.ts | 11 ++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 777aaa95d..40dac9306 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -5,6 +5,7 @@ import gatherBluetoothData from './blueoothScanner'; import { logWarn } from '../plugin/logger'; import BluetoothCard from './BluetoothCard'; import { Appbar, useTheme, Button } from 'react-native-paper'; +// import useBluetoothScan from '../bluetooth/blueoothScanner' /** * The implementation of this scanner page follows the design of @@ -22,7 +23,7 @@ const BluetoothScanPage = ({ ...props }: any) => { // Function to run Bluetooth test and update logs const runBluetoothTest = async () => { try { - const newLogs = await gatherBluetoothData(); + const newLogs = await gatherBluetoothData(t); setLogs(newLogs); } catch (error) { logWarn(error); diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index efad6aea7..10b36b498 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -1,11 +1,10 @@ -import { logWarn } from '../plugin/logger'; -import { useTranslation } from 'react-i18next'; +import { logWarn, logDebug } from '../plugin/logger'; -export function gatherBluetoothData(): Promise { - const { t } = useTranslation(); +export default function gatherBluetoothData(t): Promise { return new Promise((resolve, reject) => { let logs: string[] = []; + logDebug("Running bluetooth discovery test!"); window['bluetoothSerial'].discoverUnpaired( (devices: Array) => { @@ -26,6 +25,4 @@ export function gatherBluetoothData(): Promise { }, ); }); -} - -export default gatherBluetoothData; +} \ No newline at end of file From 157cfdefe110578014a203bc420b94ef40b54b52 Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:49:24 -0800 Subject: [PATCH 14/33] Updated bluetooth plugin, ran `prettier` - Updated plugin to a fork of the original: ideally, this fork should support Bluetooth Classic for both iOS & Android --- package.cordovabuild.json | 6 ++++-- www/js/bluetooth/blueoothScanner.ts | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.cordovabuild.json b/package.cordovabuild.json index 9c0c1acb4..1ef62ad3f 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -97,7 +97,8 @@ "phonegap-plugin-barcodescanner": { "ANDROID_SUPPORT_V4_VERSION": "27.+" }, - "cordova-plugin-bluetooth-serial": {} + "cordova-plugin-bluetooth-classic-serial-port": {}, + "cordova-custom-config": {} } }, "dependencies": { @@ -133,7 +134,8 @@ "cordova-plugin-ionic-webview": "5.0.0", "cordova-plugin-local-notification-12": "github:e-mission/cordova-plugin-local-notification-12#v0.1.4-fix-android-action", "cordova-plugin-x-socialsharing": "6.0.4", - "cordova-plugin-bluetooth-serial": "0.4.7", + "cordova-plugin-bluetooth-classic-serial-port": "0.9.13", + "cordova-custom-config": "^5.1.1", "core-js": "^2.5.7", "enketo-core": "^6.1.7", "enketo-transformer": "^4.0.0", diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index 10b36b498..4ebd8f908 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -1,10 +1,9 @@ import { logWarn, logDebug } from '../plugin/logger'; export default function gatherBluetoothData(t): Promise { - return new Promise((resolve, reject) => { let logs: string[] = []; - logDebug("Running bluetooth discovery test!"); + logDebug('Running bluetooth discovery test!'); window['bluetoothSerial'].discoverUnpaired( (devices: Array) => { @@ -25,4 +24,4 @@ export default function gatherBluetoothData(t): Promise { }, ); }); -} \ No newline at end of file +} From 43bfb4e5912d1979c3467654899e5c3fca2aa19c Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Mon, 19 Feb 2024 16:36:57 -0800 Subject: [PATCH 15/33] Updated plugin call to use new plugin --- www/js/bluetooth/blueoothScanner.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index 4ebd8f908..0a678edca 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -5,7 +5,7 @@ export default function gatherBluetoothData(t): Promise { let logs: string[] = []; logDebug('Running bluetooth discovery test!'); - window['bluetoothSerial'].discoverUnpaired( + window['bluetoothClassicSerial'].discoverUnpaired( (devices: Array) => { devices.forEach(function (device) { logs.push( From 4b5a7e7927d8dde4b8ae2085b45c5572f76f9cb6 Mon Sep 17 00:00:00 2001 From: the-bay-kay Date: Tue, 20 Feb 2024 22:29:38 -0800 Subject: [PATCH 16/33] Fixed rendering issues with BluetoothScanPage - Cards were not splitting logs correctly, fixed to split via index - We should be fine with this rudimentary string parsing technique; from my testing, IDs have not gone past the length given. --- www/js/bluetooth/BluetoothScanPage.tsx | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 40dac9306..fea9ddc09 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -5,7 +5,6 @@ import gatherBluetoothData from './blueoothScanner'; import { logWarn } from '../plugin/logger'; import BluetoothCard from './BluetoothCard'; import { Appbar, useTheme, Button } from 'react-native-paper'; -// import useBluetoothScan from '../bluetooth/blueoothScanner' /** * The implementation of this scanner page follows the design of @@ -14,6 +13,7 @@ import { Appbar, useTheme, Button } from 'react-native-paper'; * Future work may include refractoring these files to be implementations of a * single base "pop-up page" component */ + const BluetoothScanPage = ({ ...props }: any) => { const { t } = useTranslation(); const [logs, setLogs] = useState([]); @@ -45,7 +45,20 @@ const BluetoothScanPage = ({ ...props }: any) => { setIsScanning(!isScanning); }; - const BlueScanContent = ( + const BluetoothCardList = ({ devices }) => ( +
+ {devices.map((device) => { + if (device) { + const deviceID = device.slice(0, 18); + const deviceName = device.slice(18); + return ; + } + return null; + })} +
+ ); + + const BlueScanContent = () => (
{ {isScanning ? t('bluetooth.is-scanning') : t('bluetooth.scan-for-bluetooth')} - - {logs.map((log, index) => ( - - ))} +
); @@ -80,7 +90,7 @@ const BluetoothScanPage = ({ ...props }: any) => { -
{BlueScanContent}
+ From 0a71d52e5075062a102e9a02479e91046b733a47 Mon Sep 17 00:00:00 2001 From: the-bay-kay Date: Tue, 20 Feb 2024 23:16:40 -0800 Subject: [PATCH 17/33] Reverted button to "Scan Once" --- www/js/bluetooth/BluetoothScanPage.tsx | 27 +++++--------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index fea9ddc09..27a3e8671 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { StyleSheet, Modal, ScrollView, SafeAreaView, View } from 'react-native'; import gatherBluetoothData from './blueoothScanner'; @@ -23,28 +23,16 @@ const BluetoothScanPage = ({ ...props }: any) => { // Function to run Bluetooth test and update logs const runBluetoothTest = async () => { try { + setIsScanning(true); const newLogs = await gatherBluetoothData(t); setLogs(newLogs); } catch (error) { logWarn(error); - // TODO: Handle error further + } finally { + setIsScanning(false); } }; - useEffect(() => { - let intervalId; - if (isScanning) { - intervalId = setInterval(runBluetoothTest, 5000); - } else { - clearInterval(intervalId); - } - return () => clearInterval(intervalId); - }, [isScanning]); - - const handleToggle = () => { - setIsScanning(!isScanning); - }; - const BluetoothCardList = ({ devices }) => (
{devices.map((device) => { @@ -72,12 +60,7 @@ const BluetoothScanPage = ({ ...props }: any) => { - From 5fcab705be9bd40a31a5510424db0f392d9c8901 Mon Sep 17 00:00:00 2001 From: the-bay-kay Date: Thu, 22 Feb 2024 13:28:54 -0800 Subject: [PATCH 18/33] Fixed miscalculation with device name slicing --- www/js/bluetooth/BluetoothScanPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 27a3e8671..f7c7c3c84 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -37,8 +37,8 @@ const BluetoothScanPage = ({ ...props }: any) => {
{devices.map((device) => { if (device) { - const deviceID = device.slice(0, 18); - const deviceName = device.slice(18); + const deviceID = device.slice(0, 21); + const deviceName = device.slice(21); return ; } return null; From f690d84a34f71c8f274959c552e7d6b684c6fc46 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Fri, 23 Feb 2024 11:49:50 -0500 Subject: [PATCH 19/33] Bumped up number of expected plugins --- setup/setup_shared_native.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/setup_shared_native.sh b/setup/setup_shared_native.sh index f7cba2aaf..87e652561 100644 --- a/setup/setup_shared_native.sh +++ b/setup/setup_shared_native.sh @@ -23,7 +23,7 @@ sed -i -e "s|/usr/bin/env node|/usr/bin/env node --unhandled-rejections=strict|" npx cordova prepare -EXPECTED_COUNT=24 +EXPECTED_COUNT=25 INSTALLED_COUNT=`npx cordova plugin list | wc -l` echo "Found $INSTALLED_COUNT plugins, expected $EXPECTED_COUNT" if [ $INSTALLED_COUNT -lt $EXPECTED_COUNT ]; From bb16e6db6967d5ffe71a42e9fb58844e7b3c8fb9 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Mon, 26 Feb 2024 19:29:54 -0500 Subject: [PATCH 20/33] Forked our own version of the bluetooth plugin so that we can change the plugin.xml to prevent Android Manifest merger errors --- package.cordovabuild.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.cordovabuild.json b/package.cordovabuild.json index 1ef62ad3f..53c28da48 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -134,7 +134,7 @@ "cordova-plugin-ionic-webview": "5.0.0", "cordova-plugin-local-notification-12": "github:e-mission/cordova-plugin-local-notification-12#v0.1.4-fix-android-action", "cordova-plugin-x-socialsharing": "6.0.4", - "cordova-plugin-bluetooth-classic-serial-port": "0.9.13", + "cordova-plugin-bluetooth-classic-serial-port": "git+https://github.com/louisg1337/cordova-plugin-bluetooth-classic-serial-port.git", "cordova-custom-config": "^5.1.1", "core-js": "^2.5.7", "enketo-core": "^6.1.7", From 00b8fdcb4a0f9d23a9be3d62b7b030549a5afdb1 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Mon, 26 Feb 2024 20:07:23 -0500 Subject: [PATCH 21/33] Added in functionality to prevent iOS users from using the bluetooth scanner. --- www/js/control/BluetoothScanSettingRow.tsx | 25 ++++++++++++++++------ www/js/control/ControlSyncHelper.tsx | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index 5af6ff25f..76958f295 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -1,7 +1,8 @@ import React, { useState } from 'react'; import SettingRow from './SettingRow'; import BluetoothScanPage from '../bluetooth/BluetoothScanPage'; -import { displayError } from '../plugin/logger'; +import { displayError, displayErrorMsg } from '../plugin/logger'; +import { getConfig } from './ControlSyncHelper'; const BluetoothScanSettingRow = ({}) => { const [bluePageVisible, setBluePageVisible] = useState(false); @@ -9,12 +10,22 @@ const BluetoothScanSettingRow = ({}) => { async function openPopover() { // TODO: Add logic to check for conifig here, or in settings - // Check and prompt for bluetooth scan permission - try { - let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); - if (response == 'OK') setBluePageVisible(true); - } catch (e) { - displayError(e, 'Insufficient Permissions'); + // Determine if user is on Android or iOS as this is an Android only feature right now + let config = await getConfig(); + + if (!config.ios_use_remote_push) { + // Check and prompt for bluetooth scan permission + try { + let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); + if (response == 'OK') setBluePageVisible(true); + } catch (e) { + displayError(e, 'Insufficient Permissions'); + } + } else { + displayErrorMsg( + 'Scanning for bluetooth devices is currently only supported on Android, sorry!', + 'Platform Not Supported', + ); } } diff --git a/www/js/control/ControlSyncHelper.tsx b/www/js/control/ControlSyncHelper.tsx index e46c38af6..2a2274e1a 100644 --- a/www/js/control/ControlSyncHelper.tsx +++ b/www/js/control/ControlSyncHelper.tsx @@ -30,7 +30,7 @@ const setConfig = function (config) { return window['cordova'].plugins.BEMServerSync.setConfig(config); }; -const getConfig = function () { +export const getConfig = function () { return window['cordova'].plugins.BEMServerSync.getConfig(); }; From 72f499f8f4be420d6a9af4262ca2cc3dd26ea3ed Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Wed, 28 Feb 2024 14:14:18 -0800 Subject: [PATCH 22/33] Updated Bluetooth Scan Coverage - Updated calls to Bluetooth Plugin, to ensure paired devices are included in the scan list --- www/js/bluetooth/blueoothScanner.ts | 80 +++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 17 deletions(-) diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index 0a678edca..bfeb3c8b1 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -1,27 +1,73 @@ import { logWarn, logDebug } from '../plugin/logger'; +// Device data, as defined in BluetoothClassicSerial's docs +type BluetoothClassicDevice = { + class: number; + id: string; + address: string; + name: string; +}; + +/** + * gatherBluetoothData scans for viewable Bluetooth Classic Devices + * @param t is the 18next translation function + * @returns an array of strings containing device data, formatted ['ID: id Name: name'] + */ export default function gatherBluetoothData(t): Promise { return new Promise((resolve, reject) => { let logs: string[] = []; logDebug('Running bluetooth discovery test!'); - window['bluetoothClassicSerial'].discoverUnpaired( - (devices: Array) => { - devices.forEach(function (device) { - logs.push( - `${t('bluetooth.device-info.id')}: ${device.id} ${t('bluetooth.device-info.name')}: ${ - device.name - }`, - ); + // Device List "I/O" + function handleLogs(devices: Array) { + devices.forEach((device) => { + logs.push( + `${t('bluetooth.device-info.id')}: ${device.id} ${t('bluetooth.device-info.name')}: ${ + device.name + }`, + ); + }); + } + + function handleErr(errorText: string) { + logs.push(t('errors.while-scanning-bluetooth')); + logs.push('ERROR: ' + errorText); + logWarn('ERROR: ' + errorText); + } + + // Plugin Calls + const unpairedDevicesPromise = new Promise((unpairedRes, unpairedRej) => { + window['bluetoothClassicSerial'].discoverUnpaired( + (devices: Array) => { + handleLogs(devices); + unpairedRes(logs); + }, + (err: string) => { + handleErr(err); + unpairedRej(new Error(err)); + }, + ); + }); + + const pairedDevicesPromise = new Promise((pairRes, pairRej) => { + window['bluetoothClassicSerial'].discoverUnpaired( + (devices: Array) => { + handleLogs(devices); + pairRes(logs); + }, + (err: string) => { + handleErr(err); + pairRej(new Error(err)); + }, + ); + + Promise.all([unpairedDevicesPromise, pairedDevicesPromise]) + .then(() => { + resolve(logs); + }) + .catch((err) => { + reject(err); }); - resolve(logs); - }, - (err: string) => { - logs.push(t('errors.while-scanning-bluetooth')); - logs.push('ERROR: ' + err); - logWarn('ERROR: ' + err); - reject(new Error(err)); - }, - ); + }); }); } From e35aaff742622e3e67eb78b35aba05697a200b3d Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:46:29 -0800 Subject: [PATCH 23/33] Updated second API call --- www/js/bluetooth/blueoothScanner.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index bfeb3c8b1..491bec25b 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -50,7 +50,7 @@ export default function gatherBluetoothData(t): Promise { }); const pairedDevicesPromise = new Promise((pairRes, pairRej) => { - window['bluetoothClassicSerial'].discoverUnpaired( + window['bluetoothClassicSerial'].list( (devices: Array) => { handleLogs(devices); pairRes(logs); From 1b772e2c5217ac8ef80b84cc9413bd808620a320 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Fri, 1 Mar 2024 18:07:50 -0500 Subject: [PATCH 24/33] Incorporated iOS functionality to scanner --- www/js/control/BluetoothScanSettingRow.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index 76958f295..5ce4919fc 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import SettingRow from './SettingRow'; import BluetoothScanPage from '../bluetooth/BluetoothScanPage'; -import { displayError, displayErrorMsg } from '../plugin/logger'; +import { displayError, displayErrorMsg, logDebug } from '../plugin/logger'; import { getConfig } from './ControlSyncHelper'; const BluetoothScanSettingRow = ({}) => { @@ -10,11 +10,13 @@ const BluetoothScanSettingRow = ({}) => { async function openPopover() { // TODO: Add logic to check for conifig here, or in settings - // Determine if user is on Android or iOS as this is an Android only feature right now + // Get the config to determine if user is on Android or iOS let config = await getConfig(); + // Depending on user platform, handle requesting the permissions differently if (!config.ios_use_remote_push) { // Check and prompt for bluetooth scan permission + logDebug('[BLUETOOTH] ANDROID'); try { let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); if (response == 'OK') setBluePageVisible(true); @@ -22,10 +24,10 @@ const BluetoothScanSettingRow = ({}) => { displayError(e, 'Insufficient Permissions'); } } else { - displayErrorMsg( - 'Scanning for bluetooth devices is currently only supported on Android, sorry!', - 'Platform Not Supported', - ); + logDebug('[BLUETOOTH] IOS'); + let response = await window['bluetoothClassicSerial'].initializeBluetooth(); + logDebug(response); + setBluePageVisible(true); } } From 1b3e946382167a8d37c22e88b785971eae0abff5 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Wed, 6 Mar 2024 16:19:11 -0500 Subject: [PATCH 25/33] Got rid of the ability for iOS users to use the scanner due to weird permission behavior. --- www/js/control/BluetoothScanSettingRow.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index 5ce4919fc..fca55554f 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -16,7 +16,6 @@ const BluetoothScanSettingRow = ({}) => { // Depending on user platform, handle requesting the permissions differently if (!config.ios_use_remote_push) { // Check and prompt for bluetooth scan permission - logDebug('[BLUETOOTH] ANDROID'); try { let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); if (response == 'OK') setBluePageVisible(true); @@ -24,10 +23,7 @@ const BluetoothScanSettingRow = ({}) => { displayError(e, 'Insufficient Permissions'); } } else { - logDebug('[BLUETOOTH] IOS'); - let response = await window['bluetoothClassicSerial'].initializeBluetooth(); - logDebug(response); - setBluePageVisible(true); + displayErrorMsg("Sorry, iOS is not supported for this feature!", "iOS Not Supported"); } } From f8a6a8edbd315da41ff3f684ee59f4e8c4779e91 Mon Sep 17 00:00:00 2001 From: louisg1337 Date: Wed, 6 Mar 2024 16:22:52 -0500 Subject: [PATCH 26/33] Ran prettier --- www/js/control/BluetoothScanSettingRow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index fca55554f..68dd452fd 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -23,7 +23,7 @@ const BluetoothScanSettingRow = ({}) => { displayError(e, 'Insufficient Permissions'); } } else { - displayErrorMsg("Sorry, iOS is not supported for this feature!", "iOS Not Supported"); + displayErrorMsg('Sorry, iOS is not supported for this feature!', 'iOS Not Supported'); } } From 1e47df37490ff26424e308864b6263d8a360b3a4 Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Wed, 6 Mar 2024 18:21:21 -0800 Subject: [PATCH 27/33] Cleaned up PR: Fixed comments, cleaned JSX --- setup/autoreload/macos-index.js | 1 + www/js/bluetooth/blueoothScanner.ts | 2 +- www/js/control/BluetoothScanSettingRow.tsx | 2 -- www/js/control/ProfileSettings.tsx | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/setup/autoreload/macos-index.js b/setup/autoreload/macos-index.js index 4c2ad690d..23cee52ab 100644 --- a/setup/autoreload/macos-index.js +++ b/setup/autoreload/macos-index.js @@ -2,6 +2,7 @@ const os = require('os'); const nameMap = new Map([ + [23, ['Sonoma', '14.3.1']], [22, ['Ventura', '13']], [21, ['Monterey', '12']], [20, ['Big Sur', '11']], diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index 491bec25b..c26152a83 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -10,7 +10,7 @@ type BluetoothClassicDevice = { /** * gatherBluetoothData scans for viewable Bluetooth Classic Devices - * @param t is the 18next translation function + * @param t is the i18next translation function * @returns an array of strings containing device data, formatted ['ID: id Name: name'] */ export default function gatherBluetoothData(t): Promise { diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index 68dd452fd..2c853dad7 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -8,8 +8,6 @@ const BluetoothScanSettingRow = ({}) => { const [bluePageVisible, setBluePageVisible] = useState(false); async function openPopover() { - // TODO: Add logic to check for conifig here, or in settings - // Get the config to determine if user is on Android or iOS let config = await getConfig(); diff --git a/www/js/control/ProfileSettings.tsx b/www/js/control/ProfileSettings.tsx index 6cf319a6f..cb18f3e4f 100644 --- a/www/js/control/ProfileSettings.tsx +++ b/www/js/control/ProfileSettings.tsx @@ -480,7 +480,7 @@ const ProfileSettings = () => { iconName="email" action={() => sendEmail('loggerDB')}> - + Date: Fri, 15 Mar 2024 20:46:00 -0700 Subject: [PATCH 28/33] Addressed review changes, updated permissions - Moved permissions check to BLE Screen, fixed error with permission appearing upon install - Updated OS checks, fixed config export --- www/js/bluetooth/BluetoothScanPage.tsx | 31 ++++++++++++++++++++-- www/js/control/BluetoothScanSettingRow.tsx | 18 +------------ www/js/control/ControlSyncHelper.tsx | 2 +- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index f7c7c3c84..3c91ea846 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { StyleSheet, Modal, ScrollView, SafeAreaView, View } from 'react-native'; import gatherBluetoothData from './blueoothScanner'; -import { logWarn } from '../plugin/logger'; +import { logWarn, displayError, displayErrorMsg } from '../plugin/logger'; import BluetoothCard from './BluetoothCard'; import { Appbar, useTheme, Button } from 'react-native-paper'; @@ -20,8 +20,35 @@ const BluetoothScanPage = ({ ...props }: any) => { const [isScanning, setIsScanning] = useState(false); const { colors } = useTheme(); - // Function to run Bluetooth test and update logs + // Function to run Bluetooth Classic test and update logs const runBluetoothTest = async () => { + let permissionFunction; + // Depending on user platform, handle requesting the permissions differently + if (window['cordova'].platformId == 'android') { + permissionFunction = window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); + } else { + permissionFunction = window['bluetoothClassicSerial'].initializeBluetooth(); + } + if (!permissionFunction) { + displayErrorMsg('PlatformID Not Found', 'OSError'); + return; + } + + try { + const response = await permissionFunction(); + if (response != 'OK') { + displayErrorMsg('Please Enable Bluetooth!', 'Insufficient Permissions'); + return; + } + if (window['cordova'].platformId == 'iOS') { + displayErrorMsg('Sorry, iOS is not supported!', 'OSError'); + return; + } + } catch (e) { + displayError(e, 'Insufficient Permissions'); + return; + } + try { setIsScanning(true); const newLogs = await gatherBluetoothData(t); diff --git a/www/js/control/BluetoothScanSettingRow.tsx b/www/js/control/BluetoothScanSettingRow.tsx index 2c853dad7..b32e4cdbf 100644 --- a/www/js/control/BluetoothScanSettingRow.tsx +++ b/www/js/control/BluetoothScanSettingRow.tsx @@ -1,28 +1,12 @@ import React, { useState } from 'react'; import SettingRow from './SettingRow'; import BluetoothScanPage from '../bluetooth/BluetoothScanPage'; -import { displayError, displayErrorMsg, logDebug } from '../plugin/logger'; -import { getConfig } from './ControlSyncHelper'; const BluetoothScanSettingRow = ({}) => { const [bluePageVisible, setBluePageVisible] = useState(false); async function openPopover() { - // Get the config to determine if user is on Android or iOS - let config = await getConfig(); - - // Depending on user platform, handle requesting the permissions differently - if (!config.ios_use_remote_push) { - // Check and prompt for bluetooth scan permission - try { - let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); - if (response == 'OK') setBluePageVisible(true); - } catch (e) { - displayError(e, 'Insufficient Permissions'); - } - } else { - displayErrorMsg('Sorry, iOS is not supported for this feature!', 'iOS Not Supported'); - } + setBluePageVisible(true); } return ( diff --git a/www/js/control/ControlSyncHelper.tsx b/www/js/control/ControlSyncHelper.tsx index 2a2274e1a..e46c38af6 100644 --- a/www/js/control/ControlSyncHelper.tsx +++ b/www/js/control/ControlSyncHelper.tsx @@ -30,7 +30,7 @@ const setConfig = function (config) { return window['cordova'].plugins.BEMServerSync.setConfig(config); }; -export const getConfig = function () { +const getConfig = function () { return window['cordova'].plugins.BEMServerSync.getConfig(); }; From 1c1c2ba9d22db04d8f1deeacf5d93d7fd2194fef Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Sat, 16 Mar 2024 16:07:30 -0700 Subject: [PATCH 29/33] Refractored Scanner Promises - Changed to avoid race conditions in logs --- www/js/bluetooth/blueoothScanner.ts | 49 +++++++++++++---------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index c26152a83..52b042765 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -1,4 +1,4 @@ -import { logWarn, logDebug } from '../plugin/logger'; +import { logDebug, displayError } from '../plugin/logger'; // Device data, as defined in BluetoothClassicSerial's docs type BluetoothClassicDevice = { @@ -15,11 +15,11 @@ type BluetoothClassicDevice = { */ export default function gatherBluetoothData(t): Promise { return new Promise((resolve, reject) => { - let logs: string[] = []; logDebug('Running bluetooth discovery test!'); // Device List "I/O" function handleLogs(devices: Array) { + let logs: string[] = []; devices.forEach((device) => { logs.push( `${t('bluetooth.device-info.id')}: ${device.id} ${t('bluetooth.device-info.name')}: ${ @@ -27,47 +27,40 @@ export default function gatherBluetoothData(t): Promise { }`, ); }); - } - - function handleErr(errorText: string) { - logs.push(t('errors.while-scanning-bluetooth')); - logs.push('ERROR: ' + errorText); - logWarn('ERROR: ' + errorText); + return logs; } // Plugin Calls - const unpairedDevicesPromise = new Promise((unpairedRes, unpairedRej) => { + const unpairedDevicesPromise = new Promise((res, rej) => { window['bluetoothClassicSerial'].discoverUnpaired( (devices: Array) => { - handleLogs(devices); - unpairedRes(logs); + res(handleLogs(devices)); }, - (err: string) => { - handleErr(err); - unpairedRej(new Error(err)); + (e: Error) => { + displayError(e, 'Error'); + rej(e); }, ); }); - const pairedDevicesPromise = new Promise((pairRes, pairRej) => { + const pairedDevicesPromise = new Promise((res, rej) => { window['bluetoothClassicSerial'].list( (devices: Array) => { - handleLogs(devices); - pairRes(logs); + res(handleLogs(devices)); }, - (err: string) => { - handleErr(err); - pairRej(new Error(err)); + (e: Error) => { + displayError(e, 'Error'); + rej(e); }, ); - - Promise.all([unpairedDevicesPromise, pairedDevicesPromise]) - .then(() => { - resolve(logs); - }) - .catch((err) => { - reject(err); - }); }); + + Promise.all([unpairedDevicesPromise, pairedDevicesPromise]) + .then((logs: Array) => { + resolve(logs.flat()); + }) + .catch((e) => { + reject(e); + }); }); } From b76ce00b6a0dd2234a4ce76e1f58c1522f19a2be Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Sun, 17 Mar 2024 15:41:24 -0700 Subject: [PATCH 30/33] Updated how logs are handled, added Pairing Status - Display status is indicated through the icon: "bluetooth-off" --- www/js/bluetooth/BluetoothCard.tsx | 8 ++++---- www/js/bluetooth/BluetoothScanPage.tsx | 4 +--- www/js/bluetooth/blueoothScanner.ts | 21 +++++---------------- www/js/types/bluetoothTypes.ts | 8 ++++++++ 4 files changed, 18 insertions(+), 23 deletions(-) create mode 100644 www/js/types/bluetoothTypes.ts diff --git a/www/js/bluetooth/BluetoothCard.tsx b/www/js/bluetooth/BluetoothCard.tsx index cda146f76..bd7450b45 100644 --- a/www/js/bluetooth/BluetoothCard.tsx +++ b/www/js/bluetooth/BluetoothCard.tsx @@ -3,14 +3,14 @@ import { Card, List } from 'react-native-paper'; import { StyleSheet } from 'react-native'; type Props = any; -const BluetoothCard = ({ deviceName, deviceData }: Props) => { +const BluetoothCard = (device: Props) => { return ( } + subtitle={`ID: ${device.id}`} + left={() => } /> ); diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 3c91ea846..4cd4f8825 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -64,9 +64,7 @@ const BluetoothScanPage = ({ ...props }: any) => {
{devices.map((device) => { if (device) { - const deviceID = device.slice(0, 21); - const deviceName = device.slice(21); - return ; + return ; } return null; })} diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/blueoothScanner.ts index 52b042765..6dd1aa8e3 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/blueoothScanner.ts @@ -1,12 +1,5 @@ import { logDebug, displayError } from '../plugin/logger'; - -// Device data, as defined in BluetoothClassicSerial's docs -type BluetoothClassicDevice = { - class: number; - id: string; - address: string; - name: string; -}; +import { BluetoothClassicDevice } from '../types/bluetoothTypes'; /** * gatherBluetoothData scans for viewable Bluetooth Classic Devices @@ -18,14 +11,10 @@ export default function gatherBluetoothData(t): Promise { logDebug('Running bluetooth discovery test!'); // Device List "I/O" - function handleLogs(devices: Array) { + function handleLogs(pairingType: Boolean, devices: Array) { let logs: string[] = []; devices.forEach((device) => { - logs.push( - `${t('bluetooth.device-info.id')}: ${device.id} ${t('bluetooth.device-info.name')}: ${ - device.name - }`, - ); + device.is_paired; }); return logs; } @@ -34,7 +23,7 @@ export default function gatherBluetoothData(t): Promise { const unpairedDevicesPromise = new Promise((res, rej) => { window['bluetoothClassicSerial'].discoverUnpaired( (devices: Array) => { - res(handleLogs(devices)); + res(handleLogs(false, devices)); }, (e: Error) => { displayError(e, 'Error'); @@ -46,7 +35,7 @@ export default function gatherBluetoothData(t): Promise { const pairedDevicesPromise = new Promise((res, rej) => { window['bluetoothClassicSerial'].list( (devices: Array) => { - res(handleLogs(devices)); + res(handleLogs(true, devices)); }, (e: Error) => { displayError(e, 'Error'); diff --git a/www/js/types/bluetoothTypes.ts b/www/js/types/bluetoothTypes.ts new file mode 100644 index 000000000..c812966c2 --- /dev/null +++ b/www/js/types/bluetoothTypes.ts @@ -0,0 +1,8 @@ +// Device data, as defined in BluetoothClassicSerial's docs +export type BluetoothClassicDevice = { + class: number; + id: string; + address: string; + name: string; + is_paired?: boolean; // We keep track of this, BCS doesn't +}; From c990c93ceee5ed580741ecda8e85a355137a2129 Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Sun, 17 Mar 2024 15:57:55 -0700 Subject: [PATCH 31/33] Fixed iOS Check --- www/js/bluetooth/BluetoothScanPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 4cd4f8825..72c221419 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -40,7 +40,7 @@ const BluetoothScanPage = ({ ...props }: any) => { displayErrorMsg('Please Enable Bluetooth!', 'Insufficient Permissions'); return; } - if (window['cordova'].platformId == 'iOS') { + if (window['cordova'].platformId == 'ios') { displayErrorMsg('Sorry, iOS is not supported!', 'OSError'); return; } From b270036ea2ec7d48a1931c83b1409548f22691a0 Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:53:35 -0700 Subject: [PATCH 32/33] Fixed permission function variable --- www/js/bluetooth/BluetoothScanPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index 72c221419..bd4dac5bb 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -25,9 +25,9 @@ const BluetoothScanPage = ({ ...props }: any) => { let permissionFunction; // Depending on user platform, handle requesting the permissions differently if (window['cordova'].platformId == 'android') { - permissionFunction = window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); + permissionFunction = window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions; } else { - permissionFunction = window['bluetoothClassicSerial'].initializeBluetooth(); + permissionFunction = window['bluetoothClassicSerial'].initializeBluetooth; } if (!permissionFunction) { displayErrorMsg('PlatformID Not Found', 'OSError'); From 295b96f7762f90180e8656e1d9f3116ac9c85d40 Mon Sep 17 00:00:00 2001 From: Katie Rischpater <98350084+the-bay-kay@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:26:53 -0700 Subject: [PATCH 33/33] Refactored Bluetooth logs, fixed race conditions - Changed logs to only pass devices, now parsed in BluetoothCard - Updated promise handling in blueoothScanner - Reverted iOS permissions check --- package.cordovabuild.json | 2 +- www/js/bluetooth/BluetoothCard.tsx | 4 ++-- www/js/bluetooth/BluetoothScanPage.tsx | 20 +++++-------------- ...blueoothScanner.ts => bluetoothScanner.ts} | 11 +++++----- 4 files changed, 13 insertions(+), 24 deletions(-) rename www/js/bluetooth/{blueoothScanner.ts => bluetoothScanner.ts} (83%) diff --git a/package.cordovabuild.json b/package.cordovabuild.json index ea438a68b..182212b49 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -120,7 +120,7 @@ "cordova-plugin-app-version": "0.1.14", "cordova-plugin-customurlscheme": "5.0.2", "cordova-plugin-device": "2.1.0", - "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.8.2", + "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.8.3", "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.2", "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.6", "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.2", diff --git a/www/js/bluetooth/BluetoothCard.tsx b/www/js/bluetooth/BluetoothCard.tsx index bd7450b45..a8c2a4e08 100644 --- a/www/js/bluetooth/BluetoothCard.tsx +++ b/www/js/bluetooth/BluetoothCard.tsx @@ -3,14 +3,14 @@ import { Card, List } from 'react-native-paper'; import { StyleSheet } from 'react-native'; type Props = any; -const BluetoothCard = (device: Props) => { +const BluetoothCard = ({ device }: Props) => { return ( } + left={() => } /> ); diff --git a/www/js/bluetooth/BluetoothScanPage.tsx b/www/js/bluetooth/BluetoothScanPage.tsx index bd4dac5bb..e3c21858e 100644 --- a/www/js/bluetooth/BluetoothScanPage.tsx +++ b/www/js/bluetooth/BluetoothScanPage.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { StyleSheet, Modal, ScrollView, SafeAreaView, View } from 'react-native'; -import gatherBluetoothData from './blueoothScanner'; +import gatherBluetoothData from './bluetoothScanner'; import { logWarn, displayError, displayErrorMsg } from '../plugin/logger'; import BluetoothCard from './BluetoothCard'; import { Appbar, useTheme, Button } from 'react-native-paper'; @@ -22,28 +22,18 @@ const BluetoothScanPage = ({ ...props }: any) => { // Function to run Bluetooth Classic test and update logs const runBluetoothTest = async () => { - let permissionFunction; - // Depending on user platform, handle requesting the permissions differently - if (window['cordova'].platformId == 'android') { - permissionFunction = window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions; - } else { - permissionFunction = window['bluetoothClassicSerial'].initializeBluetooth; - } - if (!permissionFunction) { - displayErrorMsg('PlatformID Not Found', 'OSError'); + // Classic not currently supported on iOS + if (window['cordova'].platformId == 'ios') { + displayErrorMsg('Sorry, iOS is not supported!', 'OSError'); return; } try { - const response = await permissionFunction(); + let response = await window['cordova'].plugins.BEMDataCollection.bluetoothScanPermissions(); if (response != 'OK') { displayErrorMsg('Please Enable Bluetooth!', 'Insufficient Permissions'); return; } - if (window['cordova'].platformId == 'ios') { - displayErrorMsg('Sorry, iOS is not supported!', 'OSError'); - return; - } } catch (e) { displayError(e, 'Insufficient Permissions'); return; diff --git a/www/js/bluetooth/blueoothScanner.ts b/www/js/bluetooth/bluetoothScanner.ts similarity index 83% rename from www/js/bluetooth/blueoothScanner.ts rename to www/js/bluetooth/bluetoothScanner.ts index 6dd1aa8e3..2e77c30b0 100644 --- a/www/js/bluetooth/blueoothScanner.ts +++ b/www/js/bluetooth/bluetoothScanner.ts @@ -11,19 +11,18 @@ export default function gatherBluetoothData(t): Promise { logDebug('Running bluetooth discovery test!'); // Device List "I/O" - function handleLogs(pairingType: Boolean, devices: Array) { - let logs: string[] = []; + function updatePairingStatus(pairingType: boolean, devices: Array) { devices.forEach((device) => { - device.is_paired; + device.is_paired = pairingType; }); - return logs; + return devices; } // Plugin Calls const unpairedDevicesPromise = new Promise((res, rej) => { window['bluetoothClassicSerial'].discoverUnpaired( (devices: Array) => { - res(handleLogs(false, devices)); + res(updatePairingStatus(false, devices)); }, (e: Error) => { displayError(e, 'Error'); @@ -35,7 +34,7 @@ export default function gatherBluetoothData(t): Promise { const pairedDevicesPromise = new Promise((res, rej) => { window['bluetoothClassicSerial'].list( (devices: Array) => { - res(handleLogs(true, devices)); + res(updatePairingStatus(true, devices)); }, (e: Error) => { displayError(e, 'Error');