From 34bef16bce9b2a27c975b5e51bb57877aed4f16a Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 10 Nov 2021 14:55:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=BA=A4=E9=80=9A?= =?UTF-8?q?=E4=BA=8B=E6=95=85=E4=BB=BB=E5=8A=A1-GET=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/notice/network/NoticeApiService.java | 7 +++---- .../core/function/notice/network/NoticeNetWorkManager.java | 7 +++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java index a843cf1118..bb9046b992 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java @@ -31,14 +31,13 @@ public interface NoticeApiService { /** - * 反馈对道路事件的操作 + * 反馈对交警事故的操作 * * @param accidentParameters 请求数据(infoID事故ID;sn;status接受状态 0否 1是) * @return {@link BaseData} */ - @FormUrlEncoded - @POST("/deva/accidentInfoManage/policeUpdateTroubleStatus") - Observable sendAcceptStatus(@FieldMap Map accidentParameters); + @GET("/deva/accidentInfoManage/policeUpdateTroubleStatus") + Observable sendAcceptStatus(@QueryMap Map accidentParameters); /** * 获取普通公告详情 diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java index 3e76f0784b..da2585dee1 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java @@ -1,10 +1,12 @@ package com.mogo.eagle.core.function.notice.network; +import android.util.ArrayMap; import android.util.Log; import com.mogo.cloud.network.NetConstants; import com.mogo.cloud.network.RetrofitFactory; import com.mogo.cloud.passport.MoGoAiCloudClient; +import com.mogo.commons.network.ParamsProvider; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.notice.NoticeNormalDetail; import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; @@ -16,6 +18,7 @@ import java.util.HashMap; import java.util.Map; import io.reactivex.Observer; +import io.reactivex.Scheduler; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; @@ -76,7 +79,7 @@ public class NoticeNetWorkManager { @Override public void onError(@NonNull Throwable e) { - Log.d(TAG, "requestAccidentInfo--error"+e.toString()); + Log.d(TAG, "requestAccidentInfo--error" + e.toString()); } @Override @@ -94,7 +97,7 @@ public class NoticeNetWorkManager { * @param status 是否接受 0否 1是 */ public void sendAccidentAcceptStatus(String infoId, String sn, int status) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("sn", sn); map.put("infoId", infoId); map.put("status", String.valueOf(status)); From b7ec9110dc1531619ca7b7e5753ce58afcae35f4 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 10 Nov 2021 15:30:18 +0800 Subject: [PATCH 2/2] opt --- .../core/function/hmi/ui/MoGoHmiFragment.kt | 78 ++++++++++--------- .../res/layout/notice_push_top_banner.xml | 2 +- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 470cad6b88..4dfacb180a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -302,47 +302,49 @@ class MoGoHmiFragment : MvpFragment } override fun showNoticeNormalData(normalData: NoticeNormalData) { - activity.let { - val noticeBannerView = this.context?.let { it1 -> NoticeNormalBannerView(it1) } - noticeBannerView?.setPushData(normalData) - mWarningFloat = it?.let { it1 -> - noticeBannerView?.let { it2 -> - WarningFloat.with(it1) - .setTag(tag) - .setLayout(it2) - .setSidePattern(SidePattern.TOP) - .setCountDownTime(10000) - .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) - .setImmersionStatusBar(true) - .addWarningStatusListener(null) - .addWarningStatusListener(object : IMoGoWarningStatusListener { - override fun onShow() { - // 创建弹窗成功才进行TTS播报 + ThreadUtils.runOnUiThread { + activity.let { + val noticeBannerView = this.context?.let { it1 -> NoticeNormalBannerView(it1) } + noticeBannerView?.setPushData(normalData) + mWarningFloat = it?.let { it1 -> + noticeBannerView?.let { it2 -> + WarningFloat.with(it1) + .setTag(tag) + .setLayout(it2) + .setSidePattern(SidePattern.TOP) + .setCountDownTime(10000) + .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) + .setImmersionStatusBar(true) + .addWarningStatusListener(null) + .addWarningStatusListener(object : IMoGoWarningStatusListener { + override fun onShow() { + // 创建弹窗成功才进行TTS播报 // AIAssist.getInstance(activity) // .speakTTSVoice("") - } - }) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern)?.apply { - interpolator = OvershootInterpolator() - } + } + }) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern)?.apply { + interpolator = OvershootInterpolator() + } - override fun exitAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .show() + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .show() + } } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml index 3fdc9dd4c1..15132bdce4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml @@ -60,7 +60,7 @@ android:layout_marginTop="@dimen/dp_22" android:ellipsize="end" android:gravity="top|left" - android:maxLines="2" + android:maxLines="1" android:paddingRight="@dimen/dp_10" android:text="这是测试数据,当前测试数据是为了查看换行的显示效果,如果最多3行呢,怎么显示的呢" android:textColor="@android:color/white"