xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改任务状态

Browse Source
This commit is contained in:
xiaoyan159 2022-05-10 15:06:59 +08:00
parent c4ce6e4e1d
commit 3e87744e6f
5 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -10,7 +10,7 @@ android {
minSdkVersion 22
targetSdkVersion 30
versionCode 21
versionName "8.220509"
versionName "8.220510"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {

4
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@ -563,6 +563,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
public void onGranted(List<String> permissions, boolean all) {
if (all) {
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
if (poiEntity.getPhoto() == null||poiEntity.getPhoto().isEmpty()) {
Toast.makeText(getActivity(), "POI录像任务必须拍照！", Toast.LENGTH_LONG).show();
return;
}
PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity);
if (poiCheckResult.getCode() == 1) {
ToastUtils.Message(getActivity(), poiCheckResult.getMsg());

15
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@ -428,6 +428,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
tvPictures.setEnabled(false);
etDesc.setEnabled(false);
btnRoadSave.setEnabled(false);
rgRoadStatus.setEnabled(false);
rbtnRoadOpen.setEnabled(false);
rbtnRoadPartOpen.setEnabled(false);
rbtnRoadHasntOpen.setEnabled(false);
rbtnRoadHasntFind.setEnabled(false);
rbtnRoadOther.setEnabled(false);
edtCheckedOther.setEnabled(false);
}
@Subscribe
@ -579,6 +587,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
public void onGranted(List<String> permissions, boolean all) {
if (all) {
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
if (poiEntity.getPhoto() == null||poiEntity.getPhoto().isEmpty()) {
Toast.makeText(getActivity(), "道路任务必须拍照！", Toast.LENGTH_LONG).show();
return;
}
PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity);
if (poiCheckResult.getCode() == 1) {
ToastUtils.Message(getActivity(), poiCheckResult.getMsg());
@ -681,6 +693,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
httpParams.put("address", poiEntity.getAddress());
httpParams.put("workType", 0);
httpParams.put("memo", poiEntity.getMemo());
// 增加对应九天平台的参数
httpParams.put("existence", rgRoadStatus.getTag().toString());
httpParams.put("description", edtCheckedOther!=null&&edtCheckedOther.isShown()? edtCheckedOther.getText().toString().trim(): "");
OkGoBuilder okGoBuilder = OkGoBuilder.getInstance()
.time(30)
.Builder(getActivity())

4
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@ -2,8 +2,8 @@ package com.navinfo.outdoor.http;
public class HttpInterface {
public static final String IP2 = "http://172.23.139.129:9999/m4";//测试接口
public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//测试接口-外网
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//测试接口-外网
public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String USER_PATH = "/user/";//我的
public static final String MSG_LIST_PATH = "/msgList/";//发现
public static final String USER_LOGIN_PATH = "/userlogin/";//登录

29
app/src/main/res/layout/fragment_road.xml
View File

@ -133,7 +133,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:text="03.描述"
android:text="03.任务状态"
android:textColor="@color/black"
android:textSize="16sp" />
<RadioGroup
@ -172,19 +172,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="4"
android:text="其他"></RadioButton>
android:text="其他不可采原因"></RadioButton>
</RadioGroup>
<EditText
android:id="@+id/edt_checked_other"
android:visibility="gone"
android:padding="@dimen/default_widget_padding"
android:hint="请添加描述文字"
android:maxLength="400"
android:maxLines="3"
android:layout_marginLeft="@dimen/fab_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/underline"></EditText>
android:layout_height="match_parent"
android:layout_margin="10dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="可手动输入"
android:padding="10dp"
android:minLines="2"
android:maxLines="3"
android:background="@drawable/underline"
android:textColor="@color/test_color_selector"
android:textSize="15sp"></EditText>
</LinearLayout>
@ -227,9 +232,9 @@
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="任务描述"
android:paddingStart="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
android:padding="10dp"
android:minLines="2"
android:maxLines="3"
android:textColor="@color/test_color_selector"
android:textSize="15sp"