Commit 2a7496c0 authored by ryoii's avatar ryoii

Fix groupCard charset encode, fixed #77

parent 18c59116
...@@ -26,7 +26,6 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.proto.* ...@@ -26,7 +26,6 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.proto.*
import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
import net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket import net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket
import net.mamoe.mirai.qqandroid.utils.encodeToString
import net.mamoe.mirai.qqandroid.utils.io.serialization.* import net.mamoe.mirai.qqandroid.utils.io.serialization.*
import net.mamoe.mirai.utils.daysToSeconds import net.mamoe.mirai.utils.daysToSeconds
import net.mamoe.mirai.data.GroupInfo as MiraiGroupInfo import net.mamoe.mirai.data.GroupInfo as MiraiGroupInfo
...@@ -413,15 +412,13 @@ internal class TroopManagement { ...@@ -413,15 +412,13 @@ internal class TroopManagement {
gender = 0, gender = 0,
dwuin = member.id, dwuin = member.id,
dwFlag = 31, dwFlag = 31,
sName = newName.toByteArray(CharsetUTF8) sName = newName,
.encodeToString(CharsetGBK),
sPhone = "", sPhone = "",
sEmail = "", sEmail = "",
sRemark = "" sRemark = ""
) )
) )
), )
JceCharset.GBK
) )
) )
) )
......
...@@ -87,8 +87,7 @@ msfwifi.3g.qq.com ? ...@@ -87,8 +87,7 @@ msfwifi.3g.qq.com ?
jcebuf = if (packet.type == 3) packet.jcebuf else null jcebuf = if (packet.type == 3) packet.jcebuf else null
) )
) )
), )
charset = JceCharset.UTF8
) )
// writePacket(this.build().debugPrintThis()) // writePacket(this.build().debugPrintThis())
} }
......
...@@ -37,7 +37,7 @@ internal fun <T : JceStruct> ByteArray.loadAs(deserializer: DeserializationStrat ...@@ -37,7 +37,7 @@ internal fun <T : JceStruct> ByteArray.loadAs(deserializer: DeserializationStrat
internal fun <T : JceStruct> BytePacketBuilder.writeJceStruct( internal fun <T : JceStruct> BytePacketBuilder.writeJceStruct(
serializer: SerializationStrategy<T>, serializer: SerializationStrategy<T>,
struct: T, struct: T,
charset: JceCharset = JceCharset.GBK charset: JceCharset = JceCharset.UTF8
) { ) {
Jce.byCharSet(charset).dumpTo(serializer, struct, this) Jce.byCharSet(charset).dumpTo(serializer, struct, this)
} }
...@@ -91,7 +91,7 @@ internal fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: Strin ...@@ -91,7 +91,7 @@ internal fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: Strin
}) })
} }
internal fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.GBK): ByteArray = internal fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.UTF8): ByteArray =
Jce.byCharSet(c).dump(serializer, this) Jce.byCharSet(c).dump(serializer, this)
internal fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) { internal fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) {
...@@ -139,7 +139,7 @@ internal fun <T : JceStruct> jceRequestSBuffer(name: String, serializer: Seriali ...@@ -139,7 +139,7 @@ internal fun <T : JceStruct> jceRequestSBuffer(name: String, serializer: Seriali
name, name,
serializer, serializer,
jceStruct, jceStruct,
JceCharset.GBK JceCharset.UTF8
) )
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment