From f2a48b9a2a9529c2a49aa3a769190b940df031a6 Mon Sep 17 00:00:00 2001 From: md Date: Tue, 6 Jul 2021 18:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0'=E5=85=B6=E4=BB=96'+?= =?UTF-8?q?=E2=80=98poi=E2=80=99=E7=9A=84=E4=BF=9D=E5=AD=98=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/UserActivity.java | 1 - .../com/navinfo/outdoor/api/Constant.java | 23 +++--- .../com/navinfo/outdoor/bean/PoiSaveBean.java | 32 ++++++++ .../fragment/CapacityEvaluationFragment.java | 6 +- .../fragment/EventPrefectureFragment.java | 2 +- .../outdoor/fragment/MessageFragment.java | 2 +- .../outdoor/fragment/OtherFragment.java | 76 ++++++++++++++++++- .../navinfo/outdoor/fragment/PoiFragment.java | 70 +++++++++++++++-- .../outdoor/fragment/StaySubmitFragment.java | 6 +- .../outdoor/fragment/TaskExplainFragment.java | 2 +- .../outdoor/fragment/WithdrawFragment.java | 2 +- .../navinfo/outdoor/http/HttpInterface.java | 18 ++++- 13 files changed, 204 insertions(+), 38 deletions(-) create mode 100644 app/src/main/java/com/navinfo/outdoor/bean/PoiSaveBean.java diff --git a/app/build.gradle b/app/build.gradle index 3b14d7f..0559a03 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/UserActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java index 47d1528..6243a47 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -136,7 +136,6 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { return; } - if (!RegexUtil.isPhone(userphone)) { Toast.makeText(this, "手机号输入错误", Toast.LENGTH_SHORT).show(); return; diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 4197409..b221f5b 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -20,16 +20,16 @@ public class Constant { * 位置权限 */ public static final String SET_LOCATION_PERMISSION = "请在“设置”中给予“TengXunMap”位置权限,否则当前功能将不可使用"; - public static final String SET_LOCATION= "请在“设置”中给予权限否则当前功能将不可使用"; + public static final String SET_LOCATION = "请在“设置”中给予权限否则当前功能将不可使用"; public static final String GET_ERR_MESSAGE1 = "设备缺少使用腾讯定位服务需要的基本条件"; public static final String GET_ERR_MESSAGE2 = "manifest 中配置的 key 不正确"; public static final String GET_ERR_MESSAGE3 = "自动加载libtencentloc.so失败"; - public static final String BASE_FOLDER = SdkFolderCreate.getSDPath()+"/navinfoOutDoor"; + public static final String BASE_FOLDER = SdkFolderCreate.getSDPath() + "/navinfoOutDoor"; // 保存图片的目录 - public static final String PICTURE_FOLDER = BASE_FOLDER+"/picture"; - public static final String POI_DAO = BASE_FOLDER+"/BaseDao/"; + public static final String PICTURE_FOLDER = BASE_FOLDER + "/picture"; + public static final String POI_DAO = BASE_FOLDER + "/BaseDao/"; // 申请权限的RequestCode public static final int PERMISSION_REQUEST_CODE = 0x100; @@ -40,7 +40,6 @@ public class Constant { public static final String DATA_FILE = "dataFile"; - //message word 值 public static final int TREASURE_FRAGMENT = 100;//抽屉界面的展示和隐藏 public static final int TREASURE_WORD = 0;//poi 对地图页面marker 的一个展示 @@ -56,22 +55,22 @@ public class Constant { public static final int MAIN_CHARGING_STATION = 13;//充电站的Fragment 对地图页面marker 的一个展示 public static final int CHARGING_STATION_WORD = 15;//地图页面marker 的经纬都回传 public static final int CHARGING_STATION = 16;//跳转到充电桩 - public static final int MAIN_CHARGING_PILE= 18;//充电桩的Fragment 对地图页面marker 的一个展示 + public static final int MAIN_CHARGING_PILE = 18;//充电桩的Fragment 对地图页面marker 的一个展示 public static final int CHARGING_PILE_WORD = 20;//地图页面marker 的经纬都回传 public static final int CHARGING_PILE_STATION = 22;//将充电桩的数据回传给充电站 public static final int MAIN_OTHER = 23;//其他的Fragment 对地图页面marker 的一个展示 public static final int OTHER_WORD = 25;//地图页面marker 的经纬都回传 public static final int CHARGING_STATION_PILE = 26;//跳转到充电桩 传给数据 - + public static final int CAPACITY_EVALUATION_PAGE = 1;//能力测评的页数 public static final int JOB_SEARCH_WORD = 28;//任务搜索的数据 public static final int GATHER_GET_MAP = 30;//地图点击marker 后弹窗点击开始采集 public static final int HOME_MINE = 32;//点击我的实时监听刷新 - public static String USER_ATTESTATION_NAME; //实名认证姓名 银行卡 - public static int NUMBER =200; //任务个数 - public static String PHOTOGRAPH ="全部"; //任务类型 - public static String EXCLUSIVE ="全部"; - public static String TYPE ="全部"; + public static String USER_ATTESTATION_NAME; //实名认证姓名 银行卡 + public static int NUMBER = 200; //任务个数 + public static String PHOTOGRAPH = "全部"; //任务类型 + public static String EXCLUSIVE = "全部"; + public static String TYPE = "全部"; /** * 用户当前位置 */ diff --git a/app/src/main/java/com/navinfo/outdoor/bean/PoiSaveBean.java b/app/src/main/java/com/navinfo/outdoor/bean/PoiSaveBean.java new file mode 100644 index 0000000..997e410 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/bean/PoiSaveBean.java @@ -0,0 +1,32 @@ +package com.navinfo.outdoor.bean; + +public class PoiSaveBean { + + private Integer code; + private String message; + private Integer body; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Integer getBody() { + return body; + } + + public void setBody(Integer body) { + this.body = body; + } +} diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java index 63c573f..e573b30 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java @@ -14,6 +14,7 @@ import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.adapter.CapacityEvaluationAdapter; +import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseFragment; import com.navinfo.outdoor.bean.CapacityMeasureBean; import com.navinfo.outdoor.bean.TaskExplainInfo; @@ -37,6 +38,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC private XRecyclerView capacityEvaluationRecycler; private CapacityEvaluationAdapter capacityEvaluationAdapter; + public static CapacityEvaluationFragment newInstance(Bundle bundle) { CapacityEvaluationFragment fragment = new CapacityEvaluationFragment(); fragment.setArguments(bundle); @@ -95,8 +97,8 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("fid","1"); - httpParams.put("pageNum","1"); - httpParams.put("pageSize","2"); + httpParams.put("pageNum", "1"); + httpParams.put("pageSize","10"); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.MSG_LISt) 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 b02bdf0..4562e76 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java @@ -64,7 +64,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic HttpParams httpParams = new HttpParams(); httpParams.put("fid", "1"); httpParams.put("pageNum", "1"); - httpParams.put("pageSize", "2"); + httpParams.put("pageSize", "10"); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.listEvent) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java index f304ac1..b682a72 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java @@ -74,7 +74,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene HttpParams httpParams = new HttpParams(); httpParams.put("fid", "1"); httpParams.put("pageNum", "1"); - httpParams.put("pageSize", "2"); + httpParams.put("pageSize", "10"); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.listTask) 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 84158f4..ad76c78 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -34,20 +34,31 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.util.DialogSettings; import com.kongzue.dialog.v3.MessageDialog; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.HttpParams; +import com.lzy.okgo.model.Response; import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.bean.Info; +import com.navinfo.outdoor.bean.NameAuthenticationBean; import com.navinfo.outdoor.bean.PoiBean; +import com.navinfo.outdoor.bean.PoiSaveBean; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.DialogCallback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.room.PoiDao; import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.room.PoiEntity; +import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.PhotoPathUtil; import com.tencent.tencentmap.mapsdk.maps.model.LatLng; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; +import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -76,6 +87,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private PoiEntity showPoiEntity; private LatLng latLng; private int station_type=0; + private String name; + private ArrayList otheruploadList; + private String takePhotoPath; + private String takePhotoPath2; public static OtherFragment newInstance(Bundle bundle) { OtherFragment fragment = new OtherFragment(); @@ -261,7 +276,8 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis PoiEntity poiEntity = new PoiEntity(); List infoList = new ArrayList<>(); - String name = editTaskName.getText().toString().trim();//名称 + //名称 + name = editTaskName.getText().toString().trim(); if (name == null || name.equals("")) { Toast.makeText(getActivity(), "请输入poi 名称", Toast.LENGTH_SHORT).show(); return; @@ -316,6 +332,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }).start(); + otherSaveByNetWork(poiEntity); onBackPressed(); } else { Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); @@ -334,10 +351,59 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis break; case R.id.btn_other_uploading: + otherUploadByNet(); break; } } + private void otherUploadByNet() { + showLoadingDialog(); + otheruploadList = new ArrayList<>(); + File otherUploadFile = new File(takePhotoPath); + File otherUploadFile2 = new File(takePhotoPath2); + if (!otherUploadFile.exists() || !otherUploadFile2.exists()){ + Toast.makeText(getContext(), "照片不能为空", Toast.LENGTH_SHORT).show(); + return; + } + otheruploadList.add(otherUploadFile); + otheruploadList.add(otherUploadFile2); + + + } + + private void otherSaveByNetWork(PoiEntity poiEntity) { + showLoadingDialog(); + HttpParams httpParams = new HttpParams(); + httpParams.put("type",poiEntity.getStation_type()); + httpParams.put("taskId", poiEntity.getTaskId()); + httpParams.put("name", name); + httpParams.put("existence", "1"); + String encode = Geohash.getInstance().encode(Double.valueOf(poiEntity.getY()), Double.valueOf(poiEntity.getX())); + httpParams.put("geo", encode); + httpParams.put("memo", poiEntity.getMemo()); + + OkGoBuilder.getInstance() + .Builder(getActivity()) + .url(HttpInterface.SUBMIT_OTHER_TASK) + .method(OkGoBuilder.GET) + .cls(PoiSaveBean.class) + .params(httpParams) + .callback(new Callback() { + @Override + public void onSuccess(PoiSaveBean poiSaveBean, int id) { + dismissLoadingDialog(); + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Log.d("TAG", "onError: " + e.getMessage()); + } + }).build(); + } + /** * 防止当页面崩溃后出现数据丢失 */ @@ -412,7 +478,8 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }); } else { - String takePhotoPath = PhotoPathUtil.getTakePhotoPath(data, "a");//照片路径 + //照片路径 + takePhotoPath = PhotoPathUtil.getTakePhotoPath(data, "a"); ivPicture.setTag(takePhotoPath); ivPicture.setImageBitmap(bitmap);//显示图像 @@ -433,8 +500,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }); } else { - String takePhotoPath = PhotoPathUtil.getTakePhotoPath(data, "b");//照片路径 - ivPictures.setTag(takePhotoPath); + //照片路径 + takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "b"); + ivPictures.setTag(takePhotoPath2); ivPictures.setImageBitmap(bitmap);//显示图像 } } 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 5856536..4142353 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -36,15 +36,22 @@ import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.util.DialogSettings; import com.kongzue.dialog.v3.MessageDialog; import com.kongzue.dialog.v3.ShareDialog; +import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.adapter.PoiRecycleAdapter; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.bean.Info; import com.navinfo.outdoor.bean.PoiBean; +import com.navinfo.outdoor.bean.PoiSaveBean; +import com.navinfo.outdoor.bean.TaskPrefectureBean; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.room.PoiDao; import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.room.PoiEntity; +import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.PhotoPathUtil; import com.tencent.tencentmap.mapsdk.maps.model.LatLng; @@ -83,6 +90,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private CheckBox checkBoxRight; private PoiEntity showPoiEntity; private LatLng latLng; + private String name; + private String site; public static PoiFragment newInstance(Bundle bundle) { PoiFragment fragment = new PoiFragment(); @@ -324,14 +333,15 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe //保存数据库： PoiEntity poiEntity = new PoiEntity(); ArrayList infoPhoto = new ArrayList<>(); - String name = editNameContent.getText().toString().trim();//名称 + //名称 + name = editNameContent.getText().toString().trim(); if (name == null || name.equals("")) { Toast.makeText(getActivity(), "请输入poi 名称", Toast.LENGTH_SHORT).show(); return; } else { poiEntity.setName(name); } - String site = editSiteContent.getText().toString().trim(); + site = editSiteContent.getText().toString().trim(); if (site == null || site.equals("")) { Toast.makeText(getActivity(), "请输入poi 地址", Toast.LENGTH_SHORT).show(); return; @@ -372,7 +382,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } else { infoPhoto.add(new Info(tagName)); } - if (showPoiEntity.getTaskId()!=0){ + if (showPoiEntity.getTaskId() != 0) { poiEntity.setTaskId(showPoiEntity.getTaskId()); } String tagInternal = (String) ivInternal.getTag(); @@ -387,8 +397,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (tagCard != null) { infoPhoto.add(new Info(tagCard)); } - if (showPoiEntity.getTaskId()!=0){ - poiEntity.setTaskId(showPoiEntity.getTaskId()); + if (showPoiEntity != null) { + if (showPoiEntity.getTaskId() != 0) { + poiEntity.setTaskId(showPoiEntity.getTaskId()); + } } poiEntity.setPhotoInfo(infoPhoto); DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -404,6 +416,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe poiDao.insertPoiEntity(poiEntity); } }).start(); + poiSaveByNet(poiEntity); onBackPressed(); } else { Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); @@ -455,6 +468,49 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } } + private void poiSaveByNet(PoiEntity poiEntity) { + showLoadingDialog(); + HttpParams httpParams = new HttpParams(); + if (poiEntity.getTaskId() != 0) { + httpParams.put("taskId", poiEntity.getTaskId()); + } + if (name != null && !name.equals("")) { + httpParams.put("name", name); + } + if (site != null && !site.equals("")) { + httpParams.put("address", site); + } + httpParams.put("existence", "1"); + if (poiEntity.getY() != null && poiEntity.getX() != null) { + String encode = Geohash.getInstance().encode(Double.valueOf(poiEntity.getY()), Double.valueOf(poiEntity.getX())); + httpParams.put("geo", encode); + } + if (poiEntity.getMemo() != null) { + httpParams.put("memo", poiEntity.getMemo()); + } + + OkGoBuilder.getInstance() + .Builder(getActivity()) + .url(HttpInterface.SUBMIT_POI_TASK) + .method(OkGoBuilder.GET) + .cls(PoiSaveBean.class) + .params(httpParams) + .callback(new Callback() { + @Override + public void onSuccess(PoiSaveBean poiSaveBean, int id) { + dismissLoadingDialog(); + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Log.d("TAG", "onError: " + e.getMessage()); + } + }).build(); + } + /** * 防止当页面崩溃后出现数据丢失 */ @@ -509,10 +565,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (tagCard != null && !tagCard.equals("")) { infoPhoto.add(new Info(tagCard)); } - if (showPoiEntity.getTaskId()!=0){ + if (showPoiEntity.getTaskId() != 0) { poiEntity.setTaskId(showPoiEntity.getTaskId()); } - if (showPoiEntity.getTaskId()!=0){ + if (showPoiEntity.getTaskId() != 0) { poiEntity.setTaskId(showPoiEntity.getTaskId()); } poiEntity.setPhotoInfo(infoPhoto); 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 c90170d..f638dc3 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -144,11 +144,11 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList public void onClick(String text, int index) { switch (index){ case 0: - List poiEntities = initRoadWord(0); + List poiEntities = initRoadWord(1); staySubmitAdapter.setAllRoad(poiEntities); break; case 1: - List poiEntitiesList = initRoadWord(1); + List poiEntitiesList = initRoadWord(4); staySubmitAdapter.setAllRoad(poiEntitiesList); break; case 2: @@ -156,7 +156,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList staySubmitAdapter.setAllRoad(poiEntities1); break; case 3: - List poiEntities2 = initRoadWord(3); + List poiEntities2 = initRoadWord(5); staySubmitAdapter.setAllRoad(poiEntities2); break; } 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 6044729..15b0f6b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -99,7 +99,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis HttpParams httpParams = new HttpParams(); httpParams.put("fid", "1"); httpParams.put("pageNum", "1"); - httpParams.put("pageSize", "2"); + httpParams.put("pageSize", "10"); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.listTaskExplain) 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 b7ea86e..8cd071d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -151,7 +151,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen private void immediatelyPrice() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); - httpParams.put("exchangeMoney", "10"); + httpParams.put("exchangeMoney", etAllPrice.getText().toString()); httpParams.put("payType", "1"); OkGoBuilder.getInstance() .Builder(getActivity()) diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index 32ac28b..07068e2 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -43,21 +43,31 @@ public class HttpInterface { public static final String IPm5 = "http://172.23.139.4:8004/userPrice/1/"; //http://172.23.139.4:8004/userPrice/1/getPrice - public static final String GET_PRICE = IPm5 + "getPrice";//总资产 + public static final String GET_PRICE = IPm5 + "getPrice";//我的-总资产 //http://172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1 - public static final String USER_PRICE_EXCHANGE = IPm5 + "userPriceExchange"; + public static final String USER_PRICE_EXCHANGE = IPm5 + "userPriceExchange";//我的-财务信息-提现 public static final String IPm6 = "http://172.23.139.4:8003/othertask/1/"; //172.23.139.4:8003/othertask/1/receivedOthertask/5001 - public static final String RECEIVED_OTHER_TASK = IPm6 + "receivedOthertask/5001"; + public static final String RECEIVED_OTHER_TASK = IPm6 + "receivedOthertask/5001";//其他-领取任务 public static final String IPm7 = "http://172.23.139.4:8003/poitask/1/"; //172.23.139.4:8003/poitask/1/receivedPoitask/1 - public static final String RECEIVED_POI_TASK = IPm7+"receivedPoitask/1"; + public static final String RECEIVED_POI_TASK = IPm7+"receivedPoitask/1";//poi-领取任务 + + public static final String IPm8 = "http://172.23.139.4:8003/poitask/1/"; + //172.23.139.4:8003/poitask/1/submitPoitask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注 + + public static final String SUBMIT_POI_TASK = IPm8+"submitPoitask";//poi-保存本地 + + public static final String IPm9 = "http://172.23.139.4:8003/othertask/1/"; + //172.23.139.4:8003/othertask/1/submitOhtertask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注 + + public static final String SUBMIT_OTHER_TASK = IPm9+"submitOthertask";//其他-保存本地 }