Revert "fix: watch and macOS (mamoe#2228)"

This reverts commit 7804ca1.
AdminHcat · Sep 2, 2022 · 8d7cf28 · 8d7cf28
1 parent e00f592
commit 8d7cf28
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt
@@ -756,7 +756,7 @@ internal fun BytePacketBuilder.t177(
         writeByte(1)
         writeInt(buildTime.toInt())
         writeShortLVString(buildVersion)
-    } // shouldEqualsTo 0x11
+    } shouldEqualsTo 0x11
 }
 
 internal fun BytePacketBuilder.t516( // 1302

diff --git a/mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt b/mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt
@@ -11,7 +11,6 @@ package net.mamoe.mirai.internal.utils
 
 import net.mamoe.mirai.utils.BotConfiguration.MiraiProtocol
 import net.mamoe.mirai.utils.EnumMap
-import net.mamoe.mirai.utils.toUHexString
 import kotlin.jvm.JvmField
 
 internal class MiraiProtocolInternal(
@@ -47,8 +46,7 @@ internal class MiraiProtocolInternal(
             )
             protocols[MiraiProtocol.ANDROID_PAD] = MiraiProtocolInternal(
                 "com.tencent.mobileqq",
-                537062409,
-                "8.4.18",
+                537062409, "8.4.18",
                 "6.0.0.2454",
                 184024956,
                 0x10400,
@@ -58,16 +56,16 @@ internal class MiraiProtocolInternal(
                 15,
             )
             protocols[MiraiProtocol.ANDROID_WATCH] = MiraiProtocolInternal(
-                "com.tencent.qqlite",
-                537064446,
-                "2.0.5",
-                "6.0.0.236",
+                "com.tencent.mobileqq",
+                537061176,
+                "8.2.7",
+                "6.0.0.2413",
                 184024956,
                 0x10400,
                 34869472,
                 "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D",
-                1559564731L,
-                5,
+                1571193922L,
+                15,
             )
             protocols[MiraiProtocol.IPAD] = MiraiProtocolInternal(
                 "com.tencent.minihd.qq",
@@ -82,16 +80,16 @@ internal class MiraiProtocolInternal(
                 12,
             )
             protocols[MiraiProtocol.MACOS] = MiraiProtocolInternal(
-                "com.tencent.qq",
-                0x2003ca32,
-                "6.7.9",
-                "6.2.0.1023",
-                0x7ffc,
+                "com.tencent.minihd.qq",
+                537064315,
+                "5.8.9",
+                "6.0.0.2433",
+                150470524,
                 66560,
                 1970400,
-                "com.tencent.qq".encodeToByteArray().toUHexString(" "),
-                0L,
-                7,
+                "AA 39 78 F4 1F D9 6F F9 91 4A 66 9E 18 64 74 C7",
+                1595836208L,
+                12,
             )
         }
     }