调整加密相关代码的编译控制

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相关信息

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);