feat: 更新部分 DevComponent Engine Media 代码

Former-commit-id: aaa07e1 Former-commit-id: b4caa37
afkT · May 20, 2022 · 4264cd5 · 4264cd5
1 parent 3f50c6a
commit 4264cd5
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 90 deletions.
diff --git a/...n/java/afkt/project/feature/other_function/dev_function/ActivityResultCallbackActivity.kt b/...n/java/afkt/project/feature/other_function/dev_function/ActivityResultCallbackActivity.kt
@@ -40,10 +40,10 @@ class ActivityResultCallbackActivity : BaseActivity<ActivityActivityResultCallba
                 override fun onActivityResult(
                     result: Boolean,
                     resultCode: Int,
-                    data: Intent?
+                    intent: Intent?
                 ) {
-                    if (result && data != null) {
-                        val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(data, true)
+                    if (result && intent != null) {
+                        val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(intent, true)
                         // 提示
                         ToastTintUtils.success("选择了图片: $imgPath")
                     } else {

diff --git a/...c/main/java/afkt/project/feature/other_function/floating/FloatingWindowManagerActivity.kt b/...c/main/java/afkt/project/feature/other_function/floating/FloatingWindowManagerActivity.kt
@@ -58,9 +58,9 @@ class FloatingWindowManagerActivity : BaseActivity<BaseViewRecyclerviewBinding>(
     override fun onActivityResult(
         requestCode: Int,
         resultCode: Int,
-        data: Intent?
+        intent: Intent?
     ) {
-        super.onActivityResult(requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, intent)
 
         if (FloatingWindowManagerAssist.isOverlayRequestCode(requestCode)) {
             checkOverlayPermission()

diff --git a/...tion/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/gpu/GPUFilterACVActivity.kt b/...tion/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/gpu/GPUFilterACVActivity.kt
@@ -109,13 +109,13 @@ class GPUFilterACVActivity : BaseActivity<ActivityGpuFilterBinding>() {
     override fun onActivityResult(
         requestCode: Int,
         resultCode: Int,
-        data: Intent?
+        intent: Intent?
     ) {
-        super.onActivityResult(requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, intent)
         // 判断是否属于图片选择
-        if (resultCode == RESULT_OK && data != null) {
+        if (resultCode == RESULT_OK && intent != null) {
             // 获取图片地址
-            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(data, true)
+            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(intent, true)
             // 获取图片 Bitmap
             selectBitmap = if (UriUtils.isUri(imgPath)) {
                 ImageUtils.decodeStream(

diff --git a/...ication/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/gpu/GPUFilterActivity.kt b/...ication/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/gpu/GPUFilterActivity.kt
@@ -97,13 +97,13 @@ class GPUFilterActivity : BaseActivity<ActivityGpuFilterBinding>() {
     override fun onActivityResult(
         requestCode: Int,
         resultCode: Int,
-        data: Intent?
+        intent: Intent?
     ) {
-        super.onActivityResult(requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, intent)
         // 判断是否属于图片选择
-        if (resultCode == RESULT_OK && data != null) {
+        if (resultCode == RESULT_OK && intent != null) {
             // 获取图片地址
-            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(data, true)
+            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(intent, true)
             // 获取图片 Bitmap
             selectBitmap = if (UriUtils.isUri(imgPath)) {
                 ImageUtils.decodeStream(

diff --git a/...n/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/qrcode/QRCodeCreateActivity.kt b/...n/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/qrcode/QRCodeCreateActivity.kt
@@ -83,13 +83,13 @@ class QRCodeCreateActivity : BaseActivity<ActivityQrcodeCreateBinding>() {
     override fun onActivityResult(
         requestCode: Int,
         resultCode: Int,
-        data: Intent?
+        intent: Intent?
     ) {
-        super.onActivityResult(requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, intent)
         // 判断是否属于图片选择
-        if (resultCode == RESULT_OK && data != null) {
+        if (resultCode == RESULT_OK && intent != null) {
             // 获取图片地址
-            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(data, true)
+            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(intent, true)
             // 获取图片 Bitmap
             selectBitmap = if (UriUtils.isUri(imgPath)) {
                 ImageUtils.decodeStream(

diff --git a/...on/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/qrcode/QRCodeImageActivity.kt b/...on/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/qrcode/QRCodeImageActivity.kt
@@ -74,14 +74,14 @@ class QRCodeImageActivity : BaseActivity<ActivityQrcodeImageBinding>() {
     override fun onActivityResult(
         requestCode: Int,
         resultCode: Int,
-        data: Intent?
+        intent: Intent?
     ) {
-        super.onActivityResult(requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, intent)
         // 判断是否属于图片选择
-        if (resultCode == RESULT_OK && data != null) {
+        if (resultCode == RESULT_OK && intent != null) {
             MainScope().launch {
                 // 获取图片地址
-                val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(data, true)
+                val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(intent, true)
 
                 val source = if (UriUtils.isUri(imgPath)) {
                     DevSource.create(UriUtils.getUriForString(imgPath))

diff --git a/...ion/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/qrcode/QRCodeScanActivity.kt b/...ion/DevUtilsApp/src/main/java/afkt/project/feature/ui_effect/qrcode/QRCodeScanActivity.kt
@@ -146,13 +146,13 @@ class QRCodeScanActivity : BaseActivity<ActivityScanShapeBinding>() {
     override fun onActivityResult(
         requestCode: Int,
         resultCode: Int,
-        data: Intent?
+        intent: Intent?
     ) {
-        super.onActivityResult(requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, intent)
         // 判断是否属于图片选择
-        if (resultCode == RESULT_OK && data != null) {
+        if (resultCode == RESULT_OK && intent != null) {
             // 获取图片地址
-            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(data, true)
+            val imgPath = DevEngine.getMedia()?.getSingleSelectorPath(intent, true)
             // 获取图片 Bitmap
             val selectBitmap = if (UriUtils.isUri(imgPath)) {
                 ImageUtils.decodeStream(

diff --git a/lib/DevApp/src/main/java/dev/utils/app/ActivityUtils.java b/lib/DevApp/src/main/java/dev/utils/app/ActivityUtils.java
@@ -652,12 +652,12 @@ public interface ResultCallback {
          * 回传处理
          * @param result     resultCode 是否等于 {@link Activity#RESULT_OK}
          * @param resultCode resultCode
-         * @param data       回传数据
+         * @param intent     回传数据
          */
         void onActivityResult(
                 boolean result,
                 int resultCode,
-                Intent data
+                Intent intent
         );
     }
 
@@ -729,13 +729,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         protected void onActivityResult(
                 int requestCode,
                 int resultCode,
-                Intent data
+                Intent intent
         ) {
-            super.onActivityResult(requestCode, resultCode, data);
+            super.onActivityResult(requestCode, resultCode, intent);
             if (mCallback != null) {
                 mCallback.onActivityResult(
                         resultCode == Activity.RESULT_OK,
-                        resultCode, data
+                        resultCode, intent
                 );
             }
             finish();

diff --git a/lib/DevApp/src/main/java/dev/utils/app/PhoneUtils.java b/lib/DevApp/src/main/java/dev/utils/app/PhoneUtils.java
@@ -632,10 +632,10 @@ public static boolean sendSmsSilent(
     /**
      * 打开手机联系人界面点击联系人后便获取该号码
      * <pre>
-     *     protected void onActivityResult (int requestCode, int resultCode, Intent data) {
-     *          super.onActivityResult(requestCode, resultCode, data);
-     *          if (data != null) {
-     *              Uri uri = data.getData();
+     *     protected void onActivityResult (int requestCode, int resultCode, Intent intent) {
+     *          super.onActivityResult(requestCode, resultCode, intent);
+     *          if (intent != null) {
+     *              Uri uri = intent.getData();
      *              String num = null;
      *              // 创建内容解析者
      *              ContentResolver resolver = getContentResolver();

diff --git a/lib/DevAssist/src/main/java/dev/engine/media/IMediaEngine.java b/lib/DevAssist/src/main/java/dev/engine/media/IMediaEngine.java
@@ -192,37 +192,37 @@ boolean isMediaSelectorResult(
 
     /**
      * 获取 Media Selector Data List
-     * @param data onActivityResult Intent data
+     * @param intent onActivityResult Intent data
      * @return Media Selector Data List
      */
-    List<Data> getSelectors(Intent data);
+    List<Data> getSelectors(Intent intent);
 
     /**
      * 获取 Media Selector Path List
-     * @param data     onActivityResult Intent data
+     * @param intent   onActivityResult Intent data
      * @param original 是否使用原图地址
      * @return Media Selector Path List
      */
     List<String> getSelectorPaths(
-            Intent data,
+            Intent intent,
             boolean original
     );
 
     /**
      * 获取 Single Media Selector Data
-     * @param data onActivityResult Intent data
+     * @param intent onActivityResult Intent data
      * @return Single Media Selector Data
      */
-    Data getSingleSelector(Intent data);
+    Data getSingleSelector(Intent intent);
 
     /**
      * 获取 Single Media Selector Path
-     * @param data     onActivityResult Intent data
+     * @param intent   onActivityResult Intent data
      * @param original 是否使用原图地址
      * @return Single Media Selector Path
      */
     String getSingleSelectorPath(
-            Intent data,
+            Intent intent,
             boolean original
     );
 }
diff --git a/lib/DevAssist/src/main/java/dev/engine/share/IShareEngine.java b/lib/DevAssist/src/main/java/dev/engine/share/IShareEngine.java
@@ -196,12 +196,12 @@ boolean share(
      * @param context     {@link Context}
      * @param requestCode 请求 code
      * @param resultCode  resultCode
-     * @param data        {@link Intent}
+     * @param intent      {@link Intent}
      */
     void onActivityResult(
             Context context,
             int requestCode,
             int resultCode,
-            Intent data
+            Intent intent
     );
 }
diff --git a/lib/DevEngine/src/main/java/dev/engine/media/engine_picture_selector.kt b/lib/DevEngine/src/main/java/dev/engine/media/engine_picture_selector.kt
@@ -362,9 +362,9 @@ class PictureSelectorEngineImpl : IMediaEngine<MediaConfig, LocalMediaData> {
 
     // =
 
-    override fun getSelectors(data: Intent?): MutableList<LocalMediaData> {
+    override fun getSelectors(intent: Intent?): MutableList<LocalMediaData> {
         val lists: MutableList<LocalMediaData> = ArrayList()
-        val result = PictureSelector.obtainMultipleResult(data)
+        val result = PictureSelector.obtainMultipleResult(intent)
         result.forEach {
             it?.let { localMedia ->
                 lists.add(LocalMediaData(localMedia))
@@ -374,11 +374,11 @@ class PictureSelectorEngineImpl : IMediaEngine<MediaConfig, LocalMediaData> {
     }
 
     override fun getSelectorPaths(
-        data: Intent?,
+        intent: Intent?,
         original: Boolean
     ): MutableList<String> {
         val lists: MutableList<String> = ArrayList()
-        val result = getSelectors(data)
+        val result = getSelectors(intent)
         result.forEach { media ->
             media.getLocalMediaPath(original)?.apply {
                 lists.add(this)
@@ -387,16 +387,16 @@ class PictureSelectorEngineImpl : IMediaEngine<MediaConfig, LocalMediaData> {
         return lists
     }
 
-    override fun getSingleSelector(data: Intent?): LocalMediaData? {
-        val lists = getSelectors(data)
+    override fun getSingleSelector(intent: Intent?): LocalMediaData? {
+        val lists = getSelectors(intent)
         return if (lists.size > 0) lists[0] else null
     }
 
     override fun getSingleSelectorPath(
-        data: Intent?,
+        intent: Intent?,
         original: Boolean
     ): String? {
-        val lists = getSelectorPaths(data, original)
+        val lists = getSelectorPaths(intent, original)
         return if (lists.size > 0) lists[0] else null
     }
 

diff --git a/lib/DevOther/src/main/java/java/dev/engine/media/PictureSelectorEngineImpl.java b/lib/DevOther/src/main/java/java/dev/engine/media/PictureSelectorEngineImpl.java
@@ -192,8 +192,8 @@ public boolean isMediaSelectorResult(
     // =
 
     @Override
-    public List<LocalMediaData> getSelectors(Intent data) {
-        List<LocalMedia>     result = PictureSelector.obtainMultipleResult(data);
+    public List<LocalMediaData> getSelectors(Intent intent) {
+        List<LocalMedia>     result = PictureSelector.obtainMultipleResult(intent);
         List<LocalMediaData> lists  = new ArrayList<>();
         if (result != null) {
             for (LocalMedia localMedia : result) {
@@ -207,10 +207,10 @@ public List<LocalMediaData> getSelectors(Intent data) {
 
     @Override
     public List<String> getSelectorPaths(
-            Intent data,
+            Intent intent,
             boolean original
     ) {
-        List<LocalMediaData> result = getSelectors(data);
+        List<LocalMediaData> result = getSelectors(intent);
         List<String>         lists  = new ArrayList<>();
         if (result != null) {
             for (LocalMediaData media : result) {
@@ -224,18 +224,18 @@ public List<String> getSelectorPaths(
     }
 
     @Override
-    public LocalMediaData getSingleSelector(Intent data) {
-        List<LocalMediaData> lists = getSelectors(data);
+    public LocalMediaData getSingleSelector(Intent intent) {
+        List<LocalMediaData> lists = getSelectors(intent);
         if (lists != null && lists.size() > 0) return lists.get(0);
         return null;
     }
 
     @Override
     public String getSingleSelectorPath(
-            Intent data,
+            Intent intent,
             boolean original
     ) {
-        List<String> lists = getSelectorPaths(data, original);
+        List<String> lists = getSelectorPaths(intent, original);
         if (lists != null && lists.size() > 0) return lists.get(0);
         return null;
     }

diff --git a/lib/DevOther/src/main/java/java/dev/other/PictureSelectorUtils.java b/lib/DevOther/src/main/java/java/dev/other/PictureSelectorUtils.java
@@ -162,30 +162,30 @@ public static boolean isMediaSelectorResult(
      *     3.media.getCompressPath() 为压缩后 path 需判断 media.isCompressed() 是否为 true  注意: 音视频除外
      *     如果裁剪并压缩了, 以取压缩路径为准, 因为是先裁剪后压缩的
      * </pre>
-     * @param data {@link Intent}
+     * @param intent {@link Intent}
      * @return {@link List<LocalMedia>}
      */
-    public static List<LocalMedia> getLocalMedias(final Intent data) {
-        return (data != null) ? PictureSelector.obtainMultipleResult(data) : null;
+    public static List<LocalMedia> getLocalMedias(final Intent intent) {
+        return (intent != null) ? PictureSelector.obtainMultipleResult(intent) : null;
     }
 
     /**
      * 获取单独选中的资源
-     * @param data {@link Intent}
+     * @param intent {@link Intent}
      * @return {@link LocalMedia}
      */
-    public static LocalMedia getSingleMedia(final Intent data) {
-        List<LocalMedia> result = getLocalMedias(data);
+    public static LocalMedia getSingleMedia(final Intent intent) {
+        List<LocalMedia> result = getLocalMedias(intent);
         return (result.size() != 0) ? result.get(0) : null;
     }
 
     /**
      * 获取本地资源路径
-     * @param data {@link Intent}
+     * @param intent {@link Intent}
      * @return 本地资源路径
      */
-    public static String getLocalMediaPath(final Intent data) {
-        return getLocalMediaPath(getSingleMedia(data), false);
+    public static String getLocalMediaPath(final Intent intent) {
+        return getLocalMediaPath(getSingleMedia(intent), false);
     }
 
     /**
@@ -228,25 +228,25 @@ public static String getLocalMediaPath(
 
     /**
      * 获取本地资源地址集合
-     * @param data {@link Intent}
+     * @param intent {@link Intent}
      * @return {@link List}
      */
-    public static List<String> getLocalMediaPaths(final Intent data) {
-        return getLocalMediaPaths(data, false);
+    public static List<String> getLocalMediaPaths(final Intent intent) {
+        return getLocalMediaPaths(intent, false);
     }
 
     /**
      * 获取本地资源地址集合
-     * @param data     {@link Intent}
+     * @param intent   {@link Intent}
      * @param original 是否使用原图地址
      * @return {@link List}
      */
     public static List<String> getLocalMediaPaths(
-            final Intent data,
+            final Intent intent,
             final boolean original
     ) {
         List<String>     lists  = new ArrayList<>();
-        List<LocalMedia> result = getLocalMedias(data);
+        List<LocalMedia> result = getLocalMedias(intent);
         if (result != null) {
             for (LocalMedia localMedia : result) {
                 String path = getLocalMediaPath(localMedia, original);