Skip to content

Commit 8b99aae

Browse files
committed
fix:picDetail Ugoira gif lowPoly
1 parent 0e25dd8 commit 8b99aae

File tree

1 file changed

+38
-17
lines changed

1 file changed

+38
-17
lines changed

src/main/kotlin/com/hcyacg/details/PicDetails.kt

+38-17
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import kotlinx.serialization.json.*
1717
import net.mamoe.mirai.contact.nameCardOrNick
1818
import net.mamoe.mirai.event.events.GroupMessageEvent
1919
import net.mamoe.mirai.message.data.*
20-
import net.mamoe.mirai.utils.ExternalResource
2120
import net.mamoe.mirai.utils.ExternalResource.Companion.toExternalResource
2221
import net.mamoe.mirai.utils.ExternalResource.Companion.uploadAsImage
2322
import net.mamoe.mirai.utils.MiraiLogger
2423
import okhttp3.*
2524
import org.apache.commons.lang3.StringUtils
2625
import java.awt.image.BufferedImage
2726
import java.io.ByteArrayInputStream
27+
import java.io.ByteArrayOutputStream
2828
import java.io.File
2929
import java.util.concurrent.TimeUnit
3030
import javax.imageio.ImageIO
@@ -106,21 +106,21 @@ object PicDetails {
106106
}
107107

108108
if ("ugoira".contentEquals(type)) {
109-
val toExternalResource = if (sanityLevel == 6 && Config.lowPoly){
110-
val byte = getUgoira(picId!!.toLong())
111-
LowPoly.generate(
112-
ByteArrayInputStream(byte),
113-
200,
114-
1F,
115-
true,
116-
"png",
117-
false,
118-
200
119-
).toByteArray().toExternalResource()
120-
}else{
121-
getUgoira(picId!!.toLong())!!.toExternalResource()
122-
}
123-
109+
// val toExternalResource = if (sanityLevel == 6 && Config.lowPoly){
110+
// val byte = getUgoira(picId!!.toLong())
111+
// LowPoly.generate(
112+
// ByteArrayInputStream(byte),
113+
// 200,
114+
// 1F,
115+
// true,
116+
// "png",
117+
// false,
118+
// 200
119+
// ).toByteArray().toExternalResource()
120+
// }else{
121+
// getUgoira(picId!!.toLong())!!.toExternalResource()
122+
// }
123+
val toExternalResource = getUgoira(picId!!.toLong())!!.toExternalResource()
124124
val imageId: String = toExternalResource.uploadAsImage(event.group).imageId
125125
withContext(Dispatchers.IO) {
126126
toExternalResource.close()
@@ -382,7 +382,28 @@ object PicDetails {
382382
withContext(Dispatchers.IO) {
383383
ImageIO.read(File(dir.path + File.separator + "image" + File.separator + pic[i]))
384384
} // 读入需要播放的jpg文件
385-
e.addFrame(src[i]) //添加到帧中
385+
386+
387+
val out = ByteArrayOutputStream()
388+
withContext(Dispatchers.IO) {
389+
ImageIO.write(src[i], "png", out)
390+
}
391+
// val input: InputStream = ByteArrayInputStream(out.toByteArray())
392+
e.addFrame(withContext(Dispatchers.IO) {
393+
ImageIO.read(
394+
ByteArrayInputStream(
395+
LowPoly.generate(
396+
ByteArrayInputStream(out.toByteArray()),
397+
200,
398+
1F,
399+
true,
400+
"png",
401+
false,
402+
200
403+
).toByteArray()
404+
)
405+
)
406+
}) //添加到帧中
386407
}
387408

388409
e.finish()

0 commit comments

Comments
 (0)