From 7cada7a3e2e174ff2b1e2888b996ecd4b6c4da9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= Date: Fri, 10 Sep 2021 14:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../house/SearchHouseByPersonActivity.java | 4 +++- .../services/LocationService.java | 3 ++- .../cm_utils/constant/PathConfig.java | 4 ++-- .../core/retrofit_net/BaseUrlApi.java | 23 ++++--------------- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/SearchHouseByPersonActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/SearchHouseByPersonActivity.java index 1d7abd3..490acc9 100644 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/SearchHouseByPersonActivity.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/house/SearchHouseByPersonActivity.java @@ -90,7 +90,9 @@ public class SearchHouseByPersonActivity extends BaseActivity { mIvClear.setOnClickListener(v -> { mKeywords = ""; mEtSearchContent.setText(""); - refreshData(); + mDatas.clear(); + mAdapter.notifyDataSetChanged(); + setStateView(12); }); mDatas = new ArrayList<>(); mAdapter = new SearchHouseByPersonAdapter(mActivity, mDatas); diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java b/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java index 227350d..b7efeb4 100755 --- a/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java +++ b/app/src/main/java/com/sucstepsoft/realtimelocation/services/LocationService.java @@ -951,7 +951,8 @@ public class LocationService extends NotificationService { private void sendLocationBroadcast(BDLocation bdLocation) { if (null != bdLocation) { - if (checkSinglePoint(bdLocation)) { + boolean isLegal = checkSinglePoint(bdLocation); + if (isLegal) { if (mTempList.size() >= 25) { checkPoints(); } else { diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java index 21e5d9e..604994c 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java @@ -78,7 +78,7 @@ public class PathConfig { public static final String DEFAULT_AREA_CODE = "0";//地区 public static final String APP_VERSION_ID = "402e60d8-8270-4bb9-8850-83d30a39a53f";/* 包头版本一 */ -// public static final String APP_VERSION_ID = "6c8b1cfc-0477-49c3-840b-f6be46278743";/* 包头测试 */ +// public static final String APP_VERSION_ID = "791e93a9-609f-4867-b5bb-5ab522825c5d";/* 包头测试 */ // public static final String APP_VERSION_ID = "04f35ca3-a269-445a-b39f-9146c9b6bfde";/*集宁*/ //包头坐标 109.926934,40.574501 @@ -101,7 +101,7 @@ public class PathConfig { public static final int MSG_NOTICE_TARGET = 108; public static final int MSG_SEND_STATUS = 1100; public static final String mDefaultCityCode = "229";//TODO 包头 229 - // public static final String mDefaultCityCode = "321";//TODO 呼和浩特 321 +// public static final String mDefaultCityCode = "321";//TODO 呼和浩特 321 // public static final String mDefaultCityCode = "168";//TODO 乌兰察布 168 // 区直领导：b01dac8e-c516-4974-b513-f1352ca40202 // 片长：e483f019-d971-49ac-b5fa-3314220da703 diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index 429540c..8b7b9b7 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -9,31 +9,16 @@ import com.sucstepsoft.cm_utils.constant.PathConfig; */ public class BaseUrlApi { - // public static final String IP = "http://219.147.99.164:8081/";/* 正式IP 版本一 */ - public static final String IP = "http://219.147.99.164:8082/usercenter/"; /* 正式IP 版本二 */ - // public static final String IP = "http://124.67.110.246:8081/usercenter/"; /* 集宁 版本一 */ -// public static final String IP = "http://192.168.0.101:7001/usercenter/";/* 本地测试IP */ - // public static final String IP = "http://49.233.36.36:8868/usercenter/";/* 测试IP */ - public static final String PROJECT_NAME = "app/"; + public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/ public static final String BASE_URL = IP; - // public static final String BASE_URL = IP + PROJECT_NAME; public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion"; public static final String PRISON_PLAN = BASE_URL + "appPlan/goPlan"; public static final String FIELD_SAFETY = BASE_URL + "appFieldSafety/goFloorPlan"; - // http://39.104.74.123:8083 -// http://39.104.74.123:8084/servicecity public static final int PHOTO_REQUEST = 233; public static final int CAMERA_REQUEST = 123; - // "http://2277c412x2.iask.in:12758/servicecity -// public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式*/ - public static final String BASE_IP_P = "http://192.168.0.109:8090/";/*测试*/ - // public static final String BASE_IP = "http://219.147.99.164:8081/servicecity/";/* 正式IP 版本一*/ -// public static final String BASE_IP_P = "http://192.168.1.176:8083/";/* 本地测试IP */ - // public static final String BASE_IP = "http://219.147.99.164:8082/servicecity/";/*正式IP 版本二*/ -// public static final String BASE_IP = "http://124.67.110.246:8081/servicecity/";/*集宁 版本二*/ - public static final String BASE_IP = BASE_IP_P + "servicecity/";/* 测试IP */ -// public static final String BASE_POPULATION_IP = BASE_IP_P + "population/"; - public static final String BASE_POPULATION_IP = "http://192.168.0.109:8080/population/";/*测试*/ + public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/ + public static final String BASE_IP = BASE_IP_P + "servicecity/";/*网格系统*/ + public static final String BASE_POPULATION_IP = BASE_IP_P + "population/";/*人口系统*/ public static final String BASE_IMG_URL = BASE_IP + "route/file/downloadfile/true/"; public static final String SOCKET_IP = BASE_IP_P + "social/appws";/*SocketIP*/