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-23 10:10:38 +08:00
parent 0dbdfcadf7
commit 30b390f4fb
5 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,7 +160,7 @@ public class IssueDetailActivity extends BaseActivity {
public void initData() { public void initData() {
mBind = ButterKnife.bind(this); mBind = ButterKnife.bind(this);
refreshView(STATE_LOAD_LOADING); refreshView(STATE_LOAD_LOADING);
mTvBaseTitle.setText("上报详情"); mTvBaseTitle.setText("案件详情");
mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("流程"); mTvPublish.setText("流程");
mId = getIntent().getStringExtra("id"); mId = getIntent().getStringExtra("id");
@ -173,13 +173,11 @@ public class IssueDetailActivity extends BaseActivity {
String mine = getIntent().getStringExtra("mine"); String mine = getIntent().getStringExtra("mine");
mCheck = getIntent().getStringExtra("check"); mCheck = getIntent().getStringExtra("check");
if (TextUtils.isEmpty(mCheck)) { if (TextUtils.isEmpty(mCheck)) {
mLlIssueDisDetail.setVisibility(View.GONE);
mLlGrade.setVisibility(View.GONE); mLlGrade.setVisibility(View.GONE);
mBtnReturn.setVisibility(View.VISIBLE); mBtnReturn.setVisibility(View.VISIBLE);
} else { } else {
mLlGrade.setVisibility(View.VISIBLE); mLlGrade.setVisibility(View.VISIBLE);
mBtnReturn.setVisibility(View.GONE); mBtnReturn.setVisibility(View.GONE);
mLlIssueDisDetail.setVisibility(View.VISIBLE);
} }
if (!TextUtils.isEmpty(mine)) { if (!TextUtils.isEmpty(mine)) {
mLlIssueDis.setVisibility(View.VISIBLE); mLlIssueDis.setVisibility(View.VISIBLE);
@ -261,12 +259,10 @@ public class IssueDetailActivity extends BaseActivity {
}); });
//检查 //检查
if (!TextUtils.isEmpty(mCheck)) { if (!TextUtils.isEmpty(mCheck)) {
mLlIssueDisDetail.setVisibility(View.VISIBLE);
mTvSwitchTitle.setText("是否合格"); mTvSwitchTitle.setText("是否合格");
mEtIssueDisDesc.setHint("请输入评价内容"); mEtIssueDisDesc.setHint("请输入评价内容");
mTvIssueDisTitle.setText(Html.fromHtml(getResources().getString(R.string.tip_issue_start_check))); mTvIssueDisTitle.setText(Html.fromHtml(getResources().getString(R.string.tip_issue_start_check)));
} else { } else {
mLlIssueDisDetail.setVisibility(View.GONE);
mTvSwitchTitle.setText("处理状态"); mTvSwitchTitle.setText("处理状态");
mEtIssueDisDesc.setHint("请输入处理描述内容"); mEtIssueDisDesc.setHint("请输入处理描述内容");
mTvIssueDisTitle.setText(Html.fromHtml(getResources().getString(R.string.tip_issue_start_dis))); 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); mRlvPhotos.setVisibility(View.GONE);
} }
//TODO 填充处理数据 //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()); mTvHandleTime.setText(mDetailBean.getHandleCreateTime());
mTvHandleUser.setText(mDetailBean.getHandleUserName()); mTvHandleUser.setText(mDetailBean.getHandleUserName());
mTvIssueDisDesc.setText(mDetailBean.getHandleOpinion()); mTvIssueDisDesc.setText(mDetailBean.getHandleOpinion());
@ -792,6 +796,8 @@ public class IssueDetailActivity extends BaseActivity {
startActivity(intent); startActivity(intent);
}); });
} }
} else {
mLlIssueDisDetail.setVisibility(View.GONE);
} }
} }
} }

1
app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java
View File

@ -1073,7 +1073,6 @@ public class LocationService extends NotificationService {
} }
} }
LogUtils.e("是否可以上传:" + isLegal);
return isLegal; return isLegal;
} }

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

@ -117,8 +117,8 @@
android:id="@+id/ll_voice" android:id="@+id/ll_voice"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="@drawable/shape_bottom_line" android:background="@drawable/shape_bottom_line"
android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
@ -161,46 +161,53 @@
<com.sucstepsoft.realtimelocation.widget.NoScrollMapView <com.sucstepsoft.realtimelocation.widget.NoScrollMapView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<RelativeLayout
<android.support.v7.widget.CardView
android:id="@+id/cv_map"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
app:cardCornerRadius="5dp">
<android.support.v7.widget.CardView <RelativeLayout
android:id="@+id/cv_map"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="230dp">
android:layout_marginTop="10dp"
app:cardCornerRadius="5dp">
<com.baidu.mapapi.map.TextureMapView <com.baidu.mapapi.map.TextureMapView
android:id="@+id/tmv_map" android:id="@+id/tmv_map"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" /> android:layout_height="match_parent" />
</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_tran"
android:drawableLeft="@drawable/ic_location_blue"
android:ellipsize="end"
android:maxLines="1"
android:padding="2dp"
android:textColor="@color/white"
android:textSize="14dp"
tools:text="地址" />
<TextView <Button
android:id="@+id/tv_issue_address" android:id="@+id/btn_reload"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentRight="true"
android:background="@color/gray_ef" android:layout_alignParentBottom="true"
android:textColor="@color/text_blue" android:layout_marginRight="10dp"
tools:text="地址" /> android:layout_marginBottom="30dp"
android:background="@drawable/bm_btn_background"
android:minWidth="0dp"
android:minHeight="0dp" />
<Button </RelativeLayout>
android:id="@+id/btn_reload" </android.support.v7.widget.CardView>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_issue_address"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:background="@drawable/bm_btn_background"
android:minWidth="0dp"
android:minHeight="0dp" />
</RelativeLayout>
</com.sucstepsoft.realtimelocation.widget.NoScrollMapView> </com.sucstepsoft.realtimelocation.widget.NoScrollMapView>
</LinearLayout> </LinearLayout>

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

@ -241,6 +241,7 @@
<ImageView <ImageView
style="@style/style_hint_star" style="@style/style_hint_star"
android:visibility="gone"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />

1
cm_utils/src/main/res/values/colors.xml
View File

@ -95,6 +95,7 @@
<color name="gray_db">#D8D8D8</color> <color name="gray_db">#D8D8D8</color>
<color name="home_background">#f5f5f5</color> <color name="home_background">#f5f5f5</color>
<color name="gray_tran">#7F393838</color>
<color name="gray_text">#777777</color> <color name="gray_text">#777777</color>
<color name="my_blue_bg">#ff7271</color> <color name="my_blue_bg">#ff7271</color>
<color name="button_bg">#8bc6f7</color> <color name="button_bg">#8bc6f7</color>