diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/NtMsgElementConverter.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/NtMsgElementConverter.kt index 03177ad..eba46b0 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/NtMsgElementConverter.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/NtMsgElementConverter.kt @@ -171,6 +171,9 @@ internal object NtMsgElementConverter { storeId = image.storeID } + /* + PicElement{picSubType=0,fileName=A655FCDADABC40D0CEAF6F9AF92937CD.jpg,fileSize=142865,picWidth=886,picHeight=1920,original=false,md5HexStr=a655fcdadabc40d0ceaf6f9af92937cd,sourcePath=null,thumbPath=null,transferStatus=2,progress=0,picType=1000,invalidState=0,fileUuid=CgoxMDI5Mzc0MTE1EhTnucgrUbp3MJjjagUM2-VxSQ5V7hiR3Agg_goo9ZCZt-HNhANQgJqeAQ,fileSubId=,thumbFileSize=0,fileBizId=null,downloadIndex=null,summary=,emojiFrom=null,emojiWebUrl=null,emojiAd=EmojiAD{url=,desc=,},emojiMall=EmojiMall{packageId=0,emojiId=0,},emojiZplan=EmojiZPlan{actionId=0,actionName=,actionType=0,playerNumber=0,peerUid=0,bytesReserveInfo=,},originImageMd5=,originImageUrl=null,importRichMediaContext=null,isFlashPic=false,} + */ return MessageSegment( type = "image", data = hashMapOf( diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt index f37a6cc..cfb60c4 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt @@ -160,7 +160,7 @@ internal object RichProtoSvc: BaseSvc() { width: UInt = 0u, height: UInt = 0u ): String { - val isNtServer = originalUrl.startsWith("/download") + val isNtServer = !fileId.startsWith("/") || originalUrl.startsWith("/download") val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC if (originalUrl.isNotEmpty()) { if (isNtServer && !originalUrl.contains("rkey=")) { @@ -196,7 +196,7 @@ internal object RichProtoSvc: BaseSvc() { height: UInt = 0u, storeId: Int = 0 ): String { - val isNtServer = storeId == 1 || originalUrl.startsWith("/download") + val isNtServer = storeId == 1 || !fileId.startsWith("/") || originalUrl.startsWith("/download") val domain = if (isNtServer) MULTIMEDIA_DOMAIN else C2C_PIC if (originalUrl.isNotEmpty()) { if (fileId.isNotEmpty()) getNtPicRKey( @@ -238,7 +238,7 @@ internal object RichProtoSvc: BaseSvc() { width: UInt = 0u, height: UInt = 0u ): String { - val isNtServer = originalUrl.startsWith("/download") + val isNtServer = !fileId.startsWith("/") || originalUrl.startsWith("/download") val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC if (originalUrl.isNotEmpty()) { if (isNtServer && !originalUrl.contains("rkey=")) {