From fbd31a37a59b70f0b23cb46f9e93cbf38203ced3 Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Wed, 26 Apr 2017 00:25:16 +0900
Subject: [PATCH] =?utf8?q?=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB=E3=82=B0?=
 =?utf8?q?=E3=83=AA=E3=83=83=E3=83=89=E7=B7=9A=E3=81=AEON/OFF=E3=82=A2?=
 =?utf8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E3=82=92=E6=9B=B4=E6=96=B0=E3=80=82?=
 =?utf8?q?=20=E3=81=9D=E3=81=AE=E4=BB=96=E5=BE=AE=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/sfjp/gokigen/a01c/MainActivity.java    | 27 ++++++++++++++++++++++
 .../gokigen/a01c/liveview/CameraLiveImageView.java |  2 +-
 .../a01c/liveview/gridframe/GridFrameDrawer0.java  |  2 +-
 .../dispatcher/FeatureDispatcher.java              |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java
index 5ced307..bfcbd25 100644
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java
@@ -1,5 +1,6 @@
 package jp.sfjp.gokigen.a01c;
 
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Vibrator;
@@ -90,6 +91,7 @@ public class MainActivity extends WearableActivity implements  IChangeScene, ISh
         vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
 
         setupCameraCoordinator();
+        setupInitialButtonIcons();
         setupActionListener();
     }
 
@@ -227,6 +229,31 @@ public class MainActivity extends WearableActivity implements  IChangeScene, ISh
     }
 
     /**
+     *   ボタンアイコンの初期設定
+     *
+     */
+    private void setupInitialButtonIcons()
+    {
+        if (coordinator != null)
+        {
+            int resId;
+            SharedPreferences preferences = android.support.v7.preference.PreferenceManager.getDefaultSharedPreferences(this);
+            if (preferences.getBoolean(ICameraPropertyAccessor.SHOW_GRID_STATUS, true))
+            {
+                // ボタンをGrid OFFアイコンにする
+                resId = R.drawable.btn_ic_grid_off;
+            }
+            else
+            {
+                // ボタンをGrid ONアイコンにする
+                resId = R.drawable.btn_ic_grid_on;
+            }
+            setButtonDrawable(IShowInformation.BUTTON_1, resId);
+        }
+    }
+
+
+    /**
      *   Olympus Cameraクラスとのやりとりをするクラスを準備する
      *   （カメラとの接続も、ここでスレッドを起こして開始する）
      */
diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java
index cbf6ecd..1dadd57 100644
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java
@@ -578,7 +578,7 @@ public class CameraLiveImageView extends View implements CameraLiveViewListenerI
         int centerX = width / 2;
         int centerY = height / 2;
 
-        float maxBandWidth = width / 3.0f;     // ゲージの最大長 (画面の 1/3 ぐらい)
+        //float maxBandWidth = width / 3.0f;     // ゲージの最大長 (画面の 1/3 ぐらい)
         float maxBandHeight = height / 3.0f;   // ゲージの最大長 (画面の 1/3 ぐらい)
         int barWidthInitial = 4;               // 表示するゲージの幅（の初期値）
         int barWidth;                          // 実際に表示するゲージの幅
diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java
index bb3aec4..e7f2c45 100644
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java
@@ -30,6 +30,6 @@ class GridFrameDrawer0 implements IGridFrameDrawer
     @Override
     public int getDrawColor()
     {
-        return (Color.argb(210,245,245,245));
+        return (Color.argb(230,245,245,245));
     }
 }
diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/dispatcher/FeatureDispatcher.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/dispatcher/FeatureDispatcher.java
index 31ff466..9a64d6d 100644
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/dispatcher/FeatureDispatcher.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/dispatcher/FeatureDispatcher.java
@@ -207,7 +207,7 @@ public class FeatureDispatcher implements ICameraFeatureDispatcher
                 /*
                 try
                 {
-                    // 実験... WIFIステート
+                    // 実験... WIFIステート設定画面を開く
                     //Intent intent = new Intent(ACTION_ADD_NETWORK_SETTINGS);
                     Intent intent = new Intent(ACTION_NETWORK_SETTINGS);
                     context.startActivity(intent);
-- 
2.11.0