diff options
12 files changed, 46 insertions, 6 deletions
diff --git a/hooks/before_prepare/01_pp_hacks.sh b/hooks/before_prepare/01_pp_hacks.sh index f668e07b..c4df404f 100755 --- a/hooks/before_prepare/01_pp_hacks.sh +++ b/hooks/before_prepare/01_pp_hacks.sh @@ -1,14 +1,28 @@ #!/bin/sh + +exe() { echo "\$ $@" ; "$@" ; } + # Custom stuff I need to do for zmNinja +echo ---------------------------------------------------- +echo Pliable Pixels build pre-preprocessing +echo ---------------------------------------------------- echo Curr Dir: `pwd` echo "Copying Modified GCMIntentService for custom sound" -cp www/external/GCMIntentService.java plugins/phonegap-plugin-push/src/android/com/adobe/phonegap/push/ -cp www/external/GCMIntentService.java platforms/android/src/com/adobe/phonegap/push +exe cp www/external/GCMIntentService.java plugins/phonegap-plugin-push/src/android/com/adobe/phonegap/push/ +exe cp www/external/GCMIntentService.java platforms/android/src/com/adobe/phonegap/push echo "Copying custom sound" -mkdir -p platforms/android/res/raw/ -cp www/sounds/blop.mp3 platforms/android/res/raw/ +echo "---------------------" +exe mkdir -p platforms/android/res/raw/ +exe cp www/sounds/blop.mp3 platforms/android/res/raw/ +exe cp www/sounds/blop.caf platforms/ios/zmNinja/Resources + +echo "Copying plist hack for iOS for non SSL connections" +echo "--------------------------------------------------" +exe cp www/external/zmNinja-Info.plist.IOS9nonSSLPatch platforms/ios/zmNinja/zmNinja-Info.plist -cp www/sounds/blop.caf platforms/ios/zmNinja/Resources +echo "Copying Android notification icons to resource dir" +echo "--------------------------------------------------" +exe cp -R www/external/android-notification-icons/ platforms/android/res/ diff --git a/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..173932de --- /dev/null +++ b/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-hdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-hdpi/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..7d832b01 --- /dev/null +++ b/www/external/android-notification-icons/drawable-hdpi/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..69685c86 --- /dev/null +++ b/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-mdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-mdpi/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..54001bbb --- /dev/null +++ b/www/external/android-notification-icons/drawable-mdpi/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..780fc21f --- /dev/null +++ b/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-xhdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xhdpi/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..96d1d6a2 --- /dev/null +++ b/www/external/android-notification-icons/drawable-xhdpi/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..bb0a69c4 --- /dev/null +++ b/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-xxhdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxhdpi/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..4a08662a --- /dev/null +++ b/www/external/android-notification-icons/drawable-xxhdpi/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..d02d7189 --- /dev/null +++ b/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png diff --git a/www/external/android-notification-icons/drawable-xxxhdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxxhdpi/ic_stat_notification.png Binary files differnew file mode 100755 index 00000000..1cf02372 --- /dev/null +++ b/www/external/android-notification-icons/drawable-xxxhdpi/ic_stat_notification.png diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index 7816d932..f6d9599a 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -113,7 +113,27 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', ZMDataModel.displayBanner('info', ['settings saved']); } - + //---------------------------------------------------------------- + // returns domain name in string - + // http://stackoverflow.com/questions/8498592/extract-root-domain-name-from-string + //---------------------------------------------------------------- + function extractDomain(url) { + var domain; + //find & remove protocol (http, ftp, etc.) and get domain + if (url.indexOf("://") > -1) { + domain = url.split('/')[2]; + } + else { + domain = url.split('/')[0]; + } + + //find & remove port number + domain = domain.split(':')[0]; + + return domain; +} + + //---------------------------------------------------------------- // returns reporting interval for monitor ID //---------------------------------------------------------------- @@ -157,6 +177,12 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', $scope.monitors = message; $scope.loginData = ZMDataModel.getLogin(); + + if ($scope.loginData.eventServer == "") + { + $scope.loginData.eventServer = "wss://"+extractDomain($scope.loginData.url)+":9000"; + } + $scope.check = { isUseEventServer: "" |
