Merge branch 'lk' into dev_MogoAP_eagle-1030_211020_8.0.14

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java

@@ -37,6 +37,7 @@ import java.util.ArrayList;
 /**
  * @author liujing
  * @description 交警事故详情弹框
+ * http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=66917475 根据infoId获取事故详情
  * @since: 10/26/21
  */
 public class NoticeTrafficDialog extends BaseFloatDialog {
@@ -363,7 +364,6 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
             @Override
             public void callBackWithResult(NoticeTrafficStyleInfo trafficInfo) {
                 Log.d(TAG, "交通事故详情::" + trafficInfo);
-                trafficInfo.setPoiType("交通事故");
                 trafficInfo.setOperaStatus("已处理");
                 trafficInfo.setTroubleReasonName("逆向");
                 mTrafficStyleInfo = trafficInfo;
@@ -418,7 +418,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
 
         NoticeValue style = new NoticeValue();
         style.setKey("事故类型：");
-        style.setValue("交通事故");
+        style.setValue(info.getTroubleTypeName());
         dataArrayList.add(style);
 
         adapter.setData(dataArrayList);

core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt

@@ -41,7 +41,7 @@ class TestNoticeBroadcastReceiver : BroadcastReceiver() {
             val video: String = "https://view.2amok.com/20200219/012d8e2a55f227e90d76056bb6aab5e4.mp4"
             pushData.poiImgUrl = video
             pushData.type = 1
-            pushData.infoId = "908763906227642368"
+            pushData.infoId = "909755160571400192"
             CallerHmiManager.showTrafficBanner(pushData)
         }
     }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java

@@ -17,6 +17,7 @@ public class NoticeTrafficStyleInfo extends BaseData {
     private String operaStatus;//事故处理状态
     private String troubleReasonName;//事故原因
     private String uploadAddress;//事故地点名称
+    private String troubleTypeName;//事故等级描述
     private double lat;//纬度
     private double lon;//经度
 
@@ -92,6 +93,14 @@ public class NoticeTrafficStyleInfo extends BaseData {
         this.lon = lon;
     }
 
+    public String getTroubleTypeName() {
+        return troubleTypeName;
+    }
+
+    public void setTroubleTypeName(String troubleTypeName) {
+        this.troubleTypeName = troubleTypeName;
+    }
+
     @Override
     public String toString() {
         return "NoticeTrafficStyleInfo{" +
@@ -102,6 +111,7 @@ public class NoticeTrafficStyleInfo extends BaseData {
                 ", operaStatus='" + operaStatus + '\'' +
                 ", troubleReasonName='" + troubleReasonName + '\'' +
                 ", uploadAddress='" + uploadAddress + '\'' +
+                ", troubleTypeName='" + troubleTypeName + '\'' +
                 ", lat=" + lat +
                 ", lon=" + lon +
                 '}';