From 69e4282da7e17e26925c634d0e65746b507db58a Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Mon, 5 Sep 2022 15:16:13 +0800
Subject: [PATCH] =?UTF-8?q?[CrashFix]=E4=BF=AE=E6=AD=A3UploadDataService#C?=
 =?UTF-8?q?oncurrentModificationException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  7 +++-
 .../third/service/UploadDataService.java      | 33 +++++++++++--------
 gradle.properties                             | 24 +++++++-------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/build.gradle b/build.gradle
index a1f1c79..74c954f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,9 @@ buildscript {
     ext.kotlin_version = "1.4.31"
     repositories {
 
+        maven {
+            url 'http://127.0.0.1:9921/nexus/content/repositories/maven_host/'
+        }
         maven {
             url 'http://maven.aliyun.com/nexus/content/groups/public/'
         }
@@ -31,7 +34,9 @@ buildscript {
 
 allprojects {
     repositories {
-
+        maven {
+            url 'http://127.0.0.1:9921/nexus/content/repositories/maven_host/'
+        }
         maven {
             url 'http://maven.aliyun.com/nexus/content/groups/public/'
         }
diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java
index b006fa6..96fc5e1 100644
--- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java
+++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java
@@ -107,9 +107,11 @@ public class UploadDataService extends Service {
     }
 
     private void publishData() {
-        final MogoPayload.MogoCoornateReq coordinateReq = SocketRequestUtil.getCoordinateReq(coordinates);
-        if (coordinateReq != null) {
-            SocketRequestUtil.sendCoordinateReqBySocket(coordinateReq, true, System.currentTimeMillis());
+        synchronized (coordinates) {
+            final MogoPayload.MogoCoornateReq coordinateReq = SocketRequestUtil.getCoordinateReq(coordinates);
+            if (coordinateReq != null) {
+                SocketRequestUtil.sendCoordinateReqBySocket(coordinateReq, true, System.currentTimeMillis());
+            }
         }
     }
 
@@ -130,26 +132,31 @@ public class UploadDataService extends Service {
     private void buildCoordinates(Location location) {
         MogoPayload.Coordinate coordinate = SocketRequestUtil.buildBCoordinate(location);
         if (coordinate.getLat() != 0 && coordinate.getLon() != 0) {
-            if (LocationConfig.isPrintLog) {
-                Logger.d(TAG, "socket-location is " + location.toString());
-                Logger.d(TAG, "socket-coordinates.size()" + coordinates.size());
+//            if (LocationConfig.isPrintLog) {
+//                Logger.d(TAG, "socket-location is " + location.toString());
+//                Logger.d(TAG, "socket-coordinates.size()" + coordinates.size());
+//            }
+            synchronized (coordinates) {
+                coordinates.offer(coordinate);
             }
-            coordinates.offer(coordinate);
         } else {
             if (LocationConfig.isPrintLog) {
                 Logger.d(TAG, "coordinates size is 0, give up uploading for Socket");
             }
         }
-
-        while (coordinates.size() > MAX_LOCATION_CACHE_SIZE) {
-            if (LocationConfig.isPrintLog) {
-                Logger.d(TAG, "socket-coordinates number is " + coordinates.size());
+        synchronized (coordinates) {
+            while (coordinates.size() > MAX_LOCATION_CACHE_SIZE) {
+                if (LocationConfig.isPrintLog) {
+                    Logger.d(TAG, "socket-coordinates number is " + coordinates.size());
+                }
+                coordinates.pop();
             }
-            coordinates.pop();
         }
     }
 
     private void clearLocationCache() {
-        coordinates.clear();
+        synchronized (coordinates) {
+            coordinates.clear();
+        }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index a531027..fe2ec9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,26 +36,26 @@ PASSWORD=xintai2018
 RELEASE=true
 # AI CLOUD 云平台
 # 工具类
-MOGO_UTILS_VERSION=1.4.3.25
+MOGO_UTILS_VERSION=1.4.3.26
 # 网络请求
-MOGO_NETWORK_VERSION=1.4.3.25
+MOGO_NETWORK_VERSION=1.4.3.26
 # 网络DNS
-MOGO_HTTPDNS_VERSION=1.4.3.25
+MOGO_HTTPDNS_VERSION=1.4.3.26
 # 鉴权
-MOGO_PASSPORT_VERSION=1.4.3.25
+MOGO_PASSPORT_VERSION=1.4.3.26
 # 常链接
-MOGO_SOCKET_VERSION=1.4.3.25
+MOGO_SOCKET_VERSION=1.4.3.26
 # 数据采集
-MOGO_REALTIME_VERSION=1.4.3.25
+MOGO_REALTIME_VERSION=1.4.3.26
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.4.3.25
+MOGO_TANLU_VERSION=1.4.3.26
 # 直播推流
-MOGO_LIVE_VERSION=1.4.3.25
+MOGO_LIVE_VERSION=1.4.3.26
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.4.3.25
+MOGO_TRAFFICLIVE_VERSION=1.4.3.26
 # 定位服务
-MOGO_LOCATION_VERSION=1.4.3.25
+MOGO_LOCATION_VERSION=1.4.3.26
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.4.3.25
+MOGO_TELEMATIC_VERSION=1.4.3.26
 # v2x
-MOGO_V2X_VERSION=1.4.3.25
+MOGO_V2X_VERSION=1.4.3.26