From 01c8767a298636cb2dc81a690565bdfabd76e076 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sat, 30 Nov 2024 13:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E3=80=82?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=8A=A0=E5=AF=86=E8=8A=AF=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/CMakeLists.txt  |  5 +++--
 app/src/main/cpp/GPIOControl.cpp | 14 +++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 3f46beeb..c5b5ffcf 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -31,8 +31,9 @@ add_definitions(-DSQLITE_THREADSAFE=1)
 add_definitions(-DLIBRAW_NO_MEMPOOL_CHECK=1)
 # add_definitions(-DHDRPLUS_NO_DETAILED_OUTPUT=1)
 add_definitions(-DHAVE_STRING_H) # for memcpy in md5.c
-add_definitions(-DUSING_NRSEC)
-add_definitions(-DUSING_NRSEC_VPN)
+
+# add_definitions(-DUSING_NRSEC)
+# 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/GPIOControl.cpp b/app/src/main/cpp/GPIOControl.cpp
index 4d69cecc..f4c509ff 100644
--- a/app/src/main/cpp/GPIOControl.cpp
+++ b/app/src/main/cpp/GPIOControl.cpp
@@ -90,7 +90,7 @@ int GpioControl::getInt(int cmd)
         param.cmd = cmd;
         ioctl(fd, IOT_PARAM_READ, &param);
 #ifdef _DEBUG
-        ALOGI("getInt cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result);
+        ALOGI("getInt cmd=%d,value=%d,result=%d",param.cmd, param.value, param.result);
 #endif
         close(fd);
         return param.value;
@@ -223,7 +223,7 @@ size_t GpioControl::TurnOff(int cmd, uint32_t delayedCloseTime/* = 0*/)
     m_locker.unlock();
     m_semaphore.release();
 #ifdef _DEBUG
-    ALOGI("PWR TurnOff cmd=%d ref=%u\r\n", cmd, (uint32_t)ref);
+    ALOGI("PWR TurnOff cmd=%d ref=%u", cmd, (uint32_t)ref);
 #endif
     return 0;
 }
@@ -314,6 +314,9 @@ void GpioControl::PowerControlThreadProc()
         {
             if (it->references == 0 && it->closeCmds == 0 && it->closeTime == 0)
             {
+#ifdef _DEBUG
+                ALOGI("PWR TH cmd=%d ref=%u closeCmds=%u", it->cmd, (uint32_t)it->references, (uint32_t)it->closeCmds);
+#endif
                 continue;
             }
 
@@ -338,6 +341,9 @@ void GpioControl::PowerControlThreadProc()
                     // close it directly
                     setInt(it->cmd, 0);
                     it->closeTime = 0;
+#ifdef _DEBUG
+                    ALOGI("PWR TH DO TurnOff cmd=%d", it->cmd);
+#endif
                 }
                 else
                 {
@@ -349,7 +355,9 @@ void GpioControl::PowerControlThreadProc()
                     }
                 }
             }
-
+#ifdef _DEBUG
+            ALOGI("PWR TH cmd=%d ref=%u closeCmds=%u", it->cmd, (uint32_t)it->references, (uint32_t)it->closeCmds);
+#endif
         }
         m_locker.unlock();