From b51b6eb1b47e65eca5432411ee6269b7a8d80766 Mon Sep 17 00:00:00 2001 From: md Date: Tue, 10 Aug 2021 20:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/UserActivity.java | 10 +++--- .../outdoor/fragment/OtherFragment.java | 4 ++- .../navinfo/outdoor/fragment/PoiFragment.java | 34 +++++++++++++++---- .../outdoor/fragment/PoiVideoFragment.java | 5 ++- .../outdoor/fragment/RoadFragment.java | 2 ++ .../outdoor/fragment/WithdrawFragment.java | 22 +++++++----- app/src/main/res/layout/activity_login.xml | 2 ++ app/src/main/res/layout/fragment_register.xml | 3 +- app/src/main/res/xml/file_paths.xml | 7 ++-- 10 files changed, 62 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d1bb336..5e04152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '29.0.2' - // ndkVersion '23.0.7123448' + ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" diff --git a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java index 8e7175e..d8527eb 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -197,19 +197,19 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { dismissLoadingDialog(); Log.d("TAG", "onSuccess: " + response.toString() + "sssssssssssss"); - if (response.body().equals("0")) { - MessageDialog.show(UserActivity.this, "是否保存", "取消", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + if (response.code()==200) { + MessageDialog.show(UserActivity.this, "是否保存", "确定", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - Toast.makeText(getContext(), "点击了确定", Toast.LENGTH_SHORT).show(); + return false; } }); } else { - MessageDialog.show(UserActivity.this, "是否保存", "确定", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + MessageDialog.show(UserActivity.this, "是否保存", "取消", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - Toast.makeText(getContext(), "点击了取消", Toast.LENGTH_SHORT).show(); + return false; } }); 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 ef5251d..82e0368 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -429,9 +429,11 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Log.e("TAG", "poiUploadByNetWork: " + body + otherUploadList); return; } - showLoadingDialog(); + HttpParams httpParams=new HttpParams(); httpParams.put("auditId",body); + showFileLoadingDialog(); + setLoadingDialogText("上传中..."); OkGoBuilder.getInstance() .Builder(getActivity()) .url(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 58c34c0..df10965 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -99,6 +99,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private int existence = 0; private RelativeLayout linearExist; private Spinner spinnerExist; + String str = ""; //获取的拍照图片 @@ -109,6 +110,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private String tagPanorama; private File file; + + public static PoiFragment newInstance(Bundle bundle) { PoiFragment fragment = new PoiFragment(); fragment.setArguments(bundle); @@ -575,7 +578,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe }).start(); break; case R.id.tv_examine: - findingDuplicateByWork(showPoiEntity); + findingDuplicateByWork(); break; case R.id.rl_panorama: Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); @@ -610,10 +613,11 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } } - private void findingDuplicateByWork(PoiEntity poiEntity) { + private void findingDuplicateByWork() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); - httpParams.put("geo", poiEntity.getGeoWkt()); + String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); + httpParams.put("geo", encode); httpParams.put("name", editNameContent.getText().toString()); OkGoBuilder.getInstance() .Builder(getActivity()) @@ -625,8 +629,23 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe @Override public void onSuccess(TaskNameBean taskNameBean, int id) { dismissLoadingDialog(); + if (taskNameBean.getCode()==200){ + List body = taskNameBean.getBody(); + if (body!=null){ + for (int i = 0; i < body.size(); i++) { + str +=body.get(i) + ","; + } + if (str!=null){ + Toast.makeText(getContext(), "存在类似名称---"+str, Toast.LENGTH_SHORT).show(); + str = ""; + }else { + Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); + } + }else { + Toast.makeText(getContext(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); + } + } - Toast.makeText(getContext(), "存在类似名称" + taskNameBean.getBody(), Toast.LENGTH_SHORT).show(); } @Override @@ -689,7 +708,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe Log.e("TAG", "poiUploadByNetWork: " + body + poiPicList); return; } - showLoadingDialog(); + showFileLoadingDialog(); + setLoadingDialogText("上传中..."); HttpParams httpParams=new HttpParams(); httpParams.put("auditId",body); OkGoBuilder.getInstance() @@ -729,7 +749,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } private void poiSaveByNet(PoiEntity poiEntity, boolean isLocal) { - showLoadingDialog(); + HttpParams httpParams = new HttpParams(); httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); @@ -738,6 +758,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe httpParams.put("geo", poiEntity.getGeoWkt()); httpParams.put("memo", poiEntity.getMemo()); httpParams.put("telephone", poiEntity.getTelPhone()); + showLoadingDialog(); + setLoadingDialogText("保存中..."); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.SUBMIT_POI_TASK) 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 762c837..5b19d3c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -384,6 +384,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick long time=System.currentTimeMillis(); httpParams.put("datetime",time); httpParams.put("file", fileZip); + showFileLoadingDialog(); + setLoadingDialogText("上传中..."); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.POI_VIDEO_UPLOAD_PIC) @@ -421,13 +423,14 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } private void poiVideoSave(PoiEntity poiEntity, boolean isLocal) { - showLoadingDialog(); + HttpParams httpParams = new HttpParams(); httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); httpParams.put("address", poiEntity.getAddress()); httpParams.put("workType", poiEntity.getWork_type()); httpParams.put("memo", poiEntity.getMemo()); + showLoadingDialog(); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.INSIDE_API_LIST) 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 9ea8d90..7cdae64 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -397,6 +397,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList long time=System.currentTimeMillis(); httpParams.put("datetime",time); httpParams.put("file", fileZip); + showFileLoadingDialog(); + setLoadingDialogText("上传中..."); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.ROAD_TASK_UPLOAD_PIC) 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 ca4419f..165b0c4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -181,19 +181,22 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen break; case R.id.button: - if (etAllPrice == null) { - Toast.makeText(getContext(), "控件不能为空", Toast.LENGTH_SHORT).show(); + + if (etAllPrice == null&&etAllPrice.getText().toString().equals("")) { + Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); return; } - if (etAllPrice.getText().toString().equals("")) { + String price = etAllPrice.getText().toString().trim(); + if (price!=null){ + Integer integer = Integer.valueOf(price); + if (integer!=null&&integer<10){ + Toast.makeText(getContext(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); + return; + } + }else { Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); } - String price = etAllPrice.getText().toString(); - double prices = Double.valueOf(price); - if (prices != 0 && prices < 10) { - Toast.makeText(getContext(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); - return; - } + if (!checkBox.isChecked()) { Toast.makeText(getContext(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); return; @@ -221,6 +224,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen private void immediatelyPrice() { showLoadingDialog(); + setLoadingDialogText("提现中..."); HttpParams httpParams = new HttpParams(); httpParams.put("exchangeMoney", etAllPrice.getText().toString()); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 091d760..935198a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -47,6 +47,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:hint=" ID/手机号" + android:maxLines="1" android:paddingBottom="20dp" android:layout_marginRight="35dp" android:layout_marginLeft="35dp" @@ -81,6 +82,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:hint=" 请输入密码" + android:maxLines="1" android:paddingBottom="15dp" android:layout_marginRight="35dp" android:layout_marginLeft="35dp" diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml index 1de46c8..70393cb 100644 --- a/app/src/main/res/layout/fragment_register.xml +++ b/app/src/main/res/layout/fragment_register.xml @@ -258,8 +258,7 @@ app:layout_constraintBottom_toBottomOf="@id/iv_register_check"/>