2020/11/4 FIX Bugs

Former-commit-id: b47b6ff

kotlin_mirai/build.gradle

@@ -22,6 +22,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
     implementation "net.mamoe:mirai-core-qqandroid:1.1.3"
     implementation "net.mamoe:mirai-console:0.5.2"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.10"
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10'
 }
 

kotlin_mirai/src/main/kotlin/com/example/plugin/CPP_lib.kt

@@ -39,6 +39,7 @@ class CPP_lib {
                     Send(message, id)
                 }
             }
+            return
         }
         @JvmStatic
         fun GetNick(qqid:Long): String {

kotlin_mirai/src/main/kotlin/com/example/plugin/ExamplePluginMain.kt

@@ -8,6 +8,7 @@ package com.example.plugin
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.console.plugins.PluginBase
 import net.mamoe.mirai.event.events.*
@@ -63,9 +64,9 @@ object ExamplePluginMain : PluginBase() {
         }
         subscribeAlways<FriendMessageEvent> {
             //个人信息
-            logger.info("starting")
-            cpp.PrivateMessage(subject.id,message.toString())
-            logger.info("ending")
+            GlobalScope.launch(Dispatchers.Default) {
+                cpp.PrivateMessage(subject.id, message.toString())
+            }
         }
         subscribeAlways<MemberJoinEvent.Active> {
             cpp.GroupMemberJoin(member.id, true, group.id)

kotlin_mirai/生成头文件指引.txt

@@ -0,0 +1,6 @@
+please run the classes task in gradle first
+先执行classes任务在gradle里
+and use cmd into the "...\MiraiCP\kotlin_mirai\build\classes\kotlin\main\com\example\plugin" address
+然后用cmd cd到"...\MiraiCP\kotlin_mirai\build\classes\kotlin\main\com\example\plugin"路径下
+run this command "javah com.example.plugin.CPP_lib"
+执行这个指令 "javah com.example.plugin.CPP_lib"

mirai-demo/.vs/mirai-demo/v16/Browse.VC.db.REMOVED.git-id

@@ -1 +1 @@
-ef4dfeb15025a34c24b8207bf8ac8a647d003414
+1482065dc947777cf4e15b464480c2c274081ba6

mirai-demo/.vs/mirai-demo/v16/ipch/683b2766f1115eca.ipch.REMOVED.git-id

@@ -1 +1 @@
-153fee2b821f694a97e719a53791bf3f30ad5b23
+0bfc5006fc37aa5f5976e64167ef2e13fa71d1f3

mirai-demo/cpp.hint

@@ -0,0 +1,4 @@
+// 提示文件帮助 Visual Studio IDE 解释 Visual C++ 标识符,
+// 如函数和宏的名称。
+// 有关详细信息，请参见 https://go.microsoft.com/fwlink/?linkid=865984
+#define JNIEXPORT __declspec(dllexport)

mirai-demo/mirai-demo.vcxproj

@@ -184,6 +184,9 @@
     </ClCompile>
     <ClCompile Include="tools.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="cpp.hint" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>

mirai-demo/mirai-demo.vcxproj.filters

@@ -33,4 +33,7 @@
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="cpp.hint" />
+  </ItemGroup>
 </Project>

mirai-demo/pch.cpp

@@ -1,5 +1,5 @@
 #include "pch.h"
-void SendLog(JNIEnv* env, jobject job, string log) {
+JNIEXPORT void SendLog(JNIEnv* env, jobject job, string log) {
     //1.首先要在C中获取jclass对象，也就是找到方法所在的类，通过完整  包名+类名
     jclass java_first = env->FindClass("com/example/plugin/CPP_lib");
 
@@ -31,7 +31,7 @@ void SendLog(JNIEnv* env, jobject job, string log) {
 * 参数:env 必备参数，job 必备参数，memberid qq号，active 是否主动加入（非邀请）
 * 返回值: void
 */
- void JNICALL Java_com_example_plugin_CPP_1lib_GroupMemberJoin
+JNIEXPORT void JNICALL Java_com_example_plugin_CPP_1lib_GroupMemberJoin
 (JNIEnv* env, jobject job, jlong memberid, jboolean active,jlong groupid) {
     Group g(env, job, groupid);
     g.SendMsg(tools.JLongToString(memberid) + "加入了本群");
@@ -42,7 +42,7 @@ void SendLog(JNIEnv* env, jobject job, string log) {
 * 参数:env 必备参数，job 必备参数，memberid qq号，active 是否退出（非踢出）
 * 返回值:void
 */
- void JNICALL Java_com_example_plugin_CPP_1lib_GroupMemberLeave
+JNIEXPORT void JNICALL Java_com_example_plugin_CPP_1lib_GroupMemberLeave
 (JNIEnv* env, jobject job, jlong memberid, jboolean active,jlong groupid) {
     Group g(env, job, groupid);
     Friend f(env, job, memberid);
@@ -54,7 +54,7 @@ void SendLog(JNIEnv* env, jobject job, string log) {
 * 参数:env 必备参数，job 必备参数，origin 原名，newName 新名字，Groupid 群号，operateid 操作者qq（如果是机器人则为0）
 * 返回值: void
 */
- void JNICALL Java_com_example_plugin_CPP_1lib_GroupNameChange
+JNIEXPORT void JNICALL Java_com_example_plugin_CPP_1lib_GroupNameChange
 (JNIEnv* env, jobject job, jstring origin, jstring newName, jlong Groupid, jlong operateid) {
     //不做反应
 }
@@ -64,7 +64,7 @@ void SendLog(JNIEnv* env, jobject job, string log) {
 * 参数:env 必备参数，job 必备参数，qqid qq号，nick 申请者昵称，message 验证消息
 * 返回值:bool 是为添加 否为不添加
 */
- jboolean JNICALL Java_com_example_plugin_CPP_1lib_FriendRequest
+JNIEXPORT jboolean JNICALL Java_com_example_plugin_CPP_1lib_FriendRequest
 (JNIEnv* env, jobject job, jlong qqid, jstring nick, jstring message) {
     Friend object(env, job, qqid);
     object.SendMsg("Hi");
@@ -77,7 +77,7 @@ void SendLog(JNIEnv* env, jobject job, string log) {
 * 参数:env 必备，job 必备
 * 返回值:jstring (用str2jstring把string类型转成jsrting) 发送返回的字符串
 */
- jstring JNICALL Java_com_example_plugin_CPP_1lib_Verify(JNIEnv* env, jobject job) {
+JNIEXPORT jstring JNICALL Java_com_example_plugin_CPP_1lib_Verify(JNIEnv* env, jobject job) {
     //Friend(env, job, (jlong)1930893235).SendMsg("H");
     return tools.str2jstring(env, "2333");//验证机制
 }
@@ -87,16 +87,17 @@ void SendLog(JNIEnv* env, jobject job, string log) {
 * 参数:env 必备，job 必备，senderid qq号，sendername 发送者昵称，HeadImageDownloadUrl 发送者头像地址，message 发送的消息
 * 返回值: void
 */
-void JNICALL Java_com_example_plugin_CPP_1lib_PrivateMessage
+JNIEXPORT void JNICALL Java_com_example_plugin_CPP_1lib_PrivateMessage
 (JNIEnv* env, jobject job, jlong SenderId, jstring Message) {
     Friend object(env,job, SenderId);
     string result = "我还在测试中";//default is no reply
     if (object.id== 1930893235) {
-        object.SendMsg("Hi");//发送消息 Hi
-        SendLog(env, job, "OKOK");//发送日志
-        return;
+        object.SendMsg("Hi"+object.GetNick());//发送消息 Hi
+        SendLog(env, job, "Send MSG");//发送日志
+    }
+    else {
+        object.SendMsg(result);
     }
-    object.SendMsg(result);
 }
 /**
 * 名称:Java_com_example_plugin_CPP_1lib_GroupMessage
@@ -107,7 +108,7 @@ void JNICALL Java_com_example_plugin_CPP_1lib_PrivateMessage
 ernick:jstring 发送者昵称，sendergroupname:jstring 发送者群名称，senderid:jlong qq号，message:jstring 信息
 * 返回值:void
 **/
- void JNICALL Java_com_example_plugin_CPP_1lib_GroupMessage
+JNIEXPORT void JNICALL Java_com_example_plugin_CPP_1lib_GroupMessage
 (JNIEnv* env, jobject job, jlong GroupId, jstring GroupName, jlong GroupOwnerId, jstring SenderNick, jstring SenderGroupName, jlong SenderId, jstring Message){
     Group object(env, job, GroupId);
     Friend Sender(env, job, SenderId);

mirai-demo/tools.cpp

@@ -20,15 +20,14 @@ Friend::Friend (JNIEnv* env, jobject job,jlong id){
         */
     this->java_first = env->FindClass("com/example/plugin/CPP_lib");
     this->Send_Msg_id = env->GetStaticMethodID(java_first, "SendPrivateMSG", "(Ljava/lang/String;J)V");
-    this->Nick_Name_id = env->GetStaticMethodID(java_first, "GetNick", "(J)Ljava/lang/String");
+    //this->Nick_Name_id = env->GetStaticMethodID(java_first, "GetNick", "(J)Ljava/lang/String");
     this->jid = id;
     this->id = (long)id;
     this->env = env;
     //this->nick=this->GetNick();
 }
 Friend::~Friend() {
     this->env->DeleteLocalRef(java_first);
-    delete(this->env);
 }
 Group::Group(JNIEnv* env, jobject job, jlong id) {
     this->java_first = env->FindClass("com/example/plugin/CPP_lib");
@@ -39,7 +38,7 @@ Group::Group(JNIEnv* env, jobject job, jlong id) {
 }
 Group::~Group() {
     env->DeleteLocalRef(java_first);
-    delete(this->env);
+
 }
     string Tools::jstring2str(JNIEnv* env, jstring jstr)
     {