From 36a65da78614087a06d3abbf68bd046295c32fa3 Mon Sep 17 00:00:00 2001 From: xiaoyan-5800X Date: Fri, 16 Dec 2022 16:31:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../fragment/ChargingStationFragment.java | 4 ++-- .../navinfo/outdoor/fragment/PoiFragment.java | 2 +- .../navinfo/outdoor/util/PoiSaveUtils.java | 23 +++++++++++-------- .../com/navinfo/outdoor/util/UploadUtils.java | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 58c1a2b..7a679c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 23 targetSdkVersion 30 - versionCode 38 - versionName "8.221214" + versionCode 39 + versionName "8.221216" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 93b7de4..3a3dae7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -1301,7 +1301,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. HttpParams httpParams = new HttpParams(); httpParams.put("auditId", chargingPileEntity.getBodyId()); Response execute = OkGoBuilder.getInstance() - .time(0) + .time(600) .url(HttpInterface.CS_TASK_UP_LOAD_PIC) .params(httpParams) .token(Constant.ACCESS_TOKEN) @@ -1345,7 +1345,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. HttpParams httpParams = new HttpParams(); httpParams.put("auditId", poiEntity.getBodyId()); OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() - .time(0) + .time(600) .Builder(getActivity()) .url(HttpInterface.C_TASK_UP_LOAD_PIC) .cls(PoiUploadBean.class) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 8a08217..fee084a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -1001,7 +1001,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); httpParams.put("auditId", body); OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() - .time(0) + .time(600) .Builder(getActivity()) .url(HttpInterface.POI_TASK_UPLOAD_PIC) .cls(OtherUploadPicBean.class) diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java index 6b2f8c3..42bc32e 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java @@ -110,14 +110,12 @@ public class PoiSaveUtils { poiEntity.setChecked(false); poiEntity.setWork_type(0); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); - sendUploadMessage(poiEntityList.size(), anInt, bInt); } }else { bInt++; poiEntity.setChecked(false); poiEntity.setWork_type(0); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); - sendUploadMessage(poiEntityList.size(), anInt, bInt); } } else { bInt++; @@ -125,10 +123,10 @@ public class PoiSaveUtils { poiEntity.setWork_type(0); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); Constant.submitIdSet.remove(poiEntity.getId()); - sendUploadMessage(poiEntityList.size(), anInt, bInt); } } - }); + }) + .onErrorResumeNext(Observable.empty()); // 处理普通数据 Observable otherObserable = Observable.fromIterable(otherPoiEntityList) .subscribeOn(Schedulers.io()) @@ -143,10 +141,10 @@ public class PoiSaveUtils { poiEntity.setChecked(false); poiEntity.setWork_type(0); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); - sendUploadMessage(poiEntityList.size(), anInt, bInt); } } - }); + }) + .onErrorResumeNext(Observable.empty()); // 处理需要分包上传数据的POI录像和道路数据 Observable spliteFileObserable = Observable.fromIterable(spliteFilePoiEntityList) .subscribeOn(Schedulers.io()) @@ -169,7 +167,6 @@ public class PoiSaveUtils { poiEntity.setChecked(false); poiEntity.setWork_type(0); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); - sendUploadMessage(poiEntityList.size(), anInt, bInt); } } }) @@ -177,6 +174,10 @@ public class PoiSaveUtils { @Override public ObservableSource apply(PoiEntity poiEntity) throws Exception { List photoFileList = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); + if (photoFileList == null||photoFileList.isEmpty()) { + bInt++; + return Observable.empty(); + } return DataSaveUtils.getInstance().getUploadSpliteFilesObservble(mContext, poiEntity, photoFileList) .toObservable(); } @@ -192,11 +193,13 @@ public class PoiSaveUtils { public void accept(Throwable throwable) throws Exception { bInt++; } - }); + }) + .onErrorResumeNext(Observable.empty()); Observable.concat( otherObserable, spliteFileObserable, chargePoiObserable ).subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) + .onErrorResumeNext(Observable.empty()) .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { @@ -530,7 +533,7 @@ public class PoiSaveUtils { HttpParams httpParams = new HttpParams(); httpParams.put("auditId", poiEntity.getBodyId()); Response execute = OkGoBuilder.getInstance() - .time(0) + .time(600) .Builder(mContext) .url(url) .params(httpParams) @@ -718,7 +721,7 @@ public class PoiSaveUtils { HttpParams httpParams = new HttpParams(); httpParams.put("auditId", chargingPileEntity.getBodyId()); Response execute = OkGoBuilder.getInstance() - .time(0) + .time(600) .Builder(mContext) .url(HttpInterface.CS_TASK_UP_LOAD_PIC) .token(Constant.ACCESS_TOKEN) diff --git a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java index d12b6fc..6a86d00 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java @@ -525,7 +525,7 @@ public class UploadUtils { HttpParams httpParams = new HttpParams(); httpParams.put("auditId", chargingPileEntity.getBodyId()); Response execute = OkGoBuilder.getInstance() - .time(0) + .time(600) .url(HttpInterface.CS_TASK_UP_LOAD_PIC) .params(httpParams) .token(Constant.ACCESS_TOKEN)