Merge pull request #6 from cqu-bdsc/android

Android V1.0 merge
cqu-bdsc · Sep 27, 2018 · b039b24 · b039b24
2 parents 9272429 + d9c1fa8
commit b039b24
Show file tree

Hide file tree

Showing 6 changed files with 315 additions and 98 deletions.
diff --git a/APP/app/src/main/java/com/github/cqu_bdsc/collision_warning_system/DAO/Message.java b/APP/app/src/main/java/com/github/cqu_bdsc/collision_warning_system/DAO/Message.java
@@ -8,6 +8,8 @@
 public class Message implements Serializable {
     public static final String TYPE_MESSAGE = "TYPE_MESSAGE";
     public static final String TYPE_TIME_SYNC_MESSAGE = "TYPE_TIME_SYNC_MESSAGE";
+    public static final String TYPE_WIFI_TIME_SYNC_RESULT = "TYPE_WIFI_TIME_SYNC_RESULT";
+    public static final String TYPE_WIFI_MESSAGE = "TYPE_WIFI_MESSAGE";
     public static int ERROR_VALUE = -666;
     private int id;
     private long timeStamp;

diff --git a/APP/app/src/main/java/com/github/cqu_bdsc/collision_warning_system/DAO/Result.java b/APP/app/src/main/java/com/github/cqu_bdsc/collision_warning_system/DAO/Result.java
@@ -39,6 +39,7 @@ public class Result implements Serializable {
 
     public static final String TYPE_RESULT = "TYPE_RESULT";
     public static final String TYPE_TIME_SYNC_RESULT = "TYPE_TIME_SYNC_RESULT";
+    public static final String TYPE_WIFI_TIME_SYNC = "TYPE_WIFI_TIME_SYNC";
     public static int ERROR_VALUE = -666;
     private int id;
     private int time;