修改bug

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 29
     buildToolsVersion '29.0.2'
-     ndkVersion '23.0.7123448'
+    //ndkVersion '23.0.7123448'
 
     defaultConfig {
         applicationId "com.navinfo.outdoor"

app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java

@@ -71,14 +71,14 @@ public class FilterAdapter extends RecyclerView.Adapter<FilterAdapter.ViewHolder
             holder.tvTaskStatus.setVisibility(View.VISIBLE);
             holder.tvTaskStatus.setText("未保存");
             holder.tvTaskStatus.setTextColor(Color.parseColor("#1CEF7B"));
-        }else if (poiEntity.getTaskStatus()==3){
+        }/*else if (poiEntity.getTaskStatus()==3){
             holder.tvTaskStatus.setVisibility(View.VISIBLE);
             holder.tvTaskStatus.setText("已保存");
             holder.tvTaskStatus.setTextColor(Color.parseColor("#00BCD4"));
         }else if (poiEntity.getTaskStatus()==4){
             holder.tvTaskStatus.setVisibility(View.VISIBLE);
             holder.tvTaskStatus.setText("已上传");
-        }
+        }*/
         if (poiEntity.getType() == 1) {
             holder.tvForm.setText("poi");
         } else if (poiEntity.getType() == 2) {

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

@@ -73,7 +73,7 @@ public class Constant {
     public static final int GATHER_GET = 6;//点击开始采集
     public static final int TREASURE_GATHER_GET_WORD = 7;//领取采集页面其他marker 的回传
     public static final int MAIN_BUTTON_VISIABLE = 8; // 控制主界面各个按钮显隐状态的what值
-    public static final int MAIN_HEADER = 9; // 控制主界面各个header
+    public static final int UN_POLY_GEN_TASK = 9; // 面妆任务的立即采集
     public static final int POI_DRAWER = 10; //设置每个页面显示屏幕的位置
     public static final int GATHER_GET_RETURN = 11;//参加领取的返回
     public static final int MAIN_CHARGING_STATION = 13;//充电站的Fragment 对地图页面marker 的一个展示 编辑

app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java

@@ -14,7 +14,7 @@ public class JobSearchBean implements Serializable {
     private int status;
     private String msg;
     private BodyBean body;
-    private List<?> upload;
+    private List<Integer> upload;
 
     public int getStatus() {
         return status;
@@ -40,11 +40,11 @@ public class JobSearchBean implements Serializable {
         this.body = body;
     }
 
-    public List<?> getUpload() {
+    public List<Integer> getUpload() {
         return upload;
     }
 
-    public void setUpload(List<?> upload) {
+    public void setUpload(List<Integer> upload) {
         this.upload = upload;
     }
 

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

@@ -39,6 +39,7 @@ import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.MessageDialog;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.FragmentManagement;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
 import com.navinfo.outdoor.bean.ChargingPileSaveBean;
@@ -139,7 +140,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
     @Override
     public void onResume() {
         super.onResume();
-        View header = findViewById(R.id.charging_pile_header);
+        View header = mView.findViewById(R.id.charging_pile_header);
         header.findViewById(R.id.iv_charging_pile_final).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -158,6 +159,14 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
                 onBackPressed();
             }
         });
+        header.findViewById(R.id.tv_charging_pile_explain).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), FragmentManagement.class);
+                intent.putExtra("tag",8);
+                startActivity(intent);
+            }
+        });
     }
 
     @Override

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

@@ -44,6 +44,7 @@ import com.kongzue.dialog.v3.MessageDialog;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.FragmentManagement;
 import com.navinfo.outdoor.adapter.ChargingPileAdapter;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
@@ -147,7 +148,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
     }
 
     private void initHeader() {
-        View header = findViewById(R.id.charging_station_header);
+        View header = mView.findViewById(R.id.charging_station_header);
         header.findViewById(R.id.iv_charging_station_final).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -166,6 +167,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 onBackPressed();
             }
         });
+        header.findViewById(R.id.tv_charging_station_explain).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), FragmentManagement.class);
+                intent.putExtra("tag",8);
+                startActivity(intent);
+            }
+        });
     }
 
     @Override

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

@@ -200,6 +200,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
         super.initData();
         poiDatabase = PoiDatabase.getInstance(getContext());
         poiDao = poiDatabase.getPoiDao();
+        poiEntities = new ArrayList<>();
         clNumber = findViewById(R.id.cl_number);
         clNumber.setOnClickListener(this::onClick);
         tvNumber = findViewById(R.id.tv_number);
@@ -241,11 +242,11 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
             tvType.setText("未领取");
         } else if (Constant.TASK_STASTUS == 1) {
             tvType.setText("已领取");
-        } else if (Constant.TASK_STASTUS == 2) {
+        }/* else if (Constant.TASK_STASTUS == 2) {
             tvType.setText("未保存");
         } else if (Constant.TASK_STASTUS == 3) {
             tvType.setText("已保存");
-        }
+        }*/
 
         btnFilter = findViewById(R.id.btn_filter);
         btnFilter.setOnClickListener(this::onClick);
@@ -263,7 +264,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
         //取消上啦加载下拉刷新
         recyclerFilter.setPullRefreshEnabled(false);
         recyclerFilter.setLoadingMoreEnabled(false);
-        poiEntities = new ArrayList<>();
         filterAdapter = new FilterAdapter(getContext(), poiEntities);
         recyclerFilter.setAdapter(filterAdapter);
 
@@ -307,6 +307,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                 obtain.what = Constant.TREASURE_FRAGMENT;
                 obtain.obj = true;
                 EventBus.getDefault().post(obtain);
+                onBackPressed();
                 break;
             case R.id.cl_number:
                 BottomMenu.show((AppCompatActivity) getContext(), new String[]{"200", "500", "1000"}, new OnMenuItemClickListener() {
@@ -403,7 +404,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                 break;
 
             case R.id.cl_type://任务状态 0.未领取 1.已领取，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）,
-                BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "未领取", "已领取", "未保存", "已保存"}, new OnMenuItemClickListener() {
+                BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "未领取", "已领取"/*, "未保存", "已保存"*/}, new OnMenuItemClickListener() {
                     @Override
                     public void onClick(String text, int index) {
                         tvType.setText(text);
@@ -417,12 +418,12 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                             case 2:
                                 Constant.TASK_STASTUS = 1;
                                 break;
-                            case 3:
+                          /*  case 3:
                                 Constant.TASK_STASTUS = 2;
                                 break;
                             case 4:
                                 Constant.TASK_STASTUS = 3;
-                                break;
+                                break;*/
                         }
                         Message obtain = Message.obtain();
                         obtain.what = Constant.JOB_WORD_MONITOR;

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

@@ -19,6 +19,7 @@ import com.navinfo.outdoor.bean.UserBean;
 import com.navinfo.outdoor.http.Callback;
 import com.navinfo.outdoor.http.HttpInterface;
 import com.navinfo.outdoor.http.OkGoBuilder;
+import com.navinfo.outdoor.util.Base64;
 import com.navinfo.outdoor.util.RegexUtil;
 
 import org.greenrobot.eventbus.EventBus;
@@ -70,6 +71,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
                 if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())){
                     Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show();
                 }else {
+                    registerNote();
                     initGetNote();
                 }
 
@@ -101,7 +103,11 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
             Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show();
             return;
         } else {
-            httpParams.put("password", password);
+            try {
+                httpParams.put("password",  Base64.desEncrypt(password));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         String conFirmPaw = etForgetPawConfirmPaw.getText().toString().trim();
         if (conFirmPaw == null || conFirmPaw.equals("")) {

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

@@ -565,6 +565,16 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                 @Override
                                 public void run() {
                                     InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity);
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            Message obtain = Message.obtain();
+                                            obtain.what = Constant.UN_POLY_GEN_TASK;
+                                            obtain.obj = true;
+                                            EventBus.getDefault().post(obtain);
+                                            onBackPressed();
+                                        }
+                                    });
                                 }
                             }).start();
                         }else {

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

@@ -26,6 +26,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
@@ -40,6 +41,7 @@ import com.lzy.okgo.OkGo;
 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.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
 import com.navinfo.outdoor.bean.Info;
@@ -96,6 +98,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
     private ArrayList<File> otherUploadList;
     private CheckBox checkPot;
     private File file;
+    private NestedScrollView nestedScrollView;
 
     public static OtherFragment newInstance(Bundle bundle) {
         OtherFragment fragment = new OtherFragment();
@@ -119,7 +122,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
     @Override
     public void onResume() {
         super.onResume();
-        View header = findViewById(R.id.other_header);
+        View header =mView.findViewById(R.id.other_header);
         header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -138,6 +141,14 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 onBackPressed();
             }
         });
+        header.findViewById(R.id.tv_explain).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), FragmentManagement.class);
+                intent.putExtra("tag",8);
+                startActivity(intent);
+            }
+        });
     }
 
     @Override
@@ -191,6 +202,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 }
             }
         });
+        nestedScrollView = findViewById(R.id.nested_scroll_view);
+        if (slidingPaneLayout!=null) {
+            slidingPaneLayout.setScrollableView(nestedScrollView);
+        }
         editTaskName = findViewById(R.id.et_task_name);
         rlPicture = findViewById(R.id.rl_picture);
         rlPicture.setOnClickListener(this::onClick);

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

@@ -42,6 +42,7 @@ import com.lzy.okgo.OkGo;
 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.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
 import com.navinfo.outdoor.bean.Info;
@@ -135,7 +136,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
     @Override
     public void onResume() {
         super.onResume();
-        View header = findViewById(R.id.poi_header);
+        View header =mView.findViewById(R.id.poi_header);
         header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -154,6 +155,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 onBackPressed();
             }
         });
+        header.findViewById(R.id.tv_explain).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), FragmentManagement.class);
+                intent.putExtra("tag",8);
+                startActivity(intent);
+            }
+        });
 
     }
 

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

@@ -26,6 +26,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
 
 import com.github.lazylibrary.util.FileUtils;
 import com.github.lazylibrary.util.StringUtils;
@@ -42,6 +43,7 @@ import com.lzy.okgo.OkGo;
 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.PictureActivity;
 import com.navinfo.outdoor.activity.PicturesActivity;
 import com.navinfo.outdoor.api.Constant;
@@ -94,6 +96,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     private String videoPath;
     private File fileZip;
     private FrameLayout fmPoiVideoPic;
+    private NestedScrollView nestedScrollView;
 
     public static PoiVideoFragment newInstance(Bundle bundle) {
         PoiVideoFragment fragment = new PoiVideoFragment();
@@ -118,7 +121,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     @Override
     public void onResume() {
         super.onResume();
-        View header = findViewById(R.id.poi_video_header);
+        View header =mView.findViewById(R.id.poi_video_header);
         header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -137,6 +140,14 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                 onBackPressed();
             }
         });
+        header.findViewById(R.id.tv_explain).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), FragmentManagement.class);
+                intent.putExtra("tag",8);
+                startActivity(intent);
+            }
+        });
     }
 
 
@@ -147,6 +158,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         poiDao = poiDatabase.getPoiDao();
         tvPictures = (TextView) findViewById(R.id.tv_pictures);
         tvPictures.setOnClickListener(this::onClick);
+        nestedScrollView = findViewById(R.id.nested_scroll_view);
+        if (slidingPaneLayout!=null){
+            slidingPaneLayout.setScrollableView(nestedScrollView);
+        }
         etRoadName = (EditText) findViewById(R.id.et_poi_video_name);
         ivPoiVideoPicture = (ImageView) findViewById(R.id.iv_poi_video_picture);
         rbCar = (RadioButton) findViewById(R.id.rb_car);
@@ -256,7 +271,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     @Subscribe
     public void onEvent(Message data) {
         if (data.what == Constant.PICTURE_VIDEO_WORD) {
-            if ((boolean) data.obj) {
+           if ((boolean)data.obj){
 
                initPoiVideoSharePre();
            }
@@ -264,6 +279,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     }
 
 
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -364,6 +380,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     }
 
 
+
     private void poiVideoUpload(int poiVideoBody, File fileZip) {
         if (poiVideoBody == 0) {
             Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show();
@@ -375,8 +392,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         }
         HttpParams httpParams = new HttpParams();
         httpParams.put("auditId", poiVideoBody);
-        long time = System.currentTimeMillis();
+        long time=System.currentTimeMillis();
-        httpParams.put("datetime", time);
+        httpParams.put("datetime",time);
         httpParams.put("file", fileZip);
         showFileLoadingDialog();
         setLoadingDialogText("上传中...");
@@ -552,7 +569,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         if (EventBus.getDefault().isRegistered(this))//加上判断
             EventBus.getDefault().unregister(this);
         super.onDestroy();
-        if (showPoiEntity != null) {
+        if (showPoiEntity!=null){
             new Thread(new Runnable() {
                 @Override
                 public void run() {
@@ -614,13 +631,13 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         poiEntity.setType(3);
         poiEntity.setTaskStatus(2);
         poiEntity.setIsLocalData(1);
-        if (fmPoiVideoPic.getTag() == null) {
+        if (fmPoiVideoPic.getTag()==null){
             List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
-            if (videoFileListByUUID != null) {
+            if (videoFileListByUUID!=null){
                 fmPoiVideoPic.setTag(videoFileListByUUID);
             }
         }
-        if (fmPoiVideoPic.getTag() != null && !((List<File>) fmPoiVideoPic.getTag()).isEmpty()) {
+        if (fmPoiVideoPic.getTag() != null &&!((List<File>) fmPoiVideoPic.getTag()).isEmpty()) {
             List<LatLng> lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List<File>) fmPoiVideoPic.getTag());
             String lineString = GeometryTools.getLineString(lineStringByVideoFileList);
             Log.d("TAG", "onGranted: " + lineString);
@@ -636,12 +653,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     @Override
     protected PoiCheckResult checkPoiEntity(PoiEntity entity) {
         PoiCheckResult poiCheckResult = new PoiCheckResult();
-        if (entity.getPhoto() == null) {
+        if (entity.getPhoto()==null){
             poiCheckResult.setCode(1);
             poiCheckResult.setMsg("请录像");
             return poiCheckResult;
         }
-        if (entity.getWork_type() == -1) {
+        if (entity.getWork_type()==-1){
             poiCheckResult.setCode(1);
             poiCheckResult.setMsg("请选择录像方式");
             return poiCheckResult;

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

@@ -10,7 +10,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.LoginActivity;
@@ -21,6 +20,8 @@ import com.navinfo.outdoor.bean.UserBean;
 import com.navinfo.outdoor.http.Callback;
 import com.navinfo.outdoor.http.HttpInterface;
 import com.navinfo.outdoor.http.OkGoBuilder;
+import com.navinfo.outdoor.util.Base64;
+import com.navinfo.outdoor.util.Md5Util;
 import com.navinfo.outdoor.util.RegexUtil;
 
 import org.greenrobot.eventbus.EventBus;
@@ -95,7 +96,6 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
                     registerNote();
                     initGetNote();
             }
-
                 break;
         }
     }
@@ -155,7 +155,12 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
             Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show();
             return;
         } else {
-            httpParams.put("password", password);
+            try {
+                httpParams.put("password",  Base64.desEncrypt(password));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
         }
         String conFirmPaw = etRegisterConfirmPaw.getText().toString().trim();
         if (conFirmPaw == null || conFirmPaw.equals("")) {
@@ -195,7 +200,6 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
                         }
                         Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
                     }
-
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();

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

@@ -27,6 +27,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
 
 import com.github.lazylibrary.util.FileUtils;
 import com.github.lazylibrary.util.StringUtils;
@@ -43,6 +44,7 @@ import com.lzy.okgo.OkGo;
 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.PictureActivity;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseDrawerFragment;
@@ -96,6 +98,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
     private Button roadUpload;
     private File fileZip;
     private FrameLayout fmRoadPic;
+    private NestedScrollView nestedScrollView;
 
     public static RoadFragment newInstance(Bundle bundle) {
         RoadFragment fragment = new RoadFragment();
@@ -119,7 +122,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
     @Override
     public void onResume() {
         super.onResume();
-        View header = findViewById(R.id.road_header);
+        View header = mView.findViewById(R.id.road_header);
         header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -136,6 +139,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 onBackPressed();
             }
         });
+        header.findViewById(R.id.tv_road_explain).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), FragmentManagement.class);
+                intent.putExtra("tag",8);
+                startActivity(intent);
+            }
+        });
     }
 
 
@@ -146,6 +157,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         poiDao = poiDatabase.getPoiDao();
         tvPictures = (TextView) findViewById(R.id.tv_pictures);
         tvPictures.setOnClickListener(this::onClick);
+        nestedScrollView = findViewById(R.id.nested_scroll_view);
+        if (slidingPaneLayout!=null){
+            slidingPaneLayout.setScrollableView(nestedScrollView);
+        }
         etRoadName = (EditText) findViewById(R.id.et_road_name);
         ivRoadPicture = (ImageView) findViewById(R.id.iv_road_picture);
         // Glide.with(getContext()).load(getLocalVideoBitmap(String.valueOf(R.drawable.bg_01))).into(ivRoadPicture);
@@ -291,16 +306,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 showFileLoadingDialog();
                 setLoadingDialogText("压缩中...");
                 if (fmRoadPic.getTag() != null) {
-                    Log.d("TAG", "onClick: "+"dddddddddddddddddddddddddddddddddd"
-                    +new Date().toLocaleString());
                     List<File> videoFileList = (List<File>) fmRoadPic.getTag();
                     fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip");
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
                             ZipUtil.zipFiles(videoFileList, fileZip, null);
-                            Log.d("TAG", "onClick: "+"dddddddddddddddddddddddddddddddddd"
-                                    +new Date().toLocaleString());
                             PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
                             if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0) {
                                 dismissLoadingDialog();

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

@@ -1,5 +1,6 @@
 package com.navinfo.outdoor.fragment;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
@@ -25,6 +26,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.github.lazylibrary.util.DensityUtil;
@@ -64,6 +66,7 @@ import com.navinfo.outdoor.util.MapManager;
 import com.navinfo.outdoor.util.MyTecentLocationSource;
 import com.navinfo.outdoor.util.NetWorkUtils;
 import com.navinfo.outdoor.util.ToastUtil;
+import com.sothree.slidinguppanel.ScrollableViewHelper;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.tencent.map.geolocation.TencentLocation;
 import com.tencent.tencentmap.mapsdk.maps.CameraUpdate;
@@ -130,6 +133,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
     private BitmapDescriptor bitmapDescriptor1, bitmapDescriptor2, bitmapDescriptor3, bitmapDescriptor4, bitmapDescriptor5;
     private Marker bigMarker;
     private Marker markerPile;
+    private List<Integer> upload;
 
     public static TreasureFragment newInstance(Bundle bundle) {
         TreasureFragment fragment = new TreasureFragment();
@@ -187,7 +191,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
 //            ivMessage.setVisibility(View.GONE);
 //        }
         cbMapType = (CheckBox) findViewById(R.id.cb_map_type);
-//      sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper());
+      //sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper());
         //地图转换
         cbMapType.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -346,6 +350,23 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
         int[] widtHeight = DensityUtil.getDeviceInfo(getActivity());
         treasureMap.getLayoutParams().width = widtHeight[0];
         treasureMap.getLayoutParams().height = widtHeight[1];
+
+    }
+
+    private class NestedScrollableViewHelper extends ScrollableViewHelper {
+        public int getScrollableViewScrollPosition(View mScrollableView, boolean isSlidingUp) {
+            if (mScrollableView instanceof NestedScrollView) {
+                if(isSlidingUp){
+                    return mScrollableView.getScrollY();
+                } else {
+                    NestedScrollView nsv = ((NestedScrollView) mScrollableView);
+                    View child = nsv.getChildAt(0);
+                    return (child.getBottom() - (nsv.getHeight() + nsv.getScrollY()));
+                }
+            } else {
+                return 0;
+            }
+        }
     }
 
     private void iniUserLocation() {
@@ -425,6 +446,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                     public void onSuccess(JobSearchBean response, int id) {
                         dismissLoadingDialog();
                         JobSearchBean.BodyBean body = response.getBody();
+                        upload =response.getUpload();
                         if (body != null) {
                             Log.d("TAG", "onSuccess: " + response.getBody().toString() + "sssssssssssss");
                             for (int i = 0; i < removables.size(); i++) {
@@ -444,6 +466,12 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                 if (geometry.getGeometryType().equals("Point")) {//点
                                     latLng = GeometryTools.createLatLng(geo);
                                 } else if (geometry.getGeometryType().equals("LineString")) {//线
+                                    BitmapDescriptor bitmapLine=null;
+                                    if (Integer.valueOf(listBean.getType())==3){//poi录像
+                                        bitmapLine= BitmapDescriptorFactory.fromResource(R.drawable.arrow_down);
+                                    }else if (Integer.valueOf(listBean.getType())==4){//道路录像
+                                        bitmapLine=BitmapDescriptorFactory.fromResource(R.drawable.arrow_down);
+                                    }
                                     List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
                                     // 构造 PolylineOpitons
                                     PolylineOptions polylineOptions = new PolylineOptions()
@@ -453,11 +481,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                             // 折线的颜色为绿色
                                             .color(0xff00ff00)
                                             // 折线宽度为5像素
-                                            .width(5)
+                                            .width(25)
+                                            .arrow(true)
+                                            .arrowSpacing(30)
+                                            .arrowTexture(bitmapLine);
                                             // 还可以添加描边颜色
-                                            .borderColor(0xffff0000)
+                                            //.borderColor(0xffff0000)
                                             // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth`
-                                            .borderWidth(1);
+                                            //.borderWidth(1);
                                     // 绘制折线
                                     Polyline polyline = tencentMap.addPolyline(polylineOptions);
                                     polyline.setZIndex(3);
@@ -582,6 +613,13 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
         if (geometry.getGeometryType().equals("Point")) {//点
             latLng = GeometryTools.createLatLng(geo);
         } else if (geometry.getGeometryType().equals("LineString")) {//线
+
+            BitmapDescriptor bitmapLine=null;
+            if (poiEntity.getType()==3){//poi录像
+                bitmapLine= BitmapDescriptorFactory.fromResource(R.drawable.arrow_down);
+            }else if (poiEntity.getType()==4){//道路录像
+                bitmapLine=BitmapDescriptorFactory.fromResource(R.drawable.arrow_down);
+            }
             List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
             // 构造 PolylineOpitons
             PolylineOptions polylineOptions = new PolylineOptions()
@@ -591,11 +629,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                     // 折线的颜色为绿色
                     .color(0xff00ff00)
                     // 折线宽度为5像素
-                    .width(25)
+                    .width(30)
-                    // 还可以添加描边颜色
+                    .arrow(true)
+                    .arrowSpacing(30)
+                    .arrowTexture(bitmapLine);
+                 /*   // 还可以添加描边颜色
                     .borderColor(0xffff0000)
                     // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth`
-                    .borderWidth(1);
+                    .borderWidth(1);*/
             // 绘制折线
             Polyline polyline = tencentMap.addPolyline(polylineOptions);
             polyline.setZIndex(3);
@@ -669,13 +710,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
         int taskStatus = Constant.TASK_STASTUS;
         int type = Constant.TASK_TYPE;
         int limit = Constant.LIMIT_TTPE;
-        if (taskStatus == 0) {
-            Message obtain = Message.obtain();
-            obtain.what = Constant.JOB_SEARCH_POI_WORD;
-            obtain.obj = null;
-            EventBus.getDefault().post(obtain);
-            return;
-        }
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -698,21 +732,29 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                 if (geometry.getGeometryType().equals("Point")) {//点
                                     latLng = GeometryTools.createLatLng(geo);
                                 } else if (geometry.getGeometryType().equals("LineString")) {//线
+                                    BitmapDescriptor bitmapLine =null;
+                                    if (type==3){//poi录像
+                                        bitmapLine= BitmapDescriptorFactory.fromResource(R.drawable.arrow_down);
+                                    }else if (type==4){//道路录像
+                                        bitmapLine=BitmapDescriptorFactory.fromResource(R.drawable.arrow_down);
+                                    }
                                     List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
                                     // 构造 PolylineOpitons
                                     PolylineOptions polylineOptions = new PolylineOptions()
                                             .alpha(0.5f)
-
                                             .addAll(latLineString)
                                             // 折线设置圆形线头
                                             .lineCap(true)
                                             .color(0xffff0000)
                                             // 折线宽度为5像素
                                             .width(5)
-                                            // 还可以添加描边颜色
+                                            .arrow(true)
+                                            .arrowSpacing(30)
+                                            .arrowTexture(bitmapLine);
+                                          /*  // 还可以添加描边颜色
                                             .borderColor(0xffff0000)
                                             // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth`
-                                            .borderWidth(1);
+                                            .borderWidth(1);*/
                                     // 绘制折线
                                     Polyline polyline = tencentMap.addPolyline(polylineOptions);
                                     polyline.setZIndex(3);
@@ -1195,6 +1237,21 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 MapManager.getInstance().animateMapLocation2TopCenter(latLng, 0.5f, 0.25f);
             }
 
+        }else if (data.what== Constant.UN_POLY_GEN_TASK){//面妆任务立即采集 领取
+            if ((boolean)data.obj){
+
+                frameLayout.setVisibility(View.GONE);
+                sliding_layout.setPanelHeight(0);
+                setMainButtonVisiable(View.VISIBLE);
+                sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+            }
+            if (bigMarker != null) {
+                bigMarker.setVisible(false);
+            }
+            for (int i = 0; i < removablesMarker.size(); i++) {
+                removablesMarker.get(i).remove();
+            }
+            removablesMarker.clear();
         }
     }
 
@@ -1214,7 +1271,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
     }
 
     private void initPoiMarker(LatLng latLng) {
-        LatLng mapCenterPoint = getMapCenterPoint();
         CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition(
                 latLng, //中心点坐标，地图目标经纬度
                 tencentMap.getCameraPosition().zoom,  //目标缩放级别

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

@@ -142,12 +142,11 @@ public class OkGoBuilder<T> {
                 .execute(new DialogCallback<T>(clazz) {
                     @Override
                     public void onSuccess(Response<T> response) {
-                        if (response.code() ==200 ){
+                        if (response.code()==200){
                             callback.onSuccess(response.body(), 1);
                         }else {
-                            Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show();
                         }
-
                     }
 
                     @Override
@@ -169,7 +168,6 @@ public class OkGoBuilder<T> {
     }
 
     public HttpHeaders getHeader() {
-
         HttpHeaders headers = new HttpHeaders();
         try {
             if (token == null) {
@@ -250,12 +248,11 @@ public class OkGoBuilder<T> {
                 .execute(new DialogCallback<T>(clazz) {
                     @Override
                     public void onSuccess(Response<T> response) {
-                        if (response.code() ==200){
+                        if (response.code()==200){
                             callback.onSuccess(response.body(), 1);
                         }else {
-                            Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show();
                         }
-
                     }
 
                     @Override
@@ -299,7 +296,7 @@ public class OkGoBuilder<T> {
                         if (response.code()==200){
                             callback.onSuccess(response.body(), 1);
                         }else {
-                            Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show();
                         }
 
                     }

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

@@ -83,6 +83,7 @@
         android:layout_marginTop="8dp"
         android:hint=" 请输入密码"
         android:maxLines="1"
+        android:inputType="textPassword"
         android:paddingBottom="15dp"
         android:layout_marginRight="35dp"
         android:layout_marginLeft="35dp"

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

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
     <include
         android:id="@+id/charging_pile_header"
         layout="@layout/charging_pile_header"
@@ -18,6 +15,15 @@
         app:layout_constraintTop_toTopOf="parent">
 
     </include>
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/nested_scroll_view"
+        >
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
             <TextView
                 android:id="@+id/tv_01"
                 android:layout_width="wrap_content"
@@ -27,7 +33,7 @@
                 android:textColor="@color/black"
                 android:layout_margin="10dp"
                 app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/charging_pile_header"/>
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <RelativeLayout
                 android:id="@+id/linear_pot"
@@ -833,4 +839,5 @@
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-       </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+       </LinearLayout>

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

@@ -55,7 +55,7 @@
         app:layout_constraintTop_toTopOf="@id/tv1" />
 
     <TextView
-        android:id="@+id/tv_Charging_pile_explain"
+        android:id="@+id/tv_charging_pile_explain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"

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

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.core.widget.NestedScrollView
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-        >
+    android:orientation="vertical">
     <include
         android:id="@+id/charging_station_header"
         layout="@layout/charging_station_header"
@@ -19,25 +14,32 @@
         app:layout_constraintTop_toTopOf="parent">
 
     </include>
-
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nested_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
             <TextView
                 android:id="@+id/tv_01"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:text="01.基本资料填写"
-            android:textSize="15sp"
-            android:textColor="@color/black"
                 android:layout_margin="10dp"
+                android:text="01.基本资料填写"
+                android:textColor="@color/black"
+                android:textSize="15sp"
                 app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/charging_station_header" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <RelativeLayout
                 android:id="@+id/linear_pot"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="2dp"
                 android:background="@drawable/underline"
+                android:padding="2dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintStart_toStartOf="parent"
@@ -47,11 +49,11 @@
                     android:id="@+id/tv_pot"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:text="点位*"
                     android:textColor="#333" />
 
@@ -77,10 +79,10 @@
                     android:layout_toRightOf="@id/check_pot_life"
                     android:background="@drawable/selector_change_bg"
                     android:button="@null"
-                android:visibility="gone"
                     android:gravity="center"
                     android:text="保存"
-                android:textSize="8sp" />
+                    android:textSize="8sp"
+                    android:visibility="gone" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -88,23 +90,23 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="2dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_pot"
+                android:padding="2dp"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_pot">
+
                 <TextView
                     android:id="@+id/tv_name_pic"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="名称*"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:textColor="#333"
-                android:layout_marginLeft="18dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                />
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="名称*"
+                    android:textColor="#333" />
 
                 <EditText
                     android:id="@+id/tv_name_content"
@@ -112,107 +114,110 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
+                    android:layout_toStartOf="@id/tv_examine"
+                    android:layout_toEndOf="@id/tv_name_pic"
                     android:layout_toRightOf="@id/tv_name_pic"
                     android:background="@color/white"
                     android:hint="名称"
                     android:singleLine="true"
-                android:layout_toEndOf="@id/tv_name_pic"
+                    android:textColor="@color/test_color_selector"
-                android:layout_toStartOf="@id/tv_examine"
+                    android:textSize="15sp" />
-                android:textSize="15sp"
+
-                android:textColor="@color/test_color_selector" />
                 <TextView
                     android:id="@+id/tv_examine"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:text="查重"
-                android:layout_margin="4dp"
-                android:textColor="@color/design_default_color_primary"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                />
+                    android:layout_margin="4dp"
+                    android:text="查重"
+                    android:textColor="@color/design_default_color_primary" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/linear_site"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="2dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_name"
+                android:padding="2dp"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_name">
+
                 <TextView
                     android:id="@+id/tv_site"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="地址"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:textColor="#333"
-                android:layout_marginLeft="18dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                />
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="地址"
+                    android:textColor="#333" />
 
                 <EditText
                     android:id="@+id/tv_site_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
+                    android:layout_marginRight="10dp"
                     android:layout_toRightOf="@id/tv_site"
                     android:background="@color/white"
                     android:hint="地址"
-                android:textSize="15sp"
+                    android:textColor="@color/test_color_selector"
-                android:textColor="@color/test_color_selector" />
+                    android:textSize="15sp" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/linear_phone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_site"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_site">
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_phone"
                     android:layout_width="match_parent"
-                android:visibility="gone"
                     android:layout_height="match_parent"
                     android:layout_centerInParent="true"
-                />
+                    android:visibility="gone" />
+
                 <LinearLayout
                     android:id="@+id/linear_contact"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                android:orientation="vertical"
                     android:layout_centerInParent="true"
-                ></LinearLayout>
+                    android:orientation="vertical"></LinearLayout>
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/linear_type"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="2dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_phone"
+                android:padding="2dp"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_phone">
+
                 <TextView
                     android:id="@+id/tv_type"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="类型"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:textColor="#333"
-                android:layout_marginLeft="18dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                />
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="类型"
+                    android:textColor="#333" />
 
                 <Spinner
                     android:id="@+id/spinner_type"
@@ -220,43 +225,44 @@
                     android:layout_height="40dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
-                android:layout_toRightOf="@id/tv_type"
-                android:background="@color/white"
                     android:layout_marginRight="10dp"
                     android:layout_toEndOf="@id/tv_type"
-                android:textSize="15sp"
+                    android:layout_toRightOf="@id/tv_type"
-                android:textColor="#333" />
+                    android:background="@color/white"
+                    android:textColor="#333"
+                    android:textSize="15sp" />
+
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                android:background="@drawable/ic_baseline_arrow_drop"
+                    android:background="@drawable/ic_baseline_arrow_drop" />
-                />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/linear_exist"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
+                android:background="@drawable/underline"
                 android:padding="2dp"
                 android:visibility="gone"
-            android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_type"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_type">
+
                 <TextView
                     android:id="@+id/tv_exist"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="是否存在*"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:textColor="#333"
-                android:layout_marginLeft="18dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                />
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="是否存在*"
+                    android:textColor="#333" />
 
                 <Spinner
                     android:id="@+id/spinner_exist"
@@ -264,30 +270,32 @@
                     android:layout_height="40dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
-                android:layout_toRightOf="@id/tv_exist"
-                android:background="@color/white"
                     android:layout_marginRight="10dp"
                     android:layout_toEndOf="@id/tv_exist"
-                android:textSize="15sp"
+                    android:layout_toRightOf="@id/tv_exist"
-                android:textColor="#333" />
+                    android:background="@color/white"
+                    android:textColor="#333"
+                    android:textSize="15sp" />
+
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                android:background="@drawable/ic_baseline_arrow_drop"
+                    android:background="@drawable/ic_baseline_arrow_drop" />
-                />
             </RelativeLayout>
+
             <TextView
                 android:id="@+id/tv_02"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:text="02.拍照"
-            android:textSize="15sp"
                 android:layout_margin="10dp"
+                android:text="02.拍照"
                 android:textColor="@color/black"
+                android:textSize="15sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/linear_exist" />
+
             <LinearLayout
                 android:id="@+id/linear_photograph"
                 android:layout_width="match_parent"
@@ -296,209 +304,214 @@
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
                 android:orientation="vertical"
-            app:layout_constraintTop_toBottomOf="@id/tv_02"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_02">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                android:layout_weight="1"
+                    android:layout_weight="1">
-                >
+
                     <RelativeLayout
                         android:id="@+id/rl_panorama"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_red_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_red_bg">
+
                         <ImageView
                             android:id="@+id/image_panorama"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/chartall"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/chartall" />
+
                         <TextView
                             android:id="@+id/tv_panorama"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:text="*全景照片"
-                        android:textSize="12sp"
-                        android:layout_margin="5dp"
-                        android:textColor="@color/pickerview_wheelview_textcolor_divider"
                             android:layout_below="@id/image_panorama"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_margin="5dp"
+                            android:text="*全景照片"
+                            android:textColor="@color/pickerview_wheelview_textcolor_divider"
+                            android:textSize="12sp" />
+
                         <ImageView
                             android:id="@+id/iv_panorama"
-                        android:layout_centerInParent="true"
-                        android:scaleType="fitXY"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <RelativeLayout
                         android:id="@+id/rl_name"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_red_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_red_bg">
+
                         <ImageView
                             android:id="@+id/image_name"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/name"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/name" />
+
                         <TextView
                             android:id="@+id/tv_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:text="*名称照片"
-                        android:textSize="12sp"
-                        android:layout_margin="5dp"
-                        android:textColor="@color/pickerview_wheelview_textcolor_divider"
                             android:layout_below="@id/image_name"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_margin="5dp"
+                            android:text="*名称照片"
+                            android:textColor="@color/pickerview_wheelview_textcolor_divider"
+                            android:textSize="12sp" />
+
                         <ImageView
                             android:id="@+id/iv_name"
-                        android:layout_centerInParent="true"
-                        android:scaleType="fitXY"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <RelativeLayout
                         android:id="@+id/rl_internal_photos"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_red_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_red_bg">
+
                         <ImageView
                             android:id="@+id/image_internal"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/explain"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/explain" />
+
                         <TextView
                             android:id="@+id/tv_internal"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:text="*服务说明"
-                        android:textSize="12sp"
-                        android:layout_margin="5dp"
-                        android:textColor="@color/pickerview_wheelview_textcolor_divider"
                             android:layout_below="@id/image_internal"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_margin="5dp"
+                            android:text="*服务说明"
+                            android:textColor="@color/pickerview_wheelview_textcolor_divider"
+                            android:textSize="12sp" />
+
                         <ImageView
                             android:id="@+id/iv_internal"
-                        android:layout_centerInParent="true"
-                        android:scaleType="fitXY"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
                 </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                android:layout_weight="1"
+                    android:layout_weight="1">
-                >
+
                     <RelativeLayout
                         android:id="@+id/rl_else"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_red_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_red_bg">
+
                         <ImageView
                             android:id="@+id/image_else"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/chargeaim"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/chargeaim" />
+
                         <TextView
                             android:id="@+id/tv_else"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:text="充电站指引牌"
-                        android:textSize="12sp"
-                        android:layout_margin="5dp"
-                        android:textColor="@color/pickerview_wheelview_textcolor_divider"
                             android:layout_below="@id/image_else"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_margin="5dp"
+                            android:text="充电站指引牌"
+                            android:textColor="@color/pickerview_wheelview_textcolor_divider"
+                            android:textSize="12sp" />
+
                         <ImageView
                             android:id="@+id/iv_else"
-                        android:layout_centerInParent="true"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        android:scaleType="fitXY"
+                            android:layout_centerInParent="true"
-                        />
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <RelativeLayout
                         android:id="@+id/rl_scutcheon"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_red_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_red_bg">
+
                         <ImageView
                             android:id="@+id/image_scutcheon"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/parkprice"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/parkprice" />
+
                         <TextView
                             android:id="@+id/tv_scutcheon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:text="停车收费标牌"
-                        android:textSize="12sp"
-                        android:layout_margin="5dp"
-                        android:textColor="@color/pickerview_wheelview_textcolor_divider"
                             android:layout_below="@id/image_scutcheon"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_margin="5dp"
+                            android:text="停车收费标牌"
+                            android:textColor="@color/pickerview_wheelview_textcolor_divider"
+                            android:textSize="12sp" />
+
                         <ImageView
                             android:id="@+id/iv_scutcheon"
-                        android:layout_centerInParent="true"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        android:scaleType="fitXY"
+                            android:layout_centerInParent="true"
-                        />
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <RelativeLayout
                         android:id="@+id/rl_null"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
-                </RelativeLayout>
+                        android:layout_weight="1"></RelativeLayout>
 
                 </LinearLayout>
             </LinearLayout>
@@ -509,8 +522,8 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:text="03.添加"
-            android:textSize="15sp"
                 android:textColor="@color/black"
+                android:textSize="15sp"
                 app:layout_constraintBottom_toTopOf="@+id/recycler_station"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/linear_photograph" />
@@ -528,13 +541,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="3dp"
                 android:background="@drawable/selector_red_radius_bg"
                 android:orientation="horizontal"
-            app:layout_constraintTop_toTopOf="@+id/tv_03"
+                android:padding="3dp"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_03"
                 app:layout_constraintRight_toRightOf="parent"
-            >
+                app:layout_constraintTop_toTopOf="@+id/tv_03">
 
                 <ImageView
                     android:layout_width="20dp"
@@ -546,21 +558,23 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                android:textSize="12sp"
-                android:textColor="@color/white"
                     android:layout_marginRight="10dp"
-                android:text="添加桩" />
+                    android:text="添加桩"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
             </LinearLayout>
+
             <TextView
                 android:id="@+id/tv_04"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="10dp"
                 android:text="04.描述"
                 android:textColor="@color/black"
                 android:textSize="15sp"
-            android:layout_margin="10dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/recycler_station" />
+
             <LinearLayout
                 android:id="@+id/linear_describe"
                 android:layout_width="match_parent"
@@ -569,22 +583,23 @@
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/tv_04"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_04">
+
                 <EditText
                     android:id="@+id/edit_describe"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                android:paddingBottom="30dp"
                     android:layout_margin="2dp"
-                android:gravity="top"
+                    android:background="@color/white"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
-                android:background="@color/white"
+                    android:gravity="top"
                     android:hint="任务描述"
-                android:paddingTop="10dp"
                     android:paddingLeft="10dp"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="30dp"
                     android:textSize="15sp"
 
                     />
@@ -623,5 +638,7 @@
                     android:text="上传" />
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
-
     </androidx.core.widget.NestedScrollView>
+
+
+</LinearLayout>

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

@@ -55,7 +55,7 @@
             app:layout_constraintTop_toTopOf="@id/tv1" />
 
         <TextView
-            android:id="@+id/tv_Charging_station_explain"
+            android:id="@+id/tv_charging_station_explain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"

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

@@ -214,8 +214,5 @@
         android:id="@+id/recycler_filter"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+         />
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rl_filters" />
 </LinearLayout>

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

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
-
+    android:orientation="vertical">
     <include
         android:id="@+id/other_header"
         layout="@layout/other_header"
@@ -16,7 +14,14 @@
         app:layout_constraintTop_toTopOf="parent">
 
     </include>
-
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
             <TextView
                 android:id="@+id/tv_select_type"
                 android:layout_width="wrap_content"
@@ -25,7 +30,7 @@
                 android:text="01.选择情报类型"
                 android:textStyle="bold"
                 app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/other_header" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <LinearLayout
                 android:id="@+id/ll_text"
@@ -214,10 +219,10 @@
 
                     <ImageView
                         android:id="@+id/iv_picture"
-                    android:scaleType="fitXY"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                    android:layout_centerInParent="true" />
+                        android:layout_centerInParent="true"
+                        android:scaleType="fitXY" />
                 </RelativeLayout>
 
                 <RelativeLayout
@@ -249,10 +254,10 @@
 
                     <ImageView
                         android:id="@+id/iv_pictures"
-                    android:scaleType="fitXY"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                    android:layout_centerInParent="true" />
+                        android:layout_centerInParent="true"
+                        android:scaleType="fitXY" />
                 </RelativeLayout>
             </LinearLayout>
 
@@ -331,6 +336,6 @@
                     android:background="@drawable/shape_transparent_pink_radius_bg"
                     android:text="上传" />
             </LinearLayout>
-
-
         </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>

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

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+    android:layout_height="match_parent"
-        app:layout_constraintEnd_toEndOf="parent"
+    android:orientation="vertical">
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
 
     <include
         android:id="@+id/road_header"
@@ -20,6 +15,15 @@
         app:layout_constraintTop_toTopOf="parent">
 
     </include>
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nested_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
             <TextView
                 android:id="@+id/tv_message"
                 android:layout_width="wrap_content"
@@ -30,7 +34,7 @@
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/road_header" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <LinearLayout
                 android:id="@+id/ll_name"
@@ -115,13 +119,13 @@
                         android:text="步行"
                         android:textColor="@color/test_color_selector" />
 
-<!--                <RadioButton-->
+                    <!--                <RadioButton-->
-<!--                    android:id="@+id/rb_manual"-->
+                    <!--                    android:id="@+id/rb_manual"-->
-<!--                    android:layout_width="0dp"-->
+                    <!--                    android:layout_width="0dp"-->
-<!--                    android:layout_height="wrap_content"-->
+                    <!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_weight="1"-->
+                    <!--                    android:layout_weight="1"-->
-<!--                    android:text="手动"-->
+                    <!--                    android:text="手动"-->
-<!--                    android:textColor="@color/test_color_selector" />-->
+                    <!--                    android:textColor="@color/test_color_selector" />-->
                 </RadioGroup>
 
             </LinearLayout>
@@ -168,12 +172,11 @@
                     android:id="@+id/iv_road_picture"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:maxWidth="200dp"
+                    android:maxHeight="100dp"
                     android:minWidth="140dp"
                     android:minHeight="70dp"
-                android:maxHeight="100dp"
+                    android:scaleType="fitXY" />
-                android:maxWidth="200dp"
-                android:scaleType="fitXY"
-                />
             </FrameLayout>
 
 
@@ -260,3 +263,7 @@
                     android:text="上传" />
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+
+</LinearLayout>

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

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.core.widget.NestedScrollView
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/nested_scroll_view"
-        xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-        >
+    android:orientation="vertical">
     <include
         android:id="@+id/poi_header"
         layout="@layout/poi_header"
@@ -19,25 +14,30 @@
         app:layout_constraintTop_toTopOf="parent">
 
     </include>
-
+    <androidx.core.widget.NestedScrollView
-
+        android:id="@+id/nested_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
             <TextView
                 android:id="@+id/tv_01"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="10dp"
                 android:text="01.基本资料填写"
                 android:textColor="@color/black"
-            android:layout_margin="10dp"
                 app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/poi_header"/>
+                app:layout_constraintTop_toTopOf="parent" />
 
             <RelativeLayout
                 android:id="@+id/linear_pot"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="2dp"
                 android:background="@drawable/underline"
+                android:padding="2dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintStart_toStartOf="parent"
@@ -47,11 +47,11 @@
                     android:id="@+id/tv_pot"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:text="点位*"
                     android:textColor="#333" />
 
@@ -77,10 +77,10 @@
                     android:layout_toRightOf="@id/check_pot_life"
                     android:background="@drawable/selector_change_bg"
                     android:button="@null"
-                android:visibility="gone"
                     android:gravity="center"
                     android:text="保存"
-                android:textSize="8sp" />
+                    android:textSize="8sp"
+                    android:visibility="gone" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -88,23 +88,23 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="2dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_pot"
+                android:padding="2dp"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_pot">
+
                 <TextView
                     android:id="@+id/tv_name"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="名称*"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:textColor="#333"
-                android:layout_marginLeft="18dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                />
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="名称*"
+                    android:textColor="#333" />
 
                 <EditText
                     android:id="@+id/tv_name_content"
@@ -112,113 +112,113 @@
                     android:layout_height="25dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
+                    android:layout_toStartOf="@id/tv_examine"
+                    android:layout_toEndOf="@id/tv_name"
                     android:layout_toRightOf="@id/tv_name"
-                android:singleLine="true"
                     android:background="@color/white"
                     android:hint="poi名称"
                     android:inputType="text"
                     android:maxLines="1"
-                android:layout_toEndOf="@id/tv_name"
+                    android:singleLine="true"
-                android:layout_toStartOf="@id/tv_examine"
+                    android:textColor="@color/test_color_selector"
-                android:textSize="15sp"
+                    android:textSize="15sp" />
-                android:textColor="@color/test_color_selector" />
                 <!--             android:textColor="#333" -->
                 <TextView
                     android:id="@+id/tv_examine"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:text="查重"
-                android:layout_margin="4dp"
-                android:textColor="@color/design_default_color_primary"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                />
+                    android:layout_margin="4dp"
+                    android:text="查重"
+                    android:textColor="@color/design_default_color_primary" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/linear_site"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
-            android:padding="2dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_name"
+                android:padding="2dp"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_name">
+
                 <TextView
                     android:id="@+id/tv_site"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="地址"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:textColor="#333"
-                android:layout_marginLeft="18dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                />
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="地址"
+                    android:textColor="#333" />
 
                 <EditText
                     android:id="@+id/tv_site_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
+                    android:layout_marginRight="10dp"
                     android:layout_toRightOf="@id/tv_site"
-                android:textColor="@color/test_color_selector"
                     android:background="@color/white"
                     android:hint="poi地址"
-                android:textSize="15sp"
+                    android:textColor="@color/test_color_selector"
-                />
+                    android:textSize="15sp" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/linear_phone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_site"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_site">
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_phone"
                     android:layout_width="match_parent"
-                android:visibility="gone"
                     android:layout_height="match_parent"
                     android:layout_centerInParent="true"
-                />
+                    android:visibility="gone" />
+
                 <LinearLayout
                     android:id="@+id/linear_contact"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                android:orientation="vertical"
                     android:layout_centerInParent="true"
-                >
+                    android:orientation="vertical"></LinearLayout>
-            </LinearLayout>
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/linear_exist"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
+                android:background="@drawable/underline"
                 android:padding="2dp"
                 android:visibility="gone"
-            android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/linear_phone"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/linear_phone">
+
                 <TextView
                     android:id="@+id/tv_exist"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="是否存在*"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:textColor="#333"
-                android:layout_marginLeft="18dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                />
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="是否存在*"
+                    android:textColor="#333" />
 
                 <Spinner
                     android:id="@+id/spinner_exist"
@@ -226,29 +226,31 @@
                     android:layout_height="40dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="18dp"
-                android:layout_toRightOf="@id/tv_exist"
-                android:background="@color/white"
                     android:layout_marginRight="10dp"
                     android:layout_toEndOf="@id/tv_exist"
-                android:textSize="15sp"
+                    android:layout_toRightOf="@id/tv_exist"
-                android:textColor="#333" />
+                    android:background="@color/white"
+                    android:textColor="#333"
+                    android:textSize="15sp" />
+
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                android:background="@drawable/ic_baseline_arrow_drop"
+                    android:background="@drawable/ic_baseline_arrow_drop" />
-                />
             </RelativeLayout>
+
             <TextView
                 android:id="@+id/tv_02"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="10dp"
                 android:text="02.拍照"
                 android:textColor="@color/black"
-            android:layout_margin="10dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/linear_exist" />
+
             <LinearLayout
                 android:id="@+id/linear_photograph"
                 android:layout_width="match_parent"
@@ -257,224 +259,231 @@
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
                 android:orientation="vertical"
-            app:layout_constraintTop_toBottomOf="@id/tv_02"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_02">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                android:layout_weight="1"
+                    android:layout_weight="1">
-                >
+
                     <RelativeLayout
                         android:id="@+id/rl_panorama"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_red_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_red_bg">
+
                         <ImageView
                             android:id="@+id/image_panorama"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/quanjing"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/quanjing" />
+
                         <TextView
                             android:id="@+id/tv_panorama"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_below="@id/image_panorama"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
-                        android:text="*全景图"
-                        android:textSize="12sp"
                             android:layout_margin="5dp"
+                            android:text="*全景图"
                             android:textColor="@color/pickerview_wheelview_textcolor_divider"
-                        android:layout_below="@id/image_panorama"
+                            android:textSize="12sp" />
-                        />
+
                         <ImageView
                             android:id="@+id/iv_panorama"
-                        android:scaleType="fitXY"
-                        android:layout_centerInParent="true"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <RelativeLayout
                         android:id="@+id/rl_name"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_red_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_red_bg">
+
                         <ImageView
                             android:id="@+id/image_name"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/mingcheng"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/mingcheng" />
+
                         <TextView
                             android:id="@+id/tv_poi_name_pic"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_below="@id/image_name"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
-                        android:text="*名称"
-                        android:textSize="12sp"
                             android:layout_margin="5dp"
+                            android:text="*名称"
                             android:textColor="@color/pickerview_wheelview_textcolor_divider"
-                        android:layout_below="@id/image_name"
+                            android:textSize="12sp" />
-                        />
+
                         <ImageView
                             android:id="@+id/iv_name"
-                        android:scaleType="fitXY"
-                        android:layout_centerInParent="true"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <RelativeLayout
                         android:id="@+id/rl_internal_photos"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_hui_bg"
                         android:layout_marginRight="5dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_hui_bg">
+
                         <ImageView
                             android:id="@+id/image_internal"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/mingcheng"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/mingcheng" />
+
                         <TextView
                             android:id="@+id/tv_internal"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_below="@id/image_internal"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
-                        android:text="内部照片"
-                        android:textSize="12sp"
                             android:layout_margin="5dp"
+                            android:text="内部照片"
                             android:textColor="@color/pickerview_wheelview_textcolor_divider"
-                        android:layout_below="@id/image_internal"
+                            android:textSize="12sp" />
-                        />
+
                         <ImageView
                             android:id="@+id/iv_internal"
-                        android:scaleType="fitXY"
-                        android:layout_centerInParent="true"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
                 </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                android:layout_weight="1"
+                    android:layout_weight="1">
-                >
+
                     <RelativeLayout
                         android:id="@+id/rl_card"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_hui_bg"
                         android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_hui_bg">
+
                         <ImageView
                             android:id="@+id/image_card"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/mingpian"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/mingpian" />
+
                         <TextView
                             android:id="@+id/tv_card"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_below="@id/image_card"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
-                        android:text="名片"
-                        android:textSize="12sp"
                             android:layout_margin="5dp"
+                            android:text="名片"
                             android:textColor="@color/pickerview_wheelview_textcolor_divider"
-                        android:layout_below="@id/image_card"
+                            android:textSize="12sp" />
-                        />
+
                         <ImageView
                             android:id="@+id/iv_card"
-                        android:scaleType="fitXY"
-                        android:layout_centerInParent="true"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <RelativeLayout
                         android:id="@+id/rl_else"
                         android:layout_width="0dp"
-                    android:layout_weight="1"
                         android:layout_height="match_parent"
                         android:layout_marginTop="10dp"
-                    android:background="@drawable/selector_hui_bg"
                         android:layout_marginRight="5dp"
-                    android:layout_marginBottom="10dp">
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_hui_bg">
+
                         <ImageView
                             android:id="@+id/image_else"
-                        android:layout_centerHorizontal="true"
                             android:layout_width="20dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/qita"
                             android:layout_height="20dp"
-                        />
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/qita" />
+
                         <TextView
                             android:id="@+id/tv_else"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_below="@id/image_else"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
-                        android:text="其他"
-                        android:textSize="12sp"
                             android:layout_margin="5dp"
+                            android:text="其他"
                             android:textColor="@color/pickerview_wheelview_textcolor_divider"
-                        android:layout_below="@id/image_else"
+                            android:textSize="12sp" />
-                        />
+
                         <ImageView
                             android:id="@+id/iv_else"
-                        android:scaleType="fitXY"
-                        android:layout_centerInParent="true"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                        />
+                            android:layout_centerInParent="true"
+                            android:scaleType="fitXY" />
                     </RelativeLayout>
+
                     <ImageView
                         android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_marginRight="5dp"
                         android:layout_height="match_parent"
-                    />
+                        android:layout_marginTop="10dp"
+                        android:layout_marginRight="5dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1" />
                 </LinearLayout>
             </LinearLayout>
+
             <TextView
                 android:id="@+id/tv_03"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="10dp"
                 android:text="03.描述"
                 android:textColor="@color/black"
-            android:layout_margin="10dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/linear_photograph" />
+
             <LinearLayout
                 android:id="@+id/linear_describe"
                 android:layout_width="match_parent"
@@ -483,24 +492,25 @@
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
                 android:background="@drawable/underline"
-            app:layout_constraintTop_toBottomOf="@id/tv_03"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_03">
+
                 <EditText
                     android:id="@+id/edit_describe"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                android:paddingBottom="30dp"
                     android:layout_margin="2dp"
-                android:gravity="top"
+                    android:background="@color/white"
-                android:paddingLeft="10dp"
-                android:paddingTop="10dp"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
-                android:background="@color/white"
+                    android:gravity="top"
                     android:hint="任务描述"
-                android:textSize="15sp"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="30dp"
                     android:textColor="@color/test_color_selector"
+                    android:textSize="15sp"
 
 
                     />
@@ -540,4 +550,7 @@
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
+
+
+</LinearLayout>

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

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+    android:layout_height="match_parent"
-        app:layout_constraintEnd_toEndOf="parent"
+    android:orientation="vertical">
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
 
     <include
         android:id="@+id/poi_video_header"
@@ -19,7 +15,15 @@
         app:layout_constraintTop_toTopOf="parent">
 
     </include>
-
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nested_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
             <TextView
                 android:id="@+id/tv_message"
                 android:layout_width="wrap_content"
@@ -30,7 +34,7 @@
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/poi_video_header" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <LinearLayout
                 android:id="@+id/ll_name"
@@ -303,3 +307,5 @@
                     android:text="上传" />
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>

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

@@ -55,7 +55,7 @@
         app:layout_constraintTop_toTopOf="@id/tv1" />
 
     <TextView
-        android:id="@+id/tv_poi_video_explain"
+        android:id="@+id/tv_explain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"