From 3e87744e6fc7e2899befd960d9ff94bfd8839190 Mon Sep 17 00:00:00 2001 From: xiaoyan159 Date: Tue, 10 May 2022 15:06:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/fragment/PoiVideoFragment.java | 4 +++ .../outdoor/fragment/RoadFragment.java | 15 ++++++++++ .../navinfo/outdoor/http/HttpInterface.java | 4 +-- app/src/main/res/layout/fragment_road.xml | 29 +++++++++++-------- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7038bda..b4988b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 21 - versionName "8.220509" + versionName "8.220510" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index a7cb163..78b4ab2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -563,6 +563,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick public void onGranted(List 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()); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index 084d35b..e5c3743 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -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 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()) diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index d24b38c..9ed77b3 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -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/";//登录 diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml index 8031c8a..389b82f 100644 --- a/app/src/main/res/layout/fragment_road.xml +++ b/app/src/main/res/layout/fragment_road.xml @@ -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" /> + android:text="其他不可采原因"> + 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"> @@ -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"