From 22e81844acf3566ae24d36314e041c4895b4eaf9 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 21 Mar 2025 21:50:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=91=E5=8F=B0=E5=AE=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/CMakeLists.txt | 4 ++- app/src/main/cpp/GPIOControl.cpp | 6 ++-- app/src/main/cpp/GPIOControl.h | 58 ++++++++++++++++---------------- app/src/main/cpp/MicroPhoto.cpp | 2 +- app/src/main/cpp/PhoneDevice.cpp | 10 +++--- 5 files changed, 41 insertions(+), 39 deletions(-) diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 6ffc05ee..2e3483a3 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -21,7 +21,7 @@ if(ANDROID_ABI STREQUAL "armeabi-v7a") add_definitions(-DUSING_N938) elseif(ANDROID_ABI STREQUAL "arm64-v8a") # add_definitions(-DUSING_N938) - # add_definitions(-DUSING_PLZ) + add_definitions(-DUSING_PTZ) endif() # OUTPUT_DBG_INFO: 输出调试相关信息 @@ -33,6 +33,8 @@ add_definitions(-DOUTPUT_SOCKET_DBG_INFO) # Database.cpp # add_definitions(-DOUTPUT_DB_DBG_INFO) +add_definitions(-DUSING_FFMPEG) + IF (CMAKE_BUILD_TYPE STREQUAL Debug) ADD_DEFINITIONS(-D_DEBUG) ELSE() diff --git a/app/src/main/cpp/GPIOControl.cpp b/app/src/main/cpp/GPIOControl.cpp index 50a72068..e156be1f 100644 --- a/app/src/main/cpp/GPIOControl.cpp +++ b/app/src/main/cpp/GPIOControl.cpp @@ -346,7 +346,7 @@ bool GpioControl::SetCamerastatus(int cmd, bool status) if(cmd == CMD_SET_PIC1_POWER) m_cameraPowerStatus = status; #endif -#ifdef USING_PLZ +#ifdef USING_PTZ if(cmd == CMD_SET_PTZ_PWR_ENABLE) { m_cameraPowerStatus = status; @@ -366,7 +366,7 @@ bool GpioControl::GetSelftestStatus(time_t wait_time) #ifdef USING_N938 cmd = CMD_SET_PIC1_POWER; #endif -#ifdef USING_PLZ +#ifdef USING_PTZ cmd = CMD_SET_PTZ_PWR_ENABLE; #endif time_t now = time(NULL); @@ -388,7 +388,7 @@ time_t GpioControl::GetSelfTestRemain(time_t wait_time) #ifdef USING_N938 cmd = CMD_SET_PIC1_POWER; #endif -#ifdef USING_PLZ +#ifdef USING_PTZ cmd = CMD_SET_PTZ_PWR_ENABLE; #endif time_t now = time(NULL); diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h index b5d37b2d..8059395f 100644 --- a/app/src/main/cpp/GPIOControl.h +++ b/app/src/main/cpp/GPIOControl.h @@ -17,7 +17,7 @@ #ifndef USING_N938 -#ifndef USING_PLZ // MicroPhoto +#ifndef USING_PTZ // MicroPhoto #define CMD_GET_LIGHT_ADC 101 #define CMD_SET_LIGHT_ADC 102 @@ -54,7 +54,7 @@ #define CMD_GET_CAMERA_STATUS 310 #define CMD_SET_INIT_STATUS 401 -#else // defined(USING_PLZ) +#else // defined(USING_PTZ) #define CMD_SET_OTG_STATE 107 #define CMD_GET_OTG_STATE 108 @@ -104,7 +104,7 @@ #define CMD_GET_CAMERA_STATUS 310 #define CMD_SET_INIT_STATUS 401 -#endif // USING_PLZ +#endif // USING_PTZ #else // defined(USING_N938) @@ -220,7 +220,7 @@ public: static void setCam3V3Enable(bool enabled, uint32_t delayedCloseTime) { -#ifdef USING_PLZ +#ifdef USING_PTZ enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN, delayedCloseTime); #else enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN, delayedCloseTime); @@ -229,7 +229,7 @@ public: static void setCam3V3Enable(bool enabled) { -#ifdef USING_PLZ +#ifdef USING_PTZ enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN); #else enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN); @@ -239,7 +239,7 @@ public: static void setBeeOn(bool z) { #ifndef USING_N938 -#ifndef USING_PLZ +#ifndef USING_PTZ z ? TurnOn(CMD_SET_PWM_BEE_STATE) : TurnOff(CMD_SET_PWM_BEE_STATE); #endif #endif @@ -247,7 +247,7 @@ public: static void setJidianqiState(bool z) { #ifndef USING_N938 -#ifndef USING_PLZ +#ifndef USING_PTZ z ? TurnOn(CMD_SET_ALM_MODE) : TurnOff(CMD_SET_ALM_MODE); #endif #endif @@ -264,7 +264,7 @@ public: static void setRS485Enable(bool z, uint32_t delayedCloseTime) { #ifndef USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ z ? TurnOn(CMD_SET_485_ENABLE) : TurnOff(CMD_SET_485_ENABLE, delayedCloseTime); #else z ? TurnOn(CMD_SET_485_EN_STATE) : TurnOff(CMD_SET_485_EN_STATE, delayedCloseTime); @@ -282,7 +282,7 @@ public: static void setRS485Enable(bool z) { #ifndef USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ z ? TurnOn(CMD_SET_485_ENABLE) : TurnOff(CMD_SET_485_ENABLE); #else z ? TurnOn(CMD_SET_485_EN_STATE) : TurnOff(CMD_SET_485_EN_STATE); @@ -305,7 +305,7 @@ public: static void setLightAdc(int i) { #ifndef USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ setInt(CMD_SET_LIGHT1_RESISTOR_ENABLE, i); #else setInt(CMD_SET_LIGHT_ADC, i); @@ -316,7 +316,7 @@ public: static int getLightAdc() { #ifndef USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ return getInt(CMD_SET_LIGHT1_RESISTOR_ENABLE); #else return getInt(CMD_GET_LIGHT_ADC); @@ -562,11 +562,11 @@ public: #ifdef USING_N938 PowerControl(0, closeDelayTime) #else // USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ PowerControl(CMD_SET_3V3_PWR_EN, closeDelayTime) -#else // USING_PLZ +#else // USING_PTZ PowerControl(CMD_SET_3V3_PWR_EN, closeDelayTime) -#endif // USING_PLZ +#endif // USING_PTZ #endif // USING_N938 { } @@ -579,12 +579,12 @@ public: #ifdef USING_N938 PowerControl(CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime) #else // USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ PowerControl(CMD_SET_12V_EN_STATE, closeDelayTime) -#else // USING_PLZ +#else // USING_PTZ // MicroPhoto PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE, closeDelayTime) -#endif // USING_PLZ +#endif // USING_PTZ #endif // USING_N938 { } @@ -597,11 +597,11 @@ public: #ifdef USING_N938 PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime) #else // USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_485_ENABLE, CMD_SET_PTZ_PWR_ENABLE, CMD_SET_12V_EN_STATE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime) -#else // USING_PLZ +#else // USING_PTZ PowerControl(CMD_SET_OTG_STATE, CMD_SET_12V_EN_STATE, closeDelayTime) -#endif // USING_PLZ +#endif // USING_PTZ #endif // USING_N938 { } @@ -614,13 +614,13 @@ public: #ifdef USING_N938 PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, closeDelayTime) #else // USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ // PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_5V_PWR_ENABLE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime) PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime) -#else // USING_PLZ +#else // USING_PTZ // Micro Photo PowerControl(CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE/* Only for wp6*/, closeDelayTime) -#endif // USING_PLZ +#endif // USING_PTZ #endif // USING_N938 { } @@ -633,11 +633,11 @@ public: #ifdef USING_N938 PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime) #else // USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ PowerControl(CMD_SET_PTZ_PWR_ENABLE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, CMD_SET_12V_EN_STATE, closeDelayTime) -#else // USING_PLZ +#else // USING_PTZ PowerControl(CMD_SET_OTG_STATE, CMD_SET_12V_EN_STATE, closeDelayTime) -#endif // USING_PLZ +#endif // USING_PTZ #endif // USING_N938 { } @@ -650,11 +650,11 @@ public: #ifdef USING_N938 PowerControl(CMD_SET_SPI_POWER, CMD_SPI2SERIAL_POWER_EN, CMD_RS485_3V3_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN4, closeDelayTime) #else // USING_N938 -#ifdef USING_PLZ +#ifdef USING_PTZ PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_485_ENABLE, CMD_SET_3V3_PWR_EN, CMD_SET_SPI_POWER, CMD_SET_PTZ_PWR_ENABLE, closeDelayTime) -#else // USING_PLZ +#else // USING_PTZ PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_3V3_PWR_EN, CMD_SET_SPI_POWER, CMD_SET_485_EN_STATE, closeDelayTime) -#endif // USING_PLZ +#endif // USING_PTZ #endif // USING_N938 { } diff --git a/app/src/main/cpp/MicroPhoto.cpp b/app/src/main/cpp/MicroPhoto.cpp index 1e902041..1103db69 100644 --- a/app/src/main/cpp/MicroPhoto.cpp +++ b/app/src/main/cpp/MicroPhoto.cpp @@ -1457,7 +1457,7 @@ JNIEXPORT jint JNICALL Java_com_xypower_mpapp_MicroPhotoService_getCustomAppId(JNIEnv *env, jobject thiz) { #ifdef USING_N938 return 2; -#elif defined(USING_PLZ) +#elif defined(USING_PTZ) return 1; #else return 0; diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index e30c78e9..369a616b 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -4914,7 +4914,7 @@ bool CPhoneDevice::OpenSensors(int sensortype) GpioControl::TurnOn(CMD_SET_SPI_POWER); // GpioControl::TurnOn(CMD_SET_485_EN_STATE); // 打开RS485电源 #ifndef USING_N938 -#ifndef USING_PLZ +#ifndef USING_PTZ GpioControl::TurnOn(CMD_SET_485_EN_STATE); #else @@ -4928,7 +4928,7 @@ bool CPhoneDevice::OpenSensors(int sensortype) if(sensortype == CAMERA_SENSOR_OPEN) { #ifndef USING_N938 -#ifndef USING_PLZ +#ifndef USING_PTZ #else GpioControl::TurnOn(CMD_SET_5V_PWR_ENABLE); GpioControl::TurnOn(CMD_SET_PTZ_PWR_ENABLE); @@ -4979,7 +4979,7 @@ bool CPhoneDevice::CloseSensors(int sensortype, uint32_t delayedCloseTime) GpioControl::TurnOff(CMD_SET_SPI_POWER, delayedCloseTime); // GpioControl::TurnOff(CMD_SET_485_EN_STATE); #ifndef USING_N938 -#ifndef USING_PLZ +#ifndef USING_PTZ GpioControl::TurnOff(CMD_SET_485_EN_STATE, delayedCloseTime); #else GpioControl::TurnOff(CMD_SET_485_ENABLE, delayedCloseTime); @@ -5001,7 +5001,7 @@ bool CPhoneDevice::CloseSensors(int sensortype, uint32_t delayedCloseTime) #ifndef USING_N938 // GpioControl::TurnOff(CMD_SET_3V3_PWR_ENABLE); -#ifndef USING_PLZ +#ifndef USING_PTZ #else GpioControl::TurnOffImmediately(CMD_SET_5V_PWR_ENABLE); GpioControl::TurnOffImmediately(CMD_SET_PTZ_PWR_ENABLE); @@ -5017,7 +5017,7 @@ bool CPhoneDevice::CloseSensors(int sensortype, uint32_t delayedCloseTime) #ifndef USING_N938 // GpioControl::TurnOff(CMD_SET_3V3_PWR_ENABLE); -#ifndef USING_PLZ +#ifndef USING_PTZ #else GpioControl::TurnOff(CMD_SET_PTZ_PWR_ENABLE, delayedCloseTime); #endif