From c0ce706448943f1276726143d3a31d9a55549339 Mon Sep 17 00:00:00 2001 From: wangdongsheng Date: Fri, 8 Oct 2021 18:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++-- .../outdoor/activity/PicturesActivity.java | 8 ++--- .../com/navinfo/outdoor/api/Constant.java | 2 +- .../outdoor/fragment/FilterFragment.java | 7 ++-- .../outdoor/fragment/ForgetPawFragment.java | 1 - .../outdoor/fragment/IssueFragment.java | 1 - .../outdoor/fragment/MessageFragment.java | 10 ++---- .../outdoor/fragment/MineFragment.java | 22 ++++++------ .../outdoor/fragment/OtherFragment.java | 18 ++-------- .../navinfo/outdoor/fragment/PoiFragment.java | 2 ++ .../outdoor/fragment/PoiVideoFragment.java | 5 +-- .../outdoor/fragment/RoadFragment.java | 2 +- .../outdoor/fragment/StaySubmitFragment.java | 35 ++++++++++--------- app/src/main/res/values/strings.xml | 2 +- 14 files changed, 51 insertions(+), 70 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 49da15d..fb281f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,14 +3,14 @@ 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" minSdkVersion 22 targetSdkVersion 30 - versionCode 3 - versionName "3.0" + versionCode 4 + versionName "4.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java index 1882ceb..68d2604 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -95,7 +95,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen private Polyline polyline; private String finalVideoPath; // 摄像后最终保存的文件名 private ViewGroup layerChange; // 切换地图和相机的父控件 - private CheckBox capturePicture, cbMapType;//拍照 + private CheckBox capturePicture, cbMapType; //拍照 private boolean isMapSlide = false; private boolean isOration = false; private SimpleDateFormat formatter; @@ -137,12 +137,13 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen super.onCreate(savedInstanceState); SharedPreferences sharedPreferences = this.getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); + @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String newFormat = formatter.format(new Date(System.currentTimeMillis())); String pictures_time = sharedPreferences.getString("pictures_time", null); if (pictures_time==null){ sharedEdit.putString("pictures_time",newFormat); - sharedEdit.commit(); + sharedEdit.apply(); logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); }else { if (pictures_time.equals(newFormat)){ @@ -594,8 +595,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } sb.append("\r\n"); FileUtils.writeFile(paperFile.getAbsolutePath(), sb.toString(), true); - - /*float speed = Constant.currentLocation.getSpeed();//米/秒 + /* float speed = Constant.currentLocation.getSpeed();//米/秒 if (speed != 0) { float a = (speed * 3600 / 1000);//km/h if (poi_video_type == 1) { 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 27069d7..acf734e 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -208,7 +208,7 @@ public class Constant { public static TencentMap.OnMarkerClickListener markerClickListener=null; - public static final String NAVIN_FO="9.30";//版本 + public static final String NAVIN_FO="10.08";//版本日期 /*联系我们的QQ群名称和QQ群号 */ public static String REGION_JIG_NAME = "京津冀晋蒙-地图寻宝群"; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java index 6613b5c..7e32fc0 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -277,12 +277,9 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi recyclerFilter.getDefaultFootView().setNoMoreHint("成功加载完毕"); recyclerFilter.setLoadingListener(new XRecyclerView.LoadingListener() { @Override - public void onRefresh() { - } - + public void onRefresh() { } @Override - public void onLoadMore() { - } + public void onLoadMore() { } }); checkOk.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java index 5e653ae..d692710 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -215,7 +215,6 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } } - @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java index 850b527..2037617 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java @@ -82,7 +82,6 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener }else { Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); } - Log.d("TAG", "onSuccess: " + response.getMessage() + ""); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java index 12086c8..01d7901 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java @@ -76,14 +76,10 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen messageRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override - public void onRefresh() { - - } + public void onRefresh() { } @Override - public void onLoadMore() { - - } + public void onLoadMore() { } }); } private void initNetwork() { @@ -131,9 +127,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen case R.id.message_final: Objects.requireNonNull(getActivity()).finish(); break; - case R.id.tv_read: - break; } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index 2c20219..73680bb 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -95,9 +95,9 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { btnQuit.setOnClickListener(this); TextView mainGrade = (TextView) findViewById(R.id.main_grade); if (Constant.LEVEL != 0) { - mainGrade.setText("LV."+Constant.LEVEL); + mainGrade.setText("LV." + Constant.LEVEL); } - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { initNetWork(); } } @@ -179,15 +179,15 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { intentWithdraw.putExtra("tag", 15); startActivity(intentWithdraw); break; -// Intent intentMap = new Intent(getActivity(), FragmentManagement.class); -// intentMap.putExtra("tag", 19); -// startActivity(intentMap); -// Intent intentIssue = new Intent(getActivity(), FragmentManagement.class); -// intentIssue.putExtra("tag", 20); -// startActivity(intentIssue); -// Intent intentSet = new Intent(getActivity(), FragmentManagement.class); -// intentSet.putExtra("tag", 22); -// startActivity(intentSet); + /*Intent intentMap = new Intent(getActivity(), FragmentManagement.class); + intentMap.putExtra("tag", 19); + startActivity(intentMap); + Intent intentIssue = new Intent(getActivity(), FragmentManagement.class); + intentIssue.putExtra("tag", 20); + startActivity(intentIssue); + Intent intentSet = new Intent(getActivity(), FragmentManagement.class); + intentSet.putExtra("tag", 22); + startActivity(intentSet);*/ case R.id.rl_contact://联系我们 Intent intentContact = new Intent(getActivity(), FragmentManagement.class); intentContact.putExtra("tag", 21); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 30be236..92254d5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -181,11 +181,8 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis break; } } - @Override - public void onNothingSelected(AdapterView parent) { - - } + public void onNothingSelected(AdapterView parent) {} }); checkPot = findViewById(R.id.check_pot); checkPot.setOnClickListener(new View.OnClickListener() { @@ -206,7 +203,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis checkPot.setTextColor(Color.WHITE); checkPot.setChecked(true); } - @Override public void onCancel() { BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bag); @@ -266,10 +262,8 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis break; } } - @Override - public void onNothingSelected(AdapterView parent) { - } + public void onNothingSelected(AdapterView parent) {} }); //数据展示 initShowPoi(); @@ -383,7 +377,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis linearExist.setVisibility(View.VISIBLE); spinnerExist.setSelection(showPoiEntity.getExistence(), true); } - String describe = showPoiEntity.getMemo();//任务描述 if (describe != null && !describe.equals("")) { editOtherDescribe.setText(describe); @@ -474,7 +467,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } } else { Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show(); - } break; } @@ -506,7 +498,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis otherSaveByNetWork(poiEntity, isLocal); } }); - } }).start(); // onBackPressed(); @@ -514,7 +505,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); } } - @Override public void onDenied(List permissions, boolean never) { if (never) { @@ -532,7 +522,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Log.e("TAG", "poiUploadByNetWork: " + body + otherUploadList); return; } - HttpParams httpParams = new HttpParams(); httpParams.put("auditId", body); OkGoBuilder.getInstance() @@ -546,7 +535,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Objects.requireNonNull(getActivity()).onBackPressed();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候..."); WaitDialog.dismiss(3000); - } private void otherSaveByNetWork(PoiEntity poiEntity, boolean isLocal) { @@ -598,13 +586,11 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis }).start(); } else { Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } } else { Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } } - @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 3a015d8..554b997 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -485,6 +485,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (showPoiEntity.getTaskStatus() == 3) { disables(); } + if (editNameContent.getText().toString() != null || editNameContent != null) { editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override @@ -497,6 +498,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } else { Toast.makeText(getActivity(), "请输入名称", Toast.LENGTH_SHORT).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 6de129f..d9cec9f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -1,5 +1,6 @@ package com.navinfo.outdoor.fragment; +import android.annotation.SuppressLint; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; @@ -138,7 +139,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick moveLatlng(latLng, null); } - @Override protected void initView() { super.initView(); @@ -627,7 +627,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (!roadName.equals("")) { poiEntity.setName(roadName); } else { - + @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss"); Calendar calendars = Calendar.getInstance(); calendars.setTimeInMillis(System.currentTimeMillis()); @@ -656,6 +656,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (!desc.equals("")) { poiEntity.setMemo(desc); } + @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(System.currentTimeMillis()); 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 58c5ae5..6e8366c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -479,7 +479,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; EventBus.getDefault().post(obtain); - onBackPressed(); + getActivity().onBackPressed(); } } }); 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 e54354e..fbc8146 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -324,27 +324,30 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } PoiDatabase roadDatabase = PoiDatabase.getInstance(getContext()); PoiDao roadDao = roadDatabase.getPoiDao(); - new Thread(new Runnable() { - @Override - public void run() { - List roadAll = roadDao.getAllPoiByRecoded(); - Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { - @Override - public void run() { - roadEntities.clear(); - roadEntities.addAll(roadAll); + if (roadDao!=null){ + new Thread(new Runnable() { + @Override + public void run() { + List roadAll = roadDao.getAllPoiByRecoded(); + Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { + @Override + public void run() { + roadEntities.clear(); + roadEntities.addAll(roadAll); // for (int i = 0; i < roadAll.size(); i++) { // if (roadAll.get(i).getType()!=6){ // roadEntities.add(roadAll.get(i)); // } // } - Log.d("TAG", "run: " + roadEntities.toString()); - staySubmitAdapter.setAllRoad(roadEntities); - staySubmitAdapter.notifyDataSetChanged(); - } - }); - } - }).start(); + Log.d("TAG", "run: " + roadEntities.toString()); + staySubmitAdapter.setAllRoad(roadEntities); + staySubmitAdapter.notifyDataSetChanged(); + } + }); + } + }).start(); + + } } @Override diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7688e84..5aff232 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 地图寻宝3.1 + 地图寻宝3 HomeActivity First Fragment