diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
index 539c899..3811df7 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
@@ -104,6 +104,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
     private boolean isOration = true;
     private boolean isTerminus = false;
     private boolean isBack = true;
+    private boolean isGPS = false;
     private int type = 0;
     private int radioPicture = 0;
     private int videoIndex = -1;
@@ -287,6 +288,33 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                 if (result != null && result.getData() != null && result.getData().length > 0) {
                     super.onPictureTaken(result);
                     isBack = true;
+
+
+                    //判断当前的信号强度
+                    if (!isGPS){
+                        int gpsRssi = Constant.currentLocation.getGPSRssi();
+                        if (gpsRssi==0){//无信号
+                            stopTimer();
+                            capturePicture.setChecked(false);
+                            if (radioPicture != 1) {
+                                capturePicture.setText("开始采集");
+                                capturePicture.setChecked(false);
+                            }
+                            return;
+                        }else if (gpsRssi==1){//信号弱
+                            stopTimer();
+                            capturePicture.setChecked(false);
+                            if (radioPicture != 1) {
+                                capturePicture.setText("开始采集");
+                                capturePicture.setChecked(false);
+                            }
+                            return;
+                        }else if (gpsRssi==2){//信号中
+                            isGPS=true;
+                        }else if (gpsRssi==3){//信号强
+                            isGPS=true;
+                        }
+                    }
                     // 如果当前手机是竖向，则不
                     if (isOration) {
                         if (Objects.requireNonNull(camera.getPictureSize()).getWidth() < camera.getPictureSize().getHeight()) {
@@ -360,6 +388,14 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                                     }
                                 }).start();
                             } else {
+                                isBack = false;
+                                if (isOration) {
+                                    stopTimer();
+                                }
+                                if (radioPicture != 1) {
+                                    capturePicture.setText("开始采集");
+                                }
+                                capturePicture.setChecked(false);
                                 runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
@@ -371,11 +407,13 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                     });
                 } else {
                     isBack = false;
+                    if (isOration) {
+                        stopTimer();
+                    }
                     if (radioPicture != 1) {
                         capturePicture.setText("开始采集");
                     }
                     capturePicture.setChecked(false);
-                    stopTimer();
                 }
             }
         });
@@ -527,7 +565,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                     tencentMap.animateCamera(cameraSigma);
                 }
                 break;
-
         }
     }
 
@@ -740,7 +777,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                 }
             }, 100);
         }
-
     }
 
     private void initTerminus() {
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
index 09b71bd..ebb8ba2 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHolder> {
     private Context context;
-    private List<HasSubmitBean.BodyBean.ListBean> listBeans ;
+    private List<HasSubmitBean.BodyBean.ListBean> listBeans;
 
 
     public PoiTaskAdapter(Context context, List<HasSubmitBean.BodyBean.ListBean> listBeans) {
@@ -42,18 +42,20 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
         HasSubmitBean.BodyBean.ListBean listBean = listBeans.get(position);
         holder.tvnName.setText(listBean.getName());
         holder.tvTime.setText(listBean.getCreateTime());
-        if (listBean.getAuditStatus()==0){
+        if (listBean.getAuditStatus() == 0) {
             holder.tvAuditStatus.setText("审核通过");
             holder.tvMassage.setVisibility(View.GONE);
-        }else if (listBean.getAuditStatus() == 1){
+        } else if (listBean.getAuditStatus() == 1) {
             holder.tvAuditStatus.setText("审核未通过");
             holder.tvMassage.setVisibility(View.VISIBLE);
-            holder.tvMassage.setText(listBean.getAuditMsg());
-        }else if (listBean.getAuditStatus() == -1){
+            if (listBean.getAuditMsg()!=null&&!listBean.getAuditMsg().equals("")){
+                holder.tvMassage.setText(listBean.getAuditMsg());
+            }
+        } else if (listBean.getAuditStatus() == -1) {
             holder.tvAuditStatus.setText("待审核");
             holder.tvMassage.setVisibility(View.GONE);
         }
-        holder.tvMany.setText("￥"+listBean.getPrice());
+        holder.tvMany.setText("￥" + listBean.getPrice());
     }
 
     @Override
@@ -62,13 +64,13 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
-        TextView tvnName, tvTime, tvMany, tvMassage ,tvAuditStatus;
+        TextView tvnName, tvTime, tvMany, tvMassage, tvAuditStatus;
 
         public ViewHolder(@NonNull @NotNull View itemView) {
             super(itemView);
             tvnName = itemView.findViewById(R.id.tv_has_name);
             tvTime = itemView.findViewById(R.id.tv_createTime);
-             tvAuditStatus= itemView.findViewById(R.id.tv_auditStatus);
+            tvAuditStatus = itemView.findViewById(R.id.tv_auditStatus);
             tvMassage = itemView.findViewById(R.id.tv_auditMsg);
             tvMany = itemView.findViewById(R.id.tv_many);
         }
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 e490c5c..0fc457b 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
@@ -63,7 +63,7 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
                     while (iterator.hasNext()) {
                         PoiEntity poiEntity = (PoiEntity) iterator.next();
                         if (poiEntity.isChecked()) {
-                            /*PoiEntityDeleteUtil.getInstance().deleteUtil(context,poiEntity);*/
+                            PoiEntityDeleteUtil.getInstance().deleteUtil(context,poiEntity);
                             poiEntity.setTaskStatus(100);
                             PoiDatabase.getInstance(context).getPoiDao().updatePoiEntity(poiEntity);
                             iterator.remove();
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
index d3d89f8..9f815f4 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
@@ -215,7 +215,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     markerPile.setIcon(pileDescriptor);
                     checkBoxLife.setText("编辑");
                     checkBoxLife.setTextColor(Color.BLACK);
-                    if (screenPilePositions.x!=0||screenPilePositions.y!=0){
+                    if (screenPilePositions.x != 0 || screenPilePositions.y != 0) {
                         latLng = tencentMap.getProjection().fromScreenLocation(screenPilePositions);
                     }
                     markerPile.setPosition(latLng);
@@ -241,7 +241,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     checkButton3.setChecked(false);
                     checkButton4.setChecked(false);
                     checkButton5.setChecked(false);
-                }else {
+                } else {
                     buffer1 = "";
                 }
             }
@@ -321,6 +321,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                         break;
                 }
             }
+
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
@@ -379,7 +380,8 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
             }
 
             @Override
-            public void onNothingSelected(AdapterView<?> parent) {}
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
         });
         spinnerScutcheon = findViewById(R.id.spinner_scutcheon);
         ArrayAdapter<String> adapterScutcheon = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, scutcheon);
