Skip to content

Commit f1d1ee6

Browse files
authored
Merge pull request #129 from Resgrid/develop
CU-868cu9311 Working on PTT logic.
2 parents 3934728 + 5765210 commit f1d1ee6

32 files changed

+1839
-337
lines changed

.DS_Store

0 Bytes
Binary file not shown.

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,8 @@
4242
},
4343
"[typescript]": {
4444
"editor.defaultFormatter": "esbenp.prettier-vscode"
45-
}
45+
},
46+
"editor.codeActionsOnSave": {
47+
48+
},
4649
}

app.config.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
2424
bundleIdentifier: Env.BUNDLE_ID,
2525
requireFullScreen: true,
2626
infoPlist: {
27-
UIBackgroundModes: ['remote-notification'],
27+
UIBackgroundModes: ['remote-notification', 'audio'],
2828
ITSAppUsesNonExemptEncryption: false,
2929
},
3030
},
@@ -40,7 +40,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
4040
softwareKeyboardLayoutMode: 'pan',
4141
package: Env.PACKAGE,
4242
googleServicesFile: 'google-services.json',
43-
permissions: ['WAKE_LOCK', 'RECORD_AUDIO', 'FOREGROUND_SERVICE_MICROPHONE'],
43+
permissions: ['WAKE_LOCK', 'RECORD_AUDIO', 'FOREGROUND_SERVICE_MICROPHONE', 'POST_NOTIFICATIONS', 'FOREGROUND_SERVICE', 'FOREGROUND_SERVICE_CONNECTED_DEVICE', 'FOREGROUND_SERVICE_MEDIA_PLAYBACK'],
4444
},
4545
web: {
4646
favicon: './assets/favicon.png',
@@ -176,7 +176,14 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
176176
[
177177
'expo-asset',
178178
{
179-
assets: ['assets/mapping'],
179+
assets: [
180+
'assets/mapping',
181+
'assets/audio/ui/space_notification1.mp3',
182+
'assets/audio/ui/space_notification2.mp3',
183+
'assets/audio/ui/positive_interface_beep.mp3',
184+
'assets/audio/ui/software_interface_start.mp3',
185+
'assets/audio/ui/software_interface_back.mp3',
186+
],
180187
},
181188
],
182189
[
@@ -201,6 +208,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
201208
bluetoothAlwaysPermission: 'Allow Resgrid Unit to connect to bluetooth devices',
202209
},
203210
],
211+
'expo-audio',
204212
'@livekit/react-native-expo-plugin',
205213
'@config-plugins/react-native-webrtc',
206214
'./customGradle.plugin.js',
-33.2 KB
Binary file not shown.
-69.4 KB
Binary file not shown.
-31.1 KB
Binary file not shown.
-67.6 KB
Binary file not shown.
11.1 KB
Binary file not shown.
32.7 KB
Binary file not shown.
56.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)