yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liujing
2021-10-29 16:59:55 +08:00
parent 847e4bb926 62f6609eaf
commit c3c1135a41
11 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
View File

@@ -9,7 +9,7 @@ import android.view.animation.OvershootInterpolator
import com.mogo.commons.mvp.MvpFragment
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.data.notice.NoticePushData
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.notification.WarningFloat
@@ -210,9 +210,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
/**
* 展示云公告顶部弹窗
* @param pushData
* @param trafficStylePushData
*/
override fun showNoticeForTrafficWithData(pushData: NoticePushData) {
override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) {
activity.let {
val noticeBannerView = this.getContext()?.let { it1 -> NoticeBannerView(it1) }

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt
View File

@@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui
import com.mogo.commons.mvp.IView
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.data.notice.NoticePushData
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
@@ -99,8 +99,8 @@ interface MoGoWarningContract {
/**
* 展示云公告顶部弹窗
* @param pushData
* @param trafficStylePushData
*/
fun showNoticeForTrafficWithData(pushData: NoticePushData)
fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData)
}
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java
View File

@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.eagle.core.data.notice.NoticeTrafficInfo;
import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo;
import com.mogo.eagle.core.function.hmi.R;
/**
@@ -61,7 +61,7 @@ public class NoticeBannerView extends ConstraintLayout {
}
//数据改变刷新UI
public void pushBeanChanged(NoticeTrafficInfo info){
public void pushBeanChanged(NoticeTrafficStyleInfo info){
}
}

4
core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java
View File

@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.eagle.core.data.notice.NoticeNormalData;
import com.mogo.eagle.core.data.notice.NoticePushData;
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData;
import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider;
import com.mogo.eagle.core.function.hmi.ui.MoGoHmiFragment;
@@ -54,7 +54,7 @@ public class NoticeProvider implements IMoGoNoticeProvider {
}
@Override
public void showNoticeForTrafficWithData(NoticePushData pushData) {
public void showNoticeForTrafficWithData(NoticeTrafficStylePushData pushData) {
mMoGoHmiFragment.showNoticeForTrafficWithData(pushData);
}

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

@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.notice.test
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.mogo.eagle.core.data.notice.NoticePushData
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.utils.logger.Logger
@@ -30,7 +30,7 @@ class TestNoticeBroadcastReceiver: BroadcastReceiver() {
private fun dispatchSceneTest(sceneType: Int) {
if (sceneType == 301001) {
val pushData = NoticePushData()
val pushData = NoticeTrafficStylePushData()
pushData.msg = "交警测试公告"
pushData.content = "交警测试公告内容"
CallerHmiManager.showTrafficBanner(pushData)

1
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalDetailData.kt
View File

@@ -18,5 +18,4 @@ data class NoticeNormalDetailData(
var videoUrl: String = "", //视频地址
var fileType: Int = 0, // 1图片，2视频
val tts: String = "", //语音播报词
)

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficInfo.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java
View File

@@ -7,7 +7,7 @@ import java.io.Serializable;
* @description 交通事故任务详情数据bean
* @since: 10/26/21
*/
public class NoticeTrafficInfo implements Serializable {
public class NoticeTrafficStyleInfo implements Serializable {
private String infoId;//事故id
private String poiType;//事故类型
private long dataCreateTime;//事故发生时间

23
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticePushData.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStylePushData.java
View File

@@ -5,10 +5,11 @@ package com.mogo.eagle.core.data.notice;
* @description 交警任务公告推送消息体
* @since: 10/28/21
*/
public class NoticePushData {
public class NoticeTrafficStylePushData {
private String msg;
private String infoId;
private String imageUrl;
private String poiImgUrl;
private String title;
private String isVideo;
private String content;
@@ -28,12 +29,20 @@ public class NoticePushData {
this.infoId = infoId;
}
public String getImageUrl() {
return imageUrl;
public String getTitle() {
return title;
}
public void setImageUrl(String imageUrl) {
this.imageUrl = imageUrl;
public void setTitle(String title) {
this.title = title;
}
public String getPoiImgUrl() {
return poiImgUrl;
}
public void setPoiImgUrl(String poiImgUrl) {
this.poiImgUrl = poiImgUrl;
}
public String getIsVideo() {
@@ -57,7 +66,7 @@ public class NoticePushData {
return "NoticePushData{" +
"msg='" + msg + '\'' +
", infoId='" + infoId + '\'' +
", imageUrl='" + imageUrl + '\'' +
", imageUrl='" + poiImgUrl + '\'' +
", isVideo='" + isVideo + '\'' +
", content='" + content + '\'' +
'}';

4
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/notice/IMoGoNoticeProvider.java
View File

@@ -1,7 +1,7 @@
package com.mogo.eagle.core.function.api.notice;
import com.mogo.eagle.core.data.notice.NoticeNormalData;
import com.mogo.eagle.core.data.notice.NoticePushData;
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData;
import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
/**
@@ -16,7 +16,7 @@ public interface IMoGoNoticeProvider extends IMoGoFunctionProvider {
*
* @param pushData 推送消息体
*/
void showNoticeForTrafficWithData(NoticePushData pushData);
void showNoticeForTrafficWithData(NoticeTrafficStylePushData pushData);
/**
* 呈现普通公告顶部弹框

8
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
View File

@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.call.hmi
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.data.notice.NoticeNormalData
import com.mogo.eagle.core.data.notice.NoticePushData
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider
@@ -132,10 +132,10 @@ object CallerHmiManager : CallerBase() {
/**
* 呈现交通云公告弹窗(hmi)
*
* @param pushData
* @param trafficStylePushData
*/
fun showTrafficBanner(pushData: NoticePushData?) {
noticeProviderApi.showNoticeForTrafficWithData(pushData)
fun showTrafficBanner(trafficStylePushData: NoticeTrafficStylePushData?) {
noticeProviderApi.showNoticeForTrafficWithData(trafficStylePushData)
}
/**

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/notice/CallerNoticeManager.java
View File

@@ -1,6 +1,5 @@
package com.mogo.eagle.core.function.call.notice;
import com.mogo.eagle.core.data.notice.NoticePushData;
import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider;
import com.mogo.eagle.core.function.call.base.CallerBase;