xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改所有吐司问题

Browse Source
This commit is contained in:
md 2021-08-15 12:09:06 +08:00
parent 8bc3c848e1
commit 760e33b9f4
27 changed files with 175 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

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

2
app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java
View File

@ -1,8 +1,6 @@
package com.navinfo.outdoor.activity; package com.navinfo.outdoor.activity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;

1
app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java
View File

@ -28,7 +28,6 @@ public class TaskExplainAdapter2 extends RecyclerView.Adapter<TaskExplainAdapter
this.explainList2.addAll(explainList2); this.explainList2.addAll(explainList2);
notifyDataSetChanged(); notifyDataSetChanged();
} }
} }
@NonNull @NonNull

2
app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java
View File

@ -115,7 +115,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC
capacityEvaluationAdapter.setCapacityList(response.getBody().getList()); capacityEvaluationAdapter.setCapacityList(response.getBody().getList());
capacityPage++; capacityPage++;
}else { }else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
} }

2
app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java
View File

@ -100,7 +100,7 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On
if (response.getCode() == 200){ if (response.getCode() == 200){
capacityItemAdapter.setCapItemList(response.getBody().getList()); capacityItemAdapter.setCapItemList(response.getBody().getList());
}else { }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() + "sssssssssssss"); Log.d("TAG", "onSuccess: " + response.getMessage() + "sssssssssssss");

2
app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java
View File

@ -153,7 +153,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On
for (int i = 0; i < bolbean.size(); i++) { for (int i = 0; i < bolbean.size(); i++) {
final String id = bolbean.get(i).getId(); final String id = bolbean.get(i).getId();
if (!checkedMap.containsKey(id) || checkedMap.get(id) == null || ("").equals(checkedMap.get(id))) { if (!checkedMap.containsKey(id) || checkedMap.get(id) == null || ("").equals(checkedMap.get(id))) {
Toast.makeText(getContext(), "有题目未填写答案，请仔细检查！", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "有题目未填写答案，请仔细检查！", Toast.LENGTH_SHORT).show();
return; return;
} }
} }

20
app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
View File

