添加禁止操作控件方法和完成记录待提交布局展示

app/build.gradle

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

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

@@ -24,6 +24,7 @@ import com.navinfo.outdoor.fragment.PoiTaskFragment;
 import com.navinfo.outdoor.fragment.PrivilegeFragment;
 import com.navinfo.outdoor.fragment.RecordFragment;
 import com.navinfo.outdoor.fragment.RoadFragment;
+import com.navinfo.outdoor.fragment.RoadTaskFragment;
 import com.navinfo.outdoor.fragment.SetFragment;
 import com.navinfo.outdoor.fragment.StaySubmitFragment;
 import com.navinfo.outdoor.fragment.TaskExWebFragment;
@@ -78,10 +79,10 @@ public class FragmentManagement extends BaseActivity {
     private WithdrawalRecordFragment withdrawalRecordFragment;//我的-提现-提现记录的fragment  -26
     private PoiFragment poiFragment;//寻宝-上传-POI的fragment -27
     private RoadFragment roadFragment;//寻宝-上传-道路的fragment -28
-
     private StaySubmitFragment staySubmitFragment;//记录-待提交的fragment -29
     private HasSubmitFragment hasSubmitFragment;//记录-已提交的fragment -30
-    //private PoiTaskFragment poiTaskFragment;//记录-已提交-POI任务列表的fragment -31
+    private PoiTaskFragment poiTaskFragment;//记录-已提交-POI任务列表的fragment -31
+    private RoadTaskFragment roadTaskFragment;//记录-已提交-道路任务列表的fragment -32
 
 
     @Override
@@ -162,7 +163,10 @@ public class FragmentManagement extends BaseActivity {
             fragmentTransaction.hide(staySubmitFragment);
         if (hasSubmitFragment !=null) //记录-已提交的fragment -30
             fragmentTransaction.hide(hasSubmitFragment);
-
+        if (poiTaskFragment !=null) //记录-已提交-任务列表的fragment -31
+            fragmentTransaction.hide(poiTaskFragment);
+        if (roadTaskFragment !=null) //记录-已提交-任务列表的fragment -31
+            fragmentTransaction.hide(roadTaskFragment);
 
 
     }
@@ -414,6 +418,14 @@ public class FragmentManagement extends BaseActivity {
                     fragmentTransaction.show(hasSubmitFragment);
                 }
                 break;
+            case 31://记录-已提交-任务列表的fragment
+                if (poiTaskFragment ==null){
+                    poiTaskFragment =new PoiTaskFragment();
+                    fragmentTransaction.add(R.id.frame_layout, poiTaskFragment);
+                }else {
+                    fragmentTransaction.show(poiTaskFragment);
+                }
+                break;
         }
         fragmentTransaction.commit();
     }

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

@@ -113,8 +113,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
 
         //设置拍照的宽高
         //camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(1000), SizeSelectors.smallest(), SizeSelectors.aspectRatio(AspectRatio.of(1, 1), 0)));
-        camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(Integer.parseInt(getIntent().getStringExtra("pic"))), SizeSelectors.aspectRatio(AspectRatio.of(1, 1), 0)));
+       // camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(Integer.parseInt(getIntent().getStringExtra("pic"))), SizeSelectors.aspectRatio(AspectRatio.of(1, 1), 0)));
-       //
         SdkFolderCreate.mkdirs(Constant.PICTURE_FOLDER);
         //获取地图
         tencentMap = ivMap.getMap();
@@ -194,9 +193,6 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
                     camera.takePicture();
                 }
                 break;
-            case R.id.btn_video:
-                //  camera.stopVideo();
-                break;
             case R.id.btn_switch:
                 btnSwich();
                 break;
@@ -216,7 +212,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
      * 定位的一些初始化设置
      */
     private void initLocation() {
-//用于访问腾讯定位服务的类, 周期性向客户端提供位置更新
+        //用于访问腾讯定位服务的类, 周期性向客户端提供位置更新
         locationManager = TencentLocationManager.getInstance(this);
         //设置坐标系
         locationManager.setCoordinateType(TencentLocationManager.COORDINATE_TYPE_GCJ02);

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

@@ -0,0 +1,63 @@
+package com.navinfo.outdoor.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.bean.CapacityMeasureBean;
+import com.navinfo.outdoor.room.PoiEntity;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.ViewHolder> {
+
+    private Context context;
+
+
+    public StaySubmitAdapter(Context context) {
+        this.context = context;
+    }
+
+    @NonNull
+    @NotNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
+        View inflate = LayoutInflater.from(context).inflate(R.layout.stay_item, parent, false);
+        return new ViewHolder(inflate);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull @NotNull ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return 0;
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView tvCs1;
+        private TextView tvDay;
+        private CheckBox cbAll;
+
+        public ViewHolder(@NonNull @NotNull View itemView) {
+            super(itemView);
+            tvCs1 = itemView.findViewById(R.id.tv_cs1);
+            tvDay = itemView.findViewById(R.id.tv_day);
+            cbAll = itemView.findViewById(R.id.cb_all);
+        }
+    }
+}

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

@@ -48,14 +48,17 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
         auditProcess = (TextView) findViewById(R.id.audit_process);
         auditThrough = (TextView) findViewById(R.id.audit_through);
         auditNotThrough = (TextView) findViewById(R.id.audit_not_through);
-        clCharging = (ConstraintLayout) findViewById(R.id.cl_charging);
-        chargingAuditProcess = (TextView) findViewById(R.id.charging_audit_process);
-        chargingAuditThrough = (TextView) findViewById(R.id.charging_audit_through);
-        chargingAuditNotThrough = (TextView) findViewById(R.id.charging_audit_not_through);
         clRoad = (ConstraintLayout) findViewById(R.id.cl_road);
+        clRoad.setOnClickListener(this::onClick);
         roadAuditProcess = (TextView) findViewById(R.id.road_audit_process);
         roadAuditThrough = (TextView) findViewById(R.id.road_audit_through);
         roadAuditNotThrough = (TextView) findViewById(R.id.road_audit_not_through);
+        clCharging = (ConstraintLayout) findViewById(R.id.cl_charging);
+        clCharging.setOnClickListener(this::onClick);
+        chargingAuditProcess = (TextView) findViewById(R.id.charging_audit_process);
+        chargingAuditThrough = (TextView) findViewById(R.id.charging_audit_through);
+        chargingAuditNotThrough = (TextView) findViewById(R.id.charging_audit_not_through);
+
         clOther = (ConstraintLayout) findViewById(R.id.cl_other);
         otherAuditProcess = (TextView) findViewById(R.id.other_audit_process);
         otherAuditThrough = (TextView) findViewById(R.id.other_audit_through);
@@ -70,8 +73,15 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.iv_poi:
+            case R.id.cl_poi:
-               // Intent hasIntent = new Intent(getContext(), FragmentManagement.class);
+                Intent hasIntent = new Intent(getContext(), FragmentManagement.class);
+                hasIntent.putExtra("tag",31);
+                startActivity(hasIntent);
+                break;
+            case R.id.cl_road:
+
+                break;
+            case R.id.cl_charging:
 
                 break;
         }

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

@@ -87,6 +87,8 @@ public class PoiFragment extends BaseDialogFragment implements View.OnClickListe
     private List<Info> photoBean;
     private boolean aBoolean = false;
     private boolean bBoolean = false;
+    private CheckBox checkBoxLife;
+    private CheckBox checkBoxRight;
 
     @Override
     protected int getLayout() {
@@ -105,10 +107,12 @@ public class PoiFragment extends BaseDialogFragment implements View.OnClickListe
     @Override
     protected void initView() {
         super.initView();
+
+
         poiDatabase = PoiDatabase.getInstance(getContext());
         poiDao = poiDatabase.getPoiDao();
-        CheckBox checkBoxLife = findViewById(R.id.check_pot_life);
+        checkBoxLife = findViewById(R.id.check_pot_life);
-        CheckBox checkBoxRight = findViewById(R.id.check_pot_right);
+        checkBoxRight = findViewById(R.id.check_pot_right);
         checkBoxLife.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -180,7 +184,23 @@ public class PoiFragment extends BaseDialogFragment implements View.OnClickListe
                 }
             }
         });
-
+        //禁用所有可操作控件
+      //  disables();
+    }
+//禁用所有可操作性控件
+    private void disables() {
+        checkBoxLife.setEnabled(false);
+        editNameContent.setEnabled(false);
+        tvExamine.setEnabled(false);
+        editSiteContent.setEnabled(false);
+        recyclerPhone.setEnabled(false);
+        ivPanorama.setEnabled(false);
+        ivName.setEnabled(false);
+        ivInternal.setEnabled(false);
+        ivCard.setEnabled(false);
+        ivElse.setEnabled(false);
+        editDescribe.setEnabled(false);
+        btnSaveLocal.setEnabled(false);
     }
 
     @Override

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

@@ -1,26 +1,73 @@
 package com.navinfo.outdoor.fragment;
 
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
+import android.widget.ImageView;
 
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.jcodecraeer.xrecyclerview.ArrowRefreshHeader;
+import com.jcodecraeer.xrecyclerview.ProgressStyle;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.adapter.TaskExplainAdapter2;
 import com.navinfo.outdoor.base.BaseFragment;
+import com.umeng.commonsdk.debug.D;
 
 /**
  * 记录-已提交-poi任务列表
  */
-public class PoiTaskFragment extends BaseFragment {
+public class PoiTaskFragment extends BaseFragment implements View.OnClickListener {
-
 
 
+    private ImageView ivPoiTaskFinish;
+    private XRecyclerView poiTaskXrv;
 
     @Override
     protected int getLayout() {
         return R.layout.fragment_poi_task;
     }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        ivPoiTaskFinish = (ImageView) findViewById(R.id.iv_poiTask_finish);
+        ivPoiTaskFinish.setOnClickListener(this::onClick);
+        poiTaskXrv = (XRecyclerView) findViewById(R.id.poiTask_xrv);
+        poiTaskXrv.setLayoutManager(new LinearLayoutManager(getContext()));
+        poiTaskXrv.addItemDecoration(new DividerItemDecoration(getContext(),DividerItemDecoration.VERTICAL));
+        poiTaskXrv.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
+        poiTaskXrv.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
+        //取消上拉加载，刷新功能。
+        poiTaskXrv.setPullRefreshEnabled(false);
+        poiTaskXrv.setLoadingMoreEnabled(false);
+
+        poiTaskXrv.getDefaultFootView().setNoMoreHint("加载完毕");
+        poiTaskXrv.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+
+            }
+
+            @Override
+            public void onLoadMore() {
+
+            }
+        });
+    }
+
+    @Override
+    protected void initData() {
+        super.initData();
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.iv_poiTask_finish:
+                getActivity().finish();
+                break;
+        }
+
+    }
 }

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

@@ -1,32 +1,16 @@
 package com.navinfo.outdoor.fragment;
 
 import android.content.Intent;
-import android.os.Bundle;
+import android.widget.Button;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.fragment.app.FragmentActivity;
 
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.PictureActivity;
-import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseFragment;
-import com.otaliastudios.cameraview.size.AspectRatio;
-import com.otaliastudios.cameraview.size.SizeSelectors;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 /**
  * 寻宝-点击上传弹窗-道路
@@ -34,7 +18,15 @@ import org.greenrobot.eventbus.ThreadMode;
 
 public class RoadFragment extends BaseFragment {
     private TextView tvPictures;
-    private EditText etHeight;
+    private EditText etRoadName;
+    private ImageView ivRoadPicture;
+    private RadioButton rbCar;
+    private RadioButton rbBicycle;
+    private RadioButton rbWalking;
+    private RadioButton rbManual;
+    private EditText etDesc;
+    private Button btnRoadSave;
+    private RadioGroup rgType;
 
 
     @Override
@@ -46,17 +38,31 @@ public class RoadFragment extends BaseFragment {
     protected void initView() {
         super.initView();
         tvPictures = (TextView) findViewById(R.id.tv_pictures);
-        etHeight = (EditText) findViewById(R.id.et_height);
         tvPictures.setOnClickListener(v -> {
-            String trim = etHeight.getText().toString().trim();
             Intent intent = new Intent(getContext(), PictureActivity.class);
-            if (trim != null) {
-                intent.putExtra("pic", trim);
-            }else {
-                intent.putExtra("pic", 1000);
-            }
             startActivity(intent);
         });
+        etRoadName = (EditText) findViewById(R.id.et_road_name);
+        ivRoadPicture = (ImageView) findViewById(R.id.iv_road_picture);
+        rbCar = (RadioButton) findViewById(R.id.rb_car);
+        rbBicycle = (RadioButton) findViewById(R.id.rb_bicycle);
+        rbWalking = (RadioButton) findViewById(R.id.rb_walking);
+        rbManual = (RadioButton) findViewById(R.id.rb_manual);
+        etDesc = (EditText) findViewById(R.id.et_desc);
+        btnRoadSave = (Button) findViewById(R.id.btn_road_save);
+        rgType = (RadioGroup) findViewById(R.id.rg_type);
+
+        //禁用可操作性控件
+       // disables();
+    }
+
+    private void disables() {
+        etRoadName.setEnabled(false);
+        rgType.setEnabled(false);
+        ivRoadPicture.setEnabled(false);
+        tvPictures.setEnabled(false);
+        etDesc.setEnabled(false);
+        btnRoadSave.setEnabled(false);
     }
 
     @Override

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

@@ -0,0 +1,39 @@
+package com.navinfo.outdoor.fragment;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.base.BaseFragment;
+
+/**
+ * 记录-已提交-道路任务列表的fragment
+ */
+public class RoadTaskFragment extends BaseFragment implements View.OnClickListener {
+
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_road_task;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+    }
+
+    @Override
+    protected void initData() {
+        super.initData();
+    }
+
+    @Override
+    public void onClick(View v) {
+
+    }
+}

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

@@ -1,21 +1,38 @@
 package com.navinfo.outdoor.fragment;
-
+import android.util.Log;
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
+import android.widget.Button;
-
+import android.widget.CheckBox;
+import android.widget.TextView;
+import android.widget.Toast;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import com.jcodecraeer.xrecyclerview.ProgressStyle;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
+import com.kongzue.dialog.interfaces.OnMenuItemClickListener;
+import com.kongzue.dialog.v3.BottomMenu;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.adapter.StaySubmitAdapter;
+import com.navinfo.outdoor.api.UserApplication;
 import com.navinfo.outdoor.base.BaseFragment;
+import com.navinfo.outdoor.room.PoiDao;
+import com.navinfo.outdoor.room.PoiDatabase;
+import com.navinfo.outdoor.room.PoiEntity;
+import java.util.List;
 
 /**
  * 记录-待提交的fragment
  */
 public class StaySubmitFragment extends BaseFragment implements View.OnClickListener {
-
+    private XRecyclerView stayXrv;
+    private CheckBox cbSelect;
+    private TextView tvDelete;
+    private Button btnStaySubmit;
+    private StaySubmitAdapter staySubmitAdapter;
+    private PoiDatabase poiDatabase;
+    private PoiDao poiDao;
+    private TextView tvStayType;
+    private TextView tvStayResult;
 
     @Override
     protected int getLayout() {
@@ -25,15 +42,66 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
     @Override
     protected void initView() {
         super.initView();
+        poiDatabase = PoiDatabase.getInstance(getContext());
+        poiDao = poiDatabase.getPoiDao();
+        ConstraintLayout clStayType = findViewById(R.id.cl_stay_type);
+        clStayType.setOnClickListener(this::onClick);
+        tvStayType = findViewById(R.id.tv_stay_type);
+        tvStayResult = findViewById(R.id.tv_stay_result);
+        tvStayResult.setOnClickListener(this::onClick);
+        stayXrv = (XRecyclerView) findViewById(R.id.stay_xrv);
+        cbSelect = (CheckBox) findViewById(R.id.cb_select);
+        tvDelete = (TextView) findViewById(R.id.tv_delete);
+        btnStaySubmit = (Button) findViewById(R.id.btn_stay_submit);
+        stayXrv.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
+        stayXrv.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
+        stayXrv.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
+        //取消上拉加载，刷新功能。
+        stayXrv.setPullRefreshEnabled(false);
+        stayXrv.setLoadingMoreEnabled(false);
+        staySubmitAdapter = new StaySubmitAdapter(getContext());
+        stayXrv.setAdapter(staySubmitAdapter);
+        stayXrv.getDefaultFootView().setNoMoreHint("加载完毕");
+        stayXrv.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+
+            }
+
+            @Override
+            public void onLoadMore() {
+
+            }
+        });
     }
 
     @Override
     protected void initData() {
         super.initData();
+
     }
 
     @Override
     public void onClick(View v) {
-
+        switch (v.getId()) {
+            case R.id.tv_stay_result:
+                Toast.makeText(getContext(), "点击了", Toast.LENGTH_SHORT).show();
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        List<PoiEntity> allPoi = poiDao.getAllPoi();
+                        Log.d("TAG", "run: " + allPoi.toString());
+                    }
+                }).start();
+                break;
+            case R.id.cl_stay_type:
+//                BottomMenu.show(UserApplication.getUserApplication(), new String[]{"poi", "道路", "充电站", "其他"}, new OnMenuItemClickListener() {
+//                    @Override
+//                    public void onClick(String text, int index) {
+//                        tvStayType.setText(text);
+//                    }
+//                });
+                break;
+        }
     }
 }

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

@@ -49,6 +49,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
         taskExplain2Recycler = findViewById(R.id.task_explain2_recycler);
         ivTaskExplain2.setOnClickListener(this::onClick);
         taskExplain2Recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+        //下划线
         taskExplain2Recycler.addItemDecoration(new DividerItemDecoration(getActivity(),DividerItemDecoration.VERTICAL));
         taskExplain2Recycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
         taskExplain2Recycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);

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

@@ -19,7 +19,11 @@
             android:id="@+id/iv_poi"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="20dp"
             android:src="@drawable/poi_square"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tv_poi"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -34,7 +38,6 @@
             app:layout_constraintTop_toTopOf="@id/iv_poi" />
 
         <LinearLayout
-            android:id="@+id/linearLayout3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -42,6 +45,7 @@
             app:layout_constraintLeft_toLeftOf="@id/tv_poi"
             app:layout_constraintTop_toBottomOf="@id/tv_poi">
 
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -85,56 +89,61 @@
         </LinearLayout>
 
         <ImageView
+            android:id="@+id/imageView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15dp"
             android:src="@drawable/icon_arrow_right"
             app:layout_constraintBottom_toBottomOf="@id/iv_poi"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintRight_toRightOf="@id/has_submit_view"
             app:layout_constraintTop_toTopOf="@id/iv_poi" />
 
         <View
+            android:id="@+id/has_submit_view"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="10dp"
             android:background="@color/colormap"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/iv_poi" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_charging"
+        android:id="@+id/cl_road"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-            android:id="@+id/iv_charging"
+            android:id="@+id/iv_road"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/road_square"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintLeft_toLeftOf="@id/view4"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            />
 
         <TextView
-            android:id="@+id/tv_charging"
+            android:id="@+id/tv_road"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:text="道路任务列表"
             android:textColor="@color/black"
-            app:layout_constraintLeft_toRightOf="@id/iv_charging"
+            app:layout_constraintLeft_toRightOf="@id/iv_road"
-            app:layout_constraintTop_toTopOf="@id/iv_charging" />
+            app:layout_constraintTop_toTopOf="@id/iv_road" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="@id/iv_charging"
+            app:layout_constraintBottom_toBottomOf="@id/iv_road"
-            app:layout_constraintLeft_toLeftOf="@id/tv_charging"
+            app:layout_constraintLeft_toLeftOf="@id/tv_road"
-            app:layout_constraintTop_toBottomOf="@id/tv_charging">
+            app:layout_constraintTop_toBottomOf="@id/tv_road">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -179,56 +188,57 @@
         </LinearLayout>
 
         <ImageView
+            android:id="@+id/imageView2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15dp"
             android:src="@drawable/icon_arrow_right"
-            app:layout_constraintBottom_toBottomOf="@id/iv_charging"
+            app:layout_constraintBottom_toBottomOf="@id/iv_road"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintRight_toRightOf="@id/view4"
-            app:layout_constraintTop_toTopOf="@id/iv_charging" />
+            app:layout_constraintTop_toTopOf="@id/iv_road" />
 
         <View
+            android:id="@+id/view4"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="10dp"
             android:background="@color/colormap"
-            app:layout_constraintTop_toBottomOf="@+id/iv_charging" />
+            app:layout_constraintTop_toBottomOf="@+id/iv_road" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_road"
+        android:id="@+id/cl_charging"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
+        >
-        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-            android:id="@+id/iv_road"
+            android:id="@+id/iv_charging"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/charge_square"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="@id/view5"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/tv_road"
+            android:id="@+id/tv_charging"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:text="充电站任务列表"
             android:textColor="@color/black"
-            app:layout_constraintLeft_toRightOf="@id/iv_road"
+            app:layout_constraintLeft_toRightOf="@id/iv_charging"
-            app:layout_constraintTop_toTopOf="@id/iv_road" />
+            app:layout_constraintTop_toTopOf="@id/iv_charging" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="@id/iv_road"
+            app:layout_constraintBottom_toBottomOf="@id/iv_charging"
-            app:layout_constraintLeft_toLeftOf="@id/tv_road"
+            app:layout_constraintLeft_toLeftOf="@id/tv_charging"
-            app:layout_constraintTop_toBottomOf="@id/tv_road">
+            app:layout_constraintTop_toBottomOf="@id/tv_charging">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -273,21 +283,23 @@
         </LinearLayout>
 
         <ImageView
+            android:id="@+id/imageView3"
             android:layout_width="wrap_content"
+
             android:layout_height="wrap_content"
-            android:layout_marginRight="15dp"
             android:src="@drawable/icon_arrow_right"
-            app:layout_constraintBottom_toBottomOf="@id/iv_road"
+            app:layout_constraintBottom_toBottomOf="@id/iv_charging"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintRight_toRightOf="@id/view5"
-            app:layout_constraintTop_toTopOf="@id/iv_road" />
+            app:layout_constraintTop_toTopOf="@id/iv_charging" />
 
         <View
+            android:id="@+id/view5"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="10dp"
             android:background="@color/colormap"
-            app:layout_constraintTop_toBottomOf="@+id/iv_road" />
+            app:layout_constraintTop_toBottomOf="@+id/iv_charging" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -295,7 +307,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
 
         app:layout_constraintTop_toTopOf="parent">
 
@@ -304,17 +315,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/other_square"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintLeft_toLeftOf="@id/other_audit_view"
+           app:layout_constraintTop_toTopOf="parent"
+            />
 
         <TextView
             android:id="@+id/tv_other"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
+            android:layout_marginEnd="245dp"
             android:text="其他任务列表"
             android:textColor="@color/black"
-            app:layout_constraintLeft_toRightOf="@id/iv_other"
+          app:layout_constraintLeft_toRightOf="@+id/iv_other"
             app:layout_constraintTop_toTopOf="@id/iv_other" />
 
         <LinearLayout
@@ -323,7 +337,7 @@
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="@id/iv_other"
             app:layout_constraintLeft_toLeftOf="@id/tv_other"
-            app:layout_constraintTop_toBottomOf="@id/tv_other">
+            >
 
             <TextView
                 android:layout_width="wrap_content"
@@ -368,20 +382,23 @@
         </LinearLayout>
 
         <ImageView
+            android:id="@+id/imageView4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15dp"
             android:src="@drawable/icon_arrow_right"
             app:layout_constraintBottom_toBottomOf="@id/iv_other"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintRight_toRightOf="@id/other_audit_view"
             app:layout_constraintTop_toTopOf="@id/iv_other" />
 
         <View
+            android:id="@+id/other_audit_view"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:background="@color/colormap"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/iv_other" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -1,14 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".fragment.PoiTaskFragment">
 
-    <!-- TODO: Update blank fragment layout -->
+    <LinearLayout
-    <TextView
+        android:id="@+id/rl_poiTask"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:text="@string/hello_blank_fragment" />
+        android:background="@color/colorPrimaryBlue"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/top_pind_sp"
+        app:layout_constraintBottom_toTopOf="@+id/poiTask_xrv"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-</FrameLayout>
+        <ImageView
+            android:id="@+id/iv_poiTask_finish"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/ic_baseline_arrow" />
+
+        <TextView
+            android:id="@+id/tv_poiTask_title"
+            style="@style/toolbar_style"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:gravity="center"
+            android:text="POI任务列表" />
+    </LinearLayout>
+
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/poiTask_xrv"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_poiTask" />
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -119,26 +119,31 @@
             android:layout_marginTop="15dp"
             app:layout_constraintTop_toBottomOf="@id/tv_mode">
 <RadioGroup
+    android:id="@+id/rg_type"
     android:layout_width="match_parent"
     android:orientation="horizontal"
     android:layout_gravity="center_horizontal"
     android:layout_height="wrap_content">
     <RadioButton
+        android:id="@+id/rb_car"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:text="车行"/>
     <RadioButton
+        android:id="@+id/rb_bicycle"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
         android:text="自行车"/>
     <RadioButton
+        android:id="@+id/rb_walking"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:text="步行"/>
     <RadioButton
+        android:id="@+id/rb_manual"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
@@ -185,13 +190,13 @@
                 android:textColor="@color/white"
                 android:textSize="15sp" />
 
-            <EditText
+<!--            <EditText-->
-                android:id="@+id/et_height"
+<!--                android:id="@+id/et_height"-->
-                android:layout_width="wrap_content"
+<!--                android:layout_width="wrap_content"-->
-                android:layout_height="wrap_content"
+<!--                android:layout_height="wrap_content"-->
-                android:layout_marginLeft="10dp"
+<!--                android:layout_marginLeft="10dp"-->
-                android:hint="请输入高度"
+<!--                android:hint="请输入高度"-->
-                android:inputType="number" />
+<!--                android:inputType="number" />-->
 
 
         </LinearLayout>
@@ -221,6 +226,7 @@
                 android:textSize="16sp" />
 
             <EditText
+                android:id="@+id/et_desc"
                 android:layout_width="320dp"
                 android:layout_height="100dp"
                 android:layout_gravity="center_horizontal"
@@ -240,6 +246,7 @@
             app:layout_constraintTop_toBottomOf="@id/ll_desc">
 
             <Button
+                android:id="@+id/btn_road_save"
                 style="@style/user_data_style"
                 android:layout_width="150dp"
                 android:layout_height="wrap_content"
@@ -247,6 +254,7 @@
                 android:text="保存本地" />
 
             <Button
+                android:id="@+id/road_upload"
                 android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".fragment.RoadTaskFragment">
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

@@ -1,43 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".fragment.StaySubmitFragment">
-<TextView
+
-    android:id="@+id/tv_type"
+    <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="wrap_content"
+        android:id="@+id/cl_stay_type"
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:text="类型"
+        android:layout_height="100dp"
-    android:textColor="@color/black"
+        app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
-    android:layout_marginTop="20dp"
+
-    android:layout_marginLeft="10dp"/>
+        <TextView
+            style="@style/text_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="类型"
+            app:layout_constraintBottom_toTopOf="@+id/tv_stay_type"
+            app:layout_constraintStart_toStartOf="@+id/tv_stay_type" />
+
+        <TextView
+            android:id="@+id/tv_stay_type"
+            style="@style/main_about_text_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:text="全部"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.65" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="20dp"
+            android:background="@drawable/ic_baseline_arrow_forward"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/colormap"
+            app:layout_constraintBottom_toBottomOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
+        android:id="@+id/ll_results"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cl_stay_type">
+        <TextView
+            android:id="@+id/tv_stay_result"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:text="筛选结果"
+            android:textSize="25sp"
+            android:textStyle="bold" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.jcodecraeer.xrecyclerview.XRecyclerView
+                android:id="@+id/stay_xrv"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_del"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_type">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ll_results">
 
-        <TextView
+        <CheckBox
+            android:id="@+id/cb_select"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_margin="15dp"
-            android:text="全部"
+            android:text="全选"
-            android:textColor="@color/black"
+            android:textSize="17sp" />
-            android:textSize="20dp" />
 
-<!--        <ImageView-->
+        <TextView
-<!--            android:layout_width="wrap_content"-->
+            android:id="@+id/tv_delete"
-<!--            android:layout_height="wrap_content"-->
+            android:layout_width="wrap_content"
-<!--            android:layout_gravity="right"-->
+            android:layout_height="wrap_content"
-<!--            android:src="@drawable/icon_arrow_right"/>-->
+            android:layout_margin="15dp"
+            android:text="删除"
+            android:textColor="@color/colorPrimaryBlue"
+            android:textSize="18sp"/>
     </LinearLayout>
 
-
+    <Button
-
+        android:id="@+id/btn_stay_submit"
+        style="@style/user_data_style"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:text="提交"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ll_del" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_margin="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+<LinearLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent">
+    <TextView
+        android:id="@+id/tv_cs1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="测试1"
+        android:textSize="15sp" />
+    <TextView
+        android:id="@+id/tv_day"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2021-05-08  13:24:36"
+        android:layout_margin="10dp"
+        app:layout_constraintTop_toBottomOf="@id/tv_cs1"/>
+</LinearLayout>
+        <CheckBox
+            android:id="@+id/cb_all"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintRight_toRightOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>