From 440fd90a5f8cedd19d7296c18727828073001078 Mon Sep 17 00:00:00 2001 From: md Date: Thu, 29 Jul 2021 20:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80=E9=80=82?= =?UTF-8?q?=E9=85=8Dbug(=E9=83=A8=E5=88=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../com/navinfo/outdoor/adapter/StaySubmitAdapter.java | 1 + .../outdoor/fragment/ChargingStationFragment.java | 2 ++ .../java/com/navinfo/outdoor/fragment/OtherFragment.java | 1 + .../java/com/navinfo/outdoor/fragment/PoiFragment.java | 1 + .../com/navinfo/outdoor/fragment/PoiVideoFragment.java | 9 +++++++-- .../java/com/navinfo/outdoor/fragment/RoadFragment.java | 2 ++ .../com/navinfo/outdoor/fragment/StaySubmitFragment.java | 2 ++ app/src/main/res/layout/charging_pile_fragment.xml | 2 ++ app/src/main/res/layout/charging_station_fragment.xml | 2 ++ app/src/main/res/layout/fragment_other.xml | 2 ++ app/src/main/res/layout/fragment_road.xml | 8 ++++++-- app/src/main/res/layout/poi_fragment.xml | 4 +++- app/src/main/res/layout/poi_video_fragment.xml | 8 ++++++-- 14 files changed, 38 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7977df5..aa5c917 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '29.0.2' - //ndkVersion '23.0.7123448' + ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java index e010077..097dac7 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java @@ -64,6 +64,7 @@ public class StaySubmitAdapter extends RecyclerView.Adapter chargingStationList) { + showLoadingDialog(); if (poiEntity == null || poiEntity.getBodyId() == 0) { Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); Log.e("TAG", "poiUploadByNetWork: " + poiEntity.getBodyId() + chargingStationList); @@ -979,6 +980,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. getActivity().runOnUiThread(new Runnable() { @Override public void run() { + OkGo // 请求方式和请求url .post(HttpInterface.C_TASK_UP_LOAD_PIC) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 314c57d..d61a0e6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -454,6 +454,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Log.e("TAG", "poiUploadByNetWork: " + body + otherUploadList); return; } + showLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.OTHER_TASK_UPLOAD_PIC) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 7aa3c79..7bc9701 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -725,6 +725,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe Log.e("TAG", "poiUploadByNetWork: " + body + poiPicList); return; } + showLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.POI_TASK_UPLOAD_PIC) 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 34dc11e..0be6c87 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -220,7 +220,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick ivPoiVideoPicture.setTag(videoFile); } }else { - + Toast.makeText(getContext(), "请先录像", Toast.LENGTH_SHORT).show(); } } //判断是否是已做完任务并保存成功 @@ -236,6 +236,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick tvPictures.setEnabled(false); etDesc.setEnabled(false); btnRoadSave.setEnabled(false); + rbCar.setEnabled(false); + rbWalking.setEnabled(false); + rbManual.setEnabled(false); + rbBicycle.setEnabled(false); } @Override @@ -441,6 +445,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show(); return; } + showLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.POI_VIDEO_UPLOAD_PIC) @@ -520,7 +525,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick }).start(); Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(getActivity(), "没有获取到具体位置", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), ""+poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); } } 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 6c8f157..06d6dfb 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -196,6 +196,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } } } + if (showPoiEntity.getTaskStatus() == 3){ disables(); } @@ -414,6 +415,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList Toast.makeText(getContext(), "未压缩完成", Toast.LENGTH_SHORT).show(); return; } + showLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.ROAD_TASK_UPLOAD_PIC) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index e3033ff..2c5135f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -202,6 +202,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList @Override public boolean onClick(BaseDialog baseDialog, View v) { staySubmitAdapter.setAllCheckedDelete(); + staySubmitAdapter.notifyDataSetChanged(); return false; } }); @@ -252,6 +253,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } Log.d("TAG", "run: " + roadEntities.toString()); staySubmitAdapter.setAllRoad(roadEntities); + staySubmitAdapter.notifyDataSetChanged(); } }); } diff --git a/app/src/main/res/layout/charging_pile_fragment.xml b/app/src/main/res/layout/charging_pile_fragment.xml index bb24654..1d0abe5 100644 --- a/app/src/main/res/layout/charging_pile_fragment.xml +++ b/app/src/main/res/layout/charging_pile_fragment.xml @@ -107,6 +107,8 @@ android:layout_toRightOf="@id/tv_name" android:background="@color/white" android:text="充电桩" + android:inputType="text" + android:maxLines="1" android:layout_toEndOf="@id/tv_name" android:textSize="15sp" android:textColor="#333" /> diff --git a/app/src/main/res/layout/charging_station_fragment.xml b/app/src/main/res/layout/charging_station_fragment.xml index f51ab1a..6849742 100644 --- a/app/src/main/res/layout/charging_station_fragment.xml +++ b/app/src/main/res/layout/charging_station_fragment.xml @@ -108,6 +108,8 @@ android:layout_toRightOf="@id/tv_name" android:background="@color/white" android:hint="名称" + android:inputType="text" + android:maxLines="1" android:layout_toEndOf="@id/tv_name" android:layout_toStartOf="@id/tv_examine" android:textSize="15sp" diff --git a/app/src/main/res/layout/fragment_other.xml b/app/src/main/res/layout/fragment_other.xml index 1234974..1ff087a 100644 --- a/app/src/main/res/layout/fragment_other.xml +++ b/app/src/main/res/layout/fragment_other.xml @@ -150,6 +150,8 @@ android:layout_marginLeft="15dp" android:background="@null" android:hint="任务名称" + android:inputType="text" + android:maxLines="1" android:textColor="@color/test_color_selector" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml index cff79d1..91d5ce5 100644 --- a/app/src/main/res/layout/fragment_road.xml +++ b/app/src/main/res/layout/fragment_road.xml @@ -34,11 +34,13 @@ @@ -53,10 +55,12 @@ diff --git a/app/src/main/res/layout/poi_fragment.xml b/app/src/main/res/layout/poi_fragment.xml index 6bf5af4..228622e 100644 --- a/app/src/main/res/layout/poi_fragment.xml +++ b/app/src/main/res/layout/poi_fragment.xml @@ -103,12 +103,14 @@ @@ -49,8 +51,10 @@