fix: #350

It is not recommended to use this build for lower versions

.github/workflows/build-apk.yml

@@ -3,7 +3,7 @@ name: Build Shamrock APK
 on:
   workflow_dispatch:
   push:
-    branches: [ master ]
+    branches: [ v1.0.9 ]
     paths-ignore:
       - '**.md'
       - '**.txt'

README.md

@@ -16,7 +16,7 @@
 
 ## 简介
 
-☘ 基于 Lsposed(**Non**-Riru) 实现 OneBot 标准的 QQ 机器人框架，原作者[**fuqiuluo**](https://github.com/fuqiuluo)已脱离开发，接下来由白池接手哦！本项目为OpenShamrock，不会有任何收费行为，欢迎大家的加入！
+☘ 基于 Lsposed(**Non**-Riru) 实现 OneBot 标准的 QQ 机器人框架！
 
 > 本项目仅提供学习与交流用途，请在24小时内删除。   
 > 本项目目的是研究 Xposed 和 LSPosed 框架的使用。 Epic 框架开发相关知识。  
@@ -27,9 +27,27 @@
 
 ## 兼容|迁移|替代 说明
 
+仅支持QQ9.0.70以上的版本，低版本问题将不再修复与处理。
+
 - 一键移植：本项目基于 go-cqhttp 的文档进行开发实现。
 - 平行部署：可多平台部署，未来将会支持 Docker 部署的教程。
-- 替代方案：[Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core)
+  
+## 相关项目
+
+<table>
+<tr>
+  <td><a href="https://github.com/LagrangeDev/Lagrange.Core">Lagrange.Core</a></td>
+  <td>NTQQ 的协议实现</td>
+</tr>
+<tr>
+  <td><a href="https://github.com/whitechi73/OpenShamrock">OpenShamrock</a></td>
+  <td>基于 Xposed 实现 OneBot 标准的机器人框架（👈你在这里</td>
+</tr>
+<tr>
+  <td><a href="https://github.com/chrononeko/chronocat">Chronocat</a></td>
+  <td>基于 Electron 的、模块化的 Satori 框架</td>
+</tr>
+</table>
 
 ## 权限声明
 

app/build.gradle.kts

@@ -17,7 +17,7 @@ android {
         minSdk = 27
         targetSdk = 34
         versionCode = getVersionCode()
-        versionName = "1.0.9" + ".r${getGitCommitCount()}." + getVersionName()
+        versionName = "1.1.1.onebot" + ".r${getGitCommitCount()}." + getVersionName()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/cpp/shamrock.cpp

@@ -12,7 +12,8 @@
 
 extern "C"
 JNIEXPORT jstring JNICALL
-Java_moe_fuqiuluo_shamrock_xposed_hooks_PullConfig_testNativeLibrary(JNIEnv *env, jobject thiz) {
+Java_moe_fuqiuluo_shamrock_xposed_hooks_PullConfig_00024Companion_testNativeLibrary(JNIEnv *env,
+                                                                                    jobject thiz) {
     return env->NewStringUTF("加载Shamrock库成功~");
 }
 

app/src/main/java/moe/fuqiuluo/shamrock/MainActivity.kt

@@ -52,7 +52,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
@@ -64,6 +63,7 @@ import androidx.compose.ui.unit.sp
 import androidx.core.view.WindowCompat
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import moe.fuqiuluo.shamrock.ui.app.AppRuntime
 import moe.fuqiuluo.shamrock.ui.app.Logger
@@ -79,7 +79,7 @@ import moe.fuqiuluo.shamrock.ui.theme.RANDOM_SUB_TITLE
 import moe.fuqiuluo.shamrock.ui.theme.RANDOM_TITLE
 import moe.fuqiuluo.shamrock.ui.theme.ShamrockTheme
 import moe.fuqiuluo.shamrock.ui.tools.NoIndication
-import moe.fuqiuluo.shamrock.ui.tools.ShamrockTab
+import moe.fuqiuluo.shamrock.ui.tools.ShamrockTabV2
 import moe.fuqiuluo.shamrock.ui.tools.getShamrockVersion
 
 class MainActivity : ComponentActivity() {
@@ -87,6 +87,15 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
+            LaunchedEffect(Unit) {
+                while (true) {
+                    delay(5_000) // Delay in milliseconds
+                    broadcastToModule {
+                        putExtra("__cmd", "switch_status")
+                    }
+                }
+            }
+
             CompositionLocalProvider(
                 LocalIndication provides NoIndication
             ) {
@@ -336,7 +345,7 @@ private fun AnimatedTab(
         }
     }
 
-    ShamrockTab(
+    ShamrockTabV2(
         selected = curSelected,
         onClick = {
             scope.launch {

app/src/main/java/moe/fuqiuluo/shamrock/ui/app/ShamrockConfig.kt

@@ -162,6 +162,17 @@ object ShamrockConfig {
         pushUpdate(ctx)
     }
 
+    fun getUploadResourceGroup(ctx: Context): String {
+        val preferences = ctx.getSharedPreferences("config", 0)
+        return preferences.getString("up_res_group", "100000000")!!
+    }
+
+    fun setUploadResourceGroup(ctx: Context, v: String) {
+        val preferences = ctx.getSharedPreferences("config", 0)
+        preferences.edit().putString("up_res_group", v).apply()
+        pushUpdate(ctx)
+    }
+
     fun getHttpPort(ctx: Context): Int {
         val preferences = ctx.getSharedPreferences("config", 0)
         return preferences.getInt("port", 5700)
@@ -354,6 +365,7 @@ object ShamrockConfig {
             "disable_auto_sync_setting" to preferences.getBoolean("disable_auto_sync_setting", false),
             "forbid_useless_process" to preferences.getBoolean("forbid_useless_process", false),
             "enable_old_bdh" to preferences.getBoolean("enable_old_bdh", false),
+            "up_res_group" to preferences.getString("up_res_group", ""),
         )
     }
 

app/src/main/java/moe/fuqiuluo/shamrock/ui/fragment/DashboardFragment.kt

@@ -356,6 +356,36 @@ private fun FunctionCard(
                 return@Function true
             }
 
+            run {
+                val uploadResourceGroup = remember { mutableStateOf(ShamrockConfig.getUploadResourceGroup(ctx)) }
+                Column(
+                    modifier = Modifier
+                        .absolutePadding(left = 8.dp, right = 8.dp, top = 12.dp, bottom = 0.dp)
+                ) {
+                    Text(
+                        modifier = Modifier.padding(2.dp),
+                        text = "用来上传资源的群聊，错误的资源上传终点可能导致封禁，请自建一个群聊并填写在下方。",
+                        color = Color.Red,
+                        fontSize = 11.sp
+                    )
+                }
+                TextItem(
+                    title = "接受资源群聊",
+                    desc = "用来上传资源的群聊，请自建一个群聊并填写在下方。",
+                    text = uploadResourceGroup,
+                    hint = "请输入群号",
+                    error = "群号不合法",
+                    checker = {
+                        it.isNotBlank() && it.toULongOrNull() != null
+                    },
+                    confirm = {
+                        val groupId = uploadResourceGroup.value
+                        ShamrockConfig.setUploadResourceGroup(ctx, groupId)
+                        AppRuntime.log("设置接受资源群聊为[$groupId]。")
+                    }
+                )
+            }
+
             /*
             Function(
                 title = "专业级接口",
@@ -445,9 +475,7 @@ private fun InfoItem(
             .fillMaxWidth()
             .combinedClickable(onDoubleClick = {
                 doubleClick?.invoke(content)
-            }) {
-                true
-            }
+            }) { true }
         ,
         verticalAlignment = Alignment.CenterVertically
     ) {

app/src/main/java/moe/fuqiuluo/shamrock/ui/service/handlers/ModuleHandler.kt

@@ -30,6 +30,7 @@ abstract class ModuleHandler {
                 }
             }
             putExtra("__hash", callbackId)
+            putExtra("__cmd", cmd)
         }
     }
 }

app/src/main/java/moe/fuqiuluo/shamrock/ui/service/internal/MultifunctionalProvider.kt

@@ -58,7 +58,7 @@ class MultifunctionalProvider: ContentProvider() {
 
 inline fun Context.broadcastToModule(intentBuilder: Intent.() -> Unit) {
     val intent = Intent()
-    intent.action = "moe.fuqiuluo.xqbot.dynamic"
+    intent.action = "moe.fuqiuluo.onebot.dynamic"
     intent.intentBuilder()
     sendBroadcast(intent)
 }

app/src/main/java/moe/fuqiuluo/shamrock/ui/tools/tabs.kt

@@ -242,13 +242,13 @@ private fun Placeable.PlacementScope.placeTextAndIcon(
 }
 
 @Composable
-fun ShamrockTab(
+fun ShamrockTabV2(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
-    text: @Composable (() -> Unit)? = null,
-    icon: @Composable (() -> Unit)? = null,
+    text: (@Composable (() -> Unit))? = null,
+    icon: (@Composable (() -> Unit))? = null,
     selectedContentColor: Color = GlobalColor.TabSelected,
     unselectedContentColor: Color = selectedContentColor,
     indication: Indication? = rememberRipple(bounded = true, color = selectedContentColor),
@@ -262,7 +262,7 @@ fun ShamrockTab(
             ProvideTextStyle(style, content = text)
         }
     }
-    ShamrockTab(
+    ShamrockTabV2(
         selected,
         onClick,
         modifier,
@@ -277,7 +277,7 @@ fun ShamrockTab(
 }
 
 @Composable
-fun ShamrockTab(
+fun ShamrockTabV2(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,

build.gradle.kts

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.2.0" apply false
+    id("com.android.application") version "8.2.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.22" apply false
-    id("com.android.library") version "8.2.0" apply false
+    id("com.android.library") version "8.2.1" apply false
 }

protobuf/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -43,3 +45,7 @@ dependencies {
 
     ksp(project(":processor"))
 }
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+}

protobuf/src/main/java/protobuf/lightapp/AdaptShareInfo.kt

@@ -32,6 +32,11 @@ data class AdaptShareInfoReq(
 
 @Serializable
 data class Template(
-    @ProtoNumber(1) var templateId: UInt? = null,
+    @ProtoNumber(1) var templateId: ULong? = null,
     @ProtoNumber(2) var templateData: ByteArray? = null,
 )
+
+@Serializable
+data class AdaptShareInfoResp(
+    @ProtoNumber(2) var json: String? = null,
+): Protobuf<AdaptShareInfoResp>

protobuf/src/main/java/protobuf/message/Ptt.kt

@@ -7,9 +7,9 @@ import kotlinx.serialization.protobuf.ProtoNumber
 data class Ptt(
     @ProtoNumber(1) var fileType: UInt?=null,
     @ProtoNumber(2) var srcUin: ULong?=null,
-    @ProtoNumber(3) var fileUuid: ByteArray?=null,
+    @ProtoNumber(3) var fileUuid: String?=null,
     @ProtoNumber(4) var fileMd5: ByteArray?=null,
-    @ProtoNumber(5) var fileName: ByteArray?=null,
+    @ProtoNumber(5) var fileName: String?=null,
     @ProtoNumber(6) var fileSize: UInt?=null,
     @ProtoNumber(7) var reserve: ByteArray?=null,
     @ProtoNumber(8) var fileId: UInt?=null,
@@ -22,11 +22,19 @@ data class Ptt(
     @ProtoNumber(15) var magicPttIndex: UInt?=null,
     @ProtoNumber(16) var voiceSwitch: UInt?=null,
     @ProtoNumber(17) var pttUrl: ByteArray?=null,
-    @ProtoNumber(18) var groupFileKey: ByteArray?=null,
+    @ProtoNumber(18) var groupFileKey: String?=null,
     @ProtoNumber(19) var time: UInt?=null,
     @ProtoNumber(20) var downPara: ByteArray?=null,
     @ProtoNumber(29) var format: UInt?=null,
-    @ProtoNumber(30) var pbReserve: ByteArray?=null,
+    @ProtoNumber(30) var pbReserve: PbReserve?=null,
     @ProtoNumber(31) var rptPttUrls: List<String>? = null,
     @ProtoNumber(32) var downloadFlag: UInt?=null,
-)
+){
+    companion object{
+        @Serializable
+        data class PbReserve(
+            @ProtoNumber(2) var magic: Int?=null,
+            @ProtoNumber(7) var reserve: Int?=null,
+        )
+    }
+}

protobuf/src/main/java/protobuf/message/RichText.kt

@@ -9,9 +9,9 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class RichText(
     @ProtoNumber(1) val attr: Attr? = null,
-    @ProtoNumber(2) val elements: List<Elem>? = null,
-    @ProtoNumber(3) val not_online_file: NotOnlineFile? = null,
-    @ProtoNumber(4) val ptt: Ptt? = null,
+    @ProtoNumber(2) var elements: List<Elem>? = null,
+    @ProtoNumber(3) var not_online_file: NotOnlineFile? = null,
+    @ProtoNumber(4) var ptt: Ptt? = null,
     @ProtoNumber(5) val tmp_ptt: TmpPtt? = null,
     @ProtoNumber(6) val trans_211_tmp_msg: Trans211TmpMsg? = null,
 )

protobuf/src/main/java/protobuf/message/longmsg/LongMsg.kt

@@ -31,7 +31,7 @@ data class RecvLongMsgInfo(
 data class SendLongMsgInfo(
     @ProtoNumber(1) val type: Int? = null,
     @ProtoNumber(2) val uid: LongMsgUid? = null,
-    @ProtoNumber(3) val groupUin: Int? = null,
+    @ProtoNumber(3) val groupUin: ULong? = null,
     @ProtoNumber(4) val payload: ByteArray? = null,
 )
 

protobuf/src/main/java/protobuf/message/multimedia/RichMediaForPicData.kt

@@ -1,55 +1 @@
-@file:OptIn(ExperimentalSerializationApi::class)
 package protobuf.message.multimedia
-
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.protobuf.ProtoNumber
-import moe.fuqiuluo.symbols.Protobuf
-
-@Serializable
-data class RichMediaForPicData(
-    @ProtoNumber(1) val info: MediaInfo?,
-    @ProtoNumber(2) val display: DisplayMediaInfo?,
-): Protobuf<RichMediaForPicData> {
-    companion object {
-        @Serializable
-        data class MediaInfo(
-            @ProtoNumber(1) val picture: Picture? = null,
-        )
-
-        @Serializable
-        data class Picture(
-            @ProtoNumber(1) val info: PictureInfo? = null,
-            @ProtoNumber(2) val fileId: String? = null,
-            @ProtoNumber(4) val time: ULong? = null,
-        )
-
-        @Serializable
-        data class PictureInfo(
-            @ProtoNumber(2) val md5Hex: String? = null,
-            @ProtoNumber(3) val sha: String? = null,
-            @ProtoNumber(4) val name: String? = null,
-            @ProtoNumber(6) val width: Int? = null,
-            @ProtoNumber(7) val height: Int? = null,
-        )
-    }
-}
-
-@Serializable
-data class DisplayMediaInfo(
-    @ProtoNumber(1) val show: Show? = null,
-) {
-    companion object {
-        @Serializable
-        data class Show(
-            @ProtoNumber(2) val text: String? = null,
-            @ProtoNumber(12) val download: Download? = null
-        )
-
-        @Serializable
-        data class Download(
-            @ProtoNumber(30) val url: String? = null,
-        )
-    }
-}
-

protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaReq.kt

@@ -49,8 +49,8 @@ data class UploadCompletedReq(
 @Serializable
 data class MsgInfo(
     @ProtoNumber(1) val msgInfoBody: List<MsgInfoBody>,
-    @ProtoNumber(2) val extBizInfo: ExtBizInfo,
-)
+    @ProtoNumber(2) val extBizInfo: ExtBizInfo?,
+): Protobuf<MsgInfo>
 
 @Serializable
 data class MsgInfoBody(
@@ -94,7 +94,8 @@ data class DeleteReq(
 
 @Serializable
 data class DownloadRkeyReq(
-    @ProtoNumber(1) val types: List<Int>
+    @ProtoNumber(1) val types: List<Int>,
+    @ProtoNumber(2) val downloadType: Int
 )
 
 @Serializable
@@ -106,7 +107,7 @@ data class UploadReq(
     @ProtoNumber(5) val compatQMsgSceneType: UInt? = null,
     @ProtoNumber(6) val extBizInfo: ExtBizInfo? = null,
     @ProtoNumber(7) val clientSeq: UInt? = null,
-    @ProtoNumber(8) val noNeedCompatMsg: Boolean = false,
+    @ProtoNumber(8) val noNeedCompatMsg: Boolean? = null,
 )
 
 @Serializable
@@ -114,7 +115,7 @@ data class ExtBizInfo(
     @ProtoNumber(1) val pic: PicExtBizInfo? = null,
     @ProtoNumber(2) val video: VideoExtBizInfo? = null,
     @ProtoNumber(3) val ptt: PttExtBizInfo? = null,
-    @ProtoNumber(10) val busiType: UInt,
+    @ProtoNumber(10) val busiType: UInt?,
 )
 
 @Serializable
@@ -132,15 +133,15 @@ data class PttExtBizInfo(
 
 @Serializable
 data class VideoExtBizInfo(
-    @ProtoNumber(1) val fromScene: UInt,
-    @ProtoNumber(2) val toScene: UInt,
-    @ProtoNumber(3) val bytesPbReserve: ByteArray,
+    @ProtoNumber(1) val fromScene: UInt?,
+    @ProtoNumber(2) val toScene: UInt?,
+    @ProtoNumber(3) val bytesPbReserve: ByteArray?,
 )
 
 @Serializable
 data class PicExtBizInfo(
-    @ProtoNumber(1) val bizType: UInt,
-    @ProtoNumber(2) val textSummary: String,
+    @ProtoNumber(1) val bizType: UInt?,
+    @ProtoNumber(2) val textSummary: String?,
     @ProtoNumber(11) val bytesPbReserveC2c: ByteArray? = null,
     @ProtoNumber(12) val bytesPbReserveTroop: ByteArray? = null,
     @ProtoNumber(1001) val fromScene: UInt? = null,
@@ -156,15 +157,15 @@ data class UploadInfo(
 
 @Serializable
 data class FileInfo(
-    @ProtoNumber(1) val fileSize: ULong,
-    @ProtoNumber(2) val md5: String,
-    @ProtoNumber(3) val sha1: String,
-    @ProtoNumber(4) val name: String,
-    @ProtoNumber(5) val fileType: FileType,
-    @ProtoNumber(6) val width: UInt,
-    @ProtoNumber(7) val height: UInt,
-    @ProtoNumber(8) val time: UInt,
-    @ProtoNumber(9) val original: UInt,
+    @ProtoNumber(1) val fileSize: ULong?,
+    @ProtoNumber(2) val md5: String?,
+    @ProtoNumber(3) val sha1: String?,
+    @ProtoNumber(4) val name: String?,
+    @ProtoNumber(5) val fileType: FileType?,
+    @ProtoNumber(6) val width: UInt?,
+    @ProtoNumber(7) val height: UInt?,
+    @ProtoNumber(8) val time: UInt?,
+    @ProtoNumber(9) val original: UInt?,
 )
 
 @Serializable
@@ -217,7 +218,7 @@ data class IndexNode(
     @ProtoNumber(3) val storeId: UInt, // 0为旧服务器 1为nt服务器
     @ProtoNumber(4) val uploadTime: ULong,
     @ProtoNumber(5) val ttl: ULong,
-    @ProtoNumber(6) val subType: UInt,
+    @ProtoNumber(6) val subType: UInt? = null,
     @ProtoNumber(7) val storeAppId: UInt? = null
 )
 

protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaRsp.kt

@@ -26,8 +26,8 @@ class DownloadSafeRsp
 
 @Serializable
 data class UploadKeyRenewalRsp(
-    @ProtoNumber(1) val ukey: String,
-    @ProtoNumber(2) val ukeyTtlSec: ULong,
+    @ProtoNumber(1) val ukey: String?,
+    @ProtoNumber(2) val ukeyTtlSec: ULong?,
 )
 
 @Serializable
@@ -39,7 +39,7 @@ data class MsgInfoAuthRsp(
 
 @Serializable
 data class UploadCompletedRsp(
-    @ProtoNumber(1) val msgSeq: ULong
+    @ProtoNumber(1) val msgSeq: ULong?
 )
 
 @Serializable
@@ -47,22 +47,22 @@ class DeleteRsp
 
 @Serializable
 data class DownloadRkeyRsp(
-    @ProtoNumber(1) val rkeys: List<RKeyInfo>
+    @ProtoNumber(1) val rkeys: List<RKeyInfo>?
 )
 
 @Serializable
 data class RKeyInfo(
     @ProtoNumber(1) val rkey: String,
-    @ProtoNumber(2) val rkeyTtlSec: ULong,
+    @ProtoNumber(2) val rkeyTtlSec: ULong?,
     @ProtoNumber(3) val storeId: UInt = 0u,
     @ProtoNumber(4) val rkeyCreateTime: UInt?,
-    @ProtoNumber(4) val type: UInt?,
+    @ProtoNumber(5) val type: UInt,
 )
 
 @Serializable
 data class DownloadRsp(
-    @ProtoNumber(1) val rkeyParam: String,
-    @ProtoNumber(2) val rkeyTtlSec: ULong,
+    @ProtoNumber(1) val rkeyParam: String?,
+    @ProtoNumber(2) val rkeyTtlSec: ULong?,
     @ProtoNumber(3) val downloadInfo: DownloadInfo?,
     @ProtoNumber(4) val rkeyCreateTime: UInt?
 )
@@ -80,16 +80,16 @@ data class DownloadInfo(
 
 @Serializable
 data class VideoExtInfo(
-    @ProtoNumber(1) val videoCodecFormat: UInt,
+    @ProtoNumber(1) val videoCodecFormat: UInt? = null,
 )
 
 @Serializable
 data class UploadRsp(
-    @ProtoNumber(1) val ukey: String,
-    @ProtoNumber(2) val ukeyTtlSec: ULong,
-    @ProtoNumber(3) val ipv4: List<Ipv4>,
-    @ProtoNumber(4) val ipv6: List<Ipv6>,
-    @ProtoNumber(5) val msgSeq: ULong,
+    @ProtoNumber(1) val ukey: String?,
+    @ProtoNumber(2) val ukeyTtlSec: ULong?,
+    @ProtoNumber(3) val ipv4: List<Ipv4>?,
+    @ProtoNumber(4) val ipv6: List<Ipv6>?,
+    @ProtoNumber(5) val msgSeq: ULong?,
     @ProtoNumber(6) val msgInfo: MsgInfo? = null,
     @ProtoNumber(7) val ext: List<RichmediaStorageTransInfo>? = null,
     @ProtoNumber(8) val compatQMsg: ByteArray? = null,
@@ -98,11 +98,11 @@ data class UploadRsp(
 
 @Serializable
 data class SubFileInfo(
-    @ProtoNumber(1) val subType: UInt,
-    @ProtoNumber(2) val ukey: String,
-    @ProtoNumber(3) val ukeyTTLSec: ULong,
-    @ProtoNumber(4) val ipv4: List<Ipv4>,
-    @ProtoNumber(5) val ipv6: List<Ipv6>,
+    @ProtoNumber(1) val subType: UInt?,
+    @ProtoNumber(2) val ukey: String?,
+    @ProtoNumber(3) val ukeyTTLSec: ULong?,
+    @ProtoNumber(4) val ipv4: List<Ipv4>?,
+    @ProtoNumber(5) val ipv6: List<Ipv6>?,
 )
 
 @Serializable
@@ -132,8 +132,8 @@ data class Ipv6(
 
 @Serializable
 data class RspHead(
-    @ProtoNumber(1) val commonHead: CommonHead,
+    @ProtoNumber(1) val commonHead: CommonHead?,
     @ProtoNumber(2) val retCode: UInt = 0u,
-    @ProtoNumber(3) val msg: String
+    @ProtoNumber(3) val msg: String?
 )
 

protobuf/src/main/java/protobuf/qweb/QWeb.kt

@@ -7,6 +7,8 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 import moe.fuqiuluo.symbols.Protobuf
 
+const val DEFAULT_DEVICE_INFO = "i=&imsi=&mac=02:00:00:00:00:00&m=Shamrock&o=114514&a=1919810&sd=0&c64=1&sc=1&p=8000*8000&aid=123456789012345678901234567890abcdef&f=Tencent&mm=5610&cf=1726&cc=8&qimei=&qimei36=&sharpP=1&n=nether_world&support_xsj_live=false&client_mod=concise&timezone=America/La_Paz&material_sdk_version=&vh265=&refreshrate=10086&hwlevel=9&suphdr=1&is_teenager_mod=8&liveH265=&bmst=5&AV1=0"
+
 @Serializable
 data class QWebReq(
     @ProtoNumber(1) val seq: Int = 0,

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopInfo.java

@@ -146,6 +146,7 @@ public class TroopInfo {
     public byte[] troopInfoExtByte;
     public String troopLevelMap;
     public String troopRemark;
+    @Deprecated
     public String troopcode;
     public short troopface;
     public String troopmemo;
@@ -154,6 +155,7 @@ public class TroopInfo {
     public int trooptype;
     public String troopuin;
     public long udwCmdUinRingtoneID;
+    @Deprecated
     public String uin;
     public int wClickBAFTipCount;
     public int wInsertBAFTipCount;

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberInfo.java

@@ -1,63 +1,92 @@
 package com.tencent.mobileqq.data.troop;
 
+import org.jetbrains.annotations.Nullable;
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole;
+
 public class TroopMemberInfo {
-    public long active_point;
+    public static final long VALUE_DISTANCE_TO_SELF_UNKOWN = -100;
+    protected static final int VALUE_INVALID = -100;
+    public static final long VALUE_MEMBER_CLOSE_SHARE_LBS = -1001;
+
     public int addState;
-    public byte age;
-    public String alias;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
     public String autoremark;
-    public long cmduinFlagEx3Grocery;
     public long credit_level;
-    public long datetime;
     public String displayedNamePinyinFirst;
-    public short faceid;
+
+    @Nullable
+    public TroopMemberInfoExt extInfo;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
     public String friendnick;
     public long gagTimeStamp;
     public String honorList;
+    public boolean isTroopFollowed;
+    public long join_time;
+    public long last_active_time;
+    public int level;
+    public int mBigClubVipType;
+    public byte mHonorRichFlag;
+    public boolean mIsShielded;
+    public int mVipType;
+    public String memberUid;
+    public String memberuin;
+    public int newRealLevel;
+    public TroopMemberNickInfo nickInfo;
+    public int realLevel;
+    public MemberRole role;
+
+    @Nullable
+    public TroopMemberSpecialTitleInfo specialTitleInfo;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
+    public String troopColorNick;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
+    public int troopColorNickId;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
+    public String troopnick;
+    public String troopuin;
+    public int globalTroopLevel = VALUE_INVALID;
+    public int flagEx = 0;
+
+    // QQ OLD API DATA
+    public long active_point;
+    public byte age;
+    public String alias;
+    public long cmduinFlagEx3Grocery;
+    public long datetime;
+    public short faceid;
     public String hwCourse;
     public int hwIdentity;
     public String hwName;
     public int isShowQZone;
-    public boolean isTroopFollowed;
-    public long join_time;
     public long lastMsgUpdateHonorRichTime;
-    public long last_active_time;
-    public int level;
     public int mBigClubTemplateId;
     public int mBigClubVipLevel;
-    public int mBigClubVipType;
     public int mGlamourLevel;
-    public byte mHonorRichFlag;
     public int mIsHideBigClub;
-    public boolean mIsShielded;
     public String mUniqueTitle;
     public int mVipLevel;
     public int mVipTemplateId;
-    public int mVipType;
-    public String memberuin;
-    public int newRealLevel;
     public String pyAll_autoremark;
     public String pyAll_friendnick;
     public String pyAll_troopnick;
     public String pyFirst_autoremark;
     public String pyFirst_friendnick;
     public String pyFirst_troopnick;
-    public int realLevel;
     public String recommendRemark;
     public byte sex;
     public byte status;
     public int tribeLevel;
     public int tribePoint;
-    public String troopColorNick;
-    public int troopColorNickId;
-    public String troopnick;
     public String troopremark;
-    public String troopuin;
     public int qqVipInfo = 0;
     public int superQqInfo = 0;
     public int superVipInfo = 0;
     public int hotChatGlamourLevel = -100;
-    public int globalTroopLevel = -100;
     public int distance = 0;
     public long msgseq = -100;
     public double distanceToSelf = -100.0d;

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberInfoExt.java

@@ -0,0 +1,48 @@
+package com.tencent.mobileqq.data.troop;
+
+import org.jetbrains.annotations.Nullable;
+
+import kotlin.jvm.JvmField;
+
+public class TroopMemberInfoExt {
+    @JvmField
+    public int commonFrdCnt;
+
+    @JvmField
+    public long flagEx3;
+
+    @JvmField
+    public int hwIdentity;
+
+    @JvmField
+    public long lastMsgUpdateHonorRichTime;
+
+    @JvmField
+    @Nullable
+    public String memberUin;
+
+    @JvmField
+    @Nullable
+    public byte[] nickIconRepeatMsgBuffer;
+
+    @JvmField
+    @Nullable
+    public String recommendRemark;
+
+    @JvmField
+    @Nullable
+    public String showNameForPinyin;
+
+    @JvmField
+    @Nullable
+    public String showNamePinyinAll;
+
+    @JvmField
+    @Nullable
+    public String showNamePinyinFirst;
+
+    @JvmField
+    @Nullable
+    public String troopUin;
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberNickInfo.java

@@ -0,0 +1,54 @@
+package com.tencent.mobileqq.data.troop;
+
+import org.jetbrains.annotations.NotNull;
+
+public class TroopMemberNickInfo {
+    @NotNull
+    public final String getAutoRemark() {
+        return null;
+    }
+
+    @NotNull
+    public final String getColorNick() {
+        return null;
+    }
+
+    public final int getColorNickId() {
+        return 0;
+    }
+
+    @NotNull
+    public final String getFriendNick() {
+        return null;
+    }
+
+    @NotNull
+    public final String getHBShowName() {
+        return null;
+    }
+
+    @NotNull
+    public final String getRemarkFromFriend() {
+        return null;
+    }
+
+    @NotNull
+    public final String getRemarkFromFriendV2() {
+        return null;
+    }
+
+    @NotNull
+    public final String getShowName() {
+        return null;
+    }
+
+    @NotNull
+    public final String getTroopNick() {
+        return null;
+    }
+
+    @NotNull
+    public final String getTroopUin() {
+        return null;
+    }
+}

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberSpecialTitleInfo.java

@@ -0,0 +1,29 @@
+package com.tencent.mobileqq.data.troop;
+
+import org.jetbrains.annotations.NotNull;
+
+public class TroopMemberSpecialTitleInfo {
+    public final int getExpireTimeSec() {
+        return 0;
+    }
+
+    @NotNull
+    public final String getFriendNick() {
+        return null;
+    }
+
+    @NotNull
+    public final String getSpecialTitle() {
+        return null;
+    }
+
+    @NotNull
+    public final String getTroopUin() {
+        return null;
+    }
+
+    @NotNull
+    public final String getUin() {
+        return null;
+    }
+}

qqinterface/src/main/java/com/tencent/mobileqq/l0/b/a.java

@@ -0,0 +1,15 @@
+package com.tencent.mobileqq.l0.b;
+
+public class a {
+    public void b () {
+
+    }
+
+    public void c (c cVar) {
+
+    }
+
+    public void onUpdate(int progress, boolean z, Object obj) {
+
+    }
+}

qqinterface/src/main/java/com/tencent/mobileqq/l0/b/b.java

@@ -0,0 +1,23 @@
+package com.tencent.mobileqq.l0.b;
+
+import android.graphics.Point;
+
+import java.util.ArrayList;
+
+public class b {
+    // text
+    public String a;
+
+    // confidence
+    public int b;
+
+    // coordinates
+    public ArrayList<Point> c;
+
+    /* renamed from: d */
+    public int d;
+
+    /* renamed from: e */
+    public boolean e;
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/l0/b/c.java

@@ -0,0 +1,39 @@
+package com.tencent.mobileqq.l0.b;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class c {
+    // image
+    public String a;
+
+    // width
+    public int b;
+
+    // height
+    public int c;
+
+    // lang
+    public String d;
+
+    // url
+    public String e;
+
+    // results
+    public ArrayList<b> f;
+
+    public ArrayList<String> g;
+
+    public HashMap<String, String> h;
+
+    public int i;
+
+    public int j;
+
+    public int k;
+
+    public String l;
+
+    public int m;
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/msf/core/MsfCore.java

@@ -1,7 +1,7 @@
 package com.tencent.mobileqq.msf.core;
 
 public class MsfCore {
-    public static synchronized int getNextSeq() {
+    public synchronized int getNextSeq() {
         return 0;
     }
 }

qqinterface/src/main/java/com/tencent/mobileqq/msf/sdk/MsfMessagePair.java

@@ -0,0 +1,18 @@
+package com.tencent.mobileqq.msf.sdk;
+
+import com.tencent.qphone.base.remote.FromServiceMsg;
+import com.tencent.qphone.base.remote.ToServiceMsg;
+
+public class MsfMessagePair {
+    public FromServiceMsg fromServiceMsg;
+    public String sendProcess;
+    public ToServiceMsg toServiceMsg;
+
+    public MsfMessagePair(String str, ToServiceMsg toServiceMsg, FromServiceMsg fromServiceMsg) {
+
+    }
+
+    public MsfMessagePair(ToServiceMsg toServiceMsg, FromServiceMsg fromServiceMsg) {
+
+    }
+}

qqinterface/src/main/java/com/tencent/mobileqq/msf/service/MsfService.java

@@ -0,0 +1,22 @@
+package com.tencent.mobileqq.msf.service;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.mobileqq.msf.core.MsfCore;
+
+public class MsfService extends Service {
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    public static MsfCore getCore() {
+        return null;
+    }
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/ocr/a/a.java

@@ -0,0 +1,38 @@
+package com.tencent.mobileqq.ocr.a;
+
+public class a {
+    public String a;
+
+    // 1
+    public int b;
+
+    // file location
+    public String c;
+
+    // null
+    public String d;
+
+    // 0
+    public long e;
+
+    // md5
+    public String f;
+
+    // null
+    public String g;
+
+    // false
+    public boolean h;
+
+    // 0
+    public int i;
+
+    // 0
+    public int j;
+
+    // 0
+    public long k;
+
+    // null
+    public String l;
+}

qqinterface/src/main/java/com/tencent/mobileqq/ocr/api/IPicOcrService.java

@@ -0,0 +1,10 @@
+package com.tencent.mobileqq.ocr.api;
+
+import mqq.app.api.IRuntimeService;
+
+public interface IPicOcrService extends IRuntimeService {
+    void putOcrResult(String str, com.tencent.mobileqq.l0.b.c cVar);
+
+    void requestOcr(com.tencent.mobileqq.ocr.a.a aVar, com.tencent.mobileqq.l0.b.a callback);
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/ocr/api/impl/OcrServiceImpl.java

@@ -0,0 +1,4 @@
+package com.tencent.mobileqq.ocr.api.impl;
+
+public class OcrServiceImpl {
+}

qqinterface/src/main/java/com/tencent/mobileqq/ocr/api/impl/PicOcrServiceImpl.java

@@ -0,0 +1,4 @@
+package com.tencent.mobileqq.ocr.api.impl;
+
+public class PicOcrServiceImpl {
+}

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/api/impl/GProSessionImpl.java

@@ -0,0 +1,11 @@
+package com.tencent.mobileqq.qqguildsdk.api.impl;
+
+import com.tencent.qqnt.kernelgpro.nativeinterface.IKernelGuildService;
+
+public class GProSessionImpl {
+    public IKernelGuildService getGuildService() {
+        return null;
+    }
+
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/GProGuildInfo.java

@@ -1,20 +1,12 @@
 package com.tencent.mobileqq.qqguildsdk.data;
 
-import android.text.TextUtils;
-
-import com.tencent.mobileqq.qqguildsdk.data.genc.GGProMedalInfo;
-import com.tencent.mobileqq.qqguildsdk.data.genc.GGProNavigationInfo;
 import com.tencent.mobileqq.qqguildsdk.data.genc.IGProMedalInfo;
 import com.tencent.mobileqq.qqguildsdk.data.genc.IGProNavigationInfo;
-import com.tencent.qqnt.kernel.nativeinterface.GProGuild;
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildSpeakableThreshold;
-import com.tencent.qqnt.kernel.nativeinterface.GProMedalInfo;
-import com.tencent.qqnt.kernel.nativeinterface.GProNavigationInfo;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 
 
 public class GProGuildInfo implements IGProGuildInfo {

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/GProGuildRoleInfo.java

@@ -2,7 +2,7 @@ package com.tencent.mobileqq.qqguildsdk.data;
 
 import androidx.annotation.NonNull;
 
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
 
 import java.util.ArrayList;
 import java.util.Iterator;

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/GProRoleMemberListInfo.java

@@ -1,6 +1,6 @@
 package com.tencent.mobileqq.qqguildsdk.data;
 
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
 import com.tencent.qqnt.kernel.nativeinterface.GProUser;
 
 import java.util.ArrayList;

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/genc/GGProGuildMemberSearchResult.java

@@ -1,14 +1,9 @@
 package com.tencent.mobileqq.qqguildsdk.data.genc;
 
-import com.tencent.mobileqq.qqguildsdk.data.GProGuildRoleInfo;
-import com.tencent.mobileqq.qqguildsdk.data.GProUserInfo;
 import com.tencent.mobileqq.qqguildsdk.data.IGProGuildRoleInfo;
 import com.tencent.mobileqq.qqguildsdk.data.IGProUserInfo;
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole;
-import com.tencent.qqnt.kernel.nativeinterface.GProUser;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 
 public  class GGProGuildMemberSearchResult implements IGProGuildMemberSearchResult {
 

qqinterface/src/main/java/com/tencent/qphone/base/util/CodecWarpper.java

@@ -1,7 +1,9 @@
 package com.tencent.qphone.base.util;
 
 public abstract class CodecWarpper {
-    public abstract void onResponse(int i2, Object obj, int i3);
+//    public abstract void onResponse(int i2, Object obj, int i3);
+
+    public abstract void onInvalidData(int i2, int i3, String str);
 
     public abstract void onResponse(int i2, Object obj, int i3, byte[] bArr);
 

qqinterface/src/main/java/com/tencent/qqnt/aio/api/IAIOFileTransfer.java

@@ -1,8 +1,8 @@
 package com.tencent.qqnt.aio.api;
 
 import com.tencent.mobileqq.qroute.QRouteApi;
-import com.tencent.qqnt.kernel.nativeinterface.Contact;
 import com.tencent.qqnt.kernel.nativeinterface.IOperateCallback;
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
 
 public interface IAIOFileTransfer extends QRouteApi {
     void sendLocalFile(Contact contact, String path, IOperateCallback cb);

qqinterface/src/main/java/com/tencent/qqnt/kernel/api/impl/GroupService.java

@@ -0,0 +1,4 @@
+package com.tencent.qqnt.kernel.api.impl;
+
+public class GroupService {
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/ContactMsgBoxInfo.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
+
 import java.util.ArrayList;
 
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProJoinGuildResult.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 public  final class GProJoinGuildResult {
     GProGuild guildInfo;
     GProGuildInit guildInit;

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProJoinGuildsResult.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 import java.io.Serializable;
 
 public  final class GProJoinGuildsResult implements Serializable {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProRoleMemberList.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public  final class GProRoleMemberList {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProSearchMemberAndRoleResult.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public  final class GProSearchMemberAndRoleResult {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GrayTipGroupMember.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole;
+
 import java.io.Serializable;
 
 public final class GrayTipGroupMember implements Serializable {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupDetailInfo.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole;
+
 import java.util.ArrayList;
 
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupGuildNotifyInfo.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
+
 import java.util.ArrayList;
 
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupMemberCommonListResult.java

@@ -0,0 +1,36 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+import java.util.ArrayList;
+
+public class GroupMemberCommonListResult {
+    public long groupCode;
+    public int identifyFlag;
+    public long startUin;
+    public ArrayList<MemberCommonInfo> memberList = new ArrayList<>();
+    public String strErrorInfo = "";
+
+    public long getGroupCode() {
+        return this.groupCode;
+    }
+
+    public int getIdentifyFlag() {
+        return this.identifyFlag;
+    }
+
+    public ArrayList<MemberCommonInfo> getMemberList() {
+        return this.memberList;
+    }
+
+    public long getStartUin() {
+        return this.startUin;
+    }
+
+    public String getStrErrorInfo() {
+        return this.strErrorInfo;
+    }
+
+    public String toString() {
+        return "GroupMemberCommonListResult{groupCode=" + this.groupCode + ",startUin=" + this.startUin + ",identifyFlag=" + this.identifyFlag + ",memberList=" + this.memberList + ",strErrorInfo=" + this.strErrorInfo + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupMemberCommonReq.java

@@ -0,0 +1,101 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+import java.util.ArrayList;
+
+public class GroupMemberCommonReq {
+    public long groupCode;
+    public int sourceType;
+    public String startUin = "";
+    public String identifyFlag = "";
+    public ArrayList<Long> uinList = new ArrayList<>();
+    public MemberCommonInfoFilter memberCommonFilter = new MemberCommonInfoFilter();
+    public String memberNum = "";
+    public String filterMethod = "";
+    public String onlineFlag = "";
+    public String realSpecialTitleFlag = "";
+
+    public String getFilterMethod() {
+        return this.filterMethod;
+    }
+
+    public long getGroupCode() {
+        return this.groupCode;
+    }
+
+    public String getIdentifyFlag() {
+        return this.identifyFlag;
+    }
+
+    public MemberCommonInfoFilter getMemberCommonFilter() {
+        return this.memberCommonFilter;
+    }
+
+    public String getMemberNum() {
+        return this.memberNum;
+    }
+
+    public String getOnlineFlag() {
+        return this.onlineFlag;
+    }
+
+    public String getRealSpecialTitleFlag() {
+        return this.realSpecialTitleFlag;
+    }
+
+    public int getSourceType() {
+        return this.sourceType;
+    }
+
+    public String getStartUin() {
+        return this.startUin;
+    }
+
+    public ArrayList<Long> getUinList() {
+        return this.uinList;
+    }
+
+    public void setFilterMethod(String str) {
+        this.filterMethod = str;
+    }
+
+    public void setGroupCode(long j2) {
+        this.groupCode = j2;
+    }
+
+    public void setIdentifyFlag(String str) {
+        this.identifyFlag = str;
+    }
+
+    public void setMemberCommonFilter(MemberCommonInfoFilter memberCommonInfoFilter) {
+        this.memberCommonFilter = memberCommonInfoFilter;
+    }
+
+    public void setMemberNum(String str) {
+        this.memberNum = str;
+    }
+
+    public void setOnlineFlag(String str) {
+        this.onlineFlag = str;
+    }
+
+    public void setRealSpecialTitleFlag(String str) {
+        this.realSpecialTitleFlag = str;
+    }
+
+    public void setSourceType(int i2) {
+        this.sourceType = i2;
+    }
+
+    public void setStartUin(String str) {
+        this.startUin = str;
+    }
+
+    public void setUinList(ArrayList<Long> arrayList) {
+        this.uinList = arrayList;
+    }
+
+    public String toString() {
+        return "GroupMemberCommonReq{groupCode=" + this.groupCode + ",startUin=" + this.startUin + ",identifyFlag=" + this.identifyFlag + ",uinList=" + this.uinList + ",memberCommonFilter=" + this.memberCommonFilter + ",memberNum=" + this.memberNum + ",filterMethod=" + this.filterMethod + ",onlineFlag=" + this.onlineFlag + ",realSpecialTitleFlag=" + this.realSpecialTitleFlag + ",sourceType=" + this.sourceType + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupMemberExtListResult.java

@@ -0,0 +1,81 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+import java.util.ArrayList;
+
+public class GroupMemberExtListResult {
+    public long dataTime;
+    public long endUin;
+    public long groupCode;
+    public int levelNameSeq;
+    public int memberInfoSeq;
+    public int sysShowFlag;
+    public int timeToUpdate;
+    public int userShowFlag;
+    public int userShowFlagNew;
+    public ArrayList<MemberExtInfo> memberLevelInfo = new ArrayList<>();
+    public ArrayList<MemberLevelName> msgLevelName = new ArrayList<>();
+    public String strOwnerName = "";
+    public String strAdminName = "";
+    public ArrayList<MemberLevelName> msgLevelNameNew = new ArrayList<>();
+
+    public long getDataTime() {
+        return this.dataTime;
+    }
+
+    public long getEndUin() {
+        return this.endUin;
+    }
+
+    public long getGroupCode() {
+        return this.groupCode;
+    }
+
+    public int getLevelNameSeq() {
+        return this.levelNameSeq;
+    }
+
+    public int getMemberInfoSeq() {
+        return this.memberInfoSeq;
+    }
+
+    public ArrayList<MemberExtInfo> getMemberLevelInfo() {
+        return this.memberLevelInfo;
+    }
+
+    public ArrayList<MemberLevelName> getMsgLevelName() {
+        return this.msgLevelName;
+    }
+
+    public ArrayList<MemberLevelName> getMsgLevelNameNew() {
+        return this.msgLevelNameNew;
+    }
+
+    public String getStrAdminName() {
+        return this.strAdminName;
+    }
+
+    public String getStrOwnerName() {
+        return this.strOwnerName;
+    }
+
+    public int getSysShowFlag() {
+        return this.sysShowFlag;
+    }
+
+    public int getTimeToUpdate() {
+        return this.timeToUpdate;
+    }
+
+    public int getUserShowFlag() {
+        return this.userShowFlag;
+    }
+
+    public int getUserShowFlagNew() {
+        return this.userShowFlagNew;
+    }
+
+    public String toString() {
+        return "GroupMemberExtListResult{groupCode=" + this.groupCode + ",memberLevelInfo=" + this.memberLevelInfo + ",msgLevelName=" + this.msgLevelName + ",endUin=" + this.endUin + ",dataTime=" + this.dataTime + ",userShowFlag=" + this.userShowFlag + ",sysShowFlag=" + this.sysShowFlag + ",timeToUpdate=" + this.timeToUpdate + ",strOwnerName=" + this.strOwnerName + ",strAdminName=" + this.strAdminName + ",levelNameSeq=" + this.levelNameSeq + ",userShowFlagNew=" + this.userShowFlagNew + ",msgLevelNameNew=" + this.msgLevelNameNew + ",memberInfoSeq=" + this.memberInfoSeq + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupMemberExtReq.java

@@ -0,0 +1,101 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+import java.util.ArrayList;
+
+public class GroupMemberExtReq {
+    public long groupCode;
+    public int sourceType;
+    public String beginUin = "";
+    public String dataTime = "";
+    public ArrayList<Long> uinList = new ArrayList<>();
+    public MemberExtInfoFilter memberExtFilter = new MemberExtInfoFilter();
+    public String seq = "";
+    public String uinNum = "";
+    public String groupType = "";
+    public String richCardNameVer = "";
+
+    public String getBeginUin() {
+        return this.beginUin;
+    }
+
+    public String getDataTime() {
+        return this.dataTime;
+    }
+
+    public long getGroupCode() {
+        return this.groupCode;
+    }
+
+    public String getGroupType() {
+        return this.groupType;
+    }
+
+    public MemberExtInfoFilter getMemberExtFilter() {
+        return this.memberExtFilter;
+    }
+
+    public String getRichCardNameVer() {
+        return this.richCardNameVer;
+    }
+
+    public String getSeq() {
+        return this.seq;
+    }
+
+    public int getSourceType() {
+        return this.sourceType;
+    }
+
+    public ArrayList<Long> getUinList() {
+        return this.uinList;
+    }
+
+    public String getUinNum() {
+        return this.uinNum;
+    }
+
+    public void setBeginUin(String str) {
+        this.beginUin = str;
+    }
+
+    public void setDataTime(String str) {
+        this.dataTime = str;
+    }
+
+    public void setGroupCode(long j2) {
+        this.groupCode = j2;
+    }
+
+    public void setGroupType(String str) {
+        this.groupType = str;
+    }
+
+    public void setMemberExtFilter(MemberExtInfoFilter memberExtInfoFilter) {
+        this.memberExtFilter = memberExtInfoFilter;
+    }
+
+    public void setRichCardNameVer(String str) {
+        this.richCardNameVer = str;
+    }
+
+    public void setSeq(String str) {
+        this.seq = str;
+    }
+
+    public void setSourceType(int i2) {
+        this.sourceType = i2;
+    }
+
+    public void setUinList(ArrayList<Long> arrayList) {
+        this.uinList = arrayList;
+    }
+
+    public void setUinNum(String str) {
+        this.uinNum = str;
+    }
+
+    public String toString() {
+        return "GroupMemberExtReq{groupCode=" + this.groupCode + ",beginUin=" + this.beginUin + ",dataTime=" + this.dataTime + ",uinList=" + this.uinList + ",memberExtFilter=" + this.memberExtFilter + ",seq=" + this.seq + ",uinNum=" + this.uinNum + ",groupType=" + this.groupType + ",richCardNameVer=" + this.richCardNameVer + ",sourceType=" + this.sourceType + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupMemberListResult.java

@@ -0,0 +1,32 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class GroupMemberListResult {
+    public boolean finish;
+    public boolean hasRobot;
+    public ArrayList<GroupMemberInfoListId> ids = new ArrayList<>();
+    public HashMap<String, MemberInfo> infos = new HashMap<>();
+
+    public boolean getFinish() {
+        return this.finish;
+    }
+
+    public boolean getHasRobot() {
+        return this.hasRobot;
+    }
+
+    public ArrayList<GroupMemberInfoListId> getIds() {
+        return this.ids;
+    }
+
+    public HashMap<String, MemberInfo> getInfos() {
+        return this.infos;
+    }
+
+    public String toString() {
+        return "GroupMemberListResult{ids=" + this.ids + ",infos=" + this.infos + ",finish=" + this.finish + ",hasRobot=" + this.hasRobot + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GroupSimpleInfo.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole;
+
 public final class GroupSimpleInfo implements IKernelModel {
     String avatarUrl;
     int discussToGroupMaxMsgSeq;

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchChannelInvisibleRoleListCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public interface IGProFetchChannelInvisibleRoleListCallback {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchChannelLiveableRoleListCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public interface IGProFetchChannelLiveableRoleListCallback {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchGuildInfoCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 public interface IGProFetchGuildInfoCallback {
     void onFetchGuildInfo(int code, String reason, GProGuild gProGuild);
 }

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchGuildListCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 import java.util.ArrayList;
 
 public interface IGProFetchGuildListCallback {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProResultCallback.java

@@ -1,5 +0,0 @@
-package com.tencent.qqnt.kernel.nativeinterface;
-
-public interface IGProResultCallback {
-    void onResult(int code, String msg, GProSecurityResult result);
-}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGroupMemberCommonCallback.java

@@ -0,0 +1,6 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public interface IGroupMemberCommonCallback {
+    void onResult(int i2, String str, GroupMemberCommonListResult groupMemberCommonListResult);
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGroupMemberExtCallback.java

@@ -0,0 +1,5 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public interface IGroupMemberExtCallback {
+    void onResult(int i2, String str, GroupMemberExtListResult groupMemberExtListResult);
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGroupMemberListCallback.java

@@ -0,0 +1,6 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public interface IGroupMemberListCallback {
+    void onResult(int result, String str, GroupMemberListResult groupMemberListResult);
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelGroupService.java

@@ -1,7 +1,25 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import java.util.ArrayList;
+
 public interface IKernelGroupService {
     void getTransferableMemberInfo(long uin, IGetTransferableMemberCallback cb);
 
     long addKernelGroupListener(IKernelGroupListener ln);
+
+    void getAllMemberList(long groupCode, boolean refresh, IGroupMemberListCallback iGroupMemberListCallback);
+
+    void getMemberCommonInfo(GroupMemberCommonReq groupMemberCommonReq, IGroupMemberCommonCallback iGroupMemberCommonCallback);
+
+    void getMemberExtInfo(GroupMemberExtReq groupMemberExtReq, IGroupMemberExtCallback iGroupMemberExtCallback);
+
+    void getMemberInfo(long j2, ArrayList<String> arrayList, boolean z, IOperateCallback iOperateCallback);
+
+    void getMemberInfoForMqq(long groupCode, ArrayList<String> uids, boolean z, IGroupMemberListCallback iGroupMemberListCallback);
+
+    void getNextMemberList(String sceneId, GroupMemberInfoListId groupMemberInfoListId, int i2, IGroupMemberListCallback iGroupMemberListCallback);
+
+    void getPrevMemberList(String sceneId, GroupMemberInfoListId groupMemberInfoListId, int i2, IGroupMemberListCallback iGroupMemberListCallback);
+
+
 }

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelGuildListener.java

@@ -1,5 +1,8 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelGuildService.java

@@ -1,5 +1,14 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProRoleCreateInfo;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProCreateRoleCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchMemberListWithRoleCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchMemberRolesCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchRoleListPermissionCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchRolePermissionCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProResultCallback;
+
 import java.util.ArrayList;
 
 public interface IKernelGuildService {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelMsgListener.java

@@ -2,6 +2,7 @@ package com.tencent.qqnt.kernel.nativeinterface;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
 
 public interface IKernelMsgListener {
     void onAddSendMsg(MsgRecord msgRecord);
@@ -116,7 +117,7 @@ public interface IKernelMsgListener {
 
     void onSendMsgError(long j2, Contact contact, int i2, String str);
 
-    void onSysMsgNotification(int i2, long j2, long j3, ArrayList<Byte> arrayList);
+    void onSysMsgNotification(int i2, long j2, long j3, boolean z, ArrayList<Byte> arrayList);
 
     void onTempChatInfoUpdate(TempChatInfo tempChatInfo);
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelMsgService.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelRichMediaService.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
+
 import java.util.ArrayList;
 
 public interface IKernelRichMediaService {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IQQNTWrapperSession.java

@@ -19,11 +19,6 @@ public interface IQQNTWrapperSession {
             return null;
         }
 
-        @Override
-        public IKernelGuildService getGuildService() {
-            return null;
-        }
-
         @Override
         public IKernelMsgService getMsgService() {
             return null;
@@ -93,7 +88,7 @@ public interface IQQNTWrapperSession {
 
     //IKernelGroupService getGroupService();
 
-    IKernelGuildService getGuildService();
+    //IKernelGuildService getGuildService();
 
     IKernelMsgService getMsgService();
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/InlineKeyboardButton.java

@@ -2,17 +2,20 @@ package com.tencent.qqnt.kernel.nativeinterface;
 
 import java.util.ArrayList;
 
-
 public final class InlineKeyboardButton {
+    int anchor;
     boolean atBotShowChannelList;
     int clickLimit;
     String data;
+    boolean enter;
     String id;
+    boolean isReply;
     String label;
     int permissionType;
     ArrayList<String> specifyRoleIds;
     ArrayList<String> specifyTinyids;
     int style;
+    ArrayList<SubscribeMsgTemplateID> subscribeDataTemplateIds;
     int type;
     String unsupportTips;
     String visitedLabel;
@@ -25,6 +28,11 @@ public  final class InlineKeyboardButton {
         this.data = "";
         this.specifyRoleIds = new ArrayList<>();
         this.specifyTinyids = new ArrayList<>();
+        this.subscribeDataTemplateIds = new ArrayList<>();
+    }
+
+    public int getAnchor() {
+        return this.anchor;
     }
 
     public boolean getAtBotShowChannelList() {
@@ -39,10 +47,18 @@ public  final class InlineKeyboardButton {
         return this.data;
     }
 
+    public boolean getEnter() {
+        return this.enter;
+    }
+
     public String getId() {
         return this.id;
     }
 
+    public boolean getIsReply() {
+        return this.isReply;
+    }
+
     public String getLabel() {
         return this.label;
     }
@@ -63,6 +79,10 @@ public  final class InlineKeyboardButton {
         return this.style;
     }
 
+    public ArrayList<SubscribeMsgTemplateID> getSubscribeDataTemplateIds() {
+        return this.subscribeDataTemplateIds;
+    }
+
     public int getType() {
         return this.type;
     }
@@ -76,14 +96,14 @@ public  final class InlineKeyboardButton {
     }
 
     public String toString() {
-        return "InlineKeyboardButton{id=" + this.id + ",label=" + this.label + ",visitedLabel=" + this.visitedLabel + ",style=" + this.style + ",type=" + this.type + ",clickLimit=" + this.clickLimit + ",unsupportTips=" + this.unsupportTips + ",data=" + this.data + ",atBotShowChannelList=" + this.atBotShowChannelList + ",permissionType=" + this.permissionType + ",specifyRoleIds=" + this.specifyRoleIds + ",specifyTinyids=" + this.specifyTinyids + ",}";
+        return "InlineKeyboardButton{id=" + this.id + ",label=" + this.label + ",visitedLabel=" + this.visitedLabel + ",style=" + this.style + ",type=" + this.type + ",clickLimit=" + this.clickLimit + ",unsupportTips=" + this.unsupportTips + ",data=" + this.data + ",atBotShowChannelList=" + this.atBotShowChannelList + ",permissionType=" + this.permissionType + ",specifyRoleIds=" + this.specifyRoleIds + ",specifyTinyids=" + this.specifyTinyids + ",isReply=" + this.isReply + ",anchor=" + this.anchor + ",enter=" + this.enter + ",subscribeDataTemplateIds=" + this.subscribeDataTemplateIds + ",}";
     }
 
-    public InlineKeyboardButton(String str, String str2, String str3, int i, int i2, int i3, String str4, String str5, boolean z, int i4, ArrayList<String> arrayList, ArrayList<String> arrayList2, boolean z2, int i5, boolean z3, ArrayList<SubscribeMsgTemplateID> arrayList3) {
+    public InlineKeyboardButton(String str, String str2, String str3, int i, int i2, int i3, String str4, String str5, boolean z, int i4, ArrayList<String> arrayList, ArrayList<String> arrayList2) {
 
     }
 
-    public InlineKeyboardButton(String str, String str2, String str3, int i2, int i3, int i4, String str4, String str5, boolean z, int i5, ArrayList<String> arrayList, ArrayList<String> arrayList2) {
+    public InlineKeyboardButton(String str, String str2, String str3, int i2, int i3, int i4, String str4, String str5, boolean z, int i5, ArrayList<String> arrayList, ArrayList<String> arrayList2, boolean z2, int i6, boolean z3, ArrayList<SubscribeMsgTemplateID> arrayList3) {
         this.id = "";
         this.label = "";
         this.visitedLabel = "";
@@ -91,6 +111,7 @@ public  final class InlineKeyboardButton {
         this.data = "";
         this.specifyRoleIds = new ArrayList<>();
         this.specifyTinyids = new ArrayList<>();
+        this.subscribeDataTemplateIds = new ArrayList<>();
         this.id = str;
         this.label = str2;
         this.visitedLabel = str3;
@@ -103,5 +124,9 @@ public  final class InlineKeyboardButton {
         this.permissionType = i5;
         this.specifyRoleIds = arrayList;
         this.specifyTinyids = arrayList2;
+        this.isReply = z2;
+        this.anchor = i6;
+        this.enter = z3;
+        this.subscribeDataTemplateIds = arrayList3;
     }
 }

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MemberCommonInfo.java

@@ -0,0 +1,63 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class MemberCommonInfo {
+    public long memberUin;
+    public int privilege;
+    public int shutUpTime;
+    public int uinFlag;
+    public int uinFlagExt;
+    public int uinMobileFlag;
+
+    public long getMemberUin() {
+        return this.memberUin;
+    }
+
+    public int getPrivilege() {
+        return this.privilege;
+    }
+
+    public int getShutUpTime() {
+        return this.shutUpTime;
+    }
+
+    public int getUinFlag() {
+        return this.uinFlag;
+    }
+
+    public int getUinFlagExt() {
+        return this.uinFlagExt;
+    }
+
+    public int getUinMobileFlag() {
+        return this.uinMobileFlag;
+    }
+
+    public void setMemberUin(long j2) {
+        this.memberUin = j2;
+    }
+
+    public void setPrivilege(int i2) {
+        this.privilege = i2;
+    }
+
+    public void setShutUpTime(int i2) {
+        this.shutUpTime = i2;
+    }
+
+    public void setUinFlag(int i2) {
+        this.uinFlag = i2;
+    }
+
+    public void setUinFlagExt(int i2) {
+        this.uinFlagExt = i2;
+    }
+
+    public void setUinMobileFlag(int i2) {
+        this.uinMobileFlag = i2;
+    }
+
+    public String toString() {
+        return "MemberCommonInfo{memberUin=" + this.memberUin + ",uinFlag=" + this.uinFlag + ",uinFlagExt=" + this.uinFlagExt + ",uinMobileFlag=" + this.uinMobileFlag + ",shutUpTime=" + this.shutUpTime + ",privilege=" + this.privilege + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MemberCommonInfoFilter.java

@@ -0,0 +1,63 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class MemberCommonInfoFilter {
+    public int memberUin;
+    public int privilege;
+    public int shutUpTime;
+    public int uinFlag;
+    public int uinFlagExt;
+    public int uinMobileFlag;
+
+    public int getMemberUin() {
+        return this.memberUin;
+    }
+
+    public int getPrivilege() {
+        return this.privilege;
+    }
+
+    public int getShutUpTime() {
+        return this.shutUpTime;
+    }
+
+    public int getUinFlag() {
+        return this.uinFlag;
+    }
+
+    public int getUinFlagExt() {
+        return this.uinFlagExt;
+    }
+
+    public int getUinMobileFlag() {
+        return this.uinMobileFlag;
+    }
+
+    public void setMemberUin(int i2) {
+        this.memberUin = i2;
+    }
+
+    public void setPrivilege(int i2) {
+        this.privilege = i2;
+    }
+
+    public void setShutUpTime(int i2) {
+        this.shutUpTime = i2;
+    }
+
+    public void setUinFlag(int i2) {
+        this.uinFlag = i2;
+    }
+
+    public void setUinFlagExt(int i2) {
+        this.uinFlagExt = i2;
+    }
+
+    public void setUinMobileFlag(int i2) {
+        this.uinMobileFlag = i2;
+    }
+
+    public String toString() {
+        return "MemberCommonInfoFilter{memberUin=" + this.memberUin + ",uinFlag=" + this.uinFlag + ",uinFlagExt=" + this.uinFlagExt + ",uinMobileFlag=" + this.uinMobileFlag + ",shutUpTime=" + this.shutUpTime + ",privilege=" + this.privilege + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MemberExtInfo.java

@@ -0,0 +1,110 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+import java.util.ArrayList;
+
+public class MemberExtInfo {
+    public int activeDay;
+    public int cmdUinFlagExt3Grocery;
+    public int level;
+    public int point;
+    public long specialTitleExpireTime;
+    public long uin;
+    public String strName = "";
+    public String nickName = "";
+    public String specialTitle = "";
+    public byte[] msgNeedField = new byte[0];
+    public ArrayList<MemberIcon> memberIconList = new ArrayList<>();
+
+    public int getActiveDay() {
+        return this.activeDay;
+    }
+
+    public int getCmdUinFlagExt3Grocery() {
+        return this.cmdUinFlagExt3Grocery;
+    }
+
+    public int getLevel() {
+        return this.level;
+    }
+
+    public ArrayList<MemberIcon> getMemberIconList() {
+        return this.memberIconList;
+    }
+
+    public byte[] getMsgNeedField() {
+        return this.msgNeedField;
+    }
+
+    public String getNickName() {
+        return this.nickName;
+    }
+
+    public int getPoint() {
+        return this.point;
+    }
+
+    public String getSpecialTitle() {
+        return this.specialTitle;
+    }
+
+    public long getSpecialTitleExpireTime() {
+        return this.specialTitleExpireTime;
+    }
+
+    public String getStrName() {
+        return this.strName;
+    }
+
+    public long getUin() {
+        return this.uin;
+    }
+
+    public void setActiveDay(int i2) {
+        this.activeDay = i2;
+    }
+
+    public void setCmdUinFlagExt3Grocery(int i2) {
+        this.cmdUinFlagExt3Grocery = i2;
+    }
+
+    public void setLevel(int i2) {
+        this.level = i2;
+    }
+
+    public void setMemberIconList(ArrayList<MemberIcon> arrayList) {
+        this.memberIconList = arrayList;
+    }
+
+    public void setMsgNeedField(byte[] bArr) {
+        this.msgNeedField = bArr;
+    }
+
+    public void setNickName(String str) {
+        this.nickName = str;
+    }
+
+    public void setPoint(int i2) {
+        this.point = i2;
+    }
+
+    public void setSpecialTitle(String str) {
+        this.specialTitle = str;
+    }
+
+    public void setSpecialTitleExpireTime(long j2) {
+        this.specialTitleExpireTime = j2;
+    }
+
+    public void setStrName(String str) {
+        this.strName = str;
+    }
+
+    public void setUin(long j2) {
+        this.uin = j2;
+    }
+
+    public String toString() {
+        return "MemberExtInfo{uin=" + this.uin + ",point=" + this.point + ",activeDay=" + this.activeDay + ",level=" + this.level + ",strName=" + this.strName + ",nickName=" + this.nickName + ",specialTitle=" + this.specialTitle + ",specialTitleExpireTime=" + this.specialTitleExpireTime + ",msgNeedField=" + this.msgNeedField + ",cmdUinFlagExt3Grocery=" + this.cmdUinFlagExt3Grocery + ",memberIconList=" + this.memberIconList + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MemberExtInfoFilter.java

@@ -0,0 +1,171 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class MemberExtInfoFilter {
+    public int cmdUinFlagExt3Grocery;
+    public int dataTime;
+    public int levelName;
+    public int levelNameNew;
+    public int memberIcon;
+    public int memberInfoSeq;
+    public int memberLevelInfoActiveDay;
+    public int memberLevelInfoLevel;
+    public int memberLevelInfoName;
+    public int memberLevelInfoPoint;
+    public int memberLevelInfoUin;
+    public int msgNeedField;
+    public int nickName;
+    public int specialTitle;
+    public int sysShowFlag;
+    public int timeToUpdate;
+    public int userShowFlag;
+    public int userShowFlagNew;
+
+    public int getCmdUinFlagExt3Grocery() {
+        return this.cmdUinFlagExt3Grocery;
+    }
+
+    public int getDataTime() {
+        return this.dataTime;
+    }
+
+    public int getLevelName() {
+        return this.levelName;
+    }
+
+    public int getLevelNameNew() {
+        return this.levelNameNew;
+    }
+
+    public int getMemberIcon() {
+        return this.memberIcon;
+    }
+
+    public int getMemberInfoSeq() {
+        return this.memberInfoSeq;
+    }
+
+    public int getMemberLevelInfoActiveDay() {
+        return this.memberLevelInfoActiveDay;
+    }
+
+    public int getMemberLevelInfoLevel() {
+        return this.memberLevelInfoLevel;
+    }
+
+    public int getMemberLevelInfoName() {
+        return this.memberLevelInfoName;
+    }
+
+    public int getMemberLevelInfoPoint() {
+        return this.memberLevelInfoPoint;
+    }
+
+    public int getMemberLevelInfoUin() {
+        return this.memberLevelInfoUin;
+    }
+
+    public int getMsgNeedField() {
+        return this.msgNeedField;
+    }
+
+    public int getNickName() {
+        return this.nickName;
+    }
+
+    public int getSpecialTitle() {
+        return this.specialTitle;
+    }
+
+    public int getSysShowFlag() {
+        return this.sysShowFlag;
+    }
+
+    public int getTimeToUpdate() {
+        return this.timeToUpdate;
+    }
+
+    public int getUserShowFlag() {
+        return this.userShowFlag;
+    }
+
+    public int getUserShowFlagNew() {
+        return this.userShowFlagNew;
+    }
+
+    public void setCmdUinFlagExt3Grocery(int i2) {
+        this.cmdUinFlagExt3Grocery = i2;
+    }
+
+    public void setDataTime(int i2) {
+        this.dataTime = i2;
+    }
+
+    public void setLevelName(int i2) {
+        this.levelName = i2;
+    }
+
+    public void setLevelNameNew(int i2) {
+        this.levelNameNew = i2;
+    }
+
+    public void setMemberIcon(int i2) {
+        this.memberIcon = i2;
+    }
+
+    public void setMemberInfoSeq(int i2) {
+        this.memberInfoSeq = i2;
+    }
+
+    public void setMemberLevelInfoActiveDay(int i2) {
+        this.memberLevelInfoActiveDay = i2;
+    }
+
+    public void setMemberLevelInfoLevel(int i2) {
+        this.memberLevelInfoLevel = i2;
+    }
+
+    public void setMemberLevelInfoName(int i2) {
+        this.memberLevelInfoName = i2;
+    }
+
+    public void setMemberLevelInfoPoint(int i2) {
+        this.memberLevelInfoPoint = i2;
+    }
+
+    public void setMemberLevelInfoUin(int i2) {
+        this.memberLevelInfoUin = i2;
+    }
+
+    public void setMsgNeedField(int i2) {
+        this.msgNeedField = i2;
+    }
+
+    public void setNickName(int i2) {
+        this.nickName = i2;
+    }
+
+    public void setSpecialTitle(int i2) {
+        this.specialTitle = i2;
+    }
+
+    public void setSysShowFlag(int i2) {
+        this.sysShowFlag = i2;
+    }
+
+    public void setTimeToUpdate(int i2) {
+        this.timeToUpdate = i2;
+    }
+
+    public void setUserShowFlag(int i2) {
+        this.userShowFlag = i2;
+    }
+
+    public void setUserShowFlagNew(int i2) {
+        this.userShowFlagNew = i2;
+    }
+
+    public String toString() {
+        return "MemberExtInfoFilter{memberLevelInfoUin=" + this.memberLevelInfoUin + ",memberLevelInfoPoint=" + this.memberLevelInfoPoint + ",memberLevelInfoActiveDay=" + this.memberLevelInfoActiveDay + ",memberLevelInfoLevel=" + this.memberLevelInfoLevel + ",memberLevelInfoName=" + this.memberLevelInfoName + ",levelName=" + this.levelName + ",dataTime=" + this.dataTime + ",userShowFlag=" + this.userShowFlag + ",sysShowFlag=" + this.sysShowFlag + ",timeToUpdate=" + this.timeToUpdate + ",nickName=" + this.nickName + ",specialTitle=" + this.specialTitle + ",levelNameNew=" + this.levelNameNew + ",userShowFlagNew=" + this.userShowFlagNew + ",msgNeedField=" + this.msgNeedField + ",cmdUinFlagExt3Grocery=" + this.cmdUinFlagExt3Grocery + ",memberIcon=" + this.memberIcon + ",memberInfoSeq=" + this.memberInfoSeq + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MemberIcon.java

@@ -0,0 +1,29 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class MemberIcon {
+    public int bizId;
+    public byte[] exInfo = new byte[0];
+    public long expireTime;
+    public int resId;
+
+    public int getBizId() {
+        return this.bizId;
+    }
+
+    public byte[] getExInfo() {
+        return this.exInfo;
+    }
+
+    public long getExpireTime() {
+        return this.expireTime;
+    }
+
+    public int getResId() {
+        return this.resId;
+    }
+
+    public String toString() {
+        return "MemberIcon{resId=" + this.resId + ",expireTime=" + this.expireTime + ",bizId=" + this.bizId + ",exInfo=" + this.exInfo + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MemberInfo.java

@@ -1,51 +1,146 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
-public final class MemberInfo implements IKernelModel {
-    String avatarPath;
-    String cardName;
-    int cardType;
-    boolean isDelete;
-    boolean isSpecialConcerned;
-    String nick;
-    String qid;
-    String remark;
-    MemberRole role;
-    long serialVersionUID;
-    int shutUpTime;
-    String uid;
-    long uin;
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole;
 
-    public MemberInfo() {
-        this.serialVersionUID = 1L;
-        this.uid = "";
-        this.qid = "";
-        this.nick = "";
-        this.remark = "";
-        this.cardName = "";
-        this.role = MemberRole.values()[0];
-        this.avatarPath = "";
+public final class MemberInfo implements IKernelModel {
+    public int bigClubFlag;
+    public int bigClubLevel;
+    public int cardNameId;
+    public int cardType;
+    public int creditLevel;
+    public int globalGroupLevel;
+    public int globalGroupPoint;
+    public boolean isDelete;
+    public boolean isRobot;
+    public boolean isSpecialConcerned;
+    public boolean isSpecialShielded;
+    public int joinTime;
+    public int lastSpeakTime;
+    public int memberFlag;
+    public int memberFlagExt;
+    public int memberFlagExt2;
+    public int memberLevel;
+    public int memberMobileFlag;
+    public int memberTitleId;
+    public int mssVipType;
+    public int richFlag;
+    public int shutUpTime;
+    public long specialTitleExpireTime;
+    public long uin;
+    public int userShowFlag;
+    public int userShowFlagNew;
+    long serialVersionUID = 1;
+    public String uid = "";
+    public String qid = "";
+    public String nick = "";
+    public String remark = "";
+    public String cardName = "";
+    public MemberRole role = MemberRole.values()[0];
+    public String avatarPath = "";
+    public byte[] groupHonor = new byte[0];
+    public String memberSpecialTitle = "";
+    public String autoRemark = "";
+
+    public String getAutoRemark() {
+        return this.autoRemark;
     }
 
     public String getAvatarPath() {
         return this.avatarPath;
     }
 
+    public int getBigClubFlag() {
+        return this.bigClubFlag;
+    }
+
+    public int getBigClubLevel() {
+        return this.bigClubLevel;
+    }
+
     public String getCardName() {
         return this.cardName;
     }
 
+    public int getCardNameId() {
+        return this.cardNameId;
+    }
+
     public int getCardType() {
         return this.cardType;
     }
 
+    public int getCreditLevel() {
+        return this.creditLevel;
+    }
+
+    public int getGlobalGroupLevel() {
+        return this.globalGroupLevel;
+    }
+
+    public int getGlobalGroupPoint() {
+        return this.globalGroupPoint;
+    }
+
+    public byte[] getGroupHonor() {
+        return this.groupHonor;
+    }
+
     public boolean getIsDelete() {
         return this.isDelete;
     }
 
+    public boolean getIsRobot() {
+        return this.isRobot;
+    }
+
     public boolean getIsSpecialConcerned() {
         return this.isSpecialConcerned;
     }
 
+    public boolean getIsSpecialShielded() {
+        return this.isSpecialShielded;
+    }
+
+    public int getJoinTime() {
+        return this.joinTime;
+    }
+
+    public int getLastSpeakTime() {
+        return this.lastSpeakTime;
+    }
+
+    public int getMemberFlag() {
+        return this.memberFlag;
+    }
+
+    public int getMemberFlagExt() {
+        return this.memberFlagExt;
+    }
+
+    public int getMemberFlagExt2() {
+        return this.memberFlagExt2;
+    }
+
+    public int getMemberLevel() {
+        return this.memberLevel;
+    }
+
+    public int getMemberMobileFlag() {
+        return this.memberMobileFlag;
+    }
+
+    public String getMemberSpecialTitle() {
+        return this.memberSpecialTitle;
+    }
+
+    public int getMemberTitleId() {
+        return this.memberTitleId;
+    }
+
+    public int getMssVipType() {
+        return this.mssVipType;
+    }
+
     public String getNick() {
         return this.nick;
     }
@@ -58,6 +153,10 @@ public final class MemberInfo implements IKernelModel {
         return this.remark;
     }
 
+    public int getRichFlag() {
+        return this.richFlag;
+    }
+
     public MemberRole getRole() {
         return this.role;
     }
@@ -66,6 +165,10 @@ public final class MemberInfo implements IKernelModel {
         return this.shutUpTime;
     }
 
+    public long getSpecialTitleExpireTime() {
+        return this.specialTitleExpireTime;
+    }
+
     public String getUid() {
         return this.uid;
     }
@@ -74,26 +177,114 @@ public final class MemberInfo implements IKernelModel {
         return this.uin;
     }
 
+    public int getUserShowFlag() {
+        return this.userShowFlag;
+    }
+
+    public int getUserShowFlagNew() {
+        return this.userShowFlagNew;
+    }
+
+    public void setAutoRemark(String str) {
+        this.autoRemark = str;
+    }
+
     public void setAvatarPath(String str) {
         this.avatarPath = str;
     }
 
+    public void setBigClubFlag(int i2) {
+        this.bigClubFlag = i2;
+    }
+
+    public void setBigClubLevel(int i2) {
+        this.bigClubLevel = i2;
+    }
+
     public void setCardName(String str) {
         this.cardName = str;
     }
 
+    public void setCardNameId(int i2) {
+        this.cardNameId = i2;
+    }
+
     public void setCardType(int i2) {
         this.cardType = i2;
     }
 
+    public void setCreditLevel(int i2) {
+        this.creditLevel = i2;
+    }
+
+    public void setGlobalGroupLevel(int i2) {
+        this.globalGroupLevel = i2;
+    }
+
+    public void setGlobalGroupPoint(int i2) {
+        this.globalGroupPoint = i2;
+    }
+
+    public void setGroupHonor(byte[] bArr) {
+        this.groupHonor = bArr;
+    }
+
     public void setIsDelete(boolean z) {
         this.isDelete = z;
     }
 
+    public void setIsRobot(boolean z) {
+        this.isRobot = z;
+    }
+
     public void setIsSpecialConcerned(boolean z) {
         this.isSpecialConcerned = z;
     }
 
+    public void setIsSpecialShielded(boolean z) {
+        this.isSpecialShielded = z;
+    }
+
+    public void setJoinTime(int i2) {
+        this.joinTime = i2;
+    }
+
+    public void setLastSpeakTime(int i2) {
+        this.lastSpeakTime = i2;
+    }
+
+    public void setMemberFlag(int i2) {
+        this.memberFlag = i2;
+    }
+
+    public void setMemberFlagExt(int i2) {
+        this.memberFlagExt = i2;
+    }
+
+    public void setMemberFlagExt2(int i2) {
+        this.memberFlagExt2 = i2;
+    }
+
+    public void setMemberLevel(int i2) {
+        this.memberLevel = i2;
+    }
+
+    public void setMemberMobileFlag(int i2) {
+        this.memberMobileFlag = i2;
+    }
+
+    public void setMemberSpecialTitle(String str) {
+        this.memberSpecialTitle = str;
+    }
+
+    public void setMemberTitleId(int i2) {
+        this.memberTitleId = i2;
+    }
+
+    public void setMssVipType(int i2) {
+        this.mssVipType = i2;
+    }
+
     public void setNick(String str) {
         this.nick = str;
     }
@@ -106,6 +297,10 @@ public final class MemberInfo implements IKernelModel {
         this.remark = str;
     }
 
+    public void setRichFlag(int i2) {
+        this.richFlag = i2;
+    }
+
     public void setRole(MemberRole memberRole) {
         this.role = memberRole;
     }
@@ -114,6 +309,10 @@ public final class MemberInfo implements IKernelModel {
         this.shutUpTime = i2;
     }
 
+    public void setSpecialTitleExpireTime(long j2) {
+        this.specialTitleExpireTime = j2;
+    }
+
     public void setUid(String str) {
         this.uid = str;
     }
@@ -122,30 +321,16 @@ public final class MemberInfo implements IKernelModel {
         this.uin = j2;
     }
 
-    public String toString() {
-        return "MemberInfo{uid=" + this.uid + ",qid=" + this.qid + ",uin=" + this.uin + ",nick=" + this.nick + ",remark=" + this.remark + ",cardType=" + this.cardType + ",cardName=" + this.cardName + ",role=" + this.role + ",avatarPath=" + this.avatarPath + ",shutUpTime=" + this.shutUpTime + ",isDelete=" + this.isDelete + ",isSpecialConcerned=" + this.isSpecialConcerned + ",}";
+    public void setUserShowFlag(int i2) {
+        this.userShowFlag = i2;
     }
 
-    public MemberInfo(String str, String str2, long j2, String str3, String str4, int i2, String str5, MemberRole memberRole, String str6, int i3, boolean z, boolean z2) {
-        this.serialVersionUID = 1L;
-        this.uid = "";
-        this.qid = "";
-        this.nick = "";
-        this.remark = "";
-        this.cardName = "";
-        this.role = MemberRole.values()[0];
-        this.avatarPath = "";
-        this.uid = str;
-        this.qid = str2;
-        this.uin = j2;
-        this.nick = str3;
-        this.remark = str4;
-        this.cardType = i2;
-        this.cardName = str5;
-        this.role = memberRole;
-        this.avatarPath = str6;
-        this.shutUpTime = i3;
-        this.isDelete = z;
-        this.isSpecialConcerned = z2;
+    public void setUserShowFlagNew(int i2) {
+        this.userShowFlagNew = i2;
     }
+
+    public String toString() {
+        return "MemberInfo{uid=" + this.uid + ",qid=" + this.qid + ",uin=" + this.uin + ",nick=" + this.nick + ",remark=" + this.remark + ",cardType=" + this.cardType + ",cardName=" + this.cardName + ",role=" + this.role + ",avatarPath=" + this.avatarPath + ",shutUpTime=" + this.shutUpTime + ",isDelete=" + this.isDelete + ",isSpecialConcerned=" + this.isSpecialConcerned + ",isRobot=" + this.isRobot + ",groupHonor=" + this.groupHonor + ",memberLevel=" + this.memberLevel + ",globalGroupLevel=" + this.globalGroupLevel + ",globalGroupPoint=" + this.globalGroupPoint + ",memberTitleId=" + this.memberTitleId + ",memberSpecialTitle=" + this.memberSpecialTitle + ",specialTitleExpireTime=" + this.specialTitleExpireTime + ",userShowFlag=" + this.userShowFlag + ",userShowFlagNew=" + this.userShowFlagNew + ",richFlag=" + this.richFlag + ",mssVipType=" + this.mssVipType + ",bigClubLevel=" + this.bigClubLevel + ",bigClubFlag=" + this.bigClubFlag + ",autoRemark=" + this.autoRemark + ",creditLevel=" + this.creditLevel + ",joinTime=" + this.joinTime + ",lastSpeakTime=" + this.lastSpeakTime + ",memberFlag=" + this.memberFlag + ",memberFlagExt=" + this.memberFlagExt + ",memberMobileFlag=" + this.memberMobileFlag + ",memberFlagExt2=" + this.memberFlagExt2 + ",isSpecialShielded=" + this.isSpecialShielded + ",cardNameId=" + this.cardNameId + ",}";
+    }
+
 }

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MemberLevelName.java

@@ -0,0 +1,19 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class MemberLevelName {
+    public int level;
+    public String strName = "";
+
+    public int getLevel() {
+        return this.level;
+    }
+
+    public String getStrName() {
+        return this.strName;
+    }
+
+    public String toString() {
+        return "MemberLevelName{level=" + this.level + ",strName=" + this.strName + ",}";
+    }
+
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MsgAbstract.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/MsgRecord.java

@@ -39,6 +39,7 @@ public class MsgRecord {
     boolean isOnlineMsg;
     FromRoleInfo levelRoleInfo;
     HashMap<Integer, MsgAttributeInfo> msgAttrs;
+    byte[] msgEventInfo;
     long msgId;
     byte[] msgMeta;
     long msgRandom;
@@ -231,6 +232,10 @@ public class MsgRecord {
         return this.msgAttrs;
     }
 
+    public byte[] getMsgEventInfo() {
+        return this.msgEventInfo;
+    }
+
     public long getMsgId() {
         return this.msgId;
     }
@@ -332,10 +337,10 @@ public class MsgRecord {
     }
 
     public String toString() {
-        return "MsgRecord{msgId=" + this.msgId + ",msgRandom=" + this.msgRandom + ",msgSeq=" + this.msgSeq + ",cntSeq=" + this.cntSeq + ",chatType=" + this.chatType + ",msgType=" + this.msgType + ",subMsgType=" + this.subMsgType + ",sendType=" + this.sendType + ",senderUid=" + this.senderUid + ",peerUid=" + this.peerUid + ",channelId=" + this.channelId + ",guildId=" + this.guildId + ",guildCode=" + this.guildCode + ",fromUid=" + this.fromUid + ",fromAppid=" + this.fromAppid + ",msgTime=" + this.msgTime + ",msgMeta=" + this.msgMeta + ",sendStatus=" + this.sendStatus + ",sendRemarkName=" + this.sendRemarkName + ",sendMemberName=" + this.sendMemberName + ",sendNickName=" + this.sendNickName + ",guildName=" + this.guildName + ",channelName=" + this.channelName + ",elements=" + this.elements + ",records=" + this.records + ",emojiLikesList=" + this.emojiLikesList + ",commentCnt=" + this.commentCnt + ",directMsgFlag=" + this.directMsgFlag + ",directMsgMembers=" + this.directMsgMembers + ",peerName=" + this.peerName + ",freqLimitInfo=" + this.freqLimitInfo + ",editable=" + this.editable + ",avatarMeta=" + this.avatarMeta + ",avatarPendant=" + this.avatarPendant + ",feedId=" + this.feedId + ",roleId=" + this.roleId + ",timeStamp=" + this.timeStamp + ",clientIdentityInfo=" + this.clientIdentityInfo + ",isImportMsg=" + this.isImportMsg + ",atType=" + this.atType + ",roleType=" + this.roleType + ",fromChannelRoleInfo=" + this.fromChannelRoleInfo + ",fromGuildRoleInfo=" + this.fromGuildRoleInfo + ",levelRoleInfo=" + this.levelRoleInfo + ",recallTime=" + this.recallTime + ",isOnlineMsg=" + this.isOnlineMsg + ",generalFlags=" + this.generalFlags + ",clientSeq=" + this.clientSeq + ",fileGroupSize=" + this.fileGroupSize + ",foldingInfo=" + this.foldingInfo + ",multiTransInfo=" + this.multiTransInfo + ",senderUin=" + this.senderUin + ",peerUin=" + this.peerUin + ",msgAttrs=" + this.msgAttrs + ",anonymousExtInfo=" + this.anonymousExtInfo + ",nameType=" + this.nameType + ",avatarFlag=" + this.avatarFlag + ",extInfoForUI=" + this.extInfoForUI + ",personalMedal=" + this.personalMedal + ",categoryManage=" + this.categoryManage + ",}";
+        return "MsgRecord{msgId=" + this.msgId + ",msgRandom=" + this.msgRandom + ",msgSeq=" + this.msgSeq + ",cntSeq=" + this.cntSeq + ",chatType=" + this.chatType + ",msgType=" + this.msgType + ",subMsgType=" + this.subMsgType + ",sendType=" + this.sendType + ",senderUid=" + this.senderUid + ",peerUid=" + this.peerUid + ",channelId=" + this.channelId + ",guildId=" + this.guildId + ",guildCode=" + this.guildCode + ",fromUid=" + this.fromUid + ",fromAppid=" + this.fromAppid + ",msgTime=" + this.msgTime + ",msgMeta=" + this.msgMeta + ",sendStatus=" + this.sendStatus + ",sendRemarkName=" + this.sendRemarkName + ",sendMemberName=" + this.sendMemberName + ",sendNickName=" + this.sendNickName + ",guildName=" + this.guildName + ",channelName=" + this.channelName + ",elements=" + this.elements + ",records=" + this.records + ",emojiLikesList=" + this.emojiLikesList + ",commentCnt=" + this.commentCnt + ",directMsgFlag=" + this.directMsgFlag + ",directMsgMembers=" + this.directMsgMembers + ",peerName=" + this.peerName + ",freqLimitInfo=" + this.freqLimitInfo + ",editable=" + this.editable + ",avatarMeta=" + this.avatarMeta + ",avatarPendant=" + this.avatarPendant + ",feedId=" + this.feedId + ",roleId=" + this.roleId + ",timeStamp=" + this.timeStamp + ",clientIdentityInfo=" + this.clientIdentityInfo + ",isImportMsg=" + this.isImportMsg + ",atType=" + this.atType + ",roleType=" + this.roleType + ",fromChannelRoleInfo=" + this.fromChannelRoleInfo + ",fromGuildRoleInfo=" + this.fromGuildRoleInfo + ",levelRoleInfo=" + this.levelRoleInfo + ",recallTime=" + this.recallTime + ",isOnlineMsg=" + this.isOnlineMsg + ",generalFlags=" + this.generalFlags + ",clientSeq=" + this.clientSeq + ",fileGroupSize=" + this.fileGroupSize + ",foldingInfo=" + this.foldingInfo + ",multiTransInfo=" + this.multiTransInfo + ",senderUin=" + this.senderUin + ",peerUin=" + this.peerUin + ",msgAttrs=" + this.msgAttrs + ",anonymousExtInfo=" + this.anonymousExtInfo + ",nameType=" + this.nameType + ",avatarFlag=" + this.avatarFlag + ",extInfoForUI=" + this.extInfoForUI + ",personalMedal=" + this.personalMedal + ",categoryManage=" + this.categoryManage + ",msgEventInfo=" + this.msgEventInfo + ",}";
     }
 
-    public MsgRecord(long j2, long j3, long j4, long j5, int i2, int i3, int i4, int i5, String str, String str2, String str3, String str4, long j6, long j7, long j8, long j9, byte[] bArr, int i6, String str5, String str6, String str7, String str8, String str9, ArrayList<MsgElement> arrayList, ArrayList<MsgRecord> arrayList2, ArrayList<MsgEmojiLikes> arrayList3, long j10, int i7, ArrayList<DirectMsgMember> arrayList4, String str10, FreqLimitInfo freqLimitInfo, boolean z, String str11, String str12, String str13, long j11, long j12, GProClientIdentity gProClientIdentity, boolean z2, int i8, int i9, FromRoleInfo fromRoleInfo, FromRoleInfo fromRoleInfo2, FromRoleInfo fromRoleInfo3, long j13, boolean z3, byte[] bArr2, long j14, Integer num, FoldingInfo foldingInfo, MultiTransInfo multiTransInfo, long j15, long j16, HashMap<Integer, MsgAttributeInfo> hashMap, AnonymousExtInfo anonymousExtInfo, int i10, int i11, byte[] bArr3, GProMedal gProMedal, int i12) {
+    public MsgRecord(long j2, long j3, long j4, long j5, int i2, int i3, int i4, int i5, String str, String str2, String str3, String str4, long j6, long j7, long j8, long j9, byte[] bArr, int i6, String str5, String str6, String str7, String str8, String str9, ArrayList<MsgElement> arrayList, ArrayList<MsgRecord> arrayList2, ArrayList<MsgEmojiLikes> arrayList3, long j10, int i7, ArrayList<DirectMsgMember> arrayList4, String str10, FreqLimitInfo freqLimitInfo, boolean z, String str11, String str12, String str13, long j11, long j12, GProClientIdentity gProClientIdentity, boolean z2, int i8, int i9, FromRoleInfo fromRoleInfo, FromRoleInfo fromRoleInfo2, FromRoleInfo fromRoleInfo3, long j13, boolean z3, byte[] bArr2, long j14, Integer num, FoldingInfo foldingInfo, MultiTransInfo multiTransInfo, long j15, long j16, HashMap<Integer, MsgAttributeInfo> hashMap, AnonymousExtInfo anonymousExtInfo, int i10, int i11, byte[] bArr3, GProMedal gProMedal, int i12, byte[] bArr4) {
         this.senderUid = "";
         this.peerUid = "";
         this.channelId = "";
@@ -419,5 +424,6 @@ public class MsgRecord {
         this.extInfoForUI = bArr3;
         this.personalMedal = gProMedal;
         this.categoryManage = i12;
+        this.msgEventInfo = bArr4;
     }
 }

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/UnreadCntInfo.java

@@ -1,6 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
 
 public final class UnreadCntInfo {
     UnreadCnt allUnreadCnt;

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/GProGuild.java

@@ -1,7 +1,9 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProCmdUinInfo;
+import com.tencent.qqnt.kernel.nativeinterface.GProGuildInfo;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 
 public final class GProGuild implements Serializable {
     GProCmdUinInfo cmdUinInfo;

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/GProGuildRole.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermission;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/GProRoleCreateInfo.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermission;
 
 public  final class GProRoleCreateInfo {
     boolean bHoist;

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProCreateRoleCallback.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProSecurityResult;
 
 public interface IGProCreateRoleCallback {
     void onCreateRoleResult(int code, String msg, GProSecurityResult result, GProGuildRole role);

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchMemberListWithRoleCallback.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRoleMemberList;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchMemberRolesCallback.java

@@ -1,4 +1,4 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchRoleListPermissionCallback.java

@@ -1,4 +1,4 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchRolePermissionCallback.java

@@ -1,4 +1,8 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermission;
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermissionCategory;
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermissionDesc;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProResultCallback.java

@@ -0,0 +1,7 @@
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProSecurityResult;
+
+public interface IGProResultCallback {
+    void onResult(int code, String msg, GProSecurityResult result);
+}

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IKernelGuildService.java

@@ -0,0 +1,90 @@
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProFaceAuthInfo;
+import com.tencent.qqnt.kernel.nativeinterface.GProGuildReqInfo;
+import com.tencent.qqnt.kernel.nativeinterface.GProSimpleProfile;
+import com.tencent.qqnt.kernel.nativeinterface.IGProAddGuildInfoCallBack;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchChannelInvisibleRoleListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchChannelLiveableRoleListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchGuildInfoCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchGuildListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchRetentionGuildListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchUserJoinedGuildListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProGetMemberInfoByOpenIdCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProGetUserInfoCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IKernelGuildListener;
+
+import java.util.ArrayList;
+
+public interface IKernelGuildService {
+    void refreshGuildList(boolean isForced); // 只刷新id，详细信息需要额外获取
+
+    //ArrayList<GProQQMsgListGuild> getQQMsgListGuilds(); 啥也拿不到
+
+    void fetchGuildList(ArrayList<GProGuildReqInfo> reqInfos, byte[] cookie, int i2, IGProFetchGuildListCallback iGProFetchGuildListCallback);
+
+    void fetchRetentionGuildList(int i2, int i3, byte[] cookie, long j2, IGProFetchRetentionGuildListCallback iGProFetchRetentionGuildListCallback);
+
+    void fetchUserJoinedGuildList(long guildId, long tinyId, String cookie, IGProFetchUserJoinedGuildListCallback cb);
+
+    void addKernelGuildListener(IKernelGuildListener iKernelGuildListener);
+
+    void GetMemberInfoByOpenId(String str, long j2, boolean z, boolean z2, IGProGetMemberInfoByOpenIdCallback iGProGetMemberInfoByOpenIdCallback);
+
+    ArrayList<GProGuild> getGroupGuildListFromCache();
+
+    ArrayList<GProGuild> getGuildListFromCache();
+
+    void fetchAddGuildInfo(int appId, long guildId, IGProAddGuildInfoCallBack iGProAddGuildInfoCallBack);
+
+    void fetchGuildInfo(long guildId, int seq, IGProFetchGuildInfoCallback iGProFetchGuildInfoCallback);
+
+    //void fetchGuildInfoByAppIdentity(GProGuildIdentity gProGuildIdentity, String str, String str2, IGProFetchGuildInfoByAppIdentityCallback iGProFetchGuildInfoByAppIdentityCallback);
+
+    void fetchGuildInfoForGuest(long guildId, int seq, IGProFetchGuildInfoCallback cb);
+
+    //void fetchGuestGuildInfoWithChannelList(String guildId, String str2, int i2, int seq, String str3,
+    //                                        IGProFetchGuestGuildInfoWithChannelListCallback iGProFetchGuestGuildInfoWithChannelListCallback);
+
+    GProGuild getGuildInfoFromCache(long guildId);
+
+    // 第一次请求: startIndex = 0 , roleIdIndex = 2
+    void fetchMemberListWithRole(long guildId, long channelId, long startIndex, long roleIndex, int count, int seq, IGProFetchMemberListWithRoleCallback cb);
+
+    void refreshGuildInfo(long guildId, boolean force, int seq);
+
+    void refreshGuildInfoOnly(long j2, boolean z, int i2);
+
+    void refreshGuildUserProfileInfo(long guildId, long tinyId, int seq);
+
+    void fetchUserInfo(long guildId, long channelId, ArrayList<Long> tinyIdList, int seq, IGProGetUserInfoCallback cb);
+
+    //@Deprecated(since = "QQ新版本不支持创建话题子频道")
+    //void fetchTopFeeds(long guildId, long channelId, IGProFetchTopFeedsCallback cb);
+
+    void fetchChannelInvisibleRoleList(long guildId, long channelId, IGProFetchChannelInvisibleRoleListCallback cb);
+
+    void fetchChannelLiveableRoleList(long guildId, long channelId, IGProFetchChannelLiveableRoleListCallback cb);
+
+    void fetchMemberRoles(long guildId, long channelId, long tinyId, int seq, IGProFetchMemberRolesCallback cb);
+
+    void fetchRoleListWithPermission(long guildId, int seq, IGProFetchRoleListPermissionCallback cb);
+
+    void fetchRoleWithPermission(long guildId, long roleId, int seq, IGProFetchRolePermissionCallback cb);
+
+    GProSimpleProfile getSimpleProfile(long guildId, long tinyId, int seq);
+
+    GProFaceAuthInfo getFaceAuthInfo();
+
+    String getGuildUserAvatarUrl(long guildId, long tinyId, int seq);
+
+    String getGuildUserNickname(long guildId);
+
+    void deleteRole(long guild, long role, IGProResultCallback cb);
+
+    void setMemberRoles(long guild, long u1, long u2, long tinyId, ArrayList<Long> addRoles, ArrayList<Long> removeRoles, IGProResultCallback cb);
+
+    void setRoleInfo(long guild, long role, GProRoleCreateInfo info, IGProResultCallback cb);
+
+    void createRole(long guildId, GProRoleCreateInfo info, ArrayList<Long> initialUsers, IGProCreateRoleCallback cb);
+}

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IQQGProWrapperSession.java

@@ -0,0 +1,9 @@
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+public interface IQQGProWrapperSession {
+    IKernelGuildService getGuildService();
+
+    static class CppProxy {
+        public static native IQQGProWrapperSession getGProWrapperSession(String str);
+    }
+}

qqinterface/src/main/java/com/tencent/qqnt/kernelpublic/nativeinterface/Contact.java

@@ -0,0 +1,53 @@
+package com.tencent.qqnt.kernelpublic.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.IKernelModel;
+
+import java.io.Serializable;
+
+public final class Contact implements IKernelModel, Serializable {
+    int chatType;
+    String guildId;
+    String peerUid;
+    long serialVersionUID;
+
+    public Contact() {
+        this.serialVersionUID = 1L;
+        this.peerUid = "";
+        this.guildId = "";
+    }
+
+    public int getChatType() {
+        return this.chatType;
+    }
+
+    public String getGuildId() {
+        return this.guildId;
+    }
+
+    public String getPeerUid() {
+        return this.peerUid;
+    }
+
+    public void setChatType(int i2) {
+        this.chatType = i2;
+    }
+
+    public void setGuildId(String str) {
+        this.guildId = str;
+    }
+
+    public void setPeerUid(String str) {
+        this.peerUid = str;
+    }
+
+    public String toString() {
+        return "Contact{chatType=" + this.chatType + ",peerUid=" + this.peerUid + ",guildId=" + this.guildId + ",}";
+    }
+
+    public Contact(int i2, String str, String str2) {
+        this.serialVersionUID = 1L;
+        this.chatType = i2;
+        this.peerUid = str;
+        this.guildId = str2;
+    }
+}

qqinterface/src/main/java/com/tencent/qqnt/kernelpublic/nativeinterface/MemberRole.java

@@ -1,4 +1,4 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelpublic.nativeinterface;
 
 public enum MemberRole {
     UNSPECIFIED,

qqinterface/src/main/java/com/tencent/qqnt/msg/api/IMsgService.java

@@ -2,6 +2,7 @@ package com.tencent.qqnt.msg.api;
 
 import com.tencent.mobileqq.qroute.QRouteApi;
 import com.tencent.qqnt.kernel.nativeinterface.*;
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

qqinterface/src/main/java/com/tencent/qqnt/ntstartup/nativeinterface/IQQNTStartupSessionWrapper.java

@@ -0,0 +1,11 @@
+package com.tencent.qqnt.ntstartup.nativeinterface;
+
+import java.util.HashMap;
+
+public interface IQQNTStartupSessionWrapper {
+    HashMap<String, String> getSessionIdList();
+
+    int start();
+
+    int stop();
+}

qqinterface/src/main/java/com/tencent/qqnt/trooplist/ITroopListRepoApi.java

@@ -0,0 +1,45 @@
+package com.tencent.qqnt.trooplist;
+
+import androidx.lifecycle.LifecycleOwner;
+
+import com.tencent.mobileqq.data.troop.TroopInfo;
+import com.tencent.mobileqq.qroute.QRouteApi;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+
+public interface ITroopListRepoApi extends QRouteApi {
+    void fetchTroopLevelInfo(@NotNull String str, boolean z);
+
+    void fetchTroopList(boolean z);
+
+    //@NotNull
+    //a<Boolean> getFetchTroopListResultLiveData();
+
+    @NotNull
+    List<TroopInfo> getSortedValidTopTroopInfoFromCache();
+
+    @NotNull
+    List<TroopInfo> getSortedValidTroopInfoFromCache();
+
+    @NotNull
+    List<TroopInfo> getTopTroopListFromCache();
+
+    @Nullable
+    TroopInfo getTroopInfoFromCache(@NotNull String str);
+
+    @NotNull
+    List<TroopInfo> getTroopListFromCache();
+
+    //@Nullable
+    //a<List<TroopInfo>> getTroopListLiveData();
+
+    void preloadTroopList();
+
+    void requestSetTroopTop(@NotNull LifecycleOwner lifecycleOwner, @NotNull String str, boolean z, @NotNull Function1<? super Boolean, Unit> function1);
+}

qqinterface/src/main/java/com/tencent/qqnt/troopmemberlist/ITroopMemberListRepoApi.java

@@ -0,0 +1,75 @@
+package com.tencent.qqnt.troopmemberlist;
+
+import androidx.lifecycle.LifecycleOwner;
+
+import com.tencent.mobileqq.data.troop.TroopMemberInfo;
+import com.tencent.mobileqq.data.troop.TroopMemberNickInfo;
+import com.tencent.mobileqq.qroute.QRouteApi;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+
+import kotlin.Deprecated;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+
+public interface ITroopMemberListRepoApi extends QRouteApi {
+    //void fetchGagTroopMemberInfo(@Nullable String str, @Nullable LifecycleOwner lifecycleOwner, boolean z, @NotNull String str2, @Nullable f fVar);
+
+    //void fetchTroopMemberInfo(@Nullable String str, @Nullable String str2, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    //void fetchTroopMemberInfoWithExtInfo(@Nullable String str, @Nullable String str2, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    //void fetchTroopMemberList(@Nullable String str, @Nullable LifecycleOwner lifecycleOwner, boolean z, @NotNull String str2, @Nullable f fVar);
+
+    //void fetchTroopMemberListWithExtInfo(@Nullable String str, @Nullable LifecycleOwner lifecycleOwner, boolean z, @NotNull String str2, @Nullable f fVar);
+
+
+
+    void fetchTroopMemberName(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable Function1<? super TroopMemberNickInfo, Unit> cb);
+
+    void fetchTroopMemberName(@Nullable String str, @Nullable String str2, @NotNull String str3, @Nullable Function1<? super TroopMemberNickInfo, Unit> cb);
+
+
+
+    void fetchTroopMemberUid(@Nullable String str, @NotNull Function2<? super Boolean, ? super String, Unit> function2);
+
+    void fetchTroopMemberUid(@NotNull List<String> list, @NotNull Function2<? super Boolean, ? super Map<String, String>, Unit> function2);
+
+    void fetchTroopMemberUin(@Nullable String str, @NotNull Function2<? super Boolean, ? super String, Unit> function2);
+
+    void fetchTroopMemberUin(@NotNull List<String> list, @NotNull Function2<? super Boolean, ? super Map<String, String>, Unit> function2);
+
+    //void fetchTroopMemberUinListInfo(@Nullable String str, @Nullable List<String> list, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str2, @Nullable f fVar);
+
+    //void fetchTroopMemberUinListInfoWithExtInfo(@Nullable String str, @Nullable List<String> list, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str2, @Nullable f fVar);
+
+    //@Nullable
+    //TroopMemberInfo getTroopMemberFromCacheOrFetchAsync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    int getTroopMemberInfoDBVersion();
+
+    @Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    @Nullable
+    TroopMemberInfo getTroopMemberInfoSync(@Nullable String groupId, @Nullable String userId, @Nullable LifecycleOwner lifecycleOwner, @NotNull String from);
+
+    //@Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    //@Nullable
+    //TroopMemberInfo getTroopMemberInfoSync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, long j);
+
+    //@Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    //@Nullable
+    //TroopMemberInfo getTroopMemberWithExtFromCacheOrFetchAsync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    //@Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    //@Nullable
+    //TroopMemberInfo getTroopMemberWithExtInfoSync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3);
+
+    boolean isTroopMemberInfoDBInited(@NotNull String str);
+
+    //void preLoadTroopMemberUinListInfo(@Nullable String str, @Nullable List<String> list, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str2, @Nullable f fVar);
+}