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

页面修改、以人找房、以房找人

Browse Source
This commit is contained in:
itgaojian 2023-11-22 17:23:51 +08:00
parent 848124963e
commit 0dbdfcadf7
18 changed files with 1413 additions and 1134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -57,3 +57,12 @@
1.人口房屋录入
```
## 2023-11-22
```
> 1.5.1
1.案件上报、详情页面修改
2.以人找房 以房找人
```

1
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueCheckActivity.java
View File

@ -154,6 +154,7 @@ public class IssueCheckActivity extends BaseActivity {
private void showDetail(IssueSubBean.RowsBean bean) {
Intent intent = new Intent(mActivity, IssueDetailActivity.class);
//待处理处理
intent.putExtra("id",bean.getReportCaseId());
intent.putExtra("mine", "1");
intent.putExtra("bean", bean);
if (bean.getCaseStatus().equals("4")) {

130
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java
View File

@ -3,7 +3,6 @@ package com.sucstepsoft.realtimelocation.activitys.issue;
import android.app.ProgressDialog;
import android.content.Intent;
import android.database.Cursor;
import android.graphics.Color;
import android.graphics.drawable.AnimationDrawable;
import android.net.Uri;
import android.os.Build;
@ -21,7 +20,6 @@ import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RadioGroup;
import android.widget.RelativeLayout;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.ZoomControls;
@ -53,10 +51,11 @@ import com.sucstepsoft.realtimelocation.R;
import com.sucstepsoft.realtimelocation.activitys.common.PhotoActivity;
import com.sucstepsoft.realtimelocation.beans.BaseUserBean;
import com.sucstepsoft.realtimelocation.beans.IssueCheckBean;
import com.sucstepsoft.realtimelocation.beans.IssueDetailBean;
import com.sucstepsoft.realtimelocation.beans.IssueDisBean;
import com.sucstepsoft.realtimelocation.beans.IssueSubBean;
import com.sucstepsoft.realtimelocation.beans.SuccessBean;
import com.sucstepsoft.realtimelocation.net.LocationApiService;
import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
import java.io.File;
import java.util.ArrayList;
@ -124,8 +123,6 @@ public class IssueDetailActivity extends BaseActivity {
TextView mTvHandleTime;
@BindView(R.id.btn_reload)
Button mBtnReload;
@BindView(R.id.rl_accept)
RelativeLayout mRlAccept;
@BindView(R.id.ll_voice)
LinearLayout mLlVoice;
@BindView(R.id.tv_voice_anim)
@ -138,8 +135,11 @@ public class IssueDetailActivity extends BaseActivity {
Button mBtnReturn;
@BindView(R.id.tv_grade)
TextView mTvGrade;
@BindView(R.id.ll_grade)
LinearLayout mLlGradeContent;
private Unbinder mBind;
private IssueSubBean.RowsBean mRowsBean;
// private IssueSubBean.RowsBean mRowsBean;
private IssueDetailBean mDetailBean;
private List<AddPhotoBean> mPhotos = new ArrayList<>();
private AddPhotoBean mCurrentBean;
private String mPicPath;
@ -149,6 +149,7 @@ public class IssueDetailActivity extends BaseActivity {
private String mCheck;
private boolean isSelf = false;//是否是自处理
private String mDegree = "4";//满意度
private String mId;
@Override
protected int setLayoutId() {
@ -158,12 +159,17 @@ public class IssueDetailActivity extends BaseActivity {
@Override
public void initData() {
mBind = ButterKnife.bind(this);
refreshView(STATE_LOAD_SUCCESS);
refreshView(STATE_LOAD_LOADING);
mTvBaseTitle.setText("上报详情");
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("流程");
mRowsBean = (IssueSubBean.RowsBean) getIntent().getSerializableExtra("bean");
getDetail(mRowsBean);
mId = getIntent().getStringExtra("id");
if (TextUtils.isEmpty(mId)) {
ToastUtils.showShort("数据有误");
finish();
} else {
getDetail(mId);
}
String mine = getIntent().getStringExtra("mine");
mCheck = getIntent().getStringExtra("check");
if (TextUtils.isEmpty(mCheck)) {
@ -181,10 +187,9 @@ public class IssueDetailActivity extends BaseActivity {
} else {
mLlIssueDis.setVisibility(View.GONE);
}
setDetailDataToView();
mTvPublish.setOnClickListener(v -> {
Intent intent = new Intent(IssueDetailActivity.this, IssueStepActivity.class);
intent.putExtra("caseId", mRowsBean.getReportCaseId());
intent.putExtra("caseId", mId);
startActivity(intent);
});
View child = mMapView.getChildAt(1);
@ -195,27 +200,29 @@ public class IssueDetailActivity extends BaseActivity {
setEditTextInhibitInputSpeChat(mEtIssueDisDesc);
}
private void getDetail(IssueSubBean.RowsBean rowsBean) {
if (rowsBean != null) {
private void getDetail(String id) {
RetrofitManager.getInstance()
.create(LocationApiService.class)
.getIssueDetail(rowsBean.getReportCaseId(), UserLgUtils.getToken())
.getIssueDetail(id, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<Object>() {
.subscribe(new Observer<IssueDetailBean>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(Object o) {
public void onNext(IssueDetailBean o) {
mDetailBean = o;
refreshView(STATE_LOAD_SUCCESS);
setDetailDataToView();
}
@Override
public void onError(Throwable e) {
refreshView(STATE_LOAD_ERROR);
ExceptionHandler.handleException(e);
}
@Override
@ -224,7 +231,6 @@ public class IssueDetailActivity extends BaseActivity {
}
});
}
}
/**
* 初始化案件处理视图
@ -315,9 +321,9 @@ public class IssueDetailActivity extends BaseActivity {
*/
private void doTrans() {
Intent intent = new Intent(mActivity, IssueTransActivity.class);
intent.putExtra("caseId", mRowsBean.getReportCaseId());
intent.putExtra("communityName", mRowsBean.getCommunityName());
intent.putExtra("areaName", mRowsBean.getAreaName());
intent.putExtra("caseId", mDetailBean.getReportCaseId());
intent.putExtra("communityName", mDetailBean.getCommunityName());
intent.putExtra("areaName", mDetailBean.getAreaName());
startActivityForResult(intent, 19);
}
@ -329,7 +335,7 @@ public class IssueDetailActivity extends BaseActivity {
dialog.show();
RetrofitManager.getInstance()
.create(LocationApiService.class)
.returnIssueDis(mRowsBean.getReportCaseId(), UserLgUtils.getToken())
.returnIssueDis(mDetailBean.getReportCaseId(), UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() {
@ -386,7 +392,7 @@ public class IssueDetailActivity extends BaseActivity {
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
RetrofitManager.getInstance()
.create(LocationApiService.class)
.saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken())
.saveIssueInspect(mDetailBean.getReportCaseId(), body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() {
@ -475,7 +481,7 @@ public class IssueDetailActivity extends BaseActivity {
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
RetrofitManager.getInstance()
.create(LocationApiService.class)
.saveIssueDis(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken())
.saveIssueDis(mDetailBean.getReportCaseId(), body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() {
@ -593,7 +599,7 @@ public class IssueDetailActivity extends BaseActivity {
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
RetrofitManager.getInstance()
.create(LocationApiService.class)
.saveIssueInspect(mRowsBean.getReportCaseId(), body, UserLgUtils.getToken())
.saveIssueInspect(mDetailBean.getReportCaseId(), body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccessBean>() {
@ -628,15 +634,15 @@ public class IssueDetailActivity extends BaseActivity {
}
private void setDetailDataToView() {
if (mRowsBean != null) {
if (mDetailBean != null) {
//TODO 处理满意度
LogUtils.e(mRowsBean.getGrade());
if (TextUtils.isEmpty(mRowsBean.getGrade()) || "0".equals(mRowsBean.getGrade())) {
mTvGrade.setVisibility(View.GONE);
LogUtils.e(mDetailBean.getGrade());
if (TextUtils.isEmpty(mDetailBean.getGrade()) || "0".equals(mDetailBean.getGrade())) {
mLlGradeContent.setVisibility(View.GONE);
} else {
mTvGrade.setVisibility(View.VISIBLE);
mLlGradeContent.setVisibility(View.VISIBLE);
String grade = "满意";
switch (mRowsBean.getGrade()) {
switch (mDetailBean.getGrade()) {
case "1":
grade = "非常不满意";
break;
@ -653,10 +659,10 @@ public class IssueDetailActivity extends BaseActivity {
grade = "非常满意";
break;
}
mTvGrade.setText("处理满意度:" + grade);
mTvGrade.setText(grade);
}
//区域
if (0 == mRowsBean.getIsSelf()) {
if (0 == mDetailBean.getIsSelf()) {
isSelf = false;
//mRlAccept.setVisibility(View.VISIBLE);
} else {
@ -665,73 +671,55 @@ public class IssueDetailActivity extends BaseActivity {
//isAccept = true;
//mRlAccept.setVisibility(View.GONE);
}
mTvUpOrg.setText(mRowsBean.getCommunityName());
mTvUpOrg.setText(mDetailBean.getCommunityName());
//状态
//描述
mTvIssueDesc.setText(mRowsBean.getCaseContent());
mTvIssueDesc.setText(mDetailBean.getCaseContent());
//上报时间
mTvUpTime.setText("上报时间:" + mRowsBean.getReportDate());
mTvUpTime.setText(mDetailBean.getReportDate());
//类型
mTvType.setText("上报类型:" + mRowsBean.getCaseTypeName());
mTvType.setText("上报类型:" + mDetailBean.getCaseTypeName());
//上报人
mTvUpUser.setText("上报人员:" + mRowsBean.getCaseReporter());
if (!TextUtils.isEmpty(mRowsBean.getCaseAudio())) {
mTvUpUser.setText("上报人员:" + mDetailBean.getCaseReporter());
if (!TextUtils.isEmpty(mDetailBean.getCaseAudio())) {
mLlVoice.setVisibility(View.VISIBLE);
mLlVoice.setOnClickListener(v -> playVoice(mRowsBean.getCaseAudio()));
mLlVoice.setOnClickListener(v -> playVoice(mDetailBean.getCaseAudio()));
} else {
mLlVoice.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(mRowsBean.getCaseStatus())) {
switch (mRowsBean.getCaseStatus()) {
if (!TextUtils.isEmpty(mDetailBean.getCaseStatus())) {
switch (mDetailBean.getCaseStatus()) {
case "0"://待受理
mTvState.setText("待受理");
mTvState.setTextColor(Color.parseColor("#DE0E0E"));
mTvState.setBackgroundResource(R.drawable.shp_status_red);
break;
case "1":
mTvState.setText("待立案");
mTvState.setTextColor(Color.parseColor("#DE0E0E"));
mTvState.setBackgroundResource(R.drawable.shp_status_red);
break;
case "2":
mTvState.setText("待下派");
mTvState.setTextColor(Color.parseColor("#FFAE3B"));
mTvState.setBackgroundResource(R.drawable.shp_status_yellow);
break;
case "3":
mTvState.setText("待处理");
mTvState.setTextColor(Color.parseColor("#DE0E0E"));
mTvState.setBackgroundResource(R.drawable.shp_status_red);
break;
case "4":
mTvState.setText("待检查");
mTvState.setTextColor(Color.parseColor("#1189FF"));
mTvState.setBackgroundResource(R.drawable.shp_status_blue);
break;
case "5":
mTvState.setText("待结案");
mTvState.setTextColor(Color.parseColor("#0EC843"));
mTvState.setBackgroundResource(R.drawable.shp_status_green);
break;
case "6":
mTvState.setText("已归档");
mTvState.setTextColor(Color.parseColor("#D8D8D8"));
mTvState.setBackgroundResource(R.drawable.shp_status_gray);
break;
default:
mTvState.setText("异常");
mTvState.setTextColor(Color.parseColor("#DE0E0E"));
mTvState.setBackgroundResource(R.drawable.shp_status_red);
break;
}
} else {
mTvState.setText("异常");
mTvState.setTextColor(Color.parseColor("#DE0E0E"));
mTvState.setBackgroundResource(R.drawable.shp_status_red);
}
mTvIssueAddress.setText(mRowsBean.getCasePosition());
String caseLongitude = mRowsBean.getCaseLongitude();
String caseLatitude = mRowsBean.getCaseLatitude();
mTvIssueAddress.setText(mDetailBean.getCasePosition());
String caseLongitude = mDetailBean.getCaseLongitude();
String caseLatitude = mDetailBean.getCaseLatitude();
if (!TextUtils.isEmpty(caseLatitude) && !TextUtils.isEmpty(caseLongitude)) {
Double l = Double.parseDouble(caseLongitude);
Double a = Double.parseDouble(caseLatitude);
@ -747,10 +735,10 @@ public class IssueDetailActivity extends BaseActivity {
map.addOverlay(markerOptions);
mBtnReload.setOnClickListener(v -> map.animateMapStatus(MapStatusUpdateFactory.newMapStatus(ms)));
}
if (!TextUtils.isEmpty(mRowsBean.getCasePhotos())) {
if (!TextUtils.isEmpty(mDetailBean.getCasePhotos())) {
mRlvPhotos.setVisibility(View.VISIBLE);
List<String> photos = new ArrayList<>();
String[] split = mRowsBean.getCasePhotos().split(",");
String[] split = mDetailBean.getCasePhotos().split(",");
for (int i = 0; i < split.length; i++) {
if (!TextUtils.isEmpty(split[i])) {
photos.add(BaseUrlApi.BASE_IMG_URL + split[i]);
@ -775,15 +763,15 @@ public class IssueDetailActivity extends BaseActivity {
}
//TODO 填充处理数据
if (!TextUtils.isEmpty(mCheck)) {
mTvHandleTime.setText("处理时间:" + mRowsBean.getHandleDate());
mTvHandleUser.setText("处理人:" + mRowsBean.getHandleUserName());
mTvIssueDisDesc.setText(mRowsBean.getHandleOpinion());
if (TextUtils.isEmpty(mRowsBean.getHandlePhotos())) {
mTvHandleTime.setText(mDetailBean.getHandleCreateTime());
mTvHandleUser.setText(mDetailBean.getHandleUserName());
mTvIssueDisDesc.setText(mDetailBean.getHandleOpinion());
if (TextUtils.isEmpty(mDetailBean.getHandlePhotos())) {
mRlvDisPhoto.setVisibility(View.GONE);
} else {
mRlvDisPhoto.setVisibility(View.VISIBLE);
List<String> photos = new ArrayList<>();
String[] split = mRowsBean.getHandlePhotos().split(",");
String[] split = mDetailBean.getHandlePhotos().split(",");
for (int i = 0; i < split.length; i++) {
if (!TextUtils.isEmpty(split[i])) {
photos.add(BaseUrlApi.BASE_IMG_URL + split[i]);

1
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueInspectActivity.java
View File

@ -155,6 +155,7 @@ public class IssueInspectActivity extends BaseActivity {
private void showDetail(IssueSubBean.RowsBean bean) {
Intent intent = new Intent(mActivity, IssueDetailActivity.class);
//待处理处理
intent.putExtra("id",bean.getReportCaseId());
intent.putExtra("mine", "1");
intent.putExtra("bean", bean);
if (bean.getCaseStatus().equals("4")) {

1
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineActivity.java
View File

@ -94,6 +94,7 @@ public class IssueMineActivity extends BaseActivity {
*/
private void showDetail(IssueSubBean.RowsBean bean) {
Intent intent = new Intent(mActivity, IssueDetailActivity.class);
intent.putExtra("id",bean.getReportCaseId());
intent.putExtra("bean", bean);
startActivity(intent);
}

2
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueMineDisActivity.java
View File

@ -89,7 +89,9 @@ public class IssueMineDisActivity extends BaseActivity {
*/
private void showDetail(IssueSubBean.RowsBean bean) {
Intent intent = new Intent(IssueMineDisActivity.this, IssueDetailActivity.class);
intent.putExtra("mine", "1");
intent.putExtra("id", bean.getReportCaseId());
intent.putExtra("bean", bean);
startActivity(intent);
}

25
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueReportActivity.java
View File

@ -11,7 +11,6 @@ import android.graphics.Color;
import android.graphics.drawable.AnimationDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
@ -96,6 +95,8 @@ public class IssueReportActivity extends BaseActivity {
EditText mEtIssueDesc;
@BindView(R.id.rlv_locale_photo)
RecyclerView mRlvLocalePhoto;
@BindView(R.id.ll_case_type)
LinearLayout mLlCaseType;
@BindView(R.id.btn_submit)
Button mBtnSubmit;
@BindView(R.id.arb_audio)
@ -106,16 +107,16 @@ public class IssueReportActivity extends BaseActivity {
LinearLayout mLlVoice;
@BindView(R.id.tv_source_content)
TextView mTvSourceContent;
@BindView(R.id.tv_issue_detail_info)
TextView mTvIssueDInfo;
@BindView(R.id.tv_issue_base_info)
TextView mTvIssueBaseInfo;
// @BindView(R.id.tv_issue_detail_info)
// TextView mTvIssueDInfo;
// @BindView(R.id.tv_issue_base_info)
// TextView mTvIssueBaseInfo;
@BindView(R.id.sw_is_self)
Switch mSwIsSelf;
@BindView(R.id.tv_case_type)
TextView mTvCaseType;
@BindView(R.id.ll_case_type)
LinearLayout mLlCaseType;
// @BindView(R.id.ll_case_type)
// LinearLayout mLlCaseType;
private Unbinder mBind;
private List<AddPhotoBean> mPhotos = new ArrayList<>();
private AddPhotoBean mCurrentBean;
@ -445,11 +446,11 @@ public class IssueReportActivity extends BaseActivity {
return null;
}
//案件分类
if (!isSelf) {
if (TextUtils.isEmpty(mSelCaseType)) {
ToastUtils.showShort("请选择案件分类");
}
}
// if (!isSelf) {
// if (TextUtils.isEmpty(mSelCaseType)) {
// ToastUtils.showShort("请选择案件分类");
// }
// }
String desc = mEtIssueDesc.getText().toString().trim();
if (TextUtils.isEmpty(desc)) {
ToastUtils.showShort("请输入案件描述");

302
app/src/main/java/com/sucstepsoft/realtimelocation/beans/IssueDetailBean.java Normal file
View File

@ -0,0 +1,302 @@
package com.sucstepsoft.realtimelocation.beans;
public class IssueDetailBean {
private String areaId;
private String areaName;
private String caseAudio;
private String caseContent;
private String caseFlowForward;
private String caseFlowType;
private String caseLatitude;
private String caseLongitude;
private String caseNumber;
private String casePhotos;
private String casePosition;
private String caseReporter;
private String caseSource;
private String caseStatus;
private String caseTypeId;
private String caseTypeName;
private String communityId;
private String communityName;
private String gmtModified;
private String grade;
private String handleCreateTime;
private String handleOpinion;
private String handlePhotos;
private String handleUserCommunityName;
private String handleUserDepartmentName;
private String handleUserName;
private String handleUserUsername;
private int isAccept;
private int isDeny;
private int isSelf;
private String readTime;
private String reportCaseId;
private String reportDate;
public String getAreaId() {
return areaId;
}
public void setAreaId(String areaId) {
this.areaId = areaId;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public String getCaseAudio() {
return caseAudio;
}
public void setCaseAudio(String caseAudio) {
this.caseAudio = caseAudio;
}
public String getCaseContent() {
return caseContent;
}
public void setCaseContent(String caseContent) {
this.caseContent = caseContent;
}
public String getCaseFlowForward() {
return caseFlowForward;
}
public void setCaseFlowForward(String caseFlowForward) {
this.caseFlowForward = caseFlowForward;
}
public String getCaseFlowType() {
return caseFlowType;
}
public void setCaseFlowType(String caseFlowType) {
this.caseFlowType = caseFlowType;
}
public String getCaseLatitude() {
return caseLatitude;
}
public void setCaseLatitude(String caseLatitude) {
this.caseLatitude = caseLatitude;
}
public String getCaseLongitude() {
return caseLongitude;
}
public void setCaseLongitude(String caseLongitude) {
this.caseLongitude = caseLongitude;
}
public String getCaseNumber() {
return caseNumber;
}
public void setCaseNumber(String caseNumber) {
this.caseNumber = caseNumber;
}
public String getCasePhotos() {
return casePhotos;
}
public void setCasePhotos(String casePhotos) {
this.casePhotos = casePhotos;
}
public String getCasePosition() {
return casePosition;
}
public void setCasePosition(String casePosition) {
this.casePosition = casePosition;
}
public String getCaseReporter() {
return caseReporter;
}
public void setCaseReporter(String caseReporter) {
this.caseReporter = caseReporter;
}
public String getCaseSource() {
return caseSource;
}
public void setCaseSource(String caseSource) {
this.caseSource = caseSource;
}
public String getCaseStatus() {
return caseStatus;
}
public void setCaseStatus(String caseStatus) {
this.caseStatus = caseStatus;
}
public String getCaseTypeId() {
return caseTypeId;
}
public void setCaseTypeId(String caseTypeId) {
this.caseTypeId = caseTypeId;
}
public String getCaseTypeName() {
return caseTypeName;
}
public void setCaseTypeName(String caseTypeName) {
this.caseTypeName = caseTypeName;
}
public String getCommunityId() {
return communityId;
}
public void setCommunityId(String communityId) {
this.communityId = communityId;
}
public String getCommunityName() {
return communityName;
}
public void setCommunityName(String communityName) {
this.communityName = communityName;
}
public String getGmtModified() {
return gmtModified;
}
public void setGmtModified(String gmtModified) {
this.gmtModified = gmtModified;
}
public String getGrade() {
return grade;
}
public void setGrade(String grade) {
this.grade = grade;
}
public String getHandleCreateTime() {
return handleCreateTime;
}
public void setHandleCreateTime(String handleCreateTime) {
this.handleCreateTime = handleCreateTime;
}
public String getHandleOpinion() {
return handleOpinion;
}
public void setHandleOpinion(String handleOpinion) {
this.handleOpinion = handleOpinion;
}
public String getHandlePhotos() {
return handlePhotos;
}
public void setHandlePhotos(String handlePhotos) {
this.handlePhotos = handlePhotos;
}
public String getHandleUserCommunityName() {
return handleUserCommunityName;
}
public void setHandleUserCommunityName(String handleUserCommunityName) {
this.handleUserCommunityName = handleUserCommunityName;
}
public String getHandleUserDepartmentName() {
return handleUserDepartmentName;
}
public void setHandleUserDepartmentName(String handleUserDepartmentName) {
this.handleUserDepartmentName = handleUserDepartmentName;
}
public String getHandleUserName() {
return handleUserName;
}
public void setHandleUserName(String handleUserName) {
this.handleUserName = handleUserName;
}
public String getHandleUserUsername() {
return handleUserUsername;
}
public void setHandleUserUsername(String handleUserUsername) {
this.handleUserUsername = handleUserUsername;
}
public int getIsAccept() {
return isAccept;
}
public void setIsAccept(int isAccept) {
this.isAccept = isAccept;
}
public int getIsDeny() {
return isDeny;
}
public void setIsDeny(int isDeny) {
this.isDeny = isDeny;
}
public int getIsSelf() {
return isSelf;
}
public void setIsSelf(int isSelf) {
this.isSelf = isSelf;
}
public String getReadTime() {
return readTime;
}
public void setReadTime(String readTime) {
this.readTime = readTime;
}
public String getReportCaseId() {
return reportCaseId;
}
public void setReportCaseId(String reportCaseId) {
this.reportCaseId = reportCaseId;
}
public String getReportDate() {
return reportDate;
}
public void setReportDate(String reportDate) {
this.reportDate = reportDate;
}
}

1
app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/MineIssueFragment.java
View File

@ -102,6 +102,7 @@ public class MineIssueFragment extends LazyFragment {
*/
private void showIssueDetail(IssueSubBean.RowsBean bean) {
Intent intent = new Intent(mActivity, IssueDetailActivity.class);
intent.putExtra("id",bean.getReportCaseId());
intent.putExtra("bean", bean);
startActivity(intent);
}

1
app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/PendingFragment.java
View File

@ -122,6 +122,7 @@ public class PendingFragment extends LazyFragment {
*/
private void showIssueDetail(IssueSubBean.RowsBean bean) {
Intent intent = new Intent(mActivity, IssueDetailActivity.class);
intent.putExtra("id",bean.getReportCaseId());
intent.putExtra("bean", bean);
switch (bean.getCaseStatus()) {
case "0"://待受理

1
app/src/main/java/com/sucstepsoft/realtimelocation/fragments/issue/SpecialCaseDisFragment.java
View File

@ -106,6 +106,7 @@ public class SpecialCaseDisFragment extends LazyFragment {
*/
private void showIssueDetail(IssueSubBean.RowsBean bean) {
Intent intent = new Intent(mActivity, IssueDetailActivity.class);
intent.putExtra("id",bean.getReportCaseId());
intent.putExtra("bean", bean);
switch (bean.getCaseStatus()) {
case "0"://待受理

3
app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java
View File

@ -22,6 +22,7 @@ import com.sucstepsoft.realtimelocation.beans.HireHouseDetailBean;
import com.sucstepsoft.realtimelocation.beans.HouseLivePersonBean;
import com.sucstepsoft.realtimelocation.beans.HousePersonBean;
import com.sucstepsoft.realtimelocation.beans.HousePersonListBean;
import com.sucstepsoft.realtimelocation.beans.IssueDetailBean;
import com.sucstepsoft.realtimelocation.beans.IssueSubBean;
import com.sucstepsoft.realtimelocation.beans.LeaveDetailBean;
import com.sucstepsoft.realtimelocation.beans.LeaveListBean;
@ -455,7 +456,7 @@ public interface LocationApiService {
@Headers({"base_url_name:dict"})
@GET("app/reportcase/getreportcase/{reportCaseId}")
Observable<Object> getIssueDetail(@Path("reportCaseId") String id, @Header("token") String token);
Observable<IssueDetailBean> getIssueDetail(@Path("reportCaseId") String id, @Header("token") String token);
//GET /app/reportcase/getreportcase/{reportCaseId}

5
app/src/main/java/com/sucstepsoft/realtimelocation/widget/ExpandableLinearLayout.java
View File

@ -80,9 +80,8 @@ public class ExpandableLinearLayout extends LinearLayout implements View.OnClick
*/
private void findViews() {
bottomView = View.inflate(getContext(), R.layout.item_ell_bottom, null);
ivArrow = (ImageView) bottomView.findViewById(R.id.iv_arrow);
tvTip = (TextView) bottomView.findViewById(R.id.tv_tip);
ivArrow = bottomView.findViewById(R.id.iv_arrow);
tvTip = bottomView.findViewById(R.id.tv_tip);
tvTip.getPaint().setTextSize(fontSize);
tvTip.setTextColor(textColor);
ivArrow.setImageResource(arrowResId);

BIN
app/src/main/res/drawable-xhdpi/ic_issue_state_title_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

362
app/src/main/res/layout/activity_issue_detail.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -8,10 +8,41 @@
android:scrollbars="none"
tools:background="@color/gray_bg">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="100dp"
android:background="@color/titleBar"
android:orientation="horizontal"
android:padding="25dp">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:scaleType="fitXY"
android:src="@drawable/ic_issue_state_title_icon" />
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="20dp"
tools:text="状态" />
</LinearLayout>
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:layout_marginTop="70dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_01">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:orientation="vertical">
<!-- 案件详情 -->
<LinearLayout
@ -22,29 +53,31 @@
android:padding="10dp"
tools:visibility="visible">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_up_org"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/text_blue"
android:textSize="18sp"
android:layout_weight="1"
android:textColor="@color/black"
android:textSize="16dp"
tools:text="稀土路街道办事处" />
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:id="@+id/tv_up_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:gravity="center"
android:textColor="@color/text_blue"
android:textSize="10sp"
tools:text="状态" />
</RelativeLayout>
android:layout_weight="1"
android:gravity="right"
android:textColor="@color/text_80_gray"
android:textSize="12dp"
tools:text="2022-10-16 12:12:12" />
</LinearLayout>
<TextView
android:id="@+id/tv_issue_desc"
@ -55,65 +88,37 @@
android:textColor="@color/text_80_gray"
tools:text="描述" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@drawable/shp_line_match"
android:layerType="software" />
<TextView
android:id="@+id/tv_up_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:padding="5dp"
android:textColor="@color/text_80_gray"
tools:text="上报时间200123421341234" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="3dp"
android:background="@drawable/shp_line_match"
android:layerType="software" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:orientation="horizontal"
android:padding="5dp">
android:orientation="vertical">
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/text_80_gray"
android:textColor="@color/black"
tools:text="上报类型:垃圾" />
<TextView
android:id="@+id/tv_up_user"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_weight="1"
android:textColor="@color/text_80_gray"
android:layout_marginTop="10dp"
android:textColor="@color/black"
tools:text="上报人员:张三" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="3dp"
android:background="@drawable/shp_line_match"
android:layerType="software" />
<LinearLayout
android:id="@+id/ll_voice"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="@drawable/shape_bottom_line"
android:orientation="vertical">
<LinearLayout
@ -131,7 +136,7 @@
android:gravity="left"
android:padding="5dp"
android:text="录音"
android:textColor="@color/text_80_gray" />
android:textColor="@color/black" />
<TextView
android:id="@+id/tv_voice_anim"
@ -143,12 +148,7 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="3dp"
android:background="@drawable/shp_line_match"
android:layerType="software" />
</LinearLayout>
@ -156,15 +156,8 @@
android:id="@+id/rlv_photos"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="11dp" />
android:layout_marginTop="5dp" />
<TextView
android:id="@+id/tv_issue_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="@color/text_blue"
tools:text="地址" />
<com.sucstepsoft.realtimelocation.widget.NoScrollMapView
android:layout_width="match_parent"
@ -179,7 +172,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:cardCornerRadius="10dp">
app:cardCornerRadius="5dp">
<com.baidu.mapapi.map.TextureMapView
android:id="@+id/tmv_map"
@ -187,18 +180,26 @@
android:layout_height="200dp" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/tv_issue_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/gray_ef"
android:textColor="@color/text_blue"
tools:text="地址" />
<Button
android:id="@+id/btn_reload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/cv_map"
android:layout_below="@id/tv_issue_address"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bm_btn_background"
android:minWidth="0dp"
android:minHeight="0dp" />
</RelativeLayout>
</com.sucstepsoft.realtimelocation.widget.NoScrollMapView>
@ -211,20 +212,52 @@
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
style="@style/issue_report_title"
android:drawableLeft="@drawable/ic_item_title_icon_rec"
android:drawablePadding="5dp"
android:padding="8dp"
android:text="案件处理详情"
android:textSize="14sp" />
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_rectangle_white"
android:orientation="vertical"
android:padding="10dp">
android:paddingLeft="20dp"
android:paddingRight="20dp">
<LinearLayout style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="处理人" />
<TextView
android:id="@+id/tv_handle_user"
style="@style/sel_text_show" />
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="处理时间" />
<TextView
android:id="@+id/tv_handle_time"
style="@style/sel_text_show" />
</LinearLayout>
<LinearLayout style="@style/item_white_ver">
<LinearLayout
android:layout_width="match_parent"
@ -232,45 +265,19 @@
android:orientation="horizontal">
<TextView
android:id="@+id/tv_handle_user"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/text_80_gray"
tools:text="处理人:张三" />
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="案件描述" />
<TextView
android:id="@+id/tv_handle_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_weight="1"
android:textColor="@color/text_80_gray"
tools:text="处理时间" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="4dp"
android:background="@drawable/shp_line_match"
android:layerType="software" />
<TextView
android:id="@+id/tv_issue_dis_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="left"
android:textColor="@color/text_80_gray"
tools:text="处理结果描述" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="4dp"
android:background="@drawable/shp_line_match"
android:layerType="software" />
style="@style/item_content_match_ver_gray"
android:hint="案件描述"
android:minHeight="80dp" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_dis_photo"
@ -278,15 +285,25 @@
android:layout_height="wrap_content"
android:layout_marginTop="3dp" />
<LinearLayout
android:id="@+id/ll_grade"
style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="处理满意度" />
<TextView
android:id="@+id/tv_grade"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
style="@style/sel_text_show"
android:hint="处理满意度" />
</LinearLayout>
android:gravity="right"
android:textColor="@color/text_80_gray"
tools:text="处理满意度:不满意" />
</LinearLayout>
@ -300,77 +317,83 @@
<TextView
android:id="@+id/tv_issue_dis_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
style="@style/issue_report_title"
android:drawableLeft="@drawable/ic_item_title_icon_rec"
android:drawablePadding="5dp"
android:padding="8dp"
android:text="案件处理"
android:textSize="14sp" />
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/shape_rectangle_white"
android:orientation="vertical"
android:padding="10dp">
android:paddingLeft="20dp"
android:paddingRight="20dp">
<LinearLayout style="@style/item_white_ver">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="案件处理描述" />
<ImageView
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
</LinearLayout>
<EditText
android:id="@+id/et_issue_dis_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_bg"
android:gravity="left"
style="@style/item_content_match_ver_gray"
android:hint="请输入处理描述内容"
android:minLines="5"
android:padding="3dp" />
android:inputType="textMultiLine"
android:minHeight="80dp" />
<RelativeLayout
android:id="@+id/rl_accept"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/gray_bg"
android:gravity="center_vertical"
android:padding="10dp">
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border">
<TextView
android:id="@+id/tv_issue_switch_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="处理状态"
android:textColor="#ff353535"
android:textSize="16sp" />
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="处理状态" />
<ImageView
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<Switch
android:id="@+id/sw_issue_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:checked="true"
android:switchMinWidth="40dp"
android:switchPadding="0dp"
android:textOff=""
android:textOn=""
android:thumb="@drawable/switch_ios_thumb"
android:track="@drawable/switch_ios_track_selector" />
</RelativeLayout>
style="@style/item_switch"
android:checked="true" />
</LinearLayout>
<LinearLayout
android:id="@+id/rl_grade"
style="@style/item_white_ver">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/gray_bg"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="10dp">
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="处理满意度"
android:textColor="#ff353535"
android:textSize="16sp" />
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="处理满意度" />
</LinearLayout>
<RadioGroup
android:id="@+id/rg_appraise"
@ -430,13 +453,14 @@
android:textColor="@color/col_blue_black" />
</RadioGroup>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_issue_dis_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
@ -457,7 +481,7 @@
android:background="@drawable/sel_btn_submit"
android:text="转派"
android:textColor="@color/white"
android:textSize="16sp"
android:textSize="16dp"
android:visibility="gone" />
<Button
@ -470,9 +494,9 @@
android:background="@drawable/sel_btn_submit"
android:text="确认处理"
android:textColor="@color/white"
android:textSize="16sp" />
android:textSize="16dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</android.support.v4.widget.NestedScrollView>
</RelativeLayout>

363
app/src/main/res/layout/activity_issue_report.xml
View File

@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".activitys.issue.IssueReportActivity">
<ScrollView
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
android:scrollbars="none">
android:layout_marginBottom="80dp">
<LinearLayout
android:layout_width="match_parent"
@ -19,267 +17,208 @@
android:orientation="vertical">
<TextView
android:id="@+id/tv_issue_base_info"
style="@style/issue_report_title"
android:drawableLeft="@drawable/ic_item_title_icon_rec"
android:drawablePadding="5dp"
android:padding="8dp"
android:text="基本信息"
android:text="基础信息"
android:textStyle="bold" />
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
app:cardCornerRadius="5dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:background="@color/white"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<LinearLayout style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="街道" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tv_area_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="请选择案件所属区域"
android:padding="10dp"
android:textColor="@color/black"
tools:text="区域" />
style="@style/sel_text_arrow"
android:hint="请选择案件所属区域" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<LinearLayout style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="社区" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tv_comm_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="请选择案件所属社区"
android:padding="10dp"
android:textColor="@color/black"
tools:text="社区" />
style="@style/sel_text_arrow"
android:hint="请选择案件所属社区" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<LinearLayout style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="类别" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tv_type_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="请选择案件所属类别"
android:padding="10dp"
android:textColor="@color/black"
tools:text="类别" />
style="@style/sel_text_arrow"
android:hint="请选择案件所属类别" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<LinearLayout style="@style/item_white_bottom_border">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="来源" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tv_source_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:hint="请选择案件来源"
android:padding="10dp"
android:textColor="@color/black"
tools:text="来源" />
style="@style/sel_text_arrow"
android:hint="请选择案件来源" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:padding="10dp">
<LinearLayout style="@style/item_white_bottom_border">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="自行处理"
android:textColor="@color/black" />
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="是否自处理" />
<ImageView
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<Switch
android:id="@+id/sw_is_self"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:switchMinWidth="40dp"
android:switchPadding="0dp"
android:textOff=""
android:textOn=""
android:thumb="@drawable/switch_ios_thumb"
android:track="@drawable/switch_ios_track_selector" />
</RelativeLayout>
style="@style/item_switch" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_case_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
style="@style/item_white_bottom_border"
>
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="分类" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tv_case_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="请选择案件分类"
android:padding="10dp"
android:textColor="@color/black"
tools:text="案件分类" />
style="@style/sel_text_arrow"
android:hint="请选择案件分类" />
</LinearLayout>
<LinearLayout style="@style/item_white_bottom_border">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="地址" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tv_address_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请选择案件地址"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
style="@style/sel_text_arrow"
android:hint="请选择案件发生地址" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/tv_issue_detail_info"
style="@style/issue_report_title"
android:drawableLeft="@drawable/ic_item_title_icon_rec"
android:drawablePadding="5dp"
android:padding="8dp"
android:text="详细信息"
android:textStyle="bold" />
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
app:cardCornerRadius="10dp"
app:cardElevation="1dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:padding="10dp">
android:paddingLeft="20dp"
android:paddingRight="20dp">
<LinearLayout style="@style/item_white_ver">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="案件描述" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
</LinearLayout>
<EditText
android:id="@+id/et_issue_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
style="@style/item_content_match_ver_gray"
android:hint="请输入案件描述内容"
android:minLines="5"
android:padding="8dp"
android:textSize="15sp"
tools:text="" />
android:inputType="textMultiLine"
android:minHeight="80dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/shp_rectangle_gray"
android:background="@drawable/shp_rectangle_bottom_border"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="10dp">
android:paddingTop="5dp"
android:paddingBottom="5dp">
<LinearLayout
android:id="@+id/ll_voice"
@ -293,13 +232,17 @@
android:id="@+id/tv_voice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_record_video"
android:drawablePadding="8dp"
android:gravity="left"
android:padding="5dp"
android:text="录音"
android:textColor="@color/black"
android:textSize="@dimen/text_16" />
android:textSize="14dp" />
<ImageView
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tv_voice_anim"
@ -318,54 +261,58 @@
<com.cjt2325.cameralibrary.videorecord.AudioRecordButton
android:id="@+id/arb_audio"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_height="25dp"
android:background="@drawable/sel_btn_submit"
android:gravity="center"
android:text="@string/long_click_record"
android:textColor="#fff"
android:textSize="15sp" />
android:textSize="14dp" />
</LinearLayout>
<LinearLayout style="@style/item_white_ver">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
android:orientation="horizontal">
<TextView
style="@style/item_title_wrap"
android:layout_gravity="center_vertical"
android:text="上传图片" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
style="@style/style_hint_star"
android:layout_gravity="center_vertical" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_locale_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="10dp"
app:cardCornerRadius="10dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="false">
android:paddingLeft="5dp"
android:paddingRight="5dp"
tools:itemCount="2"
tools:listitem="@layout/item_apply_service_photo" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<Button
android:id="@+id/btn_submit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:background="@drawable/sel_btn_submit"
android:text="上报"
android:textColor="@color/white"
android:textSize="18sp" />
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>
android:textSize="18dp" />
</RelativeLayout>

2
app/src/main/res/layout/activity_new_search_person_by_house.xml
View File

@ -70,7 +70,7 @@
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp"
app:defaultItemCount="2"
app:defaultItemCount="1"
app:expandText="展开"
app:hideText="收起"
app:tipTextSize="14dp">

8
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -9,8 +9,8 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
*/
public class BaseUrlApi {
public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/
// public static final String IP = "http://192.168.0.15:7021/usercenter/"; /*测试统一用户*/
// public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/
public static final String IP = "http://192.168.0.15:7021/usercenter/"; /*测试统一用户*/
// public static final String IP = "http://175.24.42.217:7000/usercenter/"; /*测试统一用户*/
public static final String BASE_URL = IP;
public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion";
@ -18,9 +18,9 @@ public class BaseUrlApi {
public static final String FIELD_SAFETY = BASE_URL + "appFieldSafety/goFloorPlan";
public static final int PHOTO_REQUEST = 233;
public static final int CAMERA_REQUEST = 123;
public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/
// public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/
// public static final String BASE_IP_P = "http://175.24.42.217"; /*演示IP*/
// public static final String BASE_IP_P = "http://192.168.0.9:7023/"; /*测试IP*/
public static final String BASE_IP_P = "http://192.168.0.15:7022/"; /*测试IP*/
public static final String BASE_IP = BASE_IP_P + "servicecity/";/*网格系统*/
// public static final String BASE_IP = "http://192.168.0.109:8083/servicecity/";/*测试网格系统*/
public static final String BASE_POPULATION_IP = BASE_IP_P + "population/";/*人口系统*/