Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
Android_Catering_service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
姜天宇
Android_Catering_service
Commits
ea3ae1c9
Commit
ea3ae1c9
authored
May 13, 2025
by
姜天宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:增加arm64支持
parent
bb408cc9
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
11 additions
and
14 deletions
+11
-14
build.gradle
app/build.gradle
+3
-3
build.gradle
camera/build.gradle
+4
-0
libUACAudio.so
camera/src/main/jniLibs/arm64-v8a/libUACAudio.so
+0
-0
libUVCCamera.so
camera/src/main/jniLibs/arm64-v8a/libUVCCamera.so
+0
-0
libjpeg-turbo1500.so
camera/src/main/jniLibs/arm64-v8a/libjpeg-turbo1500.so
+0
-0
libusb100.so
camera/src/main/jniLibs/arm64-v8a/libusb100.so
+0
-0
libuvc.so
camera/src/main/jniLibs/arm64-v8a/libuvc.so
+0
-0
build.gradle
core/build.gradle
+1
-1
CMakeLists.txt
core/src/main/cpp/CMakeLists.txt
+0
-8
libret.a
core/src/main/jniLibs/arm64-v8a/libret.a
+0
-0
libret.so
core/src/main/jniLibs/arm64-v8a/libret.so
+0
-0
libretri.a
core/src/main/jniLibs/armeabi-v7a/libretri.a
+0
-0
build.gradle
data-local/build.gradle
+1
-1
history.txt
history.txt
+1
-0
build.gradle
opencv/build.gradle
+1
-1
No files found.
app/build.gradle
View file @
ea3ae1c9
...
...
@@ -3,8 +3,8 @@ plugins {
id
'org.jetbrains.kotlin.android'
}
def
APP_VERSION_CODE
=
100020
3
def
APP_VERSION_NAME
=
"1.0.2.
3
"
def
APP_VERSION_CODE
=
100020
4
def
APP_VERSION_NAME
=
"1.0.2.
4
"
android
{
namespace
'com.wmdigit.cateringdetect'
...
...
@@ -34,7 +34,7 @@ android {
signingConfig
signingConfigs
.
release
ndk
{
abiFilters
'armeabi-v7a'
abiFilters
'armeabi-v7a'
,
'arm64-v8a'
}
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
...
...
camera/build.gradle
View file @
ea3ae1c9
...
...
@@ -9,6 +9,10 @@ android {
defaultConfig
{
minSdk
24
ndk
{
abiFilters
'armeabi-v7a'
,
'arm64-v8a'
}
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles
"consumer-rules.pro"
}
...
...
camera/src/main/jniLibs/arm64-v8a/libUACAudio.so
0 → 100644
View file @
ea3ae1c9
File added
camera/src/main/jniLibs/arm64-v8a/libUVCCamera.so
0 → 100644
View file @
ea3ae1c9
File added
camera/src/main/jniLibs/arm64-v8a/libjpeg-turbo1500.so
0 → 100644
View file @
ea3ae1c9
File added
camera/src/main/jniLibs/arm64-v8a/libusb100.so
0 → 100644
View file @
ea3ae1c9
File added
camera/src/main/jniLibs/arm64-v8a/libuvc.so
0 → 100644
View file @
ea3ae1c9
File added
core/build.gradle
View file @
ea3ae1c9
...
...
@@ -10,7 +10,7 @@ android {
minSdk
24
ndk
{
abiFilters
'armeabi-v7a'
abiFilters
'armeabi-v7a'
,
'arm64-v8a'
// abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
}
...
...
core/src/main/cpp/CMakeLists.txt
View file @
ea3ae1c9
...
...
@@ -40,14 +40,6 @@ set_target_properties(
${
CMAKE_SOURCE_DIR
}
/../jniLibs/
${
ANDROID_ABI
}
/libc++_shared.so
)
# todo 测试用
#add_library(retri SHARED IMPORTED)
#set_target_properties(
# retri
# PROPERTIES IMPORTED_LOCATION
# ${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libretri.a
#)
# hnsw索引库
add_library
(
hnsw SHARED IMPORTED
)
set_target_properties
(
...
...
core/src/main/jniLibs/arm64-v8a/libret.a
deleted
100644 → 0
View file @
bb408cc9
File deleted
core/src/main/jniLibs/arm64-v8a/libret.so
0 → 100644
View file @
ea3ae1c9
File added
core/src/main/jniLibs/armeabi-v7a/libretri.a
deleted
100644 → 0
View file @
bb408cc9
File deleted
data-local/build.gradle
View file @
ea3ae1c9
...
...
@@ -13,7 +13,7 @@ android {
consumerProguardFiles
"consumer-rules.pro"
ndk
{
abiFilters
'armeabi-v7a'
abiFilters
'armeabi-v7a'
,
'arm64-v8a'
}
externalNativeBuild
{
...
...
history.txt
View file @
ea3ae1c9
...
...
@@ -28,6 +28,7 @@ v1.0.2.3 2025/05/08 1.增加GPU推理
2.增加纠错功能
3.学习页增加重置背景功能
4.修复部分设备USB相机格式不兼容的问题
v1.0.2.4 2025/05/13 1.增加arm64支持
todo 增加学习记录管理模块
...
...
opencv/build.gradle
View file @
ea3ae1c9
...
...
@@ -109,7 +109,7 @@ android {
versionName
openCVersionName
ndk
{
abiFilters
'armeabi-v7a'
abiFilters
'armeabi-v7a'
,
'arm64-v8a'
}
externalNativeBuild
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment