From 4c114b8357cb7445a6cf14fccf05ee68b6a1184c Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Sun, 15 Aug 2021 19:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                    |  2 +-
 .../outdoor/adapter/CapacityEvaluationAdapter.java  |  2 +-
 .../fragment/CapacityEvaluationFragment.java        |  1 +
 .../fragment/CapacityMeasurementFragment.java       |  3 ++-
 .../navinfo/outdoor/fragment/HasSubmitFragment.java |  7 ++++---
 .../com/navinfo/outdoor/fragment/PoiFragment.java   |  2 +-
 .../java/com/navinfo/outdoor/util/PoiSaveUtils.java | 11 ++++++-----
 app/src/main/res/layout/fragment_has_submit.xml     | 13 +++++++------
 8 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d1bb336..5e04152 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/CapacityEvaluationAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java
index 893a008..9de26ce 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java
@@ -50,7 +50,7 @@ public class CapacityEvaluationAdapter extends RecyclerView.Adapter<CapacityEval
             @Override
             public void onClick(View v) {
                 if (onCapacityClick != null) {
-                    onCapacityClick.onClick(position);
+                    onCapacityClick.onClick(capacityList.get(position).getId());
                 }
             }
         });
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
index b8a09b6..228b86c 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
@@ -83,6 +83,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
             public void onClick(int id) {
                 Intent capacityEvaWeb = new Intent(getActivity(), FragmentManagement.class);
                 capacityEvaWeb.putExtra("tag", 14);
+                capacityEvaWeb.putExtra("id",id+"");
                 startActivity(capacityEvaWeb);
             }
         });
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java
index 88285ef..d532517 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java
@@ -90,8 +90,9 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On
 
     private void initNetWorks(boolean b) {
         showLoadingDialog();
+        String id = getActivity().getIntent().getStringExtra("id");
         HttpParams httpParams = new HttpParams();
-        httpParams.put("id", "11");
+        httpParams.put("id", id);
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
                 .url(HttpInterface.EXAM_CONTENT)
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
index 9d263d5..8125a5f 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
@@ -98,10 +98,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
 
     public void initRequest() {
         initPoiSubMitWork();//poi
+        initChaningSubMitWork();//充电站
         initPoiVideoSubMitWork();//poi录像
         initRoadSubMitWork();//道路录像
-        initChaningSubMitWork();//充电站录像
-        initOtherSubMitWork();//其他录像
+        initOtherSubMitWork();//其他
     }
 
     private void initOtherSubMitWork() {
@@ -148,7 +148,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
         HttpParams httpParams = new HttpParams();
         httpParams.put("type", "2");
         httpParams.put("pageSize", "10");
-        httpParams.put("pageNum", "2");
+        httpParams.put("pageNum", hasPage);
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
                 .url(HttpInterface.GET_COMMIT_LIST)
@@ -165,6 +165,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
                                 chargingAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + "");
                                 chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount() + "");
                                 chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + "");
+                                hasPage++;
                             }
                         } else {
                             Toast.makeText(getActivity(), hasSubmitBean.getMessage() + "", Toast.LENGTH_SHORT).show();
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 135b7b1..6f36a80 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -509,7 +509,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                         if (getPhoneBean.getCode() == 200) {
                             String code = getPhoneBean.getBody().getCode();
                             Integer telLength = getPhoneBean.getBody().getTelLength();
-                            if (!code.equals(Constant.CODE)){
+                            if (!Constant.CODE.equals(code)){
                                 DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
                                 MessageDialog.show((AppCompatActivity) getContext(), "提示", "此地区区号为"+code+"，请手动修改", "确定","取消").setOkButton(new OnDialogButtonClickListener() {
                                     @Override
diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
index e73a272..df45e39 100644
--- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
+++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
@@ -250,7 +250,6 @@ public class PoiSaveUtils {
             return;
         }
         ArrayList<File> photoFile = new ArrayList<>();
-        photoFile.clear();
         if (poiEntity.getPhotoInfo() != null) {
             if (poiEntity.getPhotoInfo().size() > 0) {
                 for (int i = 0; i < poiEntity.getPhotoInfo().size(); i++) {
@@ -268,11 +267,12 @@ public class PoiSaveUtils {
                 txtFileList.add(file);
             }
             videoFileList.addAll(txtFileList);
+            File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
+            ZipUtil.zipFiles(videoFileList, fileZip, null);
+            if (fileZip!=null){
+                photoFile.add(fileZip);
+            }
         }
-        File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
-        ZipUtil.zipFiles(videoFileList, fileZip, null);
-        photoFile.add(fileZip);
-
         String url = null;
         //1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
         if (poiEntity.getType() == 1) {
@@ -289,6 +289,7 @@ public class PoiSaveUtils {
         try {
             HttpParams httpParams=new HttpParams();
             httpParams.put("auditId",bodyId);
+
             Response execute = OkGoBuilder.getInstance()
                     .Builder(mContext)
                     .url(url)
diff --git a/app/src/main/res/layout/fragment_has_submit.xml b/app/src/main/res/layout/fragment_has_submit.xml
index 7c7bebc..b7ff7b5 100644
--- a/app/src/main/res/layout/fragment_has_submit.xml
+++ b/app/src/main/res/layout/fragment_has_submit.xml
@@ -254,7 +254,8 @@
                 android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/charging_audit_process"
+
+                android:id="@+id/road_audit_process"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="1"
@@ -268,7 +269,7 @@
                 android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/charging_audit_through"
+                android:id="@+id/road_audit_through"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="1"
@@ -282,7 +283,7 @@
                 android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/charging_audit_not_through"
+                android:id="@+id/road_audit_not_through"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="18"
@@ -349,7 +350,7 @@
                 android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/road_audit_process"
+                android:id="@+id/charging_audit_process"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="1"
@@ -363,7 +364,7 @@
                 android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/road_audit_through"
+                android:id="@+id/charging_audit_through"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="1"
@@ -377,7 +378,7 @@
                 android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/road_audit_not_through"
+                android:id="@+id/charging_audit_not_through"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="18"