xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

实现GPIO的访问

Browse Source
serial
BlueMatthew 1 year ago
parent c0e5ed52fe
commit 6e3105b0f8
9 changed files with 283 additions and 126 deletions
Show Stats Download Patch File Download Diff File

194
app/src/main/cpp/GPIOControl.cpp
Unescape Escape View File

@ -15,142 +15,116 @@
#include "GPIOControl.h" #include "GPIOControl.h"
#define GPIO_DIRECTION_IN 0
#define GPIO_DIRECTION_OUT 1
#define GPIO_VALUE_LOW 0
#define GPIO_VALUE_HIGH 1
#define BUFFER_MAX 3 #define IOT_PARAM_WRITE 0xAE
#define DIRECTION_MAX 48 #define IOT_PARAM_READ 0xAF
#define MAX_STRING_LEN 32
int GpioControl::exp(int gpio) typedef struct
{ {
char buffer[BUFFER_MAX]; int cmd;
int len; int value;
int fd; int result;
long value2;
fd = open("/sys/class/gpio/export", O_WRONLY); char str[MAX_STRING_LEN];
if (fd < 0) }IOT_PARAM;
{
// LOGE("Failed to open export for writing!\n"); void GpioControl::setInt(int cmd, int value)
return(0); {
} int fd = open("/dev/mtkgpioctrl", O_RDONLY);
IOT_PARAM param;
len = snprintf(buffer, BUFFER_MAX, "%d", gpio); param.cmd = cmd;
if (write(fd, buffer, len) < 0) param.value = value;
// LOGE("set_int fd=%d,cmd=%d,value=%d\r\n",fd, cmd, value);
if( fd > 0 )
{ {
// LOGE("Fail to export gpio!\n"); int res = ioctl(fd, IOT_PARAM_WRITE, &param);
return 0; // LOGE("set_int22 cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result);
close(fd);
} }
return;
close(fd);
return 1;
} }
int GpioControl::setDirection(int gpio, int direction) int GpioControl::getInt(int cmd)
{ {
static const char dir_str[] = "in\0out"; int fd = open("/dev/mtkgpioctrl", O_RDONLY);
char path[DIRECTION_MAX]; // LOGE("get_int fd=%d,cmd=%d\r\n",fd, cmd);
int fd; if( fd > 0 )
snprintf(path, DIRECTION_MAX, "/sys/class/gpio/gpio%d/direction", gpio);
fd = open(path, O_WRONLY);
if (fd < 0)
{
// LOGE("failed to open gpio direction for writing!\n");
return 0;
}
if (write(fd, &dir_str[direction == GPIO_DIRECTION_IN ? 0 : 3], direction == GPIO_DIRECTION_IN ? 2 : 3) < 0)
{ {
// LOGE("failed to set direction!\n"); IOT_PARAM param;
return 0; param.cmd = cmd;
ioctl(fd, IOT_PARAM_READ, &param);
// LOGE("get_int22 cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result);
close(fd);
return param.value;
} }
return -1;
close(fd);
return 1;
} }
int GpioControl::readStatus(int gpio)
{
char path[DIRECTION_MAX];
char value_str[3];
int fd;
snprintf(path, DIRECTION_MAX, "/sys/class/gpio/gpio%d/value", gpio); void GpioControl::setLong(int cmd, long value)
fd = open(path, O_RDONLY); {
if (fd < 0) int fd = open("/dev/mtkgpioctrl", O_RDONLY);
{ IOT_PARAM param;
// LOGE("failed to open gpio value for reading!\n"); param.cmd = cmd;
return -1; param.value2 = value;
} // LOGE("set_long fd=%d,cmd=%d,value2=%ld\r\n",fd, param.cmd, param.value2);
if (read(fd, value_str, 3) < 0) if( fd > 0 )
{ {
// LOGE("failed to read value!\n"); ioctl(fd, IOT_PARAM_WRITE, &param);
return -1; // LOGE("set_long22 cmd=%d,value2=%ld,result=%d\r\n",param.cmd, param.value2, param.result);
close(fd);
} }
close(fd);
return (atoi(value_str));
} }
int GpioControl::writeStatus(int gpio, int value) long GpioControl::getLong(int cmd)
{ {
static const char values_str[] = "01"; int fd = open("/dev/mtkgpioctrl", O_RDONLY);
char path[DIRECTION_MAX]; // LOGE("get_long fd=%d,cmd=%d\r\n",fd, cmd);
int fd; if( fd > 0 )
snprintf(path, DIRECTION_MAX, "/sys/class/gpio/gpio%d/value", gpio);
fd = open(path, O_WRONLY);
if (fd < 0)
{
// LOGE("failed to open gpio value for writing!\n");
return 0;
}
if (write(fd, &values_str[value == GPIO_VALUE_LOW ? 0 : 1], 1) < 0)
{ {
// LOGE("failed to write value!\n"); IOT_PARAM param;
return 0; param.cmd = cmd;
ioctl(fd, IOT_PARAM_READ, &param);
// LOGE("get_long22 cmd=%d,value2=%ld,result=%d\r\n",param.cmd, param.value2, param.result);
close(fd);
return param.value2;
} }
return -1;
close(fd);
return 1;
} }
int GpioControl::unexp(int gpio) void GpioControl::setString(int cmd, const std::string& value)
{ {
char buffer[BUFFER_MAX]; IOT_PARAM param;
int len; // char *pval = jstringToChars(env, value);
int fd; int fd = open("/dev/mtkgpioctrl", O_RDONLY);
int len = MAX_STRING_LEN < value.size() ? MAX_STRING_LEN : value.size();
fd = open("/sys/class/gpio/unexport", O_WRONLY);
if (fd < 0) param.cmd = cmd;
memset(param.str, 0, MAX_STRING_LEN);
memcpy(param.str, value.c_str(), len);
// LOGE("set_string fd=%d,cmd=%d,str=%s\r\n",fd, param.cmd, param.str);
if( fd > 0 )
{ {
// LOGE("Failed to open unexport for writing!\n"); ioctl(fd, IOT_PARAM_WRITE, &param);
return 0; // LOGE("set_string22 cmd=%d,str=%s,result=%d\r\n",param.cmd, param.str, param.result);
close(fd);
} }
return;
len = snprintf(buffer, BUFFER_MAX, "%d", gpio);
if (write(fd, buffer, len) < 0)
{
// LOGE("Fail to unexport gpio!");
return 0;
}
close(fd);
return 1;
} }
bool GpioControl::EnableGpio(int gpio, bool en) std::string GpioControl::getString(int cmd)
{ {
GpioControl gpioControl; int fd = open("/dev/mtkgpioctrl", O_RDONLY);
gpioControl.exp(gpio); // LOGE("get_string fd=%d,cmd=%d\r\n",fd, cmd);
gpioControl.setDirection(gpio, GPIO_DIRECTION_OUT); if( fd > 0 )
{
gpioControl.writeStatus(gpio, en ? GPIO_VALUE_HIGH : GPIO_VALUE_LOW); IOT_PARAM param;
param.cmd = cmd;
gpioControl.unexp(gpio); ioctl(fd, IOT_PARAM_READ, &param);
// LOGE("get_string22 cmd=%d,str=%s,result=%d\r\n",param.cmd, param.str, param.result);
return true; close(fd);
return std::string(param.str);
}
return "";
} }

147
app/src/main/cpp/GPIOControl.h
Unescape Escape View File

@ -5,17 +5,152 @@
#ifndef MICROPHOTO_GPIOCONTROL_H #ifndef MICROPHOTO_GPIOCONTROL_H
#define MICROPHOTO_GPIOCONTROL_H #define MICROPHOTO_GPIOCONTROL_H
#include <string>
#define CMD_GET_LIGHT_ADC 101
#define CMD_SET_LIGHT_ADC 102
#define CMD_GET_KEY_LOCKSTATE 103
#define CMD_GET_BAT_ADC 104
#define CMD_SET_FLASH_LED 105
#define CMD_SET_NETWORK_STATE 106
#define CMD_SET_OTG_STATE 107
#define CMD_GET_OTG_STATE 108
#define CMD_GET_CHARGING_VOL_STATE 110
#define CMD_GET_CHARGING_SHUNT_VOLTAGE_STATE 111
#define CMD_GET_CHARGING_BUS_VOLTAGE_STATE 112
#define CMD_GET_CHARGING_POWER_STATE 113
#define CMD_GET_CHARGING_CURRENT_STATE 114
#define CMD_GET_BAT_VOL_STATE 115
#define CMD_GET_BAT_SHUNT_VOLTAGE_STATE 116
#define CMD_GET_BAT_BUS_VOLTAGE_STATE 117
#define CMD_GET_BAT_POWER_STATE 118
#define CMD_GET_BAT_CURRENT_STATE 119
#define CMD_SET_485_STATE 121
#define CMD_SET_SPI_MODE 123
#define CMD_SET_SPI_BITS_PER_WORD 124
#define CMD_SET_SPI_MAXSPEEDHZ 125
#define CMD_SET_PWM_BEE_STATE 126
#define CMD_SET_ALM_MODE 128
#define CMD_SET_485_EN_STATE 131
#define CMD_SET_CAM_3V3_EN_STATE 132
#define CMD_SET_12V_EN_STATE 133
#define CMD_SET_SYSTEM_RESET 202
class GpioControl class GpioControl
{ {
public: public:
int exp(int gpio);
int setDirection(int gpio, int direction);
int readStatus(int gpio);
int writeStatus(int gpio, int value);
int unexp(int gpio);
static bool EnableGpio(int gpio, bool en); static void setInt(int cmd, int value);
static int getInt(int cmd);
static void setLong(int cmd, long value);
static long getLong(int cmd);
static void setString(int cmd, const std::string& value);
static std::string getString(int cmd);
static void setOtgState(bool on)
{
setInt(CMD_SET_OTG_STATE, on ? 1 : 0);
}
static void setCam3V3Enable(bool enabled)
{
setInt(CMD_SET_CAM_3V3_EN_STATE, enabled ? 1 : 0);
}
static void reboot()
{
setInt(CMD_SET_SYSTEM_RESET, 1);
}
static void setLightAdc(int i)
{
setInt(CMD_SET_LIGHT_ADC, i);
}
static int getLightAdc()
{
return getInt(CMD_GET_LIGHT_ADC);
}
static int getChargingVoltage()
{
return getInt(CMD_GET_CHARGING_VOL_STATE);
}
static int getChargingShuntVoltage()
{
return getInt(CMD_GET_CHARGING_SHUNT_VOLTAGE_STATE);
}
static int getChargingBusVoltage() {
return getInt(CMD_GET_CHARGING_BUS_VOLTAGE_STATE);
}
static int getChargingPower() {
return getInt(CMD_GET_CHARGING_POWER_STATE);
}
static int getChargingCurrent() {
return getInt(CMD_GET_CHARGING_CURRENT_STATE);
}
static int getBatteryVoltage() {
return getInt(CMD_GET_BAT_VOL_STATE);
}
static int getBatteryShuntVoltage() {
return getInt(CMD_GET_BAT_SHUNT_VOLTAGE_STATE);
}
static int getBatteryBusVoltage() {
return getInt(CMD_GET_BAT_BUS_VOLTAGE_STATE);
}
static int getBatteryPower() {
return getInt(CMD_GET_BAT_POWER_STATE);
}
static int getBatteryCurrent() {
return getInt(CMD_GET_BAT_CURRENT_STATE);
}
static void set485WriteMode() {
setInt(CMD_SET_485_STATE, 1);
}
static void set485ReadMode() {
setInt(CMD_SET_485_STATE, 0);
}
static void setSpiMode(int i) {
setInt(CMD_SET_SPI_MODE, i);
}
static void setSpiBitsPerWord(int i) {
setInt(CMD_SET_SPI_BITS_PER_WORD, i);
}
static void setSpiMaxSpeedHz(long j) {
setLong(CMD_SET_SPI_MAXSPEEDHZ, j);
}
static void setBeeOn(bool z) {
setInt(CMD_SET_PWM_BEE_STATE, z ? 1 : 0);
}
static void setJidianqiState(bool z) {
setInt(CMD_SET_ALM_MODE, z ? 1 : 0);
}
static void setRS485Enable(bool z) {
setInt(CMD_SET_485_EN_STATE, z ? 1 : 0);
}
static void set12VEnable(bool z) {
setInt(CMD_SET_12V_EN_STATE, z ? 1 : 0);
}
}; };

21
app/src/main/cpp/PhoneDevice.cpp
Unescape Escape View File

@ -414,6 +414,13 @@ bool CPhoneDevice::GetNextScheduleItem(uint32_t tsBasedZero, uint32_t scheduleTi
bool CPhoneDevice::Reboot(int resetType) bool CPhoneDevice::Reboot(int resetType)
{ {
if (resetType == 1)
{
// reboot the device
GpioControl::reboot();
return true;
}
JNIEnv* env = NULL; JNIEnv* env = NULL;
bool didAttachThread = false; bool didAttachThread = false;
bool res = GetJniEnv(m_vm, &env, didAttachThread); bool res = GetJniEnv(m_vm, &env, didAttachThread);
@ -804,7 +811,7 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
return false; return false;
} }
mat = cv::imread("/sdcard/com.xypower.mpapp/ai1.jpg"); // mat = cv::imread("/sdcard/com.xypower.mpapp/ai1.jpg");
mPhotoInfo.photoTime = time(NULL); mPhotoInfo.photoTime = time(NULL);
int baseline = 0; int baseline = 0;
@ -1015,6 +1022,7 @@ void CPhoneDevice::TurnOnCameraPower(JNIEnv* env)
mCameraPowerLocker.lock(); mCameraPowerLocker.lock();
if (mCameraPowerCount == 0) if (mCameraPowerCount == 0)
{ {
#if 0
if(m_sysApiClass != NULL) if(m_sysApiClass != NULL)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -1022,6 +1030,8 @@ void CPhoneDevice::TurnOnCameraPower(JNIEnv* env)
#endif #endif
env->CallStaticVoidMethod(m_sysApiClass, mSetCam3V3EnableMid, JNI_TRUE); env->CallStaticVoidMethod(m_sysApiClass, mSetCam3V3EnableMid, JNI_TRUE);
} }
#endif
GpioControl::setCam3V3Enable(true);
} }
mCameraPowerCount++; mCameraPowerCount++;
mCameraPowerLocker.unlock(); mCameraPowerLocker.unlock();
@ -1035,6 +1045,7 @@ void CPhoneDevice::TurnOffCameraPower(JNIEnv* env)
mCameraPowerCount--; mCameraPowerCount--;
if (mCameraPowerCount == 0) if (mCameraPowerCount == 0)
{ {
#if 0
if(m_sysApiClass != NULL) if(m_sysApiClass != NULL)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -1042,6 +1053,8 @@ void CPhoneDevice::TurnOffCameraPower(JNIEnv* env)
#endif #endif
env->CallStaticVoidMethod(m_sysApiClass, mSetCam3V3EnableMid, JNI_FALSE); env->CallStaticVoidMethod(m_sysApiClass, mSetCam3V3EnableMid, JNI_FALSE);
} }
#endif // 0
GpioControl::setCam3V3Enable(false);
} }
} }
mCameraPowerLocker.unlock(); mCameraPowerLocker.unlock();
@ -1052,6 +1065,7 @@ void CPhoneDevice::TurnOnOtg(JNIEnv* env)
mCameraPowerLocker.lock(); mCameraPowerLocker.lock();
if (mOtgCount == 0) if (mOtgCount == 0)
{ {
#if 0
if(m_sysApiClass != NULL) if(m_sysApiClass != NULL)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -1059,6 +1073,8 @@ void CPhoneDevice::TurnOnOtg(JNIEnv* env)
#endif #endif
env->CallStaticVoidMethod(m_sysApiClass, mTurnOtgMid, JNI_TRUE); env->CallStaticVoidMethod(m_sysApiClass, mTurnOtgMid, JNI_TRUE);
} }
#endif
GpioControl::setOtgState(true);
} }
mOtgCount++; mOtgCount++;
mCameraPowerLocker.unlock(); mCameraPowerLocker.unlock();
@ -1072,6 +1088,7 @@ void CPhoneDevice::TurnOffOtg(JNIEnv* env)
mOtgCount--; mOtgCount--;
if (mOtgCount == 0) if (mOtgCount == 0)
{ {
#if 0
if(m_sysApiClass != NULL) if(m_sysApiClass != NULL)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -1079,6 +1096,8 @@ void CPhoneDevice::TurnOffOtg(JNIEnv* env)
#endif #endif
env->CallStaticVoidMethod(m_sysApiClass, mTurnOtgMid, JNI_FALSE); env->CallStaticVoidMethod(m_sysApiClass, mTurnOtgMid, JNI_FALSE);
} }
#endif
GpioControl::setOtgState(false);
} }
} }
mCameraPowerLocker.unlock(); mCameraPowerLocker.unlock();

30
app/src/main/cpp/camera2/ndkcamera.cpp
Unescape Escape View File

@ -70,6 +70,20 @@ void onCaptureSequenceAborted(void* context, ACameraCaptureSession* session, int
ALOGW("onCaptureSequenceAborted %p %d", session, sequenceId); ALOGW("onCaptureSequenceAborted %p %d", session, sequenceId);
} }
void onCaptureProgressed(void* context, ACameraCaptureSession* session, ACaptureRequest* request, const ACameraMetadata* result)
{
ACameraMetadata_const_entry val = { 0 };
camera_status_t status = ACAMERA_ERROR_BASE;
val = { 0 };
status = ACameraMetadata_getConstEntry(result, ACAMERA_CONTROL_AF_STATE, &val);
uint8_t afState = *(val.data.u8);
ALOGW("onCaptureProgressed AF_STATE=%u", (unsigned int)afState);
// ((NdkCamera*)context)->onCaptureProgressed(session, request, result);
}
void onCaptureCompleted(void* context, ACameraCaptureSession* session, ACaptureRequest* request, const ACameraMetadata* result) void onCaptureCompleted(void* context, ACameraCaptureSession* session, ACaptureRequest* request, const ACameraMetadata* result)
{ {
((NdkCamera*)context)->onCaptureCompleted(session, request, result); ((NdkCamera*)context)->onCaptureCompleted(session, request, result);
@ -102,6 +116,7 @@ NdkCamera::NdkCamera(int32_t width, int32_t height, const NdkCamera::CAMERA_PARA
capture_session_output_container = 0; capture_session_output_container = 0;
capture_session_output = 0; capture_session_output = 0;
capture_session = 0; capture_session = 0;
captureSequenceId = 0;
} }
NdkCamera::~NdkCamera() NdkCamera::~NdkCamera()
@ -340,7 +355,7 @@ int NdkCamera::open(const std::string& cameraId) {
} }
} }
std::this_thread::sleep_for(std::chrono::milliseconds(128)); // std::this_thread::sleep_for(std::chrono::milliseconds(128));
// capture request // capture request
{ {
res = ACameraDevice_createCaptureRequest(camera_device, TEMPLATE_STILL_CAPTURE, &capture_request); res = ACameraDevice_createCaptureRequest(camera_device, TEMPLATE_STILL_CAPTURE, &capture_request);
@ -426,16 +441,15 @@ int NdkCamera::open(const std::string& cameraId) {
ACameraCaptureSession_captureCallbacks camera_capture_session_capture_callbacks; ACameraCaptureSession_captureCallbacks camera_capture_session_capture_callbacks;
camera_capture_session_capture_callbacks.context = this; camera_capture_session_capture_callbacks.context = this;
camera_capture_session_capture_callbacks.onCaptureStarted = 0; camera_capture_session_capture_callbacks.onCaptureStarted = 0;
camera_capture_session_capture_callbacks.onCaptureProgressed = 0; camera_capture_session_capture_callbacks.onCaptureProgressed = ::onCaptureProgressed;
camera_capture_session_capture_callbacks.onCaptureCompleted = ::onCaptureCompleted; camera_capture_session_capture_callbacks.onCaptureCompleted = ::onCaptureCompleted;
camera_capture_session_capture_callbacks.onCaptureFailed = onCaptureFailed; camera_capture_session_capture_callbacks.onCaptureFailed = onCaptureFailed;
camera_capture_session_capture_callbacks.onCaptureSequenceCompleted = onCaptureSequenceCompleted; camera_capture_session_capture_callbacks.onCaptureSequenceCompleted = onCaptureSequenceCompleted;
camera_capture_session_capture_callbacks.onCaptureSequenceAborted = onCaptureSequenceAborted; camera_capture_session_capture_callbacks.onCaptureSequenceAborted = onCaptureSequenceAborted;
camera_capture_session_capture_callbacks.onCaptureBufferLost = 0; camera_capture_session_capture_callbacks.onCaptureBufferLost = 0;
ACameraCaptureSession_setRepeatingRequest(capture_session, &camera_capture_session_capture_callbacks, 1, &capture_request, &captureSequenceId);
ACameraCaptureSession_setRepeatingRequest(capture_session, &camera_capture_session_capture_callbacks, 1, &capture_request, nullptr); // ACameraCaptureSession_capture(capture_session, &camera_capture_session_capture_callbacks, 1, &capture_request, &captureSequenceId);
// ACameraCaptureSession_capture(capture_session, &camera_capture_session_capture_callbacks, 1, &capture_request,nullptr);
} }
return 0; return 0;
@ -496,7 +510,6 @@ void NdkCamera::close()
{ {
ACameraManager_delete(camera_manager); ACameraManager_delete(camera_manager);
camera_manager = 0; camera_manager = 0;
ALOGW("DBG::close %s", mCameraId.c_str()); ALOGW("DBG::close %s", mCameraId.c_str());
} }
} }
@ -686,6 +699,7 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
// ACameraMetadata_getConstEntry(result, ) // ACameraMetadata_getConstEntry(result, )
ACameraMetadata_const_entry val = { 0 }; ACameraMetadata_const_entry val = { 0 };
camera_status_t status = ACAMERA_ERROR_BASE; camera_status_t status = ACAMERA_ERROR_BASE;
uint8_t afState = 0;
if (m_imagesCaptured == ~0) if (m_imagesCaptured == ~0)
{ {
@ -693,7 +707,7 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
{ {
val = { 0 }; val = { 0 };
status = ACameraMetadata_getConstEntry(result, ACAMERA_CONTROL_AF_STATE, &val); status = ACameraMetadata_getConstEntry(result, ACAMERA_CONTROL_AF_STATE, &val);
uint8_t afState = *(val.data.u8); afState = *(val.data.u8);
if (afState == ACAMERA_CONTROL_AF_STATE_PASSIVE_FOCUSED || afState == ACAMERA_CONTROL_AF_STATE_FOCUSED_LOCKED) if (afState == ACAMERA_CONTROL_AF_STATE_PASSIVE_FOCUSED || afState == ACAMERA_CONTROL_AF_STATE_FOCUSED_LOCKED)
// if (afState != ACAMERA_CONTROL_AF_STATE_INACTIVE) // if (afState != ACAMERA_CONTROL_AF_STATE_INACTIVE)
{ {
@ -727,7 +741,7 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
} }
} }
ALOGD("onCaptureCompleted EXPOSURE_TIME=%lld, FocusDis=%f camera id=%s, AE=%s", exTime, focusDistance, mCameraId.c_str(), ((aeMode == 1) ? "ON" : "OFF")); ALOGD("onCaptureCompleted EXPOSURE_TIME=%lld, FocusDis=%f camera id=%s, AE=%s AF_STATE=%u", exTime, focusDistance, mCameraId.c_str(), ((aeMode == 1) ? "ON" : "OFF"), afState);
// __android_log_print(ANDROID_LOG_WARN, "NdkCamera", "onCaptureCompleted %p %p %p", session, request, result); // __android_log_print(ANDROID_LOG_WARN, "NdkCamera", "onCaptureCompleted %p %p %p", session, request, result);
} }

