From 760e33b9f42b2dca9202c51bb9bfc0f08c32d3e4 Mon Sep 17 00:00:00 2001 From: md Date: Sun, 15 Aug 2021 12:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E5=90=90?= =?UTF-8?q?=E5=8F=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/StatementActivity.java | 2 - .../outdoor/adapter/TaskExplainAdapter2.java | 1 - .../fragment/CapacityEvaluationFragment.java | 2 +- .../fragment/CapacityEvaluationFragment2.java | 2 +- .../fragment/CapacityMeasurementFragment.java | 2 +- .../fragment/ChargingPileFragment.java | 20 +++---- .../fragment/ChargingStationFragment.java | 33 +++++++----- .../fragment/EventPrefectureFragment.java | 2 +- .../outdoor/fragment/ForgetPawFragment.java | 16 +++--- .../outdoor/fragment/GatherGetFragment.java | 36 ++++++------- .../outdoor/fragment/GatheringFragment.java | 10 ++-- .../outdoor/fragment/HasSubmitFragment.java | 34 +++++++----- .../outdoor/fragment/MineFragment.java | 4 +- .../outdoor/fragment/OtherFragment.java | 6 +-- .../navinfo/outdoor/fragment/PoiFragment.java | 52 +++++++++++-------- .../outdoor/fragment/PoiTaskFragment.java | 4 +- .../outdoor/fragment/PoiVideoFragment.java | 6 +-- .../outdoor/fragment/RegisterFragment.java | 18 +++---- .../outdoor/fragment/RoadFragment.java | 20 +++---- .../outdoor/fragment/StaySubmitFragment.java | 8 +-- .../outdoor/fragment/TaskExplainFragment.java | 14 ++--- .../fragment/TaskPrefectureFragment.java | 2 +- .../outdoor/fragment/TreasureFragment.java | 4 +- .../fragment/UserAttestationFragment.java | 20 +++---- .../outdoor/fragment/WithdrawFragment.java | 14 ++--- .../main/res/layout/activity_statement.xml | 2 +- 27 files changed, 175 insertions(+), 161 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8bed7c3..5e04152 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/activity/StatementActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java index b70f780..6739dce 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java @@ -1,8 +1,6 @@ package com.navinfo.outdoor.activity; -import androidx.appcompat.app.AppCompatActivity; -import android.os.Bundle; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java b/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java index dc05f3b..1bedc0e 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java @@ -28,7 +28,6 @@ public class TaskExplainAdapter2 extends RecyclerView.Adapter(); String tagPanorama = (String) tvPanorama.getTag(); if (tagPanorama == null) { - Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); return; } else { chargingStationList.add(new File(tagPanorama)); } String tagName = (String) tvNamePic.getTag(); if (tagName == null) { - Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); return; } else { chargingStationList.add(new File(tagName)); @@ -782,21 +787,21 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (existence == 0) { String tagInternal = (String) tvInternal.getTag(); if (tagInternal == null) { - Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); return; } else { chargingStationList.add(new File(tagInternal)); } String tagElse = (String) tvElse.getTag(); if (tagElse == null) { - Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); return; } else { chargingStationList.add(new File(tagElse)); } String tagScutcheon = (String) tvScutcheon.getTag(); if (tagScutcheon == null) { - Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); return; } else { chargingStationList.add(new File(tagScutcheon)); @@ -1182,10 +1187,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }).start(); } else { - Toast.makeText(getContext(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(getContext(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java index f825b7b..efbb5e6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java @@ -81,7 +81,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic eventPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList()); eventPage++; }else { - Toast.makeText(getContext(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show(); } Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "sssssssssssss"); 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 483e6ab..275a811 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -72,7 +72,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe break; case R.id.forgetPaw_get_note: if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())){ - Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); }else { registerNote(); initGetNote(); @@ -89,21 +89,21 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); String mobile = etForgetPawPhone.getText().toString().trim(); if (!RegexUtil.isPhone(mobile)) { - Toast.makeText(getContext(), "手机号输入错误", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "手机号输入错误", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("mobile", mobile); } String code = etForgetPawNote.getText().toString().trim(); if (code == null || code.equals("")) { - Toast.makeText(getContext(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("code", code); } String password = etForgetPawPaw.getText().toString().trim(); if (password == null || password.equals("")) { - Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请输入密码", Toast.LENGTH_SHORT).show(); return; } else { try { @@ -114,14 +114,14 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe } String conFirmPaw = etForgetPawConfirmPaw.getText().toString().trim(); if (conFirmPaw == null || conFirmPaw.equals("")) { - Toast.makeText(getContext(), "请输入确认密码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请输入确认密码", Toast.LENGTH_SHORT).show(); return; } if (!conFirmPaw.equals(password)) { - Toast.makeText(getContext(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); } if (sessionId == null || sessionId.equals("")) { - Toast.makeText(getContext(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("sessionId", sessionId); @@ -185,7 +185,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); String mobile = etForgetPawPhone.getText().toString().trim(); if (mobile == null || mobile.equals("")) { - Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请输入手机号", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("mobile", mobile); 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 612232c..05ceb91 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -405,14 +405,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe }).start(); } } else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -426,7 +426,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initPolygonTask(String url, int taskId, boolean aBoolean) { if (taskId == 0) { - Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); return; } showLoadingDialog(); @@ -485,14 +485,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } }).start(); } else { - Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -505,7 +505,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initEndReceiveTask(String url, int taskId, PoiEntity poiEntity) { if (taskId == 0) { - Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); return; } showLoadingDialog(); @@ -538,14 +538,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe }).start(); } else { - Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -558,7 +558,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initCompleteTask(String url, int taskId, boolean b, PoiEntity poiEntity) { if (taskId == 0) { - Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); return; } showLoadingDialog(); @@ -593,14 +593,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } }).start(); } else { - Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -612,7 +612,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initSubmitPolygonTask(String url, int taskId) { if (taskId == 0) { - Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); return; } showLoadingDialog(); @@ -635,14 +635,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe }).start(); } else { - Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -744,7 +744,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe }).start(); } } else { - Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } @@ -752,7 +752,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); } }); dismissDialog(); @@ -866,7 +866,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe }).start(); } } else { - Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } @@ -875,7 +875,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); } }); dismissDialog(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java index 42d819e..b654111 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -156,7 +156,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe break; case R.id.btn_bank: if (etBankNum.getText().toString() == null && etBankNum.getText().toString().equals("")) { - Toast.makeText(getContext(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); return; } gatheringNetWork(); @@ -173,7 +173,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe private void gatheringNetWork() { ArrayList gatheringList = new ArrayList<>(); if (gatheringCamera.getTag() == null) { - Toast.makeText(getContext(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); return; } String gatheringCameraTag = (String) gatheringCamera.getTag(); @@ -181,7 +181,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe String etBankAccount = etBankNum.getText().toString().trim(); if (etBankAccount == null || etBankAccount.equals("")) { if (!etBankAccount.matches("^\\\\d{19}$\"")) { - Toast.makeText(getContext(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); return; } } @@ -226,7 +226,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage()+"", Toast.LENGTH_SHORT).show(); } }); /*OkGo @@ -279,7 +279,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe super.onActivityResult(requestCode, resultCode, data); if (requestCode == 131 && resultCode == RESULT_OK) { if (file == null && !file.exists()) { - Toast.makeText(getContext(), "请先拍照", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show(); return; } gatheringCamera.setTag(file.getAbsolutePath()); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java index 216eb59..9ffd0c6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java @@ -49,6 +49,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe private TextView poiVideoAuditProcess; private TextView poiVideoAuditThrough; private TextView poiVideoAuditProcessauditNotThrough; + private int hasPage; public static HasSubmitFragment newInstance(Bundle bundle) { HasSubmitFragment fragment = new HasSubmitFragment(); @@ -104,7 +105,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); httpParams.put("type", "5"); httpParams.put("pageSize", "10"); - httpParams.put("pageNum", "2"); + httpParams.put("pageNum", hasPage); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) @@ -121,9 +122,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + hasPage++; } + }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); @@ -133,7 +136,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show(); } }); } @@ -161,7 +164,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); } }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); @@ -171,7 +174,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), e.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage()+"", Toast.LENGTH_SHORT).show(); } }); } @@ -180,7 +183,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); httpParams.put("type", "4"); httpParams.put("pageSize", "10"); - httpParams.put("pageNum", "2"); + httpParams.put("pageNum", hasPage); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) @@ -197,9 +200,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + hasPage++; } }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); @@ -209,7 +213,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show(); } }); } @@ -218,7 +222,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); httpParams.put("type", "3"); httpParams.put("pageSize", "10"); - httpParams.put("pageNum", "2"); + httpParams.put("pageNum", hasPage); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) @@ -235,9 +239,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + hasPage++; } }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); @@ -247,7 +252,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show(); } }); } @@ -256,7 +261,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); httpParams.put("type", "1"); httpParams.put("pageSize", "10"); - httpParams.put("pageNum", "2"); + httpParams.put("pageNum", hasPage); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) @@ -273,10 +278,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe auditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); auditThrough.setText(hasSubmitBeanBody.getPassCount()+""); auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + hasPage++; Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); } }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); } @@ -286,7 +292,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show(); } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index cdb3681..790bbf2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -114,7 +114,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { @Override public void onSuccess(GetPriceBean response, int id) { dismissLoadingDialog(); - // Toast.makeText(getContext(), "获取成功", Toast.LENGTH_SHORT).show(); if (response.getCode() == 200){ GetPriceBean.BodyBean body = response.getBody(); if (body!=null){ @@ -122,7 +121,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { tvMoney.setText(userPrice + ""); } }else { - Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); } @@ -132,7 +131,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - // Toast.makeText(getContext(), "获取失败"+e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 64a07aa..cbf2433 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -503,7 +503,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }).start(); } else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); } } @@ -617,7 +617,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis super.onActivityResult(requestCode, resultCode, data); if (requestCode == 101 && resultCode == RESULT_OK) { if (file == null || !file.exists()) { - Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; } else { String s = PhotoUtils.showPhotoAndGetPath(file, ivPicture); @@ -627,7 +627,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } else if (requestCode == 102 && resultCode == RESULT_OK) { //照片路径 if (file == null || !file.exists()) { - Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; } else { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 172bfe6..26d7931 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -365,14 +365,19 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (name != null && !name.equals("")) { editNameContent.setText(name + ""); } - editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - if (!hasFocus) { - findingDuplicateByWork(); + if (editNameContent.getText().toString()!=null||editNameContent!=null){ + editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + if (!hasFocus) { + findingDuplicateByWork(); + } } - } - }); + }); + }else { + Toast.makeText(getActivity(), "请输入名称", Toast.LENGTH_SHORT).show(); + } + String address = showPoiEntity.getAddress();//地址 if (address != null && !address.equals("")) { editSiteContent.setText(address); @@ -502,7 +507,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe dismissLoadingDialog(); if (getPhoneBean.getCode() == 200) { String code = getPhoneBean.getBody().getCode(); - // Toast.makeText(getActivity(), code+"", Toast.LENGTH_SHORT).show(); Constant.CODE = code; }else { Toast.makeText(getActivity(), getPhoneBean.getMessage()+"", Toast.LENGTH_SHORT).show(); @@ -592,14 +596,16 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (tagInternal != null) { poiPicList.add(new File(tagInternal)); } - String tagElse = (String) tvElse.getTag(); - if (tagElse != null) { - poiPicList.add(new File(tagElse)); - } + String tagCard = (String) tvCard.getTag(); if (tagCard != null) { poiPicList.add(new File(tagCard)); } + + String tagElse = (String) tvElse.getTag(); + if (tagElse != null) { + poiPicList.add(new File(tagElse)); + } new Thread(new Runnable() { @Override public void run() { @@ -623,7 +629,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe case R.id.rl_panorama: Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); file = PhotoUtils.showPhotoFile("a", latLng); - ; intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); startActivityForResult(intentPanorama, 101); break; @@ -677,16 +682,16 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe str += body.get(i) + ","; } if (str != null) { - Toast.makeText(getContext(), "存在类似名称---" + str, Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "存在类似名称---" + str, Toast.LENGTH_SHORT).show(); str = ""; } else { - Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(getContext(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); } } @@ -785,7 +790,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } }).start(); } else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); } } @@ -1086,14 +1091,15 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (tagInternal != null && !tagInternal.equals("")) { infoPhoto.add(new Info(tagInternal)); } - String tagElse = (String) tvElse.getTag(); - if (tagElse != null && !tagElse.equals("")) { - infoPhoto.add(new Info(tagElse)); - } String tagCard = (String) tvCard.getTag(); if (tagCard != null && !tagCard.equals("")) { infoPhoto.add(new Info(tagCard)); } + String tagElse = (String) tvElse.getTag(); + if (tagElse != null && !tagElse.equals("")) { + infoPhoto.add(new Info(tagElse)); + } + poiEntity.setPhotoInfo(infoPhoto); DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar calendar = Calendar.getInstance(); @@ -1132,7 +1138,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } if (contactView.getPhoneList()!=-1){ poiCheckResult.setCode(1); - poiCheckResult.setMsg("您第"+contactView.getPhoneList()+"手机号输入有误"); + poiCheckResult.setMsg("您第"+contactView.getPhoneList()+"个手机号输入有误"); return poiCheckResult; } if (entity.getTelPhone() == null) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java index f8d826a..cb8a4f5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -126,7 +126,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene initHasSubmitBean(hasSubmitBean,aBoolean); } }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); } } @@ -135,7 +135,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene public void onError(Throwable e, int id) { dismissLoadingDialog(); Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show(); } }); dismissDialog(); 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 7193f58..7c7289d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -348,7 +348,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick }).start(); } else { dismissLoadingDialog(); - Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show(); return; } break; @@ -433,7 +433,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick getActivity().runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show(); Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; @@ -444,7 +444,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } }).start(); }else { - Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); } } 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 1cf2cde..84e1b8f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -92,7 +92,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen break; case R.id.register_get_note: if (!RegexUtil.isPhone(etRegisterPhone.getText().toString())){ - Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); return; }else { registerNote(); @@ -106,7 +106,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen HttpParams httpParams = new HttpParams(); String mobile = etRegisterPhone.getText().toString().trim(); if (!RegexUtil.isPhone(mobile)) { - Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请输入手机号", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("mobile", mobile); @@ -126,7 +126,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen sessionId = response.getBody(); Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show(); }else { - Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); } } @@ -143,21 +143,21 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen HttpParams httpParams = new HttpParams(); String mobile = etRegisterPhone.getText().toString().trim(); if (!RegexUtil.isPhone(mobile)) { - Toast.makeText(getContext(), "手机号错误", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "手机号错误", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("mobile", mobile); } String code = etRegisterNote.getText().toString().trim(); if (code == null || code.equals("")) { - Toast.makeText(getContext(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("code", code); } String password = etRegisterPaw.getText().toString().trim(); if (password == null || password.equals("")) { - Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请输入密码", Toast.LENGTH_SHORT).show(); return; } else { try { @@ -169,15 +169,15 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen } String conFirmPaw = etRegisterConfirmPaw.getText().toString().trim(); if (conFirmPaw == null || conFirmPaw.equals("")) { - Toast.makeText(getContext(), "请输入确认密码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请输入确认密码", Toast.LENGTH_SHORT).show(); return; } if (!conFirmPaw.equals(password)) { - Toast.makeText(getContext(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); return; } if (sessionId == null || sessionId.equals("")) { - Toast.makeText(getContext(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); return; } else { httpParams.put("sessionId", sessionId); 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 fc5ce63..3963d7f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -350,7 +350,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList }).start(); } else { dismissLoadingDialog(); - Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show(); return; } break; @@ -385,14 +385,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList }).start(); //onBackPressed(); } else { - Toast.makeText(getContext(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - Toast.makeText(getContext(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(getActivity(), permissions); } @@ -404,11 +404,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private void poiVideoUpload(int body, File fileZip) { if (body == 0) { - Toast.makeText(getContext(), "请先保存本地上传", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请先保存本地上传", Toast.LENGTH_SHORT).show(); return; } if (fileZip == null) { - Toast.makeText(getContext(), "未压缩完成", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show(); return; } HttpParams httpParams = new HttpParams(); @@ -437,7 +437,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList getActivity().runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show(); Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; @@ -448,14 +448,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }).start(); }else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), "上传失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage() + ""); } }); @@ -507,10 +507,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }).start(); } else { - Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index 5078764..33e37a7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -132,7 +132,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList @Subscribe public void onEvent(Message data) { if (data.what == Constant.EVENT_STAY_REFRESH) { - Toast.makeText(getContext(), (String) data.obj, Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), (String) data.obj, Toast.LENGTH_SHORT).show(); dismissLoadingDialog(); refreshData(); } @@ -224,7 +224,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList setLoadingDialogText("提交中..."); PoiSaveUtils.getInstance(getActivity()).uploadPoiEntityBatch(poiEntities); } else { - Toast.makeText(getContext(), "请选择要删除的条目数据", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请选择要删除的条目数据", Toast.LENGTH_SHORT).show(); } break; @@ -281,14 +281,14 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList if (response.getCode()==200){ staySubmitAdapter.setAllCheckedDelete(); }else { - Toast.makeText(getContext(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java index e72eaeb..c2d4bc5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -87,6 +87,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis public void onClick(int pos) { Intent itemIntent = new Intent(getActivity(), FragmentManagement.class); itemIntent.putExtra("tag", 10); + itemIntent.putExtra("id",fId); startActivity(itemIntent); } @@ -118,22 +119,21 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis if (response.getCode() == 200){ taskExplainAdapter.setExplainList(response.getBody().getList()); TaskPrefectureBean.BodyBean body = response.getBody(); - List list = body.getList(); - for (int i = 0; i < list.size(); i++) { - fId = list.get(i).getId(); - } +// List list = body.getList(); +// for (int i = 0; i < list.size(); i++) { +// fId = list.get(i).getId(); +// } taskPage++; }else { - Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); } - Log.d("TAG", "onSuccess: " + response.getMessage() + ""); } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - // Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Log.d("TAG", "onError: " + e.getMessage()); } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java index 4b6d9b5..9cbb254 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -117,7 +117,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList()); taskPage++; }else { - Toast.makeText(getContext(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show(); } Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + ""); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index 09c0bff..945208c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -128,6 +128,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private List removables; private List removableScreenMarker; private List removablesLocality; + private int treasurePage=1; /** * bitmapDescriptor1 */ @@ -360,7 +361,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen httpParams.put("userGeo", userEncode); httpParams.put("centerGeo", centerEncode); httpParams.put("pageSize", Constant.NUMBER); - httpParams.put("pageNum", "1"); + httpParams.put("pageNum", treasurePage); httpParams.put("type", task_type); httpParams.put("isExclusive", limit_type); OkGoBuilder.getInstance() @@ -528,6 +529,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen break; } } + treasurePage++; } Message obtain = Message.obtain(); obtain.what = Constant.JOB_SEARCH_WORD; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java index 28cd251..50a26df 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -180,7 +180,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic break; case R.id.btn_attestation: if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) { - Toast.makeText(getContext(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); return; } if (!chineseNameTest(etAttestationName.getText().toString())) { @@ -188,7 +188,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic return; } if (!checkNum(etNamePhone.getText().toString().trim())) { - Toast.makeText(getContext(), "身份证号错误，请重新输入", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "身份证号错误，请重新输入", Toast.LENGTH_SHORT).show(); return; } nameAuthentication(); @@ -224,23 +224,23 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic private void nameAuthentication() { if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) { - Toast.makeText(getContext(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); return; } if (!checkNum(etNamePhone.getText().toString().trim())) { - Toast.makeText(getContext(), "身份证错误，请重新输入", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "身份证错误，请重新输入", Toast.LENGTH_SHORT).show(); return; } if (tvCard1.getTag() == null) { - Toast.makeText(getContext(), "请拍照 身份证人像面", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照 身份证人像面", Toast.LENGTH_SHORT).show(); return; } if (tvCard2.getTag() == null) { - Toast.makeText(getContext(), "请拍照 身份证国徽面", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照 身份证国徽面", Toast.LENGTH_SHORT).show(); return; } if (tvCard3.getTag() == null) { - Toast.makeText(getContext(), "请拍照 手持身份证", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请拍照 手持身份证", Toast.LENGTH_SHORT).show(); return; } @@ -307,7 +307,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic super.onActivityResult(requestCode, resultCode, data); if (requestCode == 121 && resultCode == RESULT_OK) { if (file == null || !file.exists()) { - Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; } else { @@ -332,7 +332,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic // } } else if (requestCode == 122 && resultCode == RESULT_OK) { if (file == null || !file.exists()) { - Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; } else { @@ -357,7 +357,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic // } } else if (requestCode == 123 && resultCode == RESULT_OK) { if (file == null || !file.exists()) { - Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; } else { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index 285d336..4542d81 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -89,7 +89,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { if (Constant.ID_NUMBER==null||Constant.BANKACCOUNT==null){ - Toast.makeText(getContext(), "没有绑定银行卡，请先绑定银行卡", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "没有绑定银行卡，请先绑定银行卡", Toast.LENGTH_SHORT).show(); checkBox.setChecked(false); }else { checkBox.setChecked(true); @@ -177,16 +177,16 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen if (price!=null&&!price.equals("")){ Integer integer = Integer.valueOf(price); if (integer!=null&&integer<10){ - Toast.makeText(getContext(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); return; } }else { - Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); return; } if (!checkBox.isChecked()) { - Toast.makeText(getContext(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); return; } if (Constant.ID_NUMBER != null) { @@ -199,7 +199,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } }); } else { - Toast.makeText(getContext(), "请先绑定银行卡", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "请先绑定银行卡", Toast.LENGTH_SHORT).show(); return; } @@ -228,7 +228,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen @Override public void onSuccess(UserPriceExchangeBean response, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); if (response.getCode() == 200) { String unit = tvUnit.getText().toString(); String price = etAllPrice.getText().toString(); @@ -246,7 +246,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } }); diff --git a/app/src/main/res/layout/activity_statement.xml b/app/src/main/res/layout/activity_statement.xml index 8cfc435..67188f4 100644 --- a/app/src/main/res/layout/activity_statement.xml +++ b/app/src/main/res/layout/activity_statement.xml @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="45dp" android:layout_alignParentLeft="true" - android:layout_marginLeft="15dp" + android:layout_marginLeft="20dp" android:src="@drawable/icon_arrow" />