url update for prediction

main
Hans P. Reiser 2022-10-02 23:08:31 +00:00
rodzic 3e23aa56b5
commit 5b863f7a1a
6 zmienionych plików z 70 dodań i 20 usunięć

36
Makefile 100644
Wyświetl plik

@ -0,0 +1,36 @@
export ANDROID_SDK_ROOT=/Users/hansr/Library/Android/sdk
all: run
el: plugin
cordova build electron
run:
clear
cp ../rdzwx-plugin/src/android/*.kt ./platforms/android/app/src/main/kotlin/de/dl9rdz/
cordova run android --device
full:
clear
cordova plugin rm de-dl9rdz-rdzwx
cordova plugin add ../rdzwx-plugin/
cordova run android --device
plugin:
cordova plugin rm de-dl9rdz-rdzwx
cordova plugin add ../rdzwx-plugin/
release: apkrelease sign
mkrelease:
cordova build --release
.ONESHELL:
sign:
cd platforms/android/app/build/outputs/apk/release/ && \
/Users/hansr/Library/Android//sdk/build-tools/30.0.3/zipalign -v -p 4 app-release-unsigned.apk app-release-unsigned-aligned.apk && \
/Users/hansr/Library/Android//sdk/build-tools/30.0.3/apksigner sign --ks ~/src/rdzwx-go/my-release-key.jks --out app-release.apk app-release-unsigned-aligned.apk
apkrelease:
cordova build --release -- --packageType=apk

Wyświetl plik

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="de.dl9rdz" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"
<widget id="de.dl9rdz" version="1.0.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"
xmlns:android="schemas.android.com/apk/res/android">
<name>rdzSonde</name>
<description>
@ -39,7 +39,7 @@
<preference name="GradlePluginKotlinVersion" value="1.3.50" />
<preference name="android-minSdkVersion" value="23" />
<preference name="android-targetSdkVersion" value="29" />
<preference name="android-targetSdkVersion" value="30" />
<preference name="SplashScreen" value="none" />

Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "de.dl9rdz",
"displayName": "rdzwx-go",
"version": "1.0.6",
"version": "1.0.7",
"description": "A sample Apache Cordova application that uses rdzwx-plugin.",
"main": "index.js",
"scripts": {
@ -12,20 +12,28 @@
],
"author": "Hansi Reiser <dl9rdz@darc.de>",
"license": "Apache-2.0",
"overrides": {
"electron-builder": "23.0.3"
},
"dependencies": {
"jetifier": "^2.0.0",
"net": "^1.0.2",
"update": "^0.7.4",
"xmlhttprequest": "^1.8.0"
},
"devDependencies": {
"cordova-android": "^10.1.2",
"cordova-browser": "^6.0.0",
"cordova-electron": "^3.0.0",
"cordova-plugin-androidx-adapter": "^1.1.3",
"cordova-plugin-inappbrowser": "^5.0.0",
"de-dl9rdz-rdzwx": "https://github.com/dl9rdz/rdzwx-plugin.git",
"rdzwx-plugin": "github:dl9rdz/rdzwx-plugin"
"rdzwx-plugin": "file:../rdzwx-plugin"
},
"cordova": {
"plugins": {
"de-dl9rdz-rdzwx": {},
"cordova-plugin-androidx-adapter": {},
"cordova-plugin-inappbrowser": {}
"cordova-plugin-inappbrowser": {},
"de-dl9rdz-rdzwx": {}
},
"platforms": [
"android",
@ -33,9 +41,12 @@
"electron"
]
},
"dependencies": {
"jetifier": "^2.0.0",
"net": "^1.0.2",
"xmlhttprequest": "^1.8.0"
"browser": {
"net": false,
"fs": false
},
"electron": {
"net": false,
"fs": false
}
}

Wyświetl plik

@ -1,5 +1,5 @@
{
"version": "1.0.6",
"url": "https://github.com/dl9rdz/rdzwx-go/releases/tag/v1.0.6",
"apkurl": "https://github.com/dl9rdz/rdzwx-go/releases/download/v1.0.6/rdzSonde-v1.0.6.apk"
}
"version": "1.0.7",
"url": "https://github.com/dl9rdz/rdzwx-go/releases/tag/v1.0.7",
"apkurl": "https://github.com/dl9rdz/rdzwx-go/releases/download/v1.0.7/rdzSonde-v1.0.7.apk"
}

Wyświetl plik

@ -33,7 +33,7 @@
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport" content="initial-scale=1, width=device-width, viewport-fit=cover, user-scalable=no">
<meta name="color-scheme" content="light dark">
<meta name="color-scheme" content="light">
<link rel="stylesheet" href="css/leaflet.css">
<link rel="stylesheet" href="css/leaflet.contextmenu.css">
<link rel="stylesheet" href="css/index.css">
@ -48,14 +48,14 @@
<script src="js/easy-button.js"></script>
<script src="js/L.Control.MousePosition.js"></script>
<title>rdzSonde v1.0.6 +experimental</title>
<title>rdzSonde v1.0.7 +experimental</title>
</head>
<body>
<div id="all">
<div id="toolbar">
<a id="toolbarclose" class="leaflet-popup-close-button" style="cursor: pointer; float: right;">X</a>
<h2>rdzSonde v1.0.6 +experimental</h2>
<p>Copyright &copy; 2021 Hansi Reiser, dl9rdz</p>
<h2>rdzSonde v1.0.7 +experimental</h2>
<p>Copyright &copy; 2022 Hansi Reiser, dl9rdz</p>
<p>see <a href="https://github.com/dl9rdz/rdzwx-go">https://github.com/dl9rdz/rdzwx-go</a> for details</p>
<p>Apache License Version 2.0</p>
<hr>

Wyświetl plik

@ -608,7 +608,8 @@ function removePrediction(marker) {
}
function getPrediction(refobj) {
TAWHIRI = 'http://predict.cusf.co.uk/api/v1';
// going out of service soon... TAWHIRI = 'http://predict.cusf.co.uk/api/v1';
TAWHIRI = 'https://api.v2.sondehub.org/tawhiri';
if(refobj == null) { refobj = lastMarker; }
if(refobj == null) {
alert("no object available");
@ -715,6 +716,8 @@ function callBack(arg) {
return;
}
update(obj);
// for now, only for electron (does not support keepCallback)
//RdzWx.next(callBack);
}
function updateMypos(obj) {