xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改12日的bug

Browse Source
This commit is contained in:
wds 2021-08-12 21:08:38 +08:00
parent c45355ceac
commit b1adb1e137
26 changed files with 976 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion '29.0.2' buildToolsVersion '29.0.2'
ndkVersion '23.0.7123448' //ndkVersion '23.0.7123448'
defaultConfig { defaultConfig {
applicationId "com.navinfo.outdoor" applicationId "com.navinfo.outdoor"

83
app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
View File

@ -19,6 +19,8 @@ import com.navinfo.outdoor.R;
import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseActivity; import com.navinfo.outdoor.base.BaseActivity;
import com.navinfo.outdoor.bean.LoginOauthTokenBean; import com.navinfo.outdoor.bean.LoginOauthTokenBean;
import com.navinfo.outdoor.bean.UserBean;
import com.navinfo.outdoor.bean.UserDetailBean;
import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.http.OkGoBuilder;
@ -63,8 +65,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
public void onEvent(Message data) { public void onEvent(Message data) {
if (data.what == Constant.REGISTER_WORD) { if (data.what == Constant.REGISTER_WORD) {
if ((boolean)data.obj){ if ((boolean)data.obj){
etLoginName.setText(Constant.user_name); etLoginName.setText(Constant.USER_NAME);
etLoginPaw.setText(Constant.pass_word); etLoginPaw.setText(Constant.PASS_WORD);
} }
} }
} }
@ -143,19 +145,19 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
navInfoEditor.putString("access_token",body.getAccess_token()); navInfoEditor.putString("access_token",body.getAccess_token());
navInfoEditor.putString("refresh_token",body.getRefresh_token()); navInfoEditor.putString("refresh_token",body.getRefresh_token());
navInfoEditor.putString("userId",body.getUserId()); navInfoEditor.putString("userId",body.getUserId());
navInfoEditor.putString("username",body.getUsername());
navInfoEditor.putString("user_name",name);
navInfoEditor.putString("pass_word",paw);
navInfoEditor.commit(); navInfoEditor.commit();
if (body.getUserId()!=null&&!body.getUserId().equals("")){
Constant.initRootFolder(body.getUserId());
}
Constant.ACCESS_TOKEN=body.getAccess_token(); Constant.ACCESS_TOKEN=body.getAccess_token();
Constant.REFRESH_TOKEN=body.getRefresh_token(); Constant.REFRESH_TOKEN=body.getRefresh_token();
Constant.USERID=body.getUserId(); Constant.USERID=body.getUserId();
Constant.USERNAME=body.getUsername(); Constant.PASS_WORD=paw;
Intent intent = new Intent(LoginActivity.this, HomeActivity.class); initGetUserInfo();//获取用户信息
startActivity(intent);
finish();
}else { }else {
Toast.makeText(LoginActivity.this, response.getMessage()+"", Toast.LENGTH_SHORT).show(); dismissLoadingDialog();
} }
} }
@Override @Override
@ -170,6 +172,67 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
private void initGetUserInfo() {
OkGoBuilder.getInstance().Builder(this)
.url(HttpInterface.USER_DETAIL_BY_USER_ID)
.token(Constant.ACCESS_TOKEN)
.params(new HttpParams())
.cls(UserDetailBean.class)
.getRequest(new Callback<UserDetailBean>() {
@Override
public void onSuccess(UserDetailBean response, int id) {
dismissLoadingDialog();
if (response.getCode()==200){
UserDetailBean.BodyBean body = response.getBody();
if (body!=null){
navInfoEditor.putString("username",body.getUsername());
Constant.USER_NAME=body.getUsername();
navInfoEditor.putString("mobile",body.getMobile());
Constant.MOBILE=body.getMobile();
navInfoEditor.putInt("sex",body.getSex());//0:女 1：男
Constant.SEX=body.getSex();
navInfoEditor.putString("qq",body.getQq());
Constant.QQ=body.getQq();
navInfoEditor.putString("wechat",body.getWechat());
Constant.WECHAT=body.getWechat();
UserDetailBean.BodyBean.UserBankcardBean userBankcard = body.getUserBankcard();
if (userBankcard!=null){//存储银行卡信息
navInfoEditor.putString("bankAccount",userBankcard.getBankAccount());//银行卡编号
Constant.BANKACCOUNT=userBankcard.getBankAccount();
navInfoEditor.putString("idNumber",userBankcard.getIdNumber());//银行卡账号
Constant.ID_NUMBER=userBankcard.getIdNumber();
}
UserDetailBean.BodyBean.UserAuthBean userAuth = body.getUserAuth();
if (userAuth!=null){//存储身份证信息
navInfoEditor.putString("name",userAuth.getName());//身份证姓名
Constant.NAME=userAuth.getName();
navInfoEditor.putString("idnum",userAuth.getIdnum());//身份证号码
Constant.ID_NUM=userAuth.getIdnum();
navInfoEditor.putInt("auditstatus",userAuth.getAuditstatus());//审核状态
Constant.AUDITSTATUS=userAuth.getAuditstatus();
navInfoEditor.putString("auditmsg",userAuth.getAuditmsg());//审核信息
Constant.AUDITMSG=userAuth.getAuditmsg();
}
navInfoEditor.commit();
}
Intent intent = new Intent(LoginActivity.this, HomeActivity.class);
startActivity(intent);
finish();
}else {
Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show();
}
}
@Override
public void onError(Throwable e, int id) {
dismissLoadingDialog();
Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
@Override @Override
public void onConfigurationChanged(@NonNull Configuration newConfig) { public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);

92
app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java
View File

@ -24,6 +24,7 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.util.BaseDialog;
import com.kongzue.dialog.v3.MessageDialog; import com.kongzue.dialog.v3.MessageDialog;
import com.lzy.okgo.OkGo; import com.lzy.okgo.OkGo;
import com.lzy.okgo.model.HttpParams;
import com.lzy.okgo.model.Response; import com.lzy.okgo.model.Response;
import com.navinfo.outdoor.R; import com.navinfo.outdoor.R;
import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.api.Constant;
@ -32,8 +33,10 @@ import com.navinfo.outdoor.bean.BankPhoneBean;
import com.navinfo.outdoor.bean.CityBean; import com.navinfo.outdoor.bean.CityBean;
import com.navinfo.outdoor.bean.JsonBean; import com.navinfo.outdoor.bean.JsonBean;
import com.navinfo.outdoor.bean.UserBean; import com.navinfo.outdoor.bean.UserBean;
import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.DialogCallback; import com.navinfo.outdoor.http.DialogCallback;
import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
import com.navinfo.outdoor.util.GetJsonDataUtil; import com.navinfo.outdoor.util.GetJsonDataUtil;
import com.navinfo.outdoor.util.RegexUtil; import com.navinfo.outdoor.util.RegexUtil;
@ -65,7 +68,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
private String usermailbox; private String usermailbox;
private String region_id; private String region_id;
private SharedPreferences navInfo; private SharedPreferences navInfo;
private SharedPreferences.Editor navInfoEditor;
@Override @Override
@ -84,6 +87,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
super.initView(); super.initView();
initJsonData(); initJsonData();
navInfo = getSharedPreferences("navInfo", Context.MODE_PRIVATE); navInfo = getSharedPreferences("navInfo", Context.MODE_PRIVATE);
navInfoEditor = getSharedPreferences("navInfo", Context.MODE_PRIVATE).edit();
ivUser = findViewById(R.id.iv_user); ivUser = findViewById(R.id.iv_user);
ivUser.setOnClickListener(this::onClick); ivUser.setOnClickListener(this::onClick);
btnAttestation = findViewById(R.id.btn_attestation); btnAttestation = findViewById(R.id.btn_attestation);
@ -102,6 +106,16 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
etMailbox.setOnClickListener(this::onClick); etMailbox.setOnClickListener(this::onClick);
userSave = findViewById(R.id.btn_save); userSave = findViewById(R.id.btn_save);
userSave.setOnClickListener(this::onClick); userSave.setOnClickListener(this::onClick);
if (Constant.MOBILE!=null){
etPhone.setText(Constant.MOBILE);
}
if (Constant.QQ!=null){
etQq.setText(Constant.QQ);
}
String regions = navInfo.getString("region", null);
if (regions!=null){
region.setText(regions);
}
} }
@Override @Override
@ -111,15 +125,15 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
finish(); finish();
break; break;
case R.id.btn_gathering: case R.id.btn_gathering:
String attestationName = navInfo.getString("attestationName", null); if (Constant.AUDITSTATUS==-1){
if (attestationName == null || attestationName.equals("")) { Toast.makeText(getContext(), "请先实名认证", Toast.LENGTH_SHORT).show();
Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show(); }else if (Constant.AUDITSTATUS==1){//认证通过
return; Intent gatheringIntent = new Intent(this, FragmentManagement.class);
gatheringIntent.putExtra("tag", 24);
startActivity(gatheringIntent);
}else if (Constant.AUDITSTATUS==0){
Toast.makeText(this, Constant.AUDITMSG+"", Toast.LENGTH_SHORT).show();
} }
Intent gatheringIntent = new Intent(this, FragmentManagement.class);
gatheringIntent.putExtra("tag", 24);
startActivity(gatheringIntent);
break; break;
case R.id.btn_attestation: case R.id.btn_attestation:
Intent attestationIntent = new Intent(this, FragmentManagement.class); Intent attestationIntent = new Intent(this, FragmentManagement.class);
@ -136,19 +150,21 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
break; break;
case R.id.btn_save: case R.id.btn_save:
String attestationNames = navInfo.getString("attestationName", null); if (Constant.ID_NUM==null){
if (attestationNames == null || attestationNames.equals("")) {
Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show();
return; return;
} }
String bankAccount = navInfo.getString("bankAccount", null); if (Constant.ID_NUMBER==null){
if (bankAccount == null||bankAccount.equals("")){
Toast.makeText(this, "请先绑定银行卡", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "请先绑定银行卡", Toast.LENGTH_SHORT).show();
return; return;
} }
userphone = etPhone.getText().toString().trim(); userphone = etPhone.getText().toString().trim();
userqq = etQq.getText().toString().trim(); userqq = etQq.getText().toString().trim();
usermailbox = etMailbox.getText().toString().trim(); usermailbox = etMailbox.getText().toString().trim();
HttpParams httpParams = new HttpParams();
httpParams.put("pid",Constant.USERID);
long time = System.currentTimeMillis();
httpParams.put("datetime", time);
boolean isQQNum_matcher = userqq.matches("[1-9][0-9]{4,14}"); boolean isQQNum_matcher = userqq.matches("[1-9][0-9]{4,14}");
// 邮箱匹配结果 // 邮箱匹配结果
boolean isEmail_matcher = usermailbox.matches( "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$"); boolean isEmail_matcher = usermailbox.matches( "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$");
@ -157,73 +173,77 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
if (region_id == null || region_id.equals("")) { if (region_id == null || region_id.equals("")) {
Toast.makeText(this, "所在地区为空，请重新输入", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "所在地区为空，请重新输入", Toast.LENGTH_SHORT).show();
return; return;
}else {
httpParams.put("regionId",region_id);
} }
if (!RegexUtil.isPhone(userphone)) { if (!RegexUtil.isPhone(userphone)) {
Toast.makeText(this, "手机号输入错误", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "手机号输入错误", Toast.LENGTH_SHORT).show();
return; return;
}else {
httpParams.put("mobile",userqq);
} }
if (!userqq.equals("")) { if (!userqq.equals("")) {
if (!isQQNum_matcher) { if (!isQQNum_matcher) {
Toast.makeText(this, "QQ号输入错误", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "QQ号输入错误", Toast.LENGTH_SHORT).show();
} }
return; return;
}else {
httpParams.put("qq",userqq);
} }
if (!usermailbox.equals("")){ if (!usermailbox.equals("")){
if (!isEmail_matcher) { if (!isEmail_matcher) {
Toast.makeText(this, "邮箱格式错误", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "邮箱格式错误", Toast.LENGTH_SHORT).show();
} }
return; return;
}else {
// httpParams.put("qq",userqq);
} }
} }
netWork(); netWork(httpParams);
break; break;
} }
} }
private void netWork() { private void netWork(HttpParams httpParams) {
showLoadingDialog(); showLoadingDialog();
OkGo OkGoBuilder.getInstance()
// 请求方式和请求url .Builder(this)
.<UserBean>post(HttpInterface.USER_UPDATE) .url(HttpInterface.USER_UPDATE)
// 请求的 tag, 主要用于取消对应的请求 .cls(UserBean.class)
.params("pid", "1") .token(Constant.ACCESS_TOKEN)
.params("regionId", region_id)//省市区id .params(httpParams)
.params("qq", userqq)//qq号 .postRequest(new Callback<UserBean>() {
.tag(this)
.execute(new DialogCallback<UserBean>(UserBean.class) {
@Override @Override
public void onSuccess(Response<UserBean> response) { public void onSuccess(UserBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Log.d("TAG", "onSuccess: " + response.toString() + "sssssssssssss"); Log.d("TAG", "onSuccess: " + response.toString() + "sssssssssssss");
if (response.getCode()==200) {
if (response.code()==200) { MessageDialog.show(UserActivity.this, "提示","是否保存", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
MessageDialog.show(UserActivity.this, "是否保存", "确定", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
navInfoEditor.putString("region",region.getText().toString());
navInfoEditor.commit();
finish();
return false; return false;
} }
}); });
} else { } else {
MessageDialog.show(UserActivity.this, "是否保存", "取消", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { MessageDialog.show(UserActivity.this, "提示","是否保存", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
return false; return false;
} }
}); });
} }
} }
@Override @Override
public void onError(Response<UserBean> response) { public void onError(Throwable e, int id) {
super.onError(response);
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(UserActivity.this, response.message(), Toast.LENGTH_SHORT).show(); Toast.makeText(UserActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + response.message()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
} }

44
app/src/main/java/com/navinfo/outdoor/api/Constant.java
View File

@ -12,6 +12,8 @@ import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory; import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
import com.tencent.tencentmap.mapsdk.maps.model.LatLng; import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
import java.io.File;
/** /**
* 常量 * 常量
*/ */
@ -31,13 +33,30 @@ public class Constant {
public static final String GET_ERR_MESSAGE1 = "设备缺少使用腾讯定位服务需要的基本条件"; public static final String GET_ERR_MESSAGE1 = "设备缺少使用腾讯定位服务需要的基本条件";
public static final String GET_ERR_MESSAGE2 = "manifest 中配置的 key 不正确"; public static final String GET_ERR_MESSAGE2 = "manifest 中配置的 key 不正确";
public static final String GET_ERR_MESSAGE3 = "自动加载libtencentloc.so失败"; public static final String GET_ERR_MESSAGE3 = "自动加载libtencentloc.so失败";
public static final String BASE_FOLDER = SdkFolderCreate.getSDPath() + "/navinfoOutDoor"; public static String BASE_FOLDER = SdkFolderCreate.getSDPath() + "/navinfoOutDoor";
// 保存图片的目录 // 保存图片的目录
public static final String PICTURE_FOLDER = BASE_FOLDER + "/picture"; public static String PICTURE_FOLDER;
public static final String VIDEOS_ = BASE_FOLDER + "/videos";
public static final String POI_DAO = BASE_FOLDER + "/BaseDao/"; public static String VIDEOS_ ;
public static String POI_DAO ;
//下载文件 //下载文件
public static final String NAVINFO_APk = BASE_FOLDER + "/apk/"; public static final String NAVINFO_APk = BASE_FOLDER + "/apk/";
public static void initRootFolder(String userId){
BASE_FOLDER+="/"+userId;
PICTURE_FOLDER = BASE_FOLDER + "/picture";
POI_DAO = BASE_FOLDER + "/BaseDao/";
VIDEOS_ = BASE_FOLDER + "/videos";
// 初始化应用目录
File baseFolder = new File(BASE_FOLDER); // 数据库文件夹路径
if (!baseFolder.exists()) {
SdkFolderCreate.mkdirs(baseFolder.getAbsolutePath());
}
File picFolder = new File(PICTURE_FOLDER); // 视频照片文件夹路径
if (!picFolder.exists()) {
SdkFolderCreate.mkdirs(picFolder.getAbsolutePath());
}
}
// 申请权限的RequestCode // 申请权限的RequestCode
public static final int PERMISSION_REQUEST_CODE = 0x100; public static final int PERMISSION_REQUEST_CODE = 0x100;
@ -47,6 +66,8 @@ public class Constant {
public static final String DATA_FILE = "dataFile"; public static final String DATA_FILE = "dataFile";
/** /**
* 存储用户信息 * 存储用户信息
* access_token 后续需求需要用到的key 过期时间8小时 * access_token 后续需求需要用到的key 过期时间8小时
@ -57,10 +78,19 @@ public class Constant {
public static String ACCESS_TOKEN=null; public static String ACCESS_TOKEN=null;
public static String REFRESH_TOKEN=null; public static String REFRESH_TOKEN=null;
public static String USERID=null; public static String USERID=null;
public static String USERNAME=null;
public static String user_name=null; public static String USER_NAME=null;//登录账号/修改账号/注册
public static String pass_word=null; public static String PASS_WORD=null;//登录密码/修改密码/注册密码
public static String AUDITMSG = null;//身份证审核信息
public static int AUDITSTATUS = -1;//身份证审核状态 //0：不通過，1：通過，-1：待审核
public static String ID_NUM = null;//身份证号
public static String NAME = null;//身份证姓名
public static String ID_NUMBER = null;//银行卡号
public static String BANKACCOUNT = null;//银行卡编码
public static int SEX = -1;//性别
public static String QQ = null;
public static String WECHAT = null;
public static String MOBILE = null;//手机号

9
app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
View File

@ -41,16 +41,7 @@ public class UserApplication extends Application {
initOkGo(); initOkGo();
// 初始化应用目录
File baseFolder = new File(Constant.BASE_FOLDER); // 数据库文件夹路径
if (!baseFolder.exists()) {
SdkFolderCreate.mkdirs(baseFolder.getAbsolutePath());
}
File picFolder = new File(Constant.PICTURE_FOLDER); // 视频照片文件夹路径
if (!picFolder.exists()) {
SdkFolderCreate.mkdirs(picFolder.getAbsolutePath());
}
TecentLocationUtils.getInstance(this).startLocation(this); TecentLocationUtils.getInstance(this).startLocation(this);
} }

534
app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java Normal file
View File

@ -0,0 +1,534 @@
package com.navinfo.outdoor.bean;
import java.util.List;
public class UserDetailBean {
/**
* code : 200
* message : 成功
* body : {"pid":1,"username":"C10000","password":"123456","createtime":"2021-06-11T07:56:06.117+0000","name":"李心榕","sex":0,"regionId":530902,"mobile":"18811794839","fatherid":null,"registerTime":null,"photoName":null,"alipayAccountName":null,"wechat":null,"qq":"","freezed":0,"locked":0,"userBankcard":{"userid":1,"name":"李心榕","bankName":"银行名称","bankAccount":"103100000026","lastUpdateTime":null,"idNumber":"8866214489652365478","name1":"李心榕","idNumber1":null,"modifydate":null},"userAuth":{"userid":1,"name":"我得","idnum":"411381200010265236","certorg":null,"idtimelimit":null,"p1":null,"p2":null,"p3":null,"modifytime":"2021-06-28T07:22:12.160+0000","audituid":null,"audittime":null,"reaudituid":null,"reaudittime":null,"auditstatus":1,"reaudited":0,"auditmsg":null},"role":[{"id":3,"name":"admin","description":"众包管理员"}]}
*/
private int code;
private String message;
private BodyBean body;
public int getCode() {
return code;
}
public void setCode(int 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 {
/**
* pid : 1
* username : C10000
* password : 123456
* createtime : 2021-06-11T07:56:06.117+0000
* name : 李心榕
* sex : 0
* regionId : 530902
* mobile : 18811794839
* fatherid : null
* registerTime : null
* photoName : null
* alipayAccountName : null
* wechat : null
* qq :
* freezed : 0
* locked : 0
* userBankcard : {"userid":1,"name":"李心榕","bankName":"银行名称","bankAccount":"103100000026","lastUpdateTime":null,"idNumber":"8866214489652365478","name1":"李心榕","idNumber1":null,"modifydate":null}
* userAuth : {"userid":1,"name":"我得","idnum":"411381200010265236","certorg":null,"idtimelimit":null,"p1":null,"p2":null,"p3":null,"modifytime":"2021-06-28T07:22:12.160+0000","audituid":null,"audittime":null,"reaudituid":null,"reaudittime":null,"auditstatus":1,"reaudited":0,"auditmsg":null}
* role : [{"id":3,"name":"admin","description":"众包管理员"}]
*/
private int pid;
private String username;
private String password;
private String createtime;
private String name;
private int sex;
private int regionId;
private String mobile;
private Object fatherid;
private Object registerTime;
private Object photoName;
private Object alipayAccountName;
private String wechat;
private String qq;
private int freezed;
private int locked;
private UserBankcardBean userBankcard;
private UserAuthBean userAuth;
private List<RoleBean> role;
public int getPid() {
return pid;
}
public void setPid(int pid) {
this.pid = pid;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getCreatetime() {
return createtime;
}
public void setCreatetime(String createtime) {
this.createtime = createtime;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getSex() {
return sex;
}
public void setSex(int sex) {
this.sex = sex;
}
public int getRegionId() {
return regionId;
}
public void setRegionId(int regionId) {
this.regionId = regionId;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public Object getFatherid() {
return fatherid;
}
public void setFatherid(Object fatherid) {
this.fatherid = fatherid;
}
public Object getRegisterTime() {
return registerTime;
}
public void setRegisterTime(Object registerTime) {
this.registerTime = registerTime;
}
public Object getPhotoName() {
return photoName;
}
public void setPhotoName(Object photoName) {
this.photoName = photoName;
}
public Object getAlipayAccountName() {
return alipayAccountName;
}
public void setAlipayAccountName(Object alipayAccountName) {
this.alipayAccountName = alipayAccountName;
}
public String getWechat() {
return wechat;
}
public void setWechat(String wechat) {
this.wechat = wechat;
}
public String getQq() {
return qq;
}
public void setQq(String qq) {
this.qq = qq;
}
public int getFreezed() {
return freezed;
}
public void setFreezed(int freezed) {
this.freezed = freezed;
}
public int getLocked() {
return locked;
}
public void setLocked(int locked) {
this.locked = locked;
}
public UserBankcardBean getUserBankcard() {
return userBankcard;
}
public void setUserBankcard(UserBankcardBean userBankcard) {
this.userBankcard = userBankcard;
}
public UserAuthBean getUserAuth() {
return userAuth;
}
public void setUserAuth(UserAuthBean userAuth) {
this.userAuth = userAuth;
}
public List<RoleBean> getRole() {
return role;
}
public void setRole(List<RoleBean> role) {
this.role = role;
}
public static class UserBankcardBean {
/**
* userid : 1
* name : 李心榕
* bankName : 银行名称
* bankAccount : 103100000026
* lastUpdateTime : null
* idNumber : 8866214489652365478
* name1 : 李心榕
* idNumber1 : null
* modifydate : null
*/
private int userid;
private String name;
private String bankName;
private String bankAccount;
private Object lastUpdateTime;
private String idNumber;
private String name1;
private Object idNumber1;
private Object modifydate;
public int getUserid() {
return userid;
}
public void setUserid(int userid) {
this.userid = userid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getBankAccount() {
return bankAccount;
}
public void setBankAccount(String bankAccount) {
this.bankAccount = bankAccount;
}
public Object getLastUpdateTime() {
return lastUpdateTime;
}
public void setLastUpdateTime(Object lastUpdateTime) {
this.lastUpdateTime = lastUpdateTime;
}
public String getIdNumber() {
return idNumber;
}
public void setIdNumber(String idNumber) {
this.idNumber = idNumber;
}
public String getName1() {
return name1;
}
public void setName1(String name1) {
this.name1 = name1;
}
public Object getIdNumber1() {
return idNumber1;
}
public void setIdNumber1(Object idNumber1) {
this.idNumber1 = idNumber1;
}
public Object getModifydate() {
return modifydate;
}
public void setModifydate(Object modifydate) {
this.modifydate = modifydate;
}
}
public static class UserAuthBean {
/**
* userid : 1
* name : 我得
* idnum : 411381200010265236
* certorg : null
* idtimelimit : null
* p1 : null
* p2 : null
* p3 : null
* modifytime : 2021-06-28T07:22:12.160+0000
* audituid : null
* audittime : null
* reaudituid : null
* reaudittime : null
* auditstatus : 1
* reaudited : 0
* auditmsg : null
*/
private int userid;
private String name;
private String idnum;
private Object certorg;
private Object idtimelimit;
private Object p1;
private Object p2;
private Object p3;
private String modifytime;
private Object audituid;
private Object audittime;
private Object reaudituid;
private Object reaudittime;
private int auditstatus;
private int reaudited;
private String auditmsg;
public int getUserid() {
return userid;
}
public void setUserid(int userid) {
this.userid = userid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getIdnum() {
return idnum;
}
public void setIdnum(String idnum) {
this.idnum = idnum;
}
public Object getCertorg() {
return certorg;
}
public void setCertorg(Object certorg) {
this.certorg = certorg;
}
public Object getIdtimelimit() {
return idtimelimit;
}
public void setIdtimelimit(Object idtimelimit) {
this.idtimelimit = idtimelimit;
}
public Object getP1() {
return p1;
}
public void setP1(Object p1) {
this.p1 = p1;
}
public Object getP2() {
return p2;
}
public void setP2(Object p2) {
this.p2 = p2;
}
public Object getP3() {
return p3;
}
public void setP3(Object p3) {
this.p3 = p3;
}
public String getModifytime() {
return modifytime;
}
public void setModifytime(String modifytime) {
this.modifytime = modifytime;
}
public Object getAudituid() {
return audituid;
}
public void setAudituid(Object audituid) {
this.audituid = audituid;
}
public Object getAudittime() {
return audittime;
}
public void setAudittime(Object audittime) {
this.audittime = audittime;
}
public Object getReaudituid() {
return reaudituid;
}
public void setReaudituid(Object reaudituid) {
this.reaudituid = reaudituid;
}
public Object getReaudittime() {
return reaudittime;
}
public void setReaudittime(Object reaudittime) {
this.reaudittime = reaudittime;
}
public int getAuditstatus() {
return auditstatus;
}
public void setAuditstatus(int auditstatus) {
this.auditstatus = auditstatus;
}
public int getReaudited() {
return reaudited;
}
public void setReaudited(int reaudited) {
this.reaudited = reaudited;
}
public String getAuditmsg() {
return auditmsg;
}
public void setAuditmsg(String auditmsg) {
this.auditmsg = auditmsg;
}
}
public static class RoleBean {
/**
* id : 3
* name : admin
* description : 众包管理员
*/
private int id;
private String name;
private String description;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
}
}
}

21
app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
View File

@ -151,7 +151,12 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
// 监听到返回按钮点击事件 // 监听到返回按钮点击事件
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.TREASURE_FRAGMENT; obtain.what = Constant.TREASURE_FRAGMENT;
obtain.obj = isSliding; obtain.obj = true;
EventBus.getDefault().post(obtain);
}else {
Message obtain = Message.obtain();
obtain.what = Constant.TREASURE_FRAGMENT;
obtain.obj = false;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
} }
onBackPressed(); onBackPressed();
@ -165,6 +170,13 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
startActivity(intent); startActivity(intent);
} }
}); });
if (latLng!=null){
Message obtain = Message.obtain();
obtain.what = Constant.POI_DRAWER;
obtain.obj = latLng;
EventBus.getDefault().post(obtain);
}
} }
@Override @Override
@ -567,7 +579,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
private void initShowPileSharePre() { private void initShowPileSharePre() {
station = getArguments().getString("station"); station = getArguments().getString("station");
if (station != null) { if (station != null) {
showPoiEntity = new Gson().fromJson(station, PoiEntity.class); PoiEntity showPoiEntity = new Gson().fromJson(station, PoiEntity.class);
pid = showPoiEntity.getId(); pid = showPoiEntity.getId();
taskId = showPoiEntity.getTaskId(); taskId = showPoiEntity.getTaskId();
latLng = new LatLng(); latLng = new LatLng();
@ -583,7 +595,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
} }
String p = chargingPileEntity.getP(); String p = chargingPileEntity.getP();
if (p != null) { if (p != null) {
// 解密geo // 解密geo
String decodeGeometry = Geohash.getInstance().decode(p); String decodeGeometry = Geohash.getInstance().decode(p);
@ -805,21 +816,19 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
file = PhotoUtils.showPhotoFile("a",latLng); file = PhotoUtils.showPhotoFile("a",latLng);
intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentPanorama, 101); startActivityForResult(intentPanorama, 101);
initPileSharePre();
break; break;
case R.id.rl_coding: case R.id.rl_coding:
Intent intentCoding = new Intent("android.media.action.IMAGE_CAPTURE"); Intent intentCoding = new Intent("android.media.action.IMAGE_CAPTURE");
file = PhotoUtils.showPhotoFile("b", latLng); file = PhotoUtils.showPhotoFile("b", latLng);
intentCoding.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); intentCoding.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentCoding, 102); startActivityForResult(intentCoding, 102);
initPileSharePre();
break; break;
case R.id.rl_equipment: case R.id.rl_equipment:
Intent intentEquipment = new Intent("android.media.action.IMAGE_CAPTURE"); Intent intentEquipment = new Intent("android.media.action.IMAGE_CAPTURE");
file = PhotoUtils.showPhotoFile("c", latLng); file = PhotoUtils.showPhotoFile("c", latLng);
intentEquipment.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); intentEquipment.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(intentEquipment, 103); startActivityForResult(intentEquipment, 103);
initPileSharePre();
break; break;
case R.id.rl_facility: case R.id.rl_facility:
Intent intentFacility = new Intent("android.media.action.IMAGE_CAPTURE"); Intent intentFacility = new Intent("android.media.action.IMAGE_CAPTURE");

