diff --git a/phoneClients/android/.idea/.name b/phoneClients/android/.idea/.name
index 37cdced..1fd74d1 100644
--- a/phoneClients/android/.idea/.name
+++ b/phoneClients/android/.idea/.name
@@ -1 +1 @@
-GpsTracker
\ No newline at end of file
+android
\ No newline at end of file
diff --git a/phoneClients/android/.idea/gradle.xml b/phoneClients/android/.idea/gradle.xml
index 0c341e5..736c7b5 100644
--- a/phoneClients/android/.idea/gradle.xml
+++ b/phoneClients/android/.idea/gradle.xml
@@ -8,7 +8,7 @@
diff --git a/phoneClients/android/.idea/libraries/android_async_http_1_4_4.xml b/phoneClients/android/.idea/libraries/android_async_http_1_4_4.xml
index a44fe84..2b6ac72 100644
--- a/phoneClients/android/.idea/libraries/android_async_http_1_4_4.xml
+++ b/phoneClients/android/.idea/libraries/android_async_http_1_4_4.xml
@@ -1,11 +1,9 @@
-
+
-
-
-
+
\ No newline at end of file
diff --git a/phoneClients/android/.idea/libraries/appcompat_v7_19_1_0.xml b/phoneClients/android/.idea/libraries/appcompat_v7_19_1_0.xml
index 93241c9..970e5fa 100644
--- a/phoneClients/android/.idea/libraries/appcompat_v7_19_1_0.xml
+++ b/phoneClients/android/.idea/libraries/appcompat_v7_19_1_0.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/phoneClients/android/.idea/libraries/play_services_4_3_23.xml b/phoneClients/android/.idea/libraries/play_services_4_3_23.xml
index b140ae1..57b5520 100644
--- a/phoneClients/android/.idea/libraries/play_services_4_3_23.xml
+++ b/phoneClients/android/.idea/libraries/play_services_4_3_23.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/phoneClients/android/.idea/misc.xml b/phoneClients/android/.idea/misc.xml
index b153e48..8fef058 100644
--- a/phoneClients/android/.idea/misc.xml
+++ b/phoneClients/android/.idea/misc.xml
@@ -1,10 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
diff --git a/phoneClients/android/.idea/modules.xml b/phoneClients/android/.idea/modules.xml
index 0348e67..ef5841b 100644
--- a/phoneClients/android/.idea/modules.xml
+++ b/phoneClients/android/.idea/modules.xml
@@ -2,9 +2,8 @@
-
-
+
diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml
index bf4d6e7..a5741dd 100644
--- a/phoneClients/android/.idea/workspace.xml
+++ b/phoneClients/android/.idea/workspace.xml
@@ -26,27 +26,38 @@
-
-
-
- Nexus 4
- @android:style/Theme.Black
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -63,7 +74,7 @@
-
+
@@ -99,10 +110,8 @@
-
-
-
+
@@ -110,41 +119,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -157,6 +146,11 @@
+
+
+
+
+
@@ -183,8 +177,8 @@
-
-
+
+
@@ -197,373 +191,373 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -829,51 +974,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -886,20 +989,20 @@
-
+
+
+
+
-
+
-
-
-
-
+
@@ -1054,8 +1157,31 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1066,7 +1192,7 @@
-
+
@@ -1078,8 +1204,8 @@
-
-
+
+
@@ -1087,58 +1213,58 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
+
-
-
-
+
+
-
-
-
-
+
+
+
-
+
+
@@ -1162,283 +1288,54 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
@@ -1470,85 +1367,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1556,14 +1378,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phoneClients/android/GpsTracker/GpsTracker.iml b/phoneClients/android/GpsTracker/GpsTracker.iml
new file mode 100644
index 0000000..9d3a505
--- /dev/null
+++ b/phoneClients/android/GpsTracker/GpsTracker.iml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/phoneClients/android/GpsTrackerProject.iml b/phoneClients/android/GpsTrackerProject.iml
new file mode 100644
index 0000000..9d3a505
--- /dev/null
+++ b/phoneClients/android/GpsTrackerProject.iml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/phoneClients/android/android.iml b/phoneClients/android/android.iml
new file mode 100644
index 0000000..d9c631d
--- /dev/null
+++ b/phoneClients/android/android.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phoneClients/android/app/app.iml b/phoneClients/android/app/app.iml
index 67dc562..7c0790e 100644
--- a/phoneClients/android/app/app.iml
+++ b/phoneClients/android/app/app.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/phoneClients/android/app/build.gradle b/phoneClients/android/app/build.gradle
index f242d4a..b6c2a4e 100644
--- a/phoneClients/android/app/build.gradle
+++ b/phoneClients/android/app/build.gradle
@@ -12,6 +12,7 @@
}
buildTypes {
release {
+ debuggable false
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
diff --git a/phoneClients/android/app/src/main/AndroidManifest.xml b/phoneClients/android/app/src/main/AndroidManifest.xml
index 3895fff..4fb95b0 100644
--- a/phoneClients/android/app/src/main/AndroidManifest.xml
+++ b/phoneClients/android/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
1) ? true : false;
+ return ((str.split(" ").length > 1) ? true : false);
}
private void displayUserSettings() {
diff --git a/phoneClients/android/app/src/main/res/layout/activity_gpstracker.xml b/phoneClients/android/app/src/main/res/layout/activity_gpstracker.xml
index 71867d2..656e59f 100644
--- a/phoneClients/android/app/src/main/res/layout/activity_gpstracker.xml
+++ b/phoneClients/android/app/src/main/res/layout/activity_gpstracker.xml
@@ -93,16 +93,12 @@
android:layout_height="wrap_content"
android:text="@string/save"
android:id="@+id/saveButton"
- android:layout_weight="1"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true" />
+ android:layout_weight="1" />
+ android:layout_weight="1" />
diff --git a/phoneClients/android/app/src/main/res/menu/gps_tracker.xml b/phoneClients/android/app/src/main/res/menu/gps_tracker.xml
deleted file mode 100644
index 3f55dc7..0000000
--- a/phoneClients/android/app/src/main/res/menu/gps_tracker.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/phoneClients/android/app/src/main/res/values/strings.xml b/phoneClients/android/app/src/main/res/values/strings.xml
index c10e009..6653985 100644
--- a/phoneClients/android/app/src/main/res/values/strings.xml
+++ b/phoneClients/android/app/src/main/res/values/strings.xml
@@ -2,9 +2,6 @@
GpsTracker
- Hello world!
- Settings
-
https://www.websmithing.com/gpstracker/updatelocation.php
Start Tracking
diff --git a/servers/dotNet/App_Code/DbJsonReader.cs b/servers/dotNet/App_Code/DbJsonReader.cs
new file mode 100755
index 0000000..432c8ca
--- /dev/null
+++ b/servers/dotNet/App_Code/DbJsonReader.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Configuration;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text;
+
+public class DbJsonReader
+{
+ ///
+ /// creates a json array from ms sql server data
+ ///
+ public DbJsonReader()
+ {
+ }
+
+ ///
+ /// This method takes an optional list of paramters.
+ ///
+ public string getJsonString(string storedProcedureName, string jsonRootName, params SqlParameter[] spParameterList)
+ {
+ SqlConnection sqlConnection = null;
+ SqlDataReader dataReader = null;
+ StringBuilder jsonStringBuilder = new StringBuilder("");
+
+ try
+ {
+ sqlConnection = new SqlConnection();
+ sqlConnection.ConnectionString = GetConnectionString();
+
+ SqlCommand cmd = new SqlCommand();
+ cmd.Connection = sqlConnection;
+ cmd.CommandText = storedProcedureName;
+ cmd.CommandType = CommandType.StoredProcedure;
+
+ // optional list of parameters for stored procedure
+ if (spParameterList.Length > 0)
+ {
+ for (int i = 0; i < spParameterList.Length; i++)
+ {
+ cmd.Parameters.Add(spParameterList[i]);
+ }
+ }
+
+ sqlConnection.Open();
+ dataReader = cmd.ExecuteReader();
+
+ jsonStringBuilder.Append("{ \"");
+ jsonStringBuilder.Append(jsonRootName);
+ jsonStringBuilder.Append("\": [");
+
+ if (dataReader.HasRows)
+ {
+ while (dataReader.Read())
+ {
+ jsonStringBuilder.Append(dataReader.GetString(0));
+ jsonStringBuilder.Append(",");
+ }
+ }
+
+ if (jsonStringBuilder.ToString().EndsWith(","))
+ {
+ jsonStringBuilder = jsonStringBuilder.Remove(jsonStringBuilder.Length - 1, 1);
+ }
+
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine("updateDB error: " + e.Message);
+ }
+ finally
+ {
+ if (sqlConnection != null)
+ {
+ sqlConnection.Close();
+ }
+ if (dataReader != null)
+ {
+ dataReader.Close();
+ }
+ }
+
+ jsonStringBuilder.Append("] }");
+ return jsonStringBuilder.ToString();
+ }
+
+ private string GetConnectionString() // stored in web.config
+ {
+ return ConfigurationManager.ConnectionStrings
+ ["MSSQLConnectionString"].ConnectionString;
+ }
+}
+
diff --git a/servers/dotNet/DisplayMap.aspx b/servers/dotNet/DisplayMap.aspx
index 59e61e8..0d5eac1 100755
--- a/servers/dotNet/DisplayMap.aspx
+++ b/servers/dotNet/DisplayMap.aspx
@@ -1,19 +1,25 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeFile="DisplayMap.aspx.cs" Inherits="DisplayMap" %>
-
+
Google Map GPS Cell Phone Tracker
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
- GPS Tracker
+
+ GpsTracker
-
-
-
-