@@ -399,7 +401,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     case 1:
                         chargingPileBuilder.append(TimestampUtil.time()).append(",").append("点击了下拉框 不存在,");
                         rlFacility.setBackgroundColor(Color.parseColor("#03A9F4"));
-                        if (exist==0){
+                        if (exist == 0) {
                             rlScutcheon.setVisibility(View.VISIBLE);
                             rlDevice.setVisibility(View.VISIBLE);
                         }
@@ -519,7 +521,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivAvailable.setImageDrawable(null);
-                        if (tvAvailable.getTag()!=null){
+                        if (tvAvailable.getTag() != null) {
                             File file = new File((String) tvAvailable.getTag());
                             file.delete();
                             tvAvailable.setTag(null);
@@ -539,7 +541,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivUsable.setImageDrawable(null);
-                        if (tvUsable.getTag()!=null){
+                        if (tvUsable.getTag() != null) {
                             File file = new File((String) tvUsable.getTag());
                             file.delete();
                             tvUsable.setTag(null);
@@ -559,7 +561,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivScutcheon.setImageDrawable(null);
-                        if (tvScutcheon.getTag()!=null){
+                        if (tvScutcheon.getTag() != null) {
                             File file = new File((String) tvScutcheon.getTag());
                             file.delete();
                             tvScutcheon.setTag(null);
@@ -580,7 +582,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivParking.setImageDrawable(null);
-                        if (tvParking.getTag()!=null){
+                        if (tvParking.getTag() != null) {
                             File file = new File((String) tvParking.getTag());
                             file.delete();
                             tvParking.setTag(null);
@@ -600,7 +602,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivPanorama.setImageDrawable(null);
-                        if (tvPanorama.getTag()!=null){
+                        if (tvPanorama.getTag() != null) {
                             File file = new File((String) tvPanorama.getTag());
                             file.delete();
                             tvPanorama.setTag(null);
@@ -620,7 +622,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivNumber.setImageDrawable(null);
-                        if (tvNumber.getTag()!=null){
+                        if (tvNumber.getTag() != null) {
                             File file = new File((String) tvNumber.getTag());
                             file.delete();
                             tvNumber.setTag(null);
@@ -641,7 +643,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivFacility.setImageDrawable(null);
-                        if (tvFacility.getTag()!=null){
+                        if (tvFacility.getTag() != null) {
                             File file = new File((String) tvFacility.getTag());
                             file.delete();
                             tvFacility.setTag(null);
@@ -661,7 +663,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivEquipment.setImageDrawable(null);
-                        if (tvEquipment.getTag()!=null){
+                        if (tvEquipment.getTag() != null) {
                             File file = new File((String) tvEquipment.getTag());
                             file.delete();
                             tvEquipment.setTag(null);
@@ -681,7 +683,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivDevice.setImageDrawable(null);
-                        if (tvDevice.getTag()!=null){
+                        if (tvDevice.getTag() != null) {
                             File file = new File((String) tvDevice.getTag());
                             file.delete();
                             tvDevice.setTag(null);
@@ -701,7 +703,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         ivCoding.setImageDrawable(null);
-                        if (tvCoding.getTag()!=null){
+                        if (tvCoding.getTag() != null) {
                             File file = new File((String) tvCoding.getTag());
                             file.delete();
                             tvCoding.setTag(null);
@@ -720,7 +722,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
         if (station != null) {
             PoiEntity showPoiEntity = new Gson().fromJson(station, PoiEntity.class);
             pid = showPoiEntity.getId();
-            if (showPoiEntity.getTaskStatus()==3){
+            if (showPoiEntity.getTaskStatus() == 3) {
                 disables();
             }
         }
@@ -761,7 +763,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
             if (fid != null) {
                 pid = fid;
             }
-
             int sign_exist = chargingPileEntity.getSign_exist();
             spinnerScutcheon.setSelection(sign_exist, true);
             if (sign_exist == 0) {
@@ -770,9 +771,9 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 rlDevice.setVisibility(View.GONE);
             } else if (sign_exist == 1) {
                 int exist = chargingPileEntity.getExist();
-                    rlFacility.setBackgroundColor(Color.parseColor("#03A9F4"));
-                    rlScutcheon.setVisibility(View.VISIBLE);
-                    if (exist == 0) {
+                rlFacility.setBackgroundColor(Color.parseColor("#03A9F4"));
+                rlScutcheon.setVisibility(View.VISIBLE);
+                if (exist == 0) {
                     rlDevice.setVisibility(View.VISIBLE);
                 } else {
                     rlScutcheon.setVisibility(View.GONE);
@@ -1237,6 +1238,9 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                         }
                     }).build();
         }*/
+
+
+
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -1277,7 +1281,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvPanorama.getTag()!=null){
+                    if (tvPanorama.getTag() != null) {
                         File filePanorama = new File((String) tvPanorama.getTag());
                         filePanorama.delete();
                         tvPanorama.setTag(null);
@@ -1291,7 +1295,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvCoding.getTag()!=null){
+                    if (tvCoding.getTag() != null) {
                         File fileCoding = new File((String) tvCoding.getTag());
                         fileCoding.delete();
                         tvCoding.setTag(null);
@@ -1305,7 +1309,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvEquipment.getTag()!=null){
+                    if (tvEquipment.getTag() != null) {
                         File fileEquipment = new File((String) tvEquipment.getTag());
                         fileEquipment.delete();
                         tvEquipment.setTag(null);
@@ -1319,7 +1323,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvFacility.getTag()!=null){
+                    if (tvFacility.getTag() != null) {
                         File fileFacility = new File((String) tvFacility.getTag());
                         fileFacility.delete();
                         tvFacility.setTag(null);
@@ -1333,8 +1337,8 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvScutcheon.getTag()!=null){
-                        File fileScutcheon= new File((String) tvScutcheon.getTag());
+                    if (tvScutcheon.getTag() != null) {
+                        File fileScutcheon = new File((String) tvScutcheon.getTag());
                         fileScutcheon.delete();
                         tvScutcheon.setTag(null);
                     }
@@ -1347,8 +1351,8 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvDevice.getTag()!=null){
-                        File fileDevice= new File((String) tvDevice.getTag());
+                    if (tvDevice.getTag() != null) {
+                        File fileDevice = new File((String) tvDevice.getTag());
                         fileDevice.delete();
                         tvDevice.setTag(null);
                     }
@@ -1361,8 +1365,8 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvUsable.getTag()!=null){
-                        File fileUsable= new File((String) tvUsable.getTag());
+                    if (tvUsable.getTag() != null) {
+                        File fileUsable = new File((String) tvUsable.getTag());
                         fileUsable.delete();
                         tvUsable.setTag(null);
                     }
@@ -1375,8 +1379,8 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvAvailable.getTag()!=null){
-                        File fileAvailable= new File((String) tvAvailable.getTag());
+                    if (tvAvailable.getTag() != null) {
+                        File fileAvailable = new File((String) tvAvailable.getTag());
                         fileAvailable.delete();
                         tvAvailable.setTag(null);
                     }
@@ -1389,8 +1393,8 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvParking.getTag()!=null){
-                        File fileParking= new File((String) tvParking.getTag());
+                    if (tvParking.getTag() != null) {
+                        File fileParking = new File((String) tvParking.getTag());
                         fileParking.delete();
                         tvParking.setTag(null);
                     }
@@ -1403,8 +1407,8 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 assert file != null;
                 File videoFile = new File(file);
                 if (videoFile.exists()) {
-                    if (tvNumber.getTag()!=null){
-                        File fileNumber=new File((String) tvNumber.getTag());
+                    if (tvNumber.getTag() != null) {
+                        File fileNumber = new File((String) tvNumber.getTag());
                         fileNumber.delete();
                         tvNumber.setTag(null);
                     }
@@ -1440,7 +1444,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
         FileUtils.writeFile(logFile.getAbsolutePath(), chargingPileBuilder.toString(), true);
     }
 
-
     @Override
     protected ChargingPileEntity initChargingPileEntityByUI(ChargingPileEntity chargingPileEntity) {
         ArrayList<String> photo = new ArrayList<>();
@@ -1455,7 +1458,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
         if (cp_floor != 0) {
             chargingPileEntity.setCp_floor(cp_floor);
         }
-
         String tagPanorama = (String) tvPanorama.getTag();
         if (tagPanorama != null && !tagPanorama.equals("")) {
             photo.add(tagPanorama);
@@ -1554,7 +1556,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 poiCheckResult.setMsg("开放状态未勾选");
                 return poiCheckResult;
             }
-
             if (tvEquipment.getTag() == null) {
                 poiCheckResult.setCode(1);
                 poiCheckResult.setMsg("请拍照 设备标牌");
@@ -1590,7 +1591,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 return poiCheckResult;
             }
         }
-
         return poiCheckResult;
     }
 
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
index 867a39f..6df47d4 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
@@ -122,7 +122,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     private LatLng latLng;
     private RelativeLayout linearExist;
     private Spinner spinnerExist;
-
     private LinearLayout linearContact;
     private ContactView contactView;
     private ArrayList<File> chargingStationList;
@@ -181,14 +180,24 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     }
 
     private void initBack() {
-        DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-        MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                if (showPoiEntity != null) {
-                    if (showPoiEntity.getTaskStatus() == 5) {
+        if (showPoiEntity != null) {
+            if (showPoiEntity.getTaskStatus() == 5) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        chargingStationBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                    } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
+                    }
+                });
+            } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        chargingStationBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initList();
                         new Thread(new Runnable() {
                             @Override
@@ -229,32 +238,28 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                             obtain1.obj = isSliding;
                             EventBus.getDefault().post(obtain1);
                         }
-                    } else {
-                        Message obtain = Message.obtain();
-                        obtain.what = Constant.JOB_WORD_MONITOR;
-                        obtain.obj = true;
-                        EventBus.getDefault().post(obtain);
-                        Bundle arguments = getArguments();
-                        if (arguments != null) {
-                            isSliding = arguments.getBoolean("isSliding", true);
-                        }
-                        if (isSliding) {
-                            Message obtain1 = Message.obtain();
-                            obtain1.what = Constant.TREASURE_FRAGMENT;
-                            obtain1.obj = isSliding;
-                            EventBus.getDefault().post(obtain1);
-                        }
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
                     }
-                    Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                });
+            } else {
+                Message obtain = Message.obtain();
+                obtain.what = Constant.JOB_WORD_MONITOR;
+                obtain.obj = true;
+                EventBus.getDefault().post(obtain);
+                Bundle arguments = getArguments();
+                if (arguments != null) {
+                    isSliding = arguments.getBoolean("isSliding", true);
                 }
-                return false;
+                if (isSliding) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.TREASURE_FRAGMENT;
+                    obtain1.obj = isSliding;
+                    EventBus.getDefault().post(obtain1);
+                }
+                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
             }
-        }).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                return false;
-            }
-        });
+        }
     }
 
     @Override
@@ -788,13 +793,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         } else if (getPhoneBean.getCode() == 230) {
                             FlushTokenUtil.flushToken(getActivity());
                         } else {
-                            if (getActivity()!=null){
-                            getActivity().runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show();
-                                }
-                            });
+                            if (getActivity() != null) {
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show();
+                                    }
+                                });
                             }
                         }
                     }
@@ -805,22 +810,22 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         String message = e.getMessage();
                         assert message != null;
                         if (message.equals("timeout") || message.equals("Read time out")) {
-                            if (getActivity()!=null){
-                            getActivity().runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
-                                }
-                            });
+                            if (getActivity() != null) {
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
+                                    }
+                                });
                             }
                         } else {
-                            if (getActivity()!=null){
-                            getActivity().runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
-                                }
-                            });
+                            if (getActivity() != null) {
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
+                                    }
+                                });
                             }
                         }
                     }
