From fac68ffc0cc0b3adb8425dedb8c1588e9fb43ba3 Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 5 Sep 2024 17:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A0=E5=AF=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E7=9A=84=E7=BC=96=E8=AF=91=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/CMakeLists.txt | 2 +- app/src/main/cpp/MicroPhoto.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 39328229..88d1446e 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -30,7 +30,7 @@ add_definitions(-DUSING_XY_EXTENSION) add_definitions(-DSQLITE_THREADSAFE=1) add_definitions(-DHAVE_STRING_H) # for memcpy in md5.c add_definitions(-DUSING_NRSEC) -# add_definitions(-DUSING_NRSEC_NETWORK) +add_definitions(-DUSING_NRSEC_VPN) # add_definitions(-DUSING_CERT) # add_definitions(-DUSING_DOWSE) # OUTPUT_CAMERA_DBG_INFO: 照片上打印CARERA相关信息 diff --git a/app/src/main/cpp/MicroPhoto.cpp b/app/src/main/cpp/MicroPhoto.cpp index cd26a219..0625e992 100644 --- a/app/src/main/cpp/MicroPhoto.cpp +++ b/app/src/main/cpp/MicroPhoto.cpp @@ -326,7 +326,7 @@ Java_com_xypower_mpapp_MicroPhotoService_init( pTerminal->InitServerInfo(MakeString(appPathStr), MakeString(cmdidStr), MakeString(ipStr), port, udpOrTcp, encryptData); // pTerminal->SetPacketSize(1 * 1024); // 1K -#ifdef USING_NRSEC +#if defined(USING_NRSEC) && !defined(USING_NRSEC_VPN) pTerminal->InitEncryptionInfo(simcardStr, "/dev/spidev0.0", ""); #endif bool res = pTerminal->Startup(device);