40
app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
View File

@ -756,7 +756,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override @Override
public void run() { public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 0 || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2) { if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 0 || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2||poiDaoPoiEntity.getTaskStatus()==5) {
initRoadSaveLocal(true); initRoadSaveLocal(true);
} else { } else {
// 首先批量保存充电站对应的充电桩数据 // 首先批量保存充电站对应的充电桩数据
@ -975,28 +975,24 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override @Override
public void onSuccess(PoiUploadBean response, int id) { public void onSuccess(PoiUploadBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
if (response == null || response.getCode()!= 200) { if (response.getCode() == 200) {
Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
getActivity().onBackPressed();//回退
}
});
}
}).start();
} else {
Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show();
return;
}
if (response != null && response.getCode()== 200) {
Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show();
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(showPoiEntity);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
getActivity().onBackPressed();//回退
}
});
}
}).start();
return;
}
} }
}
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
@ -1099,7 +1095,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
public void run() { public void run() {
if (isLocal) { if (isLocal) {
stationUploadByNetWork(poiEntity, chargingStationList); stationUploadByNetWork(poiEntity, chargingStationList);
// chargingPileUploadNetWork(chargingPileBody, fileList); // chargingPileUploadNetWork(chargingPileBody, fileList);
} else { } else {
Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
onBackPressed(); onBackPressed();

7
app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
View File

@ -159,7 +159,12 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
if (data.what == Constant.JOB_SEARCH_POI_WORD) { if (data.what == Constant.JOB_SEARCH_POI_WORD) {
allPoi = (List<PoiEntity>) data.obj; allPoi = (List<PoiEntity>) data.obj;
if (allPoi != null) { if (allPoi != null) {
poiEntities.addAll(allPoi); for (int i = 0; i < allPoi.size(); i++) {
if (allPoi.get(i).getTaskStatus()==0||allPoi.get(i).getTaskStatus()==1){
poiEntities.add(allPoi.get(i));
}
}
} }
} else if (data.what == Constant.JOB_SEARCH_WORD) { } else if (data.what == Constant.JOB_SEARCH_WORD) {
JobSearchBean jobSearchBean = (JobSearchBean) data.obj; JobSearchBean jobSearchBean = (JobSearchBean) data.obj;

7
app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
View File

@ -140,14 +140,13 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
public void onSuccess(UserBean response, int id) { public void onSuccess(UserBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
if (response.getCode()==200){ if (response.getCode()==200){
Constant.user_name = mobile; Constant.USER_NAME = mobile;
Constant.pass_word = password; Constant.PASS_WORD = password;
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what=Constant.REGISTER_WORD; obtain.what=Constant.REGISTER_WORD;
obtain.obj = true; obtain.obj = true;
EventBus.getDefault().post(obtain); EventBus.getDefault().post(obtain);
Intent forgetIntent = new Intent(getContext(), LoginActivity.class); getActivity().finish();
startActivity(forgetIntent);
} }
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();

22
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
View File

@ -365,8 +365,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} }
//获取当前位置的marker //获取当前位置的marker
// senMessageMarker(chargingStationEntity.getType(), chargingStationEntity.getY(), chargingStationEntity.getX()); if (chargingStationEntity.getTaskStatus()==1){
// InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(),chargingStationEntity); //senMessageMarker(chargingStationEntity.getType(), chargingStationEntity.getY(), chargingStationEntity.getX());
InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(),chargingStationEntity);
}
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -396,12 +398,15 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} }
}).start(); }).start();
} }
}else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@ -453,9 +458,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
polygonEntity.setX(latPolygon.get(0).longitude + ""); polygonEntity.setX(latPolygon.get(0).longitude + "");
polygonEntity.setY(latPolygon.get(0).latitude + ""); polygonEntity.setY(latPolygon.get(0).latitude + "");
} }
polygonEntity.setTaskStatus(1);
} }
polygonEntity.setTaskStatus(1);
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -464,6 +470,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
@Override @Override
public void run() { public void run() {
initViewByTaskStatus(1); initViewByTaskStatus(1);
Toast.makeText(getActivity(), "领取成功", Toast.LENGTH_SHORT).show();
if (aBoolean) { if (aBoolean) {
initCompleteTask(HttpInterface.SUBMIT_POLYGON_TASK, GatherGetFragment.this.poiEntity.getTaskId(), true, polygonEntity); initCompleteTask(HttpInterface.SUBMIT_POLYGON_TASK, GatherGetFragment.this.poiEntity.getTaskId(), true, polygonEntity);
} }
@ -689,12 +696,11 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
poiListEntity.setX(latPolygon.get(0).longitude + ""); poiListEntity.setX(latPolygon.get(0).longitude + "");
poiListEntity.setY(latPolygon.get(0).latitude + ""); poiListEntity.setY(latPolygon.get(0).latitude + "");
} }
if (poiListEntity.getTaskStatus() != 1) { if (poiListEntity.getTaskStatus() == 1) {
// 通知地图界面显示当前编辑数据的marker // 通知地图界面显示当前编辑数据的marker
senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX());
InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity);
} }
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -805,9 +811,9 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
poiListEntity.setX(latPolygon.get(0).longitude + ""); poiListEntity.setX(latPolygon.get(0).longitude + "");
poiListEntity.setY(latPolygon.get(0).latitude + ""); poiListEntity.setY(latPolygon.get(0).latitude + "");
} }
if (poiListEntity.getTaskStatus() != 1) { if (poiListEntity.getTaskStatus() == 1) {
// 通知地图界面显示当前编辑数据的marker // 通知地图界面显示当前编辑数据的marker
senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX());
InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity);
} }