@ -1070,7 +1070,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 101 && resultCode == RESULT_OK) { if (requestCode == 101 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1095,7 +1095,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 102 && resultCode == RESULT_OK) { } else if (requestCode == 102 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1120,7 +1120,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 103 && resultCode == RESULT_OK) { } else if (requestCode == 103 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1146,7 +1146,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 104 && resultCode == RESULT_OK) { } else if (requestCode == 104 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1171,7 +1171,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 105 && resultCode == RESULT_OK) { } else if (requestCode == 105 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1197,7 +1197,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 106 && resultCode == RESULT_OK) { } else if (requestCode == 106 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1223,7 +1223,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 107 && resultCode == RESULT_OK) { } else if (requestCode == 107 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1248,7 +1248,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 108 && resultCode == RESULT_OK) { } else if (requestCode == 108 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1273,7 +1273,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 109 && resultCode == RESULT_OK) { } else if (requestCode == 109 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -1298,7 +1298,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}*/ }*/
} else if (requestCode == 110 && resultCode == RESULT_OK) { } else if (requestCode == 110 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {

19
app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
View File

@ -468,6 +468,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
if (name != null && !name.equals("")) { if (name != null && !name.equals("")) {
editNameContent.setText(name + ""); editNameContent.setText(name + "");
} }
if (editNameContent.getText().toString()!=null||editNameContent!=null){
editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override @Override
public void onFocusChange(View v, boolean hasFocus) { public void onFocusChange(View v, boolean hasFocus) {
@ -476,6 +477,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
} }
} }
}); });
}else {
Toast.makeText(getActivity(), "请输入名称", Toast.LENGTH_SHORT).show();
}
String address = showPoiEntity.getAddress();//地址 String address = showPoiEntity.getAddress();//地址
if (address != null && !address.equals("")) { if (address != null && !address.equals("")) {
editSiteContent.setText(address); editSiteContent.setText(address);
@ -767,14 +772,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
chargingStationList = new ArrayList<>(); chargingStationList = new ArrayList<>();
String tagPanorama = (String) tvPanorama.getTag(); String tagPanorama = (String) tvPanorama.getTag();
if (tagPanorama == null) { if (tagPanorama == null) {
Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
chargingStationList.add(new File(tagPanorama)); chargingStationList.add(new File(tagPanorama));
} }
String tagName = (String) tvNamePic.getTag(); String tagName = (String) tvNamePic.getTag();
if (tagName == null) { if (tagName == null) {
Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
chargingStationList.add(new File(tagName)); chargingStationList.add(new File(tagName));
@ -782,21 +787,21 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
if (existence == 0) { if (existence == 0) {
String tagInternal = (String) tvInternal.getTag(); String tagInternal = (String) tvInternal.getTag();
if (tagInternal == null) { if (tagInternal == null) {
Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
chargingStationList.add(new File(tagInternal)); chargingStationList.add(new File(tagInternal));
} }
String tagElse = (String) tvElse.getTag(); String tagElse = (String) tvElse.getTag();
if (tagElse == null) { if (tagElse == null) {
Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
chargingStationList.add(new File(tagElse)); chargingStationList.add(new File(tagElse));
} }
String tagScutcheon = (String) tvScutcheon.getTag(); String tagScutcheon = (String) tvScutcheon.getTag();
if (tagScutcheon == null) { if (tagScutcheon == null) {
Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
chargingStationList.add(new File(tagScutcheon)); chargingStationList.add(new File(tagScutcheon));
@ -1182,10 +1187,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getContext(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
} else { } else {
Toast.makeText(getContext(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }

2
app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java
View File

@ -81,7 +81,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic
eventPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList()); eventPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
eventPage++; eventPage++;
}else { }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"); Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "sssssssssssss");

16
app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
View File

@ -72,7 +72,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
break; break;
case R.id.forgetPaw_get_note: case R.id.forgetPaw_get_note:
if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())){ if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())){
Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show();
}else { }else {
registerNote(); registerNote();
initGetNote(); initGetNote();
@ -89,21 +89,21 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
String mobile = etForgetPawPhone.getText().toString().trim(); String mobile = etForgetPawPhone.getText().toString().trim();
if (!RegexUtil.isPhone(mobile)) { if (!RegexUtil.isPhone(mobile)) {
Toast.makeText(getContext(), "手机号输入错误", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "手机号输入错误", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("mobile", mobile); httpParams.put("mobile", mobile);
} }
String code = etForgetPawNote.getText().toString().trim(); String code = etForgetPawNote.getText().toString().trim();
if (code == null || code.equals("")) { if (code == null || code.equals("")) {
Toast.makeText(getContext(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请获取短信验证码", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("code", code); httpParams.put("code", code);
} }
String password = etForgetPawPaw.getText().toString().trim(); String password = etForgetPawPaw.getText().toString().trim();
if (password == null || password.equals("")) { if (password == null || password.equals("")) {
Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请输入密码", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
try { try {
@ -114,14 +114,14 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
} }
String conFirmPaw = etForgetPawConfirmPaw.getText().toString().trim(); String conFirmPaw = etForgetPawConfirmPaw.getText().toString().trim();
if (conFirmPaw == null || conFirmPaw.equals("")) { if (conFirmPaw == null || conFirmPaw.equals("")) {
Toast.makeText(getContext(), "请输入确认密码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请输入确认密码", Toast.LENGTH_SHORT).show();
return; return;
} }
if (!conFirmPaw.equals(password)) { if (!conFirmPaw.equals(password)) {
Toast.makeText(getContext(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show();
} }
if (sessionId == null || sessionId.equals("")) { if (sessionId == null || sessionId.equals("")) {
Toast.makeText(getContext(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请短信获取验证码", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("sessionId", sessionId); httpParams.put("sessionId", sessionId);
@ -185,7 +185,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
String mobile = etForgetPawPhone.getText().toString().trim(); String mobile = etForgetPawPhone.getText().toString().trim();
if (mobile == null || mobile.equals("")) { if (mobile == null || mobile.equals("")) {
Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请输入手机号", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("mobile", mobile); httpParams.put("mobile", mobile);

36
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
View File

@ -405,14 +405,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}).start(); }).start();
} }
} else { } else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); 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()); 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) { private void initPolygonTask(String url, int taskId, boolean aBoolean) {
if (taskId == 0) { if (taskId == 0) {
Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show();
return; return;
} }
showLoadingDialog(); showLoadingDialog();
@ -485,14 +485,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); 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()); 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) { private void initEndReceiveTask(String url, int taskId, PoiEntity poiEntity) {
if (taskId == 0) { if (taskId == 0) {
Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show();
return; return;
} }
showLoadingDialog(); showLoadingDialog();
@ -538,14 +538,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}).start(); }).start();
} else { } else {
Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); 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()); 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) { private void initCompleteTask(String url, int taskId, boolean b, PoiEntity poiEntity) {
if (taskId == 0) { if (taskId == 0) {
Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show();
return; return;
} }
showLoadingDialog(); showLoadingDialog();
@ -593,14 +593,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); 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()); 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) { private void initSubmitPolygonTask(String url, int taskId) {
if (taskId == 0) { if (taskId == 0) {
Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show();
return; return;
} }
showLoadingDialog(); showLoadingDialog();
@ -635,14 +635,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}).start(); }).start();
} else { } else {
Toast.makeText(getContext(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); 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()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@ -744,7 +744,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}).start(); }).start();
} }
} else { } 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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); 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(); dismissDialog();
@ -866,7 +866,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
}).start(); }).start();
} }
} else { } 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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); 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(); dismissDialog();

