modify:跟踪jni代码问题

.idea/compiler.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="softbus-sdk" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="c58eb72d-fe6d-4fbf-a4f0-68fec4d46296" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "customColor": "",
+  "associatedIndex": 7
+}]]></component>
+  <component name="ProjectId" id="2ZpiB7DShj6wkrEUHvqqugVvgOq" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "master",
+    "last_opened_file_path": "D:/ma/work/softbus-sdk/softbus-sdk",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="c58eb72d-fe6d-4fbf-a4f0-68fec4d46296" name="Changes" comment="" />
+      <created>1703125299157</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1703125299157</updated>
+      <workItem from="1703125306381" duration="870000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>

softbus-jdk/SoftbusLNN.c

@@ -41,21 +41,23 @@ int parseConnectAddr(JNIEnv *env, jobject targetAddr,  ConnectionAddr *addr) {
         //获取getBrMac
         jmethodID getBrMacMethod = (*env)->GetMethodID(env, brAddrClass, "getBrMac", "()Ljava/lang/String;");
         jstring brMac = (*env)->CallObjectMethod(env, brAddr, getBrMacMethod);
-        const char *brMacStr = (*env)->GetStringUTFChars(env, brMac, 0);
-        if (brMacStr != NULL) {
-            // 获取字符串长度
-            jsize length = (*env)->GetStringUTFLength(env, brMac); 
-            // 将字符串转换为char数组
-            char brMacArray[length+1];
-            for (int i = 0; i < length; i++) {
-                brMacArray[i] = brMacStr[i];
-            }
-            // 添加字符串结束符
-            brMacArray[length] = '\0'; 
-            strcpy(addr->info.br.brMac, brMacArray);
-            printf("addr->info.br.brMac:%s\n", brMacStr);
-        } 
-        (*env)->ReleaseStringUTFChars(env, brMac, brMacStr);
+        if(brMac != NULL) {
+          const char *brMacStr = (*env)->GetStringUTFChars(env, brMac, 0);
+          if (brMacStr != NULL) {
+              // 获取字符串长度
+              jsize length = (*env)->GetStringUTFLength(env, brMac); 
+              // 将字符串转换为char数组
+              char brMacArray[length+1];
+              for (int i = 0; i < length; i++) {
+                  brMacArray[i] = brMacStr[i];
+              }
+              // 添加字符串结束符
+              brMacArray[length] = '\0'; 
+              strcpy(addr->info.br.brMac, brMacArray);
+              printf("addr->info.br.brMac:%s\n", brMacStr);
+          } 
+          (*env)->ReleaseStringUTFChars(env, brMac, brMacStr);
+        }
       }
       (*env)->DeleteLocalRef(env, brAddr);
 
