From b1adb1e1375879ab0fcf473e02e2d7c2df437558 Mon Sep 17 00:00:00 2001 From: wds Date: Thu, 12 Aug 2021 21:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B912=E6=97=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/LoginActivity.java | 83 ++- .../outdoor/activity/UserActivity.java | 92 +-- .../com/navinfo/outdoor/api/Constant.java | 44 +- .../navinfo/outdoor/api/UserApplication.java | 9 - .../navinfo/outdoor/bean/UserDetailBean.java | 534 ++++++++++++++++++ .../fragment/ChargingPileFragment.java | 21 +- .../fragment/ChargingStationFragment.java | 40 +- .../outdoor/fragment/FilterFragment.java | 7 +- .../outdoor/fragment/ForgetPawFragment.java | 7 +- .../outdoor/fragment/GatherGetFragment.java | 22 +- .../outdoor/fragment/GatheringFragment.java | 48 +- .../outdoor/fragment/MineFragment.java | 2 +- .../outdoor/fragment/OtherFragment.java | 2 +- .../navinfo/outdoor/fragment/PoiFragment.java | 2 +- .../outdoor/fragment/PoiVideoFragment.java | 2 +- .../outdoor/fragment/RegisterFragment.java | 4 +- .../outdoor/fragment/RoadFragment.java | 62 +- .../outdoor/fragment/TreasureFragment.java | 95 ++-- .../fragment/UserAttestationFragment.java | 43 +- .../outdoor/fragment/WithdrawFragment.java | 36 +- .../navinfo/outdoor/http/HttpInterface.java | 5 +- .../main/res/drawable/poi_video_arrows.png | Bin 0 -> 620 bytes app/src/main/res/drawable/road_arrows.png | Bin 0 -> 490 bytes .../main/res/layout/fragment_forget_paw.xml | 30 +- .../res/layout/user_attestation_fragment.xml | 38 +- 26 files changed, 976 insertions(+), 254 deletions(-) create mode 100644 app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java create mode 100644 app/src/main/res/drawable/poi_video_arrows.png create mode 100644 app/src/main/res/drawable/road_arrows.png diff --git a/app/build.gradle b/app/build.gradle index 5e04152..81cf51b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '29.0.2' - ndkVersion '23.0.7123448' + //ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java index 28b42a0..f7354c7 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -19,6 +19,8 @@ import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseActivity; 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.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; @@ -63,8 +65,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onEvent(Message data) { if (data.what == Constant.REGISTER_WORD) { if ((boolean)data.obj){ - etLoginName.setText(Constant.user_name); - etLoginPaw.setText(Constant.pass_word); + etLoginName.setText(Constant.USER_NAME); + 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("refresh_token",body.getRefresh_token()); navInfoEditor.putString("userId",body.getUserId()); - navInfoEditor.putString("username",body.getUsername()); - navInfoEditor.putString("user_name",name); - navInfoEditor.putString("pass_word",paw); navInfoEditor.commit(); + if (body.getUserId()!=null&&!body.getUserId().equals("")){ + Constant.initRootFolder(body.getUserId()); + + } + Constant.ACCESS_TOKEN=body.getAccess_token(); Constant.REFRESH_TOKEN=body.getRefresh_token(); Constant.USERID=body.getUserId(); - Constant.USERNAME=body.getUsername(); - Intent intent = new Intent(LoginActivity.this, HomeActivity.class); - startActivity(intent); - finish(); + Constant.PASS_WORD=paw; + initGetUserInfo();//获取用户信息 }else { - Toast.makeText(LoginActivity.this, response.getMessage()+"", Toast.LENGTH_SHORT).show(); + dismissLoadingDialog(); } } @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() { + @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 public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); diff --git a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java index 40b242a..04e60c0 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -24,6 +24,7 @@ import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.v3.MessageDialog; import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.navinfo.outdoor.R; 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.JsonBean; import com.navinfo.outdoor.bean.UserBean; +import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.DialogCallback; import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.GetJsonDataUtil; import com.navinfo.outdoor.util.RegexUtil; @@ -65,7 +68,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { private String usermailbox; private String region_id; private SharedPreferences navInfo; - + private SharedPreferences.Editor navInfoEditor; @Override @@ -84,6 +87,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { super.initView(); initJsonData(); navInfo = getSharedPreferences("navInfo", Context.MODE_PRIVATE); + navInfoEditor = getSharedPreferences("navInfo", Context.MODE_PRIVATE).edit(); ivUser = findViewById(R.id.iv_user); ivUser.setOnClickListener(this::onClick); btnAttestation = findViewById(R.id.btn_attestation); @@ -102,6 +106,16 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { etMailbox.setOnClickListener(this::onClick); userSave = findViewById(R.id.btn_save); 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 @@ -111,15 +125,15 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { finish(); break; case R.id.btn_gathering: - String attestationName = navInfo.getString("attestationName", null); - if (attestationName == null || attestationName.equals("")) { - Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show(); - return; + if (Constant.AUDITSTATUS==-1){ + Toast.makeText(getContext(), "请先实名认证", Toast.LENGTH_SHORT).show(); + }else if (Constant.AUDITSTATUS==1){//认证通过 + 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; case R.id.btn_attestation: Intent attestationIntent = new Intent(this, FragmentManagement.class); @@ -136,19 +150,21 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { break; case R.id.btn_save: - String attestationNames = navInfo.getString("attestationName", null); - if (attestationNames == null || attestationNames.equals("")) { + if (Constant.ID_NUM==null){ Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show(); return; } - String bankAccount = navInfo.getString("bankAccount", null); - if (bankAccount == null||bankAccount.equals("")){ + if (Constant.ID_NUMBER==null){ Toast.makeText(this, "请先绑定银行卡", Toast.LENGTH_SHORT).show(); return; } userphone = etPhone.getText().toString().trim(); userqq = etQq.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 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("")) { Toast.makeText(this, "所在地区为空，请重新输入", Toast.LENGTH_SHORT).show(); return; + }else { + httpParams.put("regionId",region_id); } if (!RegexUtil.isPhone(userphone)) { Toast.makeText(this, "手机号输入错误", Toast.LENGTH_SHORT).show(); return; + }else { + httpParams.put("mobile",userqq); } if (!userqq.equals("")) { if (!isQQNum_matcher) { Toast.makeText(this, "QQ号输入错误", Toast.LENGTH_SHORT).show(); } return; + }else { + httpParams.put("qq",userqq); } if (!usermailbox.equals("")){ if (!isEmail_matcher) { Toast.makeText(this, "邮箱格式错误", Toast.LENGTH_SHORT).show(); } return; + }else { + // httpParams.put("qq",userqq); } } - netWork(); + netWork(httpParams); break; } } - private void netWork() { + private void netWork(HttpParams httpParams) { showLoadingDialog(); - OkGo - // 请求方式和请求url - .post(HttpInterface.USER_UPDATE) - // 请求的 tag, 主要用于取消对应的请求 - .params("pid", "1") - .params("regionId", region_id)//省市区id - .params("qq", userqq)//qq号 - .tag(this) - .execute(new DialogCallback(UserBean.class) { + OkGoBuilder.getInstance() + .Builder(this) + .url(HttpInterface.USER_UPDATE) + .cls(UserBean.class) + .token(Constant.ACCESS_TOKEN) + .params(httpParams) + .postRequest(new Callback() { @Override - public void onSuccess(Response response) { + public void onSuccess(UserBean response, int id) { dismissLoadingDialog(); Log.d("TAG", "onSuccess: " + response.toString() + "sssssssssssss"); - - if (response.code()==200) { - MessageDialog.show(UserActivity.this, "是否保存", "确定", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + if (response.getCode()==200) { + MessageDialog.show(UserActivity.this, "提示","是否保存", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - + navInfoEditor.putString("region",region.getText().toString()); + navInfoEditor.commit(); + finish(); return false; } }); } else { - MessageDialog.show(UserActivity.this, "是否保存", "取消", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + MessageDialog.show(UserActivity.this, "提示","是否保存", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - return false; } }); } } - @Override - public void onError(Response response) { - super.onError(response); + public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(UserActivity.this, response.message(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + response.message()); + Toast.makeText(UserActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show(); + Log.d("TAG", "onError: " + e.getMessage()); } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 5208718..8aa5384 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -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.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_MESSAGE2 = "manifest 中配置的 key 不正确"; 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 final String VIDEOS_ = BASE_FOLDER + "/videos"; - public static final String POI_DAO = BASE_FOLDER + "/BaseDao/"; + public static String PICTURE_FOLDER; + + public static String VIDEOS_ ; + public static String POI_DAO ; //下载文件 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 public static final int PERMISSION_REQUEST_CODE = 0x100; @@ -47,6 +66,8 @@ public class Constant { public static final String DATA_FILE = "dataFile"; + + /** * 存储用户信息 * access_token 后续需求需要用到的key 过期时间8小时 @@ -57,10 +78,19 @@ public class Constant { public static String ACCESS_TOKEN=null; public static String REFRESH_TOKEN=null; public static String USERID=null; - public static String USERNAME=null; - public static String user_name=null; - public static String pass_word=null; + public static String USER_NAME=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;//手机号 diff --git a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java index 134bb33..9eb8169 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java +++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java @@ -41,16 +41,7 @@ public class UserApplication extends Application { 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); } diff --git a/app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java b/app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java new file mode 100644 index 0000000..2007c67 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java @@ -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 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 getRole() { + return role; + } + + public void setRole(List 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; + } + } + } +} diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index 401d9ba..ad1f206 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -151,7 +151,12 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC // 监听到返回按钮点击事件 Message obtain = Message.obtain(); 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); } onBackPressed(); @@ -165,6 +170,13 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC startActivity(intent); } }); + if (latLng!=null){ + Message obtain = Message.obtain(); + obtain.what = Constant.POI_DRAWER; + obtain.obj = latLng; + EventBus.getDefault().post(obtain); + } + } @Override @@ -567,7 +579,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC private void initShowPileSharePre() { station = getArguments().getString("station"); if (station != null) { - showPoiEntity = new Gson().fromJson(station, PoiEntity.class); + PoiEntity showPoiEntity = new Gson().fromJson(station, PoiEntity.class); pid = showPoiEntity.getId(); taskId = showPoiEntity.getTaskId(); latLng = new LatLng(); @@ -583,7 +595,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } String p = chargingPileEntity.getP(); - if (p != null) { // 解密geo String decodeGeometry = Geohash.getInstance().decode(p); @@ -805,21 +816,19 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC file = PhotoUtils.showPhotoFile("a",latLng); intentPanorama.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); startActivityForResult(intentPanorama, 101); - initPileSharePre(); break; case R.id.rl_coding: Intent intentCoding = new Intent("android.media.action.IMAGE_CAPTURE"); file = PhotoUtils.showPhotoFile("b", latLng); intentCoding.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); startActivityForResult(intentCoding, 102); - initPileSharePre(); break; case R.id.rl_equipment: Intent intentEquipment = new Intent("android.media.action.IMAGE_CAPTURE"); file = PhotoUtils.showPhotoFile("c", latLng); intentEquipment.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(file)); startActivityForResult(intentEquipment, 103); - initPileSharePre(); + break; case R.id.rl_facility: Intent intentFacility = new Intent("android.media.action.IMAGE_CAPTURE"); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index c37b25c..acf2370 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -756,7 +756,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. @Override public void run() { 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); } else { // 首先批量保存充电站对应的充电桩数据 @@ -975,28 +975,24 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. @Override public void onSuccess(PoiUploadBean response, int id) { 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(); - 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 public void onError(Throwable e, int id) { @@ -1099,7 +1095,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. public void run() { if (isLocal) { stationUploadByNetWork(poiEntity, chargingStationList); -// chargingPileUploadNetWork(chargingPileBody, fileList); +// chargingPileUploadNetWork(chargingPileBody, fileList); } else { Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); onBackPressed(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java index b53f3e4..92c5edf 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -159,7 +159,12 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi if (data.what == Constant.JOB_SEARCH_POI_WORD) { allPoi = (List) data.obj; 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) { JobSearchBean jobSearchBean = (JobSearchBean) data.obj; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java index 928e520..ac164b7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -140,14 +140,13 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe public void onSuccess(UserBean response, int id) { dismissLoadingDialog(); if (response.getCode()==200){ - Constant.user_name = mobile; - Constant.pass_word = password; + Constant.USER_NAME = mobile; + Constant.PASS_WORD = password; Message obtain = Message.obtain(); obtain.what=Constant.REGISTER_WORD; obtain.obj = true; EventBus.getDefault().post(obtain); - Intent forgetIntent = new Intent(getContext(), LoginActivity.class); - startActivity(forgetIntent); + getActivity().finish(); } Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java index ca9393f..b407752 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -365,8 +365,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } //获取当前位置的marker -// senMessageMarker(chargingStationEntity.getType(), chargingStationEntity.getY(), chargingStationEntity.getX()); -// InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(),chargingStationEntity); + if (chargingStationEntity.getTaskStatus()==1){ + //senMessageMarker(chargingStationEntity.getType(), chargingStationEntity.getY(), chargingStationEntity.getX()); + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(),chargingStationEntity); + } getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -396,12 +398,15 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } }).start(); } + }else { + Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); } } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); + Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); 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.setY(latPolygon.get(0).latitude + ""); } + polygonEntity.setTaskStatus(1); } - polygonEntity.setTaskStatus(1); + new Thread(new Runnable() { @Override public void run() { @@ -464,6 +470,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { initViewByTaskStatus(1); + Toast.makeText(getActivity(), "领取成功", Toast.LENGTH_SHORT).show(); if (aBoolean) { 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.setY(latPolygon.get(0).latitude + ""); } - if (poiListEntity.getTaskStatus() != 1) { + if (poiListEntity.getTaskStatus() == 1) { // 通知地图界面显示当前编辑数据的marker - senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); + //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); } - getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -805,9 +811,9 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe poiListEntity.setX(latPolygon.get(0).longitude + ""); poiListEntity.setY(latPolygon.get(0).latitude + ""); } - if (poiListEntity.getTaskStatus() != 1) { + if (poiListEntity.getTaskStatus() == 1) { // 通知地图界面显示当前编辑数据的marker - senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); + //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java index 90eaafa..664e5bb 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -66,12 +66,9 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe private TextView tvName; private EditText etBankNum; private ImageView gatheringCamera; - private String gatheringPath; private ArrayList jsonBean; private String value; - private SharedPreferences navInfo; - private SharedPreferences.Editor navInfoEditor; private File file; @@ -90,8 +87,6 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe @Override protected void 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.setOnClickListener(this::onClick); 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.setOnClickListener(this::onClick); 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); gatheringCamera = (ImageView) findViewById(R.id.gathering_camera); 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 @@ -166,7 +163,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe break; case R.id.gathering_camera: 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)); startActivityForResult(gatheringNumberIntent, 131); break; @@ -174,11 +171,11 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe } private void gatheringNetWork() { - ArrayList gatheringList = new ArrayList<>(); - if (gatheringCamera.getTag() == null){ - Toast.makeText(getContext(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); - return; - } + ArrayList gatheringList = new ArrayList<>(); + if (gatheringCamera.getTag() == null) { + Toast.makeText(getContext(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); + return; + } String gatheringCameraTag = (String) gatheringCamera.getTag(); gatheringList.add(new File(gatheringCameraTag)); String etBankAccount = etBankNum.getText().toString().trim(); @@ -200,25 +197,25 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe .cls(BankPhoneBean.class) .token(Constant.ACCESS_TOKEN) .params(httpParams) - .fileList( gatheringList) + .fileList(gatheringList) .postFileAsynchronous(new Callback() { @Override public void onSuccess(BankPhoneBean response, int id) { dismissLoadingDialog(); - if (response.getCode()==200){ - MessageDialog.show((AppCompatActivity) getActivity(), "绑定成功", "确定", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + if (response.getCode() == 200) { + MessageDialog.show((AppCompatActivity) getActivity(), "提示", "绑定成功", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - - getActivity().finish(); + Constant.BANKACCOUNT=value; + Constant.ID_NUMBER=etBankAccount; + getActivity().finish(); return false; } }); - }else { - MessageDialog.show((AppCompatActivity) getActivity(), "绑定失败", "取消", "取消", "确定").setOkButton(new OnDialogButtonClickListener() { + } else { + MessageDialog.show((AppCompatActivity) getActivity(), "提示", "绑定失败", "确定","取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - return false; } }); @@ -228,6 +225,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); + Toast.makeText(getContext(), e.getMessage()+"", Toast.LENGTH_SHORT).show(); } }); /*OkGo @@ -279,7 +277,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); if (requestCode == 131 && resultCode == RESULT_OK) { - if (file ==null&&!file.exists()){ + if (file == null && !file.exists()) { Toast.makeText(getContext(), "请先拍照", Toast.LENGTH_SHORT).show(); return; } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index c6eedab..1377d93 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -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); imageHeard.setOnClickListener(this::onClick); tvName = findViewById(R.id.tv_name); - tvName.setText(Constant.USERNAME); + tvName.setText(Constant.USER_NAME); tvName.setOnClickListener(this::onClick); tvMoney = findViewById(R.id.tv_money); imageShare = findViewById(R.id.image_share); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index c7359be..c7b9de7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -377,7 +377,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis @Override public void run() { 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); }else { getActivity().runOnUiThread(new Runnable() { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 3d5e950..f698ee2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -576,7 +576,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe @Override public void run() { 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); } else { getActivity().runOnUiThread(new Runnable() { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index d1f49c5..1e49e3d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -309,7 +309,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick public void run() { ZipUtil.zipFiles(videoFileList, fileZip, null); 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() { @Override public void run() { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java index 1238022..8c1957d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -195,8 +195,8 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen public void onSuccess(UserBean response, int id) { dismissLoadingDialog(); if (response.getCode() == 200) { - Constant.user_name = mobile; - Constant.pass_word = password; + Constant.USER_NAME = mobile; + Constant.PASS_WORD = password; Message obtain = Message.obtain(); obtain.what = Constant.REGISTER_WORD; obtain.obj = true; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index 761e555..17377f4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -119,6 +119,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } } + @Override public void onResume() { super.onResume(); @@ -143,7 +144,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void onClick(View v) { Intent intent = new Intent(getActivity(), FragmentManagement.class); - intent.putExtra("tag",8); + intent.putExtra("tag", 8); startActivity(intent); } }); @@ -159,7 +160,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList tvPictures.setOnClickListener(this::onClick); setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT); nestedScrollView = findViewById(R.id.nested_scroll_view); - if (slidingPaneLayout!=null){ + if (slidingPaneLayout != null) { slidingPaneLayout.setScrollableView(nestedScrollView); } 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() { @Override public void onClick(View v) { - if (v.getTag() == null || ((List)v.getTag()).size()==0) { + if (v.getTag() == null || ((List) v.getTag()).size() == 0) { Toast.makeText(getActivity(), "还没有拍摄视频！", Toast.LENGTH_SHORT).show(); return; } @@ -236,13 +237,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList String[] photos = photoList.split(","); List videoFileList = new ArrayList<>(); boolean isImageLoad = false; - if (photos!=null&&photos.length>0) { + if (photos != null && photos.length > 0) { for (int i = 0; i < photos.length; i++) { String photo = photos[i]; if (!StringUtils.isEmpty(photo)) { File videoFile = 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) { // 使用glide加载视频的第一帧 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(); } @@ -279,8 +280,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Subscribe public void onEvent(Message data) { if (data.what == Constant.PICTURE_VIDEO_WORD) { - if ((boolean)data.obj){ - initRoadSharePre(); + if ((boolean) data.obj) { + initRoadSharePre(); } } } @@ -312,9 +313,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList new Thread(new Runnable() { @Override public void run() { - ZipUtil.zipFiles(videoFileList, fileZip, null); + ZipUtil.zipFiles(videoFileList, fileZip, null);//压缩 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(); initPoiSaveLocal(true); } else { @@ -329,7 +330,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }).start(); - }else { + } else { dismissLoadingDialog(); Toast.makeText(getContext(), "请录像", Toast.LENGTH_SHORT).show(); return; @@ -349,7 +350,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - Toast.makeText(getActivity(), poiCheckResult.getMsg()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show(); return; } new Thread(new Runnable() { @@ -383,8 +384,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } - - private void poiVideoUpload(int body, File fileZip) { if (body == 0) { Toast.makeText(getContext(), "请先保存本地上传", Toast.LENGTH_SHORT).show(); @@ -396,8 +395,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } HttpParams httpParams = new HttpParams(); httpParams.put("auditId", body); - long time=System.currentTimeMillis(); - httpParams.put("datetime",time); + long time = System.currentTimeMillis(); + httpParams.put("datetime", time); httpParams.put("file", fileZip); showFileLoadingDialog(); setLoadingDialogText("上传中..."); @@ -455,9 +454,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void onSuccess(RoadSaveBean roadSaveBean, int id) { dismissLoadingDialog(); - if (roadSaveBean.getCode()==200){ + if (roadSaveBean.getCode() == 200) { Integer roadBody = roadSaveBean.getBody(); - if (roadBody!=null&&roadBody!=0){ + if (roadBody != null && roadBody != 0) { poiEntity.setBodyId(roadBody); poiEntity.setTaskStatus(3); new Thread(new Runnable() { @@ -477,15 +476,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList }); } }).start(); - }else { - Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } - }else { - Toast.makeText(getContext(), ""+roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getContext(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } - } @Override @@ -512,12 +510,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList Bitmap bitmap = AWMp4ParserHelper.getInstance().getLocalVideoBitmap(videoPath); int height = bitmap.getHeight(); int width = bitmap.getWidth(); - if (height>width){ + if (height > width) { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新录像，要求横屏录像", "确定").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - Intent intentPanorama = new Intent(getActivity(),PictureActivity.class); + Intent intentPanorama = new Intent(getActivity(), PictureActivity.class); 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_ORATATION, 0); @@ -526,7 +524,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }); return; - }else { + } else { if (videoFile.exists()) { AWMp4ParserHelper.getInstance().loadFirstWithGlide(getActivity(), Uri.fromFile(videoFile).toString(), ivRoadPicture, 500); List videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId()); @@ -600,7 +598,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - if (showPoiEntity!=null){ + if (showPoiEntity != null) { new Thread(new Runnable() { @Override public void run() { @@ -662,13 +660,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList poiEntity.setType(4); poiEntity.setTaskStatus(2); poiEntity.setIsLocalData(1); - if (fmRoadPic.getTag()==null){ + if (fmRoadPic.getTag() == null) { List videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId()); - if (videoFileListByUUID!=null){ + if (videoFileListByUUID != null) { fmRoadPic.setTag(videoFileListByUUID); } } - if (fmRoadPic.getTag() != null &&!((List) fmRoadPic.getTag()).isEmpty()) { + if (fmRoadPic.getTag() != null && !((List) fmRoadPic.getTag()).isEmpty()) { List lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List) fmRoadPic.getTag()); String lineString = GeometryTools.getLineString(lineStringByVideoFileList); Log.d("TAG", "onGranted: " + lineString); @@ -684,12 +682,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override protected PoiCheckResult checkPoiEntity(PoiEntity entity) { PoiCheckResult poiCheckResult = new PoiCheckResult(); - if (entity.getPhoto()==null){ + if (entity.getPhoto() == null) { poiCheckResult.setCode(1); poiCheckResult.setMsg("请录像"); return poiCheckResult; } - if (entity.getWork_type()==-1){ + if (entity.getWork_type() == -1) { poiCheckResult.setCode(1); poiCheckResult.setMsg("请选择录像方式"); return poiCheckResult; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index db21b4d..e4dee63 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -136,6 +136,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private Marker bigMarker; private Marker markerPile; private List upload; + private Point screenPilePositions; + private List pileLocality; public static TreasureFragment newInstance(Bundle bundle) { TreasureFragment fragment = new TreasureFragment(); @@ -234,6 +236,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen removables = new ArrayList<>();//存储网络数据的marker removablesLocality = new ArrayList<>(); //存储本地数据的marker removablesMarker = new ArrayList<>();//存储网络数据的marker + pileLocality = new ArrayList<>();//存储充电桩的marker tencentMap.addOnMapLoadedCallback(new TencentMap.OnMapLoadedCallback() { @Override public void onMapLoaded() { @@ -373,7 +376,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen View child = nsv.getChildAt(0); return (child.getBottom() - (nsv.getHeight() + nsv.getScrollY())); } - }else { + } else { return 0; } } @@ -483,9 +486,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } else if (geometry.getGeometryType().equals("LineString")) {//线 BitmapDescriptor bitmapLine = null; 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) {//道路录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); } List latLineString = GeometryTools.getLatLngs(geo); // 构造 PolylineOpitons @@ -497,9 +500,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen // 折线的颜色为绿色 .color(0xff00ff00) // 折线宽度为5像素 - .width(25) + .width(35) .arrow(true) - .arrowSpacing(30) + .arrowSpacing(100) .arrowTexture(bitmapLine); // 还可以添加描边颜色 //.borderColor(0xffff0000) @@ -540,6 +543,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen switch (Integer.valueOf(list.get(i).getType())) { case 1://poi 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) .flat(true) .clockwise(false)); @@ -631,12 +635,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (geometry.getGeometryType().equals("Point")) {//点 latLng = GeometryTools.createLatLng(geo); } else if (geometry.getGeometryType().equals("LineString")) {//线 - BitmapDescriptor bitmapLine = null; 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) {//道路录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); } List latLineString = GeometryTools.getLatLngs(geo); // 构造 PolylineOpitons @@ -647,9 +650,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen // 折线的颜色为绿色 .color(0xff00ff00) // 折线宽度为5像素 - .width(30) + .width(45) .arrow(true) - .arrowSpacing(30) + .arrowSpacing(150) .arrowTexture(bitmapLine); /* // 还可以添加描边颜色 .borderColor(0xffff0000) @@ -713,7 +716,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen bigMarker.setVisible(true); bigMarker.setClickable(false); bigMarker.setZIndex(4); - initPileMarker(latLng); frameLayout.setVisibility(View.VISIBLE); setMainButtonVisiable(View.GONE); fragmentTransaction = supportFragmentManager.beginTransaction(); @@ -752,9 +754,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } else if (geometry.getGeometryType().equals("LineString")) {//线 BitmapDescriptor bitmapLine = null; if (type == 3) {//poi录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); - } else if (type == 4) {//道路录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.arrow_down); + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); + } else if (type== 4) {//道路录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); } List latLineString = GeometryTools.getLatLngs(geo); // 构造 PolylineOpitons @@ -765,9 +767,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .lineCap(true) .color(0xffff0000) // 折线宽度为5像素 - .width(5) + .width(35) .arrow(true) - .arrowSpacing(30) + .arrowSpacing(100) .arrowTexture(bitmapLine); /* // 还可以添加描边颜色 .borderColor(0xffff0000) @@ -1144,20 +1146,25 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen sliding_layout.setPanelHeight(0); setMainButtonVisiable(View.VISIBLE); 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值 setMainButtonVisiable((Integer) data.obj); } else if (data.what == Constant.GATHER_GET_RETURN) {//item 点击页面的返回事件的处理 @@ -1184,9 +1191,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (chargingPileEntity != null) { 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); showSlidingFragment(chargingPileFragment); } 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 跳转到充电桩 Bundle bundle = new Bundle(); bundle.putBoolean("isSliding", false); // 通知抽屉不收回 - bundle.putSerializable("chargingPileEntity", (ChargingPileEntity) data.obj); + ChargingPileEntity chargingPileEntity = (ChargingPileEntity) data.obj; + bundle.putSerializable("chargingPileEntity", chargingPileEntity); ChargingPileFragment chargingPileFragment = ChargingPileFragment.newInstance(bundle); showSlidingFragment(chargingPileFragment); } else if (data.what == Constant.HOME_TREASURE) {//寻宝的刷新 @@ -1312,16 +1317,20 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } 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( - mapCenterPoint, //中心点坐标，地图目标经纬度 + latLng, //中心点坐标，地图目标经纬度 tencentMap.getCameraPosition().zoom, //目标缩放级别 tencentMap.getCameraPosition().tilt, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) tencentMap.getCameraPosition().bearing)); //目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() { @Override public void onFinish() { - screenPosition = tencentMap.getProjection().toScreenLocation(latLng); + screenPilePositions = tencentMap.getProjection().toScreenLocation(latLng); sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); //创建Marker对象之前，设置属性 if (markerPile != null) { @@ -1336,9 +1345,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } private void initCheckedPileMarker(int poiWord) { - if (screenPosition != null) { + if (screenPilePositions != null) { sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); - LatLng latLng = tencentMap.getProjection().fromScreenLocation(screenPosition); + LatLng latLng = tencentMap.getProjection().fromScreenLocation(screenPilePositions); markerPile.setPosition(latLng); markerPile.setFixingPointEnable(false); Constant.markerLatlng = latLng; @@ -1503,22 +1512,22 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } if (upload.contains(2)) { itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_chongdianzhuang, "充电站")); - }else { + } else { } if (upload.contains(3)) { itemList.add(new ShareDialog.Item(getContext(), R.drawable.poi_video, "POI录像")); - }else { + } else { } if (upload.contains(4)) { itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_road, "道路")); - }else { + } else { } if (upload.contains(5)) { itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_qingbao, "其他")); - }else { + } else { } Bundle bundle = new Bundle(); @@ -1599,7 +1608,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen int[] deviceInfo = DensityUtil.getDeviceInfo(getActivity()); sliding_layout.setPanelHeight(deviceInfo[1] / 2); 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()); if (!(fragment instanceof FilterFragment)) { FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName()); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java index 83c923a..c5df6ec 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -12,6 +12,7 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; @@ -64,6 +65,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic private ImageView ivHera3; private TextView tvCard3; private File file; + private LinearLayout linearHint; + private TextView tvTitle; public static UserAttestationFragment newInstance(Bundle bundle) { @@ -99,6 +102,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic ivAttestation3.setOnClickListener(this); btnAttestation = (Button) findViewById(R.id.btn_attestation); btnAttestation.setOnClickListener(this::onClick); + linearHint = findViewById(R.id.linear_hint); etAttestationName = (EditText) findViewById(R.id.et_attestationName); etNamePhone = (EditText) findViewById(R.id.et_namePhone); 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); ivHera3 = (ImageView) findViewById(R.id.iv_hera3); 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 @@ -229,7 +268,9 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic MessageDialog.show((AppCompatActivity) getActivity(), "提示", "提交成功", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - Toast.makeText(getContext(), "", Toast.LENGTH_SHORT).show(); + Constant.NAME=attestationName; + Constant.ID_NUM=namePhone; + Constant.AUDITSTATUS=-1; getActivity().finish(); return false; } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index 165b0c4..3711221 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -52,9 +52,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen private TextView chargingReportMoney; private TextView otherPushMoney; private TextView otherReportMoney; - private SharedPreferences navInfo; private CheckBox checkBox; - private String bankAccount; public static WithdrawFragment newInstance(Bundle bundle) { WithdrawFragment fragment = new WithdrawFragment(); @@ -90,22 +88,11 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { - checkBox.setChecked(true); - navInfo = getActivity().getSharedPreferences("navInfo", Context.MODE_PRIVATE); - bankAccount = navInfo.getString("bankAccount", null); - if (bankAccount == null || bankAccount.equals("")) { - String attestationName = navInfo.getString("attestationName", null); - if (attestationName == null || attestationName.equals("")) { - Intent attestationIntent = new Intent(getContext(), FragmentManagement.class); - attestationIntent.putExtra("tag", 25); - startActivity(attestationIntent); - Toast.makeText(getContext(), "未实名认证，不能绑定银行卡", Toast.LENGTH_SHORT).show(); - } else { - Intent gatheringIntent = new Intent(getContext(), FragmentManagement.class); - gatheringIntent.putExtra("tag", 24); - startActivity(gatheringIntent); - Toast.makeText(getContext(), "以实名认证，请绑定银行卡", Toast.LENGTH_SHORT).show(); - } + if (Constant.ID_NUMBER==null||Constant.BANKACCOUNT==null){ + Toast.makeText(getContext(), "没有绑定银行卡，请先绑定银行卡", Toast.LENGTH_SHORT).show(); + checkBox.setChecked(false); + }else { + checkBox.setChecked(true); } } } @@ -181,13 +168,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen break; 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(); - if (price!=null){ + if (price!=null&&!price.equals("")){ Integer integer = Integer.valueOf(price); if (integer!=null&&integer<10){ Toast.makeText(getContext(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); @@ -195,15 +177,16 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } }else { Toast.makeText(getContext(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); + return; } if (!checkBox.isChecked()) { Toast.makeText(getContext(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); return; } - if (bankAccount != null) { + if (Constant.ID_NUMBER != null) { 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 public boolean onClick(BaseDialog baseDialog, View v) { immediatelyPrice(); @@ -212,6 +195,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen }); } else { Toast.makeText(getContext(), "请先绑定银行卡", Toast.LENGTH_SHORT).show(); + return; } diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index 3945db0..d558bc4 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -23,12 +23,13 @@ public class HttpInterface { //172.23.139.4:8001/m4/user/update public static final String USER_UPDATE =IP +USER_PATH+ "user/m4/user/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 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加密 - public static final String geomIP="http://172.23.139.4:9999/m4"; 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/** diff --git a/app/src/main/res/drawable/poi_video_arrows.png b/app/src/main/res/drawable/poi_video_arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..1c6ec572f5119ac4a7e1efffe04f7b600228811a GIT binary patch literal 620 zcmV-y0+aoTP)Px%CP_p=R5%gURK1H6K@@+pABjP2EF?${trV+lBP@bMj>BwXk|Iq=3dyEOl_LLv z%~_cLKopN_v` zK;)b?P*qi*HyRDD>pHdDZ5{S~RC`@Mw9VGSghHXPk3Q~|N+l+InM{UE({#t<@oSiO z!@T3m{ARcp+VkiV`Sg@&^u+$f-U?q-X)>97QLooIdMW&Yv|2448`H9^TmM|-IrMdP z0q`?o2i&ETqZEI4bdg&DXg;66hro?Wr4n5tK+@?n<#IU}?GV*&70&4garz#Bq*AGu zwOWm%+EWLc&8DceCx{{IIwVpQBG#$nXXpn^?j6#zyZfKl(k(Zh4?X~?LZ zD-~>7tyIN8@q9W|89jcqU>`+nXHfemJBwM?>P6@J{17;*6tnajC`+AA#}Pr__X#v* zj^k*P$%Kao;^<%?hlv<2HSG7Wg1I6zE*lR9gAZX&9Q_woNX^jJm~lD)0000Px$q)9|UR45f=WIzMnK=9|!pDoPH%m=q^+vb2Q&4kPWvDw+#XD22m{s$_y^YZeN zK$b^Q?Cb06#>mJh5fl`}Xl!iE0MxJ&r(#xC*16Hq(F{PEAvrmj5vb4>Xu3R11Kea! zPfw@+|Nlz^oy@r7*)N6{oDvLHR#qU5t1uLEa&pd#ii%=jV`F1zz5JD-{^A#ggoFgf zfB*iOdU$xKgEW9mc6WET1)3@cbTi|@m%kZ~zWT+m{pnAJM=T-?4h{|=PlHVdE9U0r zUJwxx0TKk83bPhudR$x_$aGzx+YOk2ZngOO^{bM(xjEyfPoEe%jd);c8Cnc^z@D|Y zw+GRyS%B7q-BVCd!0`S1cZSKUx55>({rk-j9u>|2^v{1LCMHp)9Xoa`+_`fnBT!)u zTosh@_wQejiT@1@4A|GNUoQX;I&_8D_#`Q2K{r8_mzm*TtT=na< z4wyrp0i&KFFE8&OD7=7)hvDbXpNzkM|7N^;_3D3+7$`Tu0WeX8139ul4AckI38aCB g9N)fu`w5UD0Ld_pG-J`?yZ`_I07*qoM6N<$g87%*kN^Mx literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/fragment_forget_paw.xml b/app/src/main/res/layout/fragment_forget_paw.xml index 6946565..2b45b46 100644 --- a/app/src/main/res/layout/fragment_forget_paw.xml +++ b/app/src/main/res/layout/fragment_forget_paw.xml @@ -64,10 +64,10 @@ android:id="@+id/et_forgetPaw_phone" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="20dp" + android:layout_marginLeft="20dp" android:background="@null" - android:inputType="number" android:hint="11位手机号码" + android:inputType="number" android:maxLength="11" android:paddingTop="10dp" android:paddingBottom="10dp" @@ -81,11 +81,11 @@ + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone" /> + + @@ -150,11 +152,11 @@ android:id="@+id/et_forgetPaw_paw" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginLeft="20dp" android:background="@null" android:hint="6-20位密码" - android:paddingTop="10dp" android:inputType="textPassword" - android:layout_marginLeft="20dp" + android:paddingTop="10dp" android:paddingBottom="10dp" android:textColorHint="@color/colorTransparent" android:textCursorDrawable="@drawable/text_color" @@ -166,9 +168,9 @@ @@ -187,14 +189,14 @@ android:id="@+id/et_forgetPaw_confirm_paw" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginLeft="20dp" android:background="@null" android:hint="请再次输入一遍密码" + android:inputType="textPassword" android:paddingTop="10dp" android:paddingBottom="10dp" - android:inputType="textPassword" android:textColorHint="@color/colorTransparent" android:textCursorDrawable="@drawable/text_color" - android:layout_marginLeft="20dp" android:textSize="15sp" android:theme="@style/MyEditText" app:layout_constraintLeft_toLeftOf="@id/forgetPaw_confirm_paw" @@ -203,8 +205,8 @@ @@ -214,8 +216,8 @@ style="@style/login_style" android:layout_width="match_parent" android:layout_height="50dp" - android:layout_marginTop="20dp" android:layout_marginLeft="20dp" + android:layout_marginTop="20dp" android:layout_marginRight="50dp" android:gravity="center" android:text="提交" diff --git a/app/src/main/res/layout/user_attestation_fragment.xml b/app/src/main/res/layout/user_attestation_fragment.xml index 56113a5..e7dd131 100644 --- a/app/src/main/res/layout/user_attestation_fragment.xml +++ b/app/src/main/res/layout/user_attestation_fragment.xml @@ -37,7 +37,43 @@ android:textSize="17sp" android:textStyle="bold" /> + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/linear_hint">