Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bpresles
Cesium
Commits
38238ab9
Commit
38238ab9
authored
5 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Fix splash screen config
parent
fb2fb024
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
config.xml
+0
-5
0 additions, 5 deletions
config.xml
hooks/after_prepare/040_useref.js
+17
-9
17 additions, 9 deletions
hooks/after_prepare/040_useref.js
scripts/run-android.sh
+7
-2
7 additions, 2 deletions
scripts/run-android.sh
www/js/services/bma-services.js
+1
-1
1 addition, 1 deletion
www/js/services/bma-services.js
with
25 additions
and
17 deletions
config.xml
+
0
−
5
View file @
38238ab9
...
...
@@ -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"
/>
...
...
This diff is collapsed.
Click to expand it.
hooks/after_prepare/040_useref.js
+
17
−
9
View file @
38238ab9
#!/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
"
...
...
This diff is collapsed.
Click to expand it.
scripts/run-android.sh
+
7
−
2
View file @
38238ab9
...
...
@@ -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
This diff is collapsed.
Click to expand it.
www/js/services/bma-services.js
+
1
−
1
View file @
38238ab9
...
...
@@ -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})
\\
)
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment