画像イメージのキャッシュ機能を搭載。

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt
index e750bde..cab98c1 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt
@@ -12,7 +12,6 @@ import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Compa
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_NUMBER_OF_CACHE_PICTURES
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_NUMBER_OF_CACHE_PICTURES_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveViewRefresher
-import jp.osdn.gokigen.gokigenassets.liveview.LiveImageView
 import jp.osdn.gokigen.gokigenassets.liveview.bitmapconvert.IPreviewImageConverter
 import jp.osdn.gokigen.gokigenassets.liveview.bitmapconvert.ImageConvertFactory
 import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper
@@ -20,12 +19,12 @@ import java.io.ByteArrayOutputStream
 import java.util.*
 
 
+data class MyImageByteArray(val imageData : ByteArray, val rotationDegrees: Int)
+
 class CameraLiveViewListenerImpl(private val context: Context) : IImageDataReceiver, IImageProvider, ImageAnalysis.Analyzer
 {
-    private var cachePics = ArrayList<ByteArray>()
+    private var cachePics = ArrayList<MyImageByteArray>()
     private var maxCachePics : Int = 0
-    //private var currentCachePics : Int = 0
-    private lateinit var imageBitmap : Bitmap
     private var bitmapConverter : IPreviewImageConverter = ImageConvertFactory().getImageConverter(0)
     private val refresher = ArrayList<ILiveViewRefresher>()
 
@@ -42,7 +41,6 @@ class CameraLiveViewListenerImpl(private val context: Context) : IImageDataRecei
     fun setRefresher(refresher: ILiveViewRefresher)
     {
         this.refresher.add(refresher)
-        imageBitmap = BitmapFactory.decodeResource(context.resources, ID_DRAWABLE_SPLASH_IMAGE)
         setupLiveviewCache()
     }
 
@@ -114,9 +112,8 @@ class CameraLiveViewListenerImpl(private val context: Context) : IImageDataRecei
 
         val out = ByteArrayOutputStream()
         yuvImage.compressToJpeg(Rect(0, 0, width, height), 100, out)
-        val imageBytes = out.toByteArray()
-        imageBitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
-        rotateImageBitmap(rotationDegrees)
+
+        insertCache(out.toByteArray(), rotationDegrees)
         imageProxy.close()
         refresh()
     }
@@ -146,28 +143,19 @@ class CameraLiveViewListenerImpl(private val context: Context) : IImageDataRecei
         val yuvImage = YuvImage(nv21, NV21, width, height, null)
         yuvImage.compressToJpeg(Rect(0, 0, width, height), 100, out)
 
-        val imageBytes = out.toByteArray()
-        imageBitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
-        rotateImageBitmap(rotationDegrees)
+        insertCache(out.toByteArray(), rotationDegrees)
         imageProxy.close()
         refresh()
     }
 
-    private fun rotateImageBitmap(rotationDegrees: Int)
+    private fun getImageBitmap(image: MyImageByteArray) : Bitmap?
     {
+        var imageBitmap : Bitmap? = null
         try
         {
-/*
-            var addDegrees = 0
-            val config = context.resources.configuration
-            if (config.orientation == Configuration.ORIENTATION_LANDSCAPE)
-            {
-                addDegrees = 90
-            }
-            val rotationDegrees = degrees + addDegrees
-*/
             val rotationMatrix = Matrix()
-            rotationMatrix.postRotate(rotationDegrees.toFloat())
+            rotationMatrix.postRotate(image.rotationDegrees.toFloat())
+            imageBitmap = BitmapFactory.decodeByteArray(image.imageData, 0, image.imageData.size)
             imageBitmap = Bitmap.createBitmap(imageBitmap, 0, 0, imageBitmap.width, imageBitmap.height, rotationMatrix, true)
             System.gc()
         }
@@ -175,12 +163,52 @@ class CameraLiveViewListenerImpl(private val context: Context) : IImageDataRecei
         {
             t.printStackTrace()
         }
+        return (imageBitmap)
+    }
+
+    private fun insertCache(byteArray : ByteArray, rotationDegrees: Int)
+    {
+        try
+        {
+            if ((cachePics.size != 0)&&(cachePics.size >= maxCachePics))
+            {
+                cachePics.removeAt(0)
+            }
+            cachePics.add(MyImageByteArray(byteArray, rotationDegrees))
+            Log.v(TAG, " -=-=- cache image : ${cachePics.size} / $maxCachePics")
+        }
+        catch (e : Exception)
+        {
+            e.printStackTrace()
+        }
     }
 
     override fun getImage(position: Float) : Bitmap
     {
-        Log.v(TAG, " getImage (pos: $position)")
-        return (imageBitmap)
+        try
+        {
+            val pos = (position * maxCachePics.toFloat()).toInt()
+            //Log.v(TAG, " getImage (pos: $position : $pos)")
+            val image : MyImageByteArray =
+            if (pos >= cachePics.size)
+            {
+                cachePics[cachePics.size - 1]
+            }
+            else
+            {
+                cachePics[pos]
+            }
+            val imageBitmap = getImageBitmap(image)
+            if (imageBitmap != null)
+            {
+                return (imageBitmap)
+            }
+        }
+        catch (e : Throwable)
+        {
+            e.printStackTrace()
+        }
+        return (BitmapFactory.decodeResource(context.resources, ID_DRAWABLE_SPLASH_IMAGE))
     }
 
     private fun refresh()

diff --git a/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt b/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt
index fd8f692..37b7687 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt
+++ b/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt
@@ -16,7 +16,7 @@ interface IPreferencePropertyAccessor
         const val CACHE_LIVE_VIEW_PICTURES = "cache_live_view_pictures"
         const val CACHE_LIVE_VIEW_PICTURES_DEFAULT_VALUE = false
 
-        const val NUMBER_OF_CACHE_PICTURES = "nof_cache_pictures"
+        const val NUMBER_OF_CACHE_PICTURES = "number_of_cache_pictures"
         const val NUMBER_OF_CACHE_PICTURES_DEFAULT_VALUE = "500"
 
         const val CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW = "capture_both_camera_and_live_view"

diff --git a/app/src/main/res/xml/preference_main.xml b/app/src/main/res/xml/preference_main.xml
index b4923ff..11dc164 100644 (file)
--- a/app/src/main/res/xml/preference_main.xml
+++ b/app/src/main/res/xml/preference_main.xml
@@ -48,7 +48,7 @@
             android:key="cache_live_view_pictures"
             android:title="@string/pref_cache_live_view_pictures"
             android:summary="@string/pref_summary_cache_live_view_pictures" />
-<!--
+
         <EditTextPreference
             android:key="number_of_cache_pictures"
             android:title="@string/pref_number_of_cache_pictures"
@@ -56,7 +56,7 @@
             android:inputType="numberDecimal"
             android:digits="0123456789"
             android:summary="@string/pref_summary_number_of_cache_pictures" />
--->
+
     </PreferenceCategory>
 
     <PreferenceCategory