48
app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
View File

@ -66,12 +66,9 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
private TextView tvName; private TextView tvName;
private EditText etBankNum; private EditText etBankNum;
private ImageView gatheringCamera; private ImageView gatheringCamera;
private String gatheringPath;
private ArrayList<BankPathBean> jsonBean; private ArrayList<BankPathBean> jsonBean;
private String value; private String value;
private SharedPreferences navInfo;
private SharedPreferences.Editor navInfoEditor;
private File file; private File file;
@ -90,8 +87,6 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
@Override @Override
protected void initView() { protected void initView() {
super.initView(); super.initView();
navInfoEditor = getActivity().getSharedPreferences("navInfo", Context.MODE_PRIVATE).edit();
navInfo = getActivity().getSharedPreferences("navInfo", Context.MODE_PRIVATE);
ivGathering = findViewById(R.id.iv_gathering); ivGathering = findViewById(R.id.iv_gathering);
ivGathering.setOnClickListener(this::onClick); ivGathering.setOnClickListener(this::onClick);
imageBank = findViewById(R.id.iv_bank); imageBank = findViewById(R.id.iv_bank);
@ -101,14 +96,16 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
btnBank = findViewById(R.id.btn_bank); btnBank = findViewById(R.id.btn_bank);
btnBank.setOnClickListener(this::onClick); btnBank.setOnClickListener(this::onClick);
tvName = (TextView) findViewById(R.id.tv_name); tvName = (TextView) findViewById(R.id.tv_name);
String attestationName = navInfo.getString("attestationName", null);
if (attestationName != null && !attestationName.equals("")) {
tvName.setText(attestationName);
}
etBankNum = (EditText) findViewById(R.id.et_bank_num); etBankNum = (EditText) findViewById(R.id.et_bank_num);
gatheringCamera = (ImageView) findViewById(R.id.gathering_camera); gatheringCamera = (ImageView) findViewById(R.id.gathering_camera);
gatheringCamera.setOnClickListener(this::onClick); gatheringCamera.setOnClickListener(this::onClick);
if (Constant.NAME!=null){
tvName.setText(Constant.NAME);
}
if (Constant.ID_NUMBER!=null){
etBankNum.setText(Constant.ID_NUMBER);
btnBank.setText("已绑定");
}
} }
@Override @Override
@ -166,7 +163,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
break; break;
case R.id.gathering_camera: case R.id.gathering_camera:
Intent gatheringNumberIntent = new Intent("android.media.action.IMAGE_CAPTURE"); Intent gatheringNumberIntent = new Intent("android.media.action.IMAGE_CAPTURE");
file =PhotoUtils.showPhotoFile("a", null); file = PhotoUtils.showPhotoFile("a", null);
gatheringNumberIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); gatheringNumberIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file));
startActivityForResult(gatheringNumberIntent, 131); startActivityForResult(gatheringNumberIntent, 131);
break; break;
@ -174,11 +171,11 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
} }
private void gatheringNetWork() { private void gatheringNetWork() {
ArrayList<File> gatheringList = new ArrayList<>(); ArrayList<File> gatheringList = new ArrayList<>();
if (gatheringCamera.getTag() == null){ if (gatheringCamera.getTag() == null) {
Toast.makeText(getContext(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "请先拍银行卡", Toast.LENGTH_SHORT).show();
return; return;
} }
String gatheringCameraTag = (String) gatheringCamera.getTag(); String gatheringCameraTag = (String) gatheringCamera.getTag();
gatheringList.add(new File(gatheringCameraTag)); gatheringList.add(new File(gatheringCameraTag));
String etBankAccount = etBankNum.getText().toString().trim(); String etBankAccount = etBankNum.getText().toString().trim();
@ -200,25 +197,25 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
.cls(BankPhoneBean.class) .cls(BankPhoneBean.class)
.token(Constant.ACCESS_TOKEN) .token(Constant.ACCESS_TOKEN)
.params(httpParams) .params(httpParams)
.fileList( gatheringList) .fileList(gatheringList)
.postFileAsynchronous(new Callback<BankPhoneBean>() { .postFileAsynchronous(new Callback<BankPhoneBean>() {
@Override @Override
public void onSuccess(BankPhoneBean response, int id) { public void onSuccess(BankPhoneBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
if (response.getCode()==200){ if (response.getCode() == 200) {
MessageDialog.show((AppCompatActivity) getActivity(), "绑定成功", "确定", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { MessageDialog.show((AppCompatActivity) getActivity(), "提示", "绑定成功", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
Constant.BANKACCOUNT=value;
getActivity().finish(); Constant.ID_NUMBER=etBankAccount;
getActivity().finish();
return false; return false;
} }
}); });
}else { } else {
MessageDialog.show((AppCompatActivity) getActivity(), "绑定失败", "取消", "取消", "确定").setOkButton(new OnDialogButtonClickListener() { MessageDialog.show((AppCompatActivity) getActivity(), "提示", "绑定失败", "确定","取消").setOkButton(new OnDialogButtonClickListener() {
@Override @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
return false; return false;
} }
}); });
@ -228,6 +225,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
@Override @Override
public void onError(Throwable e, int id) { public void onError(Throwable e, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), e.getMessage()+"", Toast.LENGTH_SHORT).show();
} }
}); });
/*OkGo /*OkGo
@ -279,7 +277,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 131 && resultCode == RESULT_OK) { if (requestCode == 131 && resultCode == RESULT_OK) {
if (file ==null&&!file.exists()){ if (file == null && !file.exists()) {
Toast.makeText(getContext(), "请先拍照", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "请先拍照", Toast.LENGTH_SHORT).show();
return; return;
} }

2
app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
View File

@ -66,7 +66,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
Glide.with(getActivity()).load(R.drawable.mine_harder).apply(RequestOptions.bitmapTransform(new CircleCrop())).into(imageHeard); Glide.with(getActivity()).load(R.drawable.mine_harder).apply(RequestOptions.bitmapTransform(new CircleCrop())).into(imageHeard);
imageHeard.setOnClickListener(this::onClick); imageHeard.setOnClickListener(this::onClick);
tvName = findViewById(R.id.tv_name); tvName = findViewById(R.id.tv_name);
tvName.setText(Constant.USERNAME); tvName.setText(Constant.USER_NAME);
tvName.setOnClickListener(this::onClick); tvName.setOnClickListener(this::onClick);
tvMoney = findViewById(R.id.tv_money); tvMoney = findViewById(R.id.tv_money);
imageShare = findViewById(R.id.image_share); imageShare = findViewById(R.id.image_share);

2
app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
View File

@ -377,7 +377,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override @Override
public void run() { public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null||poiDaoPoiEntity.getTaskStatus()==1||poiDaoPoiEntity.getTaskStatus()==2||poiDaoPoiEntity.getTaskStatus()==0){ if (poiDaoPoiEntity == null||poiDaoPoiEntity.getTaskStatus()==1||poiDaoPoiEntity.getTaskStatus()==2||poiDaoPoiEntity.getTaskStatus()==0||poiDaoPoiEntity.getTaskStatus()==5){
initPoiSaveLocal(true); initPoiSaveLocal(true);
}else { }else {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {

2
app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
View File

@ -576,7 +576,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override @Override
public void run() { public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0) { if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0||poiDaoPoiEntity.getTaskStatus()==5) {
initPoiSaveLocal(true); initPoiSaveLocal(true);
} else { } else {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {

2
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@ -309,7 +309,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
public void run() { public void run() {
ZipUtil.zipFiles(videoFileList, fileZip, null); ZipUtil.zipFiles(videoFileList, fileZip, null);
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0) { if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0||poiDaoPoiEntity.getTaskStatus()==5) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {

4
app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
View File

@ -195,8 +195,8 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
public void onSuccess(UserBean response, int id) { public void onSuccess(UserBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
if (response.getCode() == 200) { if (response.getCode() == 200) {
Constant.user_name = mobile; Constant.USER_NAME = mobile;
Constant.pass_word = password; Constant.PASS_WORD = password;
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.REGISTER_WORD; obtain.what = Constant.REGISTER_WORD;
obtain.obj = true; obtain.obj = true;

62
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@ -119,6 +119,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@ -143,7 +144,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(getActivity(), FragmentManagement.class); Intent intent = new Intent(getActivity(), FragmentManagement.class);
intent.putExtra("tag",8); intent.putExtra("tag", 8);
startActivity(intent); startActivity(intent);
} }
}); });
@ -159,7 +160,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
tvPictures.setOnClickListener(this::onClick); tvPictures.setOnClickListener(this::onClick);
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT); setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
nestedScrollView = findViewById(R.id.nested_scroll_view); nestedScrollView = findViewById(R.id.nested_scroll_view);
if (slidingPaneLayout!=null){ if (slidingPaneLayout != null) {
slidingPaneLayout.setScrollableView(nestedScrollView); slidingPaneLayout.setScrollableView(nestedScrollView);
} }
etRoadName = (EditText) findViewById(R.id.et_road_name); etRoadName = (EditText) findViewById(R.id.et_road_name);
@ -179,7 +180,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
fmRoadPic.setOnClickListener(new View.OnClickListener() { fmRoadPic.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (v.getTag() == null || ((List<File>)v.getTag()).size()==0) { if (v.getTag() == null || ((List<File>) v.getTag()).size() == 0) {
Toast.makeText(getActivity(), "还没有拍摄视频！", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "还没有拍摄视频！", Toast.LENGTH_SHORT).show();
return; return;
} }
@ -236,13 +237,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
String[] photos = photoList.split(","); String[] photos = photoList.split(",");
List<File> videoFileList = new ArrayList<>(); List<File> videoFileList = new ArrayList<>();
boolean isImageLoad = false; boolean isImageLoad = false;
if (photos!=null&&photos.length>0) { if (photos != null && photos.length > 0) {
for (int i = 0; i < photos.length; i++) { for (int i = 0; i < photos.length; i++) {
String photo = photos[i]; String photo = photos[i];
if (!StringUtils.isEmpty(photo)) { if (!StringUtils.isEmpty(photo)) {
File videoFile = new File(photo); File videoFile = new File(photo);
videoFileList.add(new File(photo)); videoFileList.add(new File(photo));
if (videoFile.getPath().contains("0.mp4")&&!videoFile.getPath().contains("0.mp4.txt")){ if (videoFile.getPath().contains("0.mp4") && !videoFile.getPath().contains("0.mp4.txt")) {
if (videoFile.exists() && !isImageLoad) { if (videoFile.exists() && !isImageLoad) {
// 使用glide加载视频的第一帧 // 使用glide加载视频的第一帧
AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivRoadPicture, 500); AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivRoadPicture, 500);
@ -257,7 +258,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
} }
if (showPoiEntity.getTaskStatus() == 3){ if (showPoiEntity.getTaskStatus() == 3) {
disables(); disables();
} }
@ -279,8 +280,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Subscribe @Subscribe
public void onEvent(Message data) { public void onEvent(Message data) {
if (data.what == Constant.PICTURE_VIDEO_WORD) { if (data.what == Constant.PICTURE_VIDEO_WORD) {
if ((boolean)data.obj){ if ((boolean) data.obj) {
initRoadSharePre(); initRoadSharePre();
} }
} }
} }
@ -312,9 +313,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
ZipUtil.zipFiles(videoFileList, fileZip, null); ZipUtil.zipFiles(videoFileList, fileZip, null);//压缩
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0) { if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0 || poiDaoPoiEntity.getTaskStatus() == 5) {
dismissLoadingDialog(); dismissLoadingDialog();
initPoiSaveLocal(true); initPoiSaveLocal(true);
} else { } else {
@ -329,7 +330,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
}).start(); }).start();
}else { } else {
dismissLoadingDialog(); dismissLoadingDialog();
Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show();
return; return;
@ -349,7 +350,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity);
PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity);
if (poiCheckResult.getCode() == 1) { if (poiCheckResult.getCode() == 1) {
Toast.makeText(getActivity(), poiCheckResult.getMsg()+"", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show();
return; return;
} }
new Thread(new Runnable() { new Thread(new Runnable() {
@ -383,8 +384,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
private void poiVideoUpload(int body, File fileZip) { private void poiVideoUpload(int body, File fileZip) {
if (body == 0) { if (body == 0) {
Toast.makeText(getContext(), "请先保存本地上传", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "请先保存本地上传", Toast.LENGTH_SHORT).show();
@ -396,8 +395,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
httpParams.put("auditId", body); httpParams.put("auditId", body);
long time=System.currentTimeMillis(); long time = System.currentTimeMillis();
httpParams.put("datetime",time); httpParams.put("datetime", time);
httpParams.put("file", fileZip); httpParams.put("file", fileZip);
showFileLoadingDialog(); showFileLoadingDialog();
setLoadingDialogText("上传中..."); setLoadingDialogText("上传中...");
@ -455,9 +454,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override @Override
public void onSuccess(RoadSaveBean roadSaveBean, int id) { public void onSuccess(RoadSaveBean roadSaveBean, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
if (roadSaveBean.getCode()==200){ if (roadSaveBean.getCode() == 200) {
Integer roadBody = roadSaveBean.getBody(); Integer roadBody = roadSaveBean.getBody();
if (roadBody!=null&&roadBody!=0){ if (roadBody != null && roadBody != 0) {
poiEntity.setBodyId(roadBody); poiEntity.setBodyId(roadBody);
poiEntity.setTaskStatus(3); poiEntity.setTaskStatus(3);
new Thread(new Runnable() { new Thread(new Runnable() {
@ -477,15 +476,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
}); });
} }
}).start(); }).start();
}else { } else {
Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
}else { } else {
Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
} }
@Override @Override
@ -512,12 +510,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
Bitmap bitmap = AWMp4ParserHelper.getInstance().getLocalVideoBitmap(videoPath); Bitmap bitmap = AWMp4ParserHelper.getInstance().getLocalVideoBitmap(videoPath);
int height = bitmap.getHeight(); int height = bitmap.getHeight();
int width = bitmap.getWidth(); int width = bitmap.getWidth();
if (height>width){ if (height > width) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新录像，要求横屏录像", "确定").setOkButton(new OnDialogButtonClickListener() { MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新录像，要求横屏录像", "确定").setOkButton(new OnDialogButtonClickListener() {
@Override @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
Intent intentPanorama = new Intent(getActivity(),PictureActivity.class); Intent intentPanorama = new Intent(getActivity(), PictureActivity.class);
File finalFile = AWMp4ParserHelper.getInstance().obtainMp4FilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath()); File finalFile = AWMp4ParserHelper.getInstance().obtainMp4FilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath());
intentPanorama.putExtra(Constant.INTENT_VIDEO_PATH, finalFile.getAbsolutePath()); intentPanorama.putExtra(Constant.INTENT_VIDEO_PATH, finalFile.getAbsolutePath());
intentPanorama.putExtra(Constant.INTENT_VIDEO_ORATATION, 0); intentPanorama.putExtra(Constant.INTENT_VIDEO_ORATATION, 0);
@ -526,7 +524,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
}); });
return; return;
}else { } else {
if (videoFile.exists()) { if (videoFile.exists()) {
AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivRoadPicture, 500); AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivRoadPicture, 500);
List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId()); List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
@ -600,7 +598,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
if (EventBus.getDefault().isRegistered(this))//加上判断 if (EventBus.getDefault().isRegistered(this))//加上判断
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
super.onDestroy(); super.onDestroy();
if (showPoiEntity!=null){ if (showPoiEntity != null) {
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -662,13 +660,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
poiEntity.setType(4); poiEntity.setType(4);
poiEntity.setTaskStatus(2); poiEntity.setTaskStatus(2);
poiEntity.setIsLocalData(1); poiEntity.setIsLocalData(1);
if (fmRoadPic.getTag()==null){ if (fmRoadPic.getTag() == null) {
List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId()); List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
if (videoFileListByUUID!=null){ if (videoFileListByUUID != null) {
fmRoadPic.setTag(videoFileListByUUID); fmRoadPic.setTag(videoFileListByUUID);
} }
} }
if (fmRoadPic.getTag() != null &&!((List<File>) fmRoadPic.getTag()).isEmpty()) { if (fmRoadPic.getTag() != null && !((List<File>) fmRoadPic.getTag()).isEmpty()) {
List<LatLng> lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List<File>) fmRoadPic.getTag()); List<LatLng> lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List<File>) fmRoadPic.getTag());
String lineString = GeometryTools.getLineString(lineStringByVideoFileList); String lineString = GeometryTools.getLineString(lineStringByVideoFileList);
Log.d("TAG", "onGranted: " + lineString); Log.d("TAG", "onGranted: " + lineString);
@ -684,12 +682,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override @Override
protected PoiCheckResult checkPoiEntity(PoiEntity entity) { protected PoiCheckResult checkPoiEntity(PoiEntity entity) {
PoiCheckResult poiCheckResult = new PoiCheckResult(); PoiCheckResult poiCheckResult = new PoiCheckResult();
if (entity.getPhoto()==null){ if (entity.getPhoto() == null) {
poiCheckResult.setCode(1); poiCheckResult.setCode(1);
poiCheckResult.setMsg("请录像"); poiCheckResult.setMsg("请录像");
return poiCheckResult; return poiCheckResult;
} }
if (entity.getWork_type()==-1){ if (entity.getWork_type() == -1) {
poiCheckResult.setCode(1); poiCheckResult.setCode(1);
poiCheckResult.setMsg("请选择录像方式"); poiCheckResult.setMsg("请选择录像方式");
return poiCheckResult; return poiCheckResult;

95
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@ -136,6 +136,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private Marker bigMarker; private Marker bigMarker;
private Marker markerPile; private Marker markerPile;
private List<Integer> upload; private List<Integer> upload;
private Point screenPilePositions;
private List<Removable> pileLocality;
public static TreasureFragment newInstance(Bundle bundle) { public static TreasureFragment newInstance(Bundle bundle) {
TreasureFragment fragment = new TreasureFragment(); TreasureFragment fragment = new TreasureFragment();
@ -234,6 +236,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
removables = new ArrayList<>();//存储网络数据的marker removables = new ArrayList<>();//存储网络数据的marker
removablesLocality = new ArrayList<>(); //存储本地数据的marker removablesLocality = new ArrayList<>(); //存储本地数据的marker
removablesMarker = new ArrayList<>();//存储网络数据的marker removablesMarker = new ArrayList<>();//存储网络数据的marker
pileLocality = new ArrayList<>();//存储充电桩的marker
tencentMap.addOnMapLoadedCallback(new TencentMap.OnMapLoadedCallback() { tencentMap.addOnMapLoadedCallback(new TencentMap.OnMapLoadedCallback() {
@Override @Override
public void onMapLoaded() { public void onMapLoaded() {
@ -373,7 +376,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
View child = nsv.getChildAt(0); View child = nsv.getChildAt(0);
return (child.getBottom() - (nsv.getHeight() + nsv.getScrollY())); return (child.getBottom() - (nsv.getHeight() + nsv.getScrollY()));
} }
}else { } else {
return 0; return 0;
} }
} }
@ -483,9 +486,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else if (geometry.getGeometryType().equals("LineString")) {//线 } else if (geometry.getGeometryType().equals("LineString")) {//线
BitmapDescriptor bitmapLine = null; BitmapDescriptor bitmapLine = null;
if (Integer.valueOf(listBean.getType()) == 3) {//poi录像 if (Integer.valueOf(listBean.getType()) == 3) {//poi录像
bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
} else if (Integer.valueOf(listBean.getType()) == 4) {//道路录像 } else if (Integer.valueOf(listBean.getType()) == 4) {//道路录像
bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows);
} }
List<LatLng> latLineString = GeometryTools.getLatLngs(geo); List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
// 构造 PolylineOpitons // 构造 PolylineOpitons
@ -497,9 +500,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
// 折线的颜色为绿色 // 折线的颜色为绿色
.color(0xff00ff00) .color(0xff00ff00)
// 折线宽度为5像素 // 折线宽度为5像素
.width(25) .width(35)
.arrow(true) .arrow(true)
.arrowSpacing(30) .arrowSpacing(100)
.arrowTexture(bitmapLine); .arrowTexture(bitmapLine);
// 还可以添加描边颜色 // 还可以添加描边颜色
//.borderColor(0xffff0000) //.borderColor(0xffff0000)
@ -540,6 +543,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
switch (Integer.valueOf(list.get(i).getType())) { switch (Integer.valueOf(list.get(i).getType())) {
case 1://poi case 1://poi
BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg1); BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg1);
poiDescriptor.getFormater().setScale(50);
Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f) Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
.flat(true) .flat(true)
.clockwise(false)); .clockwise(false));
@ -631,12 +635,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if (geometry.getGeometryType().equals("Point")) {//点 if (geometry.getGeometryType().equals("Point")) {//点
latLng = GeometryTools.createLatLng(geo); latLng = GeometryTools.createLatLng(geo);
} else if (geometry.getGeometryType().equals("LineString")) {//线 } else if (geometry.getGeometryType().equals("LineString")) {//线
BitmapDescriptor bitmapLine = null; BitmapDescriptor bitmapLine = null;
if (poiEntity.getType() == 3) {//poi录像 if (poiEntity.getType() == 3) {//poi录像
bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
} else if (poiEntity.getType() == 4) {//道路录像 } else if (poiEntity.getType() == 4) {//道路录像
bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows);
} }
List<LatLng> latLineString = GeometryTools.getLatLngs(geo); List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
// 构造 PolylineOpitons // 构造 PolylineOpitons
@ -647,9 +650,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
// 折线的颜色为绿色 // 折线的颜色为绿色
.color(0xff00ff00) .color(0xff00ff00)
// 折线宽度为5像素 // 折线宽度为5像素
.width(30) .width(45)
.arrow(true) .arrow(true)
.arrowSpacing(30) .arrowSpacing(150)
.arrowTexture(bitmapLine); .arrowTexture(bitmapLine);
/* // 还可以添加描边颜色 /* // 还可以添加描边颜色
.borderColor(0xffff0000) .borderColor(0xffff0000)
@ -713,7 +716,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
bigMarker.setVisible(true); bigMarker.setVisible(true);
bigMarker.setClickable(false); bigMarker.setClickable(false);
bigMarker.setZIndex(4); bigMarker.setZIndex(4);
initPileMarker(latLng);
frameLayout.setVisibility(View.VISIBLE); frameLayout.setVisibility(View.VISIBLE);
setMainButtonVisiable(View.GONE); setMainButtonVisiable(View.GONE);
fragmentTransaction = supportFragmentManager.beginTransaction(); fragmentTransaction = supportFragmentManager.beginTransaction();
@ -752,9 +754,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else if (geometry.getGeometryType().equals("LineString")) {//线 } else if (geometry.getGeometryType().equals("LineString")) {//线
BitmapDescriptor bitmapLine = null; BitmapDescriptor bitmapLine = null;
if (type == 3) {//poi录像 if (type == 3) {//poi录像
bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows);
} else if (type == 4) {//道路录像 } else if (type== 4) {//道路录像
bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows);
} }
List<LatLng> latLineString = GeometryTools.getLatLngs(geo); List<LatLng> latLineString = GeometryTools.getLatLngs(geo);
// 构造 PolylineOpitons // 构造 PolylineOpitons
@ -765,9 +767,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
.lineCap(true) .lineCap(true)
.color(0xffff0000) .color(0xffff0000)
// 折线宽度为5像素 // 折线宽度为5像素
.width(5) .width(35)
.arrow(true) .arrow(true)
.arrowSpacing(30) .arrowSpacing(100)
.arrowTexture(bitmapLine); .arrowTexture(bitmapLine);
/* // 还可以添加描边颜色 /* // 还可以添加描边颜色
.borderColor(0xffff0000) .borderColor(0xffff0000)
@ -1144,20 +1146,25 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
sliding_layout.setPanelHeight(0); sliding_layout.setPanelHeight(0);
setMainButtonVisiable(View.VISIBLE); setMainButtonVisiable(View.VISIBLE);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN); sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
if (markerPoi != null) {
markerPoi.remove();
}
if (markerPile != null) {
markerPile.remove();
}
if (bigMarker != null) {
bigMarker.setVisible(false);
}
for (int i = 0; i < removablesMarker.size(); i++) {
removablesMarker.get(i).remove();
}
removablesMarker.clear();
}else {
if (markerPile != null) {
markerPile.remove();
}
} }
if (markerPoi != null) {
markerPoi.remove();
}
if (markerPile != null) {
markerPile.remove();
}
if (bigMarker != null) {
bigMarker.setVisible(false);
}
for (int i = 0; i < removablesMarker.size(); i++) {
removablesMarker.get(i).remove();
}
removablesMarker.clear();
} else if (data.what == Constant.MAIN_BUTTON_VISIABLE) {//控制主界面各个按钮显隐状态的what值 } else if (data.what == Constant.MAIN_BUTTON_VISIABLE) {//控制主界面各个按钮显隐状态的what值
setMainButtonVisiable((Integer) data.obj); setMainButtonVisiable((Integer) data.obj);
} else if (data.what == Constant.GATHER_GET_RETURN) {//item 点击页面的返回事件的处理 } else if (data.what == Constant.GATHER_GET_RETURN) {//item 点击页面的返回事件的处理
@ -1184,9 +1191,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if (chargingPileEntity != null) { if (chargingPileEntity != null) {
bundle.putSerializable("chargingPileEntity", chargingPileEntity); bundle.putSerializable("chargingPileEntity", chargingPileEntity);
} }
BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
LatLng mapCenterPoint = getMapCenterPoint();
markerPile = tencentMap.addMarker(new MarkerOptions(mapCenterPoint).icon(pileDescriptor));
ChargingPileFragment chargingPileFragment = ChargingPileFragment.newInstance(bundle); ChargingPileFragment chargingPileFragment = ChargingPileFragment.newInstance(bundle);
showSlidingFragment(chargingPileFragment); showSlidingFragment(chargingPileFragment);
} else if (data.what == Constant.CHARGING_STATION_PILE) {//充电站的充电桩 } else if (data.what == Constant.CHARGING_STATION_PILE) {//充电站的充电桩
@ -1194,7 +1198,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else if (data.what == Constant.CHARGING_STATION_ITEM) {//充电站的item 跳转到充电桩 } else if (data.what == Constant.CHARGING_STATION_ITEM) {//充电站的item 跳转到充电桩
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putBoolean("isSliding", false); // 通知抽屉不收回 bundle.putBoolean("isSliding", false); // 通知抽屉不收回
bundle.putSerializable("chargingPileEntity", (ChargingPileEntity) data.obj); ChargingPileEntity chargingPileEntity = (ChargingPileEntity) data.obj;
bundle.putSerializable("chargingPileEntity", chargingPileEntity);
ChargingPileFragment chargingPileFragment = ChargingPileFragment.newInstance(bundle); ChargingPileFragment chargingPileFragment = ChargingPileFragment.newInstance(bundle);
showSlidingFragment(chargingPileFragment); showSlidingFragment(chargingPileFragment);
} else if (data.what == Constant.HOME_TREASURE) {//寻宝的刷新 } else if (data.what == Constant.HOME_TREASURE) {//寻宝的刷新
@ -1312,16 +1317,20 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} }
private void initPileMarker(LatLng latLng) { private void initPileMarker(LatLng latLng) {
LatLng mapCenterPoint = getMapCenterPoint(); BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.datouzhen);
if (markerPile == null) {
markerPile = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor));
}
CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition(
mapCenterPoint, //中心点坐标，地图目标经纬度 latLng, //中心点坐标，地图目标经纬度
tencentMap.getCameraPosition().zoom, //目标缩放级别 tencentMap.getCameraPosition().zoom, //目标缩放级别
tencentMap.getCameraPosition().tilt, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) tencentMap.getCameraPosition().tilt, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0)
tencentMap.getCameraPosition().bearing)); //目标旋转角 0~360° (正北方为0) tencentMap.getCameraPosition().bearing)); //目标旋转角 0~360° (正北方为0)
tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() { tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() {
@Override @Override
public void onFinish() { public void onFinish() {
screenPosition = tencentMap.getProjection().toScreenLocation(latLng); screenPilePositions = tencentMap.getProjection().toScreenLocation(latLng);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
//创建Marker对象之前，设置属性 //创建Marker对象之前，设置属性
if (markerPile != null) { if (markerPile != null) {
@ -1336,9 +1345,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} }
private void initCheckedPileMarker(int poiWord) { private void initCheckedPileMarker(int poiWord) {
if (screenPosition != null) { if (screenPilePositions != null) {
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
LatLng latLng = tencentMap.getProjection().fromScreenLocation(screenPosition); LatLng latLng = tencentMap.getProjection().fromScreenLocation(screenPilePositions);
markerPile.setPosition(latLng); markerPile.setPosition(latLng);
markerPile.setFixingPointEnable(false); markerPile.setFixingPointEnable(false);
Constant.markerLatlng = latLng; Constant.markerLatlng = latLng;
@ -1503,22 +1512,22 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} }
if (upload.contains(2)) { if (upload.contains(2)) {
itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_chongdianzhuang, "充电站")); itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_chongdianzhuang, "充电站"));
}else { } else {
} }
if (upload.contains(3)) { if (upload.contains(3)) {
itemList.add(new ShareDialog.Item(getContext(), R.drawable.poi_video, "POI录像")); itemList.add(new ShareDialog.Item(getContext(), R.drawable.poi_video, "POI录像"));
}else { } else {
} }
if (upload.contains(4)) { if (upload.contains(4)) {
itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_road, "道路")); itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_road, "道路"));
}else { } else {
} }
if (upload.contains(5)) { if (upload.contains(5)) {
itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_qingbao, "其他")); itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_qingbao, "其他"));
}else { } else {
} }
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
@ -1599,7 +1608,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
int[] deviceInfo = DensityUtil.getDeviceInfo(getActivity()); int[] deviceInfo = DensityUtil.getDeviceInfo(getActivity());
sliding_layout.setPanelHeight(deviceInfo[1] / 2); sliding_layout.setPanelHeight(deviceInfo[1] / 2);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
Constant.SLIDING_LAYOUT=sliding_layout; Constant.SLIDING_LAYOUT = sliding_layout;
fragmentTransaction.add(R.id.scroll_view, fragment, fragment.getClass().getName()); fragmentTransaction.add(R.id.scroll_view, fragment, fragment.getClass().getName());
if (!(fragment instanceof FilterFragment)) { if (!(fragment instanceof FilterFragment)) {
FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName()); FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName());

43
app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
View File

@ -12,6 +12,7 @@ import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -64,6 +65,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
private ImageView ivHera3; private ImageView ivHera3;
private TextView tvCard3; private TextView tvCard3;
private File file; private File file;
private LinearLayout linearHint;
private TextView tvTitle;
public static UserAttestationFragment newInstance(Bundle bundle) { public static UserAttestationFragment newInstance(Bundle bundle) {
@ -99,6 +102,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
ivAttestation3.setOnClickListener(this); ivAttestation3.setOnClickListener(this);
btnAttestation = (Button) findViewById(R.id.btn_attestation); btnAttestation = (Button) findViewById(R.id.btn_attestation);
btnAttestation.setOnClickListener(this::onClick); btnAttestation.setOnClickListener(this::onClick);
linearHint = findViewById(R.id.linear_hint);
etAttestationName = (EditText) findViewById(R.id.et_attestationName); etAttestationName = (EditText) findViewById(R.id.et_attestationName);
etNamePhone = (EditText) findViewById(R.id.et_namePhone); etNamePhone = (EditText) findViewById(R.id.et_namePhone);
ivHera1 = (ImageView) findViewById(R.id.iv_hera1); ivHera1 = (ImageView) findViewById(R.id.iv_hera1);
@ -107,6 +111,41 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
tvCard2 = (TextView) findViewById(R.id.tv_card2); tvCard2 = (TextView) findViewById(R.id.tv_card2);
ivHera3 = (ImageView) findViewById(R.id.iv_hera3); ivHera3 = (ImageView) findViewById(R.id.iv_hera3);
tvCard3 = (TextView) findViewById(R.id.tv_card3); tvCard3 = (TextView) findViewById(R.id.tv_card3);
tvTitle = findViewById(R.id.tv_title);
if (Constant.AUDITSTATUS==-1){//审核中
if (Constant.NAME!=null&&Constant.ID_NUM!=null){
tvTitle.setText("1.审核中");
linearHint.setVisibility(View.VISIBLE);
etAttestationName.setText(Constant.NAME);
etNamePhone.setText(Constant.ID_NUM);
etAttestationName.setEnabled(false);
etNamePhone.setEnabled(false);
btnAttestation.setEnabled(false);
}else {
linearHint.setVisibility(View.GONE);
etAttestationName.setEnabled(true);
etNamePhone.setEnabled(true);
btnAttestation.setEnabled(true);
}
}else if (Constant.AUDITSTATUS==0){//不通过
linearHint.setVisibility(View.GONE);
etAttestationName.setText(Constant.NAME);
etNamePhone.setText(Constant.ID_NUM);
etAttestationName.setEnabled(true);
etNamePhone.setEnabled(true);
btnAttestation.setEnabled(true);
}else if (Constant.AUDITSTATUS==1){//通过
tvTitle.setText("1.审核通过");
linearHint.setVisibility(View.VISIBLE);
etAttestationName.setText(Constant.NAME);
etNamePhone.setText(Constant.ID_NUM);
etAttestationName.setEnabled(false);
etNamePhone.setEnabled(false);
btnAttestation.setEnabled(false);
}
} }
@Override @Override
@ -229,7 +268,9 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
MessageDialog.show((AppCompatActivity) getActivity(), "提示", "提交成功", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { MessageDialog.show((AppCompatActivity) getActivity(), "提示", "提交成功", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
Toast.makeText(getContext(), "", Toast.LENGTH_SHORT).show(); Constant.NAME=attestationName;
Constant.ID_NUM=namePhone;
Constant.AUDITSTATUS=-1;
getActivity().finish(); getActivity().finish();
return false; return false;
} }

36
app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
View File

@ -52,9 +52,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
private TextView chargingReportMoney; private TextView chargingReportMoney;
private TextView otherPushMoney; private TextView otherPushMoney;
private TextView otherReportMoney; private TextView otherReportMoney;
private SharedPreferences navInfo;
private CheckBox checkBox; private CheckBox checkBox;
private String bankAccount;
public static WithdrawFragment newInstance(Bundle bundle) { public static WithdrawFragment newInstance(Bundle bundle) {
WithdrawFragment fragment = new WithdrawFragment(); WithdrawFragment fragment = new WithdrawFragment();
@ -90,22 +88,11 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) { if (isChecked) {
checkBox.setChecked(true); if (Constant.ID_NUMBER==null||Constant.BANKACCOUNT==null){
navInfo = getActivity().getSharedPreferences("navInfo", Context.MODE_PRIVATE); Toast.makeText(getContext(), "没有绑定银行卡，请先绑定银行卡", Toast.LENGTH_SHORT).show();
bankAccount = navInfo.getString("bankAccount", null); checkBox.setChecked(false);
if (bankAccount == null || bankAccount.equals("")) { }else {
String attestationName = navInfo.getString("attestationName", null); checkBox.setChecked(true);
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 {
Intent gatheringIntent = new Intent(getContext(), FragmentManagement.class);
gatheringIntent.putExtra("tag", 24);
startActivity(gatheringIntent);
Toast.makeText(getContext(), "以实名认证，请绑定银行卡", Toast.LENGTH_SHORT).show();
}
} }
} }
} }
@ -181,13 +168,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
break; break;
case R.id.button: case R.id.button:
if (etAllPrice == null&&etAllPrice.getText().toString().equals("")) {
Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show();
return;
}
String price = etAllPrice.getText().toString().trim(); String price = etAllPrice.getText().toString().trim();
if (price!=null){ if (price!=null&&!price.equals("")){
Integer integer = Integer.valueOf(price); Integer integer = Integer.valueOf(price);
if (integer!=null&&integer<10){ if (integer!=null&&integer<10){
Toast.makeText(getContext(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show();
@ -195,15 +177,16 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
} }
}else { }else {
Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show();
return;
} }
if (!checkBox.isChecked()) { if (!checkBox.isChecked()) {
Toast.makeText(getContext(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "请勾选银行卡", Toast.LENGTH_SHORT).show();
return; return;
} }
if (bankAccount != null) { if (Constant.ID_NUMBER != null) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否提取到" + bankAccount.substring(bankAccount.length() - 4) + "的银行卡", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { MessageDialog.show((AppCompatActivity) getContext(), "提示", "是否提取到" + Constant.ID_NUMBER.substring(Constant.ID_NUMBER.length() - 4) + "的银行卡", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
immediatelyPrice(); immediatelyPrice();
@ -212,6 +195,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
}); });
} else { } else {
Toast.makeText(getContext(), "请先绑定银行卡", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "请先绑定银行卡", Toast.LENGTH_SHORT).show();
return;
} }

5
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@ -23,12 +23,13 @@ public class HttpInterface {
//172.23.139.4:8001/m4/user/update //172.23.139.4:8001/m4/user/update
public static final String USER_UPDATE =IP +USER_PATH+ "user/m4/user/update";//用户资料 public static final String USER_UPDATE =IP +USER_PATH+ "user/m4/user/update";//用户资料
//172.23.139.4:8001/m4/userBankcard/update //172.23.139.4:8001/m4/userBankcard/update
public static final String USER_BANKCARD_UP_DATA =IP +USER_PATH+ "user/m4/userBankcard/update"; //绑定银行卡 public static final String USER_BANKCARD_UP_DATA =IP +USER_PATH+ "user/m4/userBankcard/add"; //绑定银行卡
//172.23.139.4:8001/m4/userAuth/add //172.23.139.4:8001/m4/userAuth/add
public static final String USER_AUTH_ADD = IP+USER_PATH+ "userAuth/add"; //实名认证 public static final String USER_AUTH_ADD = IP+USER_PATH+ "userAuth/add"; //实名认证
//172.23.139.4:9999/m4/user/userLocation/1/userLocation post 参数 geom:geohash加密 //172.23.139.4:9999/m4/user/userLocation/1/userLocation post 参数 geom:geohash加密
public static final String geomIP="http://172.23.139.4:9999/m4";
public static final String USER_LOCATION = IP+USER_PATH+ "userLocation/"+USERID+"/userLocation"; //上传用户坐标 public static final String USER_LOCATION = IP+USER_PATH+ "userLocation/"+USERID+"/userLocation"; //上传用户坐标
//dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718
public static final String USER_DETAIL_BY_USER_ID = IP+USER_PATH+ "user/"+USERID+"/getUserDetailByUserid/"+USERID; //获取用户信息
/** /**
* 发现 * 发现
* Path=/m4/msgList/** * Path=/m4/msgList/**

BIN
app/src/main/res/drawable/poi_video_arrows.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 620 B

BIN
app/src/main/res/drawable/road_arrows.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 490 B

30
app/src/main/res/layout/fragment_forget_paw.xml
View File

@ -64,10 +64,10 @@
android:id="@+id/et_forgetPaw_phone" android:id="@+id/et_forgetPaw_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:background="@null" android:background="@null"
android:inputType="number"
android:hint="11位手机号码" android:hint="11位手机号码"
android:inputType="number"
android:maxLength="11" android:maxLength="11"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
@ -81,11 +81,11 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone" app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone"/> app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone" />
<TextView <TextView
android:id="@+id/forgetPaw_note" android:id="@+id/forgetPaw_note"
@ -102,18 +102,19 @@
android:id="@+id/et_forgetPaw_note" android:id="@+id/et_forgetPaw_note"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:background="@null" android:background="@null"
android:hint="6为短信验证" android:hint="6为短信验证"
android:inputType="number" android:inputType="number"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:layout_marginLeft="20dp"
android:textColorHint="@color/colorTransparent" android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color" android:textCursorDrawable="@drawable/text_color"
android:textSize="15sp" android:textSize="15sp"
android:theme="@style/MyEditText" android:theme="@style/MyEditText"
app:layout_constraintRight_toLeftOf="@+id/forgetPaw_get_note" app:layout_constraintRight_toLeftOf="@+id/forgetPaw_get_note"
app:layout_constraintTop_toBottomOf="@id/forgetPaw_note" /> app:layout_constraintTop_toBottomOf="@id/forgetPaw_note" />
<TextView <TextView
android:id="@+id/forgetPaw_get_note" android:id="@+id/forgetPaw_get_note"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -124,12 +125,13 @@
app:layout_constraintBottom_toBottomOf="@id/et_forgetPaw_note" app:layout_constraintBottom_toBottomOf="@id/et_forgetPaw_note"
app:layout_constraintRight_toRightOf="@+id/tv_view" app:layout_constraintRight_toRightOf="@+id/tv_view"
app:layout_constraintTop_toTopOf="@id/et_forgetPaw_note" /> app:layout_constraintTop_toTopOf="@id/et_forgetPaw_note" />
<View <View
android:id="@+id/tv_view" android:id="@+id/tv_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@color/colorHui" android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note" app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" /> app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" />
@ -150,11 +152,11 @@
android:id="@+id/et_forgetPaw_paw" android:id="@+id/et_forgetPaw_paw"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:background="@null" android:background="@null"
android:hint="6-20位密码" android:hint="6-20位密码"
android:paddingTop="10dp"
android:inputType="textPassword" android:inputType="textPassword"
android:layout_marginLeft="20dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent" android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color" android:textCursorDrawable="@drawable/text_color"
@ -166,9 +168,9 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw" app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw" /> app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw" />
@ -187,14 +189,14 @@
android:id="@+id/et_forgetPaw_confirm_paw" android:id="@+id/et_forgetPaw_confirm_paw"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:background="@null" android:background="@null"
android:hint="请再次输入一遍密码" android:hint="请再次输入一遍密码"
android:inputType="textPassword"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:inputType="textPassword"
android:textColorHint="@color/colorTransparent" android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color" android:textCursorDrawable="@drawable/text_color"
android:layout_marginLeft="20dp"
android:textSize="15sp" android:textSize="15sp"
android:theme="@style/MyEditText" android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_confirm_paw" app:layout_constraintLeft_toLeftOf="@id/forgetPaw_confirm_paw"
@ -203,8 +205,8 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@color/colorHui" android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_confirm_paw" app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_confirm_paw"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw" /> app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw" />
@ -214,8 +216,8 @@
style="@style/login_style" style="@style/login_style"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="20dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="50dp" android:layout_marginRight="50dp"
android:gravity="center" android:gravity="center"
android:text="提交" android:text="提交"

38
app/src/main/res/layout/user_attestation_fragment.xml
View File

@ -37,7 +37,43 @@
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/linear_hint"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_margin="20dp"
android:background="@drawable/gethering_shape"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_attestation">
<TextView
android:id="@+id/tv_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="提示："
android:textColor="#FF9800"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="1.实名成功"
android:textColor="#FF9800" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:text="2.银行卡户主姓名必须与实名认证姓名一致"
android:textColor="#FF9800" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -47,7 +83,7 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_attestation"> app:layout_constraintTop_toBottomOf="@+id/linear_hint">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"