上报轨迹展示，提交放到后台

app/build.gradle

@@ -62,6 +62,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui:2.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation files('libs\\jts-1.13.jar')
+    implementation files('libs\\jacob.jar')
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

app/src/main/AndroidManifest.xml

@@ -96,6 +96,7 @@
         <activity
             android:name=".activity.FragmentManagement"
             android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activity.ImageShowActivity"
@@ -105,6 +106,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.UserActivity"
+            android:configChanges="keyboardHidden|orientation"
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.GuidanceActivity"

app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java

@@ -1,5 +1,9 @@
 package com.navinfo.outdoor.activity;
 
+import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
+import com.kongzue.dialog.util.BaseDialog;
+import com.kongzue.dialog.util.DialogSettings;
+import com.kongzue.dialog.v3.MessageDialog;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseActivity;
 import com.navinfo.outdoor.fragment.FindFragment;
@@ -16,6 +20,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import android.os.Handler;
 import android.os.Message;
+import android.view.View;
 import android.widget.Toast;
 
 import com.navinfo.outdoor.R;
@@ -135,9 +140,16 @@ public class HomeActivity extends BaseActivity{
     @Subscribe
     public void onEvent(Message data) {
         if (data.what == Constant.EVENT_WORK_HOME) {
-           if ((boolean)data.obj){
+            if ((boolean) data.obj) {
                 Objects.requireNonNull(mTab.getTabAt(0)).select();
             }
+        }else if (data.what==Constant.NEST_WORD_SUBMIT){
+            String dataString = (String) data.obj;
+            if (!dataString.equals("")) {
+                Constant.isPresent=true;
+                DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+                MessageDialog.show(this, "提示", dataString, "确定");
+            }
         }
     }
 

app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java

@@ -92,6 +92,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         SharedPreferences navInfo = getSharedPreferences(Constant.SHARED_PREFERENCES, Context.MODE_PRIVATE);
         navInfoEditor = navInfo.edit();
         TextView tvRegister = findViewById(R.id.tv_register);
+        TextView tvView = findViewById(R.id.tv_view);
+        tvView.setText(Constant.NAVIN_FO);
         etLoginName = findViewById(R.id.et_login_name);
         etLoginPaw = findViewById(R.id.et_login_paw);
         TextView tvForgetPaw = findViewById(R.id.tv_forget_paw);

app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java

@@ -78,20 +78,13 @@ public class MainActivity extends BaseActivity {
     private ProgressDialog pBar;
     private int progress;
     private String user_id;
-    private TextView tvView;
+
 
     @Override
     protected int getLayout() {
         return R.layout.activity_main;
     }
 
-    @Override
-    protected void initMVP() {
-        super.initMVP();
-        tvView = findViewById(R.id.tv_view);
-        tvView.setText(Constant.NAVIN_FO);
-    }
-
     @Override
     protected void initData() {
         super.initData();

app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java

@@ -144,8 +144,8 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
     @Override
     protected void initView() {
         super.initView();
-
         if (getIntent() != null) {
+
             finalVideoPath = getIntent().getStringExtra(Constant.INTENT_VIDEO_PATH);
             poiEntity = (PoiEntity) getIntent().getSerializableExtra("poiEntity");
             oration = getIntent().getIntExtra(Constant.INTENT_VIDEO_OBLATION, -1);
@@ -238,7 +238,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
         if (poiEntity.getId() != null) {
             List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId());
             if (fileListByUUID != null) {
-                List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLineStringByFileList(fileListByUUID);
+                List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID);
                 for (int i = 0; i < lineStringByFileList.size(); i++) {
                     LatLng latLng = lineStringByFileList.get(i);
                     if (latLng != null) {

app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java

@@ -116,6 +116,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
     private TimerTask timerTask;
     private int videoIndex = -1;
     private int oration;
+    private ImageView ivPicImage;
+    private boolean isPicture=true;
 
     @Override
     protected int getLayout() {
@@ -141,6 +143,13 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
         formatter = new SimpleDateFormat("yyyyMMdd HHmmss");
         this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         ivMap = findViewById(R.id.iv_map);
+        ivMap.setOnClickListener(this);
+        ivPicImage = findViewById(R.id.iv_pic);
+        if (poi_video_type==1||poi_video_type==2){
+            ivPicImage.setImageResource(R.mipmap.take_poi_video_arrow);
+        }else if (poi_video_type==3){
+            ivPicImage.setImageResource(R.mipmap.take_pic_arrow);
+        }
         btnSwitch = findViewById(R.id.btn_switch);
         btnSwitch.setOnClickListener(this);
         //相机记录器
@@ -190,7 +199,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
         if (poiEntity.getId() != null) {
             List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId());
             if (fileListByUUID != null) {
-                List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLineStringByFileList(fileListByUUID);
+                List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID);
                 for (int i = 0; i < lineStringByFileList.size(); i++) {
                     LatLng latLng = lineStringByFileList.get(i);
                     if (latLng != null) {
@@ -212,8 +221,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                     if (Objects.requireNonNull(camera.getPictureSize()).getWidth() < camera.getPictureSize().getHeight()) {
                         Toast.makeText(PicturesActivity.this, "不允许竖向拍摄...", Toast.LENGTH_SHORT).show();
                         stopTimer();
+                        capturePicture.setChecked(false);
                         if (poi_video_type != 2) {
                             capturePicture.setText("开始采集");
+                            capturePicture.setChecked(false);
                         }
                         return;
                     }
@@ -300,6 +311,18 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                 setResult(0x111, intent);
                 finish();
                 break;
+            case R.id.camera:
+                benSwitch();
+
+                if (!isPicture){
+                //    benSwitch();
+                }
+                break;
+            case R.id.iv_map:
+                if (isPicture){
+                    benSwitch();
+                }
+                break;
             case R.id.btn_switch:
                 v.setEnabled(false);
                 handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
@@ -382,6 +405,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
             layerChange.addView(camera);
             layerChange.addView(ivMap);
             initMapBig();
+            ivPicImage.setVisibility(View.VISIBLE);
+            isPicture = true;
         } else {
             layoutParamsMap.height = dm.heightPixels;
             layoutParamsMap.width = dm.widthPixels;
@@ -392,6 +417,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
             layerChange.addView(ivMap);
             layerChange.addView(camera);
             initMapShort();
+            ivPicImage.setVisibility(View.GONE);
+            isPicture = false;
+
         }
     }
 

app/src/main/java/com/navinfo/outdoor/api/BankCard.java

@@ -2,7 +2,7 @@ package com.navinfo.outdoor.api;
 
 
 
-import com.navinfo.outdoor.base.Base64Util;
+import com.navinfo.outdoor.util.Base64Util;
 import com.navinfo.outdoor.http.HttpUtil;
 import com.navinfo.outdoor.util.FileUtil;
 

app/src/main/java/com/navinfo/outdoor/api/Constant.java

@@ -101,6 +101,7 @@ public class Constant {
     public static String MOBILE = null;//手机号
     public static String FILE_PATH = null;//银行卡图片途径
     public static int LEVEL = 0;//用户等级
+    public static boolean isPresent =true;//判断是否在提交中
 
 
     public static  String YOU_MENG_APP_KEY="6139d82c5f798a55cafc51d6";//友盟appkey
@@ -152,6 +153,7 @@ public class Constant {
     public static final int REGISTER_WORD = 46; //注册的返回
     public static final int VIDEO_FINISH_ROAD = 47;//录像视频列表的返回
     public static final int PHOTO_FINISH_VIDEO = 49;//拍照列表的返回
+    public static final int NEST_WORD_SUBMIT =50;//所有的提交/上传
 
 
     public static final String  INTENT_POI_VIDEO_TYPE ="poi_video_type";
@@ -188,7 +190,7 @@ public class Constant {
 
     public static TencentMap.OnMarkerClickListener markerClickListener=null;
 
-    public static final String NAVIN_FO="9.07";//版本
+    public static final String NAVIN_FO="9.14";//版本
 
     /**
      * 联系我们的QQ群名称和QQ群号

app/src/main/java/com/navinfo/outdoor/api/IdCard.java

@@ -1,6 +1,6 @@
 package com.navinfo.outdoor.api;
 
-import com.navinfo.outdoor.base.Base64Util;
+import com.navinfo.outdoor.util.Base64Util;
 import com.navinfo.outdoor.http.HttpUtil;
 import com.navinfo.outdoor.util.FileUtil;
 

app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java

@@ -4,10 +4,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
-import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -39,6 +37,7 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialog.util.BaseDialog;
 import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.MessageDialog;
+import com.kongzue.dialog.v3.WaitDialog;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.FragmentManagement;
@@ -46,6 +45,7 @@ import com.navinfo.outdoor.activity.PhotographActivity;
 import com.navinfo.outdoor.adapter.ChargingPileAdapter;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
+import com.navinfo.outdoor.util.UploadUtils;
 import com.navinfo.outdoor.bean.ChargingPileSaveBean;
 import com.navinfo.outdoor.bean.ChargingStationBean;
 import com.navinfo.outdoor.bean.GetPhoneBean;
@@ -67,7 +67,6 @@ import com.navinfo.outdoor.ui.view.ContactView;
 import com.navinfo.outdoor.util.Geohash;
 import com.navinfo.outdoor.util.GeometryTools;
 import com.navinfo.outdoor.util.PhotoUtils;
-import com.navinfo.outdoor.util.ToastUtil;
 import com.tencent.tencentmap.mapsdk.maps.TencentMap;
 import com.tencent.tencentmap.mapsdk.maps.interfaces.Removable;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
@@ -75,6 +74,7 @@ import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 import com.tencent.tencentmap.mapsdk.maps.model.Marker;
 import com.tencent.tencentmap.mapsdk.maps.model.MarkerOptions;
+import com.vividsolutions.jts.geom.Geometry;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -91,8 +91,6 @@ import java.util.Objects;
 
 import okhttp3.Response;
 
-import static android.app.Activity.RESULT_OK;
-
 /**
  * 充电站的Fragment
  * 2021-5-25
@@ -115,7 +113,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     private int existence = 0;
     private LinearLayout linearChargingPile;
     private ChargingPileAdapter chargingPileAdapter;
-    private int station_type = 0;
+    private int station_type = 1;
     private ChargingPileDao chargingPileDao;
     private LatLng latLng;
     private RelativeLayout linearExist;
@@ -126,7 +124,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     private ArrayList<File> chargingStationList;
     String str = "";
 
-//    private ArrayList<File> fileList;
+    //    private ArrayList<File> fileList;
     private NestedScrollView nestedScrollView;
     private Marker markerStation;
     private Point screenStationPositions;
@@ -148,7 +146,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         super.onHiddenChanged(hidden);
         if (!hidden) {
             setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
-            if (slidingPaneLayout!=null) {
+            if (slidingPaneLayout != null) {
                 slidingPaneLayout.setScrollableView(nestedScrollView);
             }
             initHeader();
@@ -179,7 +177,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getActivity(), FragmentManagement.class);
-                intent.putExtra("tag",8);
+                intent.putExtra("tag", 8);
                 startActivity(intent);
             }
         });
@@ -198,9 +196,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     public void onResume() {
         super.onResume();
         initHeader();
-        moveLatlng(latLng,null);
+        moveLatlng(latLng, null);
 
     }
+
     @Override
     protected void initView() {
         super.initView();
@@ -210,9 +209,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         checkBoxLife = findViewById(R.id.check_pot_life);
         CheckBox checkBoxRight = findViewById(R.id.check_pot_right);
         nestedScrollView = findViewById(R.id.nested_scroll_view);
-        removablesLocality=new ArrayList<>();
+        removablesLocality = new ArrayList<>();
         setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
-        if (slidingPaneLayout!=null) {
+        if (slidingPaneLayout != null) {
             slidingPaneLayout.setScrollableView(nestedScrollView);
         }
         //添加桩
@@ -263,8 +262,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             public void item(ChargingPileEntity chargingPileEntity) {
                 String showStation = initShowStation();
                 HashMap<String, Object> stringObjectHashMap = new HashMap<>();
-                stringObjectHashMap.put("chargingPileEntity",chargingPileEntity);
+                stringObjectHashMap.put("chargingPileEntity", chargingPileEntity);
-                stringObjectHashMap.put("showStation",showStation);
+                stringObjectHashMap.put("showStation", showStation);
                 Message obtain = Message.obtain();
                 obtain.what = Constant.CHARGING_STATION;
                 obtain.obj = stringObjectHashMap;
@@ -274,7 +273,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         checkBoxLife.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if(checkBoxLife.isChecked()){
+                if (checkBoxLife.isChecked()) {
                     moveLatlng(latLng, new TencentMap.CancelableCallback() {
                         @Override
                         public void onFinish() {
@@ -289,6 +288,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                             checkBoxLife.setTextColor(Color.WHITE);
                             checkBoxLife.setChecked(true);
                         }
+
                         @Override
                         public void onCancel() {
                             BitmapDescriptor stationDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bags);
@@ -298,7 +298,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                             checkBoxLife.setChecked(false);
                         }
                     });
-                }else {
+                } else {
                     BitmapDescriptor stationDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bags);
                     markerStation.setIcon(stationDescriptor);
                     checkBoxLife.setText("编辑");
@@ -333,6 +333,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         break;
                 }
             }
+
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
@@ -369,6 +370,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         break;
                 }
             }
+
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
@@ -465,16 +467,16 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         if (name != null && !name.equals("")) {
             editNameContent.setText(name);
         }
-        if (editNameContent.getText().toString()!=null||editNameContent!=null){
+        if (editNameContent.getText().toString() != null || editNameContent != null) {
             editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() {
                 @Override
                 public void onFocusChange(View v, boolean hasFocus) {
-                    if (!hasFocus){
+                    if (!hasFocus) {
                         findingDuplicateByWork();
                     }
                 }
             });
-        }else {
+        } else {
             Toast.makeText(getActivity(), "请输入名称", Toast.LENGTH_SHORT).show();
         }
 
@@ -483,6 +485,26 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             editSiteContent.setText(address);
         }
         bodyId = showPoiEntity.getBodyId(); // 获取当前数据的bodyId
+        String geoWkt = showPoiEntity.getGeoWkt();
+        if (geoWkt != null) {
+            String geo = Geohash.getInstance().decode(geoWkt);
+            Geometry geometry = GeometryTools.createGeometry(geo);
+            switch (geometry.getGeometryType()) {
+                case "Point": //点
+                    latLng = GeometryTools.createLatLng(geo);
+                    break;
+                case "LineString": //线
+                case "Polygon": //面
+                    List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                    assert latLineString != null;
+                    latLng = latLineString.get(0);
+                    break;
+            }
+            BitmapDescriptor stationDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bags);
+            markerStation = tencentMap.addMarker(new MarkerOptions(latLng).icon(stationDescriptor).anchor(0.5f, 1.0f));
+            markerStation.setZIndex(4);
+            moveLatlng(latLng, null);
+        } else {
             String x = showPoiEntity.getX();
             String y = showPoiEntity.getY();
             if (x != null && y != null) {
@@ -490,27 +512,28 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 latLng.setLatitude(Double.parseDouble(y));
                 latLng.setLongitude(Double.parseDouble(x));
                 BitmapDescriptor stationDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bags);
-            markerStation = tencentMap.addMarker(new MarkerOptions(latLng).icon(stationDescriptor).anchor(0.5f,1.0f));
+                markerStation = tencentMap.addMarker(new MarkerOptions(latLng).icon(stationDescriptor).anchor(0.5f, 1.0f));
                 markerStation.setZIndex(4);
-            moveLatlng(latLng,null);
+                moveLatlng(latLng, null);
+            }
         }
-        initPhone();
         String describe = showPoiEntity.getMemo();//任务描述
         if (describe != null && !describe.equals("")) {
             editDescribe.setText(describe);
         }
+        initPhone();
         int station_type = showPoiEntity.getStation_type();
-        if (station_type==1){
+        if (station_type == 1) {
             spinnerType.setSelection(0, true);
-        }else if (station_type==2){
+        } else if (station_type == 2) {
             spinnerType.setSelection(1, true);
-        }else if (station_type==3){
+        } else if (station_type == 3) {
             spinnerType.setSelection(2, true);
-        }else if (station_type==4){
+        } else if (station_type == 4) {
             spinnerType.setSelection(3, true);
         }
         String telPhone = showPoiEntity.getTelPhone();
-        if (telPhone != null && !telPhone.equals("")&&!telPhone.equals("null")) {
+        if (telPhone != null && !telPhone.equals("") && !telPhone.equals("null")) {
             String[] phones = telPhone.split("\\|");
             for (int i = 0; i < phones.length; i++) {
                 if (i == 0) {
@@ -611,8 +634,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             ChargingPileEntity chargingPileEntity = new Gson().fromJson(pileFileString, ChargingPileEntity.class);
             String showStation = initShowStation();
             HashMap<String, Object> stringObjectHashMap = new HashMap<>();
-            stringObjectHashMap.put("chargingPileEntity",chargingPileEntity);
+            stringObjectHashMap.put("chargingPileEntity", chargingPileEntity);
-            stringObjectHashMap.put("showStation",showStation);
+            stringObjectHashMap.put("showStation", showStation);
             initRemovePileSharePre();
             Message obtain = Message.obtain();
             obtain.what = Constant.CHARGING_STATION;
@@ -644,13 +667,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         if (getPhoneBean.getCode() == 200) {
                             String code = getPhoneBean.getBody().getCode();
                             Integer telLength = getPhoneBean.getBody().getTelLength();
-                            if (!code.equals(Constant.CODE)){
+                            if (!code.equals(Constant.CODE)) {
                                 DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
-                                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为"+code+"，请手动修改", "确定","取消").setOkButton(new OnDialogButtonClickListener() {
+                                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                                     @Override
                                     public boolean onClick(BaseDialog baseDialog, View v) {
                                         Constant.CODE = code;
-                                        Constant.TelLength=telLength;
+                                        Constant.TelLength = telLength;
                                       /*  for (int i = 0; i < poiBeans.size(); i++) {
                                             poiBeans.get(i).setArea(Constant.CODE);
                                         }
@@ -660,8 +683,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                                     }
                                 });
                             }
-                        }else {
+                        } else {
-                            Toast.makeText(getActivity(), getPhoneBean.getMessage()+"", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getActivity(), getPhoneBean.getMessage() + "", Toast.LENGTH_SHORT).show();
                         }
                     }
 
@@ -720,11 +743,12 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         } else if (data.what == Constant.CHARGING_PILE_STATION) { // 新增充电桩
             ChargingPileEntity chargingPileEntity = (ChargingPileEntity) data.obj;
             List<ChargingPileEntity> currentChargingPileList = chargingPileAdapter.getChargingPileEntities();
-            m: if (currentChargingPileList!=null&&!currentChargingPileList.isEmpty()) {
+            m:
+            if (currentChargingPileList != null && !currentChargingPileList.isEmpty()) {
                 for (int i = 0; i < currentChargingPileList.size(); i++) {
                     if (currentChargingPileList.get(i).getPileId() == chargingPileEntity.getPileId()) {
                         currentChargingPileList.add(i, chargingPileEntity);
-                        currentChargingPileList.remove(i+1);
+                        currentChargingPileList.remove(i + 1);
                         break m;
                     }
                 }
@@ -734,11 +758,12 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 currentChargingPileList.add(chargingPileEntity);
             }
             chargingPileAdapter.notifyDataSetChanged();
-        }else if (data.what==Constant.PILE_MARKER_SHOW){
+        } else if (data.what == Constant.PILE_MARKER_SHOW) {
             initPileMarkerShow();
         }
     }
-    public void initPileMarkerShow(){
+
+    public void initPileMarkerShow() {
         for (int i = 0; i < removablesLocality.size(); i++) {
             removablesLocality.get(i).remove();
         }
@@ -751,7 +776,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 // 解密geo
                 String decodeGeometry = Geohash.getInstance().decode(p);
                 LatLng latLngPile = GeometryTools.createLatLng(decodeGeometry);
-                Marker markerPile = tencentMap.addMarker(new MarkerOptions(latLngPile).icon(pileDescriptor).anchor(0.5f,1.0f));
+                Marker markerPile = tencentMap.addMarker(new MarkerOptions(latLngPile).icon(pileDescriptor).anchor(0.5f, 1.0f));
                 markerPile.setZIndex(3);
                 removablesLocality.add(markerPile);
             }
@@ -833,7 +858,15 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                             Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
+                                    if (Constant.isPresent) {
                                         stationUploadByNetWork(poiDaoPoiEntity, chargingStationList);
+                                        Constant.isPresent = false;
+                                    } else {
+                                        Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show();
+
+                                    }
+
+
                                 }
                             });
                         }
@@ -885,8 +918,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         ChargingPileEntity chargingPileEntity = new ChargingPileEntity();
         String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude);
         chargingPileEntity.setP(encode);
-        stringObjectHashMap.put("chargingPileEntity",chargingPileEntity);
+        stringObjectHashMap.put("chargingPileEntity", chargingPileEntity);
-        stringObjectHashMap.put("showStation",showStation);
+        stringObjectHashMap.put("showStation", showStation);
         initRemovePileSharePre();
         Message obtain = Message.obtain();
         obtain.what = Constant.CHARGING_STATION;
@@ -904,7 +937,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) {
                 for (ChargingPileEntity pileEntity : chargingPileEntityList) {
                     if (pileEntity.getBodyId() == 0) {
-                        saveChargingPileByWork(pileEntity,poiEntity.getBodyId());
+                        saveChargingPileByWork(pileEntity, poiEntity.getBodyId());
                     }
                 }
             }
@@ -928,13 +961,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         }
 
         try {
-            HttpParams httpParams=new HttpParams();
+            HttpParams httpParams = new HttpParams();
-            httpParams.put("auditId",chargingPileEntity.getBodyId());
+            httpParams.put("auditId", chargingPileEntity.getBodyId());
             Response execute = OkGoBuilder.getInstance().url(HttpInterface.CS_TASK_UP_LOAD_PIC)
                     .params(httpParams)
                     .token(Constant.ACCESS_TOKEN)
                     .fileList(chargingPileFileList).postFileSynchronization();
-            if(execute!=null){
+            if (execute != null) {
                 assert execute.body() != null;
                 String pileUpLoadResultStr = execute.body().string();
                 PoiUploadBean uploadBeanResult = new Gson().fromJson(pileUpLoadResultStr, PoiUploadBean.class);
@@ -995,7 +1028,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                             PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
                             PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity);
                             if (poiCheckResult.getCode() == 1) {
-                                Toast.makeText(getActivity(), poiCheckResult.getMsg()+"", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show();
                                 return;
                             }
                             new Thread(new Runnable() {
@@ -1028,8 +1061,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     }
 
     private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList<File> chargingStationList) {
-     showLoadingDialog();
-        setLoadingDialogText("上传中...");
         if (poiEntity == null || poiEntity.getBodyId() == 0) {
             Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show();
             assert poiEntity != null;
@@ -1049,12 +1080,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         }
                     }
                 }
-
                 Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        HttpParams httpParams=new HttpParams();
+                        HttpParams httpParams = new HttpParams();
-                        httpParams.put("auditId",poiEntity.getBodyId());
+                        httpParams.put("auditId", poiEntity.getBodyId());
                         OkGoBuilder.getInstance()
                                 .Builder(getActivity())
                                 .url(HttpInterface.C_TASK_UP_LOAD_PIC)
@@ -1062,89 +1092,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                                 .token(Constant.ACCESS_TOKEN)
                                 .params(httpParams)
                                 .cls(PoiUploadBean.class)
-                                .postFileAsynchronous( new Callback<PoiUploadBean>() {
+                                .postFileAsynchronous(UploadUtils.getInstance().getChargingUploadCallback(getActivity(), showPoiEntity));
-                            @Override
+                        Objects.requireNonNull(getActivity()).onBackPressed();//回退
-                            public void onSuccess(PoiUploadBean response, int id) {
+                        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-                                dismissLoadingDialog();
+                        WaitDialog.dismiss(3000);
-                                if (response.getCode() == 200) {
 
-                                    new Thread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            poiDao.deletePoiEntity(poiEntity);
-                                            getActivity().runOnUiThread(new Runnable() {
-                                                @Override
-                                                public void run() {
-                                                    Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
-                                                    Message obtain = Message.obtain();
-                                                    obtain.what = Constant.JOB_WORD_MONITOR;
-                                                    obtain.obj = true;
-                                                    EventBus.getDefault().post(obtain);
-                                                    getActivity().onBackPressed();//回退
-                                                }
-                                            });
-                                        }
-                                    }).start();
-                                } else {
-                                    Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show();
-                                }
-                            }
-
-                            @Override
-                            public void onError(Throwable e, int id) {
-                                dismissLoadingDialog();
-                                Toast.makeText(getActivity(), e.getMessage()+"", Toast.LENGTH_SHORT).show();
-                                Log.d("TAG", "onError: " +e.getMessage() + "");
-                            }
-                        });
-
-
- /*                       OkGo
-                                // 请求方式和请求url
-                                .<PoiUploadBean>post(HttpInterface.C_TASK_UP_LOAD_PIC)
-                                // 请求的 tag, 主要用于取消对应的请求
-                                .params("auditId", poiEntity.getBodyId())
-                                .addFileParams("file", chargingStationList)
-                                .tag(this)
-                                .execute(new DialogCallback<PoiUploadBean>(PoiUploadBean.class) {
-                                    @Override
-                                    public void onSuccess(Response<PoiUploadBean> poiUploadBeanResponse) {
-                                        dismissLoadingDialog();
-                                        if (poiUploadBeanResponse == null || poiUploadBeanResponse.code() != 200 || poiUploadBeanResponse.body().getCode() != 200) {
-                                            Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show();
-                                            return;
-                                        }
-
-                                        if (poiUploadBeanResponse != null && poiUploadBeanResponse.code() == 200) {
-                                            PoiUploadBean body = poiUploadBeanResponse.body();
-                                            if (body.getCode() == 200) {
-                                                Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
-                                                Log.d("TAG", "onSuccess: " + poiUploadBeanResponse.toString() + "sssssssssssss");
-                                                new Thread(new Runnable() {
-                                                    @Override
-                                                    public void run() {
-                                                        poiDao.deletePoiEntity(showPoiEntity);
-                                                        getActivity().runOnUiThread(new Runnable() {
-                                                            @Override
-                                                            public void run() {
-                                                                getActivity().onBackPressed();//回退
-                                                            }
-                                                        });
-                                                    }
-                                                }).start();
-                                                return;
-                                            }
-                                        }
-                                    }
-
-                                    @Override
-                                    public void onError(Response<PoiUploadBean> poiUploadBeanResponse) {
-                                        super.onError(poiUploadBeanResponse);
-                                        dismissLoadingDialog();
-                                        Toast.makeText(getActivity(), poiUploadBeanResponse.code() + "", Toast.LENGTH_SHORT).show();
-                                        Log.d("TAG", "onError: " + poiUploadBeanResponse.code() + "");
-                                    }
-                                });*/
                     }
                 });
             }
@@ -1190,6 +1142,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                                             public void run() {
                                                 if (isLocal) {
                                                     stationUploadByNetWork(poiEntity, chargingStationList);
+                                                    Constant.isPresent = false;
 //                                                  chargingPileUploadNetWork(chargingPileBody, fileList);
                                                 } else {
                                                     Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
@@ -1220,6 +1173,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     }
                 });
     }
+
     private void findingDuplicateByWork() {
         HttpParams httpParams = new HttpParams();
         String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude);
@@ -1234,40 +1188,40 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 .getRequest(new Callback<TaskNameBean>() {
                     @Override
                     public void onSuccess(TaskNameBean taskNameBean, int id) {
-                        if (getActivity()==null){
+                        if (getActivity() == null) {
                             return;
                         }
                         dismissLoadingDialog();
-                        if (taskNameBean.getCode()==200){
+                        if (taskNameBean.getCode() == 200) {
                             editNameContent.setTextColor(Color.BLACK);
                             btnSaveLocal.setEnabled(true);
                             btnUploading.setEnabled(true);
                             List<String> body = taskNameBean.getBody();
-                            if (body!=null){
+                            if (body != null) {
                                 for (int i = 0; i < body.size(); i++) {
-                                    str +=body.get(i) + ",";
+                                    str += body.get(i) + ",";
                                 }
-                                if (str!=null){
+                                if (str != null) {
-                                    Toast.makeText(getActivity(), "存在类似名称---"+str, Toast.LENGTH_SHORT).show();
+                                    Toast.makeText(getActivity(), "存在类似名称---" + str, Toast.LENGTH_SHORT).show();
                                     str = "";
-                                }else {
+                                } else {
                                     Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
                                 }
-                            }else {
+                            } else {
                                 Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
                             }
-                        }else {
+                        } else {
                             editNameContent.setTextColor(Color.RED);
                             btnSaveLocal.setEnabled(false);
                             btnUploading.setEnabled(false);
-                            Toast.makeText(getActivity(), taskNameBean.getMessage()+"", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show();
                         }
 
                     }
 
                     @Override
                     public void onError(Throwable e, int id) {
-                        if (getActivity()==null){
+                        if (getActivity() == null) {
                             return;
                         }
                         dismissLoadingDialog();
@@ -1276,6 +1230,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     }
                 });
     }
+
     private String initShowStation() {
         PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
         String newPoiEntity = new Gson().toJson(poiEntity);
@@ -1313,8 +1268,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode==0x104){
+        if (resultCode == 0x104) {
-            if (requestCode==101){
+            if (requestCode == 101) {
                 assert data != null;
                 String file = data.getStringExtra("file");
                 assert file != null;
@@ -1323,7 +1278,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivPanorama);
                     tvPanorama.setTag(andGetPath);
                 }
-            }else if (requestCode==102){
+            } else if (requestCode == 102) {
                 assert data != null;
                 String file = data.getStringExtra("file");
                 assert file != null;
@@ -1332,7 +1287,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivName);
                     tvNamePic.setTag(andGetPath);
                 }
-            }else if (requestCode==103){
+            } else if (requestCode == 103) {
                 assert data != null;
                 String file = data.getStringExtra("file");
                 assert file != null;
@@ -1341,7 +1296,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivInternal);
                     tvInternal.setTag(andGetPath);
                 }
-            }else if (requestCode==104){
+            } else if (requestCode == 104) {
                 assert data != null;
                 String file = data.getStringExtra("file");
                 assert file != null;
@@ -1350,7 +1305,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivElse);
                     tvElse.setTag(andGetPath);
                 }
-            }else if (requestCode==105){
+            } else if (requestCode == 105) {
                 assert data != null;
                 String file = data.getStringExtra("file");
                 assert file != null;
@@ -1384,7 +1339,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             Response execute = OkGoBuilder.getInstance().url(HttpInterface.SUBMIT_CSTASK)
                     .token(Constant.ACCESS_TOKEN)
                     .params(httpParams).getSynchronization();
-            if(execute!=null){
+            if (execute != null) {
                 assert execute.body() != null;
                 String responseBodyStr = execute.body().string();
                 Gson gson = new Gson();
@@ -1400,13 +1355,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             e.printStackTrace();
         }
     }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
         if (showPoiEntity != null) {
             if (showPoiEntity.getTaskStatus() == 5) {
                 initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-            }else {
+            } else {
                 Message obtain = Message.obtain();
                 obtain.what = Constant.JOB_WORD_MONITOR;
                 obtain.obj = true;
@@ -1414,12 +1370,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             }
         }
     }
+
     @Override
     public void onDestroy() {
         if (EventBus.getDefault().isRegistered(this))//加上判断
             EventBus.getDefault().unregister(this);
         super.onDestroy();
-        if (markerStation!=null){
+        if (markerStation != null) {
             markerStation.remove();
         }
         for (int i = 0; i < removablesLocality.size(); i++) {
@@ -1428,7 +1385,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         removablesLocality.clear();
     }
 
-    private void initEndReceiveTask(String url,PoiEntity poiEntity) {
+    private void initEndReceiveTask(String url, PoiEntity poiEntity) {
         if (poiEntity.getTaskId() == 0) {
             Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show();
             return;
@@ -1471,6 +1428,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     }
                 });
     }
+
     @Override
     protected PoiEntity initPoiEntityByUI(PoiEntity poiEntity) {
         List<Info> infoPhoto = new ArrayList<>();
@@ -1533,49 +1491,49 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     @Override
     protected PoiCheckResult checkPoiEntity(PoiEntity entity) {
         PoiCheckResult poiCheckResult = new PoiCheckResult();
-        if (entity.getName()==null){
+        if (entity.getName() == null) {
             poiCheckResult.setCode(1);
             poiCheckResult.setMsg("请输入 名称");
             return poiCheckResult;
         }
-        if (tvPanorama.getTag()==null){
+        if (tvPanorama.getTag() == null) {
             poiCheckResult.setCode(1);
             poiCheckResult.setMsg("请拍照 全景图");
             return poiCheckResult;
         }
-        if (tvNamePic.getTag()==null){
+        if (tvNamePic.getTag() == null) {
             poiCheckResult.setCode(1);
             poiCheckResult.setMsg("请拍照 名称照片");
             return poiCheckResult;
         }
-        if (entity.getExistence()==0){
+        if (entity.getExistence() == 0) {
-            if (tvInternal.getTag()==null){
+            if (tvInternal.getTag() == null) {
                 poiCheckResult.setCode(1);
                 poiCheckResult.setMsg("请拍照 服务说明");
                 return poiCheckResult;
             }
-            if (tvElse.getTag()==null){
+            if (tvElse.getTag() == null) {
                 poiCheckResult.setCode(1);
                 poiCheckResult.setMsg("请拍照 充电站指引牌");
                 return poiCheckResult;
             }
-            if (tvScutcheon.getTag()==null){
+            if (tvScutcheon.getTag() == null) {
                 poiCheckResult.setCode(1);
                 poiCheckResult.setMsg("请拍照 收费标牌");
                 return poiCheckResult;
             }
         }
-        if (entity.getX()==null&&entity.getY()==null){
+        if (entity.getX() == null && entity.getY() == null) {
             poiCheckResult.setCode(1);
             poiCheckResult.setMsg("请确定 点位");
             return poiCheckResult;
         }
-        if (contactView.getPhoneList()!=-1){
+        if (contactView.getPhoneList() != -1) {
             poiCheckResult.setCode(1);
-            poiCheckResult.setMsg("您第"+contactView.getPhoneList()+"手机号输入有误");
+            poiCheckResult.setMsg("您第" + contactView.getPhoneList() + "手机号输入有误");
             return poiCheckResult;
         }
-        if (entity.getTelPhone()==null){
+        if (entity.getTelPhone() == null) {
             poiCheckResult.setCode(1);
             poiCheckResult.setMsg("请输入 手机号");
             return poiCheckResult;

app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java

@@ -38,7 +38,6 @@ public class ContactFragment extends BaseFragment implements View.OnClickListene
         super.initView();
         ImageView ivContact = findViewById(R.id.iv_contact);
         ivContact.setOnClickListener(this);
-
         TextView tvJigName = (TextView) findViewById(R.id.tv_jingName);
         tvJigName.setText(Constant.REGION_JIG_NAME);
         TextView tvJigPhone = (TextView) findViewById(R.id.tv_jingPhone);

app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java

@@ -62,7 +62,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
     private FilterAdapter filterAdapter;
     private ArrayList<PoiEntity> poiEntities;
     private ArrayList<PoiEntity> btnChock;
-    private PoiDao poiDao;
     private CheckBox checkOk;
 
     public static FilterFragment newInstance(Bundle bundle) {
@@ -144,13 +143,14 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                     PoiEntity poiEntity = new PoiEntity();
                     poiEntity.setTaskId(list.get(i).getId());
                     poiEntity.setName(list.get(i).getName());
+                    poiEntity.setGeoWkt(list.get(i).getGeo());
                     poiEntity.setAddress(list.get(i).getAddress());
                     poiEntity.setTelPhone(list.get(i).getTelephone() + "");
                     poiEntity.setPrecision(list.get(i).getPrice() + "");
                     poiEntity.setDist(list.get(i).getDist() + "");
                     poiEntity.setType(list.get(i).getType());
-                    String geo = list.get(i).getGeo();
+                    String gawk = list.get(i).getGeo();
-                    poiEntity.setGeoWkt(geo);
+                    String geo = Geohash.getInstance().decode(gawk);
                     Geometry geometry = GeometryTools.createGeometry(geo);
                     switch (geometry.getGeometryType()) {
                         case "Point": //点
@@ -180,7 +180,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
     protected void initData() {
         super.initData();
         PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext());
-        poiDao = poiDatabase.getPoiDao();
+        PoiDao poiDao = poiDatabase.getPoiDao();
         poiEntities = new ArrayList<>();
         btnChock = new ArrayList<>();//存储选择中的的数据
         ConstraintLayout clNumber = findViewById(R.id.cl_number);
@@ -310,7 +310,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.btn_draw:
-                if (btnChock==null){
+                if (btnChock == null) {
                     return;
                 }
                 StringBuilder a = new StringBuilder();
@@ -457,6 +457,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
 
     /**
      * 批量领取
+     *
      * @param taskId
      */
     private void initBatch(String taskId) {
@@ -487,6 +488,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                         EventBus.getDefault().post(obtain);
                         Toast.makeText(getContext(), "领取成功", Toast.LENGTH_SHORT).show();
                     }
+
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
@@ -498,7 +500,8 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
 
     /**
      * 通过不同类型的type 进行批量领取
-     * @param successBean
+     *
+     * @param
      */
     private void initType(FilterBatchBean.BodyBean.SuccessBean successBean) {
         switch (successBean.getType()) {
@@ -514,16 +517,16 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                         chargingStationEntity.setCreateTime(String.valueOf(successBean.getEndDate()));
                         chargingStationEntity.setPrecision(String.valueOf(successBean.getPrice()));
                         chargingStationEntity.setAddress(successBean.getAddress());
-                        if(successBean.getTelephone()==null||successBean.getTelephone().equals("")||successBean.getTelephone().equals("null")){
+                        if (successBean.getTelephone() == null || successBean.getTelephone().equals("") || successBean.getTelephone().equals("null")) {
                             chargingStationEntity.setTelPhone(null);
-                        }else {
+                        } else {
                             chargingStationEntity.setTelPhone(successBean.getTelephone());
                         }
                         chargingStationEntity.setType(successBean.getType());
                         chargingStationEntity.setTaskStatus(1);
+                        chargingStationEntity.setGeoWkt(successBean.getGeo());
                         String encodeStr = successBean.getGeo();
                         String geo = Geohash.getInstance().decode(encodeStr);
-                        chargingStationEntity.setGeoWkt(geo);
                         Geometry geometry = GeometryTools.createGeometry(geo);
                         switch (geometry.getGeometryType()) {
                             case "Point": //点
@@ -569,15 +572,15 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                         poiListEntity.setTaskId(successBean.getId());
                         poiListEntity.setName(successBean.getName());
                         poiListEntity.setDescribe(successBean.getMemo());
-                            poiListEntity.setCreateTime(successBean.getEndDate()+"");
+                        poiListEntity.setCreateTime(successBean.getEndDate() + "");
                         poiListEntity.setAddress(successBean.getAddress());
                         poiListEntity.setType(successBean.getType());
                         poiListEntity.setPrecision(String.valueOf(successBean.getPrice()));
                         poiListEntity.setIsExclusive(successBean.getIsExclusive());
                         poiListEntity.setTaskStatus(1);
+                        poiListEntity.setGeoWkt(successBean.getGeo());
                         String encodeStr = successBean.getGeo();
                         String geo = Geohash.getInstance().decode(encodeStr);
-                            poiListEntity.setGeoWkt(geo);
                         Geometry geometry = GeometryTools.createGeometry(geo);
                         switch (geometry.getGeometryType()) {
                             case "Point": //点
@@ -606,9 +609,9 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                         polygonEntity.setName(successBean.getName());
                         polygonEntity.setType(successBean.getType());
                         polygonEntity.setTaskStatus(1);
+                        polygonEntity.setGeoWkt(successBean.getGeo());
                         String encodeStr = successBean.getGeo();
                         String geo = Geohash.getInstance().decode(encodeStr);
-                        polygonEntity.setGeoWkt(geo);
                         Geometry geometry = GeometryTools.createGeometry(geo);
                         switch (geometry.getGeometryType()) {
                             case "Point": //点

app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java

@@ -35,6 +35,7 @@ import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 import com.navinfo.outdoor.util.Geohash;
 import com.navinfo.outdoor.util.GeometryTools;
+import com.navinfo.outdoor.util.Voice;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 import com.vividsolutions.jts.geom.Geometry;
 
@@ -243,19 +244,21 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                         return;
                     }else {
                         if (geometry>50){
+//                          Voice.sprat("注意在附近50米范围内进行采集",0);
+
+
                             DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
-                            MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前位置偏离任务线", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                            MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "注意在任务附近50米范围内进行采集", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                                 @Override
                                 public boolean onClick(BaseDialog baseDialog, View v) {
                                     initGather();
+//                                  Voice.sprat("注意在附近50米范围内进行采集",1);
                                     return false;
                                 }
                             });
                         }else {
                             initGather();
                         }
-
-
                     }
                 }
                 break;
@@ -361,10 +364,9 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                             }
                                             chargingStationEntity.setType(Integer.valueOf(stationBean.getType()));
                                             chargingStationEntity.setTaskStatus(statusId);
-
+                                            chargingStationEntity.setGeoWkt(stationBean.getGeo());
                                             String encodeStr = stationBean.getGeo();
                                             String geo = Geohash.getInstance().decode(encodeStr);
-                                            chargingStationEntity.setGeoWkt(geo);
                                             Geometry geometry = GeometryTools.createGeometry(geo);
                                             switch (geometry.getGeometryType()) {
                                                 case "Point": //点
@@ -375,6 +377,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                                 case "LineString": //线
                                                 case "Polygon": //面
                                                     List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                                                    assert latLineString != null;
                                                     chargingStationEntity.setX(latLineString.get(0).longitude + "");
                                                     chargingStationEntity.setY(latLineString.get(0).latitude + "");
                                                     break;
@@ -479,22 +482,23 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                 polygonEntity.setTaskId(listBean.getId());
                                 polygonEntity.setName(listBean.getName());
                                 polygonEntity.setType(listBean.getType());
+                                polygonEntity.setGeoWkt(listBean.getGeo());
                                 String encodeStr = listBean.getGeo();
                                 String geo = Geohash.getInstance().decode(encodeStr);
-                                polygonEntity.setGeoWkt(geo);
                                 Geometry geometry = GeometryTools.createGeometry(geo);
-                                if (geometry.getGeometryType().equals("Point")) {//点
+                                switch (geometry.getGeometryType()) {
+                                    case "Point": //点
                                         LatLng latLng = GeometryTools.createLatLng(geo);
                                         polygonEntity.setX(latLng.longitude + "");
                                         polygonEntity.setY(latLng.latitude + "");
-                                } else if (geometry.getGeometryType().equals("LineString")) {//线
+                                        break;
+                                    case "LineString": //线
+                                    case "Polygon": //面
                                         List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                                        assert latLineString != null;
                                         polygonEntity.setX(latLineString.get(0).longitude + "");
                                         polygonEntity.setY(latLineString.get(0).latitude + "");
-                                } else if (geometry.getGeometryType().equals("Polygon")) {//面
+                                        break;
-                                    List<LatLng> latPolygon = GeometryTools.getLatLags(geo);
-                                    polygonEntity.setX(latPolygon.get(0).longitude + "");
-                                    polygonEntity.setY(latPolygon.get(0).latitude + "");
                                 }
                                 polygonEntity.setTaskStatus(1);
                             }
@@ -725,25 +729,26 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                             poiListEntity.setDescribe(listBean.getMemo());
                                             poiListEntity.setCreateTime(listBean.getEndDate());
                                             poiListEntity.setAddress(listBean.getAddress());
-                                            poiListEntity.setType(Integer.valueOf(listBean.getType()));
+                                            poiListEntity.setType(listBean.getType());
                                             poiListEntity.setIsExclusive(listBean.getIsExclusive());
                                             poiListEntity.setTaskStatus(statusId);
+                                            poiListEntity.setGeoWkt(listBean.getGeo());
                                             String encodeStr = listBean.getGeo();
                                             String geo = Geohash.getInstance().decode(encodeStr);
-                                            poiListEntity.setGeoWkt(geo);
                                             Geometry geometry = GeometryTools.createGeometry(geo);
-                                            if (geometry.getGeometryType().equals("Point")) {//点
+                                            switch (geometry.getGeometryType()) {
+                                                case "Point": //点
                                                     LatLng latLng = GeometryTools.createLatLng(geo);
                                                     poiListEntity.setX(latLng.longitude + "");
                                                     poiListEntity.setY(latLng.latitude + "");
-                                            } else if (geometry.getGeometryType().equals("LineString")) {//线
+                                                    break;
+                                                case "LineString": //线
+                                                case "Polygon": //面
                                                     List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                                                    assert latLineString != null;
                                                     poiListEntity.setX(latLineString.get(0).longitude + "");
                                                     poiListEntity.setY(latLineString.get(0).latitude + "");
-                                            } else if (geometry.getGeometryType().equals("Polygon")) {//面
+                                                    break;
-                                                List<LatLng> latPolygon = GeometryTools.getLatLags(geo);
-                                                poiListEntity.setX(latPolygon.get(0).longitude + "");
-                                                poiListEntity.setY(latPolygon.get(0).latitude + "");
                                             }
                                           //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX());
                                             if (statusId==1||statusId==5){
@@ -851,22 +856,23 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                             poiListEntity.setPrecision(String.valueOf(listBean.getPrice()));
                                             poiListEntity.setIsExclusive(listBean.getIsExclusive());
                                             poiListEntity.setTaskStatus(statusId);
+                                            poiListEntity.setGeoWkt(listBean.getGeo());
                                             String encodeStr = listBean.getGeo();
                                             String geo = Geohash.getInstance().decode(encodeStr);
-                                            poiListEntity.setGeoWkt(geo);
                                             Geometry geometry = GeometryTools.createGeometry(geo);
-                                            if (geometry.getGeometryType().equals("Point")) {//点
+                                            switch (geometry.getGeometryType()) {
+                                                case "Point": //点
                                                     LatLng latLng = GeometryTools.createLatLng(geo);
                                                     poiListEntity.setX(latLng.longitude + "");
                                                     poiListEntity.setY(latLng.latitude + "");
-                                            } else if (geometry.getGeometryType().equals("LineString")) {//线
+                                                    break;
+                                                case "LineString": //线
+                                                case "Polygon": //面
                                                     List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                                                    assert latLineString != null;
                                                     poiListEntity.setX(latLineString.get(0).longitude + "");
                                                     poiListEntity.setY(latLineString.get(0).latitude + "");
-                                            } else if (geometry.getGeometryType().equals("Polygon")) {//面
+                                                    break;
-                                                List<LatLng> latPolygon = GeometryTools.getLatLags(geo);
-                                                poiListEntity.setX(latPolygon.get(0).longitude + "");
-                                                poiListEntity.setY(latPolygon.get(0).latitude + "");
                                             }
                                             //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX());
                                             if (statusId==1||statusId==5){

app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java

@@ -22,6 +22,7 @@ import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.github.lazylibrary.util.StringUtils;
 import com.google.gson.Gson;
 import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialog.util.BaseDialog;
@@ -240,7 +241,12 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
                     }else {
                         if (bankCardBean.getResult()!=null&&bankCardBean.getResult().getBank_card_number()!=null){
                             String bank_card_number = bankCardBean.getResult().getBank_card_number();
+                            if (StringUtils.isEmpty(bank_card_number)) {
+                                Toast.makeText(getActivity(), "无法识别银行卡号", Toast.LENGTH_SHORT).show();
+                                return;
+                            }
                             etBankNum.setText(bank_card_number);
+                            String bankName = bankCardBean.getResult().getBank_name();
                         }else {
                             Toast.makeText(getActivity(), "请拍银行卡照片", Toast.LENGTH_SHORT).show();
                         }

app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java

@@ -98,7 +98,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
         mainGrade = (TextView) findViewById(R.id.main_grade);
         tvMainGrade = findViewById(R.id.tv_main_grade);
         if (Constant.LEVEL != 0) {
-            tvMainGrade.setText(Constant.LEVEL+"");
+            tvMainGrade.setText(Constant.LEVEL + "");
         }
         initNetWork();
 
@@ -164,21 +164,23 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
             case R.id.rl_set://设置
             case R.id.rl_issue://常见问题
             case R.id.rl_map://地图下载
-            case R.id.rl_privilege://我的特权
-            case R.id.rl_grade://我的等级
                 Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
                 break;
+            case R.id.rl_privilege://我的特权
+                Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class);
+                intentPrivilege.putExtra("tag", 18);
+                startActivity(intentPrivilege);
+                break;
+            case R.id.rl_grade://我的等级
+                Intent intentGrade = new Intent(getActivity(), FragmentManagement.class);
+                intentGrade.putExtra("tag", 17);
+                startActivity(intentGrade);
+                break;
             case R.id.btn_withdraw://提现页面
                 Intent intentWithdraw = new Intent(getActivity(), FragmentManagement.class);
                 intentWithdraw.putExtra("tag", 15);
                 startActivity(intentWithdraw);
                 break;
-//              Intent intentGrade = new Intent(getActivity(), FragmentManagement.class);
-//              intentGrade.putExtra("tag", 17);
-//              startActivity(intentGrade);
-//              Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class);
-//              intentPrivilege.putExtra("tag", 18);
-//              startActivity(intentPrivilege);
 //              Intent intentMap = new Intent(getActivity(), FragmentManagement.class);
 //              intentMap.putExtra("tag", 19);
 //              startActivity(intentMap);

app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java

@@ -2,21 +2,16 @@ package com.navinfo.outdoor.fragment;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
-import android.provider.MediaStore;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -38,21 +33,19 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialog.util.BaseDialog;
 import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.MessageDialog;
-import com.lzy.okgo.OkGo;
+import com.kongzue.dialog.v3.WaitDialog;
 import com.lzy.okgo.model.HttpParams;
-import com.lzy.okgo.model.Response;
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.FragmentManagement;
 import com.navinfo.outdoor.activity.PhotographActivity;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
+import com.navinfo.outdoor.util.UploadUtils;
 import com.navinfo.outdoor.bean.Info;
-import com.navinfo.outdoor.bean.OtherUploadPicBean;
 import com.navinfo.outdoor.bean.PoiSaveBean;
 import com.navinfo.outdoor.bean.PoiUploadBean;
 import com.navinfo.outdoor.bean.UnPolygonTaskBean;
 import com.navinfo.outdoor.http.Callback;
-import com.navinfo.outdoor.http.DialogCallback;
 import com.navinfo.outdoor.http.HttpInterface;
 import com.navinfo.outdoor.http.OkGoBuilder;
 import com.navinfo.outdoor.room.ChargingPileEntity;
@@ -60,8 +53,8 @@ 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.AWMp4ParserHelper;
 import com.navinfo.outdoor.util.Geohash;
+import com.navinfo.outdoor.util.GeometryTools;
 import com.navinfo.outdoor.util.PhotoUtils;
 import com.tencent.tencentmap.mapsdk.maps.TencentMap;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
@@ -69,6 +62,7 @@ import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 import com.tencent.tencentmap.mapsdk.maps.model.Marker;
 import com.tencent.tencentmap.mapsdk.maps.model.MarkerOptions;
+import com.vividsolutions.jts.geom.Geometry;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -81,8 +75,6 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
 
-import static android.app.Activity.RESULT_OK;
-
 /**
  * 寻宝-上报-其他的fragment
  */
@@ -90,7 +82,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
 
 
     private Spinner spinnerOther;
-    String[] others = new String[]{"门牌", "公交", "情报"};//  //门牌:5 公交:6 情报:7 现在其他任务类型里就这三种
+    String[] others = new String[]{"门牌", "公交", "情报"};//  //门牌:7 公交:8 情报:9 现在其他任务类型里就这三种
     private EditText editTaskName, editOtherDescribe;
     private RelativeLayout rlPicture;
     private ImageView ivPicture;
@@ -101,7 +93,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
     private Button btnOtherLocal;
     private PoiDao poiDao;
     private LatLng latLng;
-    private int station_type = 5;
+    private int station_type = 7;
     private ArrayList<File> otherUploadList;
     private CheckBox checkPot;
     private Marker markerOther;
@@ -173,13 +165,13 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 switch (position) {
                     case 0:
-                        station_type = 5;
+                        station_type = 7;
                         break;
                     case 1:
-                        station_type = 6;
+                        station_type = 8;
                         break;
                     case 2:
-                        station_type = 7;
+                        station_type = 9;
                         break;
                 }
             }
@@ -320,6 +312,27 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
             if (name != null && !name.equals("")) {
                 editTaskName.setText(name);
             }
+
+            String geoWkt = showPoiEntity.getGeoWkt();
+            if (geoWkt!=null){
+                String geo = Geohash.getInstance().decode(geoWkt);
+                Geometry geometry = GeometryTools.createGeometry(geo);
+                switch (geometry.getGeometryType()) {
+                    case "Point": //点
+                        latLng = GeometryTools.createLatLng(geo);
+                        break;
+                    case "LineString": //线
+                    case "Polygon": //面
+                        List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                        assert latLineString != null;
+                        latLng = latLineString.get(0);
+                        break;
+                }
+                BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bag);
+                markerOther = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).anchor(0.5f, 1.0f));
+                markerOther.setZIndex(4);
+                moveLatlng(latLng, null);
+            }else {
                 String x = showPoiEntity.getX();
                 String y = showPoiEntity.getY();
                 if (x != null && y != null) {
@@ -331,16 +344,19 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                     markerOther.setZIndex(4);
                     moveLatlng(latLng, null);
                 }
+            }
+
+
             String describe = showPoiEntity.getMemo();//任务描述
             if (describe != null && !describe.equals("")) {
                 editOtherDescribe.setText(describe);
             }
             int station_type = showPoiEntity.getStation_type();
-            if (station_type == 5) {
+            if (station_type == 7) {
                 spinnerOther.setSelection(0, true);
-            } else if (station_type == 6) {
+            } else if (station_type == 8) {
                 spinnerOther.setSelection(1, true);
-            } else if (station_type == 7) {
+            } else if (station_type == 9) {
                 spinnerOther.setSelection(2, true);
             }
             if (showPoiEntity.getPhotoInfo() != null) {
@@ -423,7 +439,12 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                             Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
+                                    if (Constant.isPresent){
                                         otherUploadByNet(poiDaoPoiEntity.getBodyId(), otherUploadList);
+                                        Constant.isPresent=false;
+                                    }else {
+                                        Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show();
+                                    }
                                 }
                             });
                         }
@@ -488,8 +509,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
 
         HttpParams httpParams = new HttpParams();
         httpParams.put("auditId", body);
-        showLoadingDialog();
-        setLoadingDialogText("上传中...");
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
                 .url(HttpInterface.OTHER_TASK_UPLOAD_PIC)
@@ -497,44 +516,13 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 .token(Constant.ACCESS_TOKEN)
                 .params(httpParams)
                 .cls(PoiUploadBean.class)
-                .postFileAsynchronous(new Callback<PoiUploadBean>() {
+                .postFileAsynchronous(UploadUtils.getInstance().getOtherUploadCallback(getActivity(),showPoiEntity));
-                    @Override
+        Objects.requireNonNull(getActivity()).onBackPressed();//回退
-                    public void onSuccess(PoiUploadBean response, int id) {
+        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-                        dismissLoadingDialog();
+        WaitDialog.dismiss(3000);
-                        if (response.getCode() == 200) {
-                            new Thread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
-                                    poiDao.deletePoiEntity(poiDaoPoiEntity);
-                                    Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
-                                            Message obtain = Message.obtain();
-                                            obtain.what = Constant.JOB_WORD_MONITOR;
-                                            obtain.obj = true;
-                                            EventBus.getDefault().post(obtain);
-                                            getActivity().onBackPressed();//回退
-                                        }
-                                    });
-                                }
-                            }).start();
-                        } else {
-                            Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
-                        }
 
     }
 
-                    @Override
-                    public void onError(Throwable e, int id) {
-                        dismissLoadingDialog();
-                        Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show();
-                        Log.d("TAG", "onError: " + e.getMessage() + "");
-                    }
-                });
-    }
-
     private void otherSaveByNetWork(PoiEntity poiEntity, boolean isLocal) {
         showLoadingDialog();
         setLoadingDialogText("保存中...");
@@ -569,6 +557,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                                             public void run() {
                                                 if (isLocal) {
                                                     otherUploadByNet(body, otherUploadList);
+                                                    Constant.isPresent=false;
                                                 } else {
                                                     Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
                                                     Message obtain = Message.obtain();

app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java

@@ -4,17 +4,14 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
-import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -38,12 +35,14 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialog.util.BaseDialog;
 import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.MessageDialog;
+import com.kongzue.dialog.v3.WaitDialog;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.FragmentManagement;
 import com.navinfo.outdoor.activity.PhotographActivity;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
+import com.navinfo.outdoor.util.UploadUtils;
 import com.navinfo.outdoor.bean.GetPhoneBean;
 import com.navinfo.outdoor.bean.Info;
 import com.navinfo.outdoor.bean.OtherUploadPicBean;
@@ -61,6 +60,7 @@ import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 import com.navinfo.outdoor.ui.view.ContactView;
 import com.navinfo.outdoor.util.Geohash;
+import com.navinfo.outdoor.util.GeometryTools;
 import com.navinfo.outdoor.util.PhotoUtils;
 import com.tencent.tencentmap.mapsdk.maps.TencentMap;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
@@ -68,6 +68,7 @@ import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 import com.tencent.tencentmap.mapsdk.maps.model.Marker;
 import com.tencent.tencentmap.mapsdk.maps.model.MarkerOptions;
+import com.vividsolutions.jts.geom.Geometry;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -80,8 +81,6 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
 
-import static android.app.Activity.RESULT_OK;
-
 /**
  * poi记录的Fragment
  * 2021-5-25
@@ -382,6 +381,27 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
         if (address != null && !address.equals("")) {
             editSiteContent.setText(address);
         }
+
+        String geoWkt = showPoiEntity.getGeoWkt();
+        if (geoWkt!=null){
+            String geo = Geohash.getInstance().decode(geoWkt);
+            Geometry geometry = GeometryTools.createGeometry(geo);
+            switch (geometry.getGeometryType()) {
+                case "Point": //点
+                    latLng = GeometryTools.createLatLng(geo);
+                    break;
+                case "LineString": //线
+                case "Polygon": //面
+                    List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                    assert latLineString != null;
+                    latLng = latLineString.get(0);
+                    break;
+            }
+            BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bags);
+            markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).anchor(0.5f, 1.0f));
+            markerPoi.setZIndex(4);
+            moveLatlng(latLng, null);
+        }else {
             String x = showPoiEntity.getX();
             String y = showPoiEntity.getY();
             if (x != null && y != null) {
@@ -393,6 +413,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 markerPoi.setZIndex(4);
                 moveLatlng(latLng, null);
             }
+        }
+
         //得到区号
         initPhone();
         String memo = showPoiEntity.getMemo();//任务描述
@@ -637,7 +659,12 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                             Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
+                                    if (Constant.isPresent){
                                         poiUploadByNetWork(poiDaoPoiEntity.getBodyId(), poiPicList);
+                                        Constant.isPresent=false;
+                                    }else {
+                                        Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show();
+                                    }
                                 }
                             });
                         }
@@ -755,7 +782,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                                 @Override
                                 public void run() {
                                     InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity);
-                                    getActivity().runOnUiThread(new Runnable() {
+                                    Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
                                             poiSaveByNet(poiEntity, isLocal);
@@ -786,8 +813,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
             Log.e("TAG", "poiUploadByNetWork: " + body + poiPicList);
             return;
         }
-        showLoadingDialog();
-        setLoadingDialogText("上传中...");
         HttpParams httpParams = new HttpParams();
         httpParams.put("auditId", body);
         OkGoBuilder.getInstance()
@@ -796,41 +821,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 .token(Constant.ACCESS_TOKEN)
                 .fileList(poiPicList)
                 .params(httpParams)
-                .postFileAsynchronous(new Callback<OtherUploadPicBean>() {
+                .postFileAsynchronous(UploadUtils.getInstance().getPoiUploadCallback(getActivity(),showPoiEntity));
-                    @Override
+        Objects.requireNonNull(getActivity()).onBackPressed();//回退
-                    public void onSuccess(OtherUploadPicBean response, int id) {
+        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-                        dismissLoadingDialog();
+        WaitDialog.dismiss(3000);
-                        if (response.getCode() == 200) {
-                            new Thread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
-                                    poiDao.deletePoiEntity(poiDaoPoiEntity);
-                                    Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
-                                            Message obtain = Message.obtain();
-                                            obtain.what = Constant.JOB_WORD_MONITOR;
-                                            obtain.obj = true;
-                                            EventBus.getDefault().post(obtain);
-                                            getActivity().onBackPressed();//回退
-                                        }
-                                    });
-                                }
-                            }).start();
-                        } else {
-                            Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
-                        }
-
-                    }
-
-                    @Override
-                    public void onError(Throwable e, int id) {
-                        dismissLoadingDialog();
-                        Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show();
-                    }
-                });
 
     }
 
@@ -869,6 +863,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                                             public void run() {
                                                 if (isLocal) {
                                                     poiUploadByNetWork(body, poiPicList);//上传
+                                                    Constant.isPresent=false;
                                                 } else {
                                                     Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
                                                     Message obtain = Message.obtain();

app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java

@@ -11,8 +11,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -32,13 +30,14 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialog.util.BaseDialog;
 import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.MessageDialog;
+import com.kongzue.dialog.v3.WaitDialog;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.FragmentManagement;
-import com.navinfo.outdoor.activity.PictureActivity;
 import com.navinfo.outdoor.activity.PicturesActivity;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
+import com.navinfo.outdoor.util.UploadUtils;
 import com.navinfo.outdoor.bean.OtherUploadPicBean;
 import com.navinfo.outdoor.bean.PoiVideoBean;
 import com.navinfo.outdoor.bean.UnPolygonTaskBean;
@@ -51,12 +50,14 @@ import com.navinfo.outdoor.room.PoiDao;
 import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 import com.navinfo.outdoor.util.AWMp4ParserHelper;
+import com.navinfo.outdoor.util.Geohash;
 import com.navinfo.outdoor.util.GeometryTools;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 import com.tencent.tencentmap.mapsdk.maps.model.Marker;
 import com.tencent.tencentmap.mapsdk.maps.model.MarkerOptions;
+import com.vividsolutions.jts.geom.Geometry;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -197,6 +198,27 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             if (name != null && !name.equals("")) {
                 etRoadName.setText(name);
             }
+
+            String geoWkt = showPoiEntity.getGeoWkt();
+            if (geoWkt!=null){
+                String geo = Geohash.getInstance().decode(geoWkt);
+                Geometry geometry = GeometryTools.createGeometry(geo);
+                switch (geometry.getGeometryType()) {
+                    case "Point": //点
+                        latLng = GeometryTools.createLatLng(geo);
+                        break;
+                    case "LineString": //线
+                    case "Polygon": //面
+                        List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                        assert latLineString != null;
+                        latLng = latLineString.get(0);
+                        break;
+                }
+                BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bag);
+                markerPoiVideo = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).anchor(0.5f, 1.0f));
+                markerPoiVideo.setZIndex(4);
+                moveLatlng(latLng, null);
+            }else {
                 String x = showPoiEntity.getX();
                 String y = showPoiEntity.getY();
                 if (x != null && y != null) {
@@ -208,6 +230,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                     markerPoiVideo.setZIndex(4);
                     moveLatlng(latLng, null);
                 }
+            }
+
             String describe = showPoiEntity.getMemo();//任务描述
             if (describe != null && !describe.equals("")) {
                 etDesc.setText(describe);
@@ -311,8 +335,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                 startActivityForResult(intent, 0x101);
                 break;
             case R.id.btn_poi_video_upload:
-                showLoadingDialog();
+                if (Constant.isPresent){
-                setLoadingDialogText("压缩中...");
                     if (fmPoiVideoPic.getTag() != null) {
                         List<File> videoFileList = (List<File>) fmPoiVideoPic.getTag();
                         fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
@@ -325,7 +348,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                                     Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-                                        dismissLoadingDialog();
                                             initPoiSaveLocal(true);
                                         }
                                     });
@@ -333,8 +355,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                                     Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-                                        dismissLoadingDialog();
                                             poiVideoUpload(poiDaoPoiEntity.getBodyId(), fileZip);
+                                            Constant.isPresent=false;
                                         }
                                     });
                                 }
@@ -345,6 +367,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                         Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show();
                         return;
                     }
+                }else {
+                    Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show();
+                }
+
                 break;
         }
     }
@@ -406,49 +432,17 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         long time = System.currentTimeMillis();
         httpParams.put("datetime", time);
         httpParams.put("file", fileZip);
-        showLoadingDialog();
-        setLoadingDialogText("上传中...");
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
                 .url(HttpInterface.POI_VIDEO_UPLOAD_PIC)
                 .cls(OtherUploadPicBean.class)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN)
-                .postRequest(new Callback<OtherUploadPicBean>() {
+                .postRequest(UploadUtils.getInstance().getPoiVideoUploadCallback(getActivity(),showPoiEntity));
-                    @Override
+        Objects.requireNonNull(getActivity()).onBackPressed();//回退
-                    public void onSuccess(OtherUploadPicBean response, int id) {
+        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-                        dismissLoadingDialog();
+        WaitDialog.dismiss(3000);
-                        if (response.getCode() == 200) {
-                            new Thread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
-                                    poiDao.deletePoiEntity(poiDaoPoiEntity);
-                                    Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
-                                            Message obtain = Message.obtain();
-                                            obtain.what = Constant.JOB_WORD_MONITOR;
-                                            obtain.obj = true;
-                                            EventBus.getDefault().post(obtain);
-                                            getActivity().onBackPressed();//回退
-                                        }
-                                    });
-                                }
-                            }).start();
-                        } else {
-                            Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
-                        }
-                    }
 
-                    @Override
-                    public void onError(Throwable e, int id) {
-                        dismissLoadingDialog();
-                        Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show();
-                        Log.d("TAG", "onError: " + e.getMessage() + "");
-                    }
-                });
     }
 
     private void poiVideoSave(PoiEntity poiEntity, boolean isLocal) {
@@ -680,9 +674,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             }
         }
         if (fmPoiVideoPic.getTag() != null && !((List<File>) fmPoiVideoPic.getTag()).isEmpty()) {
-            List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLineStringByFileList((List<File>) fmPoiVideoPic.getTag());
+            List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList((List<File>) fmPoiVideoPic.getTag());
-            String lineString = GeometryTools.getLineString(lineStringByFileList);
+            String lineString = Geohash.getInstance().encodeList(lineStringByFileList);
-            Log.d("TAG", "onGranted: " + lineString);
             String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr((List<File>) fmPoiVideoPic.getTag());
             poiEntity.setPhoto(photoStr);
             if (lineString != null) {

app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java

@@ -2,7 +2,6 @@ package com.navinfo.outdoor.fragment;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
@@ -12,8 +11,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -22,6 +19,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.widget.NestedScrollView;
 
+import com.bumptech.glide.Glide;
 import com.github.lazylibrary.util.StringUtils;
 import com.github.lazylibrary.util.ZipUtil;
 import com.google.gson.Gson;
@@ -32,13 +30,14 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialog.util.BaseDialog;
 import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.MessageDialog;
+import com.kongzue.dialog.v3.WaitDialog;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.FragmentManagement;
-import com.navinfo.outdoor.activity.PictureActivity;
 import com.navinfo.outdoor.activity.PicturesActivity;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
+import com.navinfo.outdoor.util.UploadUtils;
 import com.navinfo.outdoor.bean.OtherUploadPicBean;
 import com.navinfo.outdoor.bean.RoadSaveBean;
 import com.navinfo.outdoor.bean.UnPolygonTaskBean;
@@ -51,12 +50,14 @@ import com.navinfo.outdoor.room.PoiDao;
 import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 import com.navinfo.outdoor.util.AWMp4ParserHelper;
+import com.navinfo.outdoor.util.Geohash;
 import com.navinfo.outdoor.util.GeometryTools;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 import com.tencent.tencentmap.mapsdk.maps.model.Marker;
 import com.tencent.tencentmap.mapsdk.maps.model.MarkerOptions;
+import com.vividsolutions.jts.geom.Geometry;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -64,7 +65,6 @@ import org.greenrobot.eventbus.Subscribe;
 import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
@@ -194,6 +194,26 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
             if (name != null && !name.equals("")) {
                 etRoadName.setText(name);
             }
+            String geoWkt = showPoiEntity.getGeoWkt();
+            if (geoWkt!=null){
+                String geo = Geohash.getInstance().decode(geoWkt);
+                Geometry geometry = GeometryTools.createGeometry(geo);
+                switch (geometry.getGeometryType()) {
+                    case "Point": //点
+                        latLng = GeometryTools.createLatLng(geo);
+                        break;
+                    case "LineString": //线
+                    case "Polygon": //面
+                        List<LatLng> latLineString = GeometryTools.getLatLags(geo);
+                        assert latLineString != null;
+                        latLng = latLineString.get(0);
+                        break;
+                }
+                BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bag);
+                markerRoad = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).anchor(0.5f, 1.0f));
+                markerRoad.setZIndex(4);
+                moveLatlng(latLng, null);
+            }else {
                 String x = showPoiEntity.getX();
                 String y = showPoiEntity.getY();
                 if (x != null && y != null) {
@@ -205,13 +225,29 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                     markerRoad.setZIndex(4);
                     moveLatlng(latLng, null);
                 }
+            }
             String describe = showPoiEntity.getDescribe();//任务描述
             if (describe != null && !describe.equals("")) {
                 etDesc.setText(describe);
             }
             String photoList = showPoiEntity.getPhoto();//存儲在數據庫中的數據
             if (!StringUtils.isEmpty(photoList)) {
-                String[] photos = photoList.split(",");
+                if (!StringUtils.isEmpty(photoList)) {
+                    boolean isImageLoad = false;
+                    List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
+                    for (int i = 0; i < fileListByUUID.size(); i++) {
+                        if (fileListByUUID.get(i).getPath().contains(".jpg") && !fileListByUUID.get(i).getPath().contains("paper.txt")) {
+                            if (fileListByUUID.get(i).exists() && !isImageLoad) {
+                                // 使用glide加载视频的第一帧
+                                Glide.with(Objects.requireNonNull(getActivity())).load(fileListByUUID.get(i)).into(ivRoadPicture);
+                                isImageLoad = true;
+                            }
+                        }
+                    }
+                    fmRoadPic.setTag(fileListByUUID);
+                }
+
+      /*         String[] photos = photoList.split(",");
                 List<File> videoFileList = new ArrayList<>();
                 boolean isImageLoad = false;
                 if (photos.length > 0) {
@@ -229,7 +265,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                         }
                     }
                     fmRoadPic.setTag(videoFileList);
-                }
+                }*/
             }
         }
         assert showPoiEntity != null;
@@ -301,8 +337,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 startActivityForResult(intent, 0x101);
                 break;
             case R.id.road_upload:
-                showLoadingDialog();
+                if (Constant.isPresent) {
-                setLoadingDialogText("压缩中...");
                     if (fmRoadPic.getTag() != null) {
                         List<File> videoFileList = (List<File>) fmRoadPic.getTag();
                         fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
@@ -315,7 +350,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                                     Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-                                        dismissLoadingDialog();
                                             initPoiSaveLocal(true);
                                         }
                                     });
@@ -324,8 +358,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                                     Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-                                        dismissLoadingDialog();
                                             poiVideoUpload(poiDaoPoiEntity.getBodyId(), fileZip);
+                                            Constant.isPresent = false;
                                         }
                                     });
                                 }
@@ -337,6 +371,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                         Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show();
                         return;
                     }
+                } else {
+                    Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show();
+                }
+
                 break;
 
         }
@@ -400,49 +438,18 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         long time = System.currentTimeMillis();
         httpParams.put("datetime", time);
         httpParams.put("file", fileZip);
-        showLoadingDialog();
-        setLoadingDialogText("上传中...");
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
                 .url(HttpInterface.ROAD_TASK_UPLOAD_PIC)
                 .params(httpParams)
                 .token(Constant.ACCESS_TOKEN)
                 .cls(OtherUploadPicBean.class)
-                .postRequest(new Callback<OtherUploadPicBean>() {
+                .postRequest(UploadUtils.getInstance().getRoadUploadCallback(getActivity(), showPoiEntity));
-                    @Override
+        Objects.requireNonNull(getActivity()).onBackPressed();//回退
-                    public void onSuccess(OtherUploadPicBean response, int id) {
+        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候...");
-                        dismissLoadingDialog();
+        WaitDialog.dismiss(3000);
-                        if (response.getCode() == 200) {
+
-                            new Thread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
-                                    poiDao.deletePoiEntity(poiDaoPoiEntity);
-                                    Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
-                                            Message obtain = Message.obtain();
-                                            obtain.what = Constant.JOB_WORD_MONITOR;
-                                            obtain.obj = true;
-                                            EventBus.getDefault().post(obtain);
-                                            getActivity().onBackPressed();//回退
-                                        }
-                                    });
-                                }
-                            }).start();
-                        } else {
-                            Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
-                        }
-                    }
 
-                    @Override
-                    public void onError(Throwable e, int id) {
-                        dismissLoadingDialog();
-                        Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show();
-                        Log.d("TAG", "onError: " + e.getMessage() + "");
-                    }
-                });
     }
 
     private void roadSaveBetWork(PoiEntity poiEntity, boolean isLocal) {
@@ -477,6 +484,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                                             public void run() {
                                                 if (isLocal) {
                                                     poiVideoUpload(roadBody, fileZip);
+                                                    Constant.isPresent = false;
                                                 } else {
                                                     Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
                                                     Message obtain = Message.obtain();
@@ -673,13 +681,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
             }
         }
         if (fmRoadPic.getTag() != null && !((List<File>) fmRoadPic.getTag()).isEmpty()) {
-            List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLineStringByFileList((List<File>) fmRoadPic.getTag());
+            List<LatLng> lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList((List<File>) fmRoadPic.getTag());
-            String lineString = GeometryTools.getLineString(lineStringByFileList);
+            String encodeList = Geohash.getInstance().encodeList(lineStringByFileList);
-            Log.d("TAG", "onGranted: " + lineString);
+            Log.d("TAG", "onGranted: " + encodeList);
             String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr((List<File>) fmRoadPic.getTag());
             poiEntity.setPhoto(photoStr);
-            if (lineString != null) {
+            if (encodeList != null) {
-                poiEntity.setGeoWkt(lineString);
+                poiEntity.setGeoWkt(encodeList);
             }
         }
         return poiEntity;

app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java

@@ -22,6 +22,7 @@ import com.kongzue.dialog.util.BaseDialog;
 import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.BottomMenu;
 import com.kongzue.dialog.v3.MessageDialog;
+import com.kongzue.dialog.v3.WaitDialog;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.adapter.StaySubmitAdapter;
@@ -83,13 +84,13 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
         roadDao = roadDatabase.getPoiDao();
         ConstraintLayout clStayType = findViewById(R.id.cl_stay_type);
         clStayType.setOnClickListener(this);
-        RecyclerView stayXrv =findViewById(R.id.stay_xrv);
+        RecyclerView stayXrv = findViewById(R.id.stay_xrv);
         cbSelect = findViewById(R.id.cb_select);
         cbSelect.setOnClickListener(this);
-        TextView tvDelete =findViewById(R.id.tv_delete);
+        TextView tvDelete = findViewById(R.id.tv_delete);
         tvDelete.setOnClickListener(this);
         tvStayType = findViewById(R.id.tv_stay_type);
-        Button btnStaySubmit =findViewById(R.id.btn_stay_submit);
+        Button btnStaySubmit = findViewById(R.id.btn_stay_submit);
         btnStaySubmit.setOnClickListener(this);
         stayXrv.setLayoutManager(new LinearLayoutManager(getActivity()));
         stayXrv.addItemDecoration(new DividerItemDecoration(Objects.requireNonNull(getContext()), DividerItemDecoration.VERTICAL));
@@ -126,8 +127,6 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
     public void onEvent(Message data) {
         if (data.what == Constant.EVENT_STAY_REFRESH) {
             cbSelect.setChecked(false);
-            Toast.makeText(getActivity(), (String) data.obj, Toast.LENGTH_SHORT).show();
-            dismissLoadingDialog();
             refreshData();
         }
     }
@@ -192,6 +191,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
                 break;
 
             case R.id.tv_delete:
+                if (Constant.isPresent) {
                     DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
                     MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                         @Override
@@ -200,6 +200,9 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
                             return false;
                         }
                     });
+                } else {
+                    Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show();
+                }
                 break;
             case R.id.btn_stay_submit://提交
                 if (poiEntities == null) {
@@ -212,13 +215,18 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
                         poiEntities.add(allRoad.get(i));
                     }
                 }
+                if (Constant.isPresent) {
                     if (poiEntities.size() > 0) {
-                    showLoadingDialog();
-                    setLoadingDialogText("提交中...");
                         PoiSaveUtils.getInstance(getActivity()).uploadPoiEntityBatch(poiEntities);
+                        Constant.isPresent = false;
+                        WaitDialog.show((AppCompatActivity) getActivity(), "任务正在提交中，无需重复提交");
+                        WaitDialog.dismiss(2000);
                     } else {
                         Toast.makeText(getActivity(), "请选择要提交的数据", Toast.LENGTH_SHORT).show();
                     }
+                } else {
+                    Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show();
+                }
                 break;
         }
     }
@@ -248,10 +256,10 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
                                 auditIds.append(poiEntities.get(i).getBodyId()).append(",");
                             }
                         }
-                        if (!taskIds.toString().equals("")){
+                        if (!taskIds.toString().equals("")) {
                             taskIds = new StringBuilder(taskIds.substring(0, taskIds.length() - 1));
                         }
-                        if (!auditIds.toString().equals("")){
+                        if (!auditIds.toString().equals("")) {
                             auditIds = new StringBuilder(auditIds.substring(0, auditIds.length() - 1));
                         }
                         HttpParams httpParams = new HttpParams();
@@ -267,9 +275,9 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
                                     @Override
                                     public void onSuccess(UnPolygonTaskBean response, int id) {
                                         dismissLoadingDialog();
-                                        if (response.getCode()==200){
+                                        if (response.getCode() == 200) {
                                             staySubmitAdapter.setAllCheckedDelete();
-                                        }else {
+                                        } else {
                                             Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
                                         }
                                     }
@@ -315,7 +323,6 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
 //                               roadEntities.add(roadAll.get(i));
 //                           }
 //                      }
-
                         Log.d("TAG", "run: " + roadEntities.toString());
                         staySubmitAdapter.setAllRoad(roadEntities);
                         staySubmitAdapter.notifyDataSetChanged();

app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java

@@ -560,7 +560,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     String encodeStr = list.get(i).getGeo();
                                     // 解密geo
                                     String geo = Geohash.getInstance().decode(encodeStr);
-                                    listBean.setGeo(geo);
                                     Log.d("TAG", "onSuccess: " + geo);
                                     Geometry geometry = GeometryTools.createGeometry(geo);
                                     LatLng latLng = null;
@@ -569,9 +568,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                         case "MultiLineString"://多线
                                             BitmapDescriptor bitmapLine = null;
                                             if (listBean.getType() == 3) {//poi录像
-                                                bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
-                                            } else if (listBean.getType() == 4) {//道路录像
                                                 bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows);
+                                            } else if (listBean.getType() == 4) {//道路录像
+                                                bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
                                             }
                                             List<LatLng> latLineString = GeometryTools.getLatLags(geo);
                                             // 构造 PolylineOptions
@@ -582,13 +581,13 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                                     // 折线的颜色为绿色
                                                     .color(Color.parseColor("#0096FF"))
                                                     // 折线宽度为5像素
-                                                    .width(10)
+                                                    .width(28)
                                                     // 还可以添加描边颜色
                                                     //.borderColor(0xffff0000)
                                                     // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth`
                                                     //.borderWidth(1);
                                                     .arrow(true)
-                                                    .arrowSpacing(100)
+                                                    .arrowSpacing(80)
                                                     .arrowTexture(bitmapLine);
                                             // 绘制折线
                                             Polyline polyline = tencentMap.addPolyline(polylineOptions);
@@ -756,8 +755,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
     }
 
     public void initMarker(PoiEntity poiEntity, boolean aBoolean) {
-        String geo = poiEntity.getGeoWkt();
+        String geoWkt = poiEntity.getGeoWkt();
-        Log.d("TAG", "onSuccess: " + geo);
+        Log.d("TAG", "onSuccess: " + geoWkt);
+        String geo = Geohash.getInstance().decode(geoWkt);//解密
         Geometry geometry = GeometryTools.createGeometry(geo);
         if (geometry == null) {
             return;
@@ -775,9 +775,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
             case "MultiLineString"://多线
                 BitmapDescriptor bitmapLine = null;
                 if (poiEntity.getType() == 3) {//poi录像
-                    bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
-                } else if (poiEntity.getType() == 4) {//道路录像
                     bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows);
+                } else if (poiEntity.getType() == 4) {//道路录像
+                    bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
+
                 }
                 List<LatLng> latLineString = GeometryTools.getLatLags(geo);
                 // 构造 PolylineOnions
@@ -786,11 +787,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                         // 折线设置圆形线头
                         .lineCap(true)
                         // 折线的颜色为绿色
-                        .color(Color.parseColor("#D8D8D8"))
+                        .color(Color.parseColor("#00ffff"))
                         // 折线宽度为5像素
-                        .width(20)
+                        .width(28)
                         .arrow(true)
-                        .arrowSpacing(150)
+                        .arrowSpacing(80)
                         .arrowTexture(bitmapLine);
                 // 绘制折线
                 Polyline polyline = tencentMap.addPolyline(polylineOptions);
@@ -887,9 +888,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                         removablesLocality.clear();
                         for (int i = 0; i < allTaskStatus.size(); i++) {
                             PoiEntity poiEntity = allTaskStatus.get(i);
-                            String geo = allTaskStatus.get(i).getGeoWkt();
+                            String geoWkt = allTaskStatus.get(i).getGeoWkt();
+
                             LatLng latLng = null;
-                            Log.d("TAG", "onSuccess: " + geo);
+                            Log.d("TAG", "onSuccess: " + geoWkt);
+                            String geo = Geohash.getInstance().decode(geoWkt);//解密geo
                             Geometry geometry = GeometryTools.createGeometry(geo);
                             if (geometry != null) {
                                 switch (geometry.getGeometryType()) {
@@ -899,23 +902,22 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     case "LineString": //线
                                     case "MultiLineString"://多线
                                         BitmapDescriptor bitmapLine = null;
-                                        if (type == 3) {//poi录像
+                                        if (poiEntity.getType() == 3) {//poi录像
-                                            bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
-                                        } else if (type == 4) {//道路录像
                                             bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows);
+                                        } else if (poiEntity.getType() == 4) {//道路录像
+                                            bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
                                         }
                                         List<LatLng> latLineString = GeometryTools.getLatLags(geo);
                                         // 构造 PolylineOnions
                                         PolylineOptions polylineOptions = new PolylineOptions()
-                                                .alpha(0.5f)
                                                 .addAll(latLineString)
                                                 // 折线设置圆形线头
                                                 .lineCap(true)
                                                 .color(Color.parseColor("#FFE70C"))
                                                 // 折线宽度为5像素
-                                                .width(10)
+                                                .width(28)
                                                 .arrow(true)
-                                                .arrowSpacing(100)
+                                                .arrowSpacing(80)
                                                 .arrowTexture(bitmapLine);
                                         // 绘制折线
                                         Polyline polyline = tencentMap.addPolyline(polylineOptions);
@@ -1756,7 +1758,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                             marker.remove();
                             break;
                         case 3:
-
                             initMarker(poiEntity, false);
                             PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
                             showSlidingFragment(poiVideoFragment);
@@ -1797,8 +1798,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 poiListEntity.setDescribe(listBean.getMemo());
                 poiListEntity.setCreateTime(listBean.getEndDate());
                 poiListEntity.setType(listBean.getType());
-                String geo = listBean.getGeo();
+                String beanGeo = listBean.getGeo();
-                poiListEntity.setGeoWkt(geo);
+                String geo = Geohash.getInstance().decode(beanGeo);
                 Geometry geometry = GeometryTools.createGeometry(geo);
                 switch (geometry.getGeometryType()) {
                     case "Point": //点

app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java

@@ -3,13 +3,12 @@ package com.navinfo.outdoor.http;
 import com.navinfo.outdoor.api.Constant;
 
 public class HttpInterface {
-    public static final String IP_ = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
+    public static final String IP_TEST = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
     public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口
     public static final String IP = "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
     public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口
     public static final String APKIP = "http://172.23.139.4:8001/";
 
-
     public static final String USER_PATH = "/user/";//我的
     public static final String MSG_LIST_PATH = "/msgList/";//发现
     public static final String USER_LOGIN_PATH = "/userlogin/";//登录
@@ -24,7 +23,6 @@ public class HttpInterface {
 
     public static void initAppPath(String userId) {
         APP_CHECK_VERSION = IP + USER_PATH + "appVersion/" + userId + "/checkVersion"; //版本升级
-
     }
 
     /**

app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java

@@ -357,4 +357,37 @@ public class AWMp4ParserHelper {
         }
         return latLngs;
     }
+
+
+    /**
+     * 根据图片文件列表，获取到对应的轨迹数据
+     * */
+    public List<LatLng> getLinePhotoByList(List<File> videoFileList) {
+        List<LatLng> latLags = new ArrayList<>();
+        if (videoFileList == null || videoFileList.isEmpty()) {
+            return latLags;
+        }
+
+        for (int m = 0; m < videoFileList.size(); m++) {
+            if (videoFileList.get(m).getPath().contains("paper.txt")){
+                File path = videoFileList.get(m);
+                List<String> strings = FileUtils.readFileToList(path.getPath(), "utf-8");
+                if (strings!=null) {
+                    for (int i = 0; i < strings.size(); i++) {
+                        String[] split = strings.get(i).split(",");
+                        LatLng latLng = new LatLng();
+                        latLng.setLatitude(Double.valueOf(split[2]));
+                        latLng.setLongitude(Double.valueOf(split[3]));
+                        latLags.add(latLng);
+                    }
+                    if (strings.size() == 1) {
+                        LatLng latLng = latLags.get(0);
+                        latLags.add(latLng);
+                    }
+                }
+            }
+        }
+        return latLags;
+    }
+
 }

app/src/main/java/com/navinfo/outdoor/util/Base64Util.java

@@ -1,4 +1,4 @@
-package com.navinfo.outdoor.base;
+package com.navinfo.outdoor.util;
 
 /**
  * Base64 工具类

app/src/main/java/com/navinfo/outdoor/util/Geohash.java

@@ -9,6 +9,7 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.BitSet;
 import java.util.HashMap;
+import java.util.List;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
@@ -151,6 +152,15 @@ public class Geohash {
 		}
 		return null;
 	}
+	public String encodeList(List<LatLng> latLngs){
+		String lineString = GeometryTools.getLineString(latLngs);
+		try {
+			return Base64.desEncrypt(lineString);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
 
 	private BitSet getBits(double lat, double floor, double ceiling) {
 		BitSet buffer = new BitSet(nubbins);

app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java

@@ -87,8 +87,12 @@ public class PoiSaveUtils {
                     public void run() {
                         Message obtain = Message.obtain();
                         obtain.what = Constant.EVENT_STAY_REFRESH;
-                        obtain.obj = "提交成功" + anInt + ",提交失败" + bInt;
                         EventBus.getDefault().post(obtain);
+
+                        Message obtain1 = Message.obtain();
+                        obtain1.what = Constant.NEST_WORD_SUBMIT;
+                        obtain1.obj = "批量提交 成功：" + anInt + ", 失败：" + bInt;
+                        EventBus.getDefault().post(obtain1);
                     }
                 });
 
@@ -259,12 +263,6 @@ public class PoiSaveUtils {
         }
         List<File> videoFileList = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId());
         if (videoFileList != null && !videoFileList.isEmpty()) {
-            /*List<File> txtFileList = new ArrayList<>();
-            for (File videoFile : videoFileList) {
-                File file = new File(videoFile.getAbsolutePath() + ".txt");
-                txtFileList.add(file);
-            }*/
-            //videoFileList.addAll(videoFileList);
             File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
             ZipUtil.zipFiles(videoFileList, fileZip, null);
             photoFile.add(fileZip);

app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java

@@ -0,0 +1,283 @@
+package com.navinfo.outdoor.util;
+
+import android.app.Activity;
+import android.os.Message;
+import android.util.Log;
+
+import com.navinfo.outdoor.api.Constant;
+import com.navinfo.outdoor.bean.OtherUploadPicBean;
+import com.navinfo.outdoor.bean.PoiUploadBean;
+import com.navinfo.outdoor.http.Callback;
+import com.navinfo.outdoor.room.PoiDao;
+import com.navinfo.outdoor.room.PoiDatabase;
+import com.navinfo.outdoor.room.PoiEntity;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.Objects;
+
+public class UploadUtils {
+    private static UploadUtils instance;
+
+    public static UploadUtils getInstance() {
+        if (instance == null) {
+            instance = new UploadUtils();
+        }
+        return instance;
+    }
+
+    /**
+     * 道路
+     * @param mContext
+     * @param showPoiEntity
+     * @return
+     */
+    public Callback getRoadUploadCallback(Activity mContext, PoiEntity showPoiEntity) {
+        PoiDao poiDao = PoiDatabase.getInstance(mContext).getPoiDao();
+        return new Callback<OtherUploadPicBean>() {
+            @Override
+            public void onSuccess(OtherUploadPicBean response, int id) {
+                if (response.getCode() == 200) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传成功";
+                    EventBus.getDefault().post(obtain1);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
+                            poiDao.deletePoiEntity(poiDaoPoiEntity);
+                            Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Message obtain = Message.obtain();
+                                    obtain.what = Constant.JOB_WORD_MONITOR;
+                                    obtain.obj = true;
+                                    EventBus.getDefault().post(obtain);
+                                }
+                            });
+                        }
+                    }).start();
+                } else {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传失败";
+                    EventBus.getDefault().post(obtain1);
+                }
+            }
+
+            @Override
+            public void onError(Throwable e, int id) {
+                Message obtain1 = Message.obtain();
+                obtain1.what = Constant.NEST_WORD_SUBMIT;
+                obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传失败";
+                EventBus.getDefault().post(obtain1);
+                Log.d("TAG", "onError: " + e.getMessage() + "");
+            }
+        };
+    }
+    /**
+     * poi
+     * @param mContext
+     * @param showPoiEntity
+     * @return
+     */
+    public Callback getPoiUploadCallback(Activity mContext, PoiEntity showPoiEntity) {
+        PoiDao poiDao = PoiDatabase.getInstance(mContext).getPoiDao();
+        return new Callback<OtherUploadPicBean>() {
+            @Override
+            public void onSuccess(OtherUploadPicBean response, int id) {
+                if (response.getCode() == 200) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "Poi："+showPoiEntity.getName()+" 上传成功";
+                    EventBus.getDefault().post(obtain1);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
+                            poiDao.deletePoiEntity(poiDaoPoiEntity);
+                            Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Message obtain = Message.obtain();
+                                    obtain.what = Constant.JOB_WORD_MONITOR;
+                                    obtain.obj = true;
+                                    EventBus.getDefault().post(obtain);
+                                }
+                            });
+                        }
+                    }).start();
+                } else {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "Poi："+showPoiEntity.getName()+" 上传失败";
+                    EventBus.getDefault().post(obtain1);
+                }
+
+            }
+
+            @Override
+            public void onError(Throwable e, int id) {
+                Message obtain1 = Message.obtain();
+                obtain1.what = Constant.NEST_WORD_SUBMIT;
+                obtain1.obj = "Poi："+showPoiEntity.getName()+" 上传失败";
+                EventBus.getDefault().post(obtain1);
+            }
+        };
+    }
+
+    /**
+     * poiVideo
+     * @param mContext
+     * @param showPoiEntity
+     * @return
+     */
+    public Callback getPoiVideoUploadCallback(Activity mContext, PoiEntity showPoiEntity) {
+        PoiDao poiDao = PoiDatabase.getInstance(mContext).getPoiDao();
+        return new Callback<OtherUploadPicBean>() {
+            @Override
+            public void onSuccess(OtherUploadPicBean response, int id) {
+                if (response.getCode() == 200) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "poi录像："+showPoiEntity.getName()+" 上传成功";
+                    EventBus.getDefault().post(obtain1);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
+                            poiDao.deletePoiEntity(poiDaoPoiEntity);
+                            Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Message obtain = Message.obtain();
+                                    obtain.what = Constant.JOB_WORD_MONITOR;
+                                    obtain.obj = true;
+                                    EventBus.getDefault().post(obtain);
+                                }
+                            });
+                        }
+                    }).start();
+                } else {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "poi录像："+showPoiEntity.getName()+" 上传失败";
+                    EventBus.getDefault().post(obtain1);
+                }
+            }
+
+            @Override
+            public void onError(Throwable e, int id) {
+                Message obtain1 = Message.obtain();
+                obtain1.what = Constant.NEST_WORD_SUBMIT;
+                obtain1.obj = "poi录像："+showPoiEntity.getName()+" 上传失败";
+                EventBus.getDefault().post(obtain1);
+                Log.d("TAG", "onError: " + e.getMessage() + "");
+            }
+        };
+    }
+
+    /**
+     * other
+     * @param mContext
+     * @param showPoiEntity
+     * @return
+     */
+    public Callback getOtherUploadCallback(Activity mContext, PoiEntity showPoiEntity) {
+        PoiDao poiDao = PoiDatabase.getInstance(mContext).getPoiDao();
+        return new Callback<PoiUploadBean>() {
+            @Override
+            public void onSuccess(PoiUploadBean response, int id) {
+                if (response.getCode() == 200) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "其他："+showPoiEntity.getName()+" 上传成功";
+                    EventBus.getDefault().post(obtain1);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
+                            poiDao.deletePoiEntity(poiDaoPoiEntity);
+                            Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Message obtain = Message.obtain();
+                                    obtain.what = Constant.JOB_WORD_MONITOR;
+                                    obtain.obj = true;
+                                    EventBus.getDefault().post(obtain);
+                                }
+                            });
+                        }
+                    }).start();
+                } else {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "其他："+showPoiEntity.getName()+" 上传失败";
+                    EventBus.getDefault().post(obtain1);
+                }
+
+            }
+
+            @Override
+            public void onError(Throwable e, int id) {
+                Message obtain1 = Message.obtain();
+                obtain1.what = Constant.NEST_WORD_SUBMIT;
+                obtain1.obj = "其他："+showPoiEntity.getName()+" 上传失败";
+                EventBus.getDefault().post(obtain1);
+                Log.d("TAG", "onError: " + e.getMessage() + "");
+            }
+        };
+    }
+
+    /**
+     * charging
+     * @param mContext
+     * @param showPoiEntity
+     * @return
+     */
+    public Callback getChargingUploadCallback(Activity mContext, PoiEntity showPoiEntity) {
+        PoiDao poiDao = PoiDatabase.getInstance(mContext).getPoiDao();
+        return new Callback<PoiUploadBean>() {
+            @Override
+            public void onSuccess(PoiUploadBean response, int id) {
+                if (response.getCode() == 200) {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "充电站："+showPoiEntity.getName()+" 上传成功";
+                    EventBus.getDefault().post(obtain1);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            poiDao.deletePoiEntity(showPoiEntity);
+                            mContext.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Message obtain = Message.obtain();
+                                    obtain.what = Constant.JOB_WORD_MONITOR;
+                                    obtain.obj = true;
+                                    EventBus.getDefault().post(obtain);
+                                }
+                            });
+                        }
+                    }).start();
+                } else {
+                    Message obtain1 = Message.obtain();
+                    obtain1.what = Constant.NEST_WORD_SUBMIT;
+                    obtain1.obj = "充电站："+showPoiEntity.getName()+" 上传失败";
+                    EventBus.getDefault().post(obtain1);
+                }
+            }
+
+            @Override
+            public void onError(Throwable e, int id) {
+                Message obtain1 = Message.obtain();
+                obtain1.what = Constant.NEST_WORD_SUBMIT;
+                obtain1.obj = "充电站："+showPoiEntity.getName()+" 上传失败";
+                EventBus.getDefault().post(obtain1);
+                Log.d("TAG", "onError: " +e.getMessage() + "");
+            }
+        };
+    }
+
+}

app/src/main/java/com/navinfo/outdoor/util/Voice.java

@@ -0,0 +1,62 @@
+package com.navinfo.outdoor.util;
+
+import com.jacob.activeX.ActiveXComponent;
+import com.jacob.com.Dispatch;
+import com.jacob.com.Variant;
+
+/**
+ * 语音播放
+ */
+public class Voice {
+    /**
+     *  @param type 设定文件   0:开始，1停止
+     * @return 返回类型：void
+     * @Title: start
+     * @Description: 该方法的主要作用：朗读
+     */
+    public static void sprat(String content, int type) {
+        ActiveXComponent sap = new ActiveXComponent("Sapi.SpVoice");
+        Dispatch sago = sap.getObject();
+        if (type == 0) {
+            try {
+                // 音量 0-100
+                sap.setProperty("Volume", new Variant(100));
+                // 语音朗读速度 -10 到 +10
+                sap.setProperty("Rate", new Variant(1.3));
+                Variant defaultVoice = sap.getProperty("Voice");
+                Dispatch discrepantVoice = defaultVoice.toDispatch();
+                Variant allVoices = Dispatch.call(sago, "GetVoices");
+                Dispatch disVoices = allVoices.toDispatch();
+                Dispatch serviced = Dispatch.call(disVoices, "Item",
+                        new Variant(1)).toDispatch();
+                ActiveXComponent voiceActive = new ActiveXComponent(discrepantVoice);
+                ActiveXComponent servicedActives = new ActiveXComponent(serviced);
+                Variant item = Dispatch.call(servicedActives, "GetDescription");
+                // 执行朗读
+                Dispatch.call(sago, "Speak", new Variant(content));
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                sago.safeRelease();
+                sap.safeRelease();
+            }
+        } else {
+            // 停止
+            try {
+                Dispatch.call(sago, "Speak", new Variant(content), new Variant(2));
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * @return 返回类型：void
+     * @Title: test
+     * @Description: 该方法的主要作用：执行朗读内容
+     */
+    public void test() {
+        sprat("请不要超过 多少", 0);
+    }
+}

app/src/main/res/drawable/btn_corners_bg.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="25dp"
+        android:bottomRightRadius="25dp"
+        android:radius="8dp"
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp" />
+    <!--    <gradient
+            android:angle="45"
+            android:endColor="#72cb60"
+            android:startColor="#72cb60" />-->
+    <padding
+        android:bottom="10dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="10dp" />
+    <size android:width="100dp" />
+    <solid android:color="#ffff" />
+    <stroke
+        android:width="2dp"
+        android:color="#ffff" />
+</shape>

app/src/main/res/drawable/corners_bg.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="25dp"
+        android:bottomRightRadius="25dp"
+        android:radius="8dp"
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp" />
+    <!--    <gradient
+            android:angle="45"
+            android:endColor="#72cb60"
+            android:startColor="#72cb60" />-->
+    <padding
+        android:bottom="10dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="10dp" />
+    <size android:width="100dp" />
+    <solid android:color="#03A9F4" />
+    <stroke
+        android:width="2dp"
+        android:color="#03A9F4" />
+</shape>

app/src/main/res/layout/activity_login.xml

@@ -164,4 +164,16 @@
         app:layout_constraintEnd_toEndOf="@+id/et_login_paw"
         app:layout_constraintStart_toStartOf="@+id/et_login_paw"
         app:layout_constraintTop_toBottomOf="@+id/tv_statement" />
+
+    <TextView
+        android:id="@+id/tv_view"
+        android:layout_width="wrap_content"
+        android:textColor="@color/white"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginBottom="20dp"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_main.xml

@@ -7,15 +7,6 @@
     android:background="@drawable/start_bg"
     tools:context="activity.MainActivity">
 
-    <TextView
+
-        android:id="@+id/tv_view"
-        android:layout_width="wrap_content"
-        android:textColor="@color/white"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginBottom="20dp"
-        />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_pictures.xml

@@ -98,7 +98,14 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
+    <ImageView
+        android:id="@+id/iv_pic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
     <CheckBox
         android:id="@+id/capture_picture"
         style="@style/user_data_style"

app/src/main/res/layout/grade_fragment.xml

@@ -30,5 +30,355 @@
             android:layout_toRightOf="@id/iv_find_task"
             android:text="我的等级" />
     </LinearLayout>
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_grade"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
+
+            <TextView
+                android:id="@+id/tv_text"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_margin="20dp"
+                android:text="等级更新"
+                android:textColor="#000"
+                android:textSize="20sp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="50个任务为一个周期，累计提交50个及以上道路任务的当天24:00更新称号和特权"
+                android:layout_marginStart="20sp"
+                android:layout_marginEnd="20sp"
+                android:textSize="18sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_margin="20dp"
+                android:text="特权等级"
+                android:textColor="#000"
+                android:textSize="20sp"
+                />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:orientation="vertical"
+                >
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:background="#EAE7E7"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:text=" 称号"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="金牌"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="银牌"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="铜牌"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text=" 奖励比"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text=">2.00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:text="0.51-2.00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:text="0-0.50"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text=" 可领路"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="15"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="10"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text=" 可领包"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text=" 新任务可领"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="08:00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="08:00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="09:00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+            </LinearLayout>
+
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_margin="20dp"
+                android:text="特权"
+                android:textColor="#000"
+                android:textSize="20sp"
+                />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:orientation="vertical"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="可领取任务上限"
+                    android:textColor="#000"
+                    android:textSize="20sp"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="当天可领取未完成任务数上限"
+                    android:textColor="#373636"
+                    android:textSize="15sp"
+                    />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:orientation="vertical"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="新任务可领"
+                    android:textColor="#000"
+                    android:textSize="20sp"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="指任务投放当天的任务开放领取时间"
+                    android:textColor="#373636"
+                    android:textSize="15sp"
+                    />
+            </LinearLayout>
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_marker.xml

@@ -17,8 +17,12 @@
 
     <TextView
         android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:inputType="textMultiLine"
+        android:scrollHorizontally="false"
+        android:singleLine="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.26"

app/src/main/res/layout/login_task_item.xml

@@ -8,8 +8,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="170dp"
+        android:layout_height="250dp"
-        android:background="#FBF9F9"
+        android:background="@drawable/btn_corners_bg"
         android:layout_margin="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -21,11 +21,11 @@
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="20dp"
             android:text="提示"
-            android:textSize="27dp"
-            android:textStyle="bold"
             android:textColor="@color/black"
+            android:textSize="25sp"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -35,8 +35,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="请查看APP使用说明"
-            android:textColor="@color/black"
+            android:textColor="#333333"
-            android:textSize="20dp"
+            android:textSize="18sp"
             android:textStyle="normal"
             app:layout_constraintBottom_toTopOf="@+id/btn_login"
             app:layout_constraintEnd_toEndOf="parent"
@@ -46,12 +46,14 @@
         <Button
             android:id="@+id/btn_login"
             android:layout_width="match_parent"
-            android:layout_height="40dp"
+            android:layout_height="50dp"
-            android:layout_marginRight="20dp"
             android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="20dp"
+            android:background="@drawable/corners_bg"
             android:text="确定"
-            android:layout_marginBottom="10dp"
+            android:textSize="18sp"
-            android:background="#D6F4F8"
+            android:textColor="#ffff"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />

app/src/main/res/layout/privilege_fragment.xml

@@ -30,4 +30,354 @@
             android:layout_toRightOf="@id/iv_find_task"
             android:text="@string/tv_privilege_title" />
     </LinearLayout>
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_privilege"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
+
+            <TextView
+                android:id="@+id/tv_text"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_margin="20dp"
+                android:text="等级更新"
+                android:textColor="#000"
+                android:textSize="20sp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="50个任务为一个周期，累计提交50个及以上道路任务的当天24:00更新称号和特权"
+                android:layout_marginStart="20sp"
+                android:layout_marginEnd="20sp"
+                android:textSize="18sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_margin="20dp"
+                android:text="特权等级"
+                android:textColor="#000"
+                android:textSize="20sp"
+                />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:orientation="vertical"
+                >
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:background="#EAE7E7"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:text="称号"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="金牌"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="银牌"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="铜牌"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text="奖励比"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text=">2.00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:text="0.51-2.00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:text="0-0.50"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text="可领路"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="15"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="10"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text="可领包"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="5"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#373636"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    >
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:layout_height="match_parent"
+                        android:text="新任务可领"
+                        android:background="#EAE7E7"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="08:00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="08:00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:layout_height="wrap_content"
+                        android:text="09:00"
+                        android:textColor="#373636"
+                        android:textSize="15sp"
+                        />
+                </LinearLayout>
+            </LinearLayout>
+
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_margin="20dp"
+                android:text="特权"
+                android:textColor="#000"
+                android:textSize="20sp"
+                />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:orientation="vertical"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="可领取任务上限"
+                    android:textColor="#000"
+                    android:textSize="20sp"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="当天可领取未完成任务数上限"
+                    android:textColor="#373636"
+                    android:textSize="15sp"
+                    />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:orientation="vertical"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="新任务可领"
+                    android:textColor="#000"
+                    android:textSize="20sp"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:text="指任务投放当天的任务开放领取时间"
+                    android:textColor="#373636"
+                    android:textSize="15sp"
+                    />
+            </LinearLayout>
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -17,6 +17,7 @@
     <color name="colorRed">#F44236</color>
     <color name="colorText">#87CDF6</color>
     <color name="colorRead">#ED1931</color>
+
     <color name="colorGrays">#BDBDBD</color>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">地图寻宝3.1</string>
     <string name="title_activity_home">HomeActivity</string>
     <!-- Strings used for fragments for navigation -->
@@ -148,7 +148,7 @@
  11.4如果出现您对本条款的违反行为，图新保留针对该违反行为采取法律所能提供的所有补救手段的权利。如果您在使用本软件或参与本活动期间发现有任何在您看来属于
         不正当或在其它方面违反本条款的内容，您应及时向图新举报。\n\n
     </string>
-    <string name="tv_privilege_title">我的特权</string>
+    <string name="tv_privilege_title" tools:ignore="MissingTranslation">特权规则</string>
     <string name="tv_login_title">Welcome</string>
     <string name="tv_login_deck">欢迎来到地图寻宝</string>
     <string name="tv_login_name">用户名</string>