ライブビューデータを拾うために検討中。その４。(OpenCV組み込み)

diff --git a/app/src/main/java/net/osdn/gokigen/cameratest/MainActivity.java b/app/src/main/java/net/osdn/gokigen/cameratest/MainActivity.java
index 4a19106..540b181 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/cameratest/MainActivity.java
+++ b/app/src/main/java/net/osdn/gokigen/cameratest/MainActivity.java
@@ -29,11 +29,12 @@ import org.opencv.android.LoaderCallbackInterface;
 
 public class MainActivity extends AppCompatActivity
 {
-    /////// OpenCV ///////
+    /////// OpenCV ///////  : license https://opencv.org/license/
     static
     {
         System.loadLibrary("opencv_java4");
     }
+
     private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this)
     {
         @Override
@@ -58,6 +59,9 @@ public class MainActivity extends AppCompatActivity
     private ViewPager mViewPager;
     private CamTest testTarget;
 
+    /**
+     *
+     */
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -112,6 +116,9 @@ public class MainActivity extends AppCompatActivity
 
     }
 
+    /**
+     *
+     */
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults)
     {
@@ -120,6 +127,9 @@ public class MainActivity extends AppCompatActivity
         onReadyClass();
     }
 
+    /**
+     *
+     */
     @Override
     public boolean onCreateOptionsMenu(Menu menu)
     {
@@ -128,6 +138,9 @@ public class MainActivity extends AppCompatActivity
         return true;
     }
 
+    /**
+     *
+     */
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
     {
@@ -156,6 +169,12 @@ public class MainActivity extends AppCompatActivity
             }
             return (true);
         }
+        if (id == R.id.action_exit)
+        {
+            // アプリケーションを終了する
+            exitApplication();
+            return (true);
+        }
         return super.onOptionsItemSelected(item);
     }
 
@@ -206,4 +225,40 @@ public class MainActivity extends AppCompatActivity
         }
     }
 
+    /**
+     *
+     */
+    private void exitApplication()
+    {
+        try
+        {
+            finish();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     *
+     */
+    @Override
+    protected void onResume()
+    {
+        super.onResume();
+
+        Log.d(TAG, "OpenCV library found inside package. Using it!");
+        mLoaderCallback.onManagerConnected(LoaderCallbackInterface.SUCCESS);
+    }
+
+    /**
+     *
+     */
+    @Override
+    protected void onPause()
+    {
+        super.onPause();
+    }
+
 }

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 7947add..2b2e997 100644 (file)
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -3,6 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="net.osdn.gokigen.cameratest.MainActivity">
     <item
+        android:id="@+id/action_exit"
+        android:orderInCategory="100"
+        android:title="@string/action_exit_app"
+        app:showAsAction="never" />
+    <item
     android:id="@+id/action_settings"
     android:orderInCategory="100"
     android:title="@string/action_settings"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 100e525..187166a 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">CameraTest</string>
     <string name="blank"> </string>
+    <string name="action_exit_app">Exit</string>
     <string name="action_settings">Settings</string>
     <string name="action_wifi_settings">WiFi Settings</string>
     <string name="section_format">Hello World from section: %1$d</string>