Merge branch 'dev2_aiSdk_datalink' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk_datalink

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java

@@ -68,18 +68,15 @@ public class V2XWarningEntity implements Serializable {
 
     public void setTts(int type) {
         switch (type) {
-            case 0:
+            case 1:
+            case 11:
                 this.tts = "注意行人";
                 break;
-            case 1:
+            case 2:
                 this.tts = "注意自行车";
                 break;
-            case 2:
-                this.tts = "注意摩托车";
-                break;
-            case 3:
             case 4:
-                this.tts = "注意前方车辆";
+                this.tts = "注意摩托车";
                 break;
             default:
                 break;
@@ -213,10 +210,11 @@ public class V2XWarningEntity implements Serializable {
 
 
     public String getTts() {
-        if (tts == null) {
+        if (warningContent == null) {
             setTts(type);
+            return tts;
         }
-        return tts;
+        return warningContent;
     }
 
     public double getStopLineDistance() {