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

Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
This commit is contained in:
donghongyu
2021-11-10 19:11:54 +08:00
parent cc7870fa9f b7ec9110dc
commit 756788ae7d
4 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java
View File

@@ -31,14 +31,13 @@ public interface NoticeApiService {
/**
* 反馈对道路事件的操作
* 反馈对交警事故的操作
*
* @param accidentParameters 请求数据(infoID事故ID;sn;status接受状态 0否 1是)
* @return {@link BaseData}
*/
@FormUrlEncoded
@POST("/deva/accidentInfoManage/policeUpdateTroubleStatus")
Observable<BaseData> sendAcceptStatus(@FieldMap Map<String, String> accidentParameters);
@GET("/deva/accidentInfoManage/policeUpdateTroubleStatus")
Observable<BaseData> sendAcceptStatus(@QueryMap Map<String, String> accidentParameters);
/**
* 获取普通公告详情

7
core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java
View File

@@ -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<String, String> map = new HashMap<>();
Map<String, String> map = new ArrayMap<>();
map.put("sn", sn);
map.put("infoId", infoId);
map.put("status", String.valueOf(status));