From f88872af4d19324137a902788f165b1d3c7bf6ae Mon Sep 17 00:00:00 2001 From: md Date: Thu, 5 Aug 2021 18:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../navinfo/outdoor/api/UserApplication.java | 6 +- .../navinfo/outdoor/bean/GetPriceBean.java | 19 +++++ .../outdoor/fragment/OtherFragment.java | 1 + .../navinfo/outdoor/fragment/PoiFragment.java | 1 + .../outdoor/fragment/PoiVideoFragment.java | 11 +-- .../outdoor/fragment/RoadFragment.java | 13 +-- .../outdoor/fragment/WithdrawFragment.java | 14 +++- .../com/navinfo/outdoor/room/PoiEntity.java | 2 +- app/src/main/res/layout/fragment_road.xml | 18 ++--- .../main/res/layout/poi_video_fragment.xml | 18 ++--- app/src/main/res/layout/withdraw_fragment.xml | 80 +++++++++++++++++++ 12 files changed, 142 insertions(+), 43 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 66355d9..43917f5 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/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java index 65b9b62..25855c4 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java +++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java @@ -79,11 +79,11 @@ public class UserApplication extends Application { //builder.cookieJar(new CookieJarImpl(new MemoryCookieStore())); //超时时间设置，默认60秒 //全局的读取超时时间 - builder.readTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS); + builder.readTimeout(0, TimeUnit.MILLISECONDS); //全局的写入超时时间 - builder.writeTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS); + builder.writeTimeout(0, TimeUnit.MILLISECONDS); //全局的连接超时时间 - builder.connectTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS); + builder.connectTimeout(0, TimeUnit.MILLISECONDS); OkGo.getInstance().init(this) .setOkHttpClient(builder.build()) //全局统一缓存模式，默认不使用缓存，可以不传 diff --git a/app/src/main/java/com/navinfo/outdoor/bean/GetPriceBean.java b/app/src/main/java/com/navinfo/outdoor/bean/GetPriceBean.java index f8b9b5e..16ed77f 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/GetPriceBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/GetPriceBean.java @@ -2,6 +2,7 @@ package com.navinfo.outdoor.bean; public class GetPriceBean { + private Integer code; private String message; private BodyBean body; @@ -38,6 +39,8 @@ public class GetPriceBean { private Double rewardPrice; private Double poiPushPrice; private Double poiNonepushPrice; + private Double poivideoPushPrice; + private Double poivideoNonepushPrice; private Double roadPushPrice; private Double roadNonepushPrice; private Double csPushPrice; @@ -102,6 +105,22 @@ public class GetPriceBean { this.poiNonepushPrice = poiNonepushPrice; } + public Double getPoivideoPushPrice() { + return poivideoPushPrice; + } + + public void setPoivideoPushPrice(Double poivideoPushPrice) { + this.poivideoPushPrice = poivideoPushPrice; + } + + public Double getPoivideoNonepushPrice() { + return poivideoNonepushPrice; + } + + public void setPoivideoNonepushPrice(Double poivideoNonepushPrice) { + this.poivideoNonepushPrice = poivideoNonepushPrice; + } + public Double getRoadPushPrice() { return roadPushPrice; } 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 d0bacd0..8335cdf 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -469,6 +469,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis return; } showFileLoadingDialog(); + setLoadingDialogText("上传中..."); OkGo // 请求方式和请求url .post(HttpInterface.OTHER_TASK_UPLOAD_PIC) 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 13aac96..b5324b6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -740,6 +740,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe return; } showFileLoadingDialog(); + setLoadingDialogText("上传中..."); OkGo // 请求方式和请求url .post(HttpInterface.POI_TASK_UPLOAD_PIC) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index 0a3c226..226aa4b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -83,7 +83,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick private RadioButton rbCar; private RadioButton rbBicycle; private RadioButton rbWalking; - private RadioButton rbManual; private EditText etDesc; private Button btnRoadSave; private RadioGroup rgType; @@ -152,7 +151,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick rbCar = (RadioButton) findViewById(R.id.rb_car); rbBicycle = (RadioButton) findViewById(R.id.rb_bicycle); rbWalking = (RadioButton) findViewById(R.id.rb_walking); - rbManual = (RadioButton) findViewById(R.id.rb_manual); etDesc = (EditText) findViewById(R.id.et_desc); fmPoiVideoPic = findViewById(R.id.fm_poi_video_picture); btnRoadSave = (Button) findViewById(R.id.btn_poi_video_save); @@ -262,7 +260,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick btnRoadSave.setEnabled(false); rbCar.setEnabled(false); rbWalking.setEnabled(false); - rbManual.setEnabled(false); rbBicycle.setEnabled(false); } @@ -308,6 +305,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick case R.id.btn_poi_video_upload: showFileLoadingDialog(); + setLoadingDialogText("压缩中..."); ArrayList fileList = new ArrayList<>(); if (fmPoiVideoPic.getTag() != null) { List videoFileList = (List) fmPoiVideoPic.getTag(); @@ -498,6 +496,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick return; } showFileLoadingDialog(); + setLoadingDialogText("上传中..."); OkGo // 请求方式和请求url .post(HttpInterface.POI_VIDEO_UPLOAD_PIC) @@ -675,8 +674,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick return 1; } else if (rbWalking != null && rbWalking.isChecked()) { return 2; - } else if (rbManual != null && rbManual.isChecked()) { - return 3; } return -1; } @@ -692,9 +689,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick case 2: rbWalking.setChecked(true); break; - case 3: - rbManual.setChecked(true); - break; + } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index 3d6627f..a91a77f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -85,7 +85,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private RadioButton rbCar; private RadioButton rbBicycle; private RadioButton rbWalking; - private RadioButton rbManual; private EditText etDesc; private Button btnRoadSave; private RadioGroup rgType; @@ -154,7 +153,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList rbCar = (RadioButton) findViewById(R.id.rb_car); rbBicycle = (RadioButton) findViewById(R.id.rb_bicycle); rbWalking = (RadioButton) findViewById(R.id.rb_walking); - rbManual = (RadioButton) findViewById(R.id.rb_manual); etDesc = (EditText) findViewById(R.id.et_desc); fmRoadPic = findViewById(R.id.fm_road_picture); btnRoadSave = (Button) findViewById(R.id.btn_road_save); @@ -269,7 +267,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList btnRoadSave.setEnabled(false); rbCar.setEnabled(false); rbBicycle.setEnabled(false); - rbManual.setEnabled(false); rbWalking.setEnabled(false); } @@ -319,7 +316,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList break; case R.id.road_upload: showFileLoadingDialog(); - setLoadingDialogText("压缩中。。"); + setLoadingDialogText("压缩中..."); ArrayList fileList = new ArrayList<>(); if (fmRoadPic.getTag() != null) { List videoFileList = (List) fmRoadPic.getTag(); @@ -512,7 +509,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList return; } showFileLoadingDialog(); - setLoadingDialogText("上传中。。"); + setLoadingDialogText("上传中..."); OkGo // 请求方式和请求url .post(HttpInterface.ROAD_TASK_UPLOAD_PIC) @@ -713,8 +710,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList return 1; } else if (rbWalking != null && rbWalking.isChecked()) { return 2; - } else if (rbManual != null && rbManual.isChecked()) { - return 3; } return -1; } @@ -730,9 +725,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList case 2: rbWalking.setChecked(true); break; - case 3: - rbManual.setChecked(true); - break; + } } 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 b774f01..1f86860 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -33,6 +33,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen private EditText etAllPrice; private TextView poiPushMoney; private TextView poiReportMoney; + private TextView poiVideoPushMoney; + private TextView poiVideoReportMoney; private TextView roadPushMoney; private TextView roadReportMoney; private TextView chargingPushMoney; @@ -60,7 +62,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen protected void initView() { super.initView(); tvUnit = findViewById(R.id.tv_unit);//可提现 - tvAlready = findViewById(R.id.tv_already);//以提现 + tvAlready = findViewById(R.id.tv_already);//已提现 tvTotal = findViewById(R.id.tv_total);//总资产 tvAll = findViewById(R.id.tv_all); tvAll.setOnClickListener(this::onClick); @@ -73,6 +75,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen btWithdraw.setOnClickListener(this::onClick); poiPushMoney = (TextView) findViewById(R.id.poi_push_money); poiReportMoney = (TextView) findViewById(R.id.poi_report_money); + poiVideoPushMoney = (TextView) findViewById(R.id.poiVideo_push_money); + poiVideoReportMoney = (TextView) findViewById(R.id.poiVideo_report_money); roadPushMoney = (TextView) findViewById(R.id.road_push_money); roadReportMoney = (TextView) findViewById(R.id.road_report_money); chargingPushMoney = (TextView) findViewById(R.id.charging_push_money); @@ -103,6 +107,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen tvAlready.setText(response.getBody().getHaveExchangePrice() + ""); poiPushMoney.setText(response.getBody().getPoiPushPrice() + "元"); poiReportMoney.setText(response.getBody().getPoiNonepushPrice() + "元"); + poiVideoPushMoney.setText(response.getBody().getPoivideoPushPrice() + "元"); + poiVideoReportMoney.setText(response.getBody().getPoivideoNonepushPrice() + "元"); roadPushMoney.setText(response.getBody().getRoadPushPrice() + "元"); roadReportMoney.setText(response.getBody().getRoadNonepushPrice() + "元"); chargingPushMoney.setText(response.getBody().getCsPushPrice() + "元"); @@ -165,7 +171,11 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen @Override public void onSuccess(UserPriceExchangeBean response, int id) { dismissLoadingDialog(); - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + + + etAllPrice.getText().clear(); + Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt"); } diff --git a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java index 6b3d385..464e68b 100644 --- a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java +++ b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java @@ -48,7 +48,7 @@ public class PoiEntity implements Serializable { private int isLocalData;//是否是本地数据 0,服务 1,本地 private int isExclusive;//任务类型 0.普通任务，1.专属任务 private int bodyId;//保存本地的bodyId - private int work_type;//0."车行" 1."自行车" 2."步行" 3."手动" + private int work_type;//0."车行" 1."自行车" 2."步行" public int getWork_type() { return work_type; diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml index 9909329..c596a3a 100644 --- a/app/src/main/res/layout/fragment_road.xml +++ b/app/src/main/res/layout/fragment_road.xml @@ -115,13 +115,13 @@ android:text="步行" android:textColor="@color/test_color_selector" /> - + + + + + + + @@ -139,7 +139,7 @@ @@ -190,7 +190,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="20dp" - android:text="03.描述" + android:text="04.描述" android:textColor="@color/black" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/poi_video_fragment.xml b/app/src/main/res/layout/poi_video_fragment.xml index 45722f2..853cf0c 100644 --- a/app/src/main/res/layout/poi_video_fragment.xml +++ b/app/src/main/res/layout/poi_video_fragment.xml @@ -104,13 +104,13 @@ android:layout_weight="1" android:textColor="@color/test_color_selector" android:text="步行"/> - + + + + + + + @@ -127,7 +127,7 @@ @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:gravity="center" - android:text="拍照" + android:text="录像" android:textColor="@color/white" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/withdraw_fragment.xml b/app/src/main/res/layout/withdraw_fragment.xml index c082689..7c77945 100644 --- a/app/src/main/res/layout/withdraw_fragment.xml +++ b/app/src/main/res/layout/withdraw_fragment.xml @@ -312,6 +312,86 @@ android:textColor="#333" android:textSize="18sp" /> + + + + + + + + + + + + + + + + + + + +