修改手机号验证的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/fragment/FilterFragment.java

@@ -72,7 +72,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
     }
 
     private void initHeader() {
-        View header = findViewById(R.id.frame_header);
+        View header = mView.findViewById(R.id.frame_header);
         header.findViewById(R.id.iv_filter_final).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -1,6 +1,7 @@
 package com.navinfo.outdoor.fragment;
 
 import android.os.Bundle;
+import android.os.CountDownTimer;
 import android.os.Message;
 import android.view.View;
 import android.widget.Button;
@@ -18,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.RegexUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -30,6 +32,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
     private EditText etForgetPawPhone, etForgetPawNote, etForgetPawPaw, etForgetPawConfirmPaw;
     private Button btnForgetPaw;
     private String sessionId;
+    private CountDownTimer timer;
 
     public static ForgetPawFragment newInstance(Bundle bundle) {
         ForgetPawFragment fragment = new ForgetPawFragment();
@@ -64,7 +67,12 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
                 getActivity().finish();
                 break;
             case R.id.forgetPaw_get_note:
+                if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())){
+                    Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show();
+                }else {
                     initGetNote();
+                }
+
                 break;
             case R.id.btn_forgetPaw:
                 initForgetPaw();
@@ -75,8 +83,8 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
     private void initForgetPaw() {
         HttpParams httpParams = new HttpParams();
         String mobile = etForgetPawPhone.getText().toString().trim();
-        if (mobile == null || mobile.equals("")) {
+        if (!RegexUtil.isPhone(mobile)) {
-            Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getContext(), "手机号输入错误", Toast.LENGTH_SHORT).show();
             return;
         } else {
             httpParams.put("mobile", mobile);
@@ -141,7 +149,26 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
                     }
                 });
     }
+    private void registerNote() {
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+        forgetPawGetNote.setEnabled(false);
+        timer = new CountDownTimer(60 * 1000, 1000) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+                forgetPawGetNote.setText(millisUntilFinished / 1000 + "秒后重新获取验证码");
+            }
 
+            @Override
+            public void onFinish() {
+                forgetPawGetNote.setEnabled(true);
+                forgetPawGetNote.setText("重新发送");
+            }
+        };
+        timer.start();
+    }
     private void initGetNote() {
         HttpParams httpParams = new HttpParams();
         String mobile = etForgetPawPhone.getText().toString().trim();

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

@@ -139,6 +139,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
             initViewByTaskStatus(taskStatus);
         }
     }
