change README.md

IronSublimate · Apr 4, 2021 · 5f372be · 5f372be
1 parent 271de05
commit 5f372be
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -3,9 +3,8 @@
 >
 > Source Code: https://github.com/IronSublimate/NCNN_ObjectDetection
 
-use Tencent's [NCNN](https://github.com/Tencent/ncnn) framework to run yolov4-tiny yolov5 and mobilenet-ssd
-
-
+use Tencent's [NCNN](https://github.com/Tencent/ncnn) framework to run yolov4-tiny yolov5 and mobilenet-ssd  
+NCNN Verison : 20210322
 
 ## How to Build and Run
 ### step1
@@ -66,7 +65,8 @@ open this project with Android Studio, build it and enjoy!
     }
     ```
     
-    
+## Known Issues
+1. Might be crashed when first open this app    
 
 ## Acknowledgement
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             moduleName "ncnn"

diff --git a/app/src/main/java/com/ironsublimate/ncnn_objectdetection/MainActivity.java b/app/src/main/java/com/ironsublimate/ncnn_objectdetection/MainActivity.java
@@ -110,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     protected void onResume() {
-        super.onResume();
+
         new Thread() {
             @Override
             public void run() {
@@ -122,6 +122,7 @@ public void run() {
                 // });
             }
         }.start();
+        super.onResume();
     }
 
     private void updateSettings() {
@@ -141,7 +142,9 @@ private void updateSettings() {
             try {
                 NCNNDetector tempDetector = (NCNNDetector) (Class.forName(networkClassName).newInstance());
                 String s = detectNetwork.getOrDefault(networkClassName, "");
-                textViewNetwork.setText(s);
+                runOnUiThread(()->{
+                    textViewNetwork.setText(s);
+                });
                 boolean ret_init = tempDetector.Init(getAssets());
                 if (!ret_init) {
                     Log.e(TAG, "NCNN Detector Init failed");

diff --git a/app/src/main/java/com/ironsublimate/ncnn_objectdetection/SettingsActivity.java b/app/src/main/java/com/ironsublimate/ncnn_objectdetection/SettingsActivity.java
@@ -2,16 +2,16 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.Switch;
+
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.*;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.SwitchPreferenceCompat;
 
 import java.util.HashMap;
-import java.util.List;
 
 public class SettingsActivity extends AppCompatActivity {
     private static final String TAG = "SettingsActivity";
@@ -50,7 +50,9 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             listPreference.setEntries(methodMap.values().toArray(new String[0]));
             listPreference.setEntryValues(methodMap.keySet().toArray(new String[0]));
 //            listPreference.setDefaultValue(methodMap.keySet().stream().findFirst());
-            listPreference.setValueIndex(0);
+            if (listPreference.getValue() == null) {
+                listPreference.setValueIndex(0);
+            }
         }
     }
 

diff --git a/app/src/main/jni/CMakeLists.txt b/app/src/main/jni/CMakeLists.txt
@@ -20,4 +20,5 @@ add_library(
 target_link_libraries(ncnn_detector
     ncnn
     jnigraphics
+    glslang
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,5 @@ add_library( @@
     target_link_libraries(ncnn_detector
         ncnn
         jnigraphics
+        glslang
     )