@@ -1123,7 +1128,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 chargingPileFileList.add(new File(photoPath));
             }
         }
-
         try {
             HttpParams httpParams = new HttpParams();
             httpParams.put("auditId", chargingPileEntity.getBodyId());
@@ -1140,10 +1144,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 PoiUploadBean uploadBeanResult = new Gson().fromJson(pileUpLoadResultStr, PoiUploadBean.class);
                 if (uploadBeanResult != null) {
                     if (uploadBeanResult.getCode() == 200) {
-                       /* PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity);
+                        // PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity);
                         for (int i = 0; i < chargingPileFileList.size(); i++) {
                             chargingPileFileList.get(i).delete();
-                        }*/
+                        }
                     }
                 }
             }
@@ -1220,10 +1224,12 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 .cls(ChargingStationBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN);
-        okGoBuilder.getRequest(PreserveUtils.getInstance().getChargingPreserveCallback(getActivity(), poiEntity));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
-        WaitDialog.dismiss(1000);
+        if (getActivity() != null) {
+            okGoBuilder.getRequest(PreserveUtils.getInstance().getChargingPreserveCallback(getActivity(), poiEntity));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
+            WaitDialog.dismiss(1000);
+        }
     }
 
     private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList<File> chargingStationList) {
@@ -1243,31 +1249,25 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         }
                     }
                 }
