diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt index cdccf07..1f388aa 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt @@ -10,6 +10,7 @@ import com.yinuo.safetywatcher.watcher.constant.CAMERA_GATEWAY import com.yinuo.safetywatcher.watcher.constant.CAMERA_IP import com.yinuo.safetywatcher.watcher.constant.CAMERA_NETMASK import com.yinuo.safetywatcher.watcher.port.cmd.GasPortStatus +import com.yinuo.safetywatcher.watcher.utils.GPIOUtils import com.yinuo.safetywatcher.watcher.utils.PlatformUtils import com.yinuo.safetywatcher.watcher.utils.SoundUtils import com.yinuo.safetywatcher.watcher.wifi.WiFiConfig @@ -27,6 +28,7 @@ class App : CommonApplication() { super.onCreate() // LztekUtil.setObject(Lztek.create(this)) ipConfig() + GPIOUtils.openCamera() tryFixDbData() } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt index 218a624..0691d72 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt @@ -101,20 +101,20 @@ class HomeActivity : NoOptionsActivity() { private fun onCameraOpen() { // 启动录制编码 RecordHelper.startRecording() - // TODO 开启GPIO - GPIOUtils.setGpioDirection(123, "out") - GPIOUtils.setGpioValue(123, 1) + // 开启GPIO + GPIOUtils.openCamera() setForCamera() } private fun onCameraClose() { // 暂停录制编码 RecordHelper.stopRecording() - // TODO 关闭GPIO - GPIOUtils.setGpioValue(123, 0) + // 关闭GPIO + GPIOUtils.closeCamera() // 关闭视频播放 mClient?.stop() mClient = null + mBinding.root.removeCallbacks(reStartCamera) AppData.setCameraData(false) changeViewStatus() } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt index 6c3f0d6..579f0c5 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt @@ -78,4 +78,13 @@ object GPIOUtils { } return null } + + fun openCamera(){ + setGpioDirection(123, "out") + setGpioValue(123, 1) + } + + fun closeCamera(){ + setGpioValue(123, 0) + } } \ No newline at end of file