Update bug.md

kritorをmasterブランチに設定する

.github/ISSUE_TEMPLATE/bug.md

@@ -21,6 +21,7 @@ labels: bug
 ## 系统信息
 
 - Shamrock 版本:
+- QQ 版本: 
 - Android 版本: 
 - LSPosed 框架版本: 
 - 设备的制造商和型号: 

.github/workflows/build-apk.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          submodules: recursive
 
       - name: Setup JDK 17
         uses: actions/setup-java@v4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "kritor"]
+	path = kritor/kritor
+	url = https://github.com/KarinJS/kritor

README.md

@@ -16,20 +16,39 @@
 
 ## 简介
 
-☘ 基于 Lsposed(**Non**-Riru) 实现 OneBot 标准的 QQ 机器人框架，原作者[**fuqiuluo**](https://github.com/fuqiuluo)已脱离开发，接下来由白池接手哦！本项目为OpenShamrock，不会有任何收费行为，欢迎大家的加入！
+☘ 基于 Lsposed(**Non**-Riru) 实现 Kritor 标准的 QQ 机器人框架！
 
 > 本项目仅提供学习与交流用途，请在24小时内删除。   
 > 本项目目的是研究 Xposed 和 LSPosed 框架的使用。 Epic 框架开发相关知识。  
 > Riru可能导致封禁，请减少使用。
 > 如有违反法律，请联系删除。
 > 请勿在任何平台宣传，宣扬，转发本项目，请勿恶意修改企业安装包造成相关企业产生损失，如有违背，必将追责到底。
-> 官方论坛，[点我直达](https://forum.libfekit.so/)！
+> 
+> 社区地址：[discord](https://discord.gg/MKR2wz863h)
 
 ## 兼容|迁移|替代 说明
 
+仅支持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>
 
 ## 权限声明
 

annotations/build.gradle.kts

@@ -9,6 +9,6 @@ java {
 }
 
 dependencies {
-    implementation(DEPENDENCY_PROTOBUF)
+    //implementation(DEPENDENCY_PROTOBUF)
     implementation(kotlinx("serialization-protobuf", "1.6.2"))
 }

annotations/src/main/java/kritor/service/Grpc.kt

@@ -0,0 +1,9 @@
+package kritor.service
+
+@Retention(AnnotationRetention.SOURCE)
+@Target(AnnotationTarget.FUNCTION)
+annotation class Grpc(
+    val serviceName: String,
+    val funcName: String,
+
+)

annotations/src/main/java/moe/fuqiuluo/symbols/OneBotHandler.kt

@@ -1,8 +0,0 @@
-package moe.fuqiuluo.symbols
-
-@Retention(AnnotationRetention.SOURCE)
-@Target(AnnotationTarget.CLASS)
-annotation class OneBotHandler(
-    val actionName: String,
-    val alias: Array<String> = []
-)

annotations/src/main/java/moe/fuqiuluo/symbols/Protobuf.kt

@@ -5,6 +5,8 @@ import kotlinx.serialization.protobuf.ProtoBuf
 
 import kotlin.reflect.KClass
 
+val EMPTY_BYTE_ARRAY = ByteArray(0)
+
 interface Protobuf<T: Protobuf<T>>
 
 inline fun <reified T: Protobuf<T>> ByteArray.decodeProtobuf(to: KClass<T>? = null): T {

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" + ".r${getGitCommitCount()}." + getVersionName()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -201,14 +201,8 @@ dependencies {
     implementation("io.coil-kt:coil-compose:2.4.0")
 
     implementation(kotlinx("io-jvm", "0.1.16"))
-    implementation(ktor("server", "core"))
-    implementation(ktor("server", "host-common"))
-    implementation(ktor("server", "status-pages"))
-    implementation(ktor("server", "netty"))
-    implementation(ktor("server", "content-negotiation"))
     implementation(ktor("client", "core"))
-    implementation(ktor("client", "content-negotiation"))
+    implementation(ktor("client", "okhttp"))
-    implementation(ktor("client", "cio"))
     implementation(ktor("serialization", "kotlinx-json"))
 
     implementation(project(":xposed"))

app/src/main/cpp/CMakeLists.txt

@@ -37,7 +37,6 @@ add_library(${CMAKE_PROJECT_NAME} SHARED
     # List C/C++ source files with relative paths to this CMakeLists.txt.
         ${SRC_DIR}
         md5.cpp
-        cqcode.cpp
         silk.cpp
         message.cpp
         shamrock.cpp)

app/src/main/cpp/cqcode.cpp

@@ -1,138 +0,0 @@
-#include <stdexcept>
-#include "cqcode.h"
-
-inline void replace_string(std::string& str, const std::string& from, const std::string& to) {
-    size_t startPos = 0;
-    while ((startPos = str.find(from, startPos)) != std::string::npos) {
-        str.replace(startPos, from.length(), to);
-        startPos += to.length();
-    }
-}
-
-inline int utf8_next_len(const std::string& str, size_t offset)
-{
-    uint8_t c = (uint8_t)str[offset];
-    if (c >= 0xFC)
-        return 6;
-    else if (c >= 0xF8)
-        return 5;
-    else if (c >= 0xF0)
-        return 4;
-    else if (c >= 0xE0)
-        return 3;
-    else if (c >= 0xC0)
-        return 2;
-    else if (c > 0x00)
-        return 1;
-    else
-        return 0;
-}
-
-
-void decode_cqcode(const std::string& code, std::vector<std::unordered_map<std::string, std::string>>& dest) {
-    std::string cache;
-    bool is_start = false;
-    std::string key_tmp;
-    std::unordered_map<std::string, std::string> kv;
-    for(size_t i = 0; i < code.size(); i++) {
-        int utf8_char_len = utf8_next_len(code, i);
-        if(utf8_char_len == 0) {
-            continue;
-        }
-        std::string_view c(&code[i],utf8_char_len);
-        if (c == "[") {
-            if (is_start) {
-                throw illegal_code();
-            } else {
-                if (!cache.empty()) {
-                    std::unordered_map<std::string, std::string> kv;
-                    replace_string(cache, "&#91;", "[");
-                    replace_string(cache, "&#93;", "]");
-                    replace_string(cache, "&amp;", "&");
-                    kv.emplace("_type", "text");
-                    kv.emplace("text", cache);
-                    dest.push_back(kv);
-                    cache.clear();
-                }
-                std::string_view cq_flag(&code[i],4);
-                if(cq_flag == "[CQ:"){
-                    is_start = true;
-                    i += 3;
-                }else{
-                    cache += c;
-                }
-            }
-        }
-        else if (c == "=") {
-            if (is_start) {
-                if (cache.empty()) {
-                    throw illegal_code();
-                } else {
-                    if (key_tmp.empty()) {
-                        key_tmp.append(cache);
-                        cache.clear();
-                    } else {
-                        cache += c;
-                    }
-                }
-            } else {
-                cache += c;
-            }
-        }
-        else if (c == ",") {
-            if (is_start) {
-                if (kv.count("_type") == 0 && !cache.empty()) {
-                    kv.emplace("_type", cache);
-                    cache.clear();
-                } else {
-                    if (!key_tmp.empty()) {
-                        replace_string(cache, "&#91;", "[");
-                        replace_string(cache, "&#93;", "]");
-                        replace_string(cache, "&#44;", ",");
-                        replace_string(cache, "&amp;", "&");
-                        kv.emplace(key_tmp, cache);
-                        cache.clear();
-                        key_tmp.clear();
-                    }
-                }
-            } else {
-                cache += c;
-            }
-        }
-        else if (c == "]") {
-            if (is_start) {
-                if (!cache.empty()) {
-                    if (!key_tmp.empty()) {
-                        replace_string(cache, "&#91;", "[");
-                        replace_string(cache, "&#93;", "]");
-                        replace_string(cache, "&#44;", ",");
-                        replace_string(cache, "&amp;", "&");
-                        kv.emplace(key_tmp, cache);
-                    } else {
-                        kv.emplace("_type", cache);
-                    }
-                    dest.push_back(kv);
-                    kv.clear();
-                    key_tmp.clear();
-                    cache.clear();
-                    is_start = false;
-                }
-            } else {
-                cache += c;
-            }
-        }
-        else {
-            cache += c;
-            i += (utf8_char_len - 1);
-        }
-    }
-    if (!cache.empty()) {
-        std::unordered_map<std::string, std::string> kv;
-        replace_string(cache, "&#91;", "[");
-        replace_string(cache, "&#93;", "]");
-        replace_string(cache, "&amp;", "&");
-        kv.emplace("_type", "text");
-        kv.emplace("text", cache);
-        dest.push_back(kv);
-    }
-}

app/src/main/cpp/group_honor.cpp

@@ -1,87 +0,0 @@
-#include "jni.h"
-#include <vector>
-#include <string>
-#include <algorithm>
-
-struct Honor {
-    int id;
-    std::string name;
-    std::string icon_url;
-    int priority;
-};
-
-int calc_honor_flag(int honor_id, char honor_flag);
-
-jobject make_honor_object(JNIEnv *env, jobject user_id, const Honor& honor);
-
-
-extern "C"
-JNIEXPORT jobject JNICALL
-Java_moe_fuqiuluo_shamrock_remote_action_handlers_GetTroopHonor_nativeDecodeHonor(JNIEnv *env, jobject thiz,
-                                                                         jstring user_id,
-                                                                         jint honor_id,
-                                                                         jbyte honor_flag) {
-    static std::vector<Honor> honor_list = {
-            Honor{1, "龙王", "https://qzonestyle.gtimg.cn/aoi/sola/20200213150116_n4PxCiurbm.png", 1},
-            Honor{2, "群聊之火", "https://qzonestyle.gtimg.cn/aoi/sola/20200217190136_92JEGFKC5k.png", 3},
-            Honor{3, "群聊炽焰", "https://qzonestyle.gtimg.cn/aoi/sola/20200217190204_zgCTeSrMq1.png", 4},
-            Honor{5, "冒尖小春笋", "https://qzonestyle.gtimg.cn/aoi/sola/20200213150335_tUJCAtoKVP.png", 5},
-            Honor{6, "快乐源泉", "https://qzonestyle.gtimg.cn/aoi/sola/20200213150434_3tDmsJExCP.png", 7},
-            Honor{7, "学术新星", "https://sola.gtimg.cn/aoi/sola/20200515140645_j0X6gbuHNP.png", 8},
-            Honor{8, "顶尖学霸", "https://sola.gtimg.cn/aoi/sola/20200515140639_0CtWOpfVzK.png", 9},
-            Honor{9, "至尊学神", "https://sola.gtimg.cn/aoi/sola/20200515140628_P8UEYBjMBT.png", 10},
-            Honor{10, "一笔当先", "https://sola.gtimg.cn/aoi/sola/20200515140654_4r94tSCdaB.png", 11},
-            Honor{11, "奋进小翠竹", "https://sola.gtimg.cn/aoi/sola/20200812151819_wbj6z2NGoB.png", 6},
-            Honor{12, "氛围魔杖", "https://sola.gtimg.cn/aoi/sola/20200812151831_4ZJgQCaD1H.png", 2},
-            Honor{13, "壕礼皇冠", "https://sola.gtimg.cn/aoi/sola/20200930154050_juZOAMg7pt.png", 12},
-    };
-    int flag = calc_honor_flag(honor_id, honor_flag);
-    if ((honor_id != 1 && honor_id != 2 && honor_id != 3) || flag != 1) {
-        auto honor = *std::find_if(honor_list.begin(), honor_list.end(), [&honor_id](auto &honor) {
-            return honor.id == honor_id;
-        });
-        return make_honor_object(env, user_id, honor);
-    } else {
-        auto honor = *std::find_if(honor_list.begin(), honor_list.end(), [&honor_id](auto &honor) {
-            return honor.id == honor_id;
-        });
-        std::string url = "https://static-res.qq.com/static-res/groupInteract/vas/a/" + std::to_string(honor_id) + "_1.png";
-        honor = Honor{honor_id, honor.name, url, honor.priority};
-        return make_honor_object(env, user_id, honor);
-    }
-}
-
-int calc_honor_flag(int honor_id, char honor_flag) {
-    int flag;
-    if (honor_flag == 0) {
-        return 0;
-    }
-    if (honor_id == 1) {
-        flag = honor_flag;
-    } else if (honor_id == 2 || honor_id == 3) {
-        flag = honor_flag >> 2;
-    } else if (honor_id != 4) {
-        return 0;
-    } else {
-        flag = honor_flag >> 4;
-    }
-    return flag & 3;
-}
-
-jobject make_honor_object(JNIEnv *env, jobject user_id, const Honor& honor) {
-    jclass GroupMemberHonor = env->FindClass("moe/fuqiuluo/shamrock/remote/service/data/GroupMemberHonor");
-    jmethodID GroupMemberHonor_init = env->GetMethodID(GroupMemberHonor, "<init>",
-                                                       "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;)V");
-    auto user_id_str = (jstring) user_id;
-    jstring honor_desc = env->NewStringUTF(honor.name.c_str());
-    jstring uin_name = env->NewStringUTF("");
-    jstring honor_icon_url = env->NewStringUTF(honor.icon_url.c_str());
-    jobject ret = env->NewObject(GroupMemberHonor, GroupMemberHonor_init, user_id_str, uin_name, honor_icon_url, 0, honor.id, honor_desc);
-
-    env->DeleteLocalRef(GroupMemberHonor);
-    env->DeleteLocalRef(user_id_str);
-    env->DeleteLocalRef(honor_desc);
-    env->DeleteLocalRef(honor_icon_url);
-
-    return ret;
-}

app/src/main/cpp/interface/cqcode.h

@@ -1,20 +0,0 @@
-#ifndef UNTITLED_CQCODE_H
-#define UNTITLED_CQCODE_H
-
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <exception>
-
-class illegal_code: std::exception {
-public:
-    [[nodiscard]] const char * what() const noexcept override {
-        return "Error cq code.";
-    }
-};
-
-void decode_cqcode(const std::string& code, std::vector<std::unordered_map<std::string, std::string>>& dest);
-
-void encode_cqcode(const std::vector<std::unordered_map<std::string, std::string>>& segment, std::string& dest);
-
-#endif //UNTITLED_CQCODE_H

app/src/main/cpp/message.cpp

@@ -1,5 +1,4 @@
 #include "jni.h"
-#include "cqcode.h"
 #include <random>
 
 inline void replace_string(std::string& str, const std::string& from, const std::string& to) {
@@ -12,7 +11,7 @@ inline void replace_string(std::string& str, const std::string& from, const std:
 
 extern "C"
 JNIEXPORT jlong JNICALL
-Java_moe_fuqiuluo_shamrock_helper_MessageHelper_createMessageUniseq(JNIEnv *env, jobject thiz,
+Java_qq_service_msg_MessageHelper_createMessageUniseq(JNIEnv *env, jobject thiz,
                                                                jint chat_type,
                                                                jlong time) {
     static std::random_device rd;
@@ -32,123 +31,6 @@ Java_moe_fuqiuluo_shamrock_helper_MessageHelper_getChatType(JNIEnv *env, jobject
     return (int32_t) ((int64_t) msg_id & 0xffL);
 }
 
-extern "C"
-JNIEXPORT jobject JNICALL
-Java_moe_fuqiuluo_shamrock_helper_MessageHelper_nativeDecodeCQCode(JNIEnv *env, jobject thiz,
-                                                              jstring code) {
-    jclass ArrayList = env->FindClass("java/util/ArrayList");
-    jmethodID NewArrayList = env->GetMethodID(ArrayList, "<init>", "()V");
-    jmethodID ArrayListAdd = env->GetMethodID(ArrayList, "add", "(Ljava/lang/Object;)Z");
-    jobject arrayList = env->NewObject(ArrayList, NewArrayList);
-
-    const char* cCode = env->GetStringUTFChars(code, nullptr);
-    std::string cppCode = cCode;
-    std::vector<std::unordered_map<std::string, std::string>> dest;
-    try {
-        decode_cqcode(cppCode, dest);
-    } catch (illegal_code& code) {
-        return arrayList;
-    }
-
-    jclass HashMap = env->FindClass("java/util/HashMap");
-    jmethodID NewHashMap = env->GetMethodID(HashMap, "<init>", "()V");
-    jclass String = env->FindClass("java/lang/String");
-    jmethodID NewString = env->GetMethodID(String, "<init>", "([BLjava/lang/String;)V");
-    jstring charset = env->NewStringUTF("UTF-8");
-    jmethodID put = env->GetMethodID(HashMap, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    for (auto& map : dest) {
-        jobject hashMap = env->NewObject(HashMap, NewHashMap);
-        for (const auto& pair : map) {
-            jbyteArray keyArray = env->NewByteArray((int) pair.first.size());
-            jbyteArray valueArray = env->NewByteArray((int) pair.second.size());
-            env->SetByteArrayRegion(keyArray, 0, (int) pair.first.size(), (jbyte*)pair.first.c_str());
-            env->SetByteArrayRegion(valueArray, 0, (int) pair.second.size(), (jbyte*)pair.second.c_str());
-            auto key = (jstring) env->NewObject(String, NewString, keyArray, charset);
-            auto value = (jstring) env->NewObject(String, NewString, valueArray, charset);
-            env->CallObjectMethod(hashMap, put, key, value);
-        }
-        env->CallBooleanMethod(arrayList, ArrayListAdd, hashMap);
-    }
-
-    env->DeleteLocalRef(ArrayList);
-    env->DeleteLocalRef(HashMap);
-    env->DeleteLocalRef(String);
-    env->DeleteLocalRef(charset);
-    env->ReleaseStringUTFChars(code, cCode);
-
-    return arrayList;
-}
-
-extern "C"
-JNIEXPORT jstring JNICALL
-Java_moe_fuqiuluo_shamrock_helper_MessageHelper_nativeEncodeCQCode(JNIEnv *env, jobject thiz,
-                                                              jobject segment_list) {
-    jclass List = env->FindClass("java/util/List");
-    jmethodID ListSize = env->GetMethodID(List, "size", "()I");
-    jmethodID ListGet = env->GetMethodID(List, "get", "(I)Ljava/lang/Object;");
-    jclass Map = env->FindClass("java/util/Map");
-    jmethodID MapGet = env->GetMethodID(Map, "get", "(Ljava/lang/Object;)Ljava/lang/Object;");
-    jmethodID entrySetMethod = env->GetMethodID(Map, "entrySet", "()Ljava/util/Set;");
-    jclass setClass = env->FindClass("java/util/Set");
-    jmethodID iteratorMethod = env->GetMethodID(setClass, "iterator", "()Ljava/util/Iterator;");
-    jclass entryClass = env->FindClass("java/util/Map$Entry");
-    jmethodID getKeyMethod = env->GetMethodID(entryClass, "getKey", "()Ljava/lang/Object;");
-    jmethodID getValueMethod = env->GetMethodID(entryClass, "getValue", "()Ljava/lang/Object;");
-
-    std::string result;
-    jint size = env->CallIntMethod(segment_list, ListSize);
-    for (int i = 0; i < size; i++ ) {
-        jobject segment = env->CallObjectMethod(segment_list, ListGet, i);
-        jobject entrySet = env->CallObjectMethod(segment, entrySetMethod);
-        jobject iterator = env->CallObjectMethod(entrySet, iteratorMethod);
-        auto type = (jstring) env->CallObjectMethod(segment, MapGet, env->NewStringUTF("_type"));
-        auto typeString = env->GetStringUTFChars(type, nullptr);
-        if (strcmp(typeString, "text") == 0) {
-            auto text = (jstring) env->CallObjectMethod(segment, MapGet, env->NewStringUTF("text"));
-            auto textString = env->GetStringUTFChars(text, nullptr);
-            std::string tmpValue = textString;
-            replace_string(tmpValue, "&", "&amp;");
-            replace_string(tmpValue, "[", "&#91;");
-            replace_string(tmpValue, "]", "&#93;");
-            replace_string(tmpValue, ",", "&#44;");
-            result.append(tmpValue);
-            env->ReleaseStringUTFChars(text, textString);
-        } else {
-            result.append("[CQ:");
-            result.append(typeString);
-            while (env->CallBooleanMethod(iterator, env->GetMethodID(env->GetObjectClass(iterator), "hasNext", "()Z"))) {
-                jobject entry = env->CallObjectMethod(iterator, env->GetMethodID(env->GetObjectClass(iterator), "next", "()Ljava/lang/Object;"));
-                auto key = (jstring) env->CallObjectMethod(entry, getKeyMethod);
-                auto value = (jstring) env->CallObjectMethod(entry, getValueMethod);
-                auto keyString = env->GetStringUTFChars(key, nullptr);
-                auto valueString = env->GetStringUTFChars(value, nullptr);
-                if (strcmp(keyString, "_type") != 0) {
-                    std::string tmpValue = valueString;
-                    replace_string(tmpValue, "&", "&amp;");
-                    replace_string(tmpValue, "[", "&#91;");
-                    replace_string(tmpValue, "]", "&#93;");
-                    replace_string(tmpValue, ",", "&#44;");
-                    result.append(",").append(keyString).append("=").append(tmpValue);
-                }
-                env->ReleaseStringUTFChars(key, keyString);
-                env->ReleaseStringUTFChars(value, valueString);
-                env->DeleteLocalRef(entry);
-                env->DeleteLocalRef(key);
-                env->DeleteLocalRef(value);
-            }
-            result.append("]");
-        }
-        env->ReleaseStringUTFChars(type, typeString);
-    }
-
-    env->DeleteLocalRef(List);
-    env->DeleteLocalRef(Map);
-    env->DeleteLocalRef(setClass);
-    env->DeleteLocalRef(entryClass);
-    return env->NewStringUTF(result.c_str());
-}
-
-
 extern "C"
 JNIEXPORT jlong JNICALL
 Java_moe_fuqiuluo_shamrock_helper_MessageHelper_insertChatTypeToMsgId(JNIEnv *env, jobject thiz,

app/src/main/cpp/shamrock.cpp

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

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

@@ -4,6 +4,7 @@ package moe.fuqiuluo.shamrock
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.os.Handler
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -64,7 +65,9 @@ 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.tools.GlobalUi
 import moe.fuqiuluo.shamrock.ui.app.AppRuntime
 import moe.fuqiuluo.shamrock.ui.app.Logger
 import moe.fuqiuluo.shamrock.ui.app.RuntimeState
@@ -85,8 +88,16 @@ import moe.fuqiuluo.shamrock.ui.tools.getShamrockVersion
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setContent {
+            LaunchedEffect(Unit) {
+                while (true) {
+                    delay(5_000) // Delay in milliseconds
+                    broadcastToModule {
+                        putExtra("__cmd", "switch_status")
+                    }
+                }
+            }
+
             CompositionLocalProvider(
                 LocalIndication provides NoIndication
             ) {
@@ -96,8 +107,9 @@ class MainActivity : ComponentActivity() {
                 isAppearanceLightStatusBars = true
             }
             WindowCompat.setDecorFitsSystemWindows(window, true)
-            broadcastToModule { putExtra("__cmd", "fetchPort") }
         }
+
+        GlobalUi = Handler(mainLooper)
     }
 }
 
@@ -153,7 +165,7 @@ private fun AppMainView() {
     }
 
     val ctx = LocalContext.current
-    LaunchedEffect(isFined.value) {
+    LaunchedEffect(isFined) {
         if (isFined.value) {
             AppRuntime.log(LocalString.logCentralLoadSuccessfully)
             Toast.makeText(ctx, LocalString.frameworkYes, Toast.LENGTH_SHORT).show()
@@ -284,58 +296,11 @@ private fun AnimatedTab(
     val lastSelectedState = remember {
         mutableIntStateOf(0)
     }
-    val enter = remember {
-        scaleIn(animationSpec = TweenSpec(150, easing = FastOutLinearInEasing))
-    }
-    val exit = remember {
-        scaleOut(animationSpec = TweenSpec(150, easing = FastOutSlowInEasing))
-    }
 
     val defaultConst = SELECTED_TABLE[index * 2]
     val selectedConst = SELECTED_TABLE[(index * 2) + 1]
     val isFirst: Boolean = (lastSelectedState.value and defaultConst) != defaultConst
 
-    var icon: @Composable (() -> Unit)? = null
-    var text: @Composable (() -> Unit)? = null
-
-    if (curSelected) {
-        text = {
-            AnimatedVisibility(visibleState = MutableTransitionState(false).also {
-                it.targetState =
-                    isFirst || lastSelectedState.value and selectedConst == selectedConst
-            }, enter = enter, exit = exit, modifier = Modifier) {
-                Text(
-                    text = titleWithIcon.first,
-                    color = GlobalColor.TabItem,
-                    fontSize = 15.sp,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier
-                        .padding(bottom = 5.dp)
-                        .indication(
-                            remember { MutableInteractionSource() },
-                            rememberRipple(color = Color.Transparent)
-                        )
-                )
-            }
-        }
-    } else {
-        icon = {
-            Icon(
-                painter = painterResource(id = titleWithIcon.second),
-                contentDescription = titleWithIcon.first,
-                tint = Color.Unspecified,
-                modifier = Modifier
-                    .height(24.dp)
-                    .width(24.dp)
-                    .padding(bottom = 5.dp)
-                    .indication(
-                        remember { MutableInteractionSource() },
-                        rememberRipple(color = Color.Transparent)
-                    )
-            )
-        }
-    }
-
     ShamrockTab(
         selected = curSelected,
         onClick = {
@@ -343,11 +308,13 @@ private fun AnimatedTab(
                 state.scrollToPage(index, 0f)
             }
         },
-        text = text,
-        icon = icon,
         selectedContentColor = Color.Transparent,
         unselectedContentColor = Color.Transparent,
-        indication = null
+        indication = null,
+        titleWithIcon = titleWithIcon,
+        visibleState =  MutableTransitionState(false).also {
+            it.targetState = isFirst || lastSelectedState.value and selectedConst == selectedConst
+        }
     )
     lastSelectedState.value.let {
         var tmp = it

app/src/main/java/moe/fuqiuluo/shamrock/app/config/ConfigKey.kt

@@ -0,0 +1,2 @@
+package moe.fuqiuluo.shamrock.app.config
+

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

@@ -0,0 +1,33 @@
+package moe.fuqiuluo.shamrock.app.config
+
+import android.content.Context
+import moe.fuqiuluo.shamrock.config.ConfigKey
+import moe.fuqiuluo.shamrock.ui.service.internal.broadcastToModule
+
+object ShamrockConfig {
+    internal fun getConfigPref(ctx: Context) = ctx.getSharedPreferences("config", 0)
+
+    internal inline operator fun <reified Type> get(ctx: Context, key: ConfigKey<Type>): Type {
+        val preferences = getConfigPref(ctx)
+        return when(Type::class) {
+            Int::class -> preferences.getInt(key.name(), key.default() as Int) as Type
+            Long::class -> preferences.getLong(key.name(), key.default() as Long) as Type
+            String::class -> preferences.getString(key.name(), key.default() as String) as Type
+            Boolean::class -> preferences.getBoolean(key.name(), key.default() as Boolean) as Type
+            else -> throw IllegalArgumentException("Unsupported type")
+        }
+    }
+
+    internal inline operator fun <reified Type> set(ctx: Context, key: ConfigKey<Type>, value: Type) {
+        val preferences = getConfigPref(ctx)
+        val editor = preferences.edit()
+        when(Type::class) {
+            Int::class -> editor.putInt(key.name(), value as Int)
+            Long::class -> editor.putLong(key.name(), value as Long)
+            String::class -> editor.putString(key.name(), value as String)
+            Boolean::class -> editor.putBoolean(key.name(), value as Boolean)
+            else -> throw IllegalArgumentException("Unsupported type")
+        }
+        editor.apply()
+    }
+}

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

@@ -1,383 +0,0 @@
-package moe.fuqiuluo.shamrock.ui.app
-
-import android.content.Context
-import moe.fuqiuluo.shamrock.ui.service.internal.broadcastToModule
-
-object ShamrockConfig {
-    fun getSSLKeyPath(ctx: Context): String {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getString("key_store", "")!!
-    }
-
-    fun setSSLKeyPath(ctx: Context, path: String) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putString("key_store", path).apply()
-        pushUpdate(ctx)
-    }
-
-    fun getSSLPort(ctx: Context): Int {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getInt("ssl_port", 5701)
-    }
-
-    fun setSSLPort(ctx: Context, port: Int) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putInt("ssl_port", port).apply()
-        pushUpdate(ctx)
-    }
-
-    fun getSSLAlias(ctx: Context): String {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getString("ssl_alias", "")!!
-    }
-
-    fun setSSLAlias(ctx: Context, alias: String) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putString("ssl_alias", alias).apply()
-        pushUpdate(ctx)
-    }
-
-    fun getSSLPwd(ctx: Context): String {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getString("ssl_pwd", "")!!
-    }
-
-    fun setSSLPwd(ctx: Context, alias: String) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putString("ssl_pwd", alias).apply()
-        pushUpdate(ctx)
-    }
-
-    fun getSSLPrivatePwd(ctx: Context): String {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getString("ssl_private_pwd", "")!!
-    }
-
-    fun setSSLPrivatePwd(ctx: Context, alias: String) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putString("ssl_private_pwd", alias).apply()
-        pushUpdate(ctx)
-    }
-
-    fun getHttpAddr(ctx: Context): String {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getString("http_addr", "")!!
-    }
-
-    fun setHttpAddr(ctx: Context, v: String) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putString("http_addr", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun isPro(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("pro_api", false)
-    }
-
-    fun setPro(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("pro_api", v).apply()
-        ctx.broadcastToModule {
-            putExtra("type", "restart")
-            putExtra("__cmd", "change_port")
-        }
-        pushUpdate(ctx)
-    }
-
-    fun getToken(ctx: Context): String {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getString("token", null) ?: ""
-    }
-
-    fun setToken(ctx: Context, v: String?) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putString("token", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun isWs(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("ws", false)
-    }
-
-    fun setWs(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("ws", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun isWsClient(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("ws_client", false)
-    }
-
-    fun setWsClient(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("ws_client", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun isTablet(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("tablet", false)
-    }
-
-    fun setTablet(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("tablet", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun isUseCQCode(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("use_cqcode", false)
-    }
-
-    fun setUseCQCode(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("use_cqcode", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun isWebhook(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("webhook", false)
-    }
-
-    fun setWebhook(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("webhook", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun getWsAddr(ctx: Context): String {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getString("ws_addr", "")!!
-    }
-
-    fun setWsAddr(ctx: Context, v: String) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putString("ws_addr", v).apply()
-        pushUpdate(ctx)
-    }
-
-    fun getHttpPort(ctx: Context): Int {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getInt("port", 5700)
-    }
-
-    fun setHttpPort(ctx: Context, v: Int) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putInt("port", v).apply()
-        ctx.broadcastToModule {
-            putExtra("type", "port")
-            putExtra("port", v)
-            putExtra("__cmd", "change_port")
-        }
-        pushUpdate(ctx)
-    }
-
-    fun getWsPort(ctx: Context): Int {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getInt("ws_port", 5800)
-    }
-
-    fun setWsPort(ctx: Context, v: Int) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putInt("ws_port", v).apply()
-        ctx.broadcastToModule {
-            putExtra("type", "ws_port")
-            putExtra("port", v)
-            putExtra("__cmd", "change_port")
-        }
-        pushUpdate(ctx)
-    }
-
-    fun is2B(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("2B", false)
-    }
-
-    fun set2B(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("2B", v).apply()
-    }
-
-    fun setAutoClean(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("auto_clear", v).apply()
-    }
-
-    fun isAutoClean(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("auto_clear", false)
-    }
-
-    fun isDebug(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("debug", false)
-    }
-
-    fun setDebug(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("debug", v).apply()
-    }
-
-    fun isAntiTrace(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("anti_qq_trace", true)
-    }
-
-    fun isForbidUselessProcess(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("forbid_useless_process", false)
-    }
-
-    fun setForbidUselessProcess(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("forbid_useless_process", v).apply()
-    }
-
-    fun setAntiTrace(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("anti_qq_trace", v).apply()
-    }
-
-    fun isInjectPacket(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("inject_packet", false)
-    }
-
-    fun setInjectPacket(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("inject_packet", v).apply()
-    }
-
-    fun enableAutoStart(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("enable_auto_start", false)
-    }
-
-    fun disableAutoSyncSetting(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("disable_auto_sync_setting", false)
-    }
-
-    fun enableAliveReply(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("alive_reply", false)
-    }
-
-    fun allowShell(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("shell", false)
-    }
-
-    fun setAutoStart(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("enable_auto_start", v).apply()
-    }
-
-    fun setDisableAutoSyncSetting(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("disable_auto_sync_setting", v).apply()
-    }
-
-    fun setAliveReply(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("alive_reply", v).apply()
-    }
-
-    fun setShellStatus(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("shell", v).apply()
-    }
-
-    fun enableSelfMsg(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("enable_self_msg", false)
-    }
-
-    fun enableOldBDH(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("enable_old_bdh", false)
-    }
-
-    fun setEnableOldBDH(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("enable_old_bdh", v).apply()
-    }
-
-    fun enableSyncMsgAsSentMsg(ctx: Context): Boolean {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return preferences.getBoolean("enable_sync_msg_as_sent_msg", false)
-    }
-
-    fun setEnableSelfMsg(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("enable_self_msg", v).apply()
-    }
-
-    fun setEnableSyncMsgAsSentMsg(ctx: Context, v: Boolean) {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        preferences.edit().putBoolean("enable_sync_msg_as_sent_msg", v).apply()
-    }
-
-    fun getConfigMap(ctx: Context): Map<String, Any?> {
-        val preferences = ctx.getSharedPreferences("config", 0)
-        return mapOf(
-            "tablet" to preferences.getBoolean("tablet", false),
-            "port" to preferences.getInt("port", 5700),
-            "ws" to preferences.getBoolean("ws", false),
-            "ws_port" to preferences.getInt("ws_port", 5800),
-            "ssl_port" to preferences.getInt("ssl_port", 5701),
-            "http" to preferences.getBoolean("webhook", false),
-            "http_addr" to preferences.getString("http_addr", ""),
-            "ws_client" to preferences.getBoolean("ws_client", false),
-            "use_cqcode" to preferences.getBoolean("use_cqcode", false),
-            "ws_addr" to preferences.getString("ws_addr", ""),
-            "ssl_alias" to preferences.getString("ssl_alias", ""),
-            "pro_api" to preferences.getBoolean("pro_api", false),
-            "token" to preferences.getString("token", null),
-            "ssl_pwd" to preferences.getString("ssl_pwd", ""),
-            "inject_packet" to preferences.getBoolean("inject_packet", false),
-            "debug" to preferences.getBoolean("debug", false),
-            "anti_qq_trace" to preferences.getBoolean("anti_qq_trace", true),
-            "ssl_private_pwd" to preferences.getString("ssl_private_pwd", ""),
-            "key_store" to preferences.getString("key_store", ""),
-            "enable_self_msg" to preferences.getBoolean("enable_self_msg", false),
-            "echo_number" to preferences.getBoolean("echo_number", false),
-            "shell" to preferences.getBoolean("shell", false),
-            "alive_reply" to preferences.getBoolean("alive_reply", false),
-            "enable_sync_msg_as_sent_msg" to preferences.getBoolean("enable_sync_msg_as_sent_msg", false),
-            "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),
-        )
-    }
-
-    fun pushUpdate(ctx: Context) {
-        ctx.broadcastToModule {
-            getConfigMap(ctx).forEach { (key, value) ->
-                if (value == null) {
-                    val v: String? = null
-                    this.putExtra(key, v)
-                } else {
-                    when (value) {
-                        is Int -> this.putExtra(key, value)
-                        is Long -> this.putExtra(key, value)
-                        is Short -> this.putExtra(key, value)
-                        is Byte -> this.putExtra(key, value)
-                        is String -> this.putExtra(key, value)
-                        is ByteArray -> this.putExtra(key, value)
-                        is Boolean -> this.putExtra(key, value)
-                        is Float -> this.putExtra(key, value)
-                        is Double -> this.putExtra(key, value)
-                    }
-                }
-            }
-            putExtra("__cmd", "push_config")
-        }
-    }
-}

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

@@ -5,7 +5,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.os.Build
-import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -25,6 +24,7 @@ import androidx.compose.material3.Divider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -45,10 +45,12 @@ import coil.compose.rememberAsyncImagePainter
 import coil.request.ImageRequest
 import coil.size.Size
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import moe.fuqiuluo.shamrock.R
 import moe.fuqiuluo.shamrock.ui.app.AppRuntime
 import moe.fuqiuluo.shamrock.ui.app.Level
-import moe.fuqiuluo.shamrock.ui.app.ShamrockConfig
+import moe.fuqiuluo.shamrock.app.config.ShamrockConfig
+import moe.fuqiuluo.shamrock.config.*
 import moe.fuqiuluo.shamrock.ui.theme.GlobalColor
 import moe.fuqiuluo.shamrock.ui.theme.LocalString
 import moe.fuqiuluo.shamrock.ui.theme.ThemeColor
@@ -72,110 +74,6 @@ fun DashboardFragment(
         InformationCard(ctx)
         APIInfoCard(ctx)
         FunctionCard(scope, ctx, LocalString.functionSetting)
-        SSLCard(ctx)
-    }
-}
-
-@Composable
-private fun SSLCard(ctx: Context) {
-    ActionBox(
-        modifier = Modifier.padding(top = 12.dp),
-        painter = painterResource(id = R.drawable.baseline_security_24),
-        title = LocalString.sslSetting
-    ) {
-        Column {
-            Divider(
-                modifier = Modifier,
-                color = GlobalColor.Divider,
-                thickness = 0.2.dp
-            )
-
-            val sslPort = remember { mutableStateOf(ShamrockConfig.getSSLPort(ctx).toString()) }
-            TextItem(
-                title = "SSL端口",
-                desc = "端口范围在0~65565，并确保可用。",
-                text = sslPort,
-                hint = "请输入端口号",
-                error = "端口范围应在0~65565",
-                checker = {
-                    it.isNotBlank() && kotlin.runCatching { it.toInt() in 0..65565 }.getOrDefault(false)
-                },
-                confirm = {
-                    val newPort = sslPort.value.toInt()
-                    ShamrockConfig.setSSLPort(ctx, newPort)
-                    AppRuntime.log("设置SSL(HTTP)端口为$newPort，立即生效尝试中。")
-                }
-            )
-
-            val keyStore = remember { mutableStateOf(ShamrockConfig.getSSLKeyPath(ctx)) }
-            TextItem(
-                title = "SSL证书",
-                desc = "BKS签名的证书。",
-                text = keyStore,
-                hint = "输入证书路径",
-                error = "证书路径不合法或不存在",
-                checker = {
-                    it.isNotBlank()
-                },
-                confirm = {
-                    val new = keyStore.value
-                    ShamrockConfig.setSSLKeyPath(ctx, new)
-                    AppRuntime.log("设置SSL证书为[$new]。")
-                }
-            )
-
-            val alias = remember { mutableStateOf(ShamrockConfig.getSSLAlias(ctx)) }
-            TextItem(
-                title = "SSL别名",
-                desc = "BKS签名的别名，确保大小写区分正确。",
-                text = alias,
-                hint = "输入签名别名",
-                error = "别名不合法",
-                checker = {
-                    it.isNotBlank()
-                },
-                confirm = {
-                    val new = alias.value
-                    ShamrockConfig.setSSLAlias(ctx, new)
-                    AppRuntime.log("设置SSL别名为[$new]。")
-                }
-            )
-
-            val sslPwd = remember { mutableStateOf(ShamrockConfig.getSSLPwd(ctx)) }
-            TextItem(
-                title = "SSL密码",
-                desc = "BKS签名的密码。",
-                text = sslPwd,
-                hint = "输入签名密码",
-                error = "密码不合法",
-                checker = {
-                    it.isNotBlank()
-                },
-                confirm = {
-                    val new = sslPwd.value
-                    ShamrockConfig.setSSLPwd(ctx, new)
-                    AppRuntime.log("设置SSL密码为[$new]。")
-                }
-            )
-
-            val sslPrivatePwd = remember { mutableStateOf(ShamrockConfig.getSSLPrivatePwd(ctx)) }
-            TextItem(
-                title = "SSL Private密码",
-                desc = "BKS签名的Private密码。",
-                text = sslPrivatePwd,
-                hint = "输入Private密码",
-                error = "密码不合法",
-                checker = {
-                    it.isNotBlank()
-                },
-                confirm = {
-                    val new = sslPrivatePwd.value
-                    ShamrockConfig.setSSLPrivatePwd(ctx, new)
-                    AppRuntime.log("设置SSL Private密码为[$new]。")
-                }
-            )
-
-        }
     }
 }
 
@@ -195,93 +93,35 @@ private fun APIInfoCard(
                 thickness = 0.2.dp
             )
 
-            val wsPort = remember { mutableStateOf(ShamrockConfig.getWsPort(ctx).toString()) }
+            val rpcPort = remember { mutableStateOf(ShamrockConfig[ctx, RPCPort].toString()) }
-            val port = remember { mutableStateOf(ShamrockConfig.getHttpPort(ctx).toString()) }
             TextItem(
-                title = "主动HTTP端口",
+                title = "RPC服务端口",
                 desc = "端口范围在0~65565，并确保可用。",
-                text = port,
+                text = rpcPort,
                 hint = "请输入端口号",
                 error = "端口范围应在0~65565",
                 checker = {
-                    it.isNotBlank() && kotlin.runCatching { it.toInt() in 0..65565 }.getOrDefault(false) && wsPort.value != it
+                    it.isNotBlank() && kotlin.runCatching { it.toInt() in 0..65565 }
+                        .getOrDefault(false) && rpcPort.value != it
                 },
                 confirm = {
-                    val newPort = port.value.toInt()
+                    val newPort = rpcPort.value.toInt()
-                    ShamrockConfig.setHttpPort(ctx, newPort)
+                    ShamrockConfig[ctx, RPCPort] = newPort
                     AppRuntime.log("设置主动HTTP监听端口为$newPort，立即生效尝试中。")
                 }
             )
 
+            val rpcAddress = remember { mutableStateOf(ShamrockConfig[ctx, RPCAddress]) }
             TextItem(
-                title = "主动WebSocket端口",
+                title = "回调RPC地址",
-                desc = "端口范围在0~65565，并确保可用。",
+                desc = "例如：kritor.support:8081",
-                text = wsPort,
+                text = rpcAddress,
-                hint = "请输入端口号",
-                error = "端口范围应在0~65565",
-                checker = {
-                    it.isNotBlank() && kotlin.runCatching { it.toInt() in 0..65565 }.getOrDefault(false) && it != port.value
-                },
-                confirm = {
-                    val newPort = wsPort.value.toInt()
-                    ShamrockConfig.setWsPort(ctx, newPort)
-                    AppRuntime.log("设置主动WebSocket监听端口为$newPort。")
-                }
-            )
-
-            val webHookAddress = remember { mutableStateOf(ShamrockConfig.getHttpAddr(ctx)) }
-            TextItem(
-                title = "回调HTTP地址",
-                desc = "例如：http://shamrock.moe:80。",
-                text = webHookAddress,
                 hint = "请输入回调地址",
                 error = "输入的地址不合法",
-                checker = {
-                    it.isNotBlank()
-                },
-                confirm = {
-                    if (it.startsWith("http://") || it.startsWith("https://")) {
-                        ShamrockConfig.setHttpAddr(ctx, webHookAddress.value)
-                        AppRuntime.log("设置回调HTTP地址为[${webHookAddress.value}]。")
-                    } else {
-                        Toast.makeText(ctx, "回调地址不合法", Toast.LENGTH_SHORT).show()
-                        webHookAddress.value = ""
-                    }
-                }
-            )
-
-            val wsAddress = remember { mutableStateOf(ShamrockConfig.getWsAddr(ctx)) }
-            TextItem(
-                title = "被动WebSocket地址",
-                desc = "例如：ws://shamrock.moe:81，多个使用逗号分隔。",
-                text = wsAddress,
-                hint = "请输入被动地址",
-                error = "输入的地址不合法",
-                checker = {
-                          true
-                },
-                confirm = {
-                    if (it.startsWith("ws://") || it.startsWith("wss://") || it.isBlank()) {
-                        ShamrockConfig.setWsAddr(ctx, wsAddress.value)
-                        AppRuntime.log("设置被动WebSocket地址为[${wsAddress.value}]。")
-                    } else {
-                        Toast.makeText(ctx, "被动WebSocket地址不合法", Toast.LENGTH_SHORT).show()
-                        wsAddress.value = ""
-                    }
-                }
-            )
-
-            val authToken = remember { mutableStateOf(ShamrockConfig.getToken(ctx)) }
-            TextItem(
-                title = "鉴权Token",
-                desc = "用于鉴权的Token。",
-                text = authToken,
-                hint = "请填写鉴权token",
-                error = "输入的参数不合法",
                 checker = { true },
                 confirm = {
-                    ShamrockConfig.setToken(ctx, authToken.value)
+                    ShamrockConfig[ctx, RPCAddress] = rpcAddress.value
-                    AppRuntime.log("设置鉴权Token为[${authToken.value}]。")
+                    AppRuntime.log("设置回调RPC地址为[${rpcAddress.value}]。")
                 }
             )
 
@@ -314,59 +154,59 @@ private fun FunctionCard(
             Function(
                 title = "强制平板模式",
                 desc = "强制QQ使用平板模式，实现共存登录。",
-                isSwitch = ShamrockConfig.isTablet(ctx)
+                isSwitch = ShamrockConfig[ctx, ForceTablet]
             ) {
-                ShamrockConfig.setTablet(ctx, it)
+                ShamrockConfig[ctx, ForceTablet] = it
                 return@Function true
             }
 
             Function(
-                title = "HTTP回调",
+                title = "主动RPC",
-                desc = "OneBot标准的HTTPAPI回调，Shamrock作为Client。",
+                desc = "Kritor协议实现RPC，由Shamrock放出rpc服务",
-                isSwitch = ShamrockConfig.isWebhook(ctx)
+                isSwitch = ShamrockConfig[ctx, ActiveRPC]
             ) {
-                ShamrockConfig.setWebhook(ctx, it)
+                ShamrockConfig[ctx, ActiveRPC] = it
                 return@Function true
             }
 
             Function(
-                title = "消息格式为CQ码",
+                title = "被动RPC",
-                desc = "HTTPAPI回调的消息格式，关闭则为消息段。",
+                desc = "Kritor协议实现RPC，由客户端提供反向的rpc服务",
-                isSwitch = ShamrockConfig.isUseCQCode(ctx)
+                isSwitch = ShamrockConfig[ctx, PassiveRPC]
             ) {
-                ShamrockConfig.setUseCQCode(ctx, it)
+                ShamrockConfig[ctx, PassiveRPC] = it
                 return@Function true
             }
 
-            Function(
+            run {
-                title = "主动WebSocket",
+                val uploadResourceGroup = remember { mutableStateOf(ShamrockConfig[ctx, ResourceGroup]) }
-                desc = "OneBot标准WebSocket，Shamrock作为Server。",
+                Column(
-                isSwitch = ShamrockConfig.isWs(ctx)
+                    modifier = Modifier
+                        .absolutePadding(left = 8.dp, right = 8.dp, top = 12.dp, bottom = 0.dp)
                 ) {
-                ShamrockConfig.setWs(ctx, it)
+                    Text(
-                return@Function true
+                        modifier = Modifier.padding(2.dp),
+                        text = "用来上传资源的群聊，错误的资源上传终点可能导致封禁，请自建一个群聊并填写在下方。",
+                        color = Color.Red,
+                        fontSize = 11.sp
+                    )
                 }
-
+                TextItem(
-            Function(
+                    title = "接受资源群聊",
-                title = "被动WebSocket",
+                    desc = "用来上传资源的群聊，请自建一个群聊并填写在下方。",
-                desc = "OneBot标准WebSocket，Shamrock作为Client。",
+                    text = uploadResourceGroup,
-                isSwitch = ShamrockConfig.isWsClient(ctx)
+                    hint = "请输入群号",
-            ) {
+                    error = "群号不合法",
-                ShamrockConfig.setWsClient(ctx, it)
+                    checker = {
-                return@Function true
+                        it.isNotBlank() && it.toULongOrNull() != null
+                    },
+                    confirm = {
+                        val groupId = uploadResourceGroup.value
+                        ShamrockConfig[ctx, ResourceGroup] = groupId
+                        AppRuntime.log("设置接受资源群聊为[$groupId]。")
+                    }
+                )
             }
-
-            /*
-            Function(
-                title = "专业级接口",
-                desc = "如果你不知道你在做什么，请不要开启本功能。",
-                descColor = Color.Red,
-                isSwitch = ShamrockConfig.isPro(ctx)
-            ) {
-                ShamrockConfig.setPro(ctx, it)
-                AppRuntime.log("专业级API = $it", Level.WARN)
-                return@Function true
-            }*/
         }
     }
 }
@@ -445,9 +285,7 @@ private fun InfoItem(
             .fillMaxWidth()
             .combinedClickable(onDoubleClick = {
                 doubleClick?.invoke(content)
-            }) {
+            }) { true }
-                true
-            }
         ,
         verticalAlignment = Alignment.CenterVertically
     ) {

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

@@ -23,7 +23,14 @@ import androidx.compose.ui.unit.sp
 import moe.fuqiuluo.shamrock.R
 import moe.fuqiuluo.shamrock.ui.app.AppRuntime
 import moe.fuqiuluo.shamrock.ui.app.Level
-import moe.fuqiuluo.shamrock.ui.app.ShamrockConfig
+import moe.fuqiuluo.shamrock.app.config.ShamrockConfig
+import moe.fuqiuluo.shamrock.config.AliveReply
+import moe.fuqiuluo.shamrock.config.AntiJvmTrace
+import moe.fuqiuluo.shamrock.config.B2Mode
+import moe.fuqiuluo.shamrock.config.DebugMode
+import moe.fuqiuluo.shamrock.config.EnableOldBDH
+import moe.fuqiuluo.shamrock.config.EnableSelfMessage
+import moe.fuqiuluo.shamrock.ui.service.handlers.InitHandler
 import moe.fuqiuluo.shamrock.ui.theme.GlobalColor
 import moe.fuqiuluo.shamrock.ui.theme.LocalString
 import moe.fuqiuluo.shamrock.ui.tools.NoticeTextDialog
@@ -68,9 +75,9 @@ fun LabFragment() {
                     title = LocalString.b2Mode,
                     desc = LocalString.b2ModeDesc,
                     descColor = it,
-                    isSwitch = ShamrockConfig.is2B(ctx)
+                    isSwitch = ShamrockConfig[ctx, B2Mode]
                 ) {
-                    ShamrockConfig.set2B(ctx, it)
+                    ShamrockConfig[ctx, B2Mode] = it
                     scope.toast(ctx, LocalString.restartToast)
                     return@Function true
                 }
@@ -79,10 +86,10 @@ fun LabFragment() {
                     title = LocalString.showDebugLog,
                     desc = LocalString.showDebugLogDesc,
                     descColor = it,
-                    isSwitch = ShamrockConfig.isDebug(ctx)
+                    isSwitch = ShamrockConfig[ctx, DebugMode]
                 ) {
-                    ShamrockConfig.setDebug(ctx, it)
+                    ShamrockConfig[ctx, DebugMode] = it
-                    ShamrockConfig.pushUpdate(ctx)
+                    InitHandler.update(ctx)
                     return@Function true
                 }
             }
@@ -100,54 +107,13 @@ fun LabFragment() {
                     thickness = 0.2.dp
                 )
 
-                Function(
-                    title = "禁止无用进程",
-                    desc = "禁止QQ生成无用进程浪费内存，可能造成部分功能闪退。",
-                    descColor = color,
-                    isSwitch = ShamrockConfig.isForbidUselessProcess(ctx)
-                ) {
-                    ShamrockConfig.setForbidUselessProcess(ctx, it)
-                    ShamrockConfig.pushUpdate(ctx)
-                    return@Function true
-                }
-
                 Function(
                     title = "自回复测试",
                     desc = "发送[ping]，机器人发送一个具有调试信息的返回。",
                     descColor = color,
-                    isSwitch = ShamrockConfig.enableAliveReply(ctx)
+                    isSwitch = ShamrockConfig[ctx, AliveReply]
                 ) {
-                    ShamrockConfig.setAliveReply(ctx, it)
+                    ShamrockConfig[ctx, AliveReply] = it
-                    return@Function true
-                }
-
-                Function(
-                    title = "开启Shell接口",
-                    desc = "可能导致设备被入侵，请勿随意开启。",
-                    descColor = color,
-                    isSwitch = ShamrockConfig.allowShell(ctx)
-                ) {
-                    ShamrockConfig.setShellStatus(ctx, it)
-                    return@Function true
-                }
-
-                Function(
-                    title = "自动唤醒QQ",
-                    desc = "QQ进程死亡时重新打开QQ进程，前提本进程存活。",
-                    descColor = color,
-                    isSwitch = ShamrockConfig.enableAutoStart(ctx)
-                ) {
-                    ShamrockConfig.setAutoStart(ctx, it)
-                    return@Function true
-                }
-
-                Function(
-                    title = "禁止Shamrock同步设置",
-                    desc = "禁止Shamrock同步设置，防止恢复手动修改后的配置文件。",
-                    descColor = color,
-                    isSwitch = ShamrockConfig.disableAutoSyncSetting(ctx)
-                ) {
-                    ShamrockConfig.setDisableAutoSyncSetting(ctx, it)
                     return@Function true
                 }
 
@@ -194,25 +160,14 @@ fun LabFragment() {
                     thickness = 0.2.dp
                 )
 
-                Function(
-                    title = LocalString.injectPacket,
-                    desc = LocalString.injectPacketDesc,
-                    descColor = color,
-                    isSwitch = ShamrockConfig.isInjectPacket(ctx)
-                ) {
-                    ShamrockConfig.setInjectPacket(ctx, it)
-                    ShamrockConfig.pushUpdate(ctx)
-                    return@Function true
-                }
-
                 Function(
                     title = LocalString.antiTrace,
                     desc = LocalString.antiTraceDesc,
                     descColor = color,
-                    isSwitch = ShamrockConfig.isAntiTrace(ctx)
+                    isSwitch = ShamrockConfig[ctx, AntiJvmTrace]
                 ) {
-                    ShamrockConfig.setAntiTrace(ctx, it)
+                    ShamrockConfig[ctx, AntiJvmTrace] = it
-                    ShamrockConfig.pushUpdate(ctx)
+                    scope.toast(ctx, LocalString.restartToast)
                     return@Function true
                 }
 
@@ -277,21 +232,10 @@ fun LabFragment() {
                     title = "自发消息推送",
                     desc = "推送Bot发送的消息，未做特殊处理请勿打开。",
                     descColor = it,
-                    isSwitch = ShamrockConfig.enableSelfMsg(ctx)
+                    isSwitch = ShamrockConfig[ctx, EnableSelfMessage]
                 ) {
-                    ShamrockConfig.setEnableSelfMsg(ctx, it)
+                    ShamrockConfig[ctx, EnableSelfMessage] = it
-                    ShamrockConfig.pushUpdate(ctx)
+                    InitHandler.update(ctx)
-                    return@Function true
-                }
-
-                Function(
-                    title = "同步消息推送类型异换",
-                    desc = "推送来自同号异设备消息，将同步消息作为自发消息推送。",
-                    descColor = it,
-                    isSwitch = ShamrockConfig.enableSyncMsgAsSentMsg(ctx)
-                ) {
-                    ShamrockConfig.setEnableSyncMsgAsSentMsg(ctx, it)
-                    ShamrockConfig.pushUpdate(ctx)
                     return@Function true
                 }
 
@@ -299,10 +243,10 @@ fun LabFragment() {
                     title = "启用旧版资源上传系统",
                     desc = "如果NT内核无法上传资源，请打开本开关。",
                     descColor = it,
-                    isSwitch = ShamrockConfig.enableOldBDH(ctx)
+                    isSwitch = ShamrockConfig[ctx, EnableOldBDH]
                 ) {
-                    ShamrockConfig.setEnableOldBDH(ctx, it)
+                    ShamrockConfig[ctx, EnableOldBDH] = it
-                    ShamrockConfig.pushUpdate(ctx)
+                    InitHandler.update(ctx)
                     return@Function true
                 }
             }

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

@@ -1,108 +0,0 @@
-@file:OptIn(DelicateCoroutinesApi::class)
-package moe.fuqiuluo.shamrock.ui.service
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.core.content.ContextCompat.startActivity
-import io.ktor.client.request.get
-import io.ktor.client.request.parameter
-import io.ktor.client.request.url
-import io.ktor.client.statement.bodyAsText
-import io.ktor.http.HttpStatusCode
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
-import moe.fuqiuluo.shamrock.remote.structures.CommonResult
-import moe.fuqiuluo.shamrock.remote.structures.CurrentAccount
-import moe.fuqiuluo.shamrock.remote.structures.Status
-import moe.fuqiuluo.shamrock.tools.GlobalClient
-import moe.fuqiuluo.shamrock.ui.app.AppRuntime.AccountInfo
-import moe.fuqiuluo.shamrock.ui.app.AppRuntime.log
-import moe.fuqiuluo.shamrock.ui.app.AppRuntime.state
-import moe.fuqiuluo.shamrock.ui.app.Level
-import moe.fuqiuluo.shamrock.ui.app.ShamrockConfig
-import moe.fuqiuluo.shamrock.ui.service.internal.broadcastToModule
-import java.net.ConnectException
-import java.util.Timer
-import kotlin.concurrent.timer
-
-object DashboardInitializer {
-    private  var servicePort: Int = 0
-    private lateinit var heartbeatTimer: Timer
-
-    operator fun invoke(context: Context, port: Int) {
-        servicePort = port
-        initHeartbeat(true, context)
-    }
-
-    private fun initHeartbeat(reload: Boolean, context: Context) {
-        if (::heartbeatTimer.isInitialized && !reload) {
-            return
-        }
-        if (::heartbeatTimer.isInitialized) {
-            heartbeatTimer.cancel()
-        }
-        heartbeatTimer = timer("heartbeat", false, 0, 1000L * 30) {
-            checkService(context)
-        }
-    }
-
-    private fun checkService(context: Context) {
-        GlobalScope.launch {
-            try {
-                GlobalClient.get {
-                    url("http://127.0.0.1:$servicePort/get_account_info")
-                    val token = ShamrockConfig.getToken(context)
-                    if (token.isNotBlank()) {
-                        //header("Authorization", "Bearer $token")
-                        parameter("access_token", token)
-                    }
-                }.let {
-                    if (it.status == HttpStatusCode.OK) {
-                        val result: CommonResult<CurrentAccount> = Json.decodeFromString(it.bodyAsText())
-                        state.isFined.value = result.retcode == 0
-                        if (result.retcode == Status.InternalHandlerError.code) {
-                            log("账号未登录。", Level.WARN)
-                        } else if (result.retcode != 0) {
-                            log("尝试从接口获取账号信息失败，未知错误。", Level.ERROR)
-                        } else {
-                            AccountInfo.let { account ->
-                                account.uin.value = result.data.uin.toString()
-                                account.nick.value = result.data.nick
-                            }
-                        }
-                    } else {
-                        state.isFined.value = false
-                        log("尝试从接口获取账号信息失败，服务运行异常。", Level.ERROR)
-                    }
-                }
-            } catch (e: ConnectException) {
-                state.isFined.value = false
-                context.broadcastToModule {
-                    putExtra("__cmd", "checkAndStartService")
-                }
-
-                if (ShamrockConfig.enableAutoStart(context)) {
-                    log("检测到Service死亡，正在尝试重新启动！")
-                    GlobalScope.launch(Dispatchers.Main) {
-                        val packageName = "com.tencent.mobileqq"
-                        val className = "com.tencent.mobileqq.activity.SplashActivity"
-
-                        val intent = Intent()
-                        intent.component = ComponentName(packageName, className)
-                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                        intent.putExtra("from", "shamrock")
-                        startActivity(context, intent, Bundle.EMPTY)
-                    }
-                }
-            } catch (e: Throwable) {
-                state.isFined.value = false
-                log(e.stackTraceToString(), Level.ERROR)
-            }
-        }
-    }
-}

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

@@ -1,15 +0,0 @@
-package moe.fuqiuluo.shamrock.ui.service.handlers
-
-import android.content.ContentValues
-import android.content.Context
-import moe.fuqiuluo.shamrock.ui.app.AppRuntime
-import moe.fuqiuluo.shamrock.ui.service.DashboardInitializer
-
-object FetchPortHandler: ModuleHandler() {
-    override val cmd: String = "success"
-
-    override fun onReceive(callbackId: Int, values: ContentValues, context: Context) {
-        AppRuntime.state.supportVoice.value = values.getAsBoolean("voice")
-        DashboardInitializer(context, values.getAsInteger("port"))
-    }
-}

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

@@ -3,13 +3,37 @@ package moe.fuqiuluo.shamrock.ui.service.handlers
 import android.content.ContentValues
 import android.content.Context
 import moe.fuqiuluo.shamrock.ui.app.AppRuntime
-import moe.fuqiuluo.shamrock.ui.app.ShamrockConfig
+import moe.fuqiuluo.shamrock.app.config.ShamrockConfig
+import moe.fuqiuluo.shamrock.config.*
 
 internal object InitHandler: ModuleHandler() {
     override val cmd: String = "init"
 
     override fun onReceive(callbackId: Int, values: ContentValues, context: Context) {
+        update(context)
+    }
+
+    fun update(context: Context) {
         AppRuntime.log("推送QQ进程初始化设置数据包成功...")
-        callback(context, callbackId, ShamrockConfig.getConfigMap(context))
+
+        val maps = hashMapOf<String, Any?>()
+
+        ActiveRPC.update(context, maps)
+        AliveReply.update(context, maps)
+        AntiJvmTrace.update(context, maps)
+        DebugMode.update(context, maps)
+        EnableOldBDH.update(context, maps)
+        EnableSelfMessage.update(context, maps)
+        ForceTablet.update(context, maps)
+        PassiveRPC.update(context, maps)
+        ResourceGroup.update(context, maps)
+        RPCAddress.update(context, maps)
+        RPCPort.update(context, maps)
+
+        callback(context, 1, maps)
+    }
+
+    private inline fun <reified T> ConfigKey<T>.update(context: Context, map: HashMap<String, Any?>) {
+        map[name()] = ShamrockConfig[context, this]
     }
 }

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

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

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

@@ -0,0 +1,49 @@
+package moe.fuqiuluo.shamrock.ui.service.handlers
+
+import android.content.ContentValues
+import android.content.Context
+import android.widget.Toast
+import moe.fuqiuluo.shamrock.tools.GlobalUi
+import moe.fuqiuluo.shamrock.ui.app.AppRuntime
+import java.util.Timer
+import kotlin.concurrent.timer
+import kotlin.concurrent.timerTask
+
+object SwitchStatus: ModuleHandler() {
+    override val cmd: String
+        get() = "switch_status"
+
+    private var lastActiveTime = 0L
+    private var timer: Timer? = null
+
+    override fun onReceive(callbackId: Int, values: ContentValues, context: Context) {
+        val voiceSwitch = values.getAsBoolean("voice")
+        val nickname = values.getAsString("nickname")
+        val account = values.getAsString("account")
+        if (lastActiveTime == 0L) GlobalUi.post {
+            Toast.makeText(context, "激活成功", Toast.LENGTH_SHORT).show()
+        }
+        AppRuntime.state.apply {
+            isFined.value = true
+            coreVersion.value = values.getAsString("core_version")
+            coreName.value = "LSPosed"
+            supportVoice.value = voiceSwitch
+        }
+        AppRuntime.AccountInfo.apply {
+            uin.value = account
+            nick.value = nickname
+        }
+        lastActiveTime = System.currentTimeMillis()
+        startTimer()
+    }
+
+    private fun startTimer() {
+        timer?.cancel()
+        timer = timer("SwitchStatus", true, 0, 5_000) {
+            if (lastActiveTime != 0L && System.currentTimeMillis() - lastActiveTime > 30 * 1000) {
+                AppRuntime.state.isFined.value = false
+                lastActiveTime = 0
+            }
+        }
+    }
+}

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

@@ -5,9 +5,9 @@ import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.database.Cursor
-import android.net.Uri
 import moe.fuqiuluo.shamrock.ui.service.ModuleTalker
 import moe.fuqiuluo.shamrock.ui.service.handlers.*
+import android.net.Uri
 
 class MultifunctionalProvider: ContentProvider() {
     override fun insert(uri: Uri, content: ContentValues?): Uri {
@@ -28,8 +28,8 @@ class MultifunctionalProvider: ContentProvider() {
 
     override fun onCreate(): Boolean {
         ModuleTalker.register(InitHandler)
-        ModuleTalker.register(FetchPortHandler)
         ModuleTalker.register(LogHandler)
+        ModuleTalker.register(SwitchStatus)
         return true
     }
 
@@ -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.kritor.dynamic"
     intent.intentBuilder()
     sendBroadcast(intent)
 }

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

@@ -1,23 +1,35 @@
 package moe.fuqiuluo.shamrock.ui.tools
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.FastOutLinearInEasing
+import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.MutableTransitionState
+import androidx.compose.animation.core.TweenSpec
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.Indication
 import androidx.compose.foundation.background
+import androidx.compose.foundation.indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
+import androidx.compose.material3.Text
 import androidx.compose.material3.Typography
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -31,8 +43,10 @@ import androidx.compose.ui.layout.LastBaseline
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
@@ -135,8 +149,7 @@ private fun TabBaselineLayout(
     text: @Composable (() -> Unit)?,
     icon: @Composable (() -> Unit)?
 ) {
-    Layout(
+    Layout({
-        {
         if (text != null) {
             Box(
                 Modifier
@@ -147,8 +160,7 @@ private fun TabBaselineLayout(
         if (icon != null) {
             Box(Modifier.layoutId("icon")) { icon() }
         }
-        }
+    }) { measurables, constraints ->
-    ) { measurables, constraints ->
         val textPlaceable = text?.let {
             measurables.first { it.layoutId == "text" }.measure(
                 // Measure with loose constraints for height as we don't want the text to take up more
@@ -247,21 +259,66 @@ fun ShamrockTab(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
-    text: @Composable (() -> Unit)? = null,
-    icon: @Composable (() -> Unit)? = null,
     selectedContentColor: Color = GlobalColor.TabSelected,
     unselectedContentColor: Color = selectedContentColor,
     indication: Indication? = rememberRipple(bounded = true, color = selectedContentColor),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    titleWithIcon: Pair<String, Int>,
+    visibleState:  MutableTransitionState<Boolean>
 ) {
-    val styledText: @Composable (() -> Unit)? = text?.let {
+    var text: @Composable (() -> Unit)? = null
-        @Composable {
+    var icon: @Composable (() -> Unit)? = null
-            val style =
+
-                MaterialTheme.typography.fromToken(PrimaryNavigationTabTokens.LabelTextFont)
+    if (!selected) {
+        icon = {
+            Icon(
+                painter = painterResource(id = titleWithIcon.second),
+                contentDescription = titleWithIcon.first,
+                tint = Color.Unspecified,
+                modifier = Modifier
+                    .height(24.dp)
+                    .width(24.dp)
+                    .padding(bottom = 5.dp)
+                    .indication(
+                        remember { MutableInteractionSource() },
+                        rememberRipple(color = Color.Transparent)
+                    )
+            )
+        }
+    } else {
+        text = {
+            val style = MaterialTheme.typography
+                .fromToken(PrimaryNavigationTabTokens.LabelTextFont)
                 .copy(textAlign = TextAlign.Center)
-            ProvideTextStyle(style, content = text)
+
+            ProvideTextStyle(style) {
+                AnimatedVisibility(
+                    visibleState = visibleState,
+                    enter = remember {
+                        scaleIn(animationSpec = TweenSpec(150, easing = FastOutLinearInEasing))
+                    },
+                    exit = remember {
+                        scaleOut(animationSpec = TweenSpec(150, easing = FastOutSlowInEasing))
+                    },
+                    modifier = Modifier
+                ) {
+                    Text(
+                        text = titleWithIcon.first,
+                        color = GlobalColor.TabItem,
+                        fontSize = 15.sp,
+                        fontWeight = FontWeight.Bold,
+                        modifier = Modifier
+                            .padding(bottom = 5.dp)
+                            .indication(
+                                remember { MutableInteractionSource() },
+                                rememberRipple(color = Color.Transparent)
+                            )
+                    )
                 }
             }
+        }
+    }
+
     ShamrockTab(
         selected,
         onClick,
@@ -272,7 +329,10 @@ fun ShamrockTab(
         interactionSource,
         indication
     ) {
-        TabBaselineLayout(icon = icon, text = styledText)
+        TabBaselineLayout(
+            icon = icon,
+            text = text
+        )
     }
 }
 

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.9.21"
+    kotlin("jvm") version "1.9.22"
 }
 
 repositories {

buildSrc/src/main/kotlin/Dependencies.kt

@@ -7,10 +7,6 @@ val DEPENDENCY_ANDROIDX = arrayOf(
     "androidx.activity:activity-compose:1.7.2",
 )
 
-const val DEPENDENCY_JSON5K = "io.github.xn32:json5k:0.3.0"
-const val DEPENDENCY_PROTOBUF = "com.google.protobuf:protobuf-java:3.24.0"
-const val DEPENDENCY_JAVA_WEBSOCKET = "org.java-websocket:Java-WebSocket:1.5.4"
-
 fun room(name: String) = "androidx.room:room-$name:${Versions.roomVersion}"
 
 fun kotlinx(name: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$name:$version"
@@ -19,8 +15,9 @@ fun ktor(target: String, name: String): String {
     return "io.ktor:ktor-$target-$name:${Versions.ktorVersion}"
 }
 
+fun grpc(name: String, version: String) = "io.grpc:grpc-$name:$version"
+
 object Versions {
     const val roomVersion = "2.5.0"
-
     const val ktorVersion = "2.3.3"
 }

kritor/.gitignore

@@ -0,0 +1,42 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

kritor/build.gradle.kts

@@ -0,0 +1,76 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("com.google.protobuf") version "0.9.4"
+}
+
+android {
+    namespace = "moe.whitechi73.kritor"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    protobuf(files("kritor/protos"))
+
+    implementation("com.google.protobuf:protobuf-java:4.26.0")
+
+    implementation(kotlinx("coroutines-core", "1.8.0"))
+
+    implementation(grpc("stub", "1.62.2"))
+    implementation(grpc("protobuf", "1.62.2"))
+    implementation(grpc("kotlin-stub", "1.4.1"))
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:4.26.0"
+    }
+    plugins {
+        create("grpc") {
+            artifact = "io.grpc:protoc-gen-grpc-java:1.62.2"
+        }
+        create("grpckt") {
+            artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
+        }
+    }
+    generateProtoTasks {
+        all().forEach {
+            it.plugins {
+                create("grpc")
+                create("grpckt")
+            }
+            it.builtins {
+                create("java")
+            }
+        }
+    }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+}

kritor/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

processor/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     implementation("com.google.devtools.ksp:symbol-processing-api:1.9.21-1.0.15")
     implementation("com.squareup:kotlinpoet:1.14.2")
 
-    implementation(DEPENDENCY_PROTOBUF)
+    //implementation(DEPENDENCY_PROTOBUF)
     implementation(kotlinx("serialization-protobuf", "1.6.2"))
 
     ksp("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")

processor/src/main/java/moe/fuqiuluo/ksp/impl/GrpcProcessor.kt

@@ -0,0 +1,83 @@
+@file:Suppress("UNCHECKED_CAST")
+@file:OptIn(KspExperimental::class)
+
+package moe.fuqiuluo.ksp.impl
+
+import com.google.devtools.ksp.KspExperimental
+import com.google.devtools.ksp.getAnnotationsByType
+import com.google.devtools.ksp.processing.*
+import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSFunctionDeclaration
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import kritor.service.Grpc
+
+class GrpcProcessor(
+    private val codeGenerator: CodeGenerator,
+    private val logger: KSPLogger
+): SymbolProcessor {
+    override fun process(resolver: Resolver): List<KSAnnotated> {
+        val symbols = resolver.getSymbolsWithAnnotation(Grpc::class.qualifiedName!!)
+        val actions = (symbols as Sequence<KSFunctionDeclaration>).toList()
+
+        if (actions.isEmpty()) return emptyList()
+
+        // 怎么返回nullable的结果
+        val packageName = "kritor.handlers"
+        val funcBuilder = FunSpec.builder("handleGrpc")
+            .addModifiers(KModifier.SUSPEND)
+            .addParameter("cmd", String::class)
+            .addParameter("data", ByteArray::class)
+            .returns(ByteArray::class)
+        val fileSpec = FileSpec.scriptBuilder("AutoGrpcHandlers", packageName)
+
+        logger.warn("Found ${actions.size} grpc-actions")
+
+        //logger.error(resolver.getClassDeclarationByName("io.kritor.AuthReq").toString())
+        //logger.error(resolver.getJavaClassByName("io.kritor.AuthReq").toString())
+        //logger.error(resolver.getKotlinClassByName("io.kritor.AuthReq").toString())
+
+        actions.forEach { action ->
+            val methodName = action.qualifiedName?.asString()!!
+            val grpcMethod = action.getAnnotationsByType(Grpc::class).first()
+            val service = grpcMethod.serviceName
+            val funcName = grpcMethod.funcName
+            funcBuilder.addStatement("if (cmd == \"${service}.${funcName}\") {\t")
+
+            val reqType = action.parameters[0].type.toString()
+            val rspType = action.returnType.toString()
+            funcBuilder.addStatement("val resp: $rspType = $methodName($reqType.parseFrom(data))")
+            funcBuilder.addStatement("return resp.toByteArray()")
+
+            funcBuilder.addStatement("}")
+        }
+        funcBuilder.addStatement("return EMPTY_BYTE_ARRAY")
+        fileSpec
+            .addStatement("import io.kritor.authentication.*")
+            .addStatement("import io.kritor.core.*")
+            .addStatement("import io.kritor.customization.*")
+            .addStatement("import io.kritor.developer.*")
+            .addStatement("import io.kritor.file.*")
+            .addStatement("import io.kritor.friend.*")
+            .addStatement("import io.kritor.group.*")
+            .addStatement("import io.kritor.guild.*")
+            .addStatement("import io.kritor.message.*")
+            .addStatement("import io.kritor.web.*")
+            .addFunction(funcBuilder.build())
+            .addImport("moe.fuqiuluo.symbols", "EMPTY_BYTE_ARRAY")
+        runCatching {
+            codeGenerator.createNewFile(
+                dependencies = Dependencies(aggregating = false),
+                packageName = packageName,
+                fileName = fileSpec.name
+            ).use { outputStream ->
+                outputStream.writer().use {
+                    fileSpec.build().writeTo(it)
+                }
+            }
+        }
+
+        return emptyList()
+    }
+}

processor/src/main/java/moe/fuqiuluo/ksp/impl/OneBotHandlerProcessor.kt

@@ -1,85 +0,0 @@
-@file:OptIn(KspExperimental::class)
-@file:Suppress("LocalVariableName", "UNCHECKED_CAST")
-
-package moe.fuqiuluo.ksp.impl
-
-import com.google.devtools.ksp.KspExperimental
-import com.google.devtools.ksp.getAnnotationsByType
-import com.google.devtools.ksp.getClassDeclarationByName
-import com.google.devtools.ksp.getKotlinClassByName
-import com.google.devtools.ksp.processing.CodeGenerator
-import com.google.devtools.ksp.processing.Dependencies
-import com.google.devtools.ksp.processing.KSPLogger
-import com.google.devtools.ksp.processing.Resolver
-import com.google.devtools.ksp.processing.SymbolProcessor
-import com.google.devtools.ksp.symbol.ClassKind
-import com.google.devtools.ksp.symbol.KSAnnotated
-import com.google.devtools.ksp.symbol.KSClassDeclaration
-import com.google.devtools.ksp.symbol.KSVisitorVoid
-import com.google.devtools.ksp.validate
-import com.squareup.kotlinpoet.FileSpec
-import com.squareup.kotlinpoet.FunSpec
-import moe.fuqiuluo.symbols.OneBotHandler
-
-class OneBotHandlerProcessor(
-    private val codeGenerator: CodeGenerator,
-    private val logger: KSPLogger
-): SymbolProcessor {
-    override fun process(resolver: Resolver): List<KSAnnotated> {
-        val ActionManagerNode = resolver.getClassDeclarationByName("moe.fuqiuluo.shamrock.remote.action.ActionManager")
-            ?: resolver.getKotlinClassByName("moe.fuqiuluo.shamrock.remote.action.ActionManager")
-            ?: resolver.getClassDeclarationByName("ActionManager")
-        val symbols = resolver.getSymbolsWithAnnotation(OneBotHandler::class.qualifiedName!!)
-        val unableToProcess = symbols.filterNot { it.validate() }
-        if (ActionManagerNode != null) {
-            val oneBotHandlers = (symbols.filter {
-                it is KSClassDeclaration && it.validate() && it.classKind == ClassKind.OBJECT
-            } as Sequence<KSClassDeclaration>).toList()
-
-            if (oneBotHandlers.isNotEmpty()) {
-                ActionManagerNode.accept(ActionManagerVisitor(oneBotHandlers), Unit)
-            }
-        }
-
-        return unableToProcess.toList()
-    }
-
-    inner class ActionManagerVisitor(
-        private val actionHandlers: List<KSClassDeclaration>
-    ): KSVisitorVoid() {
-        override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
-            val packageName = classDeclaration.packageName.asString()
-
-            // generate kotlin `init { }`
-            val fileSpec = FileSpec.builder(packageName, classDeclaration.qualifiedName?.asString() ?: run {
-                throw IllegalStateException("ActionManagerVisitor: classDeclaration.qualifiedName is null")
-            }).addFunction(FunSpec.builder("initManager").apply {
-                actionHandlers.forEach { handler ->
-                    // fetch the params of the annotation
-                    val annotation = handler.getAnnotationsByType(OneBotHandler::class).first()
-                    val actionName = annotation.actionName
-                    val alias = annotation.alias
-                    alias.forEach { name ->
-                        addStatement("actionMap[\"$name\"] = ${handler.simpleName.asString()}")
-                    }
-                    addStatement("actionMap[\"$actionName\"] = ${handler.simpleName.asString()}")
-                }
-            }.build()).apply {
-                addImport("moe.fuqiuluo.shamrock.remote.action.ActionManager", "actionMap")
-                actionHandlers.forEach {
-                    addImport(it.packageName.asString(), it.simpleName.asString())
-                }
-            }.build()
-
-            codeGenerator.createNewFile(
-                dependencies = Dependencies(aggregating = false),
-                packageName = packageName,
-                fileName = "Auto" + classDeclaration.simpleName.asString()
-            ).use { outputStream ->
-                outputStream.writer().use {
-                    fileSpec.writeTo(it)
-                }
-            }
-        }
-    }
-}

processor/src/main/java/moe/fuqiuluo/ksp/impl/ProtobufProcessor.kt

@@ -32,7 +32,7 @@ class ProtobufProcessor(
         }.toList()
 
         if (actions.isNotEmpty()) {
-            actions.forEachIndexed { index, clz ->
+            actions.forEachIndexed { _, clz ->
                 if (clz.isInternal()) return@forEachIndexed
                 if (clz.isPrivate()) return@forEachIndexed
 

processor/src/main/java/moe/fuqiuluo/ksp/impl/XposedHookProcessor.kt

@@ -1,5 +1,5 @@
 @file:Suppress("UNCHECKED_CAST", "LocalVariableName", "PrivatePropertyName")
-@file:OptIn(KspExperimental::class)
+@file:OptIn(KspExperimental::class, KspExperimental::class)
 
 package moe.fuqiuluo.ksp.impl
 
@@ -27,10 +27,14 @@ class XposedHookProcessor(
     private val logger: KSPLogger
 ): SymbolProcessor {
     override fun process(resolver: Resolver): List<KSAnnotated> {
-        val symbols = resolver.getSymbolsWithAnnotation(XposedHook::class.qualifiedName!!)
+        val symbols = resolver.getSymbolsWithAnnotation(
+            annotationName = XposedHook::class.qualifiedName!!,
+            inDepth = true
+        )
+        logger.warn("Found ${symbols.count()} classes annotated with XposedHook")
         val unableToProcess = symbols.filterNot { it.validate() }
         val actions = (symbols.filter {
-            it is KSClassDeclaration && it.validate()  && it.classKind == ClassKind.CLASS
+            it is KSClassDeclaration && it.classKind == ClassKind.CLASS
         } as Sequence<KSClassDeclaration>).toList()
 
         if (actions.isNotEmpty()) {
@@ -46,7 +50,7 @@ class XposedHookProcessor(
             }
 
             val context = ClassName("android.content", "Context")
-            val packageName = "moe.fuqiuluo.shamrock.xposed.hooks"
+            val packageName = "moe.fuqiuluo.shamrock.xposed.actions"
             val fileSpec = FileSpec.builder(packageName, "AutoActionLoader").addFunction(FunSpec.builder("runFirstActions")
                 .addParameter("ctx", context)
                 .apply {
@@ -96,16 +100,6 @@ class XposedHookProcessor(
                 }
             }
         }
-
         return unableToProcess.toList()
     }
-
-    inner class ActionLoaderVisitor(
-        private val firstActions: List<KSClassDeclaration>,
-        private val serviceActions: List<KSClassDeclaration>,
-    ): KSVisitorVoid() {
-        override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
-
-        }
-    }
 }

processor/src/main/java/moe/fuqiuluo/ksp/providers/GrpcProvider.kt

@@ -4,12 +4,12 @@ import com.google.auto.service.AutoService
 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
 import com.google.devtools.ksp.processing.SymbolProcessorProvider
-import moe.fuqiuluo.ksp.impl.OneBotHandlerProcessor
+import moe.fuqiuluo.ksp.impl.GrpcProcessor
 
 @AutoService(SymbolProcessorProvider::class)
-class OneBotHandlerProcessorProvider: SymbolProcessorProvider {
+class GrpcProvider: SymbolProcessorProvider {
     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
-        return OneBotHandlerProcessor(
+        return GrpcProcessor(
             environment.codeGenerator,
             environment.logger
         )

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")
@@ -35,7 +37,6 @@ android {
 }
 
 dependencies {
-    implementation(DEPENDENCY_PROTOBUF)
     implementation(kotlinx("serialization-protobuf", "1.6.2"))
     implementation(kotlinx("serialization-json", "1.6.2"))
 
@@ -43,3 +44,7 @@ dependencies {
 
     ksp(project(":processor"))
 }
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-opt-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(2) var elements: List<Elem>? = null,
-    @ProtoNumber(3) val not_online_file: NotOnlineFile? = null,
+    @ProtoNumber(3) var not_online_file: NotOnlineFile? = null,
-    @ProtoNumber(4) val ptt: Ptt? = 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/element/commelem/ButtonExtra.kt

@@ -13,7 +13,7 @@ data class ButtonExtra(
 @Serializable
 data class Object1(
     @ProtoNumber(1) val rows: List<Row>? = null,
-    @ProtoNumber(2) val appid: Int? = null,
+    @ProtoNumber(2) val appid: ULong? = null,
 )
 
 @Serializable

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/TrpcOidb.kt

@@ -8,7 +8,9 @@ import moe.fuqiuluo.symbols.Protobuf
 data class TrpcOidb(
     @ProtoNumber(1) val cmd: Int = Int.MIN_VALUE,
     @ProtoNumber(2) val service: Int = Int.MIN_VALUE,
-    @ProtoNumber(4) val buffer: ByteArray,
+    @ProtoNumber(3) val result: UInt? = null,
+    @ProtoNumber(4) val buffer: ByteArray? = null,
+    @ProtoNumber(5) val msg: String? = null,
     //@ProtoNumber(11) val traceParams: Map<String, String> = mapOf(),
     @ProtoNumber(12) val flag: Int = Int.MIN_VALUE,
 ): Protobuf<TrpcOidb>

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(1) val fromScene: UInt?,
-    @ProtoNumber(2) val toScene: UInt,
+    @ProtoNumber(2) val toScene: UInt?,
-    @ProtoNumber(3) val bytesPbReserve: ByteArray,
+    @ProtoNumber(3) val bytesPbReserve: ByteArray?,
 )
 
 @Serializable
 data class PicExtBizInfo(
-    @ProtoNumber(1) val bizType: UInt,
+    @ProtoNumber(1) val bizType: UInt?,
-    @ProtoNumber(2) val textSummary: String,
+    @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(1) val fileSize: ULong?,
-    @ProtoNumber(2) val md5: String,
+    @ProtoNumber(2) val md5: String?,
-    @ProtoNumber(3) val sha1: String,
+    @ProtoNumber(3) val sha1: String?,
-    @ProtoNumber(4) val name: String,
+    @ProtoNumber(4) val name: String?,
-    @ProtoNumber(5) val fileType: FileType,
+    @ProtoNumber(5) val fileType: FileType?,
-    @ProtoNumber(6) val width: UInt,
+    @ProtoNumber(6) val width: UInt?,
-    @ProtoNumber(7) val height: UInt,
+    @ProtoNumber(7) val height: UInt?,
-    @ProtoNumber(8) val time: UInt,
+    @ProtoNumber(8) val time: UInt?,
-    @ProtoNumber(9) val original: 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

@@ -1,7 +1,7 @@
 @file:OptIn(ExperimentalSerializationApi::class)
 package protobuf.oidb.cmd0x11c5
 
-import com.google.protobuf.Internal.EMPTY_BYTE_ARRAY
+import moe.fuqiuluo.symbols.EMPTY_BYTE_ARRAY
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
@@ -9,7 +9,7 @@ import moe.fuqiuluo.symbols.Protobuf
 
 @Serializable
 data class NtV2RichMediaRsp(
-    @ProtoNumber(1) val head: RspHead,
+    @ProtoNumber(1) val head: RspHead?,
     @ProtoNumber(2) val upload: UploadRsp?,
     @ProtoNumber(3) val download: DownloadRsp?,
     @ProtoNumber(4) val downloadRkeyRsp: DownloadRkeyRsp?,
@@ -26,8 +26,8 @@ class DownloadSafeRsp
 
 @Serializable
 data class UploadKeyRenewalRsp(
-    @ProtoNumber(1) val ukey: String,
+    @ProtoNumber(1) val ukey: String?,
-    @ProtoNumber(2) val ukeyTtlSec: ULong,
+    @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(4) val type: UInt,
 )
 
 @Serializable
 data class DownloadRsp(
-    @ProtoNumber(1) val rkeyParam: String,
+    @ProtoNumber(1) val rkeyParam: String?,
-    @ProtoNumber(2) val rkeyTtlSec: ULong,
+    @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(1) val ukey: String?,
-    @ProtoNumber(2) val ukeyTtlSec: ULong,
+    @ProtoNumber(2) val ukeyTtlSec: ULong?,
-    @ProtoNumber(3) val ipv4: List<Ipv4>,
+    @ProtoNumber(3) val ipv4: List<Ipv4>?,
-    @ProtoNumber(4) val ipv6: List<Ipv6>,
+    @ProtoNumber(4) val ipv6: List<Ipv6>?,
-    @ProtoNumber(5) val msgSeq: ULong,
+    @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(1) val subType: UInt?,
-    @ProtoNumber(2) val ukey: String,
+    @ProtoNumber(2) val ukey: String?,
-    @ProtoNumber(3) val ukeyTTLSec: ULong,
+    @ProtoNumber(3) val ukeyTTLSec: ULong?,
-    @ProtoNumber(4) val ipv4: List<Ipv4>,
+    @ProtoNumber(4) val ipv4: List<Ipv4>?,
-    @ProtoNumber(5) val ipv6: List<Ipv6>,
+    @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/oidb/cmd0x388/Cmd0x388Req.kt

@@ -1,6 +1,6 @@
 package protobuf.oidb.cmd0x388
 
-import com.google.protobuf.Internal.EMPTY_BYTE_ARRAY
+import moe.fuqiuluo.symbols.EMPTY_BYTE_ARRAY
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 import moe.fuqiuluo.symbols.Protobuf

protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Rsp.kt

@@ -2,7 +2,7 @@
 
 package protobuf.oidb.cmd0x388
 
-import com.google.protobuf.Internal.EMPTY_BYTE_ARRAY
+import moe.fuqiuluo.symbols.EMPTY_BYTE_ARRAY
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber

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/common/app/AppInterface.java

@@ -6,9 +6,13 @@ import com.tencent.mobileqq.app.BusinessObserver;
 import com.tencent.mobileqq.app.MessageHandler;
 import com.tencent.qphone.base.remote.ToServiceMsg;
 
+import java.util.concurrent.ConcurrentHashMap;
+
 import mqq.app.AppRuntime;
 
 public abstract class AppInterface extends AppRuntime {
+    private final ConcurrentHashMap<String, BusinessHandler> allHandler = new ConcurrentHashMap<>();
+
     public String getCurrentNickname() {
         return "";
     }

qqinterface/src/main/java/com/tencent/mobileqq/app/BaseBusinessHandler.java

@@ -13,6 +13,10 @@ public abstract class BaseBusinessHandler extends OidbWrapper {
         return null;
     }
 
+    public void addBusinessObserver(ToServiceMsg toServiceMsg, BusinessObserver businessObserver, boolean z) {
+
+    }
+
     public final <T> T decodePacket(byte[] data, String name, T obj) {
         UniPacket uniPacket = new UniPacket(true);
         try {
@@ -24,6 +28,10 @@ public abstract class BaseBusinessHandler extends OidbWrapper {
         }
     }
 
+    public boolean msgCmdFilter(String str) {
+        return false;
+    }
+
     protected abstract Set<String> getCommandList();
 
     protected abstract Set<String> getPushCommandList();

qqinterface/src/main/java/com/tencent/mobileqq/app/BusinessHandler.java

@@ -8,6 +8,8 @@ public abstract class BusinessHandler extends BaseBusinessHandler {
     public BusinessHandler(AppInterface appInterface) {
     }
 
+    protected abstract Class<? extends BusinessObserver> observerClass();
+
     @Override
     public Set<String> getCommandList() {
         return null;

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/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,7 +1,7 @@
 package com.tencent.qqnt.aio.api;
 
 import com.tencent.mobileqq.qroute.QRouteApi;
-import com.tencent.qqnt.kernel.nativeinterface.Contact;
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
 import com.tencent.qqnt.kernel.nativeinterface.IOperateCallback;
 
 public interface IAIOFileTransfer extends QRouteApi {

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/api/impl/MsgService.java

@@ -18,6 +18,11 @@ public class MsgService {
     public void addMsgListener(IKernelMsgListener listener) {
     }
 
+    public void removeMsgListener(@NotNull IKernelMsgListener iKernelMsgListener) {
+
+    }
+
+
     public String getRichMediaFilePathForGuild(@NotNull RichMediaFilePathInfo richMediaFilePathInfo) {
         return null;
     }

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/GProGuildTopFeedMsg.java

@@ -0,0 +1,4 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class GProGuildTopFeedMsg {
+}

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/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/IKernelMsgListener.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelpublic.nativeinterface.Contact;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -16,7 +18,7 @@ public interface IKernelMsgListener {
 
     void onCustomWithdrawConfigUpdate(CustomWithdrawConfig customWithdrawConfig);
 
-    void onDraftUpdate(Contact contact, ArrayList<MsgElement> arrayList, long j2);
+    void onDraftUpdate(Contact contact, ArrayList<MsgElement> arrayList, long j);
 
     void onEmojiDownloadComplete(EmojiNotifyInfo emojiNotifyInfo);
 
@@ -30,7 +32,7 @@ public interface IKernelMsgListener {
 
     void onFirstViewGroupGuildMapping(ArrayList<FirstViewGroupGuildInfo> arrayList);
 
-    void onGrabPasswordRedBag(int i2, String str, int i3, RecvdOrder recvdOrder, MsgRecord msgRecord);
+    void onGrabPasswordRedBag(int i, String str, int i2, RecvdOrder recvdOrder, MsgRecord msgRecord);
 
     void onGroupFileInfoAdd(GroupItem groupItem);
 
@@ -48,6 +50,8 @@ public interface IKernelMsgListener {
 
     void onGuildNotificationAbstractUpdate(GuildNotificationAbstractInfo guildNotificationAbstractInfo);
 
+    void onGuildTopFeedUpdate(GProGuildTopFeedMsg gProGuildTopFeedMsg);
+
     void onHitCsRelatedEmojiResult(DownloadRelateEmojiResultInfo downloadRelateEmojiResultInfo);
 
     void onHitEmojiKeywordResult(HitRelatedEmojiWordsResult hitRelatedEmojiWordsResult);
@@ -62,7 +66,7 @@ public interface IKernelMsgListener {
 
     void onLineDev(ArrayList<DevInfo> arrayList);
 
-    void onLogLevelChanged(long j2);
+    void onLogLevelChanged(long j);
 
     void onMsgAbstractUpdate(ArrayList<MsgAbstract> arrayList);
 
@@ -76,14 +80,16 @@ public interface IKernelMsgListener {
 
     void onMsgInfoListUpdate(ArrayList<MsgRecord> arrayList);
 
-    void onMsgQRCodeStatusChanged(int i2);
+    void onMsgQRCodeStatusChanged(int i);
 
-    void onMsgRecall(int i2, String str, long j2);
+    void onMsgRecall(int i, String str, long j);
 
     void onMsgSecurityNotify(MsgRecord msgRecord);
 
     void onMsgSettingUpdate(MsgSetting msgSetting);
 
+    void onMsgWithRichLinkInfoUpdate(ArrayList<MsgRecord> arrayList);
+
     void onNtFirstViewMsgSyncEnd();
 
     void onNtMsgSyncEnd();
@@ -92,11 +98,11 @@ public interface IKernelMsgListener {
 
     void onReadFeedEventUpdate(FirstViewDirectMsgNotifyInfo firstViewDirectMsgNotifyInfo);
 
-    void onRecvGroupGuildFlag(int i2);
+    void onRecvGroupGuildFlag(int i);
 
     void onRecvMsg(ArrayList<MsgRecord> arrayList);
 
-    void onRecvMsgSvrRspTransInfo(long j2, Contact contact, int i2, int i3, String str, byte[] bArr);
+    void onRecvMsgSvrRspTransInfo(long j, Contact contact, int i, int i2, String str, byte[] bArr);
 
     void onRecvOnlineFileMsg(ArrayList<MsgRecord> arrayList);
 
@@ -104,7 +110,9 @@ public interface IKernelMsgListener {
 
     void onRecvSysMsg(ArrayList<Byte> arrayList);
 
-    void onRecvUDCFlag(int i2);
+    void onRecvUDCFlag(int i);
+
+    void onRedTouchChanged();
 
     void onRichMediaDownloadComplete(FileTransNotifyInfo fileTransNotifyInfo);
 
@@ -114,9 +122,9 @@ public interface IKernelMsgListener {
 
     void onSearchGroupFileInfoUpdate(SearchGroupFileResult searchGroupFileResult);
 
-    void onSendMsgError(long j2, Contact contact, int i2, String str);
+    void onSendMsgError(long j, Contact contact, int i, String str);
 
-    void onSysMsgNotification(int i2, long j2, long j3, ArrayList<Byte> arrayList);
+    void onSysMsgNotification(int i, long j, long j2, boolean z, ArrayList<Byte> arrayList);
 
     void onTempChatInfoUpdate(TempChatInfo tempChatInfo);
 
@@ -128,9 +136,11 @@ public interface IKernelMsgListener {
 
     void onUserOnlineStatusChanged(boolean z);
 
+    void onUserSecQualityChanged(QueryUserSecQualityRsp queryUserSecQualityRsp);
+
     void onUserTabStatusChanged(ArrayList<TabStatusInfo> arrayList);
 
-    void onlineStatusBigIconDownloadPush(int i2, long j2, String str);
+    void onlineStatusBigIconDownloadPush(int i, long j, String str);
 
-    void onlineStatusSmallIconDownloadPush(int i2, long j2, String str);
+    void onlineStatusSmallIconDownloadPush(int i, long j, String str);
 }

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/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 {
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole;
-    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;
 
-    public MemberInfo() {
+public final class MemberInfo implements IKernelModel {
-        this.serialVersionUID = 1L;
+    public int bigClubFlag;
-        this.uid = "";
+    public int bigClubLevel;
-        this.qid = "";
+    public int cardNameId;
-        this.nick = "";
+    public int cardType;
-        this.remark = "";
+    public int creditLevel;
-        this.cardName = "";
+    public int globalGroupLevel;
-        this.role = MemberRole.values()[0];
+    public int globalGroupPoint;
-        this.avatarPath = "";
+    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() {
+    public void setUserShowFlag(int i2) {
-        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 + ",}";
+        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) {
+    public void setUserShowFlagNew(int i2) {
-        this.serialVersionUID = 1L;
+        this.userShowFlagNew = i2;
-        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 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/QueryUserSecQualityRsp.java

@@ -0,0 +1,4 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+public class QueryUserSecQualityRsp {
+}

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/kernelpublic/nativeinterface/Contact.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelpublic.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.IKernelModel;
 
 import java.io.Serializable;
 

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

@@ -0,0 +1,9 @@
+package com.tencent.qqnt.kernelpublic.nativeinterface;
+
+public enum MemberRole {
+    UNSPECIFIED,
+    STRANGER,
+    MEMBER,
+    ADMIN,
+    OWNER
+}

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;
@@ -9,7 +10,6 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import kotlin.Pair;
 import kotlinx.coroutines.flow.Flow;
 
 public interface IMsgService extends QRouteApi {

qqinterface/src/main/java/mqq/app/AppRuntime.java

@@ -66,6 +66,13 @@ public abstract class AppRuntime {
         }
     }
 
+    public MobileQQ getApplication() {
+        return null;
+    }
+
+    public void startServlet(NewIntent newIntent) {
+    }
+
     public <T extends IRuntimeService> T getRuntimeService(Class<T> cls, String namespace) {
         throw new UnsupportedOperationException();
     }

qqinterface/src/main/java/mqq/app/NewIntent.java

@@ -0,0 +1,29 @@
+package mqq.app;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.tencent.mobileqq.app.BusinessObserver;
+
+public class NewIntent extends Intent {
+    public boolean runNow;
+
+    public NewIntent(Context context, Class<? extends Servlet> cls) {
+        super(context, cls);
+    }
+
+    public BusinessObserver getObserver() {
+        return null;
+    }
+
+    public boolean isWithouLogin() {
+        return false;
+    }
+
+    public void setObserver(BusinessObserver businessObserver) {
+
+    }
+
+    public void setWithouLogin(boolean z) {
+    }
+}

settings.gradle.kts

@@ -26,7 +26,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools:r8:8.2.47")
+        classpath("com.android.tools:r8:8.3.37")
     }
 }
 
@@ -34,8 +34,9 @@ rootProject.name = "Shamrock"
 include(
     ":app",
     ":xposed",
-    ":qqinterface"
+    ":qqinterface",
+    ":protobuf",
+    ":processor",
+    ":annotations",
+    ":kritor"
 )
-include(":protobuf")
-include(":processor")
-include(":annotations")

xposed/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -58,9 +60,10 @@ kotlin {
 }
 
 dependencies {
-    compileOnly ("de.robv.android.xposed:api:82")
+    compileOnly("de.robv.android.xposed:api:82")
-    compileOnly (project(":qqinterface"))
+    compileOnly(project(":qqinterface"))
 
+    implementation(project(":kritor"))
     implementation(project(":protobuf"))
     implementation(project(":annotations"))
     ksp(project(":processor"))
@@ -70,27 +73,20 @@ dependencies {
     DEPENDENCY_ANDROIDX.forEach {
         implementation(it)
     }
-    implementation(DEPENDENCY_JAVA_WEBSOCKET)
-    implementation(DEPENDENCY_PROTOBUF)
-    implementation(DEPENDENCY_JSON5K)
 
     implementation(room("runtime"))
     kapt(room("compiler"))
     implementation(room("ktx"))
 
     implementation(kotlinx("io-jvm", "0.1.16"))
-    implementation(kotlinx("serialization-protobuf", "1.6.2"))
 
-    implementation(ktor("server", "core"))
-    implementation(ktor("server", "host-common"))
-    implementation(ktor("server", "status-pages"))
-    implementation(ktor("server", "netty"))
-    implementation(ktor("server", "content-negotiation"))
     implementation(ktor("client", "core"))
-    implementation(ktor("client", "content-negotiation"))
+    implementation(ktor("client", "okhttp"))
-    implementation(ktor("client", "cio"))
     implementation(ktor("serialization", "kotlinx-json"))
-    implementation(ktor("network", "tls-certificates"))
+
+    implementation(grpc("protobuf", "1.62.2"))
+    implementation(grpc("kotlin-stub", "1.4.1"))
+    implementation(grpc("okhttp", "1.62.2"))
 
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
@@ -99,4 +95,8 @@ dependencies {
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
 }
 
-
+tasks.withType<KotlinCompile>().all {
+    kotlinOptions {
+        freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
+    }
+}

xposed/src/main/aidl/moe/fuqiuluo/shamrock/xposed/ipc/bytedata/IByteData.aidl

@@ -1,8 +0,0 @@
-// IByteData.aidl
-package moe.fuqiuluo.shamrock.xposed.ipc.bytedata;
-
-import moe.fuqiuluo.shamrock.xposed.ipc.bytedata.IByteDataSign;
-
-interface IByteData {
-    IByteDataSign sign(String uin, String data, in byte[] salt);
-}

xposed/src/main/aidl/moe/fuqiuluo/shamrock/xposed/ipc/bytedata/IByteDataSign.aidl

@@ -1,4 +0,0 @@
-// IByteDataSign.aidl
-package moe.fuqiuluo.shamrock.xposed.ipc.bytedata;
-
-parcelable IByteDataSign;

xposed/src/main/aidl/moe/fuqiuluo/shamrock/xposed/ipc/qsign/IQSign.aidl

@@ -1,4 +0,0 @@
-// IQSign.aidl
-package moe.fuqiuluo.shamrock.xposed.ipc.qsign;
-
-parcelable IQSign;

xposed/src/main/aidl/moe/fuqiuluo/shamrock/xposed/ipc/qsign/IQSigner.aidl

@@ -1,14 +0,0 @@
-// IQSigner.aidl
-package moe.fuqiuluo.shamrock.xposed.ipc.qsign;
-
-import moe.fuqiuluo.shamrock.xposed.ipc.qsign.IQSign;
-
-interface IQSigner {
-    IQSign sign(String cmd, int seq, String uin, in byte[] buffer);
-
-    byte[] energy(String module, in byte[] salt);
-
-    byte[] xwDebugId(String uin, String start, String end);
-
-    List<String> getCmdWhiteList();
-}