-
-                if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            HttpParams httpParams = new HttpParams();
-                            httpParams.put("auditId", poiEntity.getBodyId());
-                            OkGoBuilder okGoBuilder = OkGoBuilder.getInstance()
-                                    .time(0)
-                                    .Builder(getActivity())
-                                    .url(HttpInterface.C_TASK_UP_LOAD_PIC)
-                                    .fileList(chargingStationList)
-                                    .token(Constant.ACCESS_TOKEN)
-                                    .params(httpParams)
-                                    .cls(PoiUploadBean.class);
-                            okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getChargingUploadCallback(getActivity(), showPoiEntity, chargingStationList));
-                            Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-                            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-                            WaitDialog.dismiss(3000);
-                        }
-                    });
-
-                }
             }
         }).start();
+        HttpParams httpParams = new HttpParams();
+        httpParams.put("auditId", poiEntity.getBodyId());
+        OkGoBuilder okGoBuilder = OkGoBuilder.getInstance()
+                .time(0)
+                .Builder(getActivity())
+                .url(HttpInterface.C_TASK_UP_LOAD_PIC)
+                .fileList(chargingStationList)
+                .token(Constant.ACCESS_TOKEN)
+                .params(httpParams)
+                .cls(PoiUploadBean.class);
+        if (getActivity() != null) {
+            okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getChargingUploadCallback(getActivity(), showPoiEntity, chargingStationList));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
+            WaitDialog.dismiss(3000);
+        }
+
     }
 
     /**
@@ -1318,7 +1318,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                             }
                         }).start();
                     } else {
-                        if (getActivity()!=null){
+                        if (getActivity() != null) {
                             getActivity().runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
@@ -1330,13 +1330,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 } else if (chargingStationBean.getCode() == 230) {
                     FlushTokenUtil.flushToken(getActivity());
                 } else {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 }
             }
@@ -1346,23 +1346,23 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 dismissLoadingDialog();
                 String message = e.getMessage();
                 assert message != null;
-                if (message.equals("timeout")|| message.equals("Read time out")) {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                if (message.equals("timeout") || message.equals("Read time out")) {
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 } else {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 }
                 Log.d("TAG", "onError: " + e.getMessage());
@@ -1420,7 +1420,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         getActivity().runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                Toast.makeText(getActivity(), taskNameBean.getMessage()+"", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show();
                                 editNameContent.setTextColor(Color.RED);
                                 btnSaveLocal.setEnabled(false);
                                 btnUploading.setEnabled(false);
@@ -1692,6 +1692,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
+                            poiEntity.setTaskStatus(100);
+                            PoiDatabase.getInstance(getContext()).getPoiDao().updatePoiEntity(poiEntity);
                         /*    if (showPoiEntity != null) {
                                 List<ChargingPileEntity> chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId());
                                 if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) {
@@ -1709,8 +1711,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                                     }
                                 }
                             }*/
-                            poiEntity.setTaskStatus(100);
-                            PoiDatabase.getInstance(getContext()).getPoiDao().updatePoiEntity(poiEntity);
                         }
                     }).start();
                     //initList();
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
index 2dc86fc..518c904 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
@@ -31,19 +31,13 @@ import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.adapter.FilterAdapter;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
-import com.navinfo.outdoor.bean.BaseBean;
-import com.navinfo.outdoor.bean.BolBean;
 import com.navinfo.outdoor.bean.FilterBatchBean;
 import com.navinfo.outdoor.bean.JobSearchBean;
-import com.navinfo.outdoor.bean.ReceivedBean;
-import com.navinfo.outdoor.bean.ReceivedPoiBean;
 import com.navinfo.outdoor.http.Callback;
 import com.navinfo.outdoor.http.HttpInterface;
 import com.navinfo.outdoor.http.OkGoBuilder;
 import com.navinfo.outdoor.room.ChargingPileEntity;
 import com.navinfo.outdoor.room.InsertAndUpdateUtils;
-import com.navinfo.outdoor.room.PoiDao;
-import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 import com.navinfo.outdoor.util.FlushTokenUtil;
 import com.navinfo.outdoor.util.Geohash;
@@ -234,8 +228,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
     @Override
     protected void initView() {
         super.initView();
-        PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext());
-        PoiDao poiDao = poiDatabase.getPoiDao();
         poiEntities = new ArrayList<>();
         btnChock = new ArrayList<>();//存储选择中的的数据
         ConstraintLayout clNumber = findViewById(R.id.cl_number);
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 f615468..35bf2e5 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
@@ -158,15 +158,24 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
     }
 
     private void initBack() {
-        DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-        MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                otherBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
-                if (showPoiEntity != null) {
-                    if (showPoiEntity.getTaskStatus() == 5) {
+        if (showPoiEntity != null) {
+            if (showPoiEntity.getTaskStatus() == 5) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        otherBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                    } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
+                    }
+                });
+            } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        otherBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initList();
                         Message obtain = Message.obtain();
                         obtain.what = Constant.JOB_WORD_MONITOR;
@@ -182,33 +191,28 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                             obtain1.obj = isSliding;
                             EventBus.getDefault().post(obtain1);
                         }
-                    } else {
-                        Message obtain = Message.obtain();
-                        obtain.what = Constant.JOB_WORD_MONITOR;
-                        obtain.obj = true;
-                        EventBus.getDefault().post(obtain);
-                        Bundle arguments = getArguments();
-                        if (arguments != null) {
-                            isSliding = arguments.getBoolean("isSliding", true);
-                        }
-                        if (isSliding) {
-                            Message obtain1 = Message.obtain();
-                            obtain1.what = Constant.TREASURE_FRAGMENT;
-                            obtain1.obj = isSliding;
-                            EventBus.getDefault().post(obtain1);
-                        }
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
                     }
-                    Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                });
+            } else {
+                Message obtain = Message.obtain();
+                obtain.what = Constant.JOB_WORD_MONITOR;
+                obtain.obj = true;
+                EventBus.getDefault().post(obtain);
+                Bundle arguments = getArguments();
+                if (arguments != null) {
+                    isSliding = arguments.getBoolean("isSliding", true);
                 }
-                return false;
+                if (isSliding) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.TREASURE_FRAGMENT;
+                    obtain1.obj = isSliding;
+                    EventBus.getDefault().post(obtain1);
+                }
+                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
             }
-        }).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                otherBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 取消 按钮,");
-                return false;
-            }
-        });
+        }
     }
 
     @Override
@@ -356,7 +360,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 return false;
             }
         });
-
         rlPictures.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
@@ -636,10 +639,12 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 .cls(PoiSaveBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN);
-        okGoBuilder.getRequest(PreserveUtils.getInstance().getOtherPreserveCallback(getActivity(), poiEntity));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
-        WaitDialog.dismiss(1000);
+        if (getActivity()!=null){
+            okGoBuilder.getRequest(PreserveUtils.getInstance().getOtherPreserveCallback(getActivity(), poiEntity));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
+            WaitDialog.dismiss(1000);
+        }
     }
 
     private void otherUploadByNet(int body, List<File> otherUploadList) {
@@ -658,10 +663,12 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 .token(Constant.ACCESS_TOKEN)
                 .params(httpParams)
                 .cls(PoiUploadBean.class);
-        okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getOtherUploadCallback(getActivity(), showPoiEntity, otherUploadList));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-        WaitDialog.dismiss(3000);
+        if (getActivity() != null) {
+            okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getOtherUploadCallback(getActivity(), showPoiEntity, otherUploadList));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
+            WaitDialog.dismiss(3000);
+        }
     }
 
     private void otherSaveByNetWork(PoiEntity poiEntity) {
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 41b8ac0..f21bd19 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -169,15 +169,24 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
     }
 
     private void initBack() {
-        DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-        MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                poiBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
-                if (showPoiEntity != null) {
-                    if (showPoiEntity.getTaskStatus() == 5) {
+        if (showPoiEntity != null) {
+            if (showPoiEntity.getTaskStatus() == 5) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        poiBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                    } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
+                    }
+                });
+            } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        poiBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initList();
                         Message obtain = Message.obtain();
                         obtain.what = Constant.JOB_WORD_MONITOR;
@@ -193,33 +202,28 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                             obtain1.obj = isSliding;
                             EventBus.getDefault().post(obtain1);
                         }
-                    } else {
-                        Message obtain = Message.obtain();
-                        obtain.what = Constant.JOB_WORD_MONITOR;
-                        obtain.obj = true;
-                        EventBus.getDefault().post(obtain);
-                        Bundle arguments = getArguments();
-                        if (arguments != null) {
-                            isSliding = arguments.getBoolean("isSliding", true);
-                        }
-                        if (isSliding) {
-                            Message obtain1 = Message.obtain();
-                            obtain1.what = Constant.TREASURE_FRAGMENT;
-                            obtain1.obj = isSliding;
-                            EventBus.getDefault().post(obtain1);
-                        }
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
                     }
-                    Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                });
+            } else {
+                Message obtain = Message.obtain();
+                obtain.what = Constant.JOB_WORD_MONITOR;
+                obtain.obj = true;
+                EventBus.getDefault().post(obtain);
+                Bundle arguments = getArguments();
+                if (arguments != null) {
+                    isSliding = arguments.getBoolean("isSliding", true);
                 }
-                return false;
+                if (isSliding) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.TREASURE_FRAGMENT;
+                    obtain1.obj = isSliding;
+                    EventBus.getDefault().post(obtain1);
+                }
+                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
             }
-        }).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                poiBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 取消 按钮,");
-                return false;
-            }
-        });
+        }
     }
 
     @Override
@@ -328,7 +332,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                         break;
                 }
             }
-
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
 
@@ -584,7 +587,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 }
             }
         });
