externel web viewer

Author: jvde-github

app/build.gradle

@@ -51,22 +51,21 @@ android {
             version '3.18.1+'
         }
     }
-    buildToolsVersion '30.0.3'
     ndkVersion '24.0.8215888'
     namespace 'com.jvdegithub.aiscatcher'
 }
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.5.0'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.webkit:webkit:1.4.0'
+    implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.webkit:webkit:1.12.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }

app/src/main/assets/webassets

@@ -55,6 +55,8 @@ public interface AisCallback {
 
     static native int createUDP(String h, String p);
 
+    static native int createWebViewer(String p);
+
     static native int createSharing(boolean b, String key);
 
 

app/src/main/java/com/jvdegithub/aiscatcher/AisCatcherJava.java

@@ -60,6 +60,10 @@ static void setDefault(Context context) {
         preferences.edit().putString("sSHARINGKEY", "").commit();
         preferences.edit().putBoolean("sSHARING", false).commit();
 
+        preferences.edit().putBoolean("w1SWITCH", false).commit();
+        preferences.edit().putInt("w1PORT", 8100).commit();
+
+
         preferences.edit().putString("oCGF_WIDE", "Default").commit();
         preferences.edit().putString("oMODEL_TYPE", "Default").commit();
         preferences.edit().putBoolean("oFP_DS", false).commit();
@@ -123,6 +127,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
             ((EditTextPreference) getPreferenceManager().findPreference("sHOST")).setOnBindEditTextListener(validateIP);
             ((EditTextPreference) getPreferenceManager().findPreference("sPORT")).setOnBindEditTextListener(validatePort);
+            ((EditTextPreference) getPreferenceManager().findPreference("w1PORT")).setOnBindEditTextListener(validatePort);;
             ((SeekBarPreference) getPreferenceManager().findPreference("sGAIN")).setUpdatesContinuously(true);
             ((EditTextPreference) getPreferenceManager().findPreference("tPORT")).setOnBindEditTextListener(validatePort);
             ((EditTextPreference) getPreferenceManager().findPreference("rFREQOFFSET")).setOnBindEditTextListener(validatePPM);
@@ -147,7 +152,7 @@ static public int getModelType(Context context)
         }
 
         private void setSummaries() {
-            setSummaryText(new String[]{"tPORT","tHOST","sPORT","sHOST","u1HOST","u1PORT","u2HOST","u2PORT", "u3HOST","u3PORT", "u4HOST","u4PORT", "rFREQOFFSET", "sSHARINGKEY"});
+            setSummaryText(new String[]{"w1PORT","tPORT","tHOST","sPORT","sHOST","u1HOST","u1PORT","u2HOST","u2PORT", "u3HOST","u3PORT", "u4HOST","u4PORT", "rFREQOFFSET", "sSHARINGKEY"});
             setSummaryList(new String[]{"rTUNER","rRATE","sRATE","tRATE","tPROTOCOL","tTUNER","mRATE","hRATE","oMODEL_TYPE","oCGF_WIDE"});
             setSummarySeekbar(new String[]{"mLINEARITY", "sGAIN"});
         }
@@ -269,6 +274,8 @@ static public boolean Apply(Context context) {
         if (!SetUDPoutput("u3", context)) return false;
         if (!SetUDPoutput("u4", context)) return false;
 
+        if (!SetWebViewerOutput( context)) return false;
+
         if(!SetSharing(context))  return false;
 
         return true;
@@ -360,6 +367,19 @@ static private boolean SetUDPoutput(String s, Context context) {
         }
         return true;
     }
+
+    static private boolean SetWebViewerOutput(Context context) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+
+        boolean b = preferences.getBoolean("w1SWITCH", false);
+        if (b) {
+            String port = preferences.getString("w1PORT", "");
+            return AisCatcherJava.createWebViewer(port) == 0;
+
+        }
+        return true;
+    }
+
     static private boolean SetSharing(Context context) {
         String defaultKey = "a6392e08-c57e-4e7a-a4fb-d73bfc7619ae";
 

app/src/main/java/com/jvdegithub/aiscatcher/Settings.java

@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 3.10.2)
 
 project("AIScatcherNDK")
 
-set(OPTIMIZATION_FLAGS "-Ofast")
-#set(OPTIMIZATION_FLAGS "-g")
+#set(OPTIMIZATION_FLAGS "-Ofast")
+set(OPTIMIZATION_FLAGS "-g")
 
 set(CMAKE_CXX_FLAGS "${OPTIMIZATION_FLAGS}")
 set(CMAKE_C_FLAGS "${OPTIMIZATION_FLAGS}")
@@ -52,7 +52,7 @@ add_library( # Sets the name of the library.
         ./AIS-catcher/Device/ZMQ.cpp ./AIS-catcher/Device/SoapySDR.cpp ./AIS-catcher/Device/SpyServer.cpp ./AIS-catcher/Library/Message.cpp ./AIS-catcher/Library/NMEA.cpp
         ./AIS-catcher/Library/Utilities.cpp ./AIS-catcher/Library/TCP.cpp ./AIS-catcher/JSON/JSON.cpp ./AIS-catcher/IO/Network.cpp ./AIS-catcher/IO/HTTPServer.cpp
         ./AIS-catcher/JSON/StringBuilder.cpp ./AIS-catcher/JSON/Parser.cpp ./AIS-catcher/Device/AIRSPY.cpp ./AIS-catcher/Device/Serial.cpp
-        ./AIS-catcher/DSP/DSP.cpp ./AIS-catcher/IO/IO.cpp ./AIS-catcher/Application/WebViewer.cpp ./AIS-catcher/Application/Prometheus.cpp
+        ./AIS-catcher/DSP/DSP.cpp ./AIS-catcher/Application/WebViewer.cpp ./AIS-catcher/Application/Prometheus.cpp ./AIS-catcher/Protocol/Protocol.cpp ./AIS-catcher/Library/Logger.cpp
 
         JNI/AIScatcherNDK.cpp)
 
@@ -61,7 +61,7 @@ include_directories(
         ./rtl-sdr/include
         ./airspyone_host/libairspy/src
         ./airspyhf/libairspyhf/src
-        ./AIS-catcher ./AIS-catcher/Application ./AIS-catcher/IO ./AIS-catcher/Library ./AIS-catcher/Ships ./AIS-catcher/DBMS ./AIS-catcher/DSP ./AIS-catcher/Device)
+        ./AIS-catcher ./AIS-catcher/Application ./AIS-catcher/IO ./AIS-catcher/Library ./AIS-catcher/Ships ./AIS-catcher/DBMS ./AIS-catcher/DSP ./AIS-catcher/Device ./AIS-catcher/Protocol)
 
 add_definitions(-DHASRTLSDR -DHASRTLSDR_BIASTEE -DHASRTL_ANDROID -DHASAIRSPY -DHASAIRSPY_ANDROID -D HASAIRSPYHF -DHASAIRSPYHF_ANDROID -DHASRTLSDR_TUNERBW)