+
     /**
      * 保存小数点后两位
      *
@@ -470,6 +471,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     });
                                 }
                             }).start();
+                        } else {
+                            Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
                         }
                     }
 
@@ -521,6 +524,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                 }
                             }).start();
 
+                        } else {
+                            Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
                         }
                     }
 
@@ -562,6 +567,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity);
                                 }
                             }).start();
+                        }else {
+                            Toast.makeText(getContext(), ""+response.getMessage(), Toast.LENGTH_SHORT).show();
                         }
                     }
 
@@ -602,6 +609,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                 }
                             }).start();
 
+                        }else {
+                            Toast.makeText(getContext(), ""+response.getMessage(), Toast.LENGTH_SHORT).show();
                         }
                     }
 
@@ -677,7 +686,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                             getActivity().runOnUiThread(new Runnable() {
                                                 @Override
                                                 public void run() {
-                                                    initViewByTaskStatus(1);
+                                                    initViewByTaskStatus(1);//已领取
                                                     if (isSaver) {
                                                         Message obtain = Message.obtain();
                                                         obtain.what = Constant.GATHER_GET_MAP;
@@ -703,6 +712,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     }
                                 }).start();
                             }
+                        }else {
+                            Toast.makeText(getContext(), ""+response.getMessage(), Toast.LENGTH_SHORT).show();
                         }
                     }
 
@@ -819,6 +830,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                             }
 
 
+                        }else {
+                            Toast.makeText(getContext(), ""+response.getMessage(), Toast.LENGTH_SHORT).show();
                         }
 
                     }

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

@@ -105,6 +105,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     protected int getLayout() {
         return R.layout.poi_video_fragment;
     }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -113,6 +114,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         }
 
     }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -179,17 +181,11 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                 MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
-                        List<File> videoFiles = (List<File>) fmPoiVideoPic.getTag();
+                        List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
-                        if (videoFiles!=null){
+                        for (int i = 0; i < videoFileListByUUID.size(); i++) {
-                            for (int i = 0; i < videoFiles.size(); i++) {
+                            videoFileListByUUID.get(i).delete();
-                                //获取文件名
+                        }
-                                String csvFileName = videoFiles.get(i).getName() + ".txt";
-                                File cavFile = new File(videoFiles.get(i).getParent(), csvFileName);
-                                videoFiles.clear();
-                                cavFile.delete();
                         ivPoiVideoPicture.setImageDrawable(null);
-                            }
-                        }
                         return false;
                     }
                 });
@@ -268,7 +264,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     }
 
 
-
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -369,7 +364,6 @@ 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();

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

@@ -10,6 +10,7 @@ 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;
@@ -20,6 +21,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.RegexUtil;
+
 import org.greenrobot.eventbus.EventBus;
 
 
@@ -85,8 +88,14 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
                 initRegister();
                 break;
             case R.id.register_get_note:
+                if (!RegexUtil.isPhone(etRegisterPhone.getText().toString())){
+                    Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show();
+                    return;
+                }else {
                     registerNote();
                     initGetNote();
+            }
+
                 break;
         }
     }
@@ -94,7 +103,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
     private void initGetNote() {
         HttpParams httpParams = new HttpParams();
         String mobile = etRegisterPhone.getText().toString().trim();
-        if (mobile == null || mobile.equals("")) {
+        if (!RegexUtil.isPhone(mobile)) {
             Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show();
             return;
         } else {
@@ -128,8 +137,8 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
     private void initRegister() {
         HttpParams httpParams = new HttpParams();
         String mobile = etRegisterPhone.getText().toString().trim();
-        if (mobile == null || mobile.equals("")) {
+        if (!RegexUtil.isPhone(mobile)) {
-            Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getContext(), "手机号错误", Toast.LENGTH_SHORT).show();
             return;
         } else {
             httpParams.put("mobile", mobile);
@@ -186,6 +195,7 @@ 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

@@ -7,6 +7,7 @@ import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
+import android.provider.ContactsContract;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -182,25 +183,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
-                        List<File> videoFiles = (List<File>) fmRoadPic.getTag();
+                        List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
-                       if (videoFiles!=null){
+                        for (int i = 0; i < videoFileListByUUID.size(); i++) {
-                           for (int i = 0; i < videoFiles.size(); i++) {
+                            videoFileListByUUID.get(i).delete();
-                               String csvFileName = videoFiles.get(i).getName() + ".txt";
+                        }
-                               File cavFile = new File(videoFiles.get(i).getParent(), csvFileName);
-                               videoFiles.clear();
-                               cavFile.delete();
                         ivRoadPicture.setImageDrawable(null);
-                           }
-                       }
-//                        File videoFile = (File) fmRoadPic.getTag();
-//                        if (videoFile != null) {
-//                            videoFile.delete();
-//                            //获取文件名
-//                            String csvFileName = videoFile.getName() + ".txt";
-//                            File cavFile = new File(videoFile.getParent(), csvFileName);
-//                            cavFile.delete();
-//                            ivRoadPicture.setImageDrawable(null);
-//                        }
                         return false;
                     }
                 });
@@ -304,12 +291,16 @@ 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/http/HttpInterface.java

@@ -113,7 +113,7 @@ public class HttpInterface {
     public static final String GET_COMMIT_LIST = IP+TASK_PATH +"m4/task/"+USERID+"/getCommitList";//紀錄——已提交
     public static final String RECEIVED_POLYGON_TASK =  IP+TASK_PATH  + "polygonTask/"+USERID+"/receivedPolygontask";  //面状任务任务领取
     //172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口
-    public static final String UNRECEIVED_POLYGON_TASK =  IP+TASK_PATH  + "m4/task/"+USERID+"/unReceivedTask";//所有類型结束领取
+    public static final String UNRECEIVED_POLYGON_TASK =  IP+TASK_PATH  + "m4/task/"+USERID+"/unReceivedTask";//所有类型结束领取
     public static final String COMPLETE =  IP+TASK_PATH  + "polygonTask/"+USERID+"/complete";//面状任务任务采集
     public static final String SUBMIT_POLYGON_TASK =  IP+TASK_PATH  + "polygonTask/"+USERID+"/submitPolygontask";//面状任务结束采集
 

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

@@ -1,6 +1,7 @@
 package com.navinfo.outdoor.http;
 
 import android.app.Activity;
+import android.widget.Toast;
 
 import com.github.lazylibrary.util.DES;
 import com.github.lazylibrary.util.MD5;
@@ -141,7 +142,12 @@ public class OkGoBuilder<T> {
                 .execute(new DialogCallback<T>(clazz) {
                     @Override
                     public void onSuccess(Response<T> response) {
+                        if (response.code() ==200 ){
                             callback.onSuccess(response.body(), 1);
+                        }else {
+                            Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show();
+                        }
+
                     }
 
                     @Override
@@ -163,6 +169,7 @@ public class OkGoBuilder<T> {
     }
 
     public HttpHeaders getHeader() {
+
         HttpHeaders headers = new HttpHeaders();
         try {
             if (token == null) {
@@ -243,7 +250,12 @@ public class OkGoBuilder<T> {
                 .execute(new DialogCallback<T>(clazz) {
                     @Override
                     public void onSuccess(Response<T> response) {
+                        if (response.code() ==200){
                             callback.onSuccess(response.body(), 1);
+                        }else {
+                            Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show();
+                        }
+
                     }
 
                     @Override
@@ -284,7 +296,12 @@ public class OkGoBuilder<T> {
                 .execute(new DialogCallback<T>(clazz) {
                     @Override
                     public void onSuccess(Response<T> response) {
+                        if (response.code()==200){
                             callback.onSuccess(response.body(), 1);
+                        }else {
+                            Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show();
+                        }
+
                     }
 
                     @Override

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

@@ -6,7 +6,7 @@
     <ImageView
         android:id="@+id/road_bg"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
+        android:layout_height="110dp"
         android:background="@drawable/top_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -55,11 +55,12 @@
         app:layout_constraintTop_toTopOf="@id/tv1" />
 
     <TextView
-        android:id="@+id/tv_explain"
+        android:id="@+id/tv_Charging_pile_explain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="任务说明"
+        android:padding="5dp"
+        android:text="点击跳至任务说明"
         android:textColor="@color/white"
         app:layout_constraintLeft_toLeftOf="@id/tv1"
         app:layout_constraintRight_toRightOf="@id/tv1"

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

@@ -6,7 +6,7 @@
         <ImageView
             android:id="@+id/road_bg"
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="110dp"
             android:background="@drawable/top_bg"
           app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -55,11 +55,12 @@
             app:layout_constraintTop_toTopOf="@id/tv1" />
 
         <TextView
-            android:id="@+id/tv_explain"
+            android:id="@+id/tv_Charging_station_explain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="任务说明"
+            android:padding="5dp"
+            android:text="点击跳至任务说明"
             android:textColor="@color/white"
             app:layout_constraintLeft_toLeftOf="@id/tv1"
             app:layout_constraintRight_toRightOf="@id/tv1"

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

@@ -67,7 +67,7 @@
        android:layout_marginLeft="20dp"
         android:background="@null"
         android:inputType="number"
-        android:hint="11为手机号码"
+        android:hint="11位手机号码"
         android:maxLength="11"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"

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

@@ -76,7 +76,7 @@
         android:id="@+id/et_register_phone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="11为手机号码"
+        android:hint="11位手机号码"
         android:inputType="number"
         android:layout_marginLeft="35dp"
         style="@style/register_hint_style"

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

@@ -7,7 +7,7 @@
         <ImageView
             android:id="@+id/road_bg"
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="110dp"
             android:background="@drawable/top_bg"
          app:layout_constraintTop_toTopOf="parent"/>
         <ImageView
@@ -54,7 +54,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="任务说明"
+            android:padding="5dp"
+            android:text="点击跳至任务说明"
             android:textColor="@color/white"
             app:layout_constraintLeft_toLeftOf="@id/tv1"
             app:layout_constraintRight_toRightOf="@id/tv1"

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

@@ -59,7 +59,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="任务说明"
+        android:text="点击跳至任务说明"
         android:textColor="@color/white"
         app:layout_constraintLeft_toLeftOf="@id/tv1"
         app:layout_constraintRight_toRightOf="@id/tv1"

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

@@ -7,7 +7,7 @@
     <ImageView
         android:id="@+id/road_bg"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
+        android:layout_height="110dp"
         android:background="@drawable/top_bg"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -55,10 +55,12 @@
         app:layout_constraintTop_toTopOf="@id/tv1" />
 
     <TextView
+        android:id="@+id/tv_poi_video_explain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="任务说明"
+        android:text="点击跳至任务说明"
+        android:padding="5dp"
         android:textColor="@color/white"
         app:layout_constraintLeft_toLeftOf="@id/tv1"
         app:layout_constraintRight_toRightOf="@id/tv1"

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

@@ -6,7 +6,7 @@
     <ImageView
         android:id="@+id/road_bg"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
+        android:layout_height="110dp"
         android:background="@drawable/top_bg"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -53,10 +53,12 @@
         app:layout_constraintTop_toTopOf="@id/tv1" />
 
     <TextView
+        android:id="@+id/tv_road_explain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="任务说明"
+        android:text="点击跳至任务说明"
+        android:padding="5dp"
         android:textColor="@color/white"
         app:layout_constraintLeft_toLeftOf="@id/tv1"
         app:layout_constraintRight_toRightOf="@id/tv1"