10
app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
View File

@ -156,7 +156,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
break; break;
case R.id.btn_bank: case R.id.btn_bank:
if (etBankNum.getText().toString() == null && etBankNum.getText().toString().equals("")) { if (etBankNum.getText().toString() == null && etBankNum.getText().toString().equals("")) {
Toast.makeText(getContext(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show();
return; return;
} }
gatheringNetWork(); gatheringNetWork();
@ -173,7 +173,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
private void gatheringNetWork() { private void gatheringNetWork() {
ArrayList<File> gatheringList = new ArrayList<>(); ArrayList<File> gatheringList = new ArrayList<>();
if (gatheringCamera.getTag() == null) { if (gatheringCamera.getTag() == null) {
Toast.makeText(getContext(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请先拍银行卡", Toast.LENGTH_SHORT).show();
return; return;
} }
String gatheringCameraTag = (String) gatheringCamera.getTag(); String gatheringCameraTag = (String) gatheringCamera.getTag();
@ -181,7 +181,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
String etBankAccount = etBankNum.getText().toString().trim(); String etBankAccount = etBankNum.getText().toString().trim();
if (etBankAccount == null || etBankAccount.equals("")) { if (etBankAccount == null || etBankAccount.equals("")) {
if (!etBankAccount.matches("^\\\\d{19}$\"")) { if (!etBankAccount.matches("^\\\\d{19}$\"")) {
Toast.makeText(getContext(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show();
return; return;
} }
} }
@ -226,7 +226,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), e.getMessage()+"", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), e.getMessage()+"", Toast.LENGTH_SHORT).show();
} }
}); });
/*OkGo /*OkGo
@ -279,7 +279,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 131 && resultCode == RESULT_OK) { if (requestCode == 131 && resultCode == RESULT_OK) {
if (file == null && !file.exists()) { if (file == null && !file.exists()) {
Toast.makeText(getContext(), "请先拍照", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请先拍照", Toast.LENGTH_SHORT).show();
return; return;
} }
gatheringCamera.setTag(file.getAbsolutePath()); gatheringCamera.setTag(file.getAbsolutePath());

34
app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
View File

@ -49,6 +49,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
private TextView poiVideoAuditProcess; private TextView poiVideoAuditProcess;
private TextView poiVideoAuditThrough; private TextView poiVideoAuditThrough;
private TextView poiVideoAuditProcessauditNotThrough; private TextView poiVideoAuditProcessauditNotThrough;
private int hasPage;
public static HasSubmitFragment newInstance(Bundle bundle) { public static HasSubmitFragment newInstance(Bundle bundle) {
HasSubmitFragment fragment = new HasSubmitFragment(); HasSubmitFragment fragment = new HasSubmitFragment();
@ -104,7 +105,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
httpParams.put("type", "5"); httpParams.put("type", "5");
httpParams.put("pageSize", "10"); httpParams.put("pageSize", "10");
httpParams.put("pageNum", "2"); httpParams.put("pageNum", hasPage);
OkGoBuilder.getInstance() OkGoBuilder.getInstance()
.Builder(getActivity()) .Builder(getActivity())
.url(HttpInterface.GET_COMMIT_LIST) .url(HttpInterface.GET_COMMIT_LIST)
@ -121,9 +122,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
hasPage++;
} }
}else { }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() + ""); 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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); 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()+""); chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
} }
}else { }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() + ""); 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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); 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 httpParams = new HttpParams();
httpParams.put("type", "4"); httpParams.put("type", "4");
httpParams.put("pageSize", "10"); httpParams.put("pageSize", "10");
httpParams.put("pageNum", "2"); httpParams.put("pageNum", hasPage);
OkGoBuilder.getInstance() OkGoBuilder.getInstance()
.Builder(getActivity()) .Builder(getActivity())
.url(HttpInterface.GET_COMMIT_LIST) .url(HttpInterface.GET_COMMIT_LIST)
@ -197,9 +200,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
hasPage++;
} }
}else { }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() + ""); 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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); 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 httpParams = new HttpParams();
httpParams.put("type", "3"); httpParams.put("type", "3");
httpParams.put("pageSize", "10"); httpParams.put("pageSize", "10");
httpParams.put("pageNum", "2"); httpParams.put("pageNum", hasPage);
OkGoBuilder.getInstance() OkGoBuilder.getInstance()
.Builder(getActivity()) .Builder(getActivity())
.url(HttpInterface.GET_COMMIT_LIST) .url(HttpInterface.GET_COMMIT_LIST)
@ -235,9 +239,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
hasPage++;
} }
}else { }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() + ""); 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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); 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 httpParams = new HttpParams();
httpParams.put("type", "1"); httpParams.put("type", "1");
httpParams.put("pageSize", "10"); httpParams.put("pageSize", "10");
httpParams.put("pageNum", "2"); httpParams.put("pageNum", hasPage);
OkGoBuilder.getInstance() OkGoBuilder.getInstance()
.Builder(getActivity()) .Builder(getActivity())
.url(HttpInterface.GET_COMMIT_LIST) .url(HttpInterface.GET_COMMIT_LIST)
@ -273,10 +278,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
auditProcess.setText(hasSubmitBeanBody.getAuditingCount()+""); auditProcess.setText(hasSubmitBeanBody.getAuditingCount()+"");
auditThrough.setText(hasSubmitBeanBody.getPassCount()+""); auditThrough.setText(hasSubmitBeanBody.getPassCount()+"");
auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+"");
hasPage++;
Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + "");
} }
}else { }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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show();
} }
}); });
} }

4
app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
View File

@ -114,7 +114,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
@Override @Override
public void onSuccess(GetPriceBean response, int id) { public void onSuccess(GetPriceBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
// Toast.makeText(getContext(), "获取成功", Toast.LENGTH_SHORT).show();
if (response.getCode() == 200){ if (response.getCode() == 200){
GetPriceBean.BodyBean body = response.getBody(); GetPriceBean.BodyBean body = response.getBody();
if (body!=null){ if (body!=null){
@ -122,7 +121,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
tvMoney.setText(userPrice + ""); tvMoney.setText(userPrice + "");
} }
}else { }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 @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
// Toast.makeText(getContext(), "获取失败"+e.getMessage(), Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });

6
app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
View File

@ -503,7 +503,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
} }
}).start(); }).start();
} else { } 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); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 101 && resultCode == RESULT_OK) { if (requestCode == 101 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
String s = PhotoUtils.showPhotoAndGetPath(file, ivPicture); 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) { } else if (requestCode == 102 && resultCode == RESULT_OK) {
//照片路径 //照片路径
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {

38
app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
View File

@ -365,6 +365,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (name != null && !name.equals("")) { if (name != null && !name.equals("")) {
editNameContent.setText(name + ""); editNameContent.setText(name + "");
} }
if (editNameContent.getText().toString()!=null||editNameContent!=null){
editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override @Override
public void onFocusChange(View v, boolean hasFocus) { public void onFocusChange(View v, boolean hasFocus) {
@ -373,6 +374,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
} }
} }
}); });
}else {
Toast.makeText(getActivity(), "请输入名称", Toast.LENGTH_SHORT).show();
}
String address = showPoiEntity.getAddress();//地址 String address = showPoiEntity.getAddress();//地址
if (address != null && !address.equals("")) { if (address != null && !address.equals("")) {
editSiteContent.setText(address); editSiteContent.setText(address);
@ -502,7 +507,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
dismissLoadingDialog(); dismissLoadingDialog();
if (getPhoneBean.getCode() == 200) { if (getPhoneBean.getCode() == 200) {
String code = getPhoneBean.getBody().getCode(); String code = getPhoneBean.getBody().getCode();
// Toast.makeText(getActivity(), code+"", Toast.LENGTH_SHORT).show();
Constant.CODE = code; Constant.CODE = code;
}else { }else {
Toast.makeText(getActivity(), getPhoneBean.getMessage()+"", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), getPhoneBean.getMessage()+"", Toast.LENGTH_SHORT).show();
@ -592,14 +596,16 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (tagInternal != null) { if (tagInternal != null) {
poiPicList.add(new File(tagInternal)); poiPicList.add(new File(tagInternal));
} }
String tagElse = (String) tvElse.getTag();
if (tagElse != null) {
poiPicList.add(new File(tagElse));
}
String tagCard = (String) tvCard.getTag(); String tagCard = (String) tvCard.getTag();
if (tagCard != null) { if (tagCard != null) {
poiPicList.add(new File(tagCard)); poiPicList.add(new File(tagCard));
} }
String tagElse = (String) tvElse.getTag();
if (tagElse != null) {
poiPicList.add(new File(tagElse));
}
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -623,7 +629,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
case R.id.rl_panorama: case R.id.rl_panorama:
Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE");
file = PhotoUtils.showPhotoFile("a", latLng); file = PhotoUtils.showPhotoFile("a", latLng);
;
intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentPanorama, 101); startActivityForResult(intentPanorama, 101);
break; break;
@ -677,16 +682,16 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
str += body.get(i) + ","; str += body.get(i) + ",";
} }
if (str != null) { if (str != null) {
Toast.makeText(getContext(), "存在类似名称---" + str, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "存在类似名称---" + str, Toast.LENGTH_SHORT).show();
str = ""; str = "";
} else { } else {
Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
} }
} else { } else {
Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
} }
} else { } 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(); }).start();
} else { } 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("")) { if (tagInternal != null && !tagInternal.equals("")) {
infoPhoto.add(new Info(tagInternal)); 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(); String tagCard = (String) tvCard.getTag();
if (tagCard != null && !tagCard.equals("")) { if (tagCard != null && !tagCard.equals("")) {
infoPhoto.add(new Info(tagCard)); infoPhoto.add(new Info(tagCard));
} }
String tagElse = (String) tvElse.getTag();
if (tagElse != null && !tagElse.equals("")) {
infoPhoto.add(new Info(tagElse));
}
poiEntity.setPhotoInfo(infoPhoto); poiEntity.setPhotoInfo(infoPhoto);
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
@ -1132,7 +1138,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
} }
if (contactView.getPhoneList()!=-1){ if (contactView.getPhoneList()!=-1){
poiCheckResult.setCode(1); poiCheckResult.setCode(1);
poiCheckResult.setMsg("您第"+contactView.getPhoneList()+"手机号输入有误"); poiCheckResult.setMsg("您第"+contactView.getPhoneList()+"个手机号输入有误");
return poiCheckResult; return poiCheckResult;
} }
if (entity.getTelPhone() == null) { if (entity.getTelPhone() == null) {

4
app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java
View File

@ -126,7 +126,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
initHasSubmitBean(hasSubmitBean,aBoolean); initHasSubmitBean(hasSubmitBean,aBoolean);
} }
}else { }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) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show();
} }
}); });
dismissDialog(); dismissDialog();

6
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@ -348,7 +348,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}).start(); }).start();
} else { } else {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show();
return; return;
} }
break; break;
@ -433,7 +433,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR; obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true; obtain.obj = true;
@ -444,7 +444,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
} }
}).start(); }).start();
}else { }else {
Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show();
} }
} }

18
app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
View File

@ -92,7 +92,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
break; break;
case R.id.register_get_note: case R.id.register_get_note:
if (!RegexUtil.isPhone(etRegisterPhone.getText().toString())){ if (!RegexUtil.isPhone(etRegisterPhone.getText().toString())){
Toast.makeText(getContext(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show();
return; return;
}else { }else {
registerNote(); registerNote();
@ -106,7 +106,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
String mobile = etRegisterPhone.getText().toString().trim(); String mobile = etRegisterPhone.getText().toString().trim();
if (!RegexUtil.isPhone(mobile)) { if (!RegexUtil.isPhone(mobile)) {
Toast.makeText(getContext(), "请输入手机号", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请输入手机号", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("mobile", mobile); httpParams.put("mobile", mobile);
@ -126,7 +126,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
sessionId = response.getBody(); sessionId = response.getBody();
Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show();
}else { }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(); HttpParams httpParams = new HttpParams();
String mobile = etRegisterPhone.getText().toString().trim(); String mobile = etRegisterPhone.getText().toString().trim();
if (!RegexUtil.isPhone(mobile)) { if (!RegexUtil.isPhone(mobile)) {
Toast.makeText(getContext(), "手机号错误", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "手机号错误", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("mobile", mobile); httpParams.put("mobile", mobile);
} }
String code = etRegisterNote.getText().toString().trim(); String code = etRegisterNote.getText().toString().trim();
if (code == null || code.equals("")) { if (code == null || code.equals("")) {
Toast.makeText(getContext(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请获取短信验证码", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("code", code); httpParams.put("code", code);
} }
String password = etRegisterPaw.getText().toString().trim(); String password = etRegisterPaw.getText().toString().trim();
if (password == null || password.equals("")) { if (password == null || password.equals("")) {
Toast.makeText(getContext(), "请输入密码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请输入密码", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
try { try {
@ -169,15 +169,15 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
} }
String conFirmPaw = etRegisterConfirmPaw.getText().toString().trim(); String conFirmPaw = etRegisterConfirmPaw.getText().toString().trim();
if (conFirmPaw == null || conFirmPaw.equals("")) { if (conFirmPaw == null || conFirmPaw.equals("")) {
Toast.makeText(getContext(), "请输入确认密码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请输入确认密码", Toast.LENGTH_SHORT).show();
return; return;
} }
if (!conFirmPaw.equals(password)) { if (!conFirmPaw.equals(password)) {
Toast.makeText(getContext(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show();
return; return;
} }
if (sessionId == null || sessionId.equals("")) { if (sessionId == null || sessionId.equals("")) {
Toast.makeText(getContext(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请短信获取验证码", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
httpParams.put("sessionId", sessionId); httpParams.put("sessionId", sessionId);

20
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@ -350,7 +350,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
}).start(); }).start();
} else { } else {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show();
return; return;
} }
break; break;
@ -385,14 +385,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
}).start(); }).start();
//onBackPressed(); //onBackPressed();
} else { } else {
Toast.makeText(getContext(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onDenied(List<String> permissions, boolean never) { public void onDenied(List<String> permissions, boolean never) {
if (never) { if (never) {
Toast.makeText(getContext(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show();
// 如果是被永久拒绝就跳转到应用权限系统设置页面 // 如果是被永久拒绝就跳转到应用权限系统设置页面
XXPermissions.startPermissionActivity(getActivity(), permissions); XXPermissions.startPermissionActivity(getActivity(), permissions);
} }
@ -404,11 +404,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
private void poiVideoUpload(int body, File fileZip) { private void poiVideoUpload(int body, File fileZip) {
if (body == 0) { if (body == 0) {
Toast.makeText(getContext(), "请先保存本地上传", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请先保存本地上传", Toast.LENGTH_SHORT).show();
return; return;
} }
if (fileZip == null) { if (fileZip == null) {
Toast.makeText(getContext(), "未压缩完成", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show();
return; return;
} }
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
@ -437,7 +437,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
Toast.makeText(getContext(), "上传成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR; obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true; obtain.obj = true;
@ -448,14 +448,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
}).start(); }).start();
}else { }else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), "上传失败", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + e.getMessage() + ""); Log.d("TAG", "onError: " + e.getMessage() + "");
} }
}); });
@ -507,10 +507,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
} else { } else {
Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} }

8
app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
View File

@ -132,7 +132,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
@Subscribe @Subscribe
public void onEvent(Message data) { public void onEvent(Message data) {
if (data.what == Constant.EVENT_STAY_REFRESH) { 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(); dismissLoadingDialog();
refreshData(); refreshData();
} }
@ -224,7 +224,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
setLoadingDialogText("提交中..."); setLoadingDialogText("提交中...");
PoiSaveUtils.getInstance(getActivity()).uploadPoiEntityBatch(poiEntities); PoiSaveUtils.getInstance(getActivity()).uploadPoiEntityBatch(poiEntities);
} else { } else {
Toast.makeText(getContext(), "请选择要删除的条目数据", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请选择要删除的条目数据", Toast.LENGTH_SHORT).show();
} }
break; break;
@ -281,14 +281,14 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
if (response.getCode()==200){ if (response.getCode()==200){
staySubmitAdapter.setAllCheckedDelete(); staySubmitAdapter.setAllCheckedDelete();
}else { }else {
Toast.makeText(getContext(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show();
} }
}); });

14
app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
View File

@ -87,6 +87,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
public void onClick(int pos) { public void onClick(int pos) {
Intent itemIntent = new Intent(getActivity(), FragmentManagement.class); Intent itemIntent = new Intent(getActivity(), FragmentManagement.class);
itemIntent.putExtra("tag", 10); itemIntent.putExtra("tag", 10);
itemIntent.putExtra("id",fId);
startActivity(itemIntent); startActivity(itemIntent);
} }
@ -118,22 +119,21 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
if (response.getCode() == 200){ if (response.getCode() == 200){
taskExplainAdapter.setExplainList(response.getBody().getList()); taskExplainAdapter.setExplainList(response.getBody().getList());
TaskPrefectureBean.BodyBean body = response.getBody(); TaskPrefectureBean.BodyBean body = response.getBody();
List<TaskPrefectureBean.BodyBean.ListBean> list = body.getList(); // List<TaskPrefectureBean.BodyBean.ListBean> list = body.getList();
for (int i = 0; i < list.size(); i++) { // for (int i = 0; i < list.size(); i++) {
fId = list.get(i).getId(); // fId = list.get(i).getId();
} // }
taskPage++; taskPage++;
}else { }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() + ""); Log.d("TAG", "onSuccess: " + response.getMessage() + "");
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
// Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });

2
app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java
View File

@ -117,7 +117,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList()); taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
taskPage++; taskPage++;
}else { }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() + ""); Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "");

4
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@ -128,6 +128,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private List<Removable> removables; private List<Removable> removables;
private List<Removable> removableScreenMarker; private List<Removable> removableScreenMarker;
private List<Removable> removablesLocality; private List<Removable> removablesLocality;
private int treasurePage=1;
/** /**
* bitmapDescriptor1 * bitmapDescriptor1
*/ */
@ -360,7 +361,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
httpParams.put("userGeo", userEncode); httpParams.put("userGeo", userEncode);
httpParams.put("centerGeo", centerEncode); httpParams.put("centerGeo", centerEncode);
httpParams.put("pageSize", Constant.NUMBER); httpParams.put("pageSize", Constant.NUMBER);
httpParams.put("pageNum", "1"); httpParams.put("pageNum", treasurePage);
httpParams.put("type", task_type); httpParams.put("type", task_type);
httpParams.put("isExclusive", limit_type); httpParams.put("isExclusive", limit_type);
OkGoBuilder.getInstance() OkGoBuilder.getInstance()
@ -528,6 +529,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break; break;
} }
} }
treasurePage++;
} }
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.JOB_SEARCH_WORD; obtain.what = Constant.JOB_SEARCH_WORD;

