diff options
26 files changed, 69 insertions, 36 deletions
diff --git a/build-extras.gradle b/build-extras.gradle new file mode 100644 index 00000000..d73317eb --- /dev/null +++ b/build-extras.gradle @@ -0,0 +1,8 @@ +configurations.all { + resolutionStrategy { + force 'com.android.support:support-v4:27.1.0' + } +} +configurations { + all*.exclude group: 'com.android.support', module: 'support-v13' +} diff --git a/build_android.sh b/build_android.sh index a80e76d2..87cfc889 100755 --- a/build_android.sh +++ b/build_android.sh @@ -37,6 +37,7 @@ if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then echo "Adding crosswalk..." #cordova plugin add cordova-plugin-crosswalk-webview cordova plugin add cordova-plugin-crosswalk-webview@2.2.0 --variable XWALK_MODE="lite" --variable "XWALK_VERSION"="17.46.459.1" + #cordova plugin add cordova-plugin-crosswalk-webview --variable XWALK_VERSION="22+" #ionic plugin add cordova-plugin-crosswalk-webview # crosswalk handles SSL certificate handling in a different way # need to switch plugins @@ -77,6 +77,7 @@ <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" /> </platform> <platform name="android"> + <resource-file src="build-extras.gradle" target="build-extras.gradle" /> <resource-file src="google-services.json" target="google-services.json" /> <preference name="android-manifest/@android:installLocation" value="auto" /> <preference name="loadUrlTimeoutValue" value="700000" /> @@ -107,17 +108,13 @@ <plugin name="cordova-library-helper" spec="^1.0.4"> <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save media to your Camera Roll" /> </plugin> - <plugin name="cordova-plugin-add-swift-support" spec="^1.7.0" /> <plugin name="cordova-plugin-android-permissions" spec="^1.0.0" /> <plugin name="cordova-plugin-app-version" spec="^0.1.9" /> - <plugin name="cordova-plugin-compat" spec="^1.2.0" /> <plugin name="cordova-plugin-console" spec="^1.1.0" /> <plugin name="cordova-plugin-customurlscheme" spec="^4.3.0"> <variable name="URL_SCHEME" value="zmninja" /> </plugin> - <plugin name="cordova-plugin-device" spec="^1.1.6" /> - <plugin name="cordova-plugin-file" spec="^4.3.3" /> - <plugin name="cordova-plugin-file-transfer" spec="^1.6.3" /> + <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" /> <plugin name="cordova-plugin-globalization" spec="^1.0.7" /> <plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" /> <plugin name="cordova-plugin-insomnia" spec="^4.3.0" /> @@ -125,7 +122,6 @@ <plugin name="cordova-plugin-media" spec="git+https://github.com/pliablepixels/cordova-plugin-media.git"> <variable name="MICROPHONE_USAGE_DESCRIPTION" value=" " /> </plugin> - <plugin name="cordova-plugin-network-information" spec="^1.3.3" /> <plugin name="cordova-plugin-photo-library" spec="^1.2.2"> <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="images to gallery" /> </plugin> @@ -140,14 +136,25 @@ <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value=" " /> </plugin> <plugin name="phonegap-plugin-mobile-accessibility" spec="^1.0.5" /> - <plugin name="cordova-custom-config" spec="^4.0.2" /> + <plugin name="cordova-custom-config" spec="~4.0.2" /> <plugin name="cordova.plugins.diagnostic" spec="^3.7.1" /> <plugin name="cordova-plugin-email" spec="git+https://github.com/pliablepixels/cordova-email-plugin.git" /> <plugin name="cordova-plugin-touch-id" spec="^3.2.0" /> <plugin name="cordova-plugin-android-fingerprint-auth" spec="^1.4.0" /> - <plugin name="phonegap-plugin-push" spec="^2.1.1"> - <variable name="FCM_VERSION" value="11.0.1" /> - </plugin> <plugin name="cordova-plugin-statusbar" spec="git+https://github.com/apache/cordova-plugin-statusbar.git" /> - <plugin name="cordova-plugin-certificates" spec="git+https://github.com/hypery2k/cordova-certificate-plugin.git" /> + <plugin name="phonegap-plugin-push" spec="^2.1.3"> + <variable name="FCM_VERSION" value="11.6.2" /> + </plugin> + <plugin name="cordova-plugin-network-information" spec="^2.0.1" /> + <plugin name="cordova-plugin-device" spec="^2.0.1" /> + <plugin name="cordova-plugin-file" spec="^6.0.1" /> + <plugin name="cordova-plugin-add-swift-support" spec="^1.7.1" /> + <plugin name="cordova-plugin-crosswalk-certificate" spec="git+https://github.com/danjarvis/cordova-plugin-crosswalk-certificate.git" /> + <plugin name="cordova-plugin-crosswalk-webview" spec="^2.2.0"> + <variable name="XWALK_MODE" value="lite" /> + <variable name="XWALK_VERSION" value="17.46.459.1" /> + <variable name="XWALK_LITEVERSION" value="xwalk_core_library_canary:17+" /> + <variable name="XWALK_COMMANDLINE" value="--disable-pull-to-refresh-effect" /> + <variable name="XWALK_MULTIPLEAPK" value="true" /> + </plugin> </widget> diff --git a/hooks/before_prepare/01_pp_hacks.sh b/hooks/before_prepare/01_pp_hacks.sh index d049f8e7..cde25dab 100755 --- a/hooks/before_prepare/01_pp_hacks.sh +++ b/hooks/before_prepare/01_pp_hacks.sh @@ -15,6 +15,16 @@ echo Curr Dir: `pwd` #else # echo "Directory plugins/phonegap-plugin-push/src/android/com/adobe/phonegap/push/ does not exist, skipping..." #fi +#echo "Copying gradle hack for push-plugin-2.1.3" +#echo "-------------------------------------------" +# +#if [ -d "platforms/android" ]; then +# exe cp www/external/build-extras.gradle platforms/android +#else +# echo "Directory platforms/android does not exist, skipping..." +#fi + + echo "Copying custom sound" echo "---------------------" diff --git a/package.json b/package.json index 07e37e6e..12b55708 100644 --- a/package.json +++ b/package.json @@ -12,16 +12,12 @@ "cordova-library-helper": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save media to your Camera Roll" }, - "cordova-plugin-add-swift-support": {}, "cordova-plugin-android-permissions": {}, "cordova-plugin-app-version": {}, - "cordova-plugin-compat": {}, "cordova-plugin-console": {}, "cordova-plugin-customurlscheme": { "URL_SCHEME": "zmninja" }, - "cordova-plugin-device": {}, - "cordova-plugin-file": {}, "cordova-plugin-file-transfer": {}, "cordova-plugin-globalization": {}, "cordova-plugin-inappbrowser": {}, @@ -30,7 +26,6 @@ "cordova-plugin-media": { "MICROPHONE_USAGE_DESCRIPTION": " " }, - "cordova-plugin-network-information": {}, "cordova-plugin-photo-library": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "images to gallery" }, @@ -50,39 +45,51 @@ "cordova-plugin-email": {}, "cordova-plugin-touch-id": {}, "cordova-plugin-android-fingerprint-auth": {}, + "cordova-plugin-statusbar": {}, "phonegap-plugin-push": { - "FCM_VERSION": "11.0.1" + "FCM_VERSION": "11.6.2" }, - "cordova-plugin-statusbar": {}, - "cordova-plugin-certificates": {} + "cordova-plugin-network-information": {}, + "cordova-plugin-device": {}, + "cordova-plugin-file": {}, + "cordova-plugin-add-swift-support": {}, + "cordova-plugin-crosswalk-certificate": {}, + "cordova-plugin-crosswalk-webview": { + "XWALK_MODE": "lite", + "XWALK_VERSION": "17.46.459.1", + "XWALK_LITEVERSION": "xwalk_core_library_canary:17+", + "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect", + "XWALK_MULTIPLEAPK": "true" + } } }, "dependencies": { "EmailComposer": "git+https://github.com/pliablepixels/email-composer.git", "com.telerik.plugins.nativepagetransitions": "^0.6.5", "cordova-android": "^6.3.0", - "cordova-custom-config": "^4.0.2", + "cordova-custom-config": "~4.0.2", "cordova-ios": "4.5.4", "cordova-library-helper": "^1.0.4", - "cordova-plugin-add-swift-support": "^1.7.0", + "cordova-plugin-add-swift-support": "^1.7.1", "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", "cordova-plugin-canvas2image": "git+https://github.com/flache/Canvas2ImagePlugin.git", - "cordova-plugin-certificates": "git+https://github.com/hypery2k/cordova-certificate-plugin.git", "cordova-plugin-compat": "^1.2.0", "cordova-plugin-console": "^1.1.0", + "cordova-plugin-crosswalk-certificate": "git+https://github.com/danjarvis/cordova-plugin-crosswalk-certificate.git", + "cordova-plugin-crosswalk-webview": "^2.2.0", "cordova-plugin-customurlscheme": "^4.3.0", - "cordova-plugin-device": "^1.1.6", + "cordova-plugin-device": "^2.0.1", "cordova-plugin-email": "git+https://github.com/pliablepixels/cordova-email-plugin.git", - "cordova-plugin-file": "^4.3.3", - "cordova-plugin-file-transfer": "^1.6.3", + "cordova-plugin-file": "^6.0.1", + "cordova-plugin-file-transfer": "^1.7.1", "cordova-plugin-globalization": "^1.0.7", "cordova-plugin-inappbrowser": "^1.7.1", "cordova-plugin-insomnia": "^4.3.0", "cordova-plugin-ios-longpress-fix": "^1.1.0", "cordova-plugin-media": "git+https://github.com/pliablepixels/cordova-plugin-media.git", - "cordova-plugin-network-information": "^1.3.3", + "cordova-plugin-network-information": "^2.0.1", "cordova-plugin-photo-library": "^1.2.2", "cordova-plugin-pin-dialog": "^0.1.3", "cordova-plugin-settings-hook": "^0.2.7", @@ -102,7 +109,8 @@ "mkdirp": "^0.5.1", "org.devgeeks.Canvas2ImagePlugin": "https://github.com/flache/Canvas2ImagePlugin", "phonegap-plugin-mobile-accessibility": "^1.0.5", - "phonegap-plugin-push": "^2.1.1" + "phonegap-plugin-push": "^2.1.3", + "tostr": "^0.1.0" }, "devDependencies": { "bower": "^1.8.2", diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png Binary files differindex 624372e1..0b88382c 100644 --- a/resources/android/icon/drawable-hdpi-icon.png +++ b/resources/android/icon/drawable-hdpi-icon.png diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png Binary files differindex e26491cf..3a34012f 100644 --- a/resources/android/icon/drawable-ldpi-icon.png +++ b/resources/android/icon/drawable-ldpi-icon.png diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png Binary files differindex 4b968271..8c134720 100644 --- a/resources/android/icon/drawable-mdpi-icon.png +++ b/resources/android/icon/drawable-mdpi-icon.png diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png Binary files differindex 1807a3de..6d5cde71 100644 --- a/resources/android/icon/drawable-xhdpi-icon.png +++ b/resources/android/icon/drawable-xhdpi-icon.png diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png Binary files differindex 2fab8bd4..338ca1b5 100644 --- a/resources/android/icon/drawable-xxhdpi-icon.png +++ b/resources/android/icon/drawable-xxhdpi-icon.png diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png Binary files differindex ce744d0a..7d3e4ba3 100644 --- a/resources/android/icon/drawable-xxxhdpi-icon.png +++ b/resources/android/icon/drawable-xxxhdpi-icon.png diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png Binary files differindex e3487695..69ed72ca 100644 --- a/resources/android/splash/drawable-land-hdpi-screen.png +++ b/resources/android/splash/drawable-land-hdpi-screen.png diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png Binary files differindex 535fe501..8269ae9f 100644 --- a/resources/android/splash/drawable-land-ldpi-screen.png +++ b/resources/android/splash/drawable-land-ldpi-screen.png diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png Binary files differindex e4a0530f..154b0d9b 100644 --- a/resources/android/splash/drawable-land-mdpi-screen.png +++ b/resources/android/splash/drawable-land-mdpi-screen.png diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png Binary files differindex 7360ba71..5d1aee71 100644 --- a/resources/android/splash/drawable-land-xhdpi-screen.png +++ b/resources/android/splash/drawable-land-xhdpi-screen.png diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png Binary files differindex 3d26db83..fe7a95a2 100644 --- a/resources/android/splash/drawable-land-xxhdpi-screen.png +++ b/resources/android/splash/drawable-land-xxhdpi-screen.png diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png Binary files differindex 0a73a9fa..8089cda5 100644 --- a/resources/android/splash/drawable-land-xxxhdpi-screen.png +++ b/resources/android/splash/drawable-land-xxxhdpi-screen.png diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png Binary files differindex 18183507..1071c75f 100644 --- a/resources/android/splash/drawable-port-hdpi-screen.png +++ b/resources/android/splash/drawable-port-hdpi-screen.png diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png Binary files differindex c3a6e85d..36493eef 100644 --- a/resources/android/splash/drawable-port-ldpi-screen.png +++ b/resources/android/splash/drawable-port-ldpi-screen.png diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png Binary files differindex 0a2a84a6..d26c79a2 100644 --- a/resources/android/splash/drawable-port-mdpi-screen.png +++ b/resources/android/splash/drawable-port-mdpi-screen.png diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png Binary files differindex 12c10f5f..2db0fb89 100644 --- a/resources/android/splash/drawable-port-xhdpi-screen.png +++ b/resources/android/splash/drawable-port-xhdpi-screen.png diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png Binary files differindex 6e264e9d..fa52e59b 100644 --- a/resources/android/splash/drawable-port-xxhdpi-screen.png +++ b/resources/android/splash/drawable-port-xxhdpi-screen.png diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png Binary files differindex c02b0fbf..c07f67fe 100644 --- a/resources/android/splash/drawable-port-xxxhdpi-screen.png +++ b/resources/android/splash/drawable-port-xxxhdpi-screen.png diff --git a/www/external/build-extras.gradle b/www/external/build-extras.gradle new file mode 100644 index 00000000..70b55fb0 --- /dev/null +++ b/www/external/build-extras.gradle @@ -0,0 +1,3 @@ +configurations { + all*.exclude group: 'com.android.support', module: 'support-v13' +} diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 8aa3e6ea..d553f0dd 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1544,7 +1544,7 @@ angular.module('zmApp.controllers') } if (serverFound) { - // debug("Monitor " + monitors[i].Monitor.Id + " has a recording server hostname of " + multiservers[j].Server.Hostname); + debug("Monitor " + monitors[i].Monitor.Id + " has a recording server hostname of " + multiservers[j].Server.Hostname); // Now here is the logic, I need to retrieve serverhostname, // and slap on the host protocol and path. Meh. @@ -1607,7 +1607,7 @@ angular.module('zmApp.controllers') monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid"; // debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access"); - //debug ("Streaming URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.streamingURL ); + debug ("Streaming URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.streamingURL ); //debug ("Base URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.baseURL ); } else { @@ -1633,6 +1633,7 @@ angular.module('zmApp.controllers') } monitors[i].Monitor.streamingURL = st2; + debug ("Streaming URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.streamingURL ); //console.log ("NO SERVER MATCH CONSTRUCTED STREAMING PATH="+st2); monitors[i].Monitor.baseURL = loginData.url; monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid"; diff --git a/www/templates/montage.html b/www/templates/montage.html index 4615e82e..8580d72a 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -84,19 +84,14 @@ <!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.Enabled !='0' ">--> <span ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit"> - + <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}} "> - - - <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}} " > - - - <figure class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'"> <!--<div ng-if="!isModalActive" >--> <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> <div ng-if="$root.authSession!='undefined' && !isBackground() "> <div ng-if = "!minimal" > + <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode={{getMode()}}&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" /> |