2
app/src/main/cpp/camera2/ndkcamera.h
Unescape Escape View File

@ -105,6 +105,8 @@ private:
ACaptureSessionOutputContainer* capture_session_output_container; ACaptureSessionOutputContainer* capture_session_output_container;
ACaptureSessionOutput* capture_session_output; ACaptureSessionOutput* capture_session_output;
ACameraCaptureSession* capture_session; ACameraCaptureSession* capture_session;
int captureSequenceId;
}; };
#endif // NDKCAMERA_H #endif // NDKCAMERA_H

2
app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
Unescape Escape View File

@ -574,7 +574,7 @@ public class MicroPhotoService extends Service {
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, alarmIntent, 0); PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, alarmIntent, 0);
AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE); AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE);
alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), pendingIntent); alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 1000, pendingIntent);
} }
@Override @Override

3
common/build.gradle
Unescape Escape View File

@ -18,6 +18,9 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
debug {
jniDebuggable true
}
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8

7
common/src/main/java/com/xypower/common/ViewUtils.java
Unescape Escape View File

@ -1,8 +1,14 @@
package com.xypower.common; package com.xypower.common;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.net.ConnectivityManager;
import android.os.Build;
import android.text.TextUtils;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import androidx.annotation.RequiresApi;
public class ViewUtils { public class ViewUtils {
public static void hideSoftKeyboard(Activity activity) { public static void hideSoftKeyboard(Activity activity) {
InputMethodManager inputMethodManager = InputMethodManager inputMethodManager =
@ -16,4 +22,5 @@ public class ViewUtils {
} }
} }
} }

3
mpmaster/build.gradle
Unescape Escape View File

@ -29,6 +29,9 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
debug {
jniDebuggable true
}
} }
compileOptions { compileOptions {

Write Preview
Loading…
Cancel
Save