-
     }
 
     /**
@@ -625,7 +627,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                         } else if (getPhoneBean.getCode() == 230) {
                             FlushTokenUtil.flushToken(getActivity());
                         } else {
-                            if (getActivity()!=null){
+                            if (getActivity() != null) {
                                 getActivity().runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
@@ -652,7 +654,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                                 });
                             }
                         } else {
-                            if (getActivity()!=null){
+                            if (getActivity() != null) {
                                 getActivity().runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
@@ -869,7 +871,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                             }
                         }
                     });
-
                 } else if (taskNameBean.getCode() == 230) {
                     if (getActivity() != null) {
                         getActivity().runOnUiThread(new Runnable() {
@@ -879,17 +880,15 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                             }
                         });
                     }
-
                 } else {
                     if (getActivity() != null) {
                         getActivity().runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                Toast.makeText(getActivity(), taskNameBean.getMessage()+"", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show();
                                 btnUploading.setEnabled(false);
                                 btnSaveLocal.setEnabled(false);
                                 editNameContent.setTextColor(Color.RED);
-
                             }
                         });
                     }
@@ -905,7 +904,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 String message = e.getMessage();
                 assert message != null;
                 if (message.equals("timeout") || message.equals("Read time out")) {
-                    if (getActivity()!=null){
+                    if (getActivity() != null) {
                         getActivity().runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
@@ -913,9 +912,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                             }
                         });
                     }
-
                 } else {
-                    if (getActivity()!=null){
+                    if (getActivity() != null) {
                         getActivity().runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
@@ -975,7 +973,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                         }
                     }
                 });
-
     }
 
     private void poiSaveNet(PoiEntity poiEntity) {
@@ -994,10 +991,12 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 .cls(PoiSaveBean.class)
                 .token(Constant.ACCESS_TOKEN)
                 .params(httpParams);
-        okGoBuilder.getRequest(PreserveUtils.getInstance().getPoiPreserveCallback(getActivity(), poiEntity));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
-        WaitDialog.dismiss(1000);
+        if (getActivity()!=null){
+            okGoBuilder.getRequest(PreserveUtils.getInstance().getPoiPreserveCallback(getActivity(), poiEntity));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
+            WaitDialog.dismiss(1000);
+        }
     }
 
     private void poiUploadByNetWork(int body, ArrayList<File> poiPicList) {
@@ -1016,10 +1015,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 .token(Constant.ACCESS_TOKEN)
                 .fileList(poiPicList)
                 .params(httpParams);
-        okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getPoiUploadCallback(getActivity(), showPoiEntity, poiPicList));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-        WaitDialog.dismiss(3000);
+        if (getActivity()!=null){
+            okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getPoiUploadCallback(getActivity(), showPoiEntity, poiPicList));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
+            WaitDialog.dismiss(3000);
+        }
+
     }
 
     private void poiSaveByNet(PoiEntity poiEntity) {
@@ -1063,25 +1065,25 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                             }
                         }).start();
                     } else {
-                        if (getActivity()!=null){
+                        if (getActivity() != null) {
+                            getActivity().runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
+                                }
+                            });
+                        }
+                    }
+                } else if (poiSaveBean.getCode() == 230) {
+                    FlushTokenUtil.flushToken(getActivity());
+                } else {
+                    if (getActivity() != null) {
                         getActivity().runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
                                 Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
                             }
                         });
-                        }
-                    }
-                } else if (poiSaveBean.getCode() == 230) {
-                    FlushTokenUtil.flushToken(getActivity());
-                } else {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
-                        }
-                    });
                     }
                 }
             }
@@ -1092,22 +1094,22 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 String message = e.getMessage();
                 assert message != null;
                 if (message.equals("timeout") || message.equals("Read time out")) {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), "请求超时",Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 } else {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 }
                 Log.d("TAG", "onError: " + e.getMessage());
@@ -1310,13 +1312,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 } else if (response.getCode() == 230) {
                     FlushTokenUtil.flushToken(getActivity());
                 } else {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 }
             }
@@ -1327,22 +1329,22 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 String message = e.getMessage();
                 assert message != null;
                 if (message.equals("timeout") || message.equals("Read time out")) {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 } else {
-                    if (getActivity()!=null){
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(getActivity(), "" + message, Toast.LENGTH_SHORT).show();
-                        }
-                    });
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(getActivity(), "" + message, Toast.LENGTH_SHORT).show();
+                            }
+                        });
                     }
                 }
                 Log.d("TAG", "onError: " + e.getMessage());
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 5b70e8f..da8bb37 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
@@ -140,15 +140,24 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     }
 
     private void initBack() {
-        DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-        MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
-                if (showPoiEntity != null) {
-                    if (showPoiEntity.getTaskStatus() == 5) {
+        if (showPoiEntity != null) {
+            if (showPoiEntity.getTaskStatus() == 5) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                    } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
+                    }
+                });
+            } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         if (showPoiEntity.getId() != null) {
                             List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
                             for (int i = 0; i < fileListByUUID.size(); i++) {
@@ -171,33 +180,28 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                             obtain1.obj = isSliding;
                             EventBus.getDefault().post(obtain1);
                         }
-                    } else {
-                        Message obtain = Message.obtain();
-                        obtain.what = Constant.JOB_WORD_MONITOR;
-                        obtain.obj = true;
-                        EventBus.getDefault().post(obtain);
-                        Bundle arguments = getArguments();
-                        if (arguments != null) {
-                            isSliding = arguments.getBoolean("isSliding", true);
-                        }
-                        if (isSliding) {
-                            Message obtain1 = Message.obtain();
-                            obtain1.what = Constant.TREASURE_FRAGMENT;
-                            obtain1.obj = isSliding;
-                            EventBus.getDefault().post(obtain1);
-                        }
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
                     }
-                    Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                });
+            } else {
+                Message obtain = Message.obtain();
+                obtain.what = Constant.JOB_WORD_MONITOR;
+                obtain.obj = true;
+                EventBus.getDefault().post(obtain);
+                Bundle arguments = getArguments();
+                if (arguments != null) {
+                    isSliding = arguments.getBoolean("isSliding", true);
                 }
-                return false;
+                if (isSliding) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.TREASURE_FRAGMENT;
+                    obtain1.obj = isSliding;
+                    EventBus.getDefault().post(obtain1);
+                }
+                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
             }
-        }).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
-            @Override
-            public boolean onClick(BaseDialog baseDialog, View v) {
-                poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 取消 按钮,");
-                return false;
-            }
-        });
+        }
     }
 
     @Override
@@ -592,10 +596,13 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                 .cls(PoiVideoBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN);
-        okGoBuilder.getRequest(PreserveUtils.getInstance().getPoiVideoPreserveCallback(getActivity(), poiEntity));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
-        WaitDialog.dismiss(1000);
+        if (getActivity() != null) {
+            okGoBuilder.getRequest(PreserveUtils.getInstance().getPoiVideoPreserveCallback(getActivity(), poiEntity));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
+            WaitDialog.dismiss(1000);
+        }
+
     }
 
     private void poiVideoUpload(int poiVideoBody, File fileZip) {
@@ -619,10 +626,13 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                 .cls(OtherUploadPicBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN);
-        okGoBuilder.postRequest(UploadUtils.getInstance().getPoiVideoUploadCallback(getActivity(), showPoiEntity, fileZip));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-        WaitDialog.dismiss(3000);
+        if (getActivity() != null) {
+            okGoBuilder.postRequest(UploadUtils.getInstance().getPoiVideoUploadCallback(getActivity(), showPoiEntity, fileZip));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
+            WaitDialog.dismiss(3000);
+        }
+
     }
 
     private void poiVideoSave(PoiEntity poiEntity) {
@@ -908,17 +918,20 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         String format = formatter.format(calendar.getTime());
         poiEntity.setCreateTime(format);
         poiEntity.setType(3);
-        List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
-        if (fileListByUUID != null) {
-            fmPoiVideoPic.setTag(fileListByUUID);
-            List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList((List<File>) fmPoiVideoPic.getTag());
-            String lineString = Geohash.getInstance().encodeList(lineStringByFileList);
-            String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr((List<File>) fmPoiVideoPic.getTag());
-            poiEntity.setPhoto(photoStr);
-            if (lineString != null) {
-                poiEntity.setDetail(lineString);
+        if (showPoiEntity.getId() != null) {
+            List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
+            if (fileListByUUID != null) {
+                fmPoiVideoPic.setTag(fileListByUUID);
+                List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID);
+                String lineString = Geohash.getInstance().encodeList(lineStringByFileList);
+                String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID);
+                poiEntity.setPhoto(photoStr);
+                if (lineString != null) {
+                    poiEntity.setDetail(lineString);
+                }
             }
         }
+
         return poiEntity;
     }
 
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 e82703b..07e1fda 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
@@ -136,66 +136,68 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
     }
 
     private void initBack() {
-        DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-        MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消")
-                .setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+        if (showPoiEntity != null) {
+            if (showPoiEntity.getTaskStatus() == 5) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
-                        roadBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确认 按钮,");
-                        if (showPoiEntity != null) {
-                            if (showPoiEntity.getTaskStatus() == 5) {
-                                initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                            } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
-                                if (showPoiEntity.getId() != null) {
-                                    List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
-                                    for (int i = 0; i < fileListByUUID.size(); i++) {
-                                        fileListByUUID.get(i).delete();
-                                    }
-                                    File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId());
-                                    filePath.delete();
-                                }
-                                Message obtain = Message.obtain();
-                                obtain.what = Constant.JOB_WORD_MONITOR;
-                                obtain.obj = true;
-                                EventBus.getDefault().post(obtain);
-                                Bundle arguments = getArguments();
-                                if (arguments != null) {
-                                    isSliding = arguments.getBoolean("isSliding", true);
-                                }
-                                if (isSliding) {
-                                    Message obtain1 = Message.obtain();
-                                    obtain1.what = Constant.TREASURE_FRAGMENT;
-                                    obtain1.obj = isSliding;
-                                    EventBus.getDefault().post(obtain1);
-                                }
-                            } else {
-                                Message obtain = Message.obtain();
-                                obtain.what = Constant.JOB_WORD_MONITOR;
-                                obtain.obj = true;
-                                EventBus.getDefault().post(obtain);
-                                Bundle arguments = getArguments();
-                                if (arguments != null) {
-                                    isSliding = arguments.getBoolean("isSliding", true);
-                                }
-                                if (isSliding) {
-                                    Message obtain1 = Message.obtain();
-                                    obtain1.what = Constant.TREASURE_FRAGMENT;
-                                    obtain1.obj = isSliding;
-                                    EventBus.getDefault().post(obtain1);
-                                }
-                            }
-                            Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
-                        }
-                        return false;
-                    }
-                })
-                .setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
-                    @Override
-                    public boolean onClick(BaseDialog baseDialog, View v) {
-                        roadBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 取消 按钮,");
+                        roadBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
+                        initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
                         return false;
                     }
                 });
+            } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
+                DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                    @Override
+                    public boolean onClick(BaseDialog baseDialog, View v) {
+                        roadBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
+                        if (showPoiEntity.getId() != null) {
+                            List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
+                            for (int i = 0; i < fileListByUUID.size(); i++) {
+                                fileListByUUID.get(i).delete();
+                            }
+                            File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId());
+                            filePath.delete();
+                        }
+                        Message obtain = Message.obtain();
+                        obtain.what = Constant.JOB_WORD_MONITOR;
+                        obtain.obj = true;
+                        EventBus.getDefault().post(obtain);
+                        Bundle arguments = getArguments();
+                        if (arguments != null) {
+                            isSliding = arguments.getBoolean("isSliding", true);
+                        }
+                        if (isSliding) {
+                            Message obtain1 = Message.obtain();
+                            obtain1.what = Constant.TREASURE_FRAGMENT;
+                            obtain1.obj = isSliding;
+                            EventBus.getDefault().post(obtain1);
+                        }
+                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        return false;
+                    }
+                });
+            } else {
+                Message obtain = Message.obtain();
+                obtain.what = Constant.JOB_WORD_MONITOR;
+                obtain.obj = true;
+                EventBus.getDefault().post(obtain);
+                Bundle arguments = getArguments();
+                if (arguments != null) {
+                    isSliding = arguments.getBoolean("isSliding", true);
+                }
+                if (isSliding) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.TREASURE_FRAGMENT;
+                    obtain1.obj = isSliding;
+                    EventBus.getDefault().post(obtain1);
+                }
+                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+            }
+        }
     }
 
     @Override
@@ -584,10 +586,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 .cls(RoadSaveBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN);
-        okGoBuilder.getRequest(PreserveUtils.getInstance().getRoadPreserveCallback(getActivity(), poiEntity));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
-        WaitDialog.dismiss(1000);
+        if (getActivity()!=null){
+            okGoBuilder.getRequest(PreserveUtils.getInstance().getRoadPreserveCallback(getActivity(), poiEntity));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
+            WaitDialog.dismiss(1000);
+        }
+
     }
 
 
@@ -612,10 +617,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN)
                 .cls(OtherUploadPicBean.class);
-        okGoBuilder.postRequest(UploadUtils.getInstance().getRoadUploadCallback(getActivity(), showPoiEntity, fileZip));
-        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
-        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-        WaitDialog.dismiss(3000);
+        if (getActivity()!=null){
+            okGoBuilder.postRequest(UploadUtils.getInstance().getRoadUploadCallback(getActivity(), showPoiEntity, fileZip));
+            getActivity().getSupportFragmentManager().popBackStack();//回退
+            WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
+            WaitDialog.dismiss(3000);
+        }
     }
 
     private void roadSaveBetWork(PoiEntity poiEntity) {
@@ -905,15 +912,17 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         String format = formatter.format(calendar.getTime());
         poiEntity.setCreateTime(format);
         poiEntity.setType(4);
-        List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
-        if (fileListByUUID != null) {
-            fmRoadPic.setTag(fileListByUUID);
-            List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList((List<File>) fmRoadPic.getTag());
-            String encodeList = Geohash.getInstance().encodeList(lineStringByFileList);
-            String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr((List<File>) fmRoadPic.getTag());
-            poiEntity.setPhoto(photoStr);
-            if (encodeList != null) {
-                poiEntity.setDetail(encodeList);
+        if (showPoiEntity.getId() != null) {
+            List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
+            if (fileListByUUID != null) {
+                fmRoadPic.setTag(fileListByUUID);
+                List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID);
+                String encodeList = Geohash.getInstance().encodeList(lineStringByFileList);
+                String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID);
+                poiEntity.setPhoto(photoStr);
+                if (encodeList != null) {
+                    poiEntity.setDetail(encodeList);
+                }
             }
         }
         return poiEntity;
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 b631340..dca8e99 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
@@ -1,8 +1,8 @@
 package com.navinfo.outdoor.http;
 
 public class HttpInterface {
-    public static final String IP= "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
-    public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
+    public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
+    public static final String IP= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
 
 
     public static final String USER_PATH ="/user/";//我的
diff --git a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java
index 03492fc..950a5f5 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java
@@ -279,9 +279,6 @@ public class OkGoBuilder<T> {
      * @return
      */
     public okhttp3.Response postFileSynchronization() {
-        if (!NetWorkUtils.iConnected(UserApplication.userApplication)) { // 当前网络不可用
-            return null;
-        }
         initTimeOut(time);
         long time = System.currentTimeMillis();
         params.put("datetime", time);
@@ -410,15 +407,6 @@ public class OkGoBuilder<T> {
      * @return
      */
     public okhttp3.Response getSynchronization() {
-        if (!NetWorkUtils.iConnected(UserApplication.userApplication)) { // 当前网络不可用
-            activity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(activity, "网络不可用，请检查网络", Toast.LENGTH_SHORT).show();
-                }
-            });
-            return null;
-        }
         initTimeOut(time);
         long time = System.currentTimeMillis();
         params.put("datetime", time);
diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java b/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java
index 3a5c37e..074f88e 100644
--- a/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java
+++ b/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java
@@ -32,7 +32,7 @@ public class PoiEntityDeleteUtil {
                 break;
             case 3:
             case 4:
-                initPicture(context, poiEntity);
+                initPicture( poiEntity);
                 break;
 
         }
@@ -66,14 +66,13 @@ public class PoiEntityDeleteUtil {
         }
     }
 
-    private void initPicture(Context context, PoiEntity poiEntity) {
+    private void initPicture(PoiEntity poiEntity) {
         List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId());
         for (int i = 0; i < fileListByUUID.size(); i++) {
             fileListByUUID.get(i).delete();
         }
         File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId());
         filePath.delete();
-
     }
 
 
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 d3fecbd..446d6e9 100644
--- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
+++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
@@ -10,6 +10,7 @@ import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.api.Constant;
+import com.navinfo.outdoor.api.UserApplication;
 import com.navinfo.outdoor.bean.ChargingPileSaveBean;
 import com.navinfo.outdoor.bean.OtherUploadPicBean;
 import com.navinfo.outdoor.bean.PoiSaveBean;
@@ -349,8 +350,11 @@ public class PoiSaveUtils {
                 bInt++;
                 return;
             }
-            assert execute.body() != null;
             String bodyStr = execute.body().string();