20
app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
View File

@ -180,7 +180,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
break; break;
case R.id.btn_attestation: case R.id.btn_attestation:
if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) { if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) {
Toast.makeText(getContext(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show();
return; return;
} }
if (!chineseNameTest(etAttestationName.getText().toString())) { if (!chineseNameTest(etAttestationName.getText().toString())) {
@ -188,7 +188,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
return; return;
} }
if (!checkNum(etNamePhone.getText().toString().trim())) { if (!checkNum(etNamePhone.getText().toString().trim())) {
Toast.makeText(getContext(), "身份证号错误，请重新输入", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "身份证号错误，请重新输入", Toast.LENGTH_SHORT).show();
return; return;
} }
nameAuthentication(); nameAuthentication();
@ -224,23 +224,23 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
private void nameAuthentication() { private void nameAuthentication() {
if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) { if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) {
Toast.makeText(getContext(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show();
return; return;
} }
if (!checkNum(etNamePhone.getText().toString().trim())) { if (!checkNum(etNamePhone.getText().toString().trim())) {
Toast.makeText(getContext(), "身份证错误，请重新输入", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "身份证错误，请重新输入", Toast.LENGTH_SHORT).show();
return; return;
} }
if (tvCard1.getTag() == null) { if (tvCard1.getTag() == null) {
Toast.makeText(getContext(), "请拍照 身份证人像面", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 身份证人像面", Toast.LENGTH_SHORT).show();
return; return;
} }
if (tvCard2.getTag() == null) { if (tvCard2.getTag() == null) {
Toast.makeText(getContext(), "请拍照 身份证国徽面", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 身份证国徽面", Toast.LENGTH_SHORT).show();
return; return;
} }
if (tvCard3.getTag() == null) { if (tvCard3.getTag() == null) {
Toast.makeText(getContext(), "请拍照 手持身份证", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请拍照 手持身份证", Toast.LENGTH_SHORT).show();
return; return;
} }
@ -307,7 +307,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 121 && resultCode == RESULT_OK) { if (requestCode == 121 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -332,7 +332,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
// } // }
} else if (requestCode == 122 && resultCode == RESULT_OK) { } else if (requestCode == 122 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {
@ -357,7 +357,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
// } // }
} else if (requestCode == 123 && resultCode == RESULT_OK) { } else if (requestCode == 123 && resultCode == RESULT_OK) {
if (file == null || !file.exists()) { if (file == null || !file.exists()) {
Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "没有拍摄照片", Toast.LENGTH_SHORT).show();
return; return;
} else { } else {

14
app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
View File

@ -89,7 +89,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) { if (isChecked) {
if (Constant.ID_NUMBER==null||Constant.BANKACCOUNT==null){ 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); checkBox.setChecked(false);
}else { }else {
checkBox.setChecked(true); checkBox.setChecked(true);
@ -177,16 +177,16 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
if (price!=null&&!price.equals("")){ if (price!=null&&!price.equals("")){
Integer integer = Integer.valueOf(price); Integer integer = Integer.valueOf(price);
if (integer!=null&&integer<10){ if (integer!=null&&integer<10){
Toast.makeText(getContext(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show();
return; return;
} }
}else { }else {
Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "提现金额不能为空", Toast.LENGTH_SHORT).show();
return; return;
} }
if (!checkBox.isChecked()) { if (!checkBox.isChecked()) {
Toast.makeText(getContext(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请勾选银行卡", Toast.LENGTH_SHORT).show();
return; return;
} }
if (Constant.ID_NUMBER != null) { if (Constant.ID_NUMBER != null) {
@ -199,7 +199,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
} }
}); });
} else { } else {
Toast.makeText(getContext(), "请先绑定银行卡", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请先绑定银行卡", Toast.LENGTH_SHORT).show();
return; return;
} }
@ -228,7 +228,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
@Override @Override
public void onSuccess(UserPriceExchangeBean response, int id) { public void onSuccess(UserPriceExchangeBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
if (response.getCode() == 200) { if (response.getCode() == 200) {
String unit = tvUnit.getText().toString(); String unit = tvUnit.getText().toString();
String price = etAllPrice.getText().toString(); String price = etAllPrice.getText().toString();
@ -246,7 +246,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); 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()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });

2
app/src/main/res/layout/activity_statement.xml
View File

@ -24,7 +24,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp" android:layout_marginLeft="20dp"
android:src="@drawable/icon_arrow" android:src="@drawable/icon_arrow"
/> />