Skip to content
Snippets Groups Projects
Commit 38238ab9 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Fix splash screen config

parent fb2fb024
No related branches found
No related tags found
No related merge requests found
Pipeline #7821 failed
...@@ -24,11 +24,6 @@ ...@@ -24,11 +24,6 @@
<preference name="DisallowOverscroll" value="true" /> <preference name="DisallowOverscroll" value="true" />
<preference name="SplashScreen" value="screen" /> <preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="4000" /> <preference name="SplashScreenDelay" value="4000" />
<preference name="FadeSplashScreen" value="true" />
<preference name="FadeSplashScreenDuration" value="300" />
<preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="AutoHideSplashScreen" value="false" />
<preference name="ShowSplashScreen" value="true" />
<preference name="KeyboardDisplayRequiresUserAction" value="false" /> <preference name="KeyboardDisplayRequiresUserAction" value="false" />
<preference name="KeyboardResizeMode" value="ionic" /> <preference name="KeyboardResizeMode" value="ionic" />
<preference name="xwalkVersion" value="19" /> <preference name="xwalkVersion" value="19" />
......
#!/usr/bin/env node #!/usr/bin/env node
"use strict"; "use strict";
const gulp = require('gulp'); const gulp = require('gulp'),
const path = require("path"); path = require("path"),
const es = require('event-stream'); es = require('event-stream'),
const useref = require('gulp-useref'); useref = require('gulp-useref'),
const filter = require('gulp-filter'); filter = require('gulp-filter'),
const uglify = require('gulp-uglify-es').default; uglify = require('gulp-uglify-es').default,
const csso = require('gulp-csso'); csso = require('gulp-csso'),
const rev = require('gulp-rev'); rev = require('gulp-rev'),
const revReplace = require('gulp-rev-replace'); revReplace = require('gulp-rev-replace'),
log = require('fancy-log'),
colors = require('ansi-colors');
const cmd = process.env.CORDOVA_CMDLINE; const cmd = process.env.CORDOVA_CMDLINE;
const rootdir = process.argv[2]; const rootdir = process.argv[2];
...@@ -17,6 +20,9 @@ let skip = true; ...@@ -17,6 +20,9 @@ let skip = true;
if (cmd.indexOf("--release") > -1 || cmd.indexOf("--useref") > -1) { if (cmd.indexOf("--release") > -1 || cmd.indexOf("--useref") > -1) {
skip = false; skip = false;
} }
else {
log(colors.grey('Skipping useref'));
}
if (rootdir && !skip) { if (rootdir && !skip) {
...@@ -41,6 +47,8 @@ if (rootdir && !skip) { ...@@ -41,6 +47,8 @@ if (rootdir && !skip) {
const revFilesFilter = filter(['**/*', '!**/index.html', '!**/config.js'], { restore: true }); const revFilesFilter = filter(['**/*', '!**/index.html', '!**/config.js'], { restore: true });
const uglifyOptions = { const uglifyOptions = {
toplevel: true, toplevel: true,
warnings: true,
ecma: '2015',
compress: { compress: {
global_defs: { global_defs: {
"@console.log": "alert" "@console.log": "alert"
......
...@@ -17,7 +17,12 @@ cd ${PROJECT_DIR} ...@@ -17,7 +17,12 @@ cd ${PROJECT_DIR}
# Run the build # Run the build
echo "Building Android application..." echo "Building Android application..."
ionic cordova build android --warning-mode=none --color ionic cordova build android --warning-mode=none --color $*
echo "Running Android application..." echo "Running Android application..."
native-run android --app ${ANDROID_OUTPUT_APK_DEBUG}/android-debug.apk $* if [[ "$1" == "--release" ]]; then
native-run android --app ${ANDROID_OUTPUT_APK_RELEASE}/android-release.apk
else
native-run android --app ${ANDROID_OUTPUT_APK_DEBUG}/android-debug.apk
fi
...@@ -10,7 +10,7 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium. ...@@ -10,7 +10,7 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
var pubkey = "[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{43,44}"; var pubkey = "[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{43,44}";
var var
// TX output conditions // TX output conditions
SIG = "SIG\\(([0-9a-zA-Z]{43,44})\\)", SIG = "SIG\\((" + pubkey + ")\\)",
XHX = 'XHX\\(([A-F0-9]{1,64})\\)', XHX = 'XHX\\(([A-F0-9]{1,64})\\)',
CSV = 'CSV\\(([0-9]{1,8})\\)', CSV = 'CSV\\(([0-9]{1,8})\\)',
CLTV = 'CLTV\\(([0-9]{1,10})\\)', CLTV = 'CLTV\\(([0-9]{1,10})\\)',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment