修改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/AndroidManifest.xml

@@ -56,12 +56,13 @@
         <meta-data
             android:name="TencentMapSDK"
             android:value="EWWBZ-2PB62-6JXUL-CEX7G-N7UE6-XRB4V" />
+        <!--今日头屏幕适配-->
         <meta-data
             android:name="design_width_in_dp"
-            android:value="480" />
+            android:value="360" />
         <meta-data
             android:name="design_height_in_dp"
-            android:value="800" />
+            android:value="640" />
 
         <activity android:name=".activity.MainActivity"
             android:screenOrientation="portrait">

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

@@ -113,6 +113,8 @@ public class JobSearchBean implements Serializable {
              * price : 通过
              * type :
              * dist :
+             * memo=任务备注3714,
+             * endDate=
              */
 
             private int id;
@@ -123,6 +125,24 @@ public class JobSearchBean implements Serializable {
             private String price;
             private String type;
             private String dist;
+            private String memo;
+            private String endDate;
+
+            public String getMemo() {
+                return memo;
+            }
+
+            public void setMemo(String memo) {
+                this.memo = memo;
+            }
+
+            public String getEndDate() {
+                return endDate;
+            }
+
+            public void setEndDate(String endDate) {
+                this.endDate = endDate;
+            }
 
             public int getId() {
                 return id;

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

@@ -42,6 +42,24 @@ public class ReceivedBean {
         private Integer type;
         private String name;
         private Integer isExclusive;
+        private String memo;
+        private String endDate;
+
+        public String getMemo() {
+            return memo;
+        }
+
+        public void setMemo(String memo) {
+            this.memo = memo;
+        }
+
+        public String getEndDate() {
+            return endDate;
+        }
+
+        public void setEndDate(String endDate) {
+            this.endDate = endDate;
+        }
 
         public Integer getSptype() {
             return sptype;

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

@@ -1,7 +1,7 @@
 package com.navinfo.outdoor.bean;
 
 /**
- *普通任务
+ * 普通任务
  */
 public class ReceivedPoiBean {
 
@@ -47,6 +47,8 @@ public class ReceivedPoiBean {
          * type : 5
          * name : 启明星辰大厦(西门)
          * isExclusive : 0
+         *  memo;
+         *  endDate;
          */
         private int id;
         private String address;
@@ -54,6 +56,24 @@ public class ReceivedPoiBean {
         private int type;
         private String name;
         private int isExclusive;
+        private String memo;
+        private String endDate;
+
+        public String getMemo() {
+            return memo;
+        }
+
+        public void setMemo(String memo) {
+            this.memo = memo;
+        }
+
+        public String getEndDate() {
+            return endDate;
+        }
+
+        public void setEndDate(String endDate) {
+            this.endDate = endDate;
+        }
 
         public int getId() {
             return id;

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

@@ -46,6 +46,8 @@ public class TaskByNetBean {
          * price : 4.860135
          * type : 4
          * isExclusive : 0
+         * memo
+         * endDate
          */
 
         private String name;
@@ -54,6 +56,24 @@ public class TaskByNetBean {
         private double price;
         private int type;
         private int isExclusive;
+        private String memo;
+        private String endDate;
+
+        public String getMemo() {
+            return memo;
+        }
+
+        public void setMemo(String memo) {
+            this.memo = memo;
+        }
+
+        public String getEndDate() {
+            return endDate;
+        }
+
+        public void setEndDate(String endDate) {
+            this.endDate = endDate;
+        }
 
         public String getName() {
             return name;

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

@@ -457,7 +457,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             latLng.setLongitude(Double.parseDouble(x));
         }
         initPhone();
-        String describe = showPoiEntity.getDescribe();//任务描述
+        String describe = showPoiEntity.getMemo();//任务描述
         if (describe != null && !describe.equals("")) {
             editDescribe.setText(describe);
         }
@@ -871,7 +871,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                             }
                             String describe = editDescribe.getText().toString().trim();
                             if (describe != null && !describe.equals("")) {
-                                poiEntity.setDescribe(describe);
+                                poiEntity.setMemo(describe);
                             }
                             boolean phoneBean = contactView.getPhoneBean();
                             if (phoneBean) {
@@ -1106,7 +1106,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         }
         String describe = editDescribe.getText().toString().trim();
         if (describe != null && !describe.equals("")) {
-            poiEntity.setDescribe(describe);
+            poiEntity.setMemo(describe);
         }
         boolean phoneBean = contactView.getPhoneBean();
         if (phoneBean) {
@@ -1184,7 +1184,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         }
         String describe = editDescribe.getText().toString().trim();
         if (describe != null && !describe.equals("")) {
-            poiEntity.setDescribe(describe);
+            poiEntity.setMemo(describe);
         }
         boolean phoneBean = contactView.getPhoneBean();
         if (phoneBean) {

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

@@ -119,10 +119,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                     tvMoney.setText("￥" + poiEntity.getPrecision());
                 }
                 if (poiEntity !=null){
-                    if (poiEntity.getMemo()!=null&&!"".equals(poiEntity.getMemo())) {
+                    if (poiEntity.getDescribe()!=null&&!"".equals(poiEntity.getDescribe())) {
-                        tvDescribe.setText("任务描述:" + poiEntity.getMemo());
+                        tvDescribe.setText("任务描述:" + poiEntity.getDescribe());
                     }
-                    if (poiEntity.getMemo()!=null&&!"".equals(poiEntity.getCreateTime())) {
+                    if (poiEntity.getCreateTime()!=null&&!"".equals(poiEntity.getCreateTime())) {
                         tvTime.setText("到期时间:" + poiEntity.getCreateTime());
                     }
                 }
@@ -315,6 +315,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                 chargingStationEntity.setTaskId(taskId);
                                 chargingStationEntity.setStation_type(stationBean.getSptype());
                                 chargingStationEntity.setName(stationBean.getName());
+                                chargingStationEntity.setDescribe(stationBean.getMemo());
+                                chargingStationEntity.setCreateTime(stationBean.getEndDate());
                                 chargingStationEntity.setPrecision(stationBean.getPrice() + "");
                                 chargingStationEntity.setAddress(stationBean.getAddress());
                                 chargingStationEntity.setTelPhone(stationBean.getTelephone() + "");
@@ -641,6 +643,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                             PoiEntity poiListEntity = new PoiEntity();
                             poiListEntity.setTaskId(listBean.getId());
                             poiListEntity.setName(listBean.getName());
+                            poiListEntity.setDescribe(listBean.getMemo());
+                            poiListEntity.setCreateTime(listBean.getEndDate());
                             poiListEntity.setAddress(listBean.getAddress());
                             poiListEntity.setType(Integer.valueOf(listBean.getType()));
                             poiListEntity.setIsExclusive(listBean.getIsExclusive());
@@ -737,6 +741,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                             if (listBean!=null){
                                 poiListEntity.setTaskId(taskId);
                                 poiListEntity.setName(listBean.getName());
+                                poiListEntity.setDescribe(listBean.getMemo());
+                                poiListEntity.setCreateTime(listBean.getEndDate());
                                 poiListEntity.setAddress(listBean.getAddress());
                                 poiListEntity.setType(Integer.valueOf(listBean.getType()));
                                 poiListEntity.setPrecision(String.valueOf(listBean.getPrice()));

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

@@ -287,7 +287,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 latLng.setLongitude(Double.parseDouble(x));
                 latLng.setLatitude(Double.parseDouble(y));
             }
-            String describe = showPoiEntity.getDescribe();//任务描述
+            String describe = showPoiEntity.getMemo();//任务描述
             if (describe != null && !describe.equals("")) {
                 editOtherDescribe.setText(describe);
             }
@@ -392,7 +392,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                             }
                             String describe = editOtherDescribe.getText().toString().trim();
                             if (describe != null&&!describe.equals("")) {
-                                poiEntity.setDescribe(describe);
+                                poiEntity.setMemo(describe);
                             }
                             String tagPicture = (String) ivPicture.getTag();
                             if (tagPicture == null) {
@@ -500,7 +500,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
         httpParams.put("existence", poiEntity.getExistence());
         httpParams.put("geo", poiEntity.getGeoWkt());
         httpParams.put("memo", poiEntity.getMemo());
-
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
                 .url(HttpInterface.SUBMIT_OTHER_TASK)
@@ -567,7 +566,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
         }
         String describe = editOtherDescribe.getText().toString().trim();
         if (describe != null && !describe.equals("")) {
-            poiEntity.setDescribe(describe);
+            poiEntity.setMemo(describe);
         }
         String tagPicture = (String) ivPicture.getTag();
         if (tagPicture != null && !tagPicture.equals("")) {

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

@@ -352,9 +352,9 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
         }
         initPhone();
 
-        String describe = showPoiEntity.getDescribe();//任务描述
+        String memo = showPoiEntity.getMemo();//任务描述
-        if (describe != null && !describe.equals("")) {
+        if (memo != null && !memo.equals("")) {
-            editDescribe.setText(describe);
+            editDescribe.setText(memo+"");
         }
         String telPhone = showPoiEntity.getTelPhone();
         if (telPhone != null && !telPhone.equals("")) {
@@ -644,9 +644,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                                 poiEntity.setX(String.valueOf(latLng.longitude));
                                 poiEntity.setY(String.valueOf(latLng.latitude));
                             }
+
                             String describe = editDescribe.getText().toString().trim();
                             if (describe != null && !describe.equals("")) {
-                                poiEntity.setDescribe(describe);
+                                poiEntity.setMemo(describe);
                             }
                             boolean phoneBean = contactView.getPhoneBean();
                             if (phoneBean) {
@@ -770,6 +771,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
         httpParams.put("existence", poiEntity.getExistence());
         httpParams.put("geo", poiEntity.getGeoWkt());
         httpParams.put("memo", poiEntity.getMemo());
+        httpParams.put("telephone", poiEntity.getTelPhone());
         OkGoBuilder.getInstance()
                 .Builder(getActivity())
                 .url(HttpInterface.SUBMIT_POI_TASK)
@@ -842,7 +844,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
         }
         String describe = editDescribe.getText().toString().trim();
         if (describe != null && !describe.equals("")) {
-            poiEntity.setDescribe(describe);
+            poiEntity.setMemo(describe);
         }
         boolean phoneBean = contactView.getPhoneBean();
         if (phoneBean) {

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

@@ -207,9 +207,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             }
             int work_type = showPoiEntity.getWork_type();
             showPictureType(work_type);
-            String describe = showPoiEntity.getDescribe();//任务描述
+            String describe = showPoiEntity.getMemo();//任务描述
             if (describe != null && !describe.equals("")) {
-                etDesc.setText(describe);
+                etDesc.setText(describe+"");
             }
             String photo = showPoiEntity.getPhoto();
             if (photo != null) {
@@ -360,7 +360,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                             }
                             String desc = etDesc.getText().toString().trim();
                             if (desc != null && !desc.equals("")) {
-                                poiEntity.setDescribe(desc);
+                                poiEntity.setMemo(desc);
                             }
                             if (showPoiEntity != null) {
                                 if (showPoiEntity.getTaskId() != 0) {
@@ -580,7 +580,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         }
         String desc = etDesc.getText().toString().trim();
         if (desc != null && !desc.equals("")) {
-            poiEntity.setDescribe(desc);
+            poiEntity.setMemo(desc);
         }
         DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar calendar = Calendar.getInstance();

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

@@ -279,6 +279,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                 poiListEntity.setTelPhone(listBean.getTelephone() + "");
                                 poiListEntity.setPrecision(listBean.getPrice());
                                 poiListEntity.setDist(listBean.getDist());
+                                poiListEntity.setDescribe(listBean.getMemo());
+                                poiListEntity.setCreateTime(listBean.getEndDate());
                                 poiListEntity.setType(Integer.valueOf(listBean.getType()));
                                 String geo = listBean.getGeo();
                                 poiListEntity.setGeoWkt(geo);
@@ -889,6 +891,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 if (markerPile!=null){
                     markerPile.remove();
                 }
+                bigMarker.setVisible(false);
             }
         } else if (data.what == Constant.MAIN_BUTTON_VISIABLE) {//控制主界面各个按钮显隐状态的what值
             setMainButtonVisiable((Integer) data.obj);

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

@@ -47,12 +47,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
     private ArrayList<NameAuthenticationBean> authenticationBeans;
     private EditText etAttestationName;
     private EditText etNamePhone;
-    private String takePhotoPath1;//身份证正面照片路径
-    private String takePhotoPath2;//身份证反面照片路径
     private ImageView ivAttestation3;
-    private String takePhotoPath3;
-    private ArrayList<File> takePhoneList;
-    private String attestationName;
     private ImageView ivHera1;
     private TextView tvCard1;
     private ImageView ivHera2;
@@ -123,26 +118,6 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
                 startActivityForResult(ivAttestation3, 300);
                 break;
             case R.id.btn_attestation:
-                /**
-                 * static boolean ChineseNameTest(String name) {
-                 * if (!name.matches("[\u4e00-\u9fa5]{2,4}")) {
-                 * System.out.println("只能输入2到4个汉字");
-                 * return false;
-                 * }else return true;
-                 * }
-                 */
-                if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) {
-                    Toast.makeText(getContext(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                if (!chineseNameTest(etAttestationName.getText().toString())){
-                    Toast.makeText(getActivity(), "请输入中文名字", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                if (!checkNum(etNamePhone.getText().toString().trim())) {
-                    Toast.makeText(getContext(), "身份证号错误，请重新输入", Toast.LENGTH_SHORT).show();
-                    return;
-                }
                 nameAuthentication();
                 break;
         }
@@ -160,29 +135,39 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
         else return true;
 
     }
-    static boolean chineseNameTest(String name) {
+
-        if (!name.matches("[\u4e00-\u9fa5]{2,4}")) {
-            System.out.println("只能输入2到4个汉字");
-            return false;
-        }else return true;
-    }
     private void nameAuthentication() {
-        showLoadingDialog();
+        if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) {
-        takePhoneList = new ArrayList<>();
+            Toast.makeText(getContext(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show();
-        File takePhotoFile1 = new File(takePhotoPath1);
-        File takePhotoFile2 = new File(takePhotoPath2);
-        File takePhotoFile3 = new File(takePhotoPath3);
-        if (!takePhotoFile1.exists() || !takePhotoFile2.exists() || !takePhotoFile3.exists()) {
-            Toast.makeText(getContext(), "身份证照片不能为空", Toast.LENGTH_SHORT).show();
             return;
         }
-        takePhoneList.add(takePhotoFile1);
+        if (!checkNum(etNamePhone.getText().toString().trim())) {
-        takePhoneList.add(takePhotoFile2);
+            Toast.makeText(getContext(), "身份证错误，请重新输入", Toast.LENGTH_SHORT).show();
-        takePhoneList.add(takePhotoFile3);
+            return;
-        attestationName = etAttestationName.getText().toString().trim();
+        }
+        if (ivAttestation1.getTag() == null) {
+            Toast.makeText(getContext(), "请拍照  身份证人像面", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (ivAttestation2.getTag() == null) {
+            Toast.makeText(getContext(), "请拍照  身份证国徽面", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (ivAttestation3.getTag() == null) {
+            Toast.makeText(getContext(), "请拍照  手持身份证", Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        ArrayList<File> takePhoneList = new ArrayList<>();
+        String takePhotoPath1 = (String) ivAttestation1.getTag();
+        takePhoneList.add(new File(takePhotoPath1));
+        String takePhotoPath2 = (String) ivAttestation2.getTag();
+        takePhoneList.add(new File(takePhotoPath2));
+        String takePhotoPath3 = (String) ivAttestation3.getTag();
+        takePhoneList.add(new File(takePhotoPath3));
+        String attestationName = etAttestationName.getText().toString().trim();
         String namePhone = etNamePhone.getText().toString().trim();
-
+        showLoadingDialog();
-
         OkGo
                 // 请求方式和请求url
                 .<NameAuthenticationBean>post(HttpInterface.USER_AUTH_ADD)
@@ -196,20 +181,21 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
                     @Override
                     public void onSuccess(Response<NameAuthenticationBean> response) {
                         dismissLoadingDialog();
+
+
                         Log.d("TAG", "onSuccess: " + response.toString() + "sssssssssssss");
-                        if (response.body().equals("200")) {
+                        if (response.body().equals("0")) {
-                            DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+                            MessageDialog.show((AppCompatActivity) getActivity(), "提示", "不通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
-                            MessageDialog.show((AppCompatActivity) getActivity(), "提示", "通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                                 @Override
                                 public boolean onClick(BaseDialog baseDialog, View v) {
+                                    // Toast.makeText(getContext(), "点击了确定", Toast.LENGTH_SHORT).show();
                                     //传值给持卡人
                                     Constant.USER_ATTESTATION_NAME = attestationName;
                                     return false;
                                 }
                             });
                         } else {
-                            DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+                            MessageDialog.show((AppCompatActivity) getActivity(), "提示", "通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
-                            MessageDialog.show((AppCompatActivity) getActivity(), "提示", "不通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                                 @Override
                                 public boolean onClick(BaseDialog baseDialog, View v) {
                                     Constant.USER_ATTESTATION_NAME = attestationName;
@@ -249,7 +235,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
                 });
             } else {
 
-                takePhotoPath1 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
+                String takePhotoPath1 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
                 ivAttestation1.setTag(takePhotoPath1);
                 ivAttestation1.setImageBitmap(bitmap);//显示图像
                 ivHera1.setVisibility(View.GONE);
@@ -272,7 +258,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
                     }
                 });
             } else {
-                takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
+                String takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
                 ivAttestation2.setTag(takePhotoPath2);
                 ivAttestation2.setImageBitmap(bitmap);//显示图像
                 ivHera2.setVisibility(View.GONE);
@@ -295,8 +281,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
                     }
                 });
             } else {
-
+                String takePhotoPath3 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
-                takePhotoPath3 = PhotoPathUtil.getTakePhotoPath(data, "a", "");
                 ivAttestation3.setTag(takePhotoPath3);
                 ivAttestation3.setImageBitmap(bitmap);//显示图像
                 ivHera3.setVisibility(View.GONE);

app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java

@@ -26,7 +26,7 @@ public class PoiEntity implements Serializable {
     private int userId;//用户id
     private String createTime; //创建时间/采集时间
     private String name;//名称
-    private String describe;//任务描述
+    private String describe;//任务描述  用于存储网络下发的memo备注
     private String address;//地址
     private String telPhone;//电话
     private String memo;//备注

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

@@ -145,6 +145,7 @@ public class PoiSaveUtils {
             httpParams.put("existence", poiEntity.getExistence());
             httpParams.put("geo", poiEntity.getGeoWkt());
             httpParams.put("memo", poiEntity.getMemo());
+            httpParams.put("telephone", poiEntity.getTelPhone());
             url = HttpInterface.SUBMIT_POI_TASK;
         } else if (poiEntity.getType() == 2) {
             httpParams.put("taskId", poiEntity.getTaskId());

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

@@ -61,8 +61,8 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="40dp"
+        android:layout_marginRight="35dp"
-        android:layout_marginRight="40dp"
+        android:layout_marginLeft="35dp"
         android:background="@color/colorHui"
         app:layout_constraintTop_toBottomOf="@id/et_login_name"
         app:layout_constraintLeft_toLeftOf="@id/et_login_name"/>
@@ -98,9 +98,9 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginRight="35dp"
+        android:layout_marginLeft="35dp"
         android:background="@color/colorHui"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
         app:layout_constraintTop_toBottomOf="@id/et_login_paw"
         app:layout_constraintLeft_toLeftOf="@id/et_login_paw"/>