From c80562f73197debeee28769dae6c92f663b2874a Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Thu, 21 Sep 2023 14:56:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2023Q4SP2=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +-- .../outdoor/activity/HomeActivity.java | 2 +- .../fragment/WithdrawalRecordFragment.java | 5 +-- .../navinfo/outdoor/http/HttpInterface.java | 34 +++++++++++-------- app/src/main/res/layout/fragment_road.xml | 1 + 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dabac16..990e385 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 112 - versionName "8.230728-正式版-OCR" + versionCode 115 + versionName "8.230921-测试版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java index 3d21f8a..48e2532 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -387,7 +387,7 @@ public class HomeActivity extends BaseActivity { ArrayList toAddressList = new ArrayList<>(); toAddressList.add("xiaoyan159@qq.com"); toAddressList.add("huangjichao@navinfo.com"); - toAddressList.add("ZhouQi@navinfo.com"); + toAddressList.add("HanFei1100@navinfo.com"); mail.setToAddress(toAddressList); mail.setSubject("疑似违规记录"); mail.setContent(stringBuilder.append("用户名：").append(Constant.USER_NAME).append("\n") diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java index b95287d..4280471 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -92,7 +92,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli @Override protected void initData() { super.initData(); - SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); + SharedPreferences sharedPreferences = requireActivity().getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); @@ -120,6 +120,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("pageNum", withPage); + httpParams.put("pageSize", 20); OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) @@ -163,7 +164,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli @Override public void onClick(View v) { if (v.getId() == R.id.iv_withdraw) { - Objects.requireNonNull(getActivity()).finish(); + requireActivity().finish(); withdrawalRecordBuilder.append(TimestampUtil.time()).append("点击了返回,"); } } 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 077a97f..f58fbb4 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -2,8 +2,11 @@ package com.navinfo.outdoor.http; public class HttpInterface { // public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP - public static final String IP0 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 +// public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 + + public static final String IP = "http://120.92.15.187/dtxb/test/m4";//开发接口-外网 + public static final String IP_UPLOAD = "http://120.92.109.239/dtxb/test/m4";//开发接口-外网 + public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String IP4 = "http://10.130.23.166/dtxb/jinshan/m4";//心榕给的测试地址 public static final String USER_PATH = "/user/";//我的 @@ -204,34 +207,22 @@ public class HttpInterface { SUBMIT_POI_TASK = IP + TASK_PATH + "poitask/" + userId + "/submitPoitask";//poi-保存本地 //172.23.139.4:8003/othertask/1/submitOhtertask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注 SUBMIT_OTHER_TASK = IP + TASK_PATH + "othertask/" + userId + "/submitOthertask";//其他-保存本地 - //172.23.139.4:8003/othertask/1/uploadpic - OTHER_TASK_UPLOAD_PIC = IP + TASK_PATH + "othertask/" + userId + "/uploadpic";//其他-上传 //172.23.139.4:8003/ctask/1/receivedCtask/8608 RECEIVED_CTASK = IP + TASK_PATH + "ctask/" + userId + "/receivedCtask";//充电站-领取任务 //172.23.139.4:8003/ctask/1/submitCtask?id=8608&name=充电站&address=地址&telephone=18812345678|14712345678&geo=1rn7exd5uhxy&memo=测试备注&sptype=1 SUBMIT_CTASK = IP + TASK_PATH + "ctask/" + userId + "/submitCtask";//充电站-保存本地 //172.23.139.4:8003/cstask/1/submitCstask?taskId=0&name=充电站&geo=1rn7exd5uhxy&memo=测试备注&sptype=1&ffid=104&existence=1&detail={"cp_openType":"1,2","cp_floor":1,"cp_availableState":0,"sign_exist":0} SUBMIT_CSTASK = IP + TASK_PATH + "cstask/" + userId + "/submitCstask";//充电桩保存 - //172.23.139.4:8003/poitask/1/uploadpic - POI_TASK_UPLOAD_PIC = IP + TASK_PATH + "poitask/" + userId + "/uploadpic";//poi-上传 //172.23.139.4:8003/roadtask/1/receivedRoadtask/8569 RECEIVED_ROAD_TASK = IP + TASK_PATH + "roadtask/" + userId + "/receivedRoadtask";//道路任务获取 //172.23.139.4:8003/poivideotask/1/receivedPoivideotask/8569 RECEIVED_POI_VIDEO_TASK = IP + TASK_PATH + "poivideotask/" + userId + "/receivedPoivideotask";//poi录像任务获取 // 172.23.139.4:8003/poivideotask/1/submitPoivideotask INSIDE_API_LIST = IP + TASK_PATH + "poivideotask/" + userId + "/submitPoivideotask";//poi录像 保存 - //172.23.139.4:8003/poivideotask/1/uploadpic - POI_VIDEO_UPLOAD_PIC = IP + TASK_PATH + "poivideotask/" + userId + "/uploadpic";//poi录像-上传 //172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2 ROAD_TASK_SUBMIT = IP + TASK_PATH + "roadtask/" + userId + "/submitRoadtask";//道路录像-保存本地 - //172.23.139.4:8003/roadtask/1/uploadpic - ROAD_TASK_UPLOAD_PIC = IP + TASK_PATH + "roadtask/" + userId + "/uploadpic";//道路录像—上传 //172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy GET_PHONES = IP + TASK_PATH + "task/" + userId + "/getPhone";//电话区号和电话位数 - //172.23.139.4:8003/cstask/1/uploadpic - CS_TASK_UP_LOAD_PIC = IP + TASK_PATH + "cstask/" + userId + "/uploadpic";//充电桩-上传 - //172.23.139.4:8003/ctask/1/uploadpic - C_TASK_UP_LOAD_PIC = IP + TASK_PATH + "ctask/" + userId + "/uploadpic";//充电站-上传 //172.23.139.4:8003/m4/task/1/taskName?geo=1rn7exd5uhxy&name=四维 TASK_NAME = IP + TASK_PATH + "task/" + userId + "/taskName";//poi-查重 //172.23.139.4:8003/m4/task/1/getCommitList?type=2&pageSize=10&pageNum=1 @@ -243,7 +234,20 @@ public class HttpInterface { SUBMIT_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + userId + "/submitPolygontask";//面状任务开始采集 UPDATE_PHONE_NUM_URL = IP + UPDATE_PHONE_NUM_PATH.replace("{userId}", userId);// 修改手机号 CREATE_UPLOAD_TASK = IP + TASK_PATH + "task/"+ userId+"/createUploadTask";// 创建断点续传任务 - UPLOAD_SPLITE_TASK = IP + TASK_PATH + "task/"+ userId+"/uploadSplitTask";// 执行断点续传 UPLOAD_TASK_FINISH = IP + TASK_PATH + "task/"+ userId+"/uploadTaskFinish";// 断点续传完成 + + //172.23.139.4:8003/othertask/1/uploadpic + OTHER_TASK_UPLOAD_PIC = IP_UPLOAD + TASK_PATH + "othertask/" + userId + "/uploadpic";//其他-上传 + //172.23.139.4:8003/poitask/1/uploadpic + POI_TASK_UPLOAD_PIC = IP_UPLOAD + TASK_PATH + "poitask/" + userId + "/uploadpic";//poi-上传 + //172.23.139.4:8003/poivideotask/1/uploadpic + POI_VIDEO_UPLOAD_PIC = IP_UPLOAD + TASK_PATH + "poivideotask/" + userId + "/uploadpic";//poi录像-上传 + //172.23.139.4:8003/roadtask/1/uploadpic + ROAD_TASK_UPLOAD_PIC = IP_UPLOAD + TASK_PATH + "roadtask/" + userId + "/uploadpic";//道路录像—上传 + //172.23.139.4:8003/cstask/1/uploadpic + CS_TASK_UP_LOAD_PIC = IP_UPLOAD + TASK_PATH + "cstask/" + userId + "/uploadpic";//充电桩-上传 + //172.23.139.4:8003/ctask/1/uploadpic + C_TASK_UP_LOAD_PIC = IP_UPLOAD + TASK_PATH + "ctask/" + userId + "/uploadpic";//充电站-上传 + UPLOAD_SPLITE_TASK = IP_UPLOAD + TASK_PATH + "task/"+ userId+"/uploadSplitTask";// 执行断点续传 } } diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml index 7e8006e..922a2b4 100644 --- a/app/src/main/res/layout/fragment_road.xml +++ b/app/src/main/res/layout/fragment_road.xml @@ -186,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:tag="4" + android:visibility="gone" android:text="其他不可采原因">