Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Last version of detecting #1332

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9870abc
chore: Rename project
Oct 28, 2024
39a8bdc
Feature/base changes (#1)
Andrzej-Krzyskow Oct 30, 2024
0a4ae8f
Feature/main content (#2)
Andrzej-Krzyskow Nov 9, 2024
6dbf334
feat: Adding new main screen of App (#3)
KamilTaras Nov 9, 2024
355c927
feature: Action bar modification (#4)
Andrzej-Krzyskow Nov 9, 2024
42f7e58
feature: Connect login screen with full screen video screen (#5)
Andrzej-Krzyskow Nov 9, 2024
bd7feea
feature: Add show list button in Debug mode (#6)
Andrzej-Krzyskow Nov 11, 2024
63457a8
bugfix: Added needed xmlns (#7)
Andrzej-Krzyskow Nov 11, 2024
498f02e
feature: Added LED button and logic, Modified SignIn page and Added m…
Andrzej-Krzyskow Nov 12, 2024
c3c32ed
feat: models added
Nov 16, 2024
2152f7f
feat: opencv library
Nov 16, 2024
812fbf8
feature: Improved access to Demo List (#9)
Andrzej-Krzyskow Nov 16, 2024
4cbf902
bug
Nov 16, 2024
9881012
fix: changes for safer OpenCV usage
Nov 17, 2024
ee27295
feat: basic tree trunk detection on LiveStreamView.java, model_trunk.…
Nov 17, 2024
e052a60
fix: opencv directory
Nov 17, 2024
7ae8268
fix: opencv
Nov 17, 2024
528d757
fix: opencv
Nov 17, 2024
64bccf6
fix: gitignore for opencv
Nov 17, 2024
aa20efc
fix: gitignore for opencv
Nov 17, 2024
12968fe
fix: gitignore for opencv
Nov 17, 2024
8e2564b
feature: Circular-error-probable (#10)
KamilTaras Nov 18, 2024
720ecca
style: making CEP more appealing (#11)
KamilTaras Nov 21, 2024
04452dc
feature: Add Nose Obstacle Distance Measurements (#12)
Andrzej-Krzyskow Nov 21, 2024
e1d815d
fix: Increase Led Shoot Time
Andrzej-Krzyskow Nov 23, 2024
14abaae
feature: Improved buttons design (#13)
Andrzej-Krzyskow Nov 25, 2024
c45a6b3
feature: Add Major UI Changes (#14)
Andrzej-Krzyskow Nov 28, 2024
6ddc7e3
feature: statistics-on-the-screen (#15)
KamilTaras Nov 30, 2024
904d3f2
style: Add Minor UI Changes
Andrzej-Krzyskow Dec 1, 2024
5e592df
Merge remote-tracking branch 'origin/master' into object_detection_v2
Dec 6, 2024
c819f92
feat: slow but working object detection with deleted old code
Dec 6, 2024
cec0677
feat: added better model, button and logs for checking why detecting …
Dec 7, 2024
e425dda
feat: added more logs, better model speed
Dec 9, 2024
c320a56
feat: better bounding boxes, last errors corrected, deleted not used …
Dec 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 0 additions & 15 deletions Sample Code/app/src/main/res/layout/actionbar_custom.xml

This file was deleted.

162 changes: 0 additions & 162 deletions Sample Code/app/src/main/res/layout/content_main.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion Sample Code/settings.gradle

This file was deleted.

12 changes: 12 additions & 0 deletions Sample Code/.gitignore → ZPI-App/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,17 @@ proguard/
ehthumbs.db
Thumbs.db

# OpenCV CMake build files
/opencv/.cxx/cmake/debug/
*.ninja_deps
*.ninja_log
*.json
*.log
*.a
*.txt

# Import summary file
import-summary.txt

# app key file
/keystore.properties
File renamed without changes.
15 changes: 15 additions & 0 deletions Sample Code/app/build.gradle → ZPI-App/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

def keystorePropertiesFile = rootProject.file("keystore.properties")
def keystoreProperties = new Properties()

if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

repositories {
mavenLocal()
}
Expand All @@ -22,6 +29,7 @@ android {
// above, FFmpeg lib might lead to runtime crashes or warnings.
abiFilters 'armeabi-v7a','arm64-v8a'
}
manifestPlaceholders = [DJI_API_KEY: keystoreProperties['DJI_API_KEY']]
}

//需要直接使用appbundle的话,需要强制配置shrinkResources为false
Expand All @@ -30,11 +38,14 @@ android {
shrinkResources false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "boolean", "DEBUG_ZPI", "false"
signingConfig signingConfigs.debug
}
debug {
shrinkResources false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "boolean", "DEBUG_ZPI", "true"
}
}

Expand Down Expand Up @@ -87,6 +98,7 @@ dependencies {
exclude module: 'library-anti-distortion'
//exclude module: 'fly-safe-database'
})
implementation project(':opencv')
compileOnly 'com.dji:dji-sdk-provided:4.18'

implementation 'androidx.appcompat:appcompat:1.0.0'
Expand Down Expand Up @@ -115,4 +127,7 @@ dependencies {
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
implementation 'io.reactivex.rxjava2:rxjava:2.2.4'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'

implementation 'org.tensorflow:tensorflow-lite:2.12.0'
implementation 'org.tensorflow:tensorflow-lite-support:0.4.3'
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@
<uses-feature
android:name="android.hardware.usb.accessory"
android:required="true"/>


<!-- SDK requirement permission end -->

<application
android:name=".internal.controller.DJISampleApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/sample_app_name"
android:label="@string/app_name_zpi"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:extractNativeLibs="true"
Expand All @@ -46,14 +45,13 @@
<!-- personal key -->
<meta-data
android:name="com.dji.sdk.API_KEY"
android:value="Please enter your App key here."/>
android:value="${DJI_API_KEY}"/>
<!-- Required for receiving accessory attachment events.
This is necessary for product when connecting over USB. -->

<activity
android:name="com.dji.sdk.sample.internal.controller.MainActivity"
android:label="@string/sample_app_name"
android:screenOrientation="portrait"
android:screenOrientation="reverseLandscape"
android:launchMode="singleTop"
android:configChanges="orientation|keyboardHidden|screenSize"
android:theme="@style/AppTheme"
Expand Down
Binary file added ZPI-App/app/src/main/assets/best_float32.tflite
Binary file not shown.
1 change: 1 addition & 0 deletions ZPI-App/app/src/main/assets/labels.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tree
Binary file added ZPI-App/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading