diff --git a/MobileTracking/.idea/caches/build_file_checksums.ser b/MobileTracking/.idea/caches/build_file_checksums.ser index 5acc7c595ae499a79ab5cd396cc30b5acafcf229..dc0e6d77477eab6fe3f233fdda24cfdb384497db 100644 Binary files a/MobileTracking/.idea/caches/build_file_checksums.ser and b/MobileTracking/.idea/caches/build_file_checksums.ser differ diff --git a/MobileTracking/.idea/caches/gradle_models.ser b/MobileTracking/.idea/caches/gradle_models.ser index 72c594f317385daa0e9da4311f8980ffe5679bdb..38865920347abdb6d25d6d368831d3262b1af5c6 100644 Binary files a/MobileTracking/.idea/caches/gradle_models.ser and b/MobileTracking/.idea/caches/gradle_models.ser differ diff --git a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java index 14a8cbaea5399c25a3dd4dd0edbd96ff41ba330d..f697514c98d1da6ad962f9db2221f57a3ab59394 100755 --- a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java +++ b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java @@ -16,10 +16,8 @@ public class Constant { * 对应中的字段 */ public static int OFFLINECACHE_TIMEOUT = 15; - /* 正常队列间隔周期 10s */ public static int ONLINECACHE_QUEUEEXPIRATIONSECS = 10; - /** * 先获得位置信息,如需要才发送给服务器,这样能减少延迟。 */ @@ -42,7 +40,6 @@ public class Constant { public static final String TRACKING_WIFIBSSID = "WIFIBSSID"; //新增华为设备ID标识,OAID public static final String TRACKING_OAID = "OAID"; - public static final String TRACKING_ADID = "ADID"; public static final String TRACKING_IMEI = "IMEI"; public static final String TRACKING_RAWIMEI = "RAWIMEI"; @@ -55,17 +52,14 @@ public class Constant { public static final String DIVIDE_MULT = "X"; public static final String TRACKING_SDKVS = "SDKVS"; public static final String TRACKING_SDKVS_VALUE = "V2.2.0"; //SDK版本号 - /** * 新版常量 Begin */ public static final int NORMAL_MESSAGE_DEFAULT_PEROID = 30 * 1000; public static final int FAILED_MESSAGE_DEFAULT_PEROID = 60 * 60 * 1000; public static final int LOCATIOON_UPDATE_INTERVAL = 60 * 60 * 1000; - public static final long TIME_THREE_DAY = 3 * 24 * 60 * 60 * 1000; public static final long TIME_ONE_DAY = 24 * 60 * 60 * 1000;//一天的毫秒数 - // 网络参数配置 public static int DEFAULT_MAX_CONNECTIONS = 30; // public static int DEFAULT_SOCKET_TIMEOUT = 30 * 1000; diff --git a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/SendMessageThread.java b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/SendMessageThread.java index b516c83ff0a6a8fc3f17d9b3f2c86f77a7af2f3d..5f6a92459e1300b4f4a0c48f0d5b3072420f981a 100644 --- a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/SendMessageThread.java +++ b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/SendMessageThread.java @@ -47,7 +47,6 @@ public class SendMessageThread extends Thread { public void run() { sendData(); } - private synchronized void sendData() { synchronized (object) { Set eventSets = SharedPreferencedUtil.getSharedPreferences(context, spName).getAll().keySet(); @@ -76,7 +75,7 @@ public class SendMessageThread extends Thread { if (response == null) { handleFailedResult(eventData, eventExpireTime); if(callBack != null){ - callBack.onFailed(monitorType.toString() + "MMA_URL Failed To Send"); + callBack.onFailed(monitorType.toString() + ":MMA_URL Failed To Send"); } return; } else { @@ -133,9 +132,7 @@ public class SendMessageThread extends Thread { SharedPreferencedUtil.SP_NAME_OTHER, key, failedTime); } } - requestList.remove(key); - } /**