UDP JSON switch|

Author: jvde-github

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

@@ -53,7 +53,7 @@ public interface AisCallback {
 
     static native int applySetting(String dev, String Setting, String Param);
 
-    static native int createUDP(String h, String p);
+    static native int createUDP(String h, String p, boolean JSON);
 
     static native int createWebViewer(String p);
 

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

@@ -89,19 +89,22 @@ static void setDefault(Context context) {
         preferences.edit().putBoolean("u1SWITCH", true).commit();
         preferences.edit().putString("u1HOST", "127.0.0.1").commit();
         preferences.edit().putString("u1PORT", "10110").commit();
+        preferences.edit().putBoolean("u1JSON", false).commit();
 
         preferences.edit().putBoolean("u2SWITCH", false).commit();
         preferences.edit().putString("u2HOST", "127.0.0.1").commit();
         preferences.edit().putString("u2PORT", "10111").commit();
+        preferences.edit().putBoolean("u2JSON", false).commit();
 
         preferences.edit().putBoolean("u3SWITCH", false).commit();
         preferences.edit().putString("u3HOST", "127.0.0.1").commit();
         preferences.edit().putString("u3PORT", "10111").commit();
+        preferences.edit().putBoolean("u3JSON", false).commit();
 
         preferences.edit().putBoolean("u4SWITCH", false).commit();
         preferences.edit().putString("u4HOST", "127.0.0.1").commit();
         preferences.edit().putString("u4PORT", "10111").commit();
-
+        preferences.edit().putBoolean("u4JSON", false).commit();
 
         preferences.edit().putInt("mLINEARITY", 17).commit();
         preferences.edit().putString("mRATE", "2500K").commit();
@@ -368,7 +371,9 @@ static private boolean SetUDPoutput(String s, Context context) {
         if (b) {
             String host = preferences.getString(s + "HOST", "");
             String port = preferences.getString(s + "PORT", "");
-            return AisCatcherJava.createUDP(host, port) == 0;
+            boolean JSON = preferences.getBoolean(s + "JSON", false);
+
+            return AisCatcherJava.createUDP(host, port, JSON) == 0;
 
         }
         return true;

app/src/main/jni/JNI/AIScatcherNDK.cpp

@@ -248,6 +248,8 @@ std::vector<IO::UDPStreamer > UDP_connections;
 std::vector<IO::TCPClientStreamer > TCP_connections;
 std::vector<std::string> UDPhost;
 std::vector<std::string> UDPport;
+std::vector<bool> UDPJSON;
+
 bool sharing = false;
 std::string sharingKey = "";
 
@@ -352,7 +354,7 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_Run(JNIEnv *env, jclass) {
         UDP_connections.resize(UDPhost.size());
 
         for (int i = 0; i < UDPhost.size(); i++) {
-            UDP_connections[i].Set("host",UDPhost[i]).Set("port",UDPport[i]);
+            UDP_connections[i].Set("host",UDPhost[i]).Set("port",UDPport[i]).Set("JSON",UDPJSON[i]?"on":"off");
             UDP_connections[i].Start();
             model->Output() >> UDP_connections[i];
         }
@@ -411,6 +413,7 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_Run(JNIEnv *env, jclass) {
 
         UDPport.clear();
         UDPhost.clear();
+        UDPJSON.clear();
 
         if(webviewer) {
             webviewer->close();
@@ -576,19 +579,22 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_createReceiver(JNIEnv *env, jclass
 extern "C"
 JNIEXPORT jint JNICALL
 Java_com_jvdegithub_aiscatcher_AisCatcherJava_createUDP(JNIEnv *env, jclass clazz, jstring h,
-                                                        jstring p) {
+                                                        jstring p, jboolean J) {
     try {
         UDPport.resize(UDPport.size() + 1);
         UDPhost.resize(UDPhost.size() + 1);
+        UDPJSON.resize(UDPJSON.size() + 1);
 
         jboolean b;
         std::string host = toString(env,h); //(env)->GetStringUTFChars(h, &b);
         std::string port = toString(env, p); //(env)->GetStringUTFChars(p, &b);
+        bool JSON = J;
 
         UDPport[UDPport.size() - 1] = port;
         UDPhost[UDPhost.size() - 1] = host;
+        UDPJSON[UDPJSON.size()-1] = JSON;
 
-        Info() << "UDP: " << host << ":" << port;
+        Info() << "UDP: " << host << ":" << port << (J ? std::string(" (JSON)") : std::string(" (NMEA)"));
     } catch (std::exception& e) {
         callbackError(env, e.what());
         device = nullptr;

app/src/main/res/xml/preferences.xml

@@ -241,6 +241,12 @@
             android:dependency="u1SWITCH"
             android:title="Port"/>
 
+        <SwitchPreferenceCompat
+            android:key="u1JSON"
+            android:defaultValue="False"
+            android:dependency="u1SWITCH"
+            android:title="JSON"/>
+
         <SwitchPreferenceCompat
             android:key="u2SWITCH"
             android:defaultValue="False"
@@ -258,6 +264,12 @@
             android:defaultValue="4002"
             android:title="Port"/>
 
+        <SwitchPreferenceCompat
+            android:key="u2JSON"
+            android:defaultValue="False"
+            android:dependency="u2SWITCH"
+            android:title="JSON"/>
+
         <SwitchPreferenceCompat
             android:key="u3SWITCH"
             android:dependency="sSHARING"
@@ -276,6 +288,12 @@
             android:defaultValue="4002"
             android:title="Port"/>
 
+        <SwitchPreferenceCompat
+            android:key="31JSON"
+            android:defaultValue="False"
+            android:dependency="u3SWITCH"
+            android:title="JSON"/>
+
         <SwitchPreferenceCompat
             android:key="u4SWITCH"
             android:dependency="sSHARING"
@@ -294,6 +312,11 @@
             android:defaultValue="4002"
             android:title="Port"/>
 
+        <SwitchPreferenceCompat
+            android:key="u4JSON"
+            android:defaultValue="False"
+            android:dependency="u4SWITCH"
+            android:title="JSON"/>
 
     </PreferenceCategory>