BluetoothがOFFのときは通知するようにした。

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 86522a5..8e0a27e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
@@ -437,10 +437,11 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
     public void wakeupExecuted(boolean isExecuted)
     {
         Log.v(TAG, "wakeupExecuted() : " + isExecuted);
-        if ((isExecuted)&&(isAutoConnectCamera()))
+        if (isAutoConnectCamera())
         {
-            // カメラへ自動接続する設定だった場合、カメラへWiFi接続する
+            // カメラへ自動接続する設定だった場合、カメラへWiFi接続する (BLEで起動しなくても)
             changeCameraConnection();
         }
+
     }
 }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/PowerOnCamera.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/PowerOnCamera.java
index df7adb8..5736b2f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/PowerOnCamera.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/PowerOnCamera.java
@@ -50,6 +50,32 @@ public class PowerOnCamera implements ICameraPowerOn
     {
         Log.v(TAG, "PowerOnCamera::wakeup()");
 
+        try
+        {
+            BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter();
+            if (!btAdapter.isEnabled()) {
+                // Bluetoothの設定がOFFだった
+                Log.v(TAG, "Bluetooth is currently off.");
+                context.runOnUiThread(new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        // Toastで カメラ起動エラーがあったことを通知する
+                        Toast.makeText(context, context.getString(R.string.ble_setting_is_off), Toast.LENGTH_LONG).show();
+                    }
+                });
+                callback.wakeupExecuted(false);
+                return;
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            callback.wakeupExecuted(false);
+            return;
+        }
+
         final BluetoothManager btMgr;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
         {

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6745a66..19b1629 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -99,6 +99,7 @@
     <string name="restored_my_props">設定を展開しました。 : </string>
 
     <string name="launch_fail_via_ble">Bluetooth経由のカメラ起動に失敗 : </string>
+    <string name="ble_setting_is_off">BluetoothがOFFです</string>
     <string name="action_refresh">更新</string>
     <string name="finish_refresh">更新終了</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 965c329..5c356c7 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -103,6 +103,7 @@
     <string name="restored_my_props">Restored Property : </string>
 
     <string name="launch_fail_via_ble">  Launch fail. via BLE : </string>
+    <string name="ble_setting_is_off">Bluetooth is currently off.</string>
 
     <string name="action_refresh">Refresh</string>
     <string name="finish_refresh">Finished Refresh</string>