@@ -78,21 +80,24 @@ int parseConnectAddr(JNIEnv *env, jobject targetAddr,  ConnectionAddr *addr) {
         //获取bleMac
         jmethodID getBleMacMethod = (*env)->GetMethodID(env, bleAddrClass, "getBleMac", "()Ljava/lang/String;");
         jstring bleMac = (*env)->CallObjectMethod(env, bleAddr, getBleMacMethod);
-        const char *bleMacStr = (*env)->GetStringUTFChars(env, bleMac, 0);
-        if (bleMac != NULL) {
-            // 获取字符串长度
-            jsize length = (*env)->GetStringUTFLength(env, bleMac); 
-            // 将字符串转换为char数组
-            char bleMacArray[length+1];
-            for (int i = 0; i < length; i++) {
-                bleMacArray[i] = bleMacStr[i];
-            }
-            // 添加字符串结束符
-            bleMacArray[length] = '\0'; 
-            strcpy(addr->info.ble.bleMac, bleMacArray);
-            printf("addr->info.ble.bleMac:%s\n", bleMacStr);
-        } 
-        (*env)->ReleaseStringUTFChars(env, bleMac, bleMacStr);
+        if(bleMac != NULL) {
+          const char *bleMacStr = (*env)->GetStringUTFChars(env, bleMac, 0);
+          if (bleMac != NULL) {
+              // 获取字符串长度
+              jsize length = (*env)->GetStringUTFLength(env, bleMac); 
+              // 将字符串转换为char数组
+              char bleMacArray[length+1];
+              for (int i = 0; i < length; i++) {
+                  bleMacArray[i] = bleMacStr[i];
+              }
+              // 添加字符串结束符
+              bleMacArray[length] = '\0'; 
+              strcpy(addr->info.ble.bleMac, bleMacArray);
+              printf("addr->info.ble.bleMac:%s\n", bleMacStr);
+          } 
+          (*env)->ReleaseStringUTFChars(env, bleMac, bleMacStr);
+        }
+        
         //获取udidHash
         jmethodID getUdidHashMethod = (*env)->GetMethodID(env, bleAddrClass, "getUdidHash", "()[B");
         jobject udidHashValue = (*env)->CallObjectMethod(env, bleAddr, getUdidHashMethod);
@@ -149,8 +154,8 @@ int parseConnectAddr(JNIEnv *env, jobject targetAddr,  ConnectionAddr *addr) {
         //获取ip属性
         jmethodID getIpMethod = (*env)->GetMethodID(env, ipAddrClass, "getIp", "()Ljava/lang/String;");
         jstring ip = (*env)->CallObjectMethod(env, ipAddr, getIpMethod);
-        const char *ipStr = (*env)->GetStringUTFChars(env, ip, 0);
         if (ip != NULL) {
+            const char *ipStr = (*env)->GetStringUTFChars(env, ip, 0);
             // 获取字符串长度
             jsize length = (*env)->GetStringUTFLength(env, ip); 
             // 将字符串转换为char数组
@@ -162,8 +167,9 @@ int parseConnectAddr(JNIEnv *env, jobject targetAddr,  ConnectionAddr *addr) {
             ipArray[length] = '\0'; 
             strcpy(addr->info.ip.ip, ipArray);
             printf("addr->info.ip.ip:%s\n", addr->info.ip.ip);
+            (*env)->ReleaseStringUTFChars(env, ip, ipStr);
         } 
-        (*env)->ReleaseStringUTFChars(env, ip, ipStr);
+        
         //获取端口port
         jmethodID getPortMethod = (*env)->GetMethodID(env, ipAddrClass, "getPort", "()I");
         jint port = (*env)->CallIntMethod(env, ipAddr, getPortMethod);
@@ -205,8 +211,8 @@ int parseConnectAddr(JNIEnv *env, jobject targetAddr,  ConnectionAddr *addr) {
     //开始解析peerUid
     jmethodID getPeerUidMethod = (*env)->GetMethodID(env, addrClass, "getPeerUid", "()Ljava/lang/String;");
     jstring peerUid = (*env)->CallObjectMethod(env, targetAddr, getPeerUidMethod);
-    const char *peerUidStr = (*env)->GetStringUTFChars(env, peerUid, 0);
-    if (peerUidStr != NULL) {
+    if (peerUid != NULL) {
+        const char *peerUidStr = (*env)->GetStringUTFChars(env, peerUid, 0);
         // 获取字符串长度
         jsize length = (*env)->GetStringUTFLength(env, peerUid); 
         // 将字符串转换为char数组
@@ -218,9 +224,9 @@ int parseConnectAddr(JNIEnv *env, jobject targetAddr,  ConnectionAddr *addr) {
         cArray[length] = '\0'; 
         strcpy(addr->peerUid, cArray);
         printf("addr->peerUid:%s\n", addr->peerUid);
+        // 释放C字符串的内存
+        (*env)->ReleaseStringUTFChars(env, peerUid, peerUidStr); 
     } 
-    // 释放C字符串的内存
-    (*env)->ReleaseStringUTFChars(env, peerUid, peerUidStr); 
     return 0;
   }
   return -1;

softbus-jdk/SoftbusPublish.c

@@ -52,24 +52,27 @@ jobject globalRef;
     //获取capability
     jmethodID getCapabilityMethod = (*env)->GetMethodID(env, infoClass, "getCapability", "()Ljava/lang/String;");
     jstring capability = (*env)->CallObjectMethod(env, pInfo, getCapabilityMethod);
-    const char *capabilityStr = (*env)->GetStringUTFChars(env, capability, 0);
-    info->capability=capabilityStr;
-    if(info->capability == NULL) {
-        info->capability = "osdCapability";
+    if(capability != NULL) {
+      const char *capabilityStr = (*env)->GetStringUTFChars(env, capability, 0);
+      char *temp = (char *)malloc(strlen(capabilityStr) + 1);
+      // 复制字符串到新分配的内存
+      strcpy(temp, capabilityStr);
+      info->capability = temp;
+      (*env)->ReleaseStringUTFChars(env, capability, capabilityStr);
+    } else {
+      info->capability = "osdCapability";
     }
-    (*env)->ReleaseStringUTFChars(env, capability, capabilityStr);
-    printf("PublishInfo->capability:%s\n", capabilityStr);
+    printf("PublishInfo->capability:%s\n", info->capability);
     //获取capabilityData
     jmethodID getCapabilityDataMethod = (*env)->GetMethodID(env, infoClass, "getCapabilityData", "()Ljava/lang/String;");
     jstring capabilityData = (*env)->CallObjectMethod(env, pInfo, getCapabilityDataMethod);
-    const char *capabilityDataStr = (*env)->GetStringUTFChars(env, capabilityData, 0);
-    strcpy(info->capabilityData, capabilityDataStr);
-
-    if(info->capabilityData == NULL) {
-        info->capabilityData = NULL;
+    if(capabilityData != NULL) {
+        const char *capabilityDataStr = (*env)->GetStringUTFChars(env, capabilityData, 0);
+        strcpy(info->capabilityData, capabilityDataStr);
+        (*env)->ReleaseStringUTFChars(env, capabilityData, capabilityDataStr);
+        printf("PublishInfo->capabilityData:%s\n", capabilityDataStr);
     }
-    (*env)->ReleaseStringUTFChars(env, capabilityData, capabilityDataStr);
-    printf("PublishInfo->capabilityData:%s\n", capabilityDataStr);
+
     //获取数据长度
     jmethodID getDataLenMethod = (*env)->GetMethodID(env, infoClass, "getDataLen", "()I");
     info->dataLen = (*env)->CallIntMethod(env, pInfo, getDataLenMethod);
@@ -248,7 +251,10 @@ JNIEXPORT jint JNICALL Java_com_jg_softbus_naservice_PublishService_stopPublishL
 
 JNIEXPORT void JNICALL Java_com_jg_softbus_naservice_PublishService_destroy
   (JNIEnv *env, jobject obj) {
+    printf("[publish]destory the publish data.");
      // 删除全局引用
     (*env)->DeleteGlobalRef(env, globalRef);
+    printf("[publish]globalRef have been destory.");
     free(jvm);
+    printf("[publish]jvm have been destory.");
   }

softbus-jdk/SoftbusSession.c

@@ -1041,8 +1041,14 @@ JNIEXPORT jstring JNICALL Java_com_jg_softbus_naservice_SessionService_getPeerSe
 
   JNIEXPORT void JNICALL Java_com_jg_softbus_naservice_SessionService_destroy
   (JNIEnv *env, jobject obj) {
+    printf("[session]destory the session data.");
+     // 删除全局引用
     (*env)->DeleteGlobalRef(env, sessionListener);
+    printf("[session]sessionListener have been destory.");
     (*env)->DeleteGlobalRef(env, fileSendListener);
+    printf("[session]fileSendListener have been destory.");
     (*env)->DeleteGlobalRef(env, fileReceiveListener);
+    printf("[session]fileReceiveListener have been destory.");
     free(jvm);
+    printf("[session]jvm have been destory.");
   }

softbus-jdk/SoftbusSubscribe.c

@@ -62,27 +62,36 @@ jobject globalRef;
     //获取capability
     jmethodID getCapabilityMethod = (*env)->GetMethodID(env, infoClass, "getCapability", "()Ljava/lang/String;");
     jstring capability = (*env)->CallObjectMethod(env, subscribeInfo, getCapabilityMethod);
-    const char *capabilityStr = (*env)->GetStringUTFChars(env, capability, 0);
-    info->capability = capabilityStr;
-    if(info->capability == NULL) {
+    if(capability != NULL) {
+        const char *capabilityStr = (*env)->GetStringUTFChars(env, capability, 0);
+        char *temp = (char *)malloc(strlen(capabilityStr) + 1);
+        // 复制字符串到新分配的内存
+        strcpy(temp, capabilityStr);
+        info->capability = temp;
+        (*env)->ReleaseStringUTFChars(env, capability, capabilityStr);
+    } else {
         info->capability = "osdCapability";
     }
-    (*env)->ReleaseStringUTFChars(env, capability, capabilityStr);
-    printf("SubscribeInfo->capability:%s\n", capabilityStr);
+    printf("SubscribeInfo->capability:%s\n", info->capability);
+    
     //获取capabilityData
     jmethodID getCapabilityDataMethod = (*env)->GetMethodID(env, infoClass, "getCapabilityData", "()Ljava/lang/String;");
     jstring capabilityData = (*env)->CallObjectMethod(env, subscribeInfo, getCapabilityDataMethod);
-    const char *capabilityDataStr = (*env)->GetStringUTFChars(env, capabilityData, 0);
-    strcpy(info->capabilityData, capabilityDataStr);
-    if(info->capabilityData == NULL) {
-        info->capabilityData = NULL;
+    if(capabilityData != NULL) {
+        const char *capabilityDataStr = (*env)->GetStringUTFChars(env, capabilityData, 0);
+        strcpy(info->capabilityData, capabilityDataStr);
+        if(info->capabilityData == NULL) {
+            info->capabilityData = NULL;
+        }
+        (*env)->ReleaseStringUTFChars(env, capabilityData, capabilityDataStr);
+        printf("SubscribeInfo->capabilityData:%s\n", capabilityDataStr);
     }
-    (*env)->ReleaseStringUTFChars(env, capabilityData, capabilityDataStr);
-    printf("SubscribeInfo->capabilityData:%s\n", capabilityDataStr);
+
     //获取数据长度
     jmethodID getDataLenMethod = (*env)->GetMethodID(env, infoClass, "getDataLen", "()I");
     info->dataLen = (*env)->CallIntMethod(env, subscribeInfo, getDataLenMethod);
     printf("SubscribeInfo->dataLen:%d\n", info->dataLen);
+    return 0;
   }
 
 /**
@@ -636,7 +645,10 @@ JNIEXPORT void JNICALL Java_com_jg_softbus_naservice_SubscribeService_releaseDev
 
   JNIEXPORT void JNICALL Java_com_jg_softbus_naservice_SubscribeService_destroy
   (JNIEnv *env, jobject obj) {
+    printf("[subscribe]destory the subscribe data.");
      // 删除全局引用
     (*env)->DeleteGlobalRef(env, globalRef);
+    printf("[subscribe]globalRef have been destory.");
     free(jvm);
+    printf("[subscribe]jvm have been destory.");
   }

softbus-jdk/softbus_client_main.c

@@ -0,0 +1,303 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include "securec.h"
+#include "discovery_service.h"
+#include "softbus_bus_center.h"
+#include "session.h"
+
+#define PACKAGE_NAME "softbus_sample"
+#define LOCAL_SESSION_NAME "session_test"
+#define TARGET_SESSION_NAME "session_test"
+#define DEFAULT_CAPABILITY "osdCapability"
+#define DEFAULT_SESSION_GROUP "group_test"
+#define DEFAULT_PUBLISH_ID 123
+
+static int g_sessionId;
+
+static void PublishSuccess(int publishId)
+{
+        printf("<PublishSuccess>CB: publish %d done\n", publishId);
+}
+
+static void PublishFailed(int publishId, PublishFailReason reason)
+{
+        printf("<PublishFailed>CB: publish %d failed, reason=%d\n", publishId, (int)reason);
+}
+
+static int PublishServiceInterface()
+{
+        PublishInfo info = {
+                .publishId = DEFAULT_PUBLISH_ID,
+                .mode = DISCOVER_MODE_PASSIVE,
+                .medium = COAP,
+                .freq = LOW,
+                .capability = DEFAULT_CAPABILITY,
+                .capabilityData = NULL,
+                .dataLen = 0,
+        };
+        IPublishCallback cb = {
+                .OnPublishSuccess = PublishSuccess,
+                .OnPublishFail = PublishFailed,
+        };
+        return PublishService(PACKAGE_NAME, &info, &cb);
+}
+
+static void UnPublishServiceInterface(void)
+{
+        int ret = UnPublishService(PACKAGE_NAME, DEFAULT_PUBLISH_ID);
+        if (ret != 0) {
+                printf("UnPublishService fail:%d\n", ret);
+        }
+}
+
+static void DeviceFound(const DeviceInfo *device)
+{
+        unsigned int i;
+        printf("<DeviceFound>CB: Device has found\n");
+        printf("\tdevId=%s\n", device->devId);
+        printf("\tdevName=%s\n", device->devName);
+        printf("\tdevType=%d\n", device->devType);
+        printf("\taddrNum=%d\n", device->addrNum);
+        for (i = 0; i < device->addrNum; i++) {
+                printf("\t\taddr%d:type=%d,", i + 1, device->addr[i].type);
+                switch (device->addr[i].type) {
+                case CONNECTION_ADDR_WLAN:
+                case CONNECTION_ADDR_ETH:
+                        printf("ip=%s,port=%d,", device->addr[i].info.ip.ip, device->addr[i].info.ip.port);
+                        break;
+                default:
+                        break;
+                }
+                printf("peerUid=%s\n", device->addr[i].peerUid);
+        }
+        printf("\tcapabilityBitmapNum=%d\n", device->capabilityBitmapNum);
+        for (i = 0; i < device->addrNum; i++) {
+                printf("\t\tcapabilityBitmap[%d]=0x%x\n", i + 1, device->capabilityBitmap[i]);
+        }
+        printf("\tcustData=%s\n", device->custData);
+}
+
+static void DiscoverySuccess(int subscribeId)
+{
+        printf("<DiscoverySuccess>CB: discover subscribeId=%d\n", subscribeId);
+}
+
+static void DiscoveryFailed(int subscribeId, DiscoveryFailReason reason)
+{
+        printf("<DiscoveryFailed>CB: discover subscribeId=%d failed, reason=%d\n", subscribeId, (int)reason);
+}
+
+static int DiscoveryInterface(void)
+{
+        SubscribeInfo info = {
+                .subscribeId = DEFAULT_PUBLISH_ID,
+                .mode = DISCOVER_MODE_ACTIVE,
+                .medium = COAP,
+                .freq = LOW,
+                .isSameAccount = false,
+                .isWakeRemote = false,
+                .capability = DEFAULT_CAPABILITY,
+                .capabilityData = NULL,
+                .dataLen = 0,
+        };
+        IDiscoveryCallback cb = {
+                .OnDeviceFound = DeviceFound,
+                .OnDiscoverFailed = DiscoveryFailed,
+                .OnDiscoverySuccess = DiscoverySuccess,
+        };
+        return StartDiscovery(PACKAGE_NAME, &info, &cb);
+}
+
+static void StopDiscoveryInterface(void)
+{
+        int ret = StopDiscovery(PACKAGE_NAME, DEFAULT_PUBLISH_ID);
+        if (ret) {
+                printf("StopDiscovery fail:%d\n", ret);
+        }
+}
+
+static int SessionOpened(int sessionId, int result)
+{
+        printf("<SessionOpened>CB: session %d open fail:%d\n", sessionId, result);
+        if (result == 0) {
+                g_sessionId = sessionId;
+        }
+
+        return result;
+}
+
+static void SessionClosed(int sessionId)
+{
+        printf("<SessionClosed>CB: session %d closed\n", sessionId);
+}
+
+static void ByteRecived(int sessionId, const void *data, unsigned int dataLen)
+{
+        printf("<ByteRecived>CB: session %d received %u bytes data=%s\n", sessionId, dataLen, (const char *)data);
+}
+
+static void MessageReceived(int sessionId, const void *data, unsigned int dataLen)
+{
+        printf("<MessageReceived>CB: session %d received %u bytes message=%s\n", sessionId, dataLen, (const char *)data);
+}
+
+static int CreateSessionServerInterface(void)
+{
+        const ISessionListener sessionCB = {
+                .OnSessionOpened = SessionOpened,
+                .OnSessionClosed = SessionClosed,
+                .OnBytesReceived = ByteRecived,
+                .OnMessageReceived = MessageReceived,
+        };
+
+        return CreateSessionServer(PACKAGE_NAME, LOCAL_SESSION_NAME, &sessionCB);
+}
+
+static void RemoveSessionServerInterface(void)
+{
+        int ret = RemoveSessionServer(PACKAGE_NAME, LOCAL_SESSION_NAME);
+        if (ret) {
+                printf("RemoveSessionServer fail:%d\n", ret);
+        }
+}
+
+static int OpenSessionInterface(const char *peerNetworkId)
+{
+        SessionAttribute attr = {
+                .dataType = TYPE_BYTES,
+                .linkTypeNum = 1,
+                .linkType[0] = LINK_TYPE_WIFI_WLAN_2G,
+                .attr = {RAW_STREAM},
+        };
+
+        return OpenSession(LOCAL_SESSION_NAME, TARGET_SESSION_NAME, peerNetworkId, DEFAULT_SESSION_GROUP, &attr);
+}
+
+static void CloseSessionInterface(int sessionId)
+{
+        CloseSession(sessionId);
+}
+
+static int GetAllNodeDeviceInfoInterface(NodeBasicInfo **dev)
+{
+        int ret, num;
+
+        ret = GetAllNodeDeviceInfo(PACKAGE_NAME, dev, &num);
+        if (ret) {
+                printf("GetAllNodeDeviceInfo fail:%d\n", ret);
+                return -1;
+        }
+
+        printf("<GetAllNodeDeviceInfo>return %d Node\n", num);
+        for (int i = 0; i < num; i++) {
+                printf("<num %d>deviceName=%s\n", i + 1, dev[i]->deviceName);
+                printf("\tnetworkId=%s\n", dev[i]->networkId);
+                printf("\tType=%d\n", dev[i]->deviceTypeId);
+        }
+
+        return num;
+}
+
+static void FreeNodeInfoInterface(NodeBasicInfo *dev)
+{
+        FreeNodeInfo(dev);
+}
+
+static void commnunicate(void)
+{
+        NodeBasicInfo *dev = NULL;
+        char cData[] = "hello world test";
+        int dev_num, sessionId, input, ret;
+        int timeout = 5;
+
+        dev_num = GetAllNodeDeviceInfoInterface(&dev);
+        if (dev_num <= 0) {
+                return;
+        }
+
+        printf("\nInput Node num to commnunication:");
+        scanf_s("%d", &input);
+        if (input <= 0 || input > dev_num) {
+                printf("error input num\n");
+                goto err_input;
+        }
+
+        g_sessionId = -1;
+        sessionId = OpenSessionInterface(dev[input - 1].networkId);
+        if (sessionId < 0) {
+                printf("OpenSessionInterface fail, ret=%d\n", sessionId);
+                goto err_OpenSessionInterface;
+        }
+
+        while (timeout) {
+                if (g_sessionId == sessionId) {
+                        ret = SendBytes(sessionId, cData, strlen(cData) + 1);
+                        if (ret) {
+                                printf("SendBytes fail:%d\n", ret);
+                        }
+                        break;
+                }
+                timeout--;
+                sleep(1);
+        }
+
+        CloseSessionInterface(sessionId);
+err_OpenSessionInterface:
+err_input:
+        FreeNodeInfoInterface(dev);
+}
+
+int main(int argc, char **argv)
+{
+        bool loop = true;
+        int ret;
+
+        ret = CreateSessionServerInterface();
+        if (ret) {
+            printf("CreateSessionServer fail, ret=%d\n", ret);
+            return ret;
+        } else {
+            printf("CreateSessionServer suc. ret=%d\n", ret);
+        }
+
+        ret = PublishServiceInterface();
+        if (ret) {
+            printf("PublishService fail, ret=%d\n", ret);
+            goto err_PublishServiceInterface;
+        } else {
+            printf("PublishService suc. ret=%d\n", ret);
+        }
+
+        ret = DiscoveryInterface();
+        if (ret) {
+                printf("DiscoveryInterface fail, ret=%d\n", ret);
+                goto err_DiscoveryInterface;
+        }  else {
+            printf("DiscoveryInterface suc. ret=%d\n", ret);
+        }
+
+        while (loop) {
+                printf("\nInput c to commnuication, Input s to stop:");
+                char op = getchar();
+                switch(op) {
+                case 'c':
+                        commnunicate();
+                        continue;
+                case 's':
+                        loop = false;
+                        break;
+                case '\n':
+                        break;
+                default:
+                        continue;
+                }
+        }
+
+        StopDiscoveryInterface();
+err_DiscoveryInterface:
+        UnPublishServiceInterface();
+err_PublishServiceInterface:
+        RemoveSessionServerInterface();
+        return 0;
+}

softbus-sdk/.idea/.name

@@ -0,0 +1 @@
+PublishService.java

softbus-sdk/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

softbus-sdk/src/main/java/com/jg/softbus/TestMain.java

@@ -19,17 +19,17 @@ public class TestMain {
     {
         //创建server
         SessionService sessionService = new SessionService("com.jg", "test-softbus");
-        CompletableFuture.runAsync(()->{
+//        CompletableFuture.runAsync(()->{
             try {
                 sessionService.createSessionServer();
             } catch (Exception ex) {
                 ex.printStackTrace();
                 System.out.println("发生异常，异常原因："+ex.getMessage());
             }
-        });
+//        });
         PublishService publishService = new PublishService("com.jg");
         //发布服务
-        CompletableFuture.runAsync(()->{
+//        CompletableFuture.runAsync(()->{
             try {
                 PublishInfo publishInfo = new PublishInfo();
                 publishInfo.setPublishId(1);
@@ -42,10 +42,10 @@ public class TestMain {
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-        });
+//        });
         //发现服务
         SubscribeService subscribeService = new SubscribeService("com.jg");
-        CompletableFuture.runAsync(()->{
+//        CompletableFuture.runAsync(()->{
             try {
                 SubscribeInfo info = new SubscribeInfo();
                 info.setSubscribeId(1);
@@ -55,13 +55,12 @@ public class TestMain {
                 info.setIsSameAccount(false);
                 info.setIsWakeRemote(false);
                 info.setCapability(DataBitMap.OSD_CAPABILITY_BITMAP.getAbbr());
-                info.setCapabilityData(null);
                 info.setDataLen(0);
                 subscribeService.discoveryStart(info);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-        });
+//        });
         //消息处理
         try {
             TimeUnit.SECONDS.sleep(30L);

softbus-sdk/src/main/java/com/jg/softbus/common/SoftbusErrCode.java

@@ -318,11 +318,13 @@ public enum SoftbusErrCode {
     }
 
     public static SoftbusErrCode getByErrCode(int errCode) {
+        System.out.println("返回异常，当前异常码为："+errCode);
         for (SoftbusErrCode softbusErrCode : SoftbusErrCode.values()) {
             if (softbusErrCode.getErrCode().equals(errCode)) {
                 return softbusErrCode;
             }
         }
-        return null;
+        //返回通用异常码
+        return SOFTBUS_ERR;
     }
 }

softbus-sdk/src/main/java/com/jg/softbus/naservice/PublishService.java

@@ -20,8 +20,10 @@ import com.jg.softbus.discovery.enums.PublishResult;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
 * 发布服务
@@ -36,9 +38,14 @@ public class PublishService implements IPublishCallback, IPublishCb, Closeable {
 	 * 包名
 	 */
 	private final String pkgName;
+	
 
 	private AtomicBoolean isStop = new AtomicBoolean(false);
 	/**
+	 * 默认进入类型 1-publishService; 2-publishLNN
+	 */
+	private AtomicInteger entryType = new AtomicInteger(0);
+	/**
 	 * 发布id及其状态维护
 	 */
 	private ConcurrentHashMap<Integer, PublishResult> publishIdState = new ConcurrentHashMap<>(16);
@@ -101,24 +108,31 @@ public class PublishService implements IPublishCallback, IPublishCb, Closeable {
 		if(isStop.get()) {
 			throw new Exception("publish service is stop");
 		}
+		if(entryType.get()==2) {
+			throw new Exception("method is not common. please call publishLNN method.");
+		}
+		entryType.set(1);
 		//提交发布请求
 		int rs = publishService(pkgName, publishInfo, callback);
 		if(rs!= 0){
 			//抛出异常
-			throw new Exception(SoftbusErrCode.getByErrCode(rs).getErrMsg());
+			throw new Exception(Objects.requireNonNull(SoftbusErrCode.getByErrCode(rs)).getErrMsg());
 		}
 	}
 
 	private void stopPublishByPublishId(int publishId) {
-		try {
-			stopPublish(publishId);
-		} catch (Exception e) {
-			//不做任何处理
-		}
-		try {
-			stopPublishLNN(publishId);
-		} catch (Exception e) {
-			//不做任何处理
+		if(entryType.get()==1) {
+			try {
+				stopPublish(publishId);
+			} catch (Exception e) {
+				//不做任何处理
+			}
+		} else if(entryType.get()==2) {
+			try {
+				stopPublishLNN(publishId);
+			} catch (Exception e) {
+				//不做任何处理
+			}
 		}
 	}
 
@@ -174,6 +188,10 @@ public class PublishService implements IPublishCallback, IPublishCb, Closeable {
 		if(isStop.get()) {
 			throw new Exception("publish service is stop");
 		}
+		if(entryType.get()==1) {
+			throw new Exception("method is not common. please call publishService method.");
+		}
+		entryType.set(2);
 		int rs = publishLNN(pkgName, publishInfo, callback);
 		if(rs!= 0) {
 			//抛出异常

softbus-sdk/src/main/java/com/jg/softbus/naservice/SubscribeService.java

@@ -17,6 +17,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -39,7 +40,10 @@ public class SubscribeService implements IDiscoveryCallback, IRefreshCallback, C
      * 订阅状态
      */
     private ConcurrentHashMap<Integer, RefreshResult> refreshIdState = new ConcurrentHashMap<>(8);
-
+    /**
+     * 进入类型； 1-discovery 2-refreshLNN
+     */
+    private AtomicInteger entryType = new AtomicInteger(0);
     /**
      * 获取包名
      * @return
@@ -102,6 +106,10 @@ public class SubscribeService implements IDiscoveryCallback, IRefreshCallback, C
         if(isStop.get()) {
             throw new Exception("subscribe service has stop");
         }
+        if(entryType.get()==2) {
+            throw new Exception("method is not common. please call refreshLNN method.");
+        }
+        entryType.set(1);
         int ret = discoveryStart(pkgName, subscribeInfo, callback);
         if (ret != 0) {
             throw new Exception(SoftbusErrCode.getByErrCode(ret).getErrMsg());
@@ -137,6 +145,10 @@ public class SubscribeService implements IDiscoveryCallback, IRefreshCallback, C
         if(isStop.get()) {
             throw new Exception("subscribe service has stop");
         }
+        if(entryType.get()==1) {
+            throw new Exception("method is not common. please call discoveryStart method.");
+        }
+        entryType.set(2);
         int res = refreshLNN(pkgName, subscribeInfo, callback);
         if (res != 0) {
             throw new Exception(SoftbusErrCode.getByErrCode(res).getErrMsg());
@@ -216,15 +228,18 @@ public class SubscribeService implements IDiscoveryCallback, IRefreshCallback, C
      * @param refreshId
      */
     private void stopSubscribeByRefreshId(int refreshId) {
-        try {
-            stopDiscovery(refreshId);
-        } catch (Exception e) {
-            //不做任何处理
-        }
-        try {
-            stopRefreshLNN(refreshId);
-        } catch (Exception e) {
-            //不做任何处理
+        if(entryType.get()==1) {
+            try {
+                stopDiscovery(refreshId);
+            } catch (Exception e) {
+                //不做任何处理
+            }
+        } else if (entryType.get()==2) {
+            try {
+                stopRefreshLNN(refreshId);
+            } catch (Exception e) {
+                //不做任何处理
+            }
         }
     }
 

softbus-sdk/src/main/java/com/jg/softbus/service/ISoftbusService.java

@@ -0,0 +1,21 @@
+package com.jg.softbus.service;
+
+import com.jg.softbus.discovery.PublishInfo;
+import com.jg.softbus.discovery.SubscribeInfo;
+
+public interface ISoftbusService {
+    /**
+     * 启动服务
+     * @param pkgName
+     * @param sessionName
+     * @param publishInfo
+     * @param subscribeInfo
+     * @return
+     */
+    boolean start(PublishInfo publishInfo, SubscribeInfo subscribeInfo);
+    /**
+     * 停止服务
+     * @return
+     */
+    boolean stopService();
+}

softbus-sdk/src/main/java/com/jg/softbus/service/SoftbusService.java

@@ -0,0 +1,29 @@
+package com.jg.softbus.service;
+
+import com.jg.softbus.discovery.PublishInfo;
+import com.jg.softbus.discovery.SubscribeInfo;
+
+public class SoftbusService implements ISoftbusService {
+    /**
+     * 服务包名
+     */
+    private final String pkgName;
+    /**
+     * session名称
+     */
+    private final String sessionName;
+
+    public SoftbusService(String pkgName, String sessionName) {
+         this.pkgName = pkgName;
+         this.sessionName = sessionName;
+    }
+    @Override
+    public boolean start(PublishInfo publishInfo, SubscribeInfo subscribeInfo) {
+        return false;
+    }
+
+    @Override
+    public boolean stopService() {
+        return false;
+    }
+}

softbus-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -34,6 +34,7 @@ com\jg\softbus\network\node\NodeBasicInfoType.class
 com\jg\softbus\session\TV.class
 com\jg\softbus\network\protocol\SessionAddr.class
 com\jg\softbus\device\DeviceInfo.class
+com\jg\softbus\service\SoftbusService.class
 com\jg\softbus\network\callback\INodeStateCb.class
 com\jg\softbus\session\enums\TransEnumEventType.class
 com\jg\softbus\session\FrameStatus.class
@@ -60,5 +61,6 @@ com\jg\softbus\session\StreamFrameInfo.class
 com\jg\softbus\session\WifiChannelQuality.class
 com\jg\softbus\discovery\enums\DataBitMap.class
 com\jg\softbus\network\node\NodeStatusType.class
+com\jg\softbus\service\ISoftbusService.class
 com\jg\softbus\session\JitterEstimation.class
 com\jg\softbus\session\callback\IFileSendListener.class

softbus-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,65 +1,67 @@
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\device\DeviceInfo.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\ConnectionAddrType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\enums\StreamType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\callback\INodeStateCb.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeStatusType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\enums\LinkType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\TV.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\device\DeviceState.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\naservice\SubscribeService.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\ConnectionAddrInfo.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\StreamStatistics.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\DiscoverMode.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\node\LNNResult.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\BrAddr.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\StreamAttr.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\ConnectionAddr.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\enums\SessionType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\callback\ISessionListener.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\naservice\package-info.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\BleProtocolType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\SessionAttribute.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\naservice\PublishService.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\QosTvInfo.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IPublishCb.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\CapabilityMap.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\ExchangeFreq.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\manager\SessionManager.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\device\DeviceType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\RefreshResult.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeBasicInfoType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\BleAddr.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\JitterEstimation.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\DiscoveryFailReason.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\WifiChannelQuality.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeBasicInfo.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\UpdateState.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IRefreshCallback.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\naservice\LNNService.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\BandwidthDetection.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\QosTv.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\StreamData.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IDiscoveryCallback.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\SendFileProcessResult.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\DataBitMap.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\PublishInfo.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeStatus.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\SubscribeInfo.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\enums\TransEnumEventType.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\PublishResult.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\common\SoftbusErrCode.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\FileReceiveContent.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\callback\ILNNCallback.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\IpAddr.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\callback\IFileSendListener.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\enums\QosEvent.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IPublishCallback.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\SessionAddr.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\TestMain.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\ExchangeMedium.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\FrameStatus.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\callback\IFileReceiveListener.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\PublishFailReason.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\model\SessionInfo.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\naservice\SessionService.java
-D:\ma\work\softbus-sdk\src\main\java\com\jg\softbus\session\StreamFrameInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\StreamStatistics.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\naservice\PublishService.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\common\SoftbusErrCode.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\naservice\LNNService.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\StreamData.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\callback\IFileSendListener.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IPublishCb.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\SendFileProcessResult.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\BleAddr.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IRefreshCallback.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeStatus.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\BrAddr.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\enums\QosEvent.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\IpAddr.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\DiscoveryFailReason.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\callback\IFileReceiveListener.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\device\DeviceInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\SessionAddr.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\manager\SessionManager.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\SessionAttribute.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\PublishInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\RefreshResult.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\StreamAttr.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\PublishFailReason.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\service\ISoftbusService.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\device\DeviceState.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeBasicInfoType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\enums\SessionType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\DataBitMap.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IDiscoveryCallback.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\ConnectionAddrInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\FrameStatus.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\naservice\SessionService.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\BleProtocolType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\JitterEstimation.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\service\SoftbusService.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\WifiChannelQuality.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\ConnectionAddr.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\QosTvInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\BandwidthDetection.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\TV.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\enums\TransEnumEventType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\naservice\package-info.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\CapabilityMap.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\StreamFrameInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\callback\IPublishCallback.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\device\DeviceType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\model\SessionInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\PublishResult.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\node\LNNResult.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\callback\ISessionListener.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\ExchangeFreq.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\QosTv.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\DiscoverMode.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\UpdateState.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\TestMain.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\callback\INodeStateCb.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\SubscribeInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\enums\LinkType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeStatusType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\discovery\enums\ExchangeMedium.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\callback\ILNNCallback.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\protocol\ConnectionAddrType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\enums\StreamType.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\naservice\SubscribeService.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\network\node\NodeBasicInfo.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\main\java\com\jg\softbus\session\FileReceiveContent.java

softbus-sdk/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-D:\ma\work\softbus-sdk\src\test\java\Test.java
+D:\ma\work\softbus-sdk\softbus-sdk\src\test\java\Test.java

softbus-sdk/target/surefire-reports/2023-12-18T19-40-35_743.dumpstream

@@ -1,4 +1,4 @@
-# Created at 2023-12-18T19:40:36.062
+# Created at 2023-12-22T13:52:42.936
 Boot Manifest-JAR contains absolute paths in classpath 'D:\ma\repo\org\apache\maven\surefire\surefire-api\3.1.2\surefire-api-3.1.2.jar'
 Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
 'other' has different root

softbus-sdk/target/surefire-reports/Test.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: Test
 -------------------------------------------------------------------------------
-Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 s -- in Test
+Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s -- in Test