From 4696a7dd29d4c4206b2a50dea5eb7516517c9ebc Mon Sep 17 00:00:00 2001 From: md Date: Mon, 5 Jul 2021 17:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=98=E7=AD=9B=E9=80=89-?= =?UTF-8?q?=E7=82=B9=E5=87=BBitem=E7=9A=84=E9=A2=86=E5=8F=96=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/UserActivity.java | 13 ++- .../navinfo/outdoor/bean/ReceivedPoiBean.java | 89 +++++++++++++++++++ .../outdoor/fragment/GatherGetFragment.java | 51 +++++++++++ .../outdoor/fragment/StaySubmitFragment.java | 8 ++ .../outdoor/fragment/WithdrawFragment.java | 23 +++-- .../navinfo/outdoor/http/HttpInterface.java | 18 +++- app/src/main/res/layout/picture_mapview.xml | 17 ++++ 8 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java create mode 100644 app/src/main/res/layout/picture_mapview.xml diff --git a/app/build.gradle b/app/build.gradle index 554a859..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 72dc6ce..47d1528 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -59,6 +59,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { private String userqq; private String userphone; private String usermailbox; + private String region_id; @Override @@ -129,7 +130,13 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { // 邮箱匹配结果 boolean isEmail_matcher = usermailbox.matches( "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$"); //&& userqq.length() < 11 && userqq.length() > 5 - if (TextUtils.isEmpty(userphone) || TextUtils.isEmpty(userqq) || TextUtils.isEmpty(usermailbox)) { + if (TextUtils.isEmpty(userphone) || TextUtils.isEmpty(userqq) || TextUtils.isEmpty(usermailbox)|| TextUtils.isEmpty(region_id)) { + if (region_id == null || region_id.equals("")) { + Toast.makeText(this, "所在地区为空，请重新输入", Toast.LENGTH_SHORT).show(); + return; + } + + if (!RegexUtil.isPhone(userphone)) { Toast.makeText(this, "手机号输入错误", Toast.LENGTH_SHORT).show(); return; @@ -160,7 +167,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { .post(HttpInterface.USER_UPDATE) // 请求的 tag, 主要用于取消对应的请求 .params("pid", "1") - .params("regionId", "530902")//省市区id + .params("regionId", region_id)//省市区id .params("qq", userqq)//qq号 .tag(this) .execute(new DialogCallback(UserBean.class) { @@ -221,7 +228,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { && options3Items.get(options1).size() > 0 && options3Items.get(options1).get(options2).size() > 0 ? options3Items.get(options1).get(options2).get(options3) : ""; - String region_id = cityItems.get(options1).get(options2).get(options3).getRegion_id(); + region_id = cityItems.get(options1).get(options2).get(options3).getRegion_id(); Toast.makeText(UserActivity.this, region_id, Toast.LENGTH_SHORT).show(); String tx = opt1tx + " " + opt2tx + " " + opt3tx; region.setText(tx); diff --git a/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java b/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java new file mode 100644 index 0000000..b00c2f2 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java @@ -0,0 +1,89 @@ +package com.navinfo.outdoor.bean; + +public class ReceivedPoiBean { + + private Integer code; + private String message; + private BodyBean 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 BodyBean getBody() { + return body; + } + + public void setBody(BodyBean body) { + this.body = body; + } + + public static class BodyBean { + private Integer id; + private String address; + private String telephone; + private String geo; + private Integer type; + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getGeo() { + return geo; + } + + public void setGeo(String geo) { + this.geo = geo; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } +} diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java index 6175b12..78de4e2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -2,6 +2,7 @@ package com.navinfo.outdoor.fragment; import android.os.Bundle; import android.os.Message; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.widget.Button; @@ -12,6 +13,11 @@ import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.bean.GetPriceBean; +import com.navinfo.outdoor.bean.ReceivedPoiBean; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.room.PoiEntity; import org.greenrobot.eventbus.EventBus; @@ -25,6 +31,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe private Button btnBank; private TextView tvTitle, tvMoney, tvTime, tvDistance, tvDescribe; private PoiEntity poiEntity; + private Button btnDraw; public static GatherGetFragment newInstance(Bundle bundle) { GatherGetFragment fragment = new GatherGetFragment(); @@ -92,6 +99,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe tvDescribe = findViewById(R.id.tv_describe); btnBank = findViewById(R.id.btn_bank); btnBank.setOnClickListener(this); + btnDraw = findViewById(R.id.btn_draw); + btnDraw.setOnClickListener(this::onClick); Bundle arguments = getArguments(); if (arguments!=null) { @@ -117,10 +126,52 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe }else { Toast.makeText(getContext(), "无法采集", Toast.LENGTH_SHORT).show(); } + break; + + case R.id.btn_draw: + if (poiEntity!=null){ + if (poiEntity.getType()==1) {//poi的领取类型 + receivedTaskByNet(HttpInterface.RECEIVED_POI_TASK,poiEntity.getPid()+""); + }else if (poiEntity.getType() == 5){ + receivedTaskByNet(HttpInterface.RECEIVED_OTHER_TASK,poiEntity.getPid()+""); + } + } + + break; } } + /** + * @param url 不同任务类型对应的url + * @param id 任务id + * */ + private void receivedTaskByNet(String url, String id) { + showLoadingDialog(); + OkGoBuilder.getInstance() + .Builder(getActivity()) + .url(url+id) + .method(OkGoBuilder.GET) + .cls(ReceivedPoiBean.class) + .callback(new Callback() { + @Override + public void onSuccess(ReceivedPoiBean response, int id) { + dismissLoadingDialog(); + // Toast.makeText(getContext(), "获取成功", Toast.LENGTH_SHORT).show(); + + Integer PoiId = response.getBody().getId(); + Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt"); + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + // Toast.makeText(getContext(), "获取失败"+e.getMessage(), Toast.LENGTH_SHORT).show(); + Log.d("TAG", "onError: " + e.getMessage()); + } + }).build(); + } + public static String format5(double value) { return String.format("%.2f", value).toString(); 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 d671505..c90170d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -151,6 +151,14 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList List poiEntitiesList = initRoadWord(1); staySubmitAdapter.setAllRoad(poiEntitiesList); break; + case 2: + List poiEntities1 = initRoadWord(2); + staySubmitAdapter.setAllRoad(poiEntities1); + break; + case 3: + List poiEntities2 = initRoadWord(3); + staySubmitAdapter.setAllRoad(poiEntities2); + break; } tvStayType.setText(text); } 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 93303fa..b7ea86e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -100,14 +100,14 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen tvTotal.setText(userPrice + ""); tvUnit.setText(canExchangePrice + ""); tvAlready.setText(response.getBody().getHaveExchangePrice() + ""); - poiPushMoney.setText(response.getBody().getPoiPushPrice()+"元"); - poiReportMoney.setText(response.getBody().getPoiNonepushPrice()+"元"); - roadPushMoney.setText(response.getBody().getRoadPushPrice()+"元"); - roadReportMoney.setText(response.getBody().getRoadNonepushPrice()+"元"); - chargingPushMoney.setText(response.getBody().getCsPushPrice()+"元"); - chargingReportMoney.setText(response.getBody().getCsNonepushPrice()+"元"); - otherPushMoney.setText(response.getBody().getOtherPushPrice()+"元"); - otherReportMoney.setText(response.getBody().getOtherNonepushPrice()+"元"); + poiPushMoney.setText(response.getBody().getPoiPushPrice() + "元"); + poiReportMoney.setText(response.getBody().getPoiNonepushPrice() + "元"); + roadPushMoney.setText(response.getBody().getRoadPushPrice() + "元"); + roadReportMoney.setText(response.getBody().getRoadNonepushPrice() + "元"); + chargingPushMoney.setText(response.getBody().getCsPushPrice() + "元"); + chargingReportMoney.setText(response.getBody().getCsNonepushPrice() + "元"); + otherPushMoney.setText(response.getBody().getOtherPushPrice() + "元"); + otherReportMoney.setText(response.getBody().getOtherNonepushPrice() + "元"); Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt"); } @@ -133,6 +133,13 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen break; case R.id.button: + if (etAllPrice == null) { + Toast.makeText(getContext(), "控件不能为空", Toast.LENGTH_SHORT).show(); + return; + } + if (etAllPrice.getText().toString().equals("")) { + Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); + } immediatelyPrice(); break; case R.id.tv_all: 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 30c4d3d..32ac28b 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -43,9 +43,21 @@ 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"; + //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 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 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"; } diff --git a/app/src/main/res/layout/picture_mapview.xml b/app/src/main/res/layout/picture_mapview.xml new file mode 100644 index 0000000..276a4a6 --- /dev/null +++ b/app/src/main/res/layout/picture_mapview.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file