diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java index ac96d21..0153802 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java @@ -160,7 +160,7 @@ public class IssueDetailActivity extends BaseActivity { public void initData() { mBind = ButterKnife.bind(this); refreshView(STATE_LOAD_LOADING); - mTvBaseTitle.setText("上报详情"); + mTvBaseTitle.setText("案件详情"); mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setText("流程"); mId = getIntent().getStringExtra("id"); @@ -173,13 +173,11 @@ public class IssueDetailActivity extends BaseActivity { String mine = getIntent().getStringExtra("mine"); mCheck = getIntent().getStringExtra("check"); if (TextUtils.isEmpty(mCheck)) { - mLlIssueDisDetail.setVisibility(View.GONE); mLlGrade.setVisibility(View.GONE); mBtnReturn.setVisibility(View.VISIBLE); } else { mLlGrade.setVisibility(View.VISIBLE); mBtnReturn.setVisibility(View.GONE); - mLlIssueDisDetail.setVisibility(View.VISIBLE); } if (!TextUtils.isEmpty(mine)) { mLlIssueDis.setVisibility(View.VISIBLE); @@ -261,12 +259,10 @@ public class IssueDetailActivity extends BaseActivity { }); //检查 if (!TextUtils.isEmpty(mCheck)) { - mLlIssueDisDetail.setVisibility(View.VISIBLE); mTvSwitchTitle.setText("是否合格"); mEtIssueDisDesc.setHint("请输入评价内容"); mTvIssueDisTitle.setText(Html.fromHtml(getResources().getString(R.string.tip_issue_start_check))); } else { - mLlIssueDisDetail.setVisibility(View.GONE); mTvSwitchTitle.setText("处理状态"); mEtIssueDisDesc.setHint("请输入处理描述内容"); mTvIssueDisTitle.setText(Html.fromHtml(getResources().getString(R.string.tip_issue_start_dis))); @@ -762,7 +758,15 @@ public class IssueDetailActivity extends BaseActivity { mRlvPhotos.setVisibility(View.GONE); } //TODO 填充处理数据 - if (!TextUtils.isEmpty(mCheck)) { + boolean isShowHandle = + "0".equals(mDetailBean.getCaseStatus()) + || "1".equals(mDetailBean.getCaseStatus()) + || "2".equals(mDetailBean.getCaseStatus()) + || "3".equals(mDetailBean.getCaseStatus()); + boolean showHandle = !TextUtils.isEmpty(mCheck) | !isShowHandle; + LogUtils.e(isShowHandle + "===" + showHandle); + if (showHandle) { + mLlIssueDisDetail.setVisibility(View.VISIBLE); mTvHandleTime.setText(mDetailBean.getHandleCreateTime()); mTvHandleUser.setText(mDetailBean.getHandleUserName()); mTvIssueDisDesc.setText(mDetailBean.getHandleOpinion()); @@ -792,6 +796,8 @@ public class IssueDetailActivity extends BaseActivity { startActivity(intent); }); } + } else { + mLlIssueDisDetail.setVisibility(View.GONE); } } } diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java b/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java index ad75690..0741886 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java @@ -1073,7 +1073,6 @@ public class LocationService extends NotificationService { } } - LogUtils.e("是否可以上传:" + isLegal); return isLegal; } diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml index 71c2f6c..fa9d2b7 100755 --- a/app/src/main/res/layout/activity_issue_detail.xml +++ b/app/src/main/res/layout/activity_issue_detail.xml @@ -117,8 +117,8 @@ 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:gravity="center_vertical" android:orientation="vertical"> + android:layout_height="wrap_content" + android:layout_marginTop="10dp"> - + android:layout_height="wrap_content" + app:cardCornerRadius="5dp"> - + android:layout_height="230dp"> - + android:layout_height="match_parent" /> + - +