diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index acad9fe..691358a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,10 +15,12 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifiedResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifiedView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -25,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifiedFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifiedFragment verifiedFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifiedFragment.isRefresh = true; + //刷新之后页码重置 + verifiedFragment.pageIndex = 1; + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } + } + } + @Override public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index acad9fe..691358a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,10 +15,12 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifiedResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifiedView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -25,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifiedFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifiedFragment verifiedFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifiedFragment.isRefresh = true; + //刷新之后页码重置 + verifiedFragment.pageIndex = 1; + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } + } + } + @Override public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index d1b0514..6cb24ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,6 +15,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifyView; @@ -26,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -33,6 +36,7 @@ public class CaseVerifyFragment extends BaseFragment implements ICaseVerifyView { + private static final String TAG = "CaseVerifyFragment"; private Context context; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifyFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifyFragment verifyFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifyFragment.isRefresh = true; + //刷新之后页码重置 + verifyFragment.pageIndex = 1; + verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } + } + } + @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index acad9fe..691358a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,10 +15,12 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifiedResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifiedView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -25,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifiedFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifiedFragment verifiedFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifiedFragment.isRefresh = true; + //刷新之后页码重置 + verifiedFragment.pageIndex = 1; + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } + } + } + @Override public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index d1b0514..6cb24ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,6 +15,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifyView; @@ -26,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -33,6 +36,7 @@ public class CaseVerifyFragment extends BaseFragment implements ICaseVerifyView { + private static final String TAG = "CaseVerifyFragment"; private Context context; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifyFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifyFragment verifyFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifyFragment.isRefresh = true; + //刷新之后页码重置 + verifyFragment.pageIndex = 1; + verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } + } + } + @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index a74131b..d8d17ab 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -48,6 +48,7 @@ public static final int PUSH_MESSAGE_DATA = 12;//透传消息，包含消息的详细数据 public static final int PUSH_CREATE_NOTIFICATION = 13; public static final int LOGIN_OUT = 14; + public static final int CASE_VERIFY_OK = 15; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index acad9fe..691358a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,10 +15,12 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifiedResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifiedView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -25,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifiedFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifiedFragment verifiedFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifiedFragment.isRefresh = true; + //刷新之后页码重置 + verifiedFragment.pageIndex = 1; + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } + } + } + @Override public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index d1b0514..6cb24ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,6 +15,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifyView; @@ -26,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -33,6 +36,7 @@ public class CaseVerifyFragment extends BaseFragment implements ICaseVerifyView { + private static final String TAG = "CaseVerifyFragment"; private Context context; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifyFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifyFragment verifyFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifyFragment.isRefresh = true; + //刷新之后页码重置 + verifyFragment.pageIndex = 1; + verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } + } + } + @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index a74131b..d8d17ab 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -48,6 +48,7 @@ public static final int PUSH_MESSAGE_DATA = 12;//透传消息，包含消息的详细数据 public static final int PUSH_CREATE_NOTIFICATION = 13; public static final int LOGIN_OUT = 14; + public static final int CASE_VERIFY_OK = 15; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 8767b1b..2171a0f 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -86,36 +86,43 @@ if (TextUtils.isEmpty(url)) { return ""; } - //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 - /** - * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg - * - * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" - * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] - * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg - * */ - if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { - //去掉[]和""，并替换\\ - url = url.replace("[", "")//左括号 - .replace("]", "")//右括号 - .replace("\"", "")//双引号 - .replace("\\\\", "\\");//反双斜杠 - } - /** - * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ - * */ - if (url.startsWith("\\") || url.endsWith("\\")) { - url = url.replace("\\", ""); - } - String imagePath; - if (url.contains("http") || url.contains("https")) { - imagePath = url; - } else { + if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); - imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + Log.d(TAG, "媒体路径: " + mediaPath); + return mediaPath; + } else { + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "图片路径: " + imagePath); + return imagePath; } - Log.d(TAG, "appendCompleteURL: " + imagePath); - return imagePath; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index acad9fe..691358a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,10 +15,12 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifiedResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifiedView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -25,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifiedFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifiedFragment verifiedFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifiedFragment.isRefresh = true; + //刷新之后页码重置 + verifiedFragment.pageIndex = 1; + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } + } + } + @Override public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index d1b0514..6cb24ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,6 +15,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifyView; @@ -26,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -33,6 +36,7 @@ public class CaseVerifyFragment extends BaseFragment implements ICaseVerifyView { + private static final String TAG = "CaseVerifyFragment"; private Context context; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifyFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifyFragment verifyFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifyFragment.isRefresh = true; + //刷新之后页码重置 + verifyFragment.pageIndex = 1; + verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } + } + } + @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index a74131b..d8d17ab 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -48,6 +48,7 @@ public static final int PUSH_MESSAGE_DATA = 12;//透传消息，包含消息的详细数据 public static final int PUSH_CREATE_NOTIFICATION = 13; public static final int LOGIN_OUT = 14; + public static final int CASE_VERIFY_OK = 15; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 8767b1b..2171a0f 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -86,36 +86,43 @@ if (TextUtils.isEmpty(url)) { return ""; } - //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 - /** - * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg - * - * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" - * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] - * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg - * */ - if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { - //去掉[]和""，并替换\\ - url = url.replace("[", "")//左括号 - .replace("]", "")//右括号 - .replace("\"", "")//双引号 - .replace("\\\\", "\\");//反双斜杠 - } - /** - * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ - * */ - if (url.startsWith("\\") || url.endsWith("\\")) { - url = url.replace("\\", ""); - } - String imagePath; - if (url.contains("http") || url.contains("https")) { - imagePath = url; - } else { + if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); - imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + Log.d(TAG, "媒体路径: " + mediaPath); + return mediaPath; + } else { + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "图片路径: " + imagePath); + return imagePath; } - Log.d(TAG, "appendCompleteURL: " + imagePath); - return imagePath; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index f2bc047..bc7082e 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -99,6 +99,8 @@ @Field("description") String description, @Field("fieldintro") String fieldintro, @Field("fileIdVerify") String fileIdVerify, + @Field("audioIdVerify") String audioIdVerify, + @Field("videoIdVerify") String videoIdVerify, @Field("bzhours") int bzhours, @Field("bzminis") int bzminis); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index acad9fe..691358a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,10 +15,12 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifiedResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifiedView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -25,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifiedFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifiedFragment verifiedFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifiedFragment.isRefresh = true; + //刷新之后页码重置 + verifiedFragment.pageIndex = 1; + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } + } + } + @Override public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index d1b0514..6cb24ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,6 +15,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifyView; @@ -26,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -33,6 +36,7 @@ public class CaseVerifyFragment extends BaseFragment implements ICaseVerifyView { + private static final String TAG = "CaseVerifyFragment"; private Context context; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifyFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifyFragment verifyFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifyFragment.isRefresh = true; + //刷新之后页码重置 + verifyFragment.pageIndex = 1; + verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } + } + } + @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index a74131b..d8d17ab 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -48,6 +48,7 @@ public static final int PUSH_MESSAGE_DATA = 12;//透传消息，包含消息的详细数据 public static final int PUSH_CREATE_NOTIFICATION = 13; public static final int LOGIN_OUT = 14; + public static final int CASE_VERIFY_OK = 15; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 8767b1b..2171a0f 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -86,36 +86,43 @@ if (TextUtils.isEmpty(url)) { return ""; } - //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 - /** - * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg - * - * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" - * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] - * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg - * */ - if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { - //去掉[]和""，并替换\\ - url = url.replace("[", "")//左括号 - .replace("]", "")//右括号 - .replace("\"", "")//双引号 - .replace("\\\\", "\\");//反双斜杠 - } - /** - * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ - * */ - if (url.startsWith("\\") || url.endsWith("\\")) { - url = url.replace("\\", ""); - } - String imagePath; - if (url.contains("http") || url.contains("https")) { - imagePath = url; - } else { + if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); - imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + Log.d(TAG, "媒体路径: " + mediaPath); + return mediaPath; + } else { + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "图片路径: " + imagePath); + return imagePath; } - Log.d(TAG, "appendCompleteURL: " + imagePath); - return imagePath; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index f2bc047..bc7082e 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -99,6 +99,8 @@ @Field("description") String description, @Field("fieldintro") String fieldintro, @Field("fileIdVerify") String fileIdVerify, + @Field("audioIdVerify") String audioIdVerify, + @Field("videoIdVerify") String videoIdVerify, @Field("bzhours") int bzhours, @Field("bzminis") int bzminis); diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 23adf26..5f51822 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -133,12 +133,13 @@ String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submitCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, bzhours, bzminis); + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); } /** diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 4505ac2..64cb10b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -32,19 +32,15 @@ } @Override - public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, - isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, - casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis); + public Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java index 5e343a8..5ca427a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java @@ -3,9 +3,10 @@ import rx.Subscription; public interface ICaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index cdc3715..274bad3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -21,15 +21,16 @@ } @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis) { + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { view.showProgress(); addSubscription(actionModel.sendRetrofitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, - communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis)); + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java index e0f6a92..fd993c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java @@ -1,11 +1,12 @@ package com.casic.dcms.mvp.presenter; public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, String streetCode, String communityCode, - String gridId, String description, String fieldintro, String fileIdVerify, - int bzhours, int bzminis); + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index dffc81c..a6bf335 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -113,8 +113,6 @@ private List realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -148,33 +146,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @OnClick({R.id.locationMapView, R.id.addImageView, R.id.caseCheckLayout, R.id.submitButton}) @@ -334,14 +305,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } //处理照片 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 9b2dc41..f6e3271 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.handleLayout}) @@ -251,14 +223,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index a3b8c1b..13fc75d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -73,8 +73,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -104,35 +102,11 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } + private static final String TAG = "CaseDetailActivity"; + @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { if (resultBean.isSuccess()) { @@ -225,14 +199,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6622445..1a8170f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -116,8 +116,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -152,33 +150,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -222,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } caseStartTimeView.setText(data.getCreateTime()); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b6c3b77..267cf58 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -195,14 +167,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f2d4cac..a19225c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -76,8 +76,6 @@ private CaseCommonSentencePresenterImpl commonSentencePresenter; private CaseUpdateSupervisePresenterImpl updateSupervisePresenter; private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; private QMUITipDialog submitDialog; @Override @@ -110,33 +108,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @OnClick({R.id.locationMapView, R.id.caseHandleLayout, R.id.caseCommonSentenceLayout, R.id.submitButton}) @@ -221,14 +193,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 712cb11..98cdb0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -68,8 +68,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); private MediaPlayer mediaPlayer; - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -99,33 +97,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -171,14 +143,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1445603..8ceeeda 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -120,7 +120,6 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -594,17 +593,9 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (!TextUtils.isEmpty(audioUrl)) { - mediaList.add(audioUrl); - } - if (!TextUtils.isEmpty(videoUrl)) { - mediaList.add(videoUrl); - } if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; - } else { - mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, @@ -612,7 +603,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 697535f..3b61f0d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -90,7 +90,7 @@ private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private List realPaths = new ArrayList<>();//真是图片路径 - private List mediaList = new ArrayList<>();//上传到服务器的数据集 + private List imageList = new ArrayList<>();//上传到服务器的数据集 private String eorc; private String typeCode; private String typeDetailCode; @@ -352,7 +352,7 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - mediaList.add(url); + imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); @@ -405,7 +405,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (mediaList.size() != 2) { + if (imageList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -415,7 +415,7 @@ gridId.substring(0, 9), gridId.substring(0, 12), gridId, description, fieldIntro, - StringHelper.reformatURL(mediaList), 0, 0); + StringHelper.reformatURL(imageList), "", "", 0, 0); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 4244758..7eaa4ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -70,8 +70,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private MediaPlayer mediaPlayer; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -101,33 +99,7 @@ @Override public void initEvent() { - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } + } @Override @@ -174,14 +146,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index ee5fa85..09fbc75 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -38,6 +38,8 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -141,8 +143,6 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private String audioUrl = ""; - private String videoUrl = ""; @Override public int initLayoutView() { @@ -177,33 +177,6 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); - if (!TextUtils.isEmpty(audioUrl)) { - try { - mediaPlayer.setDataSource(audioUrl); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); - mediaPlayer.prepare(); - } catch (IOException e) { - e.printStackTrace(); - } - caseAudioButton.setChangeAlphaWhenPress(true); - caseAudioButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!mediaPlayer.isPlaying()) { - mediaPlayer.start(); - } - } - }); - } - if (!TextUtils.isEmpty(videoUrl)) { - videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); - videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); - //设置第一帧为封面 - Glide.with(this) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(videoUrl) - .into(videoPlayerView.thumbImageView); - } } @Override @@ -263,14 +236,36 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { caseAudioButton.setVisibility(View.VISIBLE); - this.audioUrl = audioFile; + try { + mediaPlayer.setDataSource(StringHelper.appendCompleteURL(audioFile)); + mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.prepare(); + } catch (IOException e) { + e.printStackTrace(); + } + caseAudioButton.setChangeAlphaWhenPress(true); + caseAudioButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (!mediaPlayer.isPlaying()) { + mediaPlayer.start(); + } + } + }); } //视频 String videoFile = data.getVideoIdVerify(); if (!TextUtils.isEmpty(audioFile)) { videoPlayerView.setVisibility(View.VISIBLE); - this.videoUrl = videoFile; + String videoUrl = StringHelper.appendCompleteURL(videoFile); + videoPlayerView.setUp(videoUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL); + videoPlayerView.tinyBackImageView.setVisibility(View.INVISIBLE); + //设置第一帧为封面 + Glide.with(this) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(videoUrl) + .into(videoPlayerView.thumbImageView); } } } @@ -454,6 +449,9 @@ public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷审核成功", ToastHelper.SUCCESS); + //案卷办完以后通知待办和已办刷新数据 + CaseVerifyFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); + CaseVerifiedFragment.sendEmptyMessage(Constant.CASE_VERIFY_OK); finish(); } else { ToastHelper.showToast("案卷审核失败，请重试", ToastHelper.ERROR); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index acad9fe..691358a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,10 +15,12 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifiedResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifiedView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; @@ -25,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifiedFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifiedFragment verifiedFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifiedFragment.isRefresh = true; + //刷新之后页码重置 + verifiedFragment.pageIndex = 1; + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + } + } + } + @Override public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index d1b0514..6cb24ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; +import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -14,6 +15,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseVerifyView; @@ -26,6 +28,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -33,6 +36,7 @@ public class CaseVerifyFragment extends BaseFragment implements ICaseVerifyView { + private static final String TAG = "CaseVerifyFragment"; private Context context; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,7 @@ */ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; + private static WeakReferenceHandler weakReferenceHandler; @Override protected int initLayoutView() { @@ -63,6 +68,8 @@ protected void initData() { caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); } @Override @@ -86,6 +93,33 @@ }); } + /** + * 供{@link com.casic.dcms.ui.CaseVerifyDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(CaseVerifyFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseVerifyFragment verifyFragment = reference.get(); + if (msg.what == Constant.CASE_VERIFY_OK) { + Log.d(TAG, "核实成功，更新列表"); + verifyFragment.isRefresh = true; + //刷新之后页码重置 + verifyFragment.pageIndex = 1; + verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + } + } + } + @Override public void obtainVerifyListResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index a74131b..d8d17ab 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -48,6 +48,7 @@ public static final int PUSH_MESSAGE_DATA = 12;//透传消息，包含消息的详细数据 public static final int PUSH_CREATE_NOTIFICATION = 13; public static final int LOGIN_OUT = 14; + public static final int CASE_VERIFY_OK = 15; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 8767b1b..2171a0f 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -86,36 +86,43 @@ if (TextUtils.isEmpty(url)) { return ""; } - //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 - /** - * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg - * - * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" - * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] - * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg - * */ - if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { - //去掉[]和""，并替换\\ - url = url.replace("[", "")//左括号 - .replace("]", "")//右括号 - .replace("\"", "")//双引号 - .replace("\\\\", "\\");//反双斜杠 - } - /** - * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ - * */ - if (url.startsWith("\\") || url.endsWith("\\")) { - url = url.replace("\\", ""); - } - String imagePath; - if (url.contains("http") || url.contains("https")) { - imagePath = url; - } else { + if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); - imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + Log.d(TAG, "媒体路径: " + mediaPath); + return mediaPath; + } else { + //TODO 由于之前测试数据，服务器垃圾数据较多，需要根据不同情况拼接图片地址 + /** + * 正确返回值：2021-02\6a4a7784e9be40238f037a03c43a5d7a.jpg + * + * 情况一：["2021-04\\3c46b405c33b4100809b8c800fa914ca.jpeg" + * 情况二："2021-04\\7c2c22005c9c47bdb7dc2c20676c9869.jpeg"] + * 情况三：http://111.198.10.15:11409/static/2021-04/8ccd6d3220fb4d59bae865d6e8be0777.jpeg + * */ + if (url.contains("[") || url.contains("]") || url.contains("\"") || url.contains("\\")) { + //去掉[]和""，并替换\\ + url = url.replace("[", "")//左括号 + .replace("]", "")//右括号 + .replace("\"", "")//双引号 + .replace("\\\\", "\\");//反双斜杠 + } + /** + * 情况四：\http://111.198.10.15:11409/static/2021-04/d78bd724431642e3adb1d78f1d99320b.jpeg\ + * */ + if (url.startsWith("\\") || url.endsWith("\\")) { + url = url.replace("\\", ""); + } + String imagePath; + if (url.contains("http") || url.contains("https")) { + imagePath = url; + } else { + String data = url.replace("\\", "/"); + imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; + } + Log.d(TAG, "图片路径: " + imagePath); + return imagePath; } - Log.d(TAG, "appendCompleteURL: " + imagePath); - return imagePath; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index f2bc047..bc7082e 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -99,6 +99,8 @@ @Field("description") String description, @Field("fieldintro") String fieldintro, @Field("fileIdVerify") String fileIdVerify, + @Field("audioIdVerify") String audioIdVerify, + @Field("videoIdVerify") String videoIdVerify, @Field("bzhours") int bzhours, @Field("bzminis") int bzminis); diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 23adf26..5f51822 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -133,12 +133,13 @@ String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submitCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, bzhours, bzminis); + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); } /** diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index c560140..f2d36c4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -273,7 +273,6 @@ android:paddingVertical="5dp" android:text="播放录音" android:textColor="@color/white" - android:textSize="@dimen/titleFontSize" android:visibility="gone" app:qmui_backgroundColor="@color/mainThemeColor" app:qmui_radius="5dp" />