diff --git a/app/build.gradle b/app/build.gradle
index 8cd7b0d..fd4fd97 100644
--- a/app/build.gradle
+++ b/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"
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
index 9d37a5b..9c3e134 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
+++ b/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) {
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
index 812a058..0acc02f 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
+++ b/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:
- initGetNote();
+ 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("")) {
- Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show();
+ if (!RegexUtil.isPhone(mobile)) {
+ 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();
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
index e63d2c3..33566a9 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
@@ -139,6 +139,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
initViewByTaskStatus(taskStatus);
}
}
+
/**
* 保存小数点后两位
*
@@ -294,10 +295,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}
/**
- * @param url 筛选充电站领取任务
+ * @param url 筛选充电站领取任务
* @param
*/
- private void chargingTaskByWork(String url, int taskId, boolean isSaver,int statusId) {
+ private void chargingTaskByWork(String url, int taskId, boolean isSaver, int statusId) {
showLoadingDialog();
OkGoBuilder.getInstance()
.Builder(getActivity())
@@ -378,7 +379,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}
}
});
- }else{
+ } else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -409,7 +410,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}
/**
- * @param url 面妆任务领取任务
+ * @param url 面妆任务领取任务
* @param
*/
private void initPolygonTask(String url, int taskId, boolean aBoolean) {
@@ -470,6 +471,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
});
}
}).start();
+ } else {
+ Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
}
}
@@ -484,7 +487,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}
/**
- * @param url 所以类型的结束领取
+ * @param url 所以类型的结束领取
* @param poiEntity
*/
private void initEndReceiveTask(String url, int taskId, PoiEntity poiEntity) {
@@ -494,8 +497,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}
showLoadingDialog();
HttpParams httpParams = new HttpParams();
- httpParams.put("taskIds",taskId);
- httpParams.put("auditIds","");
+ httpParams.put("taskIds", taskId);
+ httpParams.put("auditIds", "");
OkGoBuilder.getInstance()
.Builder(getActivity())
.url(url)
@@ -514,13 +517,15 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
- Log.d("TAG", "run: "+response.getMessage());
+ Log.d("TAG", "run: " + response.getMessage());
initViewByTaskStatus(0);
}
});
}
}).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();
}
}
@@ -668,7 +677,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
poiListEntity.setX(latPolygon.get(0).longitude + "");
poiListEntity.setY(latPolygon.get(0).latitude + "");
}
- if (poiListEntity.getTaskStatus()!=1){
+ if (poiListEntity.getTaskStatus() != 1) {
// 通知地图界面显示当前编辑数据的marker
senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX());
InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity);
@@ -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();
}
}
@@ -782,7 +793,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
poiListEntity.setX(latPolygon.get(0).longitude + "");
poiListEntity.setY(latPolygon.get(0).latitude + "");
}
- if (poiListEntity.getTaskStatus()!=1){
+ if (poiListEntity.getTaskStatus() != 1) {
// 通知地图界面显示当前编辑数据的marker
senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX());
InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity);
@@ -819,6 +830,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}
+ }else {
+ Toast.makeText(getContext(), ""+response.getMessage(), Toast.LENGTH_SHORT).show();
}
}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
index 825ae70..03ad6f5 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/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,10 +114,11 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}
}
+
@Override
public void onResume() {
super.onResume();
- View header =findViewById(R.id.poi_video_header);
+ View header = findViewById(R.id.poi_video_header);
header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -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();
- if (videoFiles!=null){
- for (int i = 0; i < videoFiles.size(); i++) {
- //获取文件名
- String csvFileName = videoFiles.get(i).getName() + ".txt";
- File cavFile = new File(videoFiles.get(i).getParent(), csvFileName);
- videoFiles.clear();
- cavFile.delete();
- ivPoiVideoPicture.setImageDrawable(null);
- }
+ List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
+ for (int i = 0; i < videoFileListByUUID.size(); i++) {
+ videoFileListByUUID.get(i).delete();
}
+ ivPoiVideoPicture.setImageDrawable(null);
return false;
}
});
@@ -225,7 +221,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
if (!StringUtils.isEmpty(photo)) {
File videoFile = new File(photo);
videoFileList.add(new File(photo));
- if (videoFile.getPath().contains("0.mp4")&&!videoFile.getPath().contains("0.mp4.txt")){
+ if (videoFile.getPath().contains("0.mp4") && !videoFile.getPath().contains("0.mp4.txt")) {
if (videoFile.exists() && !isImageLoad) {
// 使用glide加载视频的第一帧
AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivPoiVideoPicture, 500);
@@ -260,15 +256,14 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
@Subscribe
public void onEvent(Message data) {
if (data.what == Constant.PICTURE_VIDEO_WORD) {
- if ((boolean)data.obj){
+ if ((boolean) data.obj) {
- initPoiVideoSharePre();
- }
+ initPoiVideoSharePre();
+ }
}
}
-
@Override
public void onClick(View v) {
switch (v.getId()) {
@@ -336,7 +331,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity);
if (poiCheckResult.getCode() == 1) {
- Toast.makeText(getActivity(), poiCheckResult.getMsg()+"", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show();
return;
}
new Thread(new Runnable() {
@@ -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();
@@ -381,8 +375,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}
HttpParams httpParams = new HttpParams();
httpParams.put("auditId", poiVideoBody);
- long time=System.currentTimeMillis();
- httpParams.put("datetime",time);
+ long time = System.currentTimeMillis();
+ httpParams.put("datetime", time);
httpParams.put("file", fileZip);
showFileLoadingDialog();
setLoadingDialogText("上传中...");
@@ -558,7 +552,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
if (EventBus.getDefault().isRegistered(this))//加上判断
EventBus.getDefault().unregister(this);
super.onDestroy();
- if (showPoiEntity!=null){
+ if (showPoiEntity != null) {
new Thread(new Runnable() {
@Override
public void run() {
@@ -620,13 +614,13 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
poiEntity.setType(3);
poiEntity.setTaskStatus(2);
poiEntity.setIsLocalData(1);
- if (fmPoiVideoPic.getTag()==null){
+ if (fmPoiVideoPic.getTag() == null) {
List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
- if (videoFileListByUUID!=null){
+ if (videoFileListByUUID != null) {
fmPoiVideoPic.setTag(videoFileListByUUID);
}
}
- if (fmPoiVideoPic.getTag() != null &&!((List<File>) fmPoiVideoPic.getTag()).isEmpty()) {
+ if (fmPoiVideoPic.getTag() != null && !((List<File>) fmPoiVideoPic.getTag()).isEmpty()) {
List<LatLng> lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List<File>) fmPoiVideoPic.getTag());
String lineString = GeometryTools.getLineString(lineStringByVideoFileList);
Log.d("TAG", "onGranted: " + lineString);
@@ -642,12 +636,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
@Override
protected PoiCheckResult checkPoiEntity(PoiEntity entity) {
PoiCheckResult poiCheckResult = new PoiCheckResult();
- if (entity.getPhoto()==null){
+ if (entity.getPhoto() == null) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请录像");
return poiCheckResult;
}
- if (entity.getWork_type()==-1){
+ if (entity.getWork_type() == -1) {
poiCheckResult.setCode(1);
poiCheckResult.setMsg("请选择录像方式");
return poiCheckResult;
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
index 87b2a56..c7e4483 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
+++ b/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:
- registerNote();
- initGetNote();
+ 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("")) {
- Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show();
+ if (!RegexUtil.isPhone(mobile)) {
+ Toast.makeText(getContext(), "手机号错误", Toast.LENGTH_SHORT).show();
return;
} else {
httpParams.put("mobile", mobile);
@@ -179,13 +188,14 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
Constant.user_name = mobile;
Constant.pass_word = password;
Message obtain = Message.obtain();
- obtain.what=Constant.REGISTER_WORD;
+ obtain.what = Constant.REGISTER_WORD;
obtain.obj = true;
EventBus.getDefault().post(obtain);
getActivity().finish();
}
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
}
+
@Override
public void onError(Throwable e, int id) {
dismissLoadingDialog();
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
index a5bddbd..d2de82e 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
+++ b/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();
- if (videoFiles!=null){
- for (int i = 0; i < videoFiles.size(); i++) {
- 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);
-// }
+ List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
+ for (int i = 0; i < videoFileListByUUID.size(); i++) {
+ videoFileListByUUID.get(i).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();
diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
index bd28e26..7e737da 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/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";//面状任务结束采集
diff --git a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java
index 9094e80..cb17a50 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java
+++ b/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) {
- callback.onSuccess(response.body(), 1);
+ 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) {
- callback.onSuccess(response.body(), 1);
+ 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) {
- callback.onSuccess(response.body(), 1);
+ if (response.code()==200){
+ callback.onSuccess(response.body(), 1);
+ }else {
+ Toast.makeText(activity, response.message()+"", Toast.LENGTH_SHORT).show();
+ }
+
}
@Override
diff --git a/app/src/main/res/layout/charging_pile_header.xml b/app/src/main/res/layout/charging_pile_header.xml
index 6e103ee..9a98193 100644
--- a/app/src/main/res/layout/charging_pile_header.xml
+++ b/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"
diff --git a/app/src/main/res/layout/charging_station_header.xml b/app/src/main/res/layout/charging_station_header.xml
index 22ef416..fdfc0fd 100644
--- a/app/src/main/res/layout/charging_station_header.xml
+++ b/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"
diff --git a/app/src/main/res/layout/fragment_forget_paw.xml b/app/src/main/res/layout/fragment_forget_paw.xml
index 8ba49d9..445fe1a 100644
--- a/app/src/main/res/layout/fragment_forget_paw.xml
+++ b/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"
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index fb5a538..c36728f 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/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"
diff --git a/app/src/main/res/layout/other_header.xml b/app/src/main/res/layout/other_header.xml
index db3e608..9aac6a1 100644
--- a/app/src/main/res/layout/other_header.xml
+++ b/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"
diff --git a/app/src/main/res/layout/poi_header.xml b/app/src/main/res/layout/poi_header.xml
index 3588dbc..21eff26 100644
--- a/app/src/main/res/layout/poi_header.xml
+++ b/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"
diff --git a/app/src/main/res/layout/poi_video_header.xml b/app/src/main/res/layout/poi_video_header.xml
index aaa7fdb..e3004da 100644
--- a/app/src/main/res/layout/poi_video_header.xml
+++ b/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"
diff --git a/app/src/main/res/layout/road_header.xml b/app/src/main/res/layout/road_header.xml
index 647facf..6516e08 100644
--- a/app/src/main/res/layout/road_header.xml
+++ b/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"