From 6f196154d849b534a5cc44f9fb99772f1d113682 Mon Sep 17 00:00:00 2001
From: wangdongsheng <wds811@126.com>
Date: Wed, 29 Sep 2021 18:35:28 +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
---
.../java/com/navinfo/outdoor/activity/MainActivity.java | 6 +++---
.../com/navinfo/outdoor/activity/PicturesActivity.java | 3 +--
app/src/main/java/com/navinfo/outdoor/api/Constant.java | 2 +-
.../java/com/navinfo/outdoor/fragment/IssueFragment.java | 7 +++----
.../java/com/navinfo/outdoor/fragment/OtherFragment.java | 3 ++-
.../java/com/navinfo/outdoor/fragment/PoiFragment.java | 4 ++--
.../main/java/com/navinfo/outdoor/util/PhotoPathUtil.java | 8 +++-----
7 files changed, 15 insertions(+), 18 deletions(-)
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 beecaff..48d7a36 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java
@@ -108,7 +108,7 @@ public class MainActivity extends BaseActivity {
// 申请多个权限
//.permission(Permission.Group.CALENDAR)
// 申请读写外部存储卡
- .permission(Permission.MANAGE_EXTERNAL_STORAGE/*, Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE*/)
+ .permission(Permission.MANAGE_EXTERNAL_STORAGE /*, Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE*/)
// 申请相机权限
.permission(Permission.CAMERA)
.permission(Permission.REQUEST_INSTALL_PACKAGES)
@@ -167,7 +167,7 @@ public class MainActivity extends BaseActivity {
dismissLoadingDialog();
if (response.getCode() == 200) {
int version = response.getBody().getVersion();
- if (versionCode <version) {//TODO 改成<
+ if (versionCode <version) {//TODO 改成
//升级
ApkVersionBean.bodyBean body = response.getBody();
showUpdateDialog(body);
@@ -239,7 +239,7 @@ public class MainActivity extends BaseActivity {
public void onFinish() {
Intent intent = new Intent(MainActivity.this, LoginActivity.class);
startActivity(intent);
- MainActivity.this.finish();
+ finish();
}
}.start();
}
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 e9e3e98..8969f1f 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
@@ -400,6 +400,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
tencentMap.setMyLocationStyle(locationStyle);
}
+
public void benSwitch() {
FrameLayout.LayoutParams layoutParamsMap = (FrameLayout.LayoutParams) ivMap.getLayoutParams();//地图的宽高
int heightMap = ivMap.getMeasuredHeight();
@@ -542,7 +543,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
}
sb.append("\r\n");
FileUtils.writeFile(paperFile.getAbsolutePath(), sb.toString(), true);
-
/*float speed = Constant.currentLocation.getSpeed();//米/秒
if (speed != 0) {
float a = (speed * 3600 / 1000);//km/h
@@ -574,7 +574,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
}
oldCurrentLocation = Constant.currentLocation;
}*/
-
}
@Override
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 71c1a55..59b0bfa 100644
--- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java
+++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java
@@ -199,7 +199,7 @@ public class Constant {
public static TencentMap.OnMarkerClickListener markerClickListener=null;
- public static final String NAVIN_FO="9.28";//版本
+ public static final String NAVIN_FO="9.29";//版本
/*联系我们的QQ群名称和QQ群号
*/
public static String REGION_JIG_NAME = "京津冀晋蒙-地图寻宝群";
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 e3fdcfd..850b527 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java
@@ -48,6 +48,7 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener
fragment.setArguments(bundle);
return fragment;
}
+
@Override
protected int getLayout() {
return R.layout.issue_fragment;
@@ -131,10 +132,8 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener
@Override
public void onClick(View v) {
- switch (v.getId()) {
- case R.id.iv_issue_finish:
- Objects.requireNonNull(getActivity()).finish();
- break;
+ if (v.getId() == R.id.iv_issue_finish) {
+ Objects.requireNonNull(getActivity()).finish();
}
}
}
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 f974174..3ec3ff9 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
@@ -1,5 +1,6 @@
package com.navinfo.outdoor.fragment;
+import android.annotation.SuppressLint;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Color;
@@ -800,7 +801,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
}
poiEntity.setPhotoInfo(arrayList);
poiEntity.setStation_type(station_type);
- DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis());
String format = formatter.format(calendar.getTime());
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 917edd2..d9dc62b 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -1,5 +1,6 @@
package com.navinfo.outdoor.fragment;
+import android.annotation.SuppressLint;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Color;
@@ -111,7 +112,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
private Marker markerPoi;
private Point screenPoiPositions;
-
public static PoiFragment newInstance(Bundle bundle) {
PoiFragment fragment = new PoiFragment();
fragment.setArguments(bundle);
@@ -1118,7 +1118,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
infoPhoto.add(new Info(tagCard));
}
poiEntity.setPhotoInfo(infoPhoto);
- DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis());
String format = formatter.format(calendar.getTime());
diff --git a/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java b/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java
index 1fd589c..8f309f8 100644
--- a/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java
+++ b/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java
@@ -22,10 +22,8 @@ import java.util.Date;
public class PhotoPathUtil {
/**
*
- * @param data
* @param d 类型
* @param chord 经纬度加密
- * @return
*/
public static String getTakePhotoPath(Intent data,String d,String chord) {
Bitmap photo = null;
@@ -56,10 +54,10 @@ public class PhotoPathUtil {
angle=90;
}
File file = new File(Constant.PICTURE_FOLDER+d+time+"_p"+chord+"_a"+angle+".jpg");
- /***打开文件输出流*/
+ /*打开文件输出流*/
fileOutputStream = new FileOutputStream(file);
// 生成图片文件
- /**
+ /*
* 对应Bitmap的compress(Bitmap.CompressFormat format, int quality, OutputStream stream)方法中第一个参数。
* CompressFormat类是个枚举，有三个取值：JPEG、PNG和WEBP。其中，
* PNG是无损格式（忽略质量设置），会导致方法中的第二个参数压缩质量失效，
@@ -67,7 +65,7 @@ public class PhotoPathUtil {
* 而WEBP格式是Google新推出的，据官方资料称“在质量相同的情况下，WEBP格式图像的体积要比JPEG格式图像小40%。
*/
photo.compress(Bitmap.CompressFormat.PNG, 100, fileOutputStream);
- /***相片的完整路径*/
+ /*相片的完整路径*/
return file.getPath();
} catch (Exception e) {
e.printStackTrace();