diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java index 9ddae57..fc977a2 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -105,7 +105,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene private Button btnVideo, stopVideo; private String finalVideoPath; // 摄像后最终保存的文件名 -// private File tmpFile; // 合并文件的临时文件路径 + // private File tmpFile; // 合并文件的临时文件路径 private Timer timer; private CsvTimerTask timerTask; // 执行定时写入csv文件的task private DateFormat formatter; @@ -232,13 +232,13 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene // } // }); removables = new ArrayList<>();//存储轨迹的marker - if (uuId!=null){ + if (uuId != null) { List videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(uuId); - if (videoFileListByUUID!=null){ + if (videoFileListByUUID != null) { List lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList(videoFileListByUUID); for (int i = 0; i < lineStringByVideoFileList.size(); i++) { LatLng latLng = lineStringByVideoFileList.get(i); - if (latLng!=null){ + if (latLng != null) { BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(ic_baseline); Marker marker = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor).alpha(0.9f) .flat(true) @@ -276,12 +276,17 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene @Override public void onVideoTaken(@NonNull @NotNull VideoResult result) { super.onVideoTaken(result); - Toast.makeText(PictureActivity.this, "暂停摄像", Toast.LENGTH_SHORT).show(); showLoadingDialog(); dismissLoadingDialog(); if (isFinishActivity) { PictureActivity.this.finish(); + return; } + if (captureVideo.isChecked()&&!isFinishActivity){ + startTakenVideo(); + return; + } + Toast.makeText(PictureActivity.this, "暂停摄像", Toast.LENGTH_SHORT).show(); // new Thread(new Runnable() { // @Override // public void run() { @@ -529,7 +534,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene layerChange.removeAllViews(); if (widthMap > widthCamera) { - + ivPic.setVisibility(View.VISIBLE); layoutParamsCamera.width = dm.widthPixels; layoutParamsCamera.height = dm.heightPixels; layoutParamsMap.height = heightCamera; @@ -539,7 +544,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene layerChange.addView(camera); layerChange.addView(ivMap); } else { - + ivPic.setVisibility(View.GONE); layoutParamsMap.height = dm.heightPixels; layoutParamsMap.width = dm.widthPixels; layoutParamsCamera.height = heightMap; @@ -550,6 +555,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene layerChange.addView(camera); } } + @Override protected void onResume() { super.onResume(); @@ -581,10 +587,10 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene public void onEventMessageMainThread(Message msg) { switch (msg.what) { case Constant.EVENT_WHAT_LOCATION_CHANGE: // 用户位置更新 - if (tencentMap!=null) { + if (tencentMap != null) { CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( - new LatLng(Constant.currentLocation.getLatitude(),Constant.currentLocation.getLongitude()), //中心点坐标，地图目标经纬度 + new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()), //中心点坐标，地图目标经纬度 16, //目标缩放级别 0, //目标倾斜角 0)); //目标旋转角 0~360° (正北方为0) @@ -596,7 +602,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene /** * 记录视频拍摄的时间及经纬度 - */ + */ private class CsvTimerTask extends TimerTask { private File csvFile; private long currentVideoTime; // 记录当前的视频时间 @@ -618,13 +624,13 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene StringBuffer sb = new StringBuffer(); sb.append(formatter.format(new Date())); // 记录当前时间 sb.append(","); - sb.append(currentVideoTime) ;// 记录视频时间 + sb.append(currentVideoTime);// 记录视频时间 sb.append(","); sb.append(Constant.currentLocation.getLatitude()); sb.append(","); sb.append(Constant.currentLocation.getLongitude()); sb.append(","); - if (Constant.currentLocation.getBearing()!=0) { + if (Constant.currentLocation.getBearing() != 0) { sb.append(Constant.currentLocation.getBearing()); } else { sb.append(Constant.currentLocation.getDirection()); 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 977b9c1..8e7175e 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -66,6 +66,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { private SharedPreferences navInfo; + @Override protected int getLayout() { return R.layout.activity_user; @@ -133,6 +134,16 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { break; case R.id.btn_save: + String attestationNames = navInfo.getString("attestationName", null); + if (attestationNames == null || attestationNames.equals("")) { + Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show(); + return; + } + String bankAccount = navInfo.getString("bankAccount", null); + if (bankAccount == null||bankAccount.equals("")){ + Toast.makeText(this, "请先绑定银行卡", Toast.LENGTH_SHORT).show(); + return; + } userphone = etPhone.getText().toString().trim(); userqq = etQq.getText().toString().trim(); usermailbox = etMailbox.getText().toString().trim(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 445ede0..ab092f7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -95,7 +95,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlElse, rlScutcheon, rlNull; private ImageView ivPanorama, ivName, ivInternal, ivElse, ivScutcheon; private TextView tvExamine; - private TextView tvPanorama, tvName, tvInternal, tvElse, tvScutcheon; + private TextView tvPanorama, tvNamePic, tvInternal, tvElse, tvScutcheon; private EditText editNameContent, editSiteContent; private ArrayList poiBeans; private Button btnSaveLocal; @@ -227,7 +227,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. tvPanorama = findViewById(R.id.tv_panorama); tvElse = findViewById(R.id.tv_else); tvInternal = findViewById(R.id.tv_internal); - tvName = findViewById(R.id.tv_name); + tvNamePic = findViewById(R.id.tv_name_pic); tvScutcheon = findViewById(R.id.tv_scutcheon); /* recyclerPhone = findViewById(R.id.recycler_phone); recyclerPhone.setLayoutManager(new LinearLayoutManager(getContext())); @@ -523,7 +523,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. tvPanorama.setTag(photo); } else if (split[split.length - 1].startsWith("b")) { Glide.with(getActivity()).load(photo).into(ivName); - tvName.setTag(photo); + tvNamePic.setTag(photo); } else if (split[split.length - 1].startsWith("c")) { Glide.with(getActivity()).load(photo).into(ivInternal); tvInternal.setTag(photo); @@ -704,7 +704,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } else { chargingStationList.add(new File(tagPanorama)); } - String tagName = (String) tvName.getTag(); + String tagName = (String) tvNamePic.getTag(); if (tagName == null) { Toast.makeText(getContext(), "请拍照", Toast.LENGTH_SHORT).show(); return; @@ -921,6 +921,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList chargingStationList) { showFileLoadingDialog(); + setLoadingDialogText("上传中..."); if (poiEntity == null || poiEntity.getBodyId() == 0) { Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); Log.e("TAG", "poiUploadByNetWork: " + poiEntity.getBodyId() + chargingStationList); @@ -1174,7 +1175,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. return; } String photoPath = PhotoUtils.showPhotoAndGetPath(photoFile, ivName); - tvName.setTag(photoPath); + tvNamePic.setTag(photoPath); photoFile = null; /*int height = bitmap.getHeight(); int width = bitmap.getWidth(); @@ -1372,7 +1373,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (tagPanorama != null && !tagPanorama.equals("")) { infoPhoto.add(new Info(tagPanorama)); } - String tagName = (String) tvName.getTag(); + String tagName = (String) tvNamePic.getTag(); if (tagName != null && !tagName.equals("")) { infoPhoto.add(new Info(tagName)); } @@ -1415,7 +1416,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. poiCheckResult.setMsg("请拍照 全景图"); return poiCheckResult; } - if (tvName.getTag()==null){ + if (tvNamePic.getTag()==null){ poiCheckResult.setCode(1); poiCheckResult.setMsg("请拍照 名称照片"); return poiCheckResult; 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 7118112..e63d2c3 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -38,6 +38,8 @@ import com.vividsolutions.jts.geom.Geometry; import org.greenrobot.eventbus.EventBus; +import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; @@ -117,7 +119,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe if (poiEntity.getPrecision() == null) { tvMoney.setText("￥" + 0); } else { - tvMoney.setText("￥" + poiEntity.getPrecision()); + tvMoney.setText("￥" + format2(Double.valueOf(poiEntity.getPrecision()))); } if (poiEntity != null) { if (poiEntity.getDescribe() != null && !"".equals(poiEntity.getDescribe())) { @@ -137,7 +139,18 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe initViewByTaskStatus(taskStatus); } } + /** + * 保存小数点后两位 + * + * @param value + * @return + */ + public static String format2(double value) { + DecimalFormat df = new DecimalFormat("0.00"); + df.setRoundingMode(RoundingMode.HALF_UP); + return df.format(value); + } private void initViewByTaskStatus(int taskStatus) { switch (taskStatus) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java index e16d40e..cddd324 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -69,8 +69,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe private String value; private SharedPreferences navInfo; private SharedPreferences.Editor navInfoEditor; - private File gatherFile; - private String file; + private File file; public static GatheringFragment newInstance(Bundle bundle) { @@ -100,7 +99,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe btnBank.setOnClickListener(this::onClick); tvName = (TextView) findViewById(R.id.tv_name); String attestationName = navInfo.getString("attestationName", null); - if (attestationName!= null&&!attestationName.equals("")) { + if (attestationName != null && !attestationName.equals("")) { tvName.setText(attestationName); } etBankNum = (EditText) findViewById(R.id.et_bank_num); @@ -156,28 +155,39 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe dialog.show(); break; case R.id.btn_bank: + if (etBankNum.getText().toString() == null && etBankNum.getText().toString().equals("")) { + Toast.makeText(getContext(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); + return; + } gatheringNetWork(); break; case R.id.gathering_camera: - Intent gatheringNumber = new Intent("android.media.action.IMAGE_CAPTURE"); - startActivityForResult(gatheringNumber, 400); + Intent gatheringNumberIntent = new Intent("android.media.action.IMAGE_CAPTURE"); + file =PhotoUtils.showPhotoFile("a", null); + gatheringNumberIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); + startActivityForResult(gatheringNumberIntent, 131); break; } } private void gatheringNetWork() { - gatheringList = new ArrayList<>(); - File gatheringFile = new File(gatheringPath); - if (!gatheringFile.exists()) { - Toast.makeText(getContext(), "身份证照片不能为空", Toast.LENGTH_SHORT).show(); - return; - } - gatheringList.add(gatheringFile); + if (gatheringCamera.getTag() == null){ + Toast.makeText(getContext(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); + return; + } +// if (!gatheringFile.exists()) { +// Toast.makeText(getContext(), "身份证照片不能为空", Toast.LENGTH_SHORT).show(); +// return; +// } + String gatheringCameraTag = (String) gatheringCamera.getTag(); + gatheringList.add(new File(gatheringCameraTag)); String etBankAccount = etBankNum.getText().toString().trim(); if (etBankAccount == null || etBankAccount.equals("")) { - Toast.makeText(getContext(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); - return; + if (!etBankAccount.matches("^\\\\d{19}$\"")) { + Toast.makeText(getContext(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); + return; + } } showLoadingDialog(); OkGo @@ -198,7 +208,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe MessageDialog.show((AppCompatActivity) getActivity(), "绑定成功", "确定", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - navInfoEditor.putString("bankAccount",value); + navInfoEditor.putString("bankAccount", value); navInfoEditor.commit(); return false; } @@ -228,28 +238,13 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe @Override public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 400 && resultCode == RESULT_OK) { - Bundle extras = data.getExtras();//从Intent中获取附加值 - Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像 - int height = bitmap.getHeight(); - int width = bitmap.getWidth(); - if (height > width) { - DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; - MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新拍照，要求横屏拍照", "确定").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); - gatherFile = new File(Constant.PICTURE_FOLDER+"/aaaaaa.jpg"); - PhotoUtils.showPhotoFile("a", null); - intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(gatherFile)); - startActivityForResult(intentPanorama, 400); - return false; - } - }); - } else { - file = PhotoPathUtil.getTakePhotoPath(data, "", ""); - + if (requestCode == 131 && resultCode == RESULT_OK) { + if (file ==null&&!file.exists()){ + Toast.makeText(getContext(), "请先拍照", Toast.LENGTH_SHORT).show(); + return; } + gatheringCamera.setTag(file.getAbsolutePath()); +// gatheringPath = PhotoPathUtil.getTakePhotoPath(data, "", ""); } } 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 d3a83d2..ef5251d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -345,7 +345,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Toast.makeText(getActivity(), "请确定点位", Toast.LENGTH_SHORT).show(); return; } - String tagPicture = (String) ivPicture.getTag(); + String tagPicture = (String) tvPicture.getTag(); if (tagPicture == null) { Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); return; @@ -471,6 +471,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private void otherSaveByNetWork(PoiEntity poiEntity,boolean isLocal) { showLoadingDialog(); + setLoadingDialogText("保存中..."); HttpParams httpParams = new HttpParams(); httpParams.put("type", poiEntity.getStation_type()); httpParams.put("taskId", poiEntity.getTaskId()); 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 91343fe..58c34c0 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -2,7 +2,6 @@ package com.navinfo.outdoor.fragment; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Bitmap; import android.graphics.Color; import android.net.Uri; import android.os.Bundle; @@ -60,8 +59,6 @@ import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.room.PoiEntity; import com.navinfo.outdoor.ui.view.ContactView; import com.navinfo.outdoor.util.Geohash; -import com.navinfo.outdoor.util.NetWorkUtils; -import com.navinfo.outdoor.util.PhotoPathUtil; import com.navinfo.outdoor.util.PhotoUtils; import com.tencent.tencentmap.mapsdk.maps.model.LatLng; @@ -86,7 +83,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private EditText editDescribe; private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlCard, rlElse; private ImageView ivPanorama, ivName, ivInternal, ivCard, ivElse; - private TextView tvPanorama, tvName, tvInternal, tvCard, tvElse; + private TextView tvPanorama, tvPoiNamePic, tvInternal, tvCard, tvElse; public TextView tvExamine; private EditText editNameContent, editSiteContent; private ArrayList poiBeans; @@ -198,7 +195,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe ivPanorama = findViewById(R.id.iv_panorama); tvPanorama = findViewById(R.id.tv_panorama); ivName = findViewById(R.id.iv_name); - tvName = findViewById(R.id.tv_name); + tvPoiNamePic = findViewById(R.id.tv_poi_name_pic); ivInternal = findViewById(R.id.iv_internal); tvInternal = findViewById(R.id.tv_internal); @@ -419,7 +416,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe tvPanorama.setTag(photo); } else if (split[split.length - 1].startsWith("b")) { Glide.with(getActivity()).load(photo).into(ivName); - tvName.setTag(photo); + tvPoiNamePic.setTag(photo); } else if (split[split.length - 1].startsWith("c")) { Glide.with(getActivity()).load(photo).into(ivInternal); tvInternal.setTag(photo); @@ -539,7 +536,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } else { poiPicList.add(new File(tagPanorama)); } - String tagName = (String)tvName.getTag(); + String tagName = (String) tvPoiNamePic.getTag(); if (tagName == null) { Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); return; @@ -849,7 +846,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe return; }else { String s = PhotoUtils.showPhotoAndGetPath(file, ivName); - tvName.setTag(s); + tvPoiNamePic.setTag(s); } file=null; @@ -999,7 +996,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (tagPanorama != null && !tagPanorama.equals("")) { infoPhoto.add(new Info(tagPanorama)); } - String tagName = (String) tvName.getTag(); + String tagName = (String) tvPoiNamePic.getTag(); if (tagName != null && !tagName.equals("")) { infoPhoto.add(new Info(tagName)); } @@ -1041,7 +1038,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe poiCheckResult.setMsg("请 拍照"); return poiCheckResult; } - if (tvName.getTag()==null){ + if (tvPoiNamePic.getTag()==null){ poiCheckResult.setCode(1); poiCheckResult.setMsg("请 拍照"); return poiCheckResult; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java index f11a7dd..5cc8849 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -2,6 +2,7 @@ package com.navinfo.outdoor.fragment; import android.content.Intent; import android.os.Bundle; +import android.os.CountDownTimer; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -14,11 +15,15 @@ import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.LoginActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseFragment; + import com.navinfo.outdoor.bean.UserBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.util.RegexUtil; + + /** * 注册页面 */ @@ -30,6 +35,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen private TextView haveGoLogin, registerGetNote; private Button btnRegister; private String sessionId; + private CountDownTimer timer; public static RegisterFragment newInstance(Bundle bundle) { RegisterFragment fragment = new RegisterFragment(); @@ -81,6 +87,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen case R.id.btn_register: initRegister(); case R.id.register_get_note: + registerNote(); initGetNote(); break; } @@ -187,4 +194,26 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen } + + private void registerNote() { + if (timer!=null){ + timer.cancel(); + timer= null; + } + registerGetNote.setEnabled(false); + timer = new CountDownTimer(60 * 1000, 1000) { + + @Override + public void onTick(long millisUntilFinished) { + registerGetNote.setText(millisUntilFinished / 1000 + "秒后重新获取验证码"); + } + + @Override + public void onFinish() { + registerGetNote.setEnabled(true); + registerGetNote.setText("重新发送"); + } + }; + timer.start(); + } } \ No newline at end of file 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 7acd63b..cf2f7bd 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -221,6 +221,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } if (poiEntities.size() > 0) { showFileLoadingDialog(); + setLoadingDialogText("提交中..."); PoiSaveUtils.getInstance(getActivity()).uploadPoiEntityBatch(poiEntities); } else { Toast.makeText(getContext(), "请选择要删除的条目数据", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index c489f5a..58596a0 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -1378,6 +1378,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen EventBus.getDefault().unregister(this); } + @Override public void onClick (View v){ switch (v.getId()) { @@ -1445,6 +1446,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen break; case 1: // POI录像 showPoiMarkerByType(2, newPoiLatLng); + poiEntity.setWork_type(1); + bundle.putSerializable("poiEntity", poiEntity); PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); showSlidingFragment(poiVideoFragment); break; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java index 4d2c5cc..62fbc6c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -115,22 +115,22 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic getActivity().finish(); break; case R.id.iv_attestation1: - Intent ivAttestation1 = new Intent("android.media.action.IMAGE_CAPTURE"); + Intent ivAttestationIntent1 = new Intent("android.media.action.IMAGE_CAPTURE"); file = PhotoUtils.showPhotoFile("a", null); - ivAttestation1.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); - startActivityForResult(ivAttestation1, 100); + ivAttestationIntent1.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); + startActivityForResult(ivAttestationIntent1, 121); break; case R.id.iv_attestation2: - Intent ivAttestation2 = new Intent("android.media.action.IMAGE_CAPTURE"); - file = PhotoUtils.showPhotoFile("a", null); - ivAttestation2.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); - startActivityForResult(ivAttestation2, 200); + Intent ivAttestationIntent2 = new Intent("android.media.action.IMAGE_CAPTURE"); + file = PhotoUtils.showPhotoFile("b", null); + ivAttestationIntent2.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); + startActivityForResult(ivAttestationIntent2, 122); break; case R.id.iv_attestation3: - Intent ivAttestation3 = new Intent("android.media.action.IMAGE_CAPTURE"); - file = PhotoUtils.showPhotoFile("a", null); - ivAttestation3.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); - startActivityForResult(ivAttestation3, 300); + Intent ivAttestationIntent3 = new Intent("android.media.action.IMAGE_CAPTURE"); + file = PhotoUtils.showPhotoFile("c", null); + ivAttestationIntent3.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); + startActivityForResult(ivAttestationIntent3, 123); break; case R.id.btn_attestation: if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) { @@ -165,15 +165,15 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic } /** - * 中文效验 + * 中文姓名效验 */ - static boolean chineseNameTest(String name) { if (!name.matches("[\u4e00-\u9fa5]{2,4}")) { System.out.println("只能输入2到4个汉字"); return false; }else return true; } + private void nameAuthentication() { if (etAttestationName.getText().toString() == null || etAttestationName.getText().toString().equals("")) { Toast.makeText(getContext(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); @@ -183,29 +183,30 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic Toast.makeText(getContext(), "身份证错误，请重新输入", Toast.LENGTH_SHORT).show(); return; } - if (ivAttestation1.getTag() == null) { + if (tvCard1.getTag() == null) { Toast.makeText(getContext(), "请拍照 身份证人像面", Toast.LENGTH_SHORT).show(); return; } - if (ivAttestation2.getTag() == null) { + if (tvCard2.getTag() == null) { Toast.makeText(getContext(), "请拍照 身份证国徽面", Toast.LENGTH_SHORT).show(); return; } - if (ivAttestation3.getTag() == null) { + if (tvCard3.getTag() == null) { Toast.makeText(getContext(), "请拍照 手持身份证", Toast.LENGTH_SHORT).show(); return; } ArrayList takePhoneList = new ArrayList<>(); - String takePhotoPath1 = (String) ivAttestation1.getTag(); + String takePhotoPath1 = (String) tvCard1.getTag(); takePhoneList.add(new File(takePhotoPath1)); - String takePhotoPath2 = (String) ivAttestation2.getTag(); + String takePhotoPath2 = (String) tvCard2.getTag(); takePhoneList.add(new File(takePhotoPath2)); - String takePhotoPath3 = (String) ivAttestation3.getTag(); + String takePhotoPath3 = (String) tvCard3.getTag(); takePhoneList.add(new File(takePhotoPath3)); String attestationName = etAttestationName.getText().toString().trim(); String namePhone = etNamePhone.getText().toString().trim(); showLoadingDialog(); + setLoadingDialogText("实名认证中..."); OkGo // 请求方式和请求url .post(HttpInterface.USER_AUTH_ADD) @@ -225,7 +226,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic MessageDialog.show((AppCompatActivity) getActivity(), "提示", "通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - // Toast.makeText(getContext(), "点击了确定", Toast.LENGTH_SHORT).show(); + navInfoEditor.putString("attestationName",attestationName); + navInfoEditor.commit(); return false; } }); @@ -234,8 +236,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic MessageDialog.show((AppCompatActivity) getActivity(), "提示", "不通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - navInfoEditor.putString("attestationName",attestationName); - navInfoEditor.commit(); + return false; } }); @@ -256,15 +257,14 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic @Override public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 100 && resultCode == RESULT_OK) { - Bundle extras = data.getExtras();//从Intent中获取附加值 + if (requestCode == 121 && resultCode == RESULT_OK) { if (file == null || !file.exists()) { Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; }else { String s = PhotoUtils.showPhotoAndGetPath(file, ivAttestation1); - ivAttestation1.setTag(s); + tvCard1.setTag(s); } file=null; ivHera1.setVisibility(View.GONE); @@ -282,15 +282,14 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic // } // }); // } - } - if (requestCode == 200 && resultCode == RESULT_OK) { + }else if (requestCode == 122 && resultCode == RESULT_OK) { if (file == null || !file.exists()) { Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; }else { String s = PhotoUtils.showPhotoAndGetPath(file, ivAttestation2); - ivAttestation2.setTag(s); + tvCard2.setTag(s); } file=null; ivHera2.setVisibility(View.GONE); @@ -308,15 +307,14 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic // } // }); // } - } - if (requestCode == 300 && resultCode == RESULT_OK) { + }else if (requestCode == 123 && resultCode == RESULT_OK) { if (file == null || !file.exists()) { Toast.makeText(getContext(), "没有拍摄照片", Toast.LENGTH_SHORT).show(); return; }else { String s = PhotoUtils.showPhotoAndGetPath(file, ivAttestation3); - ivAttestation3.setTag(s); + tvCard3.setTag(s); } file=null; ivHera3.setVisibility(View.GONE); 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 fa7ecdf..ca4419f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -89,18 +89,18 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked){ + if (isChecked) { checkBox.setChecked(true); navInfo = getActivity().getSharedPreferences("navInfo", Context.MODE_PRIVATE); bankAccount = navInfo.getString("bankAccount", null); - if (bankAccount ==null|| bankAccount.equals("")){ + if (bankAccount == null || bankAccount.equals("")) { String attestationName = navInfo.getString("attestationName", null); if (attestationName == null || attestationName.equals("")) { Intent attestationIntent = new Intent(getContext(), FragmentManagement.class); attestationIntent.putExtra("tag", 25); startActivity(attestationIntent); Toast.makeText(getContext(), "未实名认证，不能绑定银行卡", Toast.LENGTH_SHORT).show(); - }else { + } else { Intent gatheringIntent = new Intent(getContext(), FragmentManagement.class); gatheringIntent.putExtra("tag", 24); startActivity(gatheringIntent); @@ -188,26 +188,26 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen if (etAllPrice.getText().toString().equals("")) { Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); } - String price = etAllPrice.getText().toString().trim(); - Integer integer = Integer.valueOf(price); - if (integer!=null&&integer<10){ + 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()){ + if (!checkBox.isChecked()) { Toast.makeText(getContext(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); return; } - if (bankAccount!=null){ + if (bankAccount != null) { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; - MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否提取到"+bankAccount.substring(bankAccount.length()-4)+"的银行卡", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否提取到" + bankAccount.substring(bankAccount.length() - 4) + "的银行卡", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { immediatelyPrice(); return false; } }); - }else { + } else { Toast.makeText(getContext(), "请先绑定银行卡", Toast.LENGTH_SHORT).show(); } @@ -236,7 +236,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen public void onSuccess(UserPriceExchangeBean response, int id) { dismissLoadingDialog(); Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); - if (response.getCode()==200){ + if (response.getCode() == 200) { String unit = tvUnit.getText().toString(); String price = etAllPrice.getText().toString(); double v = Double.valueOf(unit) - Double.valueOf(price); diff --git a/app/src/main/res/layout/activity_picture.xml b/app/src/main/res/layout/activity_picture.xml index d8db5a4..4f8f697 100644 --- a/app/src/main/res/layout/activity_picture.xml +++ b/app/src/main/res/layout/activity_picture.xml @@ -83,7 +83,7 @@ android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@+id/btn_switch" android:background="@color/whiteAlpha50" android:padding="@dimen/default_widget_padding" android:format="00:00:00" diff --git a/app/src/main/res/layout/charging_station_fragment.xml b/app/src/main/res/layout/charging_station_fragment.xml index 960ef00..6884588 100644 --- a/app/src/main/res/layout/charging_station_fragment.xml +++ b/app/src/main/res/layout/charging_station_fragment.xml @@ -90,7 +90,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> diff --git a/app/src/main/res/layout/fragment_forget_paw.xml b/app/src/main/res/layout/fragment_forget_paw.xml index 91e7d41..2f31a2a 100644 --- a/app/src/main/res/layout/fragment_forget_paw.xml +++ b/app/src/main/res/layout/fragment_forget_paw.xml @@ -62,10 +62,13 @@ + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone"/> - - - - - @@ -143,16 +142,17 @@ android:text="密码" android:textColor="@color/colorWhite" android:textSize="14sp" - app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note" + app:layout_constraintLeft_toLeftOf="@id/forgetPaw_note" app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" /> @@ -181,7 +183,7 @@ @@ -204,9 +209,11 @@