Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/mogo/cloud/MoGoApplication.java

.idea/gradle.xml

@@ -26,6 +26,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

gradle.properties

@@ -40,7 +40,7 @@ MOGO_PASSPORT_VERSION=1.0.51
 # 常链接
 MOGO_SOCKET_VERSION=1.0.51
 # 数据采集
-MOGO_REALTIME_VERSION=1.0.51
+MOGO_REALTIME_VERSION=1.0.52
 # 探路，道路事件发布，获取
 MOGO_TANLU_VERSION=1.0.51
 # 直播推流

modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudRoadData.java

@@ -246,4 +246,24 @@ public class CloudRoadData implements Parcelable {
     }
 
 
+    @Override
+    public String toString() {
+        return "CloudRoadData{" +
+                "type=" + type +
+                ", fromType=" + fromType +
+                ", lat=" + lat +
+                ", lon=" + lon +
+                ", uuid='" + uuid + '\'' +
+                ", sn='" + sn + '\'' +
+                ", speed=" + speed +
+                ", heading=" + heading +
+                ", systemTime=" + systemTime +
+                ", satelliteTime=" + satelliteTime +
+                ", lightStatus=" + lightStatus +
+                ", lightLeftTime=" + lightLeftTime +
+                ", rtmpUrl='" + rtmpUrl + '\'' +
+                ", distance=" + distance +
+                ", coordinates=" + coordinates +
+                '}';
+    }
 }

modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/FrequencyData.java

@@ -60,4 +60,14 @@ public class FrequencyData {
     public void setType(int type) {
         this.type = type;
     }
+
+    @Override
+    public String toString() {
+        return "FrequencyData{" +
+                "unit=" + unit +
+                ", collectionInterval=" + collectionInterval +
+                ", reportStartTime=" + reportStartTime +
+                ", type=" + type +
+                '}';
+    }
 }