5 Commits

Author SHA1 Message Date
John Lyon-Smith
5e00b0dd23 Correct fix for background location services 2018-05-29 12:49:51 -07:00
John Lyon-Smith
fb8545110c Revert to location when in use 2018-05-29 12:44:38 -07:00
John Lyon-Smith
323d047903 Version 1.1.2-20180529.0 2018-05-29 07:55:59 -07:00
John Lyon-Smith
9ec1e689eb Production settings 2018-05-29 07:55:29 -07:00
John Lyon-Smith
bbd259f989 Version 1.1.1-20180528.0 2018-05-28 16:13:55 -07:00
10 changed files with 53 additions and 38 deletions

View File

@@ -101,8 +101,8 @@ android {
applicationId "com.deightonar" applicationId "com.deightonar"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 27 targetSdkVersion 27
versionCode 6 versionCode 8
versionName "1.1.0" versionName "1.1.2"
ndk { ndk {
abiFilters "armeabi-v7a", "x86" abiFilters "armeabi-v7a", "x86"
} }

View File

@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.deightonar" package="com.deightonar"
android:versionCode="6" android:versionCode="8"
android:versionName="1.1.0"> android:versionName="1.1.2">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

View File

@@ -140,6 +140,11 @@
TargetAttributes = { TargetAttributes = {
13B07F861A680F5B00A75B9A = { 13B07F861A680F5B00A75B9A = {
DevelopmentTeam = 523GZPCZ3X; DevelopmentTeam = 523GZPCZ3X;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
};
};
}; };
}; };
}; };

View File

@@ -2,8 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>NSMicrophoneUsageDescription</key> <key>NSLocationAlwaysUsageDescription</key>
<string>$(PRODUCT_NAME) camera use</string> <string>$(PRODUCT_NAME) background location use</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
@@ -19,11 +19,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.1.0</string> <string>1.1.2</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>20180525.0</string> <string>20180529.0</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>
@@ -33,8 +33,16 @@
</dict> </dict>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>$(PRODUCT_NAME) camera use</string> <string>$(PRODUCT_NAME) camera use</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>$(PRODUCT_NAME) location use</string>
<key>NSMicrophoneUsageDescription</key>
<string>$(PRODUCT_NAME) camera use</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>
<string>$(PRODUCT_NAME) photo use</string> <string>$(PRODUCT_NAME) photo use</string>
<key>UIBackgroundModes</key>
<array>
<string>location</string>
</array>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
@@ -46,8 +54,6 @@
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>$(PRODUCT_NAME) location use</string>
<key>UIViewControllerBasedStatusBarAppearance</key> <key>UIViewControllerBasedStatusBarAppearance</key>
<false/> <false/>
</dict> </dict>

View File

@@ -9,26 +9,30 @@ export const config = {
googleGeocodeURL: "https://maps.googleapis.com/maps/api/geocode/json", googleGeocodeURL: "https://maps.googleapis.com/maps/api/geocode/json",
refererURL: "https://dar.kss.us.com", refererURL: "https://dar.kss.us.com",
minDistanceToItem: 20, minDistanceToItem: 20,
geocodeDelayMilliseconds: 500,
defaultUser: "john@lyon-smith.org",
//defaultUser: "",
// This region is downtown Toronto
// initialRegion: {
// latitude: 43.653908,
// longitude: -79.384293,
// latitudeDelta: 0.0922,
// longitudeDelta: 0.0421,
// },
// This region is Bainbridge Island
initialRegion: {
latitude: 47.629536,
longitude: -122.524162,
latitudeDelta: 0.0922,
longitudeDelta: 0.0421,
},
workItemRegionDelta: 0.005, workItemRegionDelta: 0.005,
activityRegionDelta: 0.005, activityRegionDelta: 0.005,
homeRegionInset: 0.02, homeRegionInset: 0.02,
homeRegionDelta: 0.005, homeRegionDelta: 0.005,
alwaysShowWorkItemInAR: true, geocodeDelayMilliseconds: 500,
// defaultUser: "john@lyon-smith.org",
defaultUser: "",
// This region is downtown Toronto
initialRegion: {
latitude: 43.653908,
longitude: -79.384293,
latitudeDelta: 0.0922,
longitudeDelta: 0.0421,
},
// This region is Bainbridge Island
// initialRegion: {
// latitude: 47.629536,
// longitude: -122.524162,
// latitudeDelta: 0.0922,
// longitudeDelta: 0.0421,
// },
// alwaysShowWorkItemInAR: true,
} }

View File

@@ -1,6 +1,6 @@
export const versionInfo = { export const versionInfo = {
version: '1.1.0', version: '1.1.2',
fullVersion: '1.1.0-20180525.0', fullVersion: '1.1.2-20180529.0',
title: 'Deighton AR System', title: 'Deighton AR System',
copyright: '© 2018, Kingston Software Solutions.', copyright: '© 2018, Kingston Software Solutions.',
supportEmail: 'support@kss.us.com', supportEmail: 'support@kss.us.com',

View File

@@ -1,6 +1,6 @@
{ {
"name": "deighton-ar", "name": "deighton-ar",
"version": "1.1.0", "version": "1.1.2",
"description": "Deighton AR Training System", "description": "Deighton AR Training System",
"main": "index.js", "main": "index.js",
"repository": { "repository": {

View File

@@ -1,6 +1,6 @@
export const versionInfo = { export const versionInfo = {
version: '1.1.0', version: '1.1.2',
fullVersion: '1.1.0-20180525.0', fullVersion: '1.1.2-20180529.0',
title: 'Deighton AR System', title: 'Deighton AR System',
copyright: '© 2018, Kingston Software Solutions.', copyright: '© 2018, Kingston Software Solutions.',
supportEmail: 'support@kss.us.com', supportEmail: 'support@kss.us.com',

View File

@@ -16,10 +16,10 @@
tags: { tags: {
major: 1, major: 1,
minor: 1, minor: 1,
patch: 0, patch: 2,
build: 20180525, build: 20180529,
revision: 0, revision: 0,
sequence: 6, sequence: 8,
tz: "America/Los_Angeles", tz: "America/Los_Angeles",
title: "Deighton AR System", title: "Deighton AR System",
copyright: "© 2018, Kingston Software Solutions.", copyright: "© 2018, Kingston Software Solutions.",

View File

@@ -1,6 +1,6 @@
export const versionInfo = { export const versionInfo = {
version: '1.1.0', version: '1.1.2',
fullVersion: '1.1.0-20180525.0', fullVersion: '1.1.2-20180529.0',
title: 'Deighton AR System', title: 'Deighton AR System',
copyright: '© 2018, Kingston Software Solutions.', copyright: '© 2018, Kingston Software Solutions.',
supportEmail: 'support@kss.us.com', supportEmail: 'support@kss.us.com',