From 38238ab9860d0e520e71fa346397d25878f211c2 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Fri, 24 Jan 2020 15:10:09 +0100
Subject: [PATCH] [fix] Fix splash screen config
---
config.xml | 5 -----
hooks/after_prepare/040_useref.js | 26 +++++++++++++++++---------
scripts/run-android.sh | 9 +++++++--
www/js/services/bma-services.js | 2 +-
4 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/config.xml b/config.xml
index bc9727133..f22a1006a 100644
--- a/config.xml
+++ b/config.xml
@@ -24,11 +24,6 @@
<preference name="DisallowOverscroll" value="true" />
<preference name="SplashScreen" value="screen" />
<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="KeyboardResizeMode" value="ionic" />
<preference name="xwalkVersion" value="19" />
diff --git a/hooks/after_prepare/040_useref.js b/hooks/after_prepare/040_useref.js
index cce0031ee..aa7692553 100755
--- a/hooks/after_prepare/040_useref.js
+++ b/hooks/after_prepare/040_useref.js
@@ -1,14 +1,17 @@
#!/usr/bin/env node
"use strict";
-const gulp = require('gulp');
-const path = require("path");
-const es = require('event-stream');
-const useref = require('gulp-useref');
-const filter = require('gulp-filter');
-const uglify = require('gulp-uglify-es').default;
-const csso = require('gulp-csso');
-const rev = require('gulp-rev');
-const revReplace = require('gulp-rev-replace');
+const gulp = require('gulp'),
+ path = require("path"),
+ es = require('event-stream'),
+ useref = require('gulp-useref'),
+ filter = require('gulp-filter'),
+ uglify = require('gulp-uglify-es').default,
+ csso = require('gulp-csso'),
+ rev = require('gulp-rev'),
+ revReplace = require('gulp-rev-replace'),
+ log = require('fancy-log'),
+ colors = require('ansi-colors');
+
const cmd = process.env.CORDOVA_CMDLINE;
const rootdir = process.argv[2];
@@ -17,6 +20,9 @@ let skip = true;
if (cmd.indexOf("--release") > -1 || cmd.indexOf("--useref") > -1) {
skip = false;
}
+else {
+ log(colors.grey('Skipping useref'));
+}
if (rootdir && !skip) {
@@ -41,6 +47,8 @@ if (rootdir && !skip) {
const revFilesFilter = filter(['**/*', '!**/index.html', '!**/config.js'], { restore: true });
const uglifyOptions = {
toplevel: true,
+ warnings: true,
+ ecma: '2015',
compress: {
global_defs: {
"@console.log": "alert"
diff --git a/scripts/run-android.sh b/scripts/run-android.sh
index f981bea29..7f1e37462 100755
--- a/scripts/run-android.sh
+++ b/scripts/run-android.sh
@@ -17,7 +17,12 @@ cd ${PROJECT_DIR}
# Run the build
echo "Building Android application..."
-ionic cordova build android --warning-mode=none --color
+ionic cordova build android --warning-mode=none --color $*
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
+
diff --git a/www/js/services/bma-services.js b/www/js/services/bma-services.js
index f7ec13f98..0fd2b3924 100644
--- a/www/js/services/bma-services.js
+++ b/www/js/services/bma-services.js
@@ -10,7 +10,7 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
var pubkey = "[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{43,44}";
var
// TX output conditions
- SIG = "SIG\\(([0-9a-zA-Z]{43,44})\\)",
+ SIG = "SIG\\((" + pubkey + ")\\)",
XHX = 'XHX\\(([A-F0-9]{1,64})\\)',
CSV = 'CSV\\(([0-9]{1,8})\\)',
CLTV = 'CLTV\\(([0-9]{1,10})\\)',
--
GitLab