修改脚本配置

Author: neilyhe

.github/script/build_android_combine.sh

@@ -67,12 +67,10 @@ cd iot/device/android_device
 ls -l output/arm64-v8a/
 ls -l output/armeabi-v7a/
 
-mv output/armeabi-v7a/libiot_video_demo.so   device_video_aar/explorer-device-video-sdk/libs/armeabi-v7a
-mv output/arm64-v8a/libiot_video_demo.so   device_video_aar/explorer-device-video-sdk/libs/arm64-v8a
+#编译app xp2p sdk
+mv output/armeabi-v7a/libiot_video_demo.so   device_video_aar/explorer-app-video-sdk/libs/armeabi-v7a
+mv output/arm64-v8a/libiot_video_demo.so   device_video_aar/explorer-app-video-sdk/libs/arm64-v8a
 
 # 4.构建打包aar所需要的app头文件以及native-lib.cpp文件
-mv ../../link/android_app/java/*.java           device_video_aar/explorer-device-video-sdk/src/main/java/com/tencent/xnet
-mv ../../link/android_app/cpp/native-lib.cpp    device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
-sed -i '/\/\/xxxxxxJNI_OnLoad & JNI_OnUnload xxxxxx/, +30d' device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
-mv samples/iot_video_demo/app_interface/appWrapper.h   device_video_aar/explorer-device-video-sdk/src/main/cpp
-mv samples/iot_video_demo/app_interface/app_log.h      device_video_aar/explorer-device-video-sdk/src/main/cpp
+mv samples/iot_video_demo/app_interface/appWrapper.h   device_video_aar/explorer-app-video-sdk/src/main/cpp
+mv samples/iot_video_demo/app_interface/app_log.h      device_video_aar/explorer-app-video-sdk/src/main/cpp

.github/workflows/libxp2p_android_combine.yml

@@ -30,7 +30,7 @@ jobs:
       run: echo +++++$(cmake --version)
 
     - name: Setup NDK
-      run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;16.1.4479499"
+      run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;25.1.8937393"
 
 
     - name: build libenet debug
@@ -55,7 +55,7 @@ jobs:
     - name: Compress xp2p artifacts
       run: |
         mkdir xp2p_artifacts
-        cp -r iot-p2p/iot/device/android_device/device_video_aar/explorer-device-video-sdk/libs/ xp2p_artifacts/
+        cp -r iot-p2p/iot/device/android_device/device_video_aar/explorer-app-video-sdk/libs/ xp2p_artifacts/
         zip -r xp2p_artifacts.zip xp2p_artifacts
     - name: Upload .so to Artifacts
       uses: actions/upload-artifact@v4
@@ -69,14 +69,14 @@ jobs:
       run: |
         VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
         export GIT_BRANCH_IMAGE_VERSION=$VERSION
-        bash .github/script/update_version_for_android.sh Debug iot-p2p/iot/device/android_device/device_video_aar/explorer-device-video-sdk/build.gradle
+        bash .github/script/update_version_for_android.sh Debug iot-p2p/iot/device/android_device/device_video_aar/explorer-app-video-sdk/build.gradle
         
     - name: Update sdk version release
       if: startsWith(github.event.ref, 'refs/tags')
       run: |
         VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
         export GIT_BRANCH_IMAGE_VERSION=$VERSION
-        bash .github/script/update_version_for_android.sh Release iot-p2p/iot/device/android_device/device_video_aar/explorer-device-video-sdk/build.gradle
+        bash .github/script/update_version_for_android.sh Release iot-p2p/iot/device/android_device/device_video_aar/explorer-app-video-sdk/build.gradle
 
     - name: Update Values of Signing
       run: |