diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar index fd79d8c..ca0daef 100644 Binary files a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar and b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar differ diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.md5 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.md5 index 5fc2a75..998159a 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.md5 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.md5 @@ -1 +1 @@ -2a8fa0fa06d069610eed09005b343994 \ No newline at end of file +5d168b3a13b32030e8635e7ebeeb842e \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha1 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha1 index 3ddd0fe..f911719 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha1 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha1 @@ -1 +1 @@ -34a3a10b015c40e16a76fe75cb974d675a9cbda6 \ No newline at end of file +9adffa480b12d4cf387d65ab45c57f280d4279bb \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha256 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha256 index 17791cf..16b6a4a 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha256 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha256 @@ -1 +1 @@ -eb0a4ee07731a3ef38f606b2978d16169a6f6388e3f33fa3a10c82f3b0c17bb0 \ No newline at end of file +fc1443c43330c3e40a8a2b0a6041419b3c5361a88eb4592d90fec48e622c147c \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha512 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha512 index 004aade..3ac4650 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha512 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7-sources.jar.sha512 @@ -1 +1 @@ -d1a0aa32976653fa04696f6d42edbe8152b59fdaf0135350cdefa14d571212571e85412c8f026a46e43069aadad3603358b63e262635a3716c948dab7b056750 \ No newline at end of file +c57204b220011558736e6372bb2542ab9582cd2c75da10df867746a475fd96b26198bb58b395a5d03d8d5f5174e43ab0b27536926279ea308aa2681ede1b2f7b \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar index 51aeca4..351d70d 100644 Binary files a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar and b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar differ diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.md5 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.md5 index ed5e3de..b3b956a 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.md5 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.md5 @@ -1 +1 @@ -195544eb25003c80879e6390c389f4b5 \ No newline at end of file +1ee8fd344f3bee13dedc2412ea85c8a1 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha1 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha1 index 7b8d373..743667e 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha1 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha1 @@ -1 +1 @@ -d7a3b759fd22ae6bb0cc7710e87c9f01b197afd8 \ No newline at end of file +dd1019d67fe7ab08a9533e3a2d4522c837e2ae60 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha256 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha256 index a7a524d..bec32b6 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha256 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha256 @@ -1 +1 @@ -2731b93ebd3aa8f457aa1dd2ac9634de1fb4641facabbc6683bc2b8575076c28 \ No newline at end of file +f1f8b7a5b49748f3f6b4765508bbae49351a04c756efb7cab1c36996fdc6fc32 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha512 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha512 index d48c18e..dab05c3 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha512 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.aar.sha512 @@ -1 +1 @@ -67d5a21983e722346be407c14a7d0dab5de051789cf7764dfaacd686e770e75a9f8377b49af1e5570e29d6a7ae38fedaec5af4c6b17f631116d665570b92fc5d \ No newline at end of file +e3b3bdf7e99fcffca5ff40b7d2c515e43af1975ec277883d7c3b80388253e632cf644dad984debdc92d3760e0b7c04a5ecce16c62ff9d066ef9b5c7e1f4737c9 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module index e4a6251..216d53f 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module @@ -25,11 +25,11 @@ { "name": "WKIMLib_local-1.0.7.aar", "url": "WKIMLib_local-1.0.7.aar", - "size": 619369, - "sha512": "67d5a21983e722346be407c14a7d0dab5de051789cf7764dfaacd686e770e75a9f8377b49af1e5570e29d6a7ae38fedaec5af4c6b17f631116d665570b92fc5d", - "sha256": "2731b93ebd3aa8f457aa1dd2ac9634de1fb4641facabbc6683bc2b8575076c28", - "sha1": "d7a3b759fd22ae6bb0cc7710e87c9f01b197afd8", - "md5": "195544eb25003c80879e6390c389f4b5" + "size": 619450, + "sha512": "e3b3bdf7e99fcffca5ff40b7d2c515e43af1975ec277883d7c3b80388253e632cf644dad984debdc92d3760e0b7c04a5ecce16c62ff9d066ef9b5c7e1f4737c9", + "sha256": "f1f8b7a5b49748f3f6b4765508bbae49351a04c756efb7cab1c36996fdc6fc32", + "sha1": "dd1019d67fe7ab08a9533e3a2d4522c837e2ae60", + "md5": "1ee8fd344f3bee13dedc2412ea85c8a1" } ] }, @@ -106,11 +106,11 @@ { "name": "WKIMLib_local-1.0.7.aar", "url": "WKIMLib_local-1.0.7.aar", - "size": 619369, - "sha512": "67d5a21983e722346be407c14a7d0dab5de051789cf7764dfaacd686e770e75a9f8377b49af1e5570e29d6a7ae38fedaec5af4c6b17f631116d665570b92fc5d", - "sha256": "2731b93ebd3aa8f457aa1dd2ac9634de1fb4641facabbc6683bc2b8575076c28", - "sha1": "d7a3b759fd22ae6bb0cc7710e87c9f01b197afd8", - "md5": "195544eb25003c80879e6390c389f4b5" + "size": 619450, + "sha512": "e3b3bdf7e99fcffca5ff40b7d2c515e43af1975ec277883d7c3b80388253e632cf644dad984debdc92d3760e0b7c04a5ecce16c62ff9d066ef9b5c7e1f4737c9", + "sha256": "f1f8b7a5b49748f3f6b4765508bbae49351a04c756efb7cab1c36996fdc6fc32", + "sha1": "dd1019d67fe7ab08a9533e3a2d4522c837e2ae60", + "md5": "1ee8fd344f3bee13dedc2412ea85c8a1" } ] }, @@ -128,11 +128,11 @@ { "name": "WKIMLib_local-1.0.7-sources.jar", "url": "WKIMLib_local-1.0.7-sources.jar", - "size": 328517, - "sha512": "d1a0aa32976653fa04696f6d42edbe8152b59fdaf0135350cdefa14d571212571e85412c8f026a46e43069aadad3603358b63e262635a3716c948dab7b056750", - "sha256": "eb0a4ee07731a3ef38f606b2978d16169a6f6388e3f33fa3a10c82f3b0c17bb0", - "sha1": "34a3a10b015c40e16a76fe75cb974d675a9cbda6", - "md5": "2a8fa0fa06d069610eed09005b343994" + "size": 328923, + "sha512": "c57204b220011558736e6372bb2542ab9582cd2c75da10df867746a475fd96b26198bb58b395a5d03d8d5f5174e43ab0b27536926279ea308aa2681ede1b2f7b", + "sha256": "fc1443c43330c3e40a8a2b0a6041419b3c5361a88eb4592d90fec48e622c147c", + "sha1": "9adffa480b12d4cf387d65ab45c57f280d4279bb", + "md5": "5d168b3a13b32030e8635e7ebeeb842e" } ] } diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.md5 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.md5 index e5e50ee..8718a52 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.md5 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.md5 @@ -1 +1 @@ -18f875f433f4b46c3a8f82d2102b4efd \ No newline at end of file +4c79885e3a68e147b7c1224f413bcd43 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha1 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha1 index 7202ad1..ffedb75 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha1 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha1 @@ -1 +1 @@ -5e3e6e61712a9bee911ec2191da0faef05f93430 \ No newline at end of file +3dffd7d2203e1d89e3a35a90543e3db528b2682b \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha256 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha256 index c4bcd55..d806e9f 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha256 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha256 @@ -1 +1 @@ -b5c54156b3a952972c75cfed1f5dd52419426a975df9a863efa8eb36f1feae12 \ No newline at end of file +bcad34f63c34e515908d28d9310773b6604acf61d0bc51ae11bfc50347a2cbc4 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha512 b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha512 index 34b6a94..b353588 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha512 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/1.0.7/WKIMLib_local-1.0.7.module.sha512 @@ -1 +1 @@ -0b3a1ba410c00e2566f0052b66121737164e4edc5defe64fd2aa7fd6e02ba05ccd9b2e0e13b603911d53a34ec9c10ee51fcd4c05719e19440c5da726484b45e3 \ No newline at end of file +f8eaf05854e3bb2b3ccc00966ab79425bd88c25e170ae94dc5a4817afc6a6e2b0a7c13a6daaa98c2c070371975216f6254e99fedd5ab6f36b2b58a41257ee156 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml index ab3c9b6..e794bc1 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml +++ b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml @@ -8,6 +8,6 @@ 1.0.7 - 20250524090841 + 20250529025503 diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.md5 b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.md5 index da8846e..1279648 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.md5 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.md5 @@ -1 +1 @@ -2867162497a0539e3e3b0a1716f9feaa \ No newline at end of file +26ae472fcffd2fe0b04d0a3133350e8d \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha1 b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha1 index a28480b..5ce03e2 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha1 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha1 @@ -1 +1 @@ -e431ad1afdad3aff298476f1949e6dcb73bf52d2 \ No newline at end of file +7ad38bd49fd820be0253b040ef16b28958a46548 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha256 b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha256 index 17d5c72..87371e8 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha256 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha256 @@ -1 +1 @@ -aa7f10d602787f0faf2fc1a55c04fd089c55313b1d22c30cf1aa24c24ab9a216 \ No newline at end of file +7ba7e14099eabac8987d6198c656c4226fb155c37fb3a808eaeeb6cc7581e630 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha512 b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha512 index 6214cc3..94247fd 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha512 +++ b/repository/com/xinbida/wukongim/WKIMLib_local/maven-metadata.xml.sha512 @@ -1 +1 @@ -3c7de45f238ee5d29b5c331b4c90ef396a87cc7a36550eeba7aa475e86f77da8d20e3373d177d46845e8e8d26c1ec106d2855ee1298c0763788a2583325b638f \ No newline at end of file +0a2414a76b786281ac97d668dc59fb63f723659e0a1d3eb500f26c285ecbfc35b5d919c68169f6a70deb1b2f12f488ac3a5946149a7823cb1b40fae59e48a86b \ No newline at end of file diff --git a/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java b/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java index 82bce41..ce6729f 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java @@ -1,6 +1,5 @@ package com.xinbida.wukongim.message; -import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Handler; import android.os.Looper; @@ -52,14 +51,14 @@ import java.util.Map; import java.util.Objects; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.locks.ReentrantLock; /** @@ -770,38 +769,62 @@ public class WKConnection { } boolean hasAttached = false; //如果是图片消息 - if (msg.baseContentMsgModel instanceof WKImageContent) { - WKImageContent imageContent = (WKImageContent) msg.baseContentMsgModel; + if (msg.baseContentMsgModel instanceof WKImageContent imageContent) { if (!TextUtils.isEmpty(imageContent.localPath)) { +// try { +// File file = new File(imageContent.localPath); +// if (file.exists() && file.length() > 0) { +// hasAttached = true; +// Bitmap bitmap = BitmapFactory.decodeFile(imageContent.localPath); +// if (bitmap != null) { +// imageContent.width = bitmap.getWidth(); +// imageContent.height = bitmap.getHeight(); +// msg.baseContentMsgModel = imageContent; +// } +// } +// } catch (Exception ignored) { +// } + try { File file = new File(imageContent.localPath); if (file.exists() && file.length() > 0) { hasAttached = true; - Bitmap bitmap = BitmapFactory.decodeFile(imageContent.localPath); - if (bitmap != null) { - imageContent.width = bitmap.getWidth(); - imageContent.height = bitmap.getHeight(); - msg.baseContentMsgModel = imageContent; - } + // 使用 Options 只解码尺寸信息 + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; // 只获取图片信息,不加载到内存 + BitmapFactory.decodeFile(imageContent.localPath, options); + + imageContent.width = options.outWidth; + imageContent.height = options.outHeight; + msg.baseContentMsgModel = imageContent; } - } catch (Exception ignored) { + } catch (Exception e) { + WKLoggerUtils.getInstance().e("WKConnection", "Get image size failed: " + e.getMessage()); } } } //视频消息 - if (msg.baseContentMsgModel instanceof WKVideoContent) { - WKVideoContent videoContent = (WKVideoContent) msg.baseContentMsgModel; + if (msg.baseContentMsgModel instanceof WKVideoContent videoContent) { if (!TextUtils.isEmpty(videoContent.localPath)) { try { File file = new File(videoContent.coverLocalPath); if (file.exists() && file.length() > 0) { hasAttached = true; - Bitmap bitmap = BitmapFactory.decodeFile(videoContent.coverLocalPath); - if (bitmap != null) { - videoContent.width = bitmap.getWidth(); - videoContent.height = bitmap.getHeight(); - msg.baseContentMsgModel = videoContent; - } +// Bitmap bitmap = BitmapFactory.decodeFile(videoContent.coverLocalPath); +// if (bitmap != null) { +// videoContent.width = bitmap.getWidth(); +// videoContent.height = bitmap.getHeight(); +// msg.baseContentMsgModel = videoContent; +// } + + // 使用 Options 只解码尺寸信息 + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; // 只获取图片信息,不加载到内存 + BitmapFactory.decodeFile(videoContent.coverLocalPath, options); + + videoContent.width = options.outWidth; + videoContent.height = options.outHeight; + msg.baseContentMsgModel = videoContent; } } catch (Exception ignored) {