From 445aa1ce30b89adc223e38774adab1264fc4172b Mon Sep 17 00:00:00 2001 From: md Date: Thu, 5 Aug 2021 15:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9poiVideo=E5=92=8C=E9=81=93?= =?UTF-8?q?=E8=B7=AF=E5=BD=95=E5=83=8F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/PictureActivity.java | 29 +++++++++++-------- .../navinfo/outdoor/api/UserApplication.java | 6 ++-- .../outdoor/fragment/PoiVideoFragment.java | 27 ++++++++++++----- .../outdoor/fragment/RoadFragment.java | 28 ++++++++++++------ 5 files changed, 59 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2d2d3d9..43917f5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ 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" diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java index 04154ff..18451be 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -397,21 +397,26 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene // String formatVideoName = formatter.format(calendar.getTime()); //文件 // String path = finalVideoPath.substring(finalVideoPath.length()-20); - File file = new File(finalVideoPath); - if (file.exists()) { - try { - FileOutputStream fo = new FileOutputStream(file); - FileDescriptor fileDescriptor = fo.getFD(); - camera.takeVideo(fileDescriptor); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); + if (finalVideoPath!=null){ + File file = new File(finalVideoPath); + if (file.exists()) { + try { + FileOutputStream fo = new FileOutputStream(file); + FileDescriptor fileDescriptor = fo.getFD(); + camera.takeVideo(fileDescriptor); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } else { + camera.takeVideo(file); } - } else { - camera.takeVideo(file); + }else { + Toast.makeText(this, "请录像", Toast.LENGTH_SHORT).show(); } + } private void stopTakenVideo() { diff --git a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java index 65b9b62..d420888 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java +++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java @@ -79,11 +79,11 @@ public class UserApplication extends Application { //builder.cookieJar(new CookieJarImpl(new MemoryCookieStore())); //超时时间设置，默认60秒 //全局的读取超时时间 - builder.readTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS); + builder.readTimeout(5000, TimeUnit.MILLISECONDS); //全局的写入超时时间 - builder.writeTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS); + builder.writeTimeout(5000, TimeUnit.MILLISECONDS); //全局的连接超时时间 - builder.connectTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS); + builder.connectTimeout(5000, TimeUnit.MILLISECONDS); OkGo.getInstance().init(this) .setOkHttpClient(builder.build()) //全局统一缓存模式，默认不使用缓存，可以不传 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 653ae37..a94893c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -181,15 +181,26 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - File videoFile = (File) fmPoiVideoPic.getTag(); - if (videoFile != null) { - videoFile.delete(); - //获取文件名 - String csvFileName = videoFile.getName() + ".txt"; - File cavFile = new File(videoFile.getParent(), csvFileName); - cavFile.delete(); - ivPoiVideoPicture.setImageDrawable(null); + List videoFiles = (List) fmPoiVideoPic.getTag(); + if (videoFiles!=null){ + for (int i = 0; i < videoFiles.size(); i++) { + //获取文件名 + String csvFileName = videoFiles.get(i).getName() + ".txt"; + File cavFile = new File(videoFiles.get(i).getParent(), csvFileName); + videoFiles.clear(); + cavFile.delete(); + ivPoiVideoPicture.setImageDrawable(null); + } } +// File videoFile = (File) fmPoiVideoPic.getTag(); +// if (videoFile != null) { +// videoFile.delete(); +// //获取文件名 +// String csvFileName = videoFile.getName() + ".txt"; +// File cavFile = new File(videoFile.getParent(), csvFileName); +// cavFile.delete(); +// ivPoiVideoPicture.setImageDrawable(null); +// } return 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 484fa60..26e4d8c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -181,15 +181,25 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { - File videoFile = (File) fmRoadPic.getTag(); - if (videoFile != null) { - videoFile.delete(); - //获取文件名 - String csvFileName = videoFile.getName() + ".txt"; - File cavFile = new File(videoFile.getParent(), csvFileName); - cavFile.delete(); - ivRoadPicture.setImageDrawable(null); - } + List videoFiles = (List) fmRoadPic.getTag(); + if (videoFiles!=null){ + for (int i = 0; i < videoFiles.size(); i++) { + String csvFileName = videoFiles.get(i).getName() + ".txt"; + File cavFile = new File(videoFiles.get(i).getParent(), csvFileName); + videoFiles.clear(); + cavFile.delete(); + ivRoadPicture.setImageDrawable(null); + } + } +// File videoFile = (File) fmRoadPic.getTag(); +// if (videoFile != null) { +// videoFile.delete(); +// //获取文件名 +// String csvFileName = videoFile.getName() + ".txt"; +// File cavFile = new File(videoFile.getParent(), csvFileName); +// cavFile.delete(); +// ivRoadPicture.setImageDrawable(null); +// } return false; } });