From 3f3a2222d5281d26fc2db254d15f7700c2e75f37 Mon Sep 17 00:00:00 2001 From: zhongjh <20249019> Date: Tue, 2 Jul 2024 17:05:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0exported=E5=92=8Ctas?= =?UTF-8?q?kAffinity,=E5=BA=94=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- imageedit/src/main/AndroidManifest.xml | 2 ++ multilibrary/src/main/AndroidManifest.xml | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/imageedit/src/main/AndroidManifest.xml b/imageedit/src/main/AndroidManifest.xml index a38398d2..43ad504d 100644 --- a/imageedit/src/main/AndroidManifest.xml +++ b/imageedit/src/main/AndroidManifest.xml @@ -6,8 +6,10 @@ diff --git a/multilibrary/src/main/AndroidManifest.xml b/multilibrary/src/main/AndroidManifest.xml index d6c550c9..84a7f119 100644 --- a/multilibrary/src/main/AndroidManifest.xml +++ b/multilibrary/src/main/AndroidManifest.xml @@ -16,24 +16,32 @@ + android:taskAffinity="" /> + android:taskAffinity="" /> + android:taskAffinity="" /> + android:taskAffinity="" /> From 8dce9861ffa3ca67cd3a40dfe76e5c6762511e95 Mon Sep 17 00:00:00 2001 From: zhongjh <20249019> Date: Tue, 2 Jul 2024 17:20:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=201.1.99X=E5=B0=81=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- README_CN.md | 14 +++++++------- README_EN.md | 14 +++++++------- testmaven/build.gradle | 12 ++++++------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index bdbe2cd2..21d89ad6 100644 --- a/README.md +++ b/README.md @@ -55,21 +55,21 @@ A non-X library version, no longer maintained(https://github.com/zhongjhATC/Albu dependencies { // if you want to simplify the code and at the same time use multilibrary and progresslibrary, albumCameraRecorderCommon, can directly use the combined library - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.99X' // Public library, if not using the combined library above - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' // core lib, call display album, screen recording, recording, etc - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' // It is mainly used to display the relevant upload progress after obtaining data. If you only need to obtain photos, videos and recordings, you don't need to use this - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' // use it with editing pictures - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' // Supporting editing video use, currently only compression function, continue to add related functions, because the library uses ffmpeg, occupies a file size of 25M, according to the actual situation to choose whether to use - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' // Because the library uses mp4parser, which takes up a file size of about 300kb, choose whether to use it according to the actual situation - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' } ## snapshoot diff --git a/README_CN.md b/README_CN.md index cf162317..9702d410 100644 --- a/README_CN.md +++ b/README_CN.md @@ -58,21 +58,21 @@ dependencies { // 如果想简化代码并且同时用到multilibrary和progresslibrary、albumCameraRecorderCommon,可以直接使用combined库 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.99X' // 公共库，如果不使用上面的combined库 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' // 核心lib，调用显示相册、录屏、录音等 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' // 配套使用，主要用于获取数据后进行相关显示，相应的上传进度显示，如果你只需要获取照片录像录音等数据，可以不需要使用这个 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' // 配套编辑图片使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' // 配套编辑视频使用,目前只有压缩功能,后续持续添加相关功能,因为该库使用了ffmpeg,占用了文件大小25M,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' // 配套合并视频使用,因为该库使用了mp4parser,占用了文件大小约300kb,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' } diff --git a/README_EN.md b/README_EN.md index 29fa5e31..2fbb9082 100644 --- a/README_EN.md +++ b/README_EN.md @@ -55,21 +55,21 @@ A non-X library version, no longer maintained(https://github.com/zhongjhATC/Albu dependencies { // if you want to simplify the code and at the same time use multilibrary and progresslibrary, albumCameraRecorderCommon, can directly use the combined library - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.99X' // Public library, if not using the combined library above - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' // core lib, call display album, screen recording, recording, etc - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' // It is mainly used to display the relevant upload progress after obtaining data. If you only need to obtain photos, videos and recordings, you don't need to use this - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' // use it with editing pictures - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' // Supporting editing video use, currently only compression function, continue to add related functions, because the library uses ffmpeg, occupies a file size of 25M, according to the actual situation to choose whether to use - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' // Because the library uses mp4parser, which takes up a file size of about 300kb, choose whether to use it according to the actual situation - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' } #### Step 3. gradle file to add configuration diff --git a/testmaven/build.gradle b/testmaven/build.gradle index 7df5e57c..285efdd5 100644 --- a/testmaven/build.gradle +++ b/testmaven/build.gradle @@ -43,16 +43,16 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // 公共库，如果不使用上面的combined库 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' // 核心lib，调用显示相册、录屏、录音等 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' // 配套使用，主要用于获取数据后进行相关显示，相应的上传进度显示，如果你只需要获取照片录像录音等数据，可以不需要使用这个 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' // 配套编辑图片使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' // 配套编辑视频使用,目前只有压缩功能,后续持续添加相关功能,因为该库使用了ffmpeg,占用了文件大小25M,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' // 配套合并视频使用,因为该库使用了mp4parser,占用了文件大小约300kb,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.98X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' } \ No newline at end of file From 50170b5a3a164e45c6ab3adc4405f95e7fcf6010 Mon Sep 17 00:00:00 2001 From: zhongjh <20249019> Date: Thu, 25 Jul 2024 09:01:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=20=E9=92=88=E5=AF=B9Android9=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=9C=BA=E5=9E=8B=E5=A4=84=E7=90=86=E5=BD=95?= =?UTF-8?q?=E5=88=B6=E8=A7=86=E9=A2=91=E5=90=8E=E9=97=AA=E9=80=80=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=20=E9=92=88=E5=AF=B9Android9=E7=9A=84?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhongjh/albumcamerarecorder/MainActivity.java | 4 +++- .../camera/ui/camera/presenter/BaseCameraVideoPresenter.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/MainActivity.java b/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/MainActivity.java index c525cbcd..59f7fde6 100644 --- a/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/MainActivity.java +++ b/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/MainActivity.java @@ -420,8 +420,10 @@ protected ArrayList getNeedPermissions() { } } } else { - if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED && + ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { permissions.add(Manifest.permission.READ_EXTERNAL_STORAGE); + permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE); } } } diff --git a/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/camera/ui/camera/presenter/BaseCameraVideoPresenter.java b/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/camera/ui/camera/presenter/BaseCameraVideoPresenter.java index c59e0818..32b45094 100644 --- a/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/camera/ui/camera/presenter/BaseCameraVideoPresenter.java +++ b/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/camera/ui/camera/presenter/BaseCameraVideoPresenter.java @@ -316,7 +316,7 @@ private long getMediaDuration(String filePath) { if (metaData != null) { duration = Long.parseLong(metaData); } - retriever.close(); + retriever.release(); return duration; } catch (Exception exception) { exception.printStackTrace(); From 399eebfd77070a1ffa430fa3c47f7570f4b88c4c Mon Sep 17 00:00:00 2001 From: zhongjh <20249019> Date: Thu, 25 Jul 2024 09:06:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=201.1.100X=E5=B0=81=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- README_CN.md | 14 +++++++------- README_EN.md | 14 +++++++------- testmaven/build.gradle | 12 ++++++------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 21d89ad6..92a93d4f 100644 --- a/README.md +++ b/README.md @@ -55,21 +55,21 @@ A non-X library version, no longer maintained(https://github.com/zhongjhATC/Albu dependencies { // if you want to simplify the code and at the same time use multilibrary and progresslibrary, albumCameraRecorderCommon, can directly use the combined library - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.100X' // Public library, if not using the combined library above - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.100X' // core lib, call display album, screen recording, recording, etc - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.100X' // It is mainly used to display the relevant upload progress after obtaining data. If you only need to obtain photos, videos and recordings, you don't need to use this - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.100X' // use it with editing pictures - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.100X' // Supporting editing video use, currently only compression function, continue to add related functions, because the library uses ffmpeg, occupies a file size of 25M, according to the actual situation to choose whether to use - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.100X' // Because the library uses mp4parser, which takes up a file size of about 300kb, choose whether to use it according to the actual situation - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.100X' } ## snapshoot diff --git a/README_CN.md b/README_CN.md index 9702d410..0edfcabd 100644 --- a/README_CN.md +++ b/README_CN.md @@ -58,21 +58,21 @@ dependencies { // 如果想简化代码并且同时用到multilibrary和progresslibrary、albumCameraRecorderCommon,可以直接使用combined库 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.100X' // 公共库，如果不使用上面的combined库 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.100X' // 核心lib，调用显示相册、录屏、录音等 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.100X' // 配套使用，主要用于获取数据后进行相关显示，相应的上传进度显示，如果你只需要获取照片录像录音等数据，可以不需要使用这个 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.100X' // 配套编辑图片使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.100X' // 配套编辑视频使用,目前只有压缩功能,后续持续添加相关功能,因为该库使用了ffmpeg,占用了文件大小25M,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.100X' // 配套合并视频使用,因为该库使用了mp4parser,占用了文件大小约300kb,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.100X' } diff --git a/README_EN.md b/README_EN.md index 2fbb9082..b4063ca2 100644 --- a/README_EN.md +++ b/README_EN.md @@ -55,21 +55,21 @@ A non-X library version, no longer maintained(https://github.com/zhongjhATC/Albu dependencies { // if you want to simplify the code and at the same time use multilibrary and progresslibrary, albumCameraRecorderCommon, can directly use the combined library - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:combined:1.1.100X' // Public library, if not using the combined library above - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.100X' // core lib, call display album, screen recording, recording, etc - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.100X' // It is mainly used to display the relevant upload progress after obtaining data. If you only need to obtain photos, videos and recordings, you don't need to use this - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.100X' // use it with editing pictures - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.100X' // Supporting editing video use, currently only compression function, continue to add related functions, because the library uses ffmpeg, occupies a file size of 25M, according to the actual situation to choose whether to use - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.100X' // Because the library uses mp4parser, which takes up a file size of about 300kb, choose whether to use it according to the actual situation - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.100X' } #### Step 3. gradle file to add configuration diff --git a/testmaven/build.gradle b/testmaven/build.gradle index 285efdd5..87071b92 100644 --- a/testmaven/build.gradle +++ b/testmaven/build.gradle @@ -43,16 +43,16 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // 公共库，如果不使用上面的combined库 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:common:1.1.100X' // 核心lib，调用显示相册、录屏、录音等 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:multilibrary:1.1.100X' // 配套使用，主要用于获取数据后进行相关显示，相应的上传进度显示，如果你只需要获取照片录像录音等数据，可以不需要使用这个 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:progresslibrary:1.1.100X' // 配套编辑图片使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:imageedit:1.1.100X' // 配套编辑视频使用,目前只有压缩功能,后续持续添加相关功能,因为该库使用了ffmpeg,占用了文件大小25M,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videoedit:1.1.100X' // 配套合并视频使用,因为该库使用了mp4parser,占用了文件大小约300kb,根据实际情况选择是否使用 - implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.99X' + implementation 'com.github.zhongjhATC.AlbumCameraRecorder:videomerge:1.1.100X' } \ No newline at end of file