デグレ？ があった個所を修正。（OPCのプロパティリスト表示）

diff --git a/app/build.gradle b/app/build.gradle
index 85b4471..5b955d9 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "net.osdn.gokigen.a01d"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 10902
         versionName "1.9.2"
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
index f2159e7..d3d0d84 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
@@ -252,16 +252,18 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
     @Override
     public void changeSceneToCameraPropertyList()
     {
-/*
         try
         {
             ICameraConnection.CameraConnectionMethod method = interfaceProvider.getCammeraConnectionMethod();
+            if (method == ICameraConnection.CameraConnectionMethod.OPC)
+            {
+                changeSceneToCameraPropertyList(method);
+            }
         }
         catch (Exception e)
         {
             e.printStackTrace();
         }
-*/
     }
 
     /**
@@ -368,7 +370,8 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
             }
             else
             {
-                // OPC カメラの場合...
+                // OPC カメラの場合...;
+                Log.v(TAG, " Change Scene to propertyList :");
                 ICameraConnection connection = getCameraConnection(connectionMethod);
                 if (connection != null)
                 {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/StoreImageOld.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/StoreImageOld.java
deleted file mode 100644 (file)
index 16cc383..0000000
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/StoreImageOld.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package net.osdn.gokigen.a01d.liveview;
-
-import android.app.ProgressDialog;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.util.Log;
-
-import net.osdn.gokigen.a01d.R;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Locale;
-
-/**
- *   画像の保管クラス
- *
- */
-class StoreImageOld implements IStoreImage
-{
-    private final String TAG = toString();
-    private final Context context;
-
-    StoreImageOld(Context context)
-    {
-        this.context = context;
-    }
-
-    @Override
-    public void doStore(final Bitmap target)
-    {
-        // 保存処理(プログレスダイアログ（「保存中...」）を表示して処理する)
-        final ProgressDialog saveDialog = new ProgressDialog(context);
-        saveDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        saveDialog.setMessage(context.getString(R.string.data_saving));
-        saveDialog.setIndeterminate(true);
-        saveDialog.setCancelable(false);
-        saveDialog.show();
-        Thread thread = new Thread(new Runnable()
-        {
-            public void run()
-            {
-                System.gc();
-                saveImageImpl(target);
-                System.gc();
-                saveDialog.dismiss();
-            }
-        });
-        try
-        {
-            thread.start();
-        }
-        catch (Throwable t)
-        {
-            t.printStackTrace();
-            System.gc();
-        }
-    }
-
-    /**
-     *   ビットマップイメージをファイルに出力する
-     *
-     * @param targetImage  出力するビットマップイメージ
-     */
-    private void saveImageImpl(Bitmap targetImage)
-    {
-        try
-        {
-            Calendar calendar = Calendar.getInstance();
-            final String directoryPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getPath() + "/" + context.getString(R.string.app_name2) + "/";
-            String filename = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(calendar.getTime()) + ".jpg";
-            String filepath = new File(directoryPath.toLowerCase(), filename).getPath();
-
-            final File directory = new File(directoryPath);
-            if (!directory.exists())
-            {
-                if (!directory.mkdirs())
-                {
-                    Log.v(TAG, "MKDIR FAIL. : " + directoryPath);
-                }
-            }
-            FileOutputStream outputStream = new FileOutputStream(filepath);
-            targetImage.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
-            outputStream.flush();
-            outputStream.close();
-
-            long now = System.currentTimeMillis();
-            ContentValues values = new ContentValues();
-            ContentResolver resolver = context.getContentResolver();
-            values.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
-            values.put(MediaStore.Images.Media.DATA, filepath);
-            values.put(MediaStore.Images.Media.DATE_ADDED, now);
-            values.put(MediaStore.Images.Media.DATE_TAKEN, now);
-            values.put(MediaStore.Images.Media.DATE_MODIFIED, now);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            {
-                values.put(MediaStore.Images.Media.WIDTH, targetImage.getWidth());
-                values.put(MediaStore.Images.Media.HEIGHT, targetImage.getHeight());
-            }
-            resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-        }
-        catch (Throwable t)
-        {
-            t.printStackTrace();
-        }
-    }
-}