+            if (bodyStr==null){
+                bInt++;
+                return;
+            }
             OtherUploadPicBean otherUploadPicBean = new Gson().fromJson(bodyStr, OtherUploadPicBean.class);
             if (otherUploadPicBean.getCode() == 200) {
                 poiEntity.setTaskStatus(100);
@@ -358,16 +362,7 @@ public class PoiSaveUtils {
                 for (int i = 0; i < list.size(); i++) {
                     list.get(i).delete();
                 }
-                if (poiEntity.getType()==3||poiEntity.getType()==4) {
-                    if (poiEntity.getId() != null) {
-                        List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId());
-                        for (int i = 0; i < fileListByUUID.size(); i++) {
-                            fileListByUUID.get(i).delete();
-                        }
-                        File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId());
-                        filePath.delete();
-                    }
-                }
+                PoiEntityDeleteUtil.getInstance().deleteUtil(mContext,poiEntity);
                 Log.d("TAGss", "uploadPoiNet: 成功" + anInt);
                 anInt++;
                 return;
@@ -432,25 +427,27 @@ public class PoiSaveUtils {
                     .url(HttpInterface.SUBMIT_CSTASK)
                     .token(Constant.ACCESS_TOKEN)
                     .params(httpParams).getSynchronization();
+            if (!NetWorkUtils.iConnected(UserApplication.userApplication)) { // 当前网络不可用
+                return -1;
+            }
             if (execute == null) {
                 return -1;
             }
             if (execute.code() != 200) {
                 return execute.code();
             }
-            String responseBodyStr = execute.body().string();
-            if (responseBodyStr == null) {
-                return -1;
-            }
-            if (responseBodyStr != null) {
+            if (execute.body().string() != null) {
+                String string = execute.body().string();
                 Gson gson = new Gson();
-                ChargingPileSaveBean chargingPileSaveBean = gson.fromJson(responseBodyStr, ChargingPileSaveBean.class);
+                ChargingPileSaveBean chargingPileSaveBean = gson.fromJson(string, ChargingPileSaveBean.class);
                 if (chargingPileSaveBean.getCode() != 200) {
                     return chargingPileSaveBean.getCode();
                 }
                 Log.d("TAGss", "saveChargingPile2NetWork" + 200);
                 chargingPileEntity.setBodyId(chargingPileSaveBean.getBody());
                 InsertAndUpdateUtils.getInstance().insertOrUpdateChargingPile(mContext, chargingPileEntity); // 更新当前充电桩的bodyId
+            }else {
+                return -1;
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -508,6 +505,9 @@ public class PoiSaveUtils {
                     .token(Constant.ACCESS_TOKEN)
                     .params(httpParams)
                     .fileList(chargingPileFileList).postFileSynchronization();
+            if (!NetWorkUtils.iConnected(UserApplication.userApplication)) { // 当前网络不可用
+                return -1;
+            }
             if (execute == null) {
                 return -1;
             }
@@ -515,9 +515,6 @@ public class PoiSaveUtils {
                 return execute.code();
             }
             String pileUpLoadResultStr = execute.body().string();
-            if (pileUpLoadResultStr == null) {
-                return -1;
-            }
             if (pileUpLoadResultStr != null) {
                 Gson gson = new Gson();
                 PoiUploadBean uploadBeanResult = gson.fromJson(pileUpLoadResultStr, PoiUploadBean.class);
@@ -527,6 +524,8 @@ public class PoiSaveUtils {
                         chargingPileFileList.get(i).delete();
                     }
                 }
+            }else {
+                return -1;
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/app/src/main/res/layout/has_sumit_item.xml b/app/src/main/res/layout/has_sumit_item.xml
index 70bb4f3..42ec472 100644
--- a/app/src/main/res/layout/has_sumit_item.xml
+++ b/app/src/main/res/layout/has_sumit_item.xml
@@ -44,6 +44,7 @@
         android:id="@+id/tv_auditMsg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_createTime"
         app:layout_constraintEnd_toStartOf="@+id/tv_auditStatus"
         app:layout_constraintHorizontal_bias="0.9"
         app:layout_constraintStart_toEndOf="@+id/tv_createTime"