diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..b6f0c5b --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +departmentclient \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e6ee875..fce5d40 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 7c7f635..db2e4fb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,16 @@ - + + + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java index ac68b62..d40d032 100644 --- a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java +++ b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java @@ -62,6 +62,7 @@ import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -115,6 +116,8 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { TextureMapView mTmvMap; @BindView(R2.id.iv_cover) ImageView mIvCover; + @BindView(R2.id.tv_report_name) + TextView mTvReportName; private Unbinder mBind; private String mTaskId; private int mLevel; @@ -198,9 +201,9 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { switch (bean.getId()) { case "LOG"://日志 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) - .withString("businessId", mDetailBean.getBusinessId()) - .navigation(); + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) + .withString("businessId", mDetailBean.getBusinessId()) + .navigation(); break; case "SAMPLE"://标杆事件 doSampleIncident(); @@ -291,10 +294,10 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { mBitMap = BitmapDescriptorFactory.fromResource(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker); } MarkerOptions markerOptions = new MarkerOptions() - .position(new LatLng(lat, lng))//mark出现的位置 - .icon(mBitMap) //mark图标 - .draggable(false)//mark可拖拽 - .animateType(MarkerOptions.MarkerAnimateType.none); + .position(new LatLng(lat, lng))//mark出现的位置 + .icon(mBitMap) //mark图标 + .draggable(false)//mark可拖拽 + .animateType(MarkerOptions.MarkerAnimateType.none); mBaiduMap.addOverlay(markerOptions); } @@ -306,39 +309,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doSampleIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doSampleIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("SAMPLE"); - bean1.setName("标杆事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("SAMPLE"); + bean1.setName("标杆事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -349,39 +352,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doCollectIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doCollectIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("COLLECT"); - bean1.setName("收藏事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("COLLECT"); + bean1.setName("收藏事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -392,39 +395,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doWarningIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doWarningIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("WARNING"); - bean1.setName("预警事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("WARNING"); + bean1.setName("预警事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -435,39 +438,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doDifficultIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doDifficultIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("DIFFICULT"); - bean1.setName("疑难事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("DIFFICULT"); + bean1.setName("疑难事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } private RequestBody buildStateParams() { @@ -487,35 +490,35 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); dialog.show(); RetrofitManager.getInstance() - .create(DeptApis.class) - .doIncidentAccept(mReportId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(DeptApis.class) + .doIncidentAccept(mReportId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("处理成功"); - setResult(13); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("处理成功"); + setResult(13); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -526,35 +529,35 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); dialog.show(); RetrofitManager.getInstance() - .create(DeptApis.class) - .doIncidentAbolish(mReportId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(DeptApis.class) + .doIncidentAbolish(mReportId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("处理成功"); - setResult(13); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("处理成功"); + setResult(13); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } @@ -574,32 +577,32 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { */ private void getDetailData() { RetrofitManager.getInstance() - .create(GridApis.class) - .getIncidentDetailById(mReportId, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .getIncidentDetailById(mReportId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull IncidentDetailBean incidentListBean) { - setDataToView(incidentListBean); - } + @Override + public void onNext(@NonNull IncidentDetailBean incidentListBean) { + setDataToView(incidentListBean); + } - @Override - public void onError(@NonNull Throwable e) { - ExceptionHandler.handleException(e); - refreshView(STATE_LOAD_ERROR); - } + @Override + public void onError(@NonNull Throwable e) { + ExceptionHandler.handleException(e); + refreshView(STATE_LOAD_ERROR); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -658,6 +661,7 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { mRlvTags.setVisibility(View.GONE); } mTvGrid.setText(b.getBGId()); + mTvReportName.setText(b.getCreatorName()); mTvComponent.setText(b.getCasePartsObjName()); mTvType.setText(b.getCaseTypeName1() + "/" + b.getCaseTypeName2()); if (b.getIsSelf() == 0) { @@ -683,10 +687,10 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); mRlvPhotos.setAdapter(mAdapter); mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) - .withStringArrayList("imgUrls", paths) - .withInt("curItem", pos) - .navigation()); + .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) + .withStringArrayList("imgUrls", paths) + .withInt("curItem", pos) + .navigation()); for (String doorId : doorIds) { if (!TextUtils.isEmpty(doorId)) { paths.add(BaseUrlApi.BASE_IMG_URL + doorId); @@ -702,19 +706,19 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { //有视频 mLlVideo.setVisibility(View.VISIBLE); mLlVideo.setOnClickListener(v -> //播放视频 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) - .withString("url", BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) - .withString("title", "事件视频") - .navigation()); + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) + .withString("url", BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) + .withString("title", "事件视频") + .navigation()); Glide.with(mActivity) - .setDefaultRequestOptions( - new RequestOptions() - .frame(0) - .centerCrop() - ) - .load(BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) - .into(mIvCover); + .setDefaultRequestOptions( + new RequestOptions() + .frame(0) + .centerCrop() + ) + .load(BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) + .into(mIvCover); } else { //没有视频 mLlVideo.setVisibility(View.GONE); @@ -728,11 +732,11 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity { AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground(); animationDrawable.start(); MediaManager.playSound(path, - mp -> { - animationDrawable.selectDrawable(0);//显示动画第一帧 - animationDrawable.stop(); - MediaManager.destroy(); - }); + mp -> { + animationDrawable.selectDrawable(0);//显示动画第一帧 + animationDrawable.stop(); + MediaManager.destroy(); + }); } }); } else { diff --git a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java index 2cbe23d..185caed 100644 --- a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java +++ b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java @@ -69,6 +69,7 @@ import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -161,6 +162,8 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { TextureMapView mTmvMap; @BindView(R2.id.iv_cover) ImageView mIvCover; + @BindView(R2.id.tv_report_name) + TextView mTvReportName; private Unbinder mBind; private IncidentDetailBean mIncidentDetailBean; private String mReportId; @@ -278,10 +281,10 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { mBitMap = BitmapDescriptorFactory.fromResource(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker); } MarkerOptions markerOptions = new MarkerOptions() - .position(new LatLng(lat, lng))//mark出现的位置 - .icon(mBitMap) //mark图标 - .draggable(false)//mark可拖拽 - .animateType(MarkerOptions.MarkerAnimateType.none); + .position(new LatLng(lat, lng))//mark出现的位置 + .icon(mBitMap) //mark图标 + .draggable(false)//mark可拖拽 + .animateType(MarkerOptions.MarkerAnimateType.none); mBaiduMap.addOverlay(markerOptions); } @@ -294,35 +297,35 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); dialog.show(); RetrofitManager.getInstance() - .create(DeptApis.class) - .doIncidentDeptCheckUnPass(mReportId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + .create(DeptApis.class) + .doIncidentDeptCheckUnPass(mReportId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { - } + } - @Override - public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("处理成功"); - setResult(13); - finish(); - } + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("处理成功"); + setResult(13); + finish(); + } - @Override - public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } } @@ -335,9 +338,9 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { switch (bean.getId()) { case "LOG"://日志 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) - .withString("businessId", mIncidentDetailBean.getBusinessId()) - .navigation(); + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) + .withString("businessId", mIncidentDetailBean.getBusinessId()) + .navigation(); break; case "SAMPLE"://标杆事件 doSampleIncident(); @@ -365,39 +368,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doSampleIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + .create(GridApis.class) + .doSampleIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { - } + } - @Override - public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("SAMPLE"); - bean1.setName("标杆事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("SAMPLE"); + bean1.setName("标杆事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -408,39 +411,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doCollectIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + .create(GridApis.class) + .doCollectIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { - } + } - @Override - public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("COLLECT"); - bean1.setName("收藏事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("COLLECT"); + bean1.setName("收藏事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -451,39 +454,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doWarningIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + .create(GridApis.class) + .doWarningIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { - } + } - @Override - public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("WARNING"); - bean1.setName("预警事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("WARNING"); + bean1.setName("预警事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -494,39 +497,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { RequestBody body = buildStateParams(); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doDifficultIncident(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + .create(GridApis.class) + .doDifficultIncident(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { - } + } - @Override - public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("操作成功"); - OperateBean bean1 = new OperateBean(); - bean1.setSel(false); - bean1.setId("DIFFICULT"); - bean1.setName("疑难事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); - mOperates.remove(bean1); - } + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("操作成功"); + OperateBean bean1 = new OperateBean(); + bean1.setSel(false); + bean1.setId("DIFFICULT"); + bean1.setName("疑难事件"); + bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); + mOperates.remove(bean1); + } - @Override - public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } private RequestBody buildStateParams() { @@ -547,35 +550,35 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); dialog.show(); RetrofitManager.getInstance() - .create(DeptApis.class) - .doIncidentDeptCheckPass(mReportId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + .create(DeptApis.class) + .doIncidentDeptCheckPass(mReportId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { - } + } - @Override - public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("处理成功"); - setResult(13); - finish(); - } + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("处理成功"); + setResult(13); + finish(); + } - @Override - public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } } @@ -611,55 +614,55 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { */ private void getDetailData() { Observable dispatchInfo = RetrofitManager.getInstance() - .create(GridApis.class) - .getDispatchDetailById(mTaskId, UserLgUtils.getToken()) - .compose(RxTransformer.getTransformer()); + .create(GridApis.class) + .getDispatchDetailById(mTaskId, UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()); Observable handleInfo = RetrofitManager.getInstance() - .create(GridApis.class) - .getHandleDetailByHandleId(mTaskId, UserLgUtils.getToken()) - .compose(RxTransformer.getTransformer()); + .create(GridApis.class) + .getHandleDetailByHandleId(mTaskId, UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()); Observable incidentDetail = RetrofitManager.getInstance() - .create(GridApis.class) - .getIncidentDetailById(mReportId, UserLgUtils.getToken()) - .compose(RxTransformer.getTransformer()); + .create(GridApis.class) + .getIncidentDetailById(mReportId, UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()); Observable.mergeDelayError(dispatchInfo, handleInfo, incidentDetail) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { - - } - - @Override - public void onNext(@NonNull Object o) { - if (o instanceof IncidentHandleDetailBean) { - //处理详情 - mHandleDetail = (IncidentHandleDetailBean) o; - setHandleDetail(); - } else if (o instanceof IncidentDetailBean) { - //事件详情 - mIncidentDetailBean = (IncidentDetailBean) o; - setIncidentDetailToView(); - } else if (o instanceof DispatchDetailBean) { - //派遣信息 - mDispatchInfo = (DispatchDetailBean) o; - setDispatchInfoToView(); + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { } - refreshView(STATE_LOAD_SUCCESS); - } - @Override - public void onError(@NonNull Throwable e) { - ExceptionHandler.handleException(e); - refreshView(STATE_LOAD_ERROR); - } + @Override + public void onNext(@NonNull Object o) { + if (o instanceof IncidentHandleDetailBean) { + //处理详情 + mHandleDetail = (IncidentHandleDetailBean) o; + setHandleDetail(); + } else if (o instanceof IncidentDetailBean) { + //事件详情 + mIncidentDetailBean = (IncidentDetailBean) o; + setIncidentDetailToView(); + } else if (o instanceof DispatchDetailBean) { + //派遣信息 + mDispatchInfo = (DispatchDetailBean) o; + setDispatchInfoToView(); - @Override - public void onComplete() { + } + refreshView(STATE_LOAD_SUCCESS); + } - } - }); + @Override + public void onError(@NonNull Throwable e) { + ExceptionHandler.handleException(e); + refreshView(STATE_LOAD_ERROR); + } + + @Override + public void onComplete() { + + } + }); } @@ -702,10 +705,10 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { mRlvHandlePhoto.setLayoutManager(new GridLayoutManager(mActivity, 4)); mRlvHandlePhoto.setAdapter(mAdapter); mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) - .withStringArrayList("imgUrls", paths) - .withInt("curItem", pos) - .navigation()); + .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) + .withStringArrayList("imgUrls", paths) + .withInt("curItem", pos) + .navigation()); for (String doorId : doorIds) { if (!TextUtils.isEmpty(doorId)) { paths.add(BaseUrlApi.BASE_IMG_URL + doorId); @@ -754,6 +757,7 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { mRlvTags.setVisibility(View.GONE); } mTvGrid.setText(mIncidentDetailBean.getBGId()); + mTvReportName.setText(mIncidentDetailBean.getCreatorName()); mTvComponent.setText(mIncidentDetailBean.getCasePartsObjName()); mTvType.setText(mIncidentDetailBean.getCaseTypeName1() + "/" + mIncidentDetailBean.getCaseTypeName2()); if (mIncidentDetailBean.getIsSelf() == 0) { @@ -779,10 +783,10 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); mRlvPhotos.setAdapter(mAdapter); mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) - .withStringArrayList("imgUrls", paths) - .withInt("curItem", pos) - .navigation()); + .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) + .withStringArrayList("imgUrls", paths) + .withInt("curItem", pos) + .navigation()); for (String doorId : doorIds) { if (!TextUtils.isEmpty(doorId)) { paths.add(BaseUrlApi.BASE_IMG_URL + doorId); @@ -798,19 +802,19 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { //有视频 mLlVideo.setVisibility(View.VISIBLE); mLlVideo.setOnClickListener(v -> //播放视频 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) - .withString("url", BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo()) - .withString("title", "事件视频") - .navigation()); + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) + .withString("url", BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo()) + .withString("title", "事件视频") + .navigation()); Glide.with(mActivity) - .setDefaultRequestOptions( - new RequestOptions() - .frame(0) - .centerCrop() - ) - .load(BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo()) - .into(mIvCover); + .setDefaultRequestOptions( + new RequestOptions() + .frame(0) + .centerCrop() + ) + .load(BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo()) + .into(mIvCover); } else { //没有视频 @@ -825,11 +829,11 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity { AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground(); animationDrawable.start(); MediaManager.playSound(path, - mp -> { - animationDrawable.selectDrawable(0);//显示动画第一帧 - animationDrawable.stop(); - MediaManager.destroy(); - }); + mp -> { + animationDrawable.selectDrawable(0);//显示动画第一帧 + animationDrawable.stop(); + MediaManager.destroy(); + }); } }); } else { diff --git a/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml b/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml index 55204b2..ccee02f 100644 --- a/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml +++ b/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml @@ -89,6 +89,22 @@ style="@style/item_content" android:hint="未录入" /> + + + + + + + + + diff --git a/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml b/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml index 040c416..2771759 100644 --- a/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml +++ b/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml @@ -93,6 +93,22 @@ style="@style/item_content" android:hint="未录入" /> + + + + + + + + +