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

修改12日提出的bug

Browse Source
This commit is contained in:
md 2021-08-13 09:47:26 +08:00
parent b1adb1e137
commit c51d9ebeb5
16 changed files with 67 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

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

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

@ -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();
}

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

@ -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;
}

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

@ -115,7 +115,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
if (!EventBus.getDefault().isRegistered(this)) {//加上判断
EventBus.getDefault().register(this);
}
}
@Override

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

@ -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();

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

@ -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)

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

@ -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();

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

@ -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);

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

@ -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";//面状任务开始采集

2
app/src/main/res/layout/activity_login.xml
View File

@ -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"

2
app/src/main/res/layout/activity_user.xml
View File

@ -70,7 +70,7 @@
android:layout_centerVertical="true"
style="@style/user_text_style" />
<Button
android:id="@+id/btn_attestation"
android:id="@+id/btn_attestations"
style="@style/user_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

1
app/src/main/res/layout/bankadapteritem.xml
View File

@ -8,5 +8,6 @@
android:layout_height="50dp"
android:gravity="center_vertical"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginLeft="20dp"
android:id="@+id/tv_bank"/>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -68,6 +68,7 @@
android:background="@null"
android:hint="11位手机号码"
android:inputType="number"
android:textColor="@color/white"
android:maxLength="11"
android:paddingTop="10dp"
android:paddingBottom="10dp"
@ -104,6 +105,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:background="@null"
android:textColor="@color/white"
android:hint="6为短信验证"
android:inputType="number"
android:paddingTop="10dp"
@ -155,6 +157,7 @@
android:layout_marginLeft="20dp"
android:background="@null"
android:hint="6-20位密码"
android:textColor="@color/white"
android:inputType="textPassword"
android:paddingTop="10dp"
android:paddingBottom="10dp"
@ -194,6 +197,7 @@
android:hint="请再次输入一遍密码"
android:inputType="textPassword"
android:paddingTop="10dp"
android:textColor="@color/white"
android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"

5
app/src/main/res/layout/fragment_register.xml
View File

@ -78,6 +78,7 @@
android:layout_height="wrap_content"
android:hint="11位手机号码"
android:inputType="number"
android:textColor="@color/white"
android:layout_marginLeft="35dp"
style="@style/register_hint_style"
android:maxLength="11"
@ -110,6 +111,7 @@
android:layout_width="250dp"
android:layout_height="wrap_content"
android:hint="6位短信验证"
android:textColor="@color/white"
android:inputType="number"
style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
@ -154,6 +156,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="推荐人(编码/邮箱/手机号)"
android:textColor="@color/white"
style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
@ -184,6 +187,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="6-20位密码"
android:textColor="@color/white"
android:inputType="textPassword"
style="@style/register_hint_style"
android:maxLength="20"
@ -217,6 +221,7 @@
android:layout_height="wrap_content"
android:hint="请再次输入一遍密码"
android:maxLength="20"
android:textColor="@color/white"
android:inputType="textPassword"
style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"

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

@ -152,6 +152,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/ll_pic"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@ -271,6 +272,7 @@
</LinearLayout>
<View
android:id="@+id/user_attestation_view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#2196F3" />

4
app/src/main/res/layout/withdraw_fragment.xml
View File

@ -336,7 +336,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:layout_toRightOf="@id/image_poiVideo"
android:text="POIVIDEO推送积分"
android:text="POI录像推送积分"
android:textColor="#333"
android:textSize="18sp" />
@ -376,7 +376,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:layout_toRightOf="@id/image_poiVideo_report"
android:text="POIVIDEO上报任务积分"
android:text="POI录像上报任务积分"
android:textColor="#333"
android:textSize="18sp" />