diff --git a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java index e06ff0d..9626a32 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java @@ -295,7 +295,7 @@ public class GuidanceActivity extends BaseActivity { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.equals("timeout")){ + if (message.equals("timeout")||message.equals("Read time out")){ Toast.makeText(GuidanceActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); }else { Toast.makeText(GuidanceActivity.this, message, Toast.LENGTH_SHORT).show(); 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 6b28c33..100ca10 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -157,6 +157,7 @@ public class HomeActivity extends BaseActivity { Constant.isPresent = true; DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; MessageDialog.show(this, "提示", dataString, "确定"); + } } else if (data.what == Constant.NEST_WORD_REGISTER) { String dataString = (String) data.obj; @@ -164,14 +165,16 @@ public class HomeActivity extends BaseActivity { DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; MessageDialog.show(this, "提示", dataString, "确定"); } - } else if (data.what == Constant.EVENT_MESSAGE) { + + }else if (data.what==Constant.EVENT_MESSAGE){ String dataString = (String) data.obj; - if (!dataString.equals("")) { + if (!dataString.equals("")){ Toast.makeText(this, dataString, Toast.LENGTH_SHORT).show(); } } } + @Override public void onBackPressed() { if (!BackHandlerHelper.handleBackPress(this)) { 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 d2faae1..f4920c2 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -320,7 +320,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.equals("timeout") || message.equals("Read time out")) { + if (message.equals("timeout") || message.equals("Read time out") || message.equals("read time out")||message.equals("TimeOut")) { Toast.makeText(LoginActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); } else { Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java index 762dc5b..ff38329 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java @@ -64,28 +64,6 @@ public class StaySubmitAdapter extends RecyclerView.Adapter chargingPileEntityList = PoiDatabase.getInstance(context).getChargingPileDao().getChargingPileByStationId(poiEntity.getId()); - if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { - for (ChargingPileEntity chargingPileEntity : chargingPileEntityList) { - List chargingPileFileList = new ArrayList<>(); - if (chargingPileEntity.getPhotos() != null && !chargingPileEntity.getPhotos().isEmpty()) { - for (String photoPath : chargingPileEntity.getPhotos()) { - chargingPileFileList.add(new File(photoPath)); - } - } - PoiDatabase.getInstance(context).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); - for (int i = 0; i < chargingPileFileList.size(); i++) { - chargingPileFileList.get(i).delete(); - } - } - } - PoiDatabase.getInstance(context).getChargingPileDao().deleteChargingFidPileEntity(poiEntity.getId()); - - } - }).start(); iterator.remove(); } } 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 3b1cf86..2f38985 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -904,7 +904,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override public void run() { etRoadName.setText(sb); - // etRoadName.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 7633aee..5176303 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,8 +1,8 @@ package com.navinfo.outdoor.http; public class HttpInterface { - public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 - public static final String IP= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 + public static final String IP= "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 public static final String USER_PATH ="/user/";//我的 public static final String MSG_LIST_PATH ="/msgList/";//发现 public static final String USER_LOGIN_PATH ="/userlogin/";//登录 diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java b/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java index dd09528..3a5c37e 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java @@ -25,18 +25,19 @@ public class PoiEntityDeleteUtil { switch (poiEntity.getType()) { case 1: case 5: - initDelete(poiEntity); + initDelete( poiEntity); break; case 2: initPileDelete(context,poiEntity); break; case 3: case 4: - initPicture(poiEntity); + initPicture(context, poiEntity); break; } } + private void initPileDelete(Context context, PoiEntity poiEntity) { if (poiEntity != null) { if (poiEntity.getPhotoInfo() != null) { @@ -65,13 +66,14 @@ public class PoiEntityDeleteUtil { } } - private void initPicture(PoiEntity poiEntity) { + private void initPicture(Context context, PoiEntity poiEntity) { List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); for (int i = 0; i < fileListByUUID.size(); i++) { fileListByUUID.get(i).delete(); } File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); filePath.delete(); + } diff --git a/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java b/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java index aa6b43b..0d3d1af 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java @@ -91,7 +91,7 @@ public class TalentLocationUtils implements TencentLocationListener{ */ @Override public void onLocationChanged(TencentLocation tencentLocation, int i, String s) { - if (i == TencentLocation.ERROR_OK) { + if (i == TencentLocation.ERROR_OK) {//定位成功 Location location = new Location(tencentLocation.getProvider()); // //设置经纬度以及精度 location.setLatitude(tencentLocation.getLatitude());