diff --git a/app/build.gradle b/app/build.gradle index 81cf51b..5e04152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '29.0.2' - //ndkVersion '23.0.7123448' + ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java index f7354c7..79e1811 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -139,7 +139,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @Override public void onSuccess(LoginOauthTokenBean response, int id) { dismissLoadingDialog(); - Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); + if (response.getCode()==200){ LoginOauthTokenBean.BodyBean body = response.getBody(); navInfoEditor.putString("access_token",body.getAccess_token()); @@ -156,6 +156,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener Constant.USERID=body.getUserId(); Constant.PASS_WORD=paw; initGetUserInfo();//获取用户信息 + Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); }else { dismissLoadingDialog(); } 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 04e60c0..fe147da 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -90,7 +90,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { navInfoEditor = getSharedPreferences("navInfo", Context.MODE_PRIVATE).edit(); ivUser = findViewById(R.id.iv_user); ivUser.setOnClickListener(this::onClick); - btnAttestation = findViewById(R.id.btn_attestation); + btnAttestation = findViewById(R.id.btn_attestations); btnAttestation.setOnClickListener(this::onClick); btnGathering = findViewById(R.id.btn_gathering); btnGathering.setOnClickListener(this::onClick); @@ -116,6 +116,14 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { if (regions!=null){ region.setText(regions); } + if (Constant.AUDITSTATUS==1){ + btnAttestation.setText("已认证"); + } + if (Constant.ID_NUMBER!=null){ + btnGathering.setText("已绑定"); + + } + } @Override @@ -128,6 +136,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { 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); @@ -135,7 +144,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { Toast.makeText(this, Constant.AUDITMSG+"", Toast.LENGTH_SHORT).show(); } break; - case R.id.btn_attestation: + case R.id.btn_attestations: Intent attestationIntent = new Intent(this, FragmentManagement.class); attestationIntent.putExtra("tag", 25); startActivity(attestationIntent); @@ -156,7 +165,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { } if (Constant.ID_NUMBER==null){ Toast.makeText(this, "请先绑定银行卡", Toast.LENGTH_SHORT).show(); - return; + } userphone = etPhone.getText().toString().trim(); userqq = etQq.getText().toString().trim(); @@ -181,11 +190,12 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { Toast.makeText(this, "手机号输入错误", Toast.LENGTH_SHORT).show(); return; }else { - httpParams.put("mobile",userqq); + httpParams.put("mobile",userphone); } - if (!userqq.equals("")) { + if (userqq.equals("")) { if (!isQQNum_matcher) { Toast.makeText(this, "QQ号输入错误", Toast.LENGTH_SHORT).show(); + return; } return; }else { @@ -199,9 +209,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { }else { // httpParams.put("qq",userqq); } - } - netWork(httpParams); break; } 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 1e49e3d..9272c5b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -115,7 +115,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (!EventBus.getDefault().isRegistered(this)) {//加上判断 EventBus.getDefault().register(this); } - } @Override 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 8c1957d..2419480 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -124,7 +124,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); if (response.getCode() == 200) { sessionId = response.getBody(); - Toast.makeText(getActivity(), "注册成功", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show(); }else { Toast.makeText(getContext(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); } @@ -174,6 +174,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen } if (!conFirmPaw.equals(password)) { Toast.makeText(getContext(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); + return; } if (sessionId == null || sessionId.equals("")) { Toast.makeText(getContext(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java index 5d1d13b..7cbe61f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -101,7 +101,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick HttpParams httpParams = new HttpParams(); httpParams.put("fid", "1"); httpParams.put("pageNum", "1"); - httpParams.put("pageSize", "2"); + httpParams.put("pageSize", "20"); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.MSG_LISt) 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 e4dee63..607294f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -931,7 +931,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen switch (poiEntity.getType()) { case 1: DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; - MessageDialog.show((AppCompatActivity) getContext(), "提示", "你poi页面还有未提交完的数据", "确定").setOkButton(new OnDialogButtonClickListener() { + MessageDialog.show((AppCompatActivity) getContext(), "提示", "你poi页面还有未提交完的数据，之前的成果已保存，点击确定可继续作业", "确定").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { Bundle bundle = new Bundle(); 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 c5df6ec..3c2972e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -67,6 +67,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic private File file; private LinearLayout linearHint; private TextView tvTitle; + private LinearLayout linearLayout; + private View userAttestView; public static UserAttestationFragment newInstance(Bundle bundle) { @@ -112,6 +114,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic ivHera3 = (ImageView) findViewById(R.id.iv_hera3); tvCard3 = (TextView) findViewById(R.id.tv_card3); tvTitle = findViewById(R.id.tv_title); + userAttestView = findViewById(R.id.user_attestation_view); + linearLayout = findViewById(R.id.ll_pic);//身份证照片 if (Constant.AUDITSTATUS==-1){//审核中 if (Constant.NAME!=null&&Constant.ID_NUM!=null){ @@ -140,6 +144,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic linearHint.setVisibility(View.VISIBLE); etAttestationName.setText(Constant.NAME); etNamePhone.setText(Constant.ID_NUM); + linearLayout.setVisibility(View.GONE); + userAttestView.setVisibility(View.GONE); etAttestationName.setEnabled(false); etNamePhone.setEnabled(false); btnAttestation.setEnabled(false); 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 d558bc4..2187e09 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -19,13 +19,12 @@ public class HttpInterface { * 我的 * Path=/m4/user/* */ - public static final String MSG_CONTENT = IP +USER_PATH+ "user/m4"+USERID+"/msg_content";//发现 -富文本详情页请求 //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/"+USERID+"/update";//用户资料 //172.23.139.4:8001/m4/userBankcard/update - public static final String USER_BANKCARD_UP_DATA =IP +USER_PATH+ "user/m4/userBankcard/add"; //绑定银行卡 + public static final String USER_BANKCARD_UP_DATA =IP +USER_PATH+ "userBankcard/"+USERID+"/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/"+USERID+"/add"; //实名认证 //172.23.139.4:9999/m4/user/userLocation/1/userLocation post 参数 geom:geohash加密 public static final String USER_LOCATION = IP+USER_PATH+ "userLocation/"+USERID+"/userLocation"; //上传用户坐标 //dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718 @@ -35,27 +34,28 @@ public class HttpInterface { * Path=/m4/msgList/** */ // public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/"; - public static final String LIST_TASK =IP+MSG_LIST_PATH+ "m4/findAndMessage/"+USERID+"/msg_list";//任务专区 - public static final String LIST_EVENT =IP+MSG_LIST_PATH+ "m4/findAndMessage/"+USERID+"/msg_list";//活动专区 - public static final String LIST_TASK_EXPLAIN =IP+MSG_LIST_PATH+"m4/findAndMessage/"+USERID+"/msg_list";//任务说明 - //http://172.23.139.4:8002/m4/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 - public static final String MSG_LISt =IP+MSG_LIST_PATH+ "m4/findAndMessage/"+USERID+"/msg_list";//发现查询接口 - //http://172.23.139.4:8002/m4/findAndMessage/1/exam_content?id=11 - public static final String EXAM_CONTENT =IP+MSG_LIST_PATH+ "m4/findAndMessage/"+USERID+"/exam_content";//发现 -能力测评获取试题接口 - //http://172.23.139.4:8002/m4/findAndMessage/1/submitExam - public static final String EXAM_SUBMIT =IP+MSG_LIST_PATH+ "m4/findAndMessage/"+USERID+"/submitExam";//发现 -能力测评提交试卷 post + public static final String MSG_CONTENT = IP +MSG_LIST_PATH+ "findAndMessage/"+USERID+"/msg_content";//发现 -富文本详情页请求 + public static final String LIST_TASK =IP+MSG_LIST_PATH+ "findAndMessage/"+USERID+"/msg_list";//任务专区 + public static final String LIST_EVENT =IP+MSG_LIST_PATH+ "findAndMessage/"+USERID+"/msg_list";//活动专区 + public static final String LIST_TASK_EXPLAIN =IP+MSG_LIST_PATH+"findAndMessage/"+USERID+"/msg_list";//任务说明 + //http://172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 + public static final String MSG_LISt =IP+MSG_LIST_PATH+ "findAndMessage/"+USERID+"/msg_list";//发现查询接口 + //http://172.23.139.4:8002/findAndMessage/1/exam_content?id=11 + public static final String EXAM_CONTENT =IP+MSG_LIST_PATH+ "findAndMessage/"+USERID+"/exam_content";//发现 -能力测评获取试题接口 + //http://172.23.139.4:8002/findAndMessage/1/submitExam + public static final String EXAM_SUBMIT =IP+MSG_LIST_PATH+ "findAndMessage/"+USERID+"/submitExam";//发现 -能力测评提交试卷 post /** * 登录 * Path=/m4/userlogin/** */ //http://172.23.139.4:9999/m4/userlogin/oauth/token public static final String USER_LOGIN_OAUTH_TOKEN = IP +USER_LOGIN_PATH+ "oauth/token"; //登录接口 - ///m4/user/m4/user/register - public static final String USER_REGISTER=IP+USER_PATH+"m4/user/register";//注册接口 + ///m4/user/user/register + public static final String USER_REGISTER=IP+USER_PATH+"user/register";//注册接口 ///m4/user/ phone/message public static final String USER_MESSAGE=IP+USER_PATH+"phone/message";//获取验证码 type 1：注册获取 2：更新 - ///m4/user/m4/user/forgetPassword - public static final String USER_FORGET_PASSWORD=IP +USER_PATH+"m4/user/forgetPassword";//忘记密码 + ///m4/user/user/forgetPassword + public static final String USER_FORGET_PASSWORD=IP +USER_PATH+"user/forgetPassword";//忘记密码 //Flat //dtxbmaps.navinfo.com/dtxb/m4/user/phone/message?mobile=18811794839&type=2 /** @@ -71,7 +71,7 @@ public class HttpInterface { *Path=/m4/task/** */ //172.23.139.4:8003/m4/task/1/getList - public static final String TASK_LIST = IP+TASK_PATH + "m4/task/"+USERID+"/getList"; //任务搜索 + public static final String TASK_LIST = IP+TASK_PATH + "task/"+USERID+"/getList"; //任务搜索 //172.23.139.4:8003/othertask/1/receivedOthertask public static final String RECEIVED_OTHER_TASK = IP+TASK_PATH + "othertask/"+USERID+"/receivedOthertask";//其他-领取任务 //172.23.139.4:8003/poitask/1/receivedPoitask/1 @@ -103,18 +103,18 @@ public class HttpInterface { //172.23.139.4:8003/roadtask/1/uploadpic public static final String ROAD_TASK_UPLOAD_PIC= IP+TASK_PATH +"roadtask/"+USERID+"/uploadpic";//道路录像—上传 //http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy - public static final String GET_PHONES = IP+TASK_PATH + "m4/task/"+USERID+"/getPhone";//电话区号和电话位数 + public static final String GET_PHONES = IP+TASK_PATH + "task/"+USERID+"/getPhone";//电话区号和电话位数 //172.23.139.4:8003/cstask/1/uploadpic public static final String CS_TASK_UP_LOAD_PIC = IP+TASK_PATH + "cstask/"+USERID+"/uploadpic";//充电桩-上传 //172.23.139.4:8003/ctask/1/uploadpic public static final String C_TASK_UP_LOAD_PIC= IP+TASK_PATH +"ctask/"+USERID+"/uploadpic";//充电站-上传 //172.23.139.4:8003/m4/task/1/taskName?geo=1rn7exd5uhxy&name=四维 - public static final String TASK_NAME = IP+TASK_PATH +"m4/task/"+USERID+"/taskName";//poi-查重 + public static final String TASK_NAME = IP+TASK_PATH +"task/"+USERID+"/taskName";//poi-查重 //172.23.139.4:8003/m4/task/1/getCommitList?type=2&pageSize=10&pageNum=1 - public static final String GET_COMMIT_LIST = IP+TASK_PATH +"m4/task/"+USERID+"/getCommitList";//紀錄——已提交 + public static final String GET_COMMIT_LIST = IP+TASK_PATH +"task/"+USERID+"/getCommitList";//紀錄——已提交 public static final String RECEIVED_POLYGON_TASK = IP+TASK_PATH + "polygonTask/"+USERID+"/receivedPolygontask"; //面状任务任务领取 //172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口 - public static final String UNRECEIVED_POLYGON_TASK = IP+TASK_PATH + "m4/task/"+USERID+"/unReceivedTask";//所有類型结束领取 + public static final String UNRECEIVED_POLYGON_TASK = IP+TASK_PATH + "task/"+USERID+"/unReceivedTask";//所有類型结束领取 public static final String COMPLETE = IP+TASK_PATH + "polygonTask/"+USERID+"/complete";//面状任务结束领取 public static final String SUBMIT_POLYGON_TASK = IP+TASK_PATH + "polygonTask/"+USERID+"/submitPolygontask";//面状任务开始采集 diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index cdbde4e..645066f 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -48,6 +48,7 @@ android:layout_marginTop="8dp" android:hint=" ID/手机号" android:maxLines="1" + android:textColor="@color/white" android:paddingBottom="20dp" android:layout_marginRight="35dp" android:layout_marginLeft="35dp" @@ -83,6 +84,7 @@ android:layout_marginTop="8dp" android:hint=" 请输入密码" android:maxLines="1" + android:textColor="@color/white" android:inputType="textPassword" android:paddingBottom="15dp" android:layout_marginRight="35dp" diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml index ed6ea0e..b05f9da 100644 --- a/app/src/main/res/layout/activity_user.xml +++ b/app/src/main/res/layout/activity_user.xml @@ -70,7 +70,7 @@ android:layout_centerVertical="true" style="@style/user_text_style" />