diff --git a/app/build.gradle b/app/build.gradle index 76a766d..4db1251 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 22 targetSdkVersion 30 - versionCode 6 - versionName "6.1112" + versionCode 7 + versionName "6.1113" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { 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 56e2f5e..b21435f 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -148,8 +148,10 @@ public class HomeActivity extends BaseActivity{ }else if (data.what==Constant.NEST_WORD_SUBMIT){ String dataString = (String) data.obj; if (!dataString.equals("")) { + 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; diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index 3848417..d125c6b 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -213,7 +213,13 @@ public class MainActivity extends BaseActivity { private void showUpdateDialog(ApkVersionBean.bodyBean bodyBean) { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setIcon(android.R.drawable.ic_dialog_info); - builder.setMessage("请升级APP版本至" + bodyBean.getVersion()); + builder.setTitle("请升级APP版本至" + bodyBean.getVersion()); + builder.setMessage("本次升级说明：\n" + + "1.修复一些闪退、丢任务、丢数据、卡顿问题\n" + + "2.修复点击保存，持续提示问题，上传任务中也可继续作业\n" + + "3.修复连拍照片错乱问题\n" + + "4.修复起终点判断问题\n" + + "5.新增默认地图缩放比例、身份证姓名自动识别功能"); builder.setCancelable(false); if (bodyBean.getUpdateState() == 0) {//非必须更新 builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 7942ba2..c135399 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -163,7 +163,7 @@ public class Constant { public static SlidingUpPanelLayout SLIDING_LAYOUT = null;//設置 public static boolean IS_FILTER_LIST_ITEM = true;//poi页面的查重 public static TencentMap.OnMarkerClickListener markerClickListener = null; - public static final String NAVIN_FO = "11.12";//版本日期 + public static final String NAVIN_FO = "11.13";//版本日期 //marker public static final BitmapDescriptor MARKER_POI_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_show); public static final BitmapDescriptor MARKER_CHARGE_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_show); 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 8b08afa..0f48902 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -856,7 +856,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override public void run() { etRoadName.setText(sb); - etRoadName.setEnabled(false); + // etRoadName.setEnabled(false); } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index ac6a63b..e096007 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -843,7 +843,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void run() { etRoadName.setText(sb); - etRoadName.setEnabled(false); + //etRoadName.setEnabled(false); } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index 7d729e5..240c206 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -41,6 +41,7 @@ import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.room.PoiEntity; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.PoiSaveUtils; +import com.umeng.umcrash.UMCrash; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -358,9 +359,9 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList 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")) { Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - }else { + } else { Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); } } @@ -389,23 +390,27 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList new Thread(new Runnable() { @Override public void run() { - List roadAll = roadDao.getAllPoiByRecoded(); - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - roadEntities.clear(); - roadEntities.addAll(roadAll); - Log.d("TAG", "run: " + roadEntities.toString()); - staySubmitAdapter.setAllRoad(roadEntities); - staySubmitAdapter.notifyDataSetChanged(); + try { + List roadAll = roadDao.getAllPoiByRecoded(); + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + roadEntities.clear(); + roadEntities.addAll(roadAll); + Log.d("TAG", "run: " + roadEntities.toString()); + staySubmitAdapter.setAllRoad(roadEntities); + staySubmitAdapter.notifyDataSetChanged(); /*for (int i = 0; i < roadAll.size(); i++) { if (roadAll.get(i).getType()!=6){ roadEntities.add(roadAll.get(i)); } }*/ - } - }); + } + }); + } + } catch (Exception e) { + UMCrash.generateCustomLog(e, "自定义"); } } }).start(); 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 39a08dc..3ff11c4 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/";//登录