gaojian/app_department
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

事件添加上报人

Browse Source
This commit is contained in:
itgaojian163 2022-10-03 10:44:36 +08:00
parent bd54c45b5c
commit 9c6287176f
9 changed files with 495 additions and 456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.name Normal file
View File

@ -0,0 +1 @@
departmentclient

2
.idea/compiler.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="1.8" />
</component> </component>
</project> </project>

3
.idea/gradle.xml
View File

@ -5,7 +5,7 @@
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="delegatedBuild" value="true" /> <option name="delegatedBuild" value="true" />
<option name="testRunner" value="PLATFORM" /> <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">
@ -21,7 +21,6 @@
<option value="$PROJECT_DIR$/supervisionmodule" /> <option value="$PROJECT_DIR$/supervisionmodule" />
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

11
.idea/misc.xml
View File

@ -5,7 +5,16 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="commonmodule/src/main/res/layout/activity_incident_detail.xml" value="0.2504528985507246" />
<entry key="supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml" value="0.3591485507246377" />
<entry key="supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml" value="0.3591485507246377" />
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

10
.idea/runConfigurations.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

422
supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java
View File

@ -62,6 +62,7 @@ import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.Unbinder; import butterknife.Unbinder;
@ -115,6 +116,8 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
TextureMapView mTmvMap; TextureMapView mTmvMap;
@BindView(R2.id.iv_cover) @BindView(R2.id.iv_cover)
ImageView mIvCover; ImageView mIvCover;
@BindView(R2.id.tv_report_name)
TextView mTvReportName;
private Unbinder mBind; private Unbinder mBind;
private String mTaskId; private String mTaskId;
private int mLevel; private int mLevel;
@ -198,9 +201,9 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
switch (bean.getId()) { switch (bean.getId()) {
case "LOG"://日志 case "LOG"://日志
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG)
.withString("businessId", mDetailBean.getBusinessId()) .withString("businessId", mDetailBean.getBusinessId())
.navigation(); .navigation();
break; break;
case "SAMPLE"://标杆事件 case "SAMPLE"://标杆事件
doSampleIncident(); doSampleIncident();
@ -291,10 +294,10 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
mBitMap = BitmapDescriptorFactory.fromResource(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker); mBitMap = BitmapDescriptorFactory.fromResource(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
} }
MarkerOptions markerOptions = new MarkerOptions() MarkerOptions markerOptions = new MarkerOptions()
.position(new LatLng(lat, lng))//mark出现的位置 .position(new LatLng(lat, lng))//mark出现的位置
.icon(mBitMap) //mark图标 .icon(mBitMap) //mark图标
.draggable(false)//mark可拖拽 .draggable(false)//mark可拖拽
.animateType(MarkerOptions.MarkerAnimateType.none); .animateType(MarkerOptions.MarkerAnimateType.none);
mBaiduMap.addOverlay(markerOptions); mBaiduMap.addOverlay(markerOptions);
} }
@ -306,39 +309,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doSampleIncident(body, UserLgUtils.getToken()) .doSampleIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull SuccessBean successBean) { public void onNext(@NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("SAMPLE"); bean1.setId("SAMPLE");
bean1.setName("标杆事件"); bean1.setName("标杆事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -349,39 +352,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doCollectIncident(body, UserLgUtils.getToken()) .doCollectIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull SuccessBean successBean) { public void onNext(@NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("COLLECT"); bean1.setId("COLLECT");
bean1.setName("收藏事件"); bean1.setName("收藏事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -392,39 +395,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doWarningIncident(body, UserLgUtils.getToken()) .doWarningIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull SuccessBean successBean) { public void onNext(@NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("WARNING"); bean1.setId("WARNING");
bean1.setName("预警事件"); bean1.setName("预警事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -435,39 +438,39 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doDifficultIncident(body, UserLgUtils.getToken()) .doDifficultIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull SuccessBean successBean) { public void onNext(@NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("DIFFICULT"); bean1.setId("DIFFICULT");
bean1.setName("疑难事件"); bean1.setName("疑难事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
private RequestBody buildStateParams() { private RequestBody buildStateParams() {
@ -487,35 +490,35 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中...");
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(DeptApis.class) .create(DeptApis.class)
.doIncidentAccept(mReportId, body, UserLgUtils.getToken()) .doIncidentAccept(mReportId, body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull SuccessBean successBean) { public void onNext(@NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("处理成功"); ToastUtils.show("处理成功");
setResult(13); setResult(13);
finish(); finish();
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -526,35 +529,35 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中...");
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(DeptApis.class) .create(DeptApis.class)
.doIncidentAbolish(mReportId, body, UserLgUtils.getToken()) .doIncidentAbolish(mReportId, body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull SuccessBean successBean) { public void onNext(@NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("处理成功"); ToastUtils.show("处理成功");
setResult(13); setResult(13);
finish(); finish();
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
@ -574,32 +577,32 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
*/ */
private void getDetailData() { private void getDetailData() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.getIncidentDetailById(mReportId, UserLgUtils.getToken()) .getIncidentDetailById(mReportId, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<IncidentDetailBean>() { .subscribe(new Observer<IncidentDetailBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull IncidentDetailBean incidentListBean) { public void onNext(@NonNull IncidentDetailBean incidentListBean) {
setDataToView(incidentListBean); setDataToView(incidentListBean);
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
refreshView(STATE_LOAD_ERROR); refreshView(STATE_LOAD_ERROR);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -658,6 +661,7 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
mRlvTags.setVisibility(View.GONE); mRlvTags.setVisibility(View.GONE);
} }
mTvGrid.setText(b.getBGId()); mTvGrid.setText(b.getBGId());
mTvReportName.setText(b.getCreatorName());
mTvComponent.setText(b.getCasePartsObjName()); mTvComponent.setText(b.getCasePartsObjName());
mTvType.setText(b.getCaseTypeName1() + "/" + b.getCaseTypeName2()); mTvType.setText(b.getCaseTypeName1() + "/" + b.getCaseTypeName2());
if (b.getIsSelf() == 0) { if (b.getIsSelf() == 0) {
@ -683,10 +687,10 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4));
mRlvPhotos.setAdapter(mAdapter); mRlvPhotos.setAdapter(mAdapter);
mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance() mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG)
.withStringArrayList("imgUrls", paths) .withStringArrayList("imgUrls", paths)
.withInt("curItem", pos) .withInt("curItem", pos)
.navigation()); .navigation());
for (String doorId : doorIds) { for (String doorId : doorIds) {
if (!TextUtils.isEmpty(doorId)) { if (!TextUtils.isEmpty(doorId)) {
paths.add(BaseUrlApi.BASE_IMG_URL + doorId); paths.add(BaseUrlApi.BASE_IMG_URL + doorId);
@ -702,19 +706,19 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
//有视频 //有视频
mLlVideo.setVisibility(View.VISIBLE); mLlVideo.setVisibility(View.VISIBLE);
mLlVideo.setOnClickListener(v -> //播放视频 mLlVideo.setOnClickListener(v -> //播放视频
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO)
.withString("url", BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) .withString("url", BaseUrlApi.BASE_IMG_URL + b.getReportVideo())
.withString("title", "事件视频") .withString("title", "事件视频")
.navigation()); .navigation());
Glide.with(mActivity) Glide.with(mActivity)
.setDefaultRequestOptions( .setDefaultRequestOptions(
new RequestOptions() new RequestOptions()
.frame(0) .frame(0)
.centerCrop() .centerCrop()
) )
.load(BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) .load(BaseUrlApi.BASE_IMG_URL + b.getReportVideo())
.into(mIvCover); .into(mIvCover);
} else { } else {
//没有视频 //没有视频
mLlVideo.setVisibility(View.GONE); mLlVideo.setVisibility(View.GONE);
@ -728,11 +732,11 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground(); AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground();
animationDrawable.start(); animationDrawable.start();
MediaManager.playSound(path, MediaManager.playSound(path,
mp -> { mp -> {
animationDrawable.selectDrawable(0);//显示动画第一帧 animationDrawable.selectDrawable(0);//显示动画第一帧
animationDrawable.stop(); animationDrawable.stop();
MediaManager.destroy(); MediaManager.destroy();
}); });
} }
}); });
} else { } else {

470
supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java
View File

@ -69,6 +69,7 @@ import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.Unbinder; import butterknife.Unbinder;
@ -161,6 +162,8 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
TextureMapView mTmvMap; TextureMapView mTmvMap;
@BindView(R2.id.iv_cover) @BindView(R2.id.iv_cover)
ImageView mIvCover; ImageView mIvCover;
@BindView(R2.id.tv_report_name)
TextView mTvReportName;
private Unbinder mBind; private Unbinder mBind;
private IncidentDetailBean mIncidentDetailBean; private IncidentDetailBean mIncidentDetailBean;
private String mReportId; private String mReportId;
@ -278,10 +281,10 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
mBitMap = BitmapDescriptorFactory.fromResource(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker); mBitMap = BitmapDescriptorFactory.fromResource(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
} }
MarkerOptions markerOptions = new MarkerOptions() MarkerOptions markerOptions = new MarkerOptions()
.position(new LatLng(lat, lng))//mark出现的位置 .position(new LatLng(lat, lng))//mark出现的位置
.icon(mBitMap) //mark图标 .icon(mBitMap) //mark图标
.draggable(false)//mark可拖拽 .draggable(false)//mark可拖拽
.animateType(MarkerOptions.MarkerAnimateType.none); .animateType(MarkerOptions.MarkerAnimateType.none);
mBaiduMap.addOverlay(markerOptions); mBaiduMap.addOverlay(markerOptions);
} }
@ -294,35 +297,35 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中...");
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(DeptApis.class) .create(DeptApis.class)
.doIncidentDeptCheckUnPass(mReportId, body, UserLgUtils.getToken()) .doIncidentDeptCheckUnPass(mReportId, body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("处理成功"); ToastUtils.show("处理成功");
setResult(13); setResult(13);
finish(); finish();
} }
@Override @Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
} }
@ -335,9 +338,9 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
switch (bean.getId()) { switch (bean.getId()) {
case "LOG"://日志 case "LOG"://日志
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG)
.withString("businessId", mIncidentDetailBean.getBusinessId()) .withString("businessId", mIncidentDetailBean.getBusinessId())
.navigation(); .navigation();
break; break;
case "SAMPLE"://标杆事件 case "SAMPLE"://标杆事件
doSampleIncident(); doSampleIncident();
@ -365,39 +368,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doSampleIncident(body, UserLgUtils.getToken()) .doSampleIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("SAMPLE"); bean1.setId("SAMPLE");
bean1.setName("标杆事件"); bean1.setName("标杆事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -408,39 +411,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doCollectIncident(body, UserLgUtils.getToken()) .doCollectIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("COLLECT"); bean1.setId("COLLECT");
bean1.setName("收藏事件"); bean1.setName("收藏事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -451,39 +454,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doWarningIncident(body, UserLgUtils.getToken()) .doWarningIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("WARNING"); bean1.setId("WARNING");
bean1.setName("预警事件"); bean1.setName("预警事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
/** /**
@ -494,39 +497,39 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
RequestBody body = buildStateParams(); RequestBody body = buildStateParams();
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.doDifficultIncident(body, UserLgUtils.getToken()) .doDifficultIncident(body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
OperateBean bean1 = new OperateBean(); OperateBean bean1 = new OperateBean();
bean1.setSel(false); bean1.setSel(false);
bean1.setId("DIFFICULT"); bean1.setId("DIFFICULT");
bean1.setName("疑难事件"); bean1.setName("疑难事件");
bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray);
mOperates.remove(bean1); mOperates.remove(bean1);
} }
@Override @Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
private RequestBody buildStateParams() { private RequestBody buildStateParams() {
@ -547,35 +550,35 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中..."); ProgressDialog dialog = UIUtil.initDialog(mActivity, "处理中...");
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(DeptApis.class) .create(DeptApis.class)
.doIncidentDeptCheckPass(mReportId, body, UserLgUtils.getToken()) .doIncidentDeptCheckPass(mReportId, body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() { .subscribe(new Observer<SuccessBean>() {
@Override @Override
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
} }
@Override @Override
public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) { public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
dialog.dismiss(); dialog.dismiss();
ToastUtils.show("处理成功"); ToastUtils.show("处理成功");
setResult(13); setResult(13);
finish(); finish();
} }
@Override @Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
} }
@ -611,55 +614,55 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
*/ */
private void getDetailData() { private void getDetailData() {
Observable<DispatchDetailBean> dispatchInfo = RetrofitManager.getInstance() Observable<DispatchDetailBean> dispatchInfo = RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.getDispatchDetailById(mTaskId, UserLgUtils.getToken()) .getDispatchDetailById(mTaskId, UserLgUtils.getToken())
.compose(RxTransformer.getTransformer()); .compose(RxTransformer.getTransformer());
Observable<IncidentHandleDetailBean> handleInfo = RetrofitManager.getInstance() Observable<IncidentHandleDetailBean> handleInfo = RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.getHandleDetailByHandleId(mTaskId, UserLgUtils.getToken()) .getHandleDetailByHandleId(mTaskId, UserLgUtils.getToken())
.compose(RxTransformer.getTransformer()); .compose(RxTransformer.getTransformer());
Observable<IncidentDetailBean> incidentDetail = RetrofitManager.getInstance() Observable<IncidentDetailBean> incidentDetail = RetrofitManager.getInstance()
.create(GridApis.class) .create(GridApis.class)
.getIncidentDetailById(mReportId, UserLgUtils.getToken()) .getIncidentDetailById(mReportId, UserLgUtils.getToken())
.compose(RxTransformer.getTransformer()); .compose(RxTransformer.getTransformer());
Observable.mergeDelayError(dispatchInfo, handleInfo, incidentDetail) Observable.mergeDelayError(dispatchInfo, handleInfo, incidentDetail)
.compose(RxTransformer.getTransformer()) .compose(RxTransformer.getTransformer())
.subscribe(new Observer<Object>() { .subscribe(new Observer<Object>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { 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();
} }
refreshView(STATE_LOAD_SUCCESS);
}
@Override @Override
public void onError(@NonNull Throwable e) { public void onNext(@NonNull Object o) {
ExceptionHandler.handleException(e); if (o instanceof IncidentHandleDetailBean) {
refreshView(STATE_LOAD_ERROR); //处理详情
} 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.setLayoutManager(new GridLayoutManager(mActivity, 4));
mRlvHandlePhoto.setAdapter(mAdapter); mRlvHandlePhoto.setAdapter(mAdapter);
mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance() mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG)
.withStringArrayList("imgUrls", paths) .withStringArrayList("imgUrls", paths)
.withInt("curItem", pos) .withInt("curItem", pos)
.navigation()); .navigation());
for (String doorId : doorIds) { for (String doorId : doorIds) {
if (!TextUtils.isEmpty(doorId)) { if (!TextUtils.isEmpty(doorId)) {
paths.add(BaseUrlApi.BASE_IMG_URL + doorId); paths.add(BaseUrlApi.BASE_IMG_URL + doorId);
@ -754,6 +757,7 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
mRlvTags.setVisibility(View.GONE); mRlvTags.setVisibility(View.GONE);
} }
mTvGrid.setText(mIncidentDetailBean.getBGId()); mTvGrid.setText(mIncidentDetailBean.getBGId());
mTvReportName.setText(mIncidentDetailBean.getCreatorName());
mTvComponent.setText(mIncidentDetailBean.getCasePartsObjName()); mTvComponent.setText(mIncidentDetailBean.getCasePartsObjName());
mTvType.setText(mIncidentDetailBean.getCaseTypeName1() + "/" + mIncidentDetailBean.getCaseTypeName2()); mTvType.setText(mIncidentDetailBean.getCaseTypeName1() + "/" + mIncidentDetailBean.getCaseTypeName2());
if (mIncidentDetailBean.getIsSelf() == 0) { if (mIncidentDetailBean.getIsSelf() == 0) {
@ -779,10 +783,10 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4));
mRlvPhotos.setAdapter(mAdapter); mRlvPhotos.setAdapter(mAdapter);
mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance() mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG)
.withStringArrayList("imgUrls", paths) .withStringArrayList("imgUrls", paths)
.withInt("curItem", pos) .withInt("curItem", pos)
.navigation()); .navigation());
for (String doorId : doorIds) { for (String doorId : doorIds) {
if (!TextUtils.isEmpty(doorId)) { if (!TextUtils.isEmpty(doorId)) {
paths.add(BaseUrlApi.BASE_IMG_URL + doorId); paths.add(BaseUrlApi.BASE_IMG_URL + doorId);
@ -798,19 +802,19 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
//有视频 //有视频
mLlVideo.setVisibility(View.VISIBLE); mLlVideo.setVisibility(View.VISIBLE);
mLlVideo.setOnClickListener(v -> //播放视频 mLlVideo.setOnClickListener(v -> //播放视频
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO)
.withString("url", BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo()) .withString("url", BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo())
.withString("title", "事件视频") .withString("title", "事件视频")
.navigation()); .navigation());
Glide.with(mActivity) Glide.with(mActivity)
.setDefaultRequestOptions( .setDefaultRequestOptions(
new RequestOptions() new RequestOptions()
.frame(0) .frame(0)
.centerCrop() .centerCrop()
) )
.load(BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo()) .load(BaseUrlApi.BASE_IMG_URL + mIncidentDetailBean.getReportVideo())
.into(mIvCover); .into(mIvCover);
} else { } else {
//没有视频 //没有视频
@ -825,11 +829,11 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground(); AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground();
animationDrawable.start(); animationDrawable.start();
MediaManager.playSound(path, MediaManager.playSound(path,
mp -> { mp -> {
animationDrawable.selectDrawable(0);//显示动画第一帧 animationDrawable.selectDrawable(0);//显示动画第一帧
animationDrawable.stop(); animationDrawable.stop();
MediaManager.destroy(); MediaManager.destroy();
}); });
} }
}); });
} else { } else {

16
supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml
View File

@ -89,6 +89,22 @@
style="@style/item_content" style="@style/item_content"
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_white">
<ImageView
style="@style/style_hint_star"
android:visibility="invisible" />
<TextView
style="@style/item_title"
android:text="上报人" />
<TextView
android:id="@+id/tv_report_name"
style="@style/item_content"
android:hint="未录入" />
</LinearLayout>
<LinearLayout style="@style/item_white"> <LinearLayout style="@style/item_white">

16
supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml
View File

@ -93,6 +93,22 @@
style="@style/item_content" style="@style/item_content"
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_white">
<ImageView
style="@style/style_hint_star"
android:visibility="invisible" />
<TextView
style="@style/item_title"
android:text="上报人" />
<TextView
android:id="@+id/tv_report_name"
style="@style/item_content"
android:hint="未录入" />
</LinearLayout>
<LinearLayout style="@style/item_white"> <LinearLayout style="@style/item_white">