OSDN > ソフトウェアを探す > GOKIGEN > SCM > SVN > コミット

GOKIGEN
Fork
LegacyGpsAdapter
A01c
BondImage
A01d
GokigenClock
GokigenAlignmentChecker
JoggingTimer
PKRemote
GokigenDiary
TestSampleApp
TheWarikan
MeMoMa
Gr2Control
FujiCam
GokigenCameraControlLibrary
BLEControl
mangle
ThetaThoughtShutter
ThetaView
mCalendar
A01f
prpr1
TransportHub

R/O
SSH
HTTPS

gokigen: コミット

コミットメタ情報

リビジョン	424 (tree)
日時	2018-01-15 00:08:57
作者	mrsa

ログメッセージ

BLE関連のロジックをaira01aから持ってくる。

変更サマリ

modified: android/AirA01b/trunk/.idea/workspace.xml (diff)
modified: android/AirA01b/trunk/app/app.iml (diff)
modified: android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java (diff)
modified: android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java (diff)
modified: android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java (diff)
modified: android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java (diff)
modified: android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java (diff)
modified: android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java (diff)
modified: android/AirA01b/trunk/app/src/main/res/menu/image_grid_view.xml (diff)
modified: android/AirA01b/trunk/app/src/main/res/values/strings.xml (diff)
modified: android/AirA01b/trunk/app/src/main/res/values-ja/strings.xml (diff)
modified: android/AirA01b/trunk/app/src/main/res/xml/preferences.xml (diff)

差分

--- android/AirA01b/trunk/.idea/workspace.xml (revision 423)

+++ android/AirA01b/trunk/.idea/workspace.xml (revision 424)

		@@ -31,28 +31,19 @@
31	31	<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
32	32	</component>
33	33	<component name="ChangeListManager">
34		- <list default="true" readonly="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="BLE関連のロジックをa01dからマージする。">
35		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble" />
36		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java" />
37		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraEntryList.java" />
38		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraSetDialogDismiss.java" />
39		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListDialog.java" />
40		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListFragment.java" />
41		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java" />
42		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayAdapter.java" />
43		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayItem.java" />
44		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java" />
45		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/column_save_bt.xml" />
46		- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_entries.xml" />
	34	+ <list default="true" readonly="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="">
47	35	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
48	36	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
49		- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
50		- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
51	37	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" />
	38	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java" />
	39	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java" />
	40	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
52	41	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" />
	42	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java" />
	43	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" afterPath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" />
53	44	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
54	45	<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
55		- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openCVLibrary320/openCVLibrary320.iml" afterPath="$PROJECT_DIR$/openCVLibrary320/openCVLibrary320.iml" />
	46	+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" afterPath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
56	47	</list>
57	48	<ignored path="AirA01b.iws" />
58	49	<ignored path=".idea/workspace.xml" />

		@@ -83,18 +74,7 @@
83	74	<favorites_list name="AirA01b" />
84	75	</component>
85	76	<component name="FileEditorManager">
86		- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
87		- <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
88		- <entry file="file://$PROJECT_DIR$/app/build.gradle">
89		- <provider selected="true" editor-type-id="text-editor">
90		- <state relative-caret-position="374">
91		- <caret line="22" column="53" lean-forward="true" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
92		- <folding />
93		- </state>
94		- </provider>
95		- </entry>
96		- </file>
97		- </leaf>
	77	+ <leaf />
98	78	</component>
99	79	<component name="FileTemplateManagerImpl">
100	80	<option name="RECENT_TEMPLATES">

		@@ -2765,15 +2745,9 @@
2765	2745	<option value="$PROJECT_DIR$/openCVLibrary320/build.gradle" />
2766	2746	<option value="$PROJECT_DIR$/build.gradle" />
2767	2747	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/takepicture/CameraDateTimeSynchronizer.java" />
2768		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java" />
2769		- <option value="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
2770		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java" />
2771		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java" />
2772	2748	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/IChangeScene.java" />
2773	2749	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ICameraDateTimeSynchronizer.java" />
2774	2750	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraDateTimeSynchronizer.java" />
2775		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
2776		- <option value="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" />
2777	2751	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/controlpanel/CameraControlPanel.java" />
2778	2752	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" />
2779	2753	<option value="$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml" />

		@@ -2785,15 +2759,21 @@
2785	2759	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayItem.java" />
2786	2760	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java" />
2787	2761	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraSetArrayAdapter.java" />
2788		- <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
2789		- <option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
2790	2762	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListFragment.java" />
2791		- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" />
2792	2763	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java" />
2793	2764	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/IOlyCameraEntryList.java" />
2794	2765	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraEntryListDialog.java" />
	2766	+ <option value="$PROJECT_DIR$/app/build.gradle" />
	2767	+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java" />
	2768	+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
	2769	+ <option value="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" />
	2770	+ <option value="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
	2771	+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java" />
2795	2772	<option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java" />
2796		- <option value="$PROJECT_DIR$/app/build.gradle" />
	2773	+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java" />
	2774	+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java" />
	2775	+ <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
	2776	+ <option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
2797	2777	</list>
2798	2778	</option>
2799	2779	</component>

		@@ -2998,6 +2978,10 @@
2998	2978	<option name="myItemId" value="res" />
2999	2979	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3000	2980	</PATH_ELEMENT>
	2981	+ <PATH_ELEMENT>
	2982	+ <option name="myItemId" value="xml" />
	2983	+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
	2984	+ </PATH_ELEMENT>
3001	2985	</PATH>
3002	2986	<PATH>
3003	2987	<PATH_ELEMENT>

		@@ -3084,10 +3068,6 @@
3084	3068	<option name="myItemId" value="res" />
3085	3069	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3086	3070	</PATH_ELEMENT>
3087		- <PATH_ELEMENT>
3088		- <option name="myItemId" value="layout" />
3089		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3090		- </PATH_ELEMENT>
3091	3071	</PATH>
3092	3072	<PATH>
3093	3073	<PATH_ELEMENT>

		@@ -3111,11 +3091,11 @@
3111	3091	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3112	3092	</PATH_ELEMENT>
3113	3093	<PATH_ELEMENT>
3114		- <option name="myItemId" value="java" />
	3094	+ <option name="myItemId" value="res" />
3115	3095	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3116	3096	</PATH_ELEMENT>
3117	3097	<PATH_ELEMENT>
3118		- <option name="myItemId" value="aira01b" />
	3098	+ <option name="myItemId" value="menu" />
3119	3099	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3120	3100	</PATH_ELEMENT>
3121	3101	</PATH>

		@@ -3141,17 +3121,13 @@
3141	3121	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3142	3122	</PATH_ELEMENT>
3143	3123	<PATH_ELEMENT>
3144		- <option name="myItemId" value="java" />
	3124	+ <option name="myItemId" value="res" />
3145	3125	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3146	3126	</PATH_ELEMENT>
3147	3127	<PATH_ELEMENT>
3148		- <option name="myItemId" value="aira01b" />
	3128	+ <option name="myItemId" value="layout" />
3149	3129	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3150	3130	</PATH_ELEMENT>
3151		- <PATH_ELEMENT>
3152		- <option name="myItemId" value="preference" />
3153		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3154		- </PATH_ELEMENT>
3155	3131	</PATH>
3156	3132	<PATH>
3157	3133	<PATH_ELEMENT>

		@@ -3178,53 +3154,7 @@
3178	3154	<option name="myItemId" value="java" />
3179	3155	<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3180	3156	</PATH_ELEMENT>
3181		- <PATH_ELEMENT>
3182		- <option name="myItemId" value="aira01b" />
3183		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3184		- </PATH_ELEMENT>
3185		- <PATH_ELEMENT>
3186		- <option name="myItemId" value="olycamerawrapper" />
3187		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3188		- </PATH_ELEMENT>
3189	3157	</PATH>
3190		- <PATH>
3191		- <PATH_ELEMENT>
3192		- <option name="myItemId" value="AirA01b" />
3193		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
3194		- </PATH_ELEMENT>
3195		- <PATH_ELEMENT>
3196		- <option name="myItemId" value="AirA01b" />
3197		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3198		- </PATH_ELEMENT>
3199		- <PATH_ELEMENT>
3200		- <option name="myItemId" value="app" />
3201		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3202		- </PATH_ELEMENT>
3203		- <PATH_ELEMENT>
3204		- <option name="myItemId" value="src" />
3205		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3206		- </PATH_ELEMENT>
3207		- <PATH_ELEMENT>
3208		- <option name="myItemId" value="main" />
3209		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3210		- </PATH_ELEMENT>
3211		- <PATH_ELEMENT>
3212		- <option name="myItemId" value="java" />
3213		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3214		- </PATH_ELEMENT>
3215		- <PATH_ELEMENT>
3216		- <option name="myItemId" value="aira01b" />
3217		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3218		- </PATH_ELEMENT>
3219		- <PATH_ELEMENT>
3220		- <option name="myItemId" value="olycamerawrapper" />
3221		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3222		- </PATH_ELEMENT>
3223		- <PATH_ELEMENT>
3224		- <option name="myItemId" value="ble" />
3225		- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
3226		- </PATH_ELEMENT>
3227		- </PATH>
3228	3158	</subPane>
3229	3159	</pane>
3230	3160	<pane id="PackagesPane" />

		@@ -3375,7 +3305,7 @@
3375	3305	<option name="ACTIVITY_CLASS" value="" />
3376	3306	<method>
3377	3307	<option name="Android.Gradle.BeforeRunTask" enabled="true" />
3378		- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515859685173" />
	3308	+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515942535461" />
3379	3309	</method>
3380	3310	</configuration>
3381	3311	<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">

		@@ -3423,7 +3353,7 @@
3423	3353	</Profilers>
3424	3354	<method>
3425	3355	<option name="Android.Gradle.BeforeRunTask" enabled="true" />
3426		- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515859685173" />
	3356	+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515942535461" />
3427	3357	</method>
3428	3358	</configuration>
3429	3359	<configuration default="true" type="Application" factoryName="Application">

		@@ -3615,7 +3545,7 @@
3615	3545	<option name="ACTIVITY_CLASS" value="" />
3616	3546	<method>
3617	3547	<option name="Android.Gradle.BeforeRunTask" enabled="true" />
3618		- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515859685173" />
	3548	+ <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1515942535463" />
3619	3549	</method>
3620	3550	</configuration>
3621	3551	<list size="1">

		@@ -3791,13 +3721,6 @@
3791	3721	<option name="presentableId" value="Default" />
3792	3722	<updated>1469871562549</updated>
3793	3723	</task>
3794		- <task id="LOCAL-00128" summary="操作パネル搭載のための準備その13。見た目を変えてみた。作例表示モードへのインパクトを治す必要あり。 ">
3795		- <created>1495378445382</created>
3796		- <option name="number" value="00128" />
3797		- <option name="presentableId" value="LOCAL-00128" />
3798		- <option name="project" value="LOCAL" />
3799		- <updated>1495378445382</updated>
3800		- </task>
3801	3724	<task id="LOCAL-00129" summary="操作パネル搭載のための準備その14。作例表示モードへのインパクト修正。 ">
3802	3725	<created>1495379376412</created>
3803	3726	<option name="number" value="00129" />

		@@ -4134,7 +4057,14 @@
4134	4057	<option name="project" value="LOCAL" />
4135	4058	<updated>1515765017102</updated>
4136	4059	</task>
4137		- <option name="localTasksCounter" value="177" />
	4060	+ <task id="LOCAL-00177" summary="BLE関連のロジックをa01dから持ってくる。">
	4061	+ <created>1515859738228</created>
	4062	+ <option name="number" value="00177" />
	4063	+ <option name="presentableId" value="LOCAL-00177" />
	4064	+ <option name="project" value="LOCAL" />
	4065	+ <updated>1515859738228</updated>
	4066	+ </task>
	4067	+ <option name="localTasksCounter" value="178" />
4138	4068	<servers />
4139	4069	</component>
4140	4070	<component name="TodoView">

		@@ -4149,28 +4079,30 @@
4149	4079	<component name="ToolWindowManager">
4150	4080	<frame x="56" y="-2" width="2505" height="1456" extended-state="0" />
4151	4081	<layout>
4152		- <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
	4082	+ <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
	4083	+ <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="5" side_tool="true" content_ui="tabs" />
	4084	+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45839873" sideWeight="0.51249486" order="8" side_tool="true" content_ui="tabs" />
	4085	+ <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32998455" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
	4086	+ <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
	4087	+ <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
	4088	+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
	4089	+ <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
	4090	+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.72096777" sideWeight="0.4923939" order="3" side_tool="false" content_ui="tabs" />
4153	4091	<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4154	4092	<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45749614" sideWeight="0.4875051" order="14" side_tool="false" content_ui="tabs" />
4155		- <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="5" side_tool="true" content_ui="tabs" />
4156	4093	<window_info id="Palette " active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
4157	4094	<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
4158	4095	<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
4159		- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45839873" sideWeight="0.51249486" order="8" side_tool="true" content_ui="tabs" />
4160		- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.118238024" sideWeight="0.4923939" order="2" side_tool="false" content_ui="tabs" />
	4096	+ <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896355" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
	4097	+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48763523" sideWeight="0.4923939" order="2" side_tool="false" content_ui="tabs" />
4161	4098	<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3265306" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
4162	4099	<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
4163		- <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998455" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
4164	4100	<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
4165		- <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4166	4101	<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46058732" sideWeight="0.50921756" order="13" side_tool="true" content_ui="tabs" />
4167		- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
4168		- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21507579" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
	4102	+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21507579" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
	4103	+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33153015" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4169	4104	<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
4170		- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
4171		- <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
4172	4105	<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4173		- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.72096777" sideWeight="0.4923939" order="3" side_tool="false" content_ui="tabs" />
4174	4106	<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="7" side_tool="true" content_ui="tabs" />
4175	4107	<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
4176	4108	<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />

		@@ -4182,9 +4114,44 @@
4182	4114	<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
4183	4115	<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978287" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
4184	4116	<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
	4117	+ </layout>
	4118	+ <layout-to-restore>
	4119	+ <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
	4120	+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
	4121	+ <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
	4122	+ <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
	4123	+ <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="5" side_tool="true" content_ui="tabs" />
	4124	+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
	4125	+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45839873" sideWeight="0.51249486" order="8" side_tool="true" content_ui="tabs" />
	4126	+ <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46310833" sideWeight="0.4747798" order="10" side_tool="false" content_ui="tabs" />
	4127	+ <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
	4128	+ <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32998455" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
	4129	+ <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
	4130	+ <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
	4131	+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="combo" />
	4132	+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
	4133	+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
	4134	+ <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
	4135	+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.72096777" sideWeight="0.4923939" order="3" side_tool="false" content_ui="tabs" />
	4136	+ <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978287" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
	4137	+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
	4138	+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45749614" sideWeight="0.4875051" order="14" side_tool="false" content_ui="tabs" />
	4139	+ <window_info id="Palette " active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
	4140	+ <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
	4141	+ <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
	4142	+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
4185	4143	<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896355" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
	4144	+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48763523" sideWeight="0.4923939" order="2" side_tool="false" content_ui="tabs" />
	4145	+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3265306" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
	4146	+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
	4147	+ <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
	4148	+ <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46058732" sideWeight="0.50921756" order="13" side_tool="true" content_ui="tabs" />
	4149	+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21507579" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
4186	4150	<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33153015" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
4187		- </layout>
	4151	+ <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
	4152	+ <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
	4153	+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42594075" sideWeight="0.5064516" order="7" side_tool="true" content_ui="tabs" />
	4154	+ </layout-to-restore>
4188	4155	</component>
4189	4156	<component name="Vcs.Log.UiProperties">
4190	4157	<option name="RECENTLY_FILTERED_USER_GROUPS">

		@@ -4198,8 +4165,6 @@
4198	4165	<option name="myLimit" value="2678400000" />
4199	4166	</component>
4200	4167	<component name="VcsManagerConfiguration">
4201		- <MESSAGE value="カメラプロパティの一覧画面を、プロパティ名でソートして表示するようにした。インターバル撮影の名称でBKTからINTに修正した。 " />
4202		- <MESSAGE value="1.7.0 リリース版。" />
4203	4168	<MESSAGE value="次バージョンリリース準備。" />
4204	4169	<MESSAGE value="撮影時にライブビュー画像を保存できるオプションを追加。 " />
4205	4170	<MESSAGE value="加工画像の保存時に、当該画像を共有できるオプションを追加。 " />

		@@ -4223,7 +4188,9 @@
4223	4188	<MESSAGE value="下部操作パネルのフリック感度調整機能を追加。スマホの時刻をカメラに設定する機能を追加。（呼び出せないが...）" />
4224	4189	<MESSAGE value="GPSのロケーションがFIXしたときに操作不能になる不具合を改修。" />
4225	4190	<MESSAGE value="BLE関連のロジックをa01dからマージする。" />
4226		- <option name="LAST_COMMIT_MESSAGE" value="BLE関連のロジックをa01dからマージする。" />
	4191	+ <MESSAGE value="BLE関連のロジックをa01dから持ってくる。" />
	4192	+ <MESSAGE value="BLE関連のロジックをaira01aから持ってくる。" />
	4193	+ <option name="LAST_COMMIT_MESSAGE" value="BLE関連のロジックをaira01aから持ってくる。" />
4227	4194	</component>
4228	4195	<component name="XDebuggerManager">
4229	4196	<breakpoint-manager>

		@@ -4235,27 +4202,6 @@
4235	4202	<watches-manager />
4236	4203	</component>
4237	4204	<component name="editorHistoryManager">
4238		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java">
4239		- <provider selected="true" editor-type-id="text-editor">
4240		- <state relative-caret-position="570">
4241		- <caret line="589" column="34" lean-forward="false" selection-start-line="589" selection-start-column="0" selection-end-line="595" selection-end-column="0" />
4242		- </state>
4243		- </provider>
4244		- </entry>
4245		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycameraproperty/CameraPropertyLoader.java">
4246		- <provider selected="true" editor-type-id="text-editor">
4247		- <state relative-caret-position="68">
4248		- <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
4249		- </state>
4250		- </provider>
4251		- </entry>
4252		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/LoadSaveCameraProperties.java">
4253		- <provider selected="true" editor-type-id="text-editor">
4254		- <state relative-caret-position="516">
4255		- <caret line="177" column="47" lean-forward="false" selection-start-line="177" selection-start-column="37" selection-end-line="177" selection-end-column="59" />
4256		- </state>
4257		- </provider>
4258		- </entry>
4259	4205	<entry file="file://$PROJECT_DIR$/openCVLibrary320/build.gradle">
4260	4206	<provider selected="true" editor-type-id="text-editor">
4261	4207	<state relative-caret-position="204">

		@@ -4335,44 +4281,6 @@
4335	4281	</state>
4336	4282	</provider>
4337	4283	</entry>
4338		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraPowerOff.java">
4339		- <provider selected="true" editor-type-id="text-editor">
4340		- <state relative-caret-position="493">
4341		- <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
4342		- </state>
4343		- </provider>
4344		- </entry>
4345		- <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
4346		- <provider selected="true" editor-type-id="text-editor">
4347		- <state relative-caret-position="374">
4348		- <caret line="229" column="23" lean-forward="true" selection-start-line="229" selection-start-column="23" selection-end-line="229" selection-end-column="23" />
4349		- </state>
4350		- </provider>
4351		- <provider editor-type-id="android-designer2">
4352		- <state />
4353		- </provider>
4354		- </entry>
4355		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java">
4356		- <provider selected="true" editor-type-id="text-editor">
4357		- <state relative-caret-position="473">
4358		- <caret line="243" column="0" lean-forward="false" selection-start-line="243" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
4359		- </state>
4360		- </provider>
4361		- </entry>
4362		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java">
4363		- <provider selected="true" editor-type-id="text-editor">
4364		- <state relative-caret-position="555">
4365		- <caret line="701" column="20" lean-forward="true" selection-start-line="701" selection-start-column="20" selection-end-line="701" selection-end-column="20" />
4366		- </state>
4367		- </provider>
4368		- </entry>
4369		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java">
4370		- <provider selected="true" editor-type-id="text-editor">
4371		- <state relative-caret-position="453">
4372		- <caret line="66" column="11" lean-forward="false" selection-start-line="66" selection-start-column="11" selection-end-line="66" selection-end-column="11" />
4373		- </state>
4374		- </provider>
4375		- </entry>
4376	4284	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraDateTimeSynchronizer.java">
4377	4285	<provider selected="true" editor-type-id="text-editor">
4378	4286	<state relative-caret-position="-108">

		@@ -4401,33 +4309,6 @@
4401	4309	</state>
4402	4310	</provider>
4403	4311	</entry>
4404		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java">
4405		- <provider selected="true" editor-type-id="text-editor">
4406		- <state relative-caret-position="289">
4407		- <caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
4408		- </state>
4409		- </provider>
4410		- </entry>
4411		- <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_view.xml">
4412		- <provider selected="true" editor-type-id="text-editor">
4413		- <state relative-caret-position="0">
4414		- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
4415		- </state>
4416		- </provider>
4417		- <provider editor-type-id="android-designer2">
4418		- <state />
4419		- </provider>
4420		- </entry>
4421		- <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml">
4422		- <provider selected="true" editor-type-id="text-editor">
4423		- <state relative-caret-position="459">
4424		- <caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
4425		- </state>
4426		- </provider>
4427		- <provider editor-type-id="android-designer2">
4428		- <state />
4429		- </provider>
4430		- </entry>
4431	4312	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
4432	4313	<provider selected="true" editor-type-id="text-editor">
4433	4314	<state relative-caret-position="3893">

		@@ -4461,8 +4342,8 @@
4461	4342	<state relative-caret-position="3685">
4462	4343	<caret line="260" column="49" lean-forward="false" selection-start-line="260" selection-start-column="49" selection-end-line="260" selection-end-column="49" />
4463	4344	<folding>
4464		- <element signature="e#6707#6728#0" expanded="true" />
4465		- <element signature="e#6839#6865#0" expanded="true" />
	4345	+ <element signature="e#6707#6728#0" expanded="false" />
	4346	+ <element signature="e#6839#6865#0" expanded="false" />
4466	4347	</folding>
4467	4348	</state>
4468	4349	</provider>

		@@ -4500,40 +4381,6 @@
4500	4381	</state>
4501	4382	</provider>
4502	4383	</entry>
4503		- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml">
4504		- <provider selected="true" editor-type-id="text-editor">
4505		- <state relative-caret-position="1088">
4506		- <caret line="224" column="0" lean-forward="false" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
4507		- <folding />
4508		- </state>
4509		- </provider>
4510		- </entry>
4511		- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
4512		- <provider selected="true" editor-type-id="text-editor">
4513		- <state relative-caret-position="1156">
4514		- <caret line="230" column="56" lean-forward="false" selection-start-line="230" selection-start-column="56" selection-end-line="230" selection-end-column="56" />
4515		- <folding />
4516		- </state>
4517		- </provider>
4518		- </entry>
4519		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java">
4520		- <provider selected="true" editor-type-id="text-editor">
4521		- <state relative-caret-position="863">
4522		- <caret line="98" column="0" lean-forward="false" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
4523		- <folding />
4524		- </state>
4525		- </provider>
4526		- </entry>
4527		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java">
4528		- <provider selected="true" editor-type-id="text-editor">
4529		- <state relative-caret-position="408">
4530		- <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
4531		- <folding>
4532		- <element signature="imports" expanded="true" />
4533		- </folding>
4534		- </state>
4535		- </provider>
4536		- </entry>
4537	4384	<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_entries.xml">
4538	4385	<provider editor-type-id="text-editor">
4539	4386	<state relative-caret-position="0">

		@@ -4569,7 +4416,7 @@
4569	4416	<state relative-caret-position="459">
4570	4417	<caret line="27" column="61" lean-forward="true" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
4571	4418	<folding>
4572		- <element signature="imports" expanded="true" />
	4419	+ <element signature="imports" expanded="false" />
4573	4420	</folding>
4574	4421	</state>
4575	4422	</provider>

		@@ -4579,7 +4426,7 @@
4579	4426	<state relative-caret-position="323">
4580	4427	<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
4581	4428	<folding>
4582		- <element signature="imports" expanded="true" />
	4429	+ <element signature="imports" expanded="false" />
4583	4430	</folding>
4584	4431	</state>
4585	4432	</provider>

		@@ -4600,20 +4447,12 @@
4600	4447	</state>
4601	4448	</provider>
4602	4449	</entry>
4603		- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java">
4604		- <provider selected="true" editor-type-id="text-editor">
4605		- <state relative-caret-position="34">
4606		- <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
4607		- <folding />
4608		- </state>
4609		- </provider>
4610		- </entry>
4611	4450	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/OlyCameraPowerOnSelector.java">
4612	4451	<provider selected="true" editor-type-id="text-editor">
4613	4452	<state relative-caret-position="782">
4614	4453	<caret line="49" column="9" lean-forward="false" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
4615	4454	<folding>
4616		- <element signature="imports" expanded="true" />
	4455	+ <element signature="imports" expanded="false" />
4617	4456	</folding>
4618	4457	</state>
4619	4458	</provider>

		@@ -4623,26 +4462,171 @@
4623	4462	<state relative-caret-position="306">
4624	4463	<caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
4625	4464	<folding>
	4465	+ <element signature="imports" expanded="false" />
	4466	+ </folding>
	4467	+ </state>
	4468	+ </provider>
	4469	+ </entry>
	4470	+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
	4471	+ <provider selected="true" editor-type-id="text-editor">
	4472	+ <state relative-caret-position="340">
	4473	+ <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
	4474	+ <folding />
	4475	+ </state>
	4476	+ </provider>
	4477	+ </entry>
	4478	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java">
	4479	+ <provider selected="true" editor-type-id="text-editor">
	4480	+ <state relative-caret-position="102">
	4481	+ <caret line="84" column="4" lean-forward="false" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="95" />
	4482	+ <folding />
	4483	+ </state>
	4484	+ </provider>
	4485	+ </entry>
	4486	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml">
	4487	+ <provider selected="true" editor-type-id="text-editor">
	4488	+ <state relative-caret-position="442">
	4489	+ <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
	4490	+ <folding />
	4491	+ </state>
	4492	+ </provider>
	4493	+ <provider editor-type-id="android-designer2">
	4494	+ <state />
	4495	+ </provider>
	4496	+ </entry>
	4497	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_view_with_raw.xml">
	4498	+ <provider selected="true" editor-type-id="text-editor">
	4499	+ <state relative-caret-position="1003">
	4500	+ <caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
	4501	+ <folding />
	4502	+ </state>
	4503	+ </provider>
	4504	+ <provider editor-type-id="android-designer2">
	4505	+ <state />
	4506	+ </provider>
	4507	+ </entry>
	4508	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/manipulate_view.xml">
	4509	+ <provider selected="true" editor-type-id="text-editor">
	4510	+ <state relative-caret-position="0">
	4511	+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
	4512	+ <folding />
	4513	+ </state>
	4514	+ </provider>
	4515	+ <provider editor-type-id="android-designer2">
	4516	+ <state />
	4517	+ </provider>
	4518	+ </entry>
	4519	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_view.xml">
	4520	+ <provider selected="true" editor-type-id="text-editor">
	4521	+ <state relative-caret-position="0">
	4522	+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
	4523	+ <folding />
	4524	+ </state>
	4525	+ </provider>
	4526	+ <provider editor-type-id="android-designer2">
	4527	+ <state />
	4528	+ </provider>
	4529	+ </entry>
	4530	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java">
	4531	+ <provider selected="true" editor-type-id="text-editor">
	4532	+ <state relative-caret-position="442">
	4533	+ <caret line="120" column="34" lean-forward="false" selection-start-line="120" selection-start-column="34" selection-end-line="120" selection-end-column="34" />
	4534	+ <folding />
	4535	+ </state>
	4536	+ </provider>
	4537	+ </entry>
	4538	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
	4539	+ <provider selected="true" editor-type-id="text-editor">
	4540	+ <state relative-caret-position="183">
	4541	+ <caret line="231" column="37" lean-forward="false" selection-start-line="231" selection-start-column="25" selection-end-line="231" selection-end-column="37" />
	4542	+ <folding />
	4543	+ </state>
	4544	+ </provider>
	4545	+ <provider editor-type-id="android-designer2">
	4546	+ <state />
	4547	+ </provider>
	4548	+ </entry>
	4549	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
	4550	+ <provider selected="true" editor-type-id="text-editor">
	4551	+ <state relative-caret-position="508">
	4552	+ <caret line="229" column="45" lean-forward="true" selection-start-line="229" selection-start-column="45" selection-end-line="229" selection-end-column="45" />
	4553	+ <folding />
	4554	+ </state>
	4555	+ </provider>
	4556	+ </entry>
	4557	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java">
	4558	+ <provider selected="true" editor-type-id="text-editor">
	4559	+ <state relative-caret-position="1564">
	4560	+ <caret line="92" column="55" lean-forward="false" selection-start-line="92" selection-start-column="55" selection-end-line="92" selection-end-column="55" />
	4561	+ <folding />
	4562	+ </state>
	4563	+ </provider>
	4564	+ </entry>
	4565	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/ICameraPowerOn.java">
	4566	+ <provider selected="true" editor-type-id="text-editor">
	4567	+ <state relative-caret-position="85">
	4568	+ <caret line="5" column="48" lean-forward="false" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="48" />
	4569	+ <folding />
	4570	+ </state>
	4571	+ </provider>
	4572	+ </entry>
	4573	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java">
	4574	+ <provider selected="true" editor-type-id="text-editor">
	4575	+ <state relative-caret-position="153">
	4576	+ <caret line="9" column="3" lean-forward="false" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
	4577	+ <folding>
4626	4578	<element signature="imports" expanded="true" />
4627	4579	</folding>
4628	4580	</state>
4629	4581	</provider>
4630	4582	</entry>
	4583	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java">
	4584	+ <provider selected="true" editor-type-id="text-editor">
	4585	+ <state relative-caret-position="357">
	4586	+ <caret line="52" column="55" lean-forward="false" selection-start-line="52" selection-start-column="49" selection-end-line="52" selection-end-column="66" />
	4587	+ <folding />
	4588	+ </state>
	4589	+ </provider>
	4590	+ </entry>
4631	4591	<entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java">
4632	4592	<provider selected="true" editor-type-id="text-editor">
4633		- <state relative-caret-position="918">
4634		- <caret line="85" column="47" lean-forward="true" selection-start-line="85" selection-start-column="47" selection-end-line="85" selection-end-column="47" />
	4593	+ <state relative-caret-position="1989">
	4594	+ <caret line="151" column="13" lean-forward="false" selection-start-line="150" selection-start-column="36" selection-end-line="151" selection-end-column="13" />
4635	4595	<folding />
4636	4596	</state>
4637	4597	</provider>
4638	4598	</entry>
4639		- <entry file="file://$PROJECT_DIR$/app/build.gradle">
	4599	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java">
4640	4600	<provider selected="true" editor-type-id="text-editor">
4641		- <state relative-caret-position="374">
4642		- <caret line="22" column="53" lean-forward="true" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
	4601	+ <state relative-caret-position="187">
	4602	+ <caret line="43" column="2" lean-forward="false" selection-start-line="43" selection-start-column="2" selection-end-line="43" selection-end-column="2" />
4643	4603	<folding />
4644	4604	</state>
4645	4605	</provider>
4646	4606	</entry>
	4607	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/ble/PowerOnCamera.java">
	4608	+ <provider selected="true" editor-type-id="text-editor">
	4609	+ <state relative-caret-position="136">
	4610	+ <caret line="24" column="26" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="26" />
	4611	+ <folding />
	4612	+ </state>
	4613	+ </provider>
	4614	+ </entry>
	4615	+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraPowerOff.java">
	4616	+ <provider selected="true" editor-type-id="text-editor">
	4617	+ <state relative-caret-position="391">
	4618	+ <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
	4619	+ <folding />
	4620	+ </state>
	4621	+ </provider>
	4622	+ </entry>
	4623	+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml">
	4624	+ <provider selected="true" editor-type-id="text-editor">
	4625	+ <state relative-caret-position="610">
	4626	+ <caret line="232" column="0" lean-forward="false" selection-start-line="232" selection-start-column="0" selection-end-line="232" selection-end-column="0" />
	4627	+ <folding />
	4628	+ </state>
	4629	+ </provider>
	4630	+ </entry>
4647	4631	</component>
4648	4632	</project>
		\ No newline at end of file

--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java (revision 423)

+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/MainActivity.java (revision 424)

		@@ -2,6 +2,7 @@
2	2
3	3	import android.content.DialogInterface;
4	4	import android.content.Intent;
	5	+import android.content.SharedPreferences;
5	6	import android.content.pm.PackageManager;
6	7	import android.provider.MediaStore;
7	8	import android.provider.Settings;

		@@ -14,6 +15,7 @@
14	15	import android.support.v7.app.AlertDialog;
15	16	import android.support.v7.app.AppCompatActivity;
16	17	import android.os.Bundle;
	18	+import android.support.v7.preference.PreferenceManager;
17	19	import android.util.Log;
18	20	import android.view.WindowManager;
19	21

		@@ -29,6 +31,7 @@
29	31	import jp.osdn.gokigen.aira01b.olycamerawrapper.IOLYCameraObjectProvider;
30	32	import jp.osdn.gokigen.aira01b.olycamerawrapper.IOlyCameraCoordinator;
31	33	import jp.osdn.gokigen.aira01b.olycamerawrapper.OlyCameraCoordinator;
	34	+import jp.osdn.gokigen.aira01b.olycamerawrapper.ble.ICameraPowerOn;
32	35	import jp.osdn.gokigen.aira01b.playback.ImageGridViewFragment;
33	36	import jp.osdn.gokigen.aira01b.preference.ICameraPropertyAccessor;
34	37	import jp.osdn.gokigen.aira01b.preference.PreferenceFragment;

		@@ -37,7 +40,7 @@
37	40	*
38	41	*
39	42	*/
40		-public class MainActivity extends AppCompatActivity implements ICameraStatusReceiver, IChangeScene
	43	+public class MainActivity extends AppCompatActivity implements ICameraStatusReceiver, IChangeScene, ICameraPowerOn.PowerOnCameraCallback
41	44	{
42	45	/////// OpenCV ///////
43	46	static

		@@ -135,7 +138,24 @@
135	138	protected void onResume()
136	139	{
137	140	super.onResume();
138		- olyCameraCoordinator.startWatchWifiStatus(this);
	141	+ if (isBlePowerOn())
	142	+ {
	143	+ // Bluetooth Smart経由でカメラをONにする場合...
	144	+ try
	145	+ {
	146	+ // カメラの電源ONクラスを呼び出しておく (電源ONができたら、コールバックをもらう）
	147	+ olyCameraCoordinator.wakeup(this);
	148	+ }
	149	+ catch (Exception e)
	150	+ {
	151	+ e.printStackTrace();
	152	+ }
	153	+ }
	154	+ else
	155	+ {
	156	+ // BLE経由でONしない時は、Wifiの状況を確認に入る。
	157	+ olyCameraCoordinator.startWatchWifiStatus(this);
	158	+ }
139	159
140	160	Log.d(TAG, "OpenCV library found inside package. Using it!");
141	161	mLoaderCallback.onManagerConnected(LoaderCallbackInterface.SUCCESS);

		@@ -443,4 +463,36 @@
443	463	olyCameraCoordinator.disconnect(true);
444	464	finish();
445	465	}
	466	+ /**
	467	+ * Bluetooth Smartでのカメラ起動シーケンスが終了したとき
	468	+ *
	469	+ */
	470	+ @Override
	471	+ public void wakeupExecuted(boolean isExecuted)
	472	+ {
	473	+ Log.v(TAG, "wakeupExecuted() : " + isExecuted);
	474	+
	475	+ // このタイミングでWifiの状況を確認に入る。
	476	+ olyCameraCoordinator.startWatchWifiStatus(this);
	477	+ }
	478	+
	479	+ /**
	480	+ * BLE経由でカメラの電源を入れるかどうか
	481	+ *
	482	+ */
	483	+ private boolean isBlePowerOn()
	484	+ {
	485	+ boolean ret = false;
	486	+ try
	487	+ {
	488	+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
	489	+ ret = preferences.getBoolean(ICameraPropertyAccessor.BLE_POWER_ON, false);
	490	+ // Log.v(TAG, "isBlePowerOn() : " + ret);
	491	+ }
	492	+ catch (Exception e)
	493	+ {
	494	+ e.printStackTrace();
	495	+ }
	496	+ return (ret);
	497	+ }
446	498	}

--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java (revision 423)

+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/IOlyCameraCoordinator.java (revision 424)

		@@ -5,6 +5,7 @@
5	5
6	6	import jp.co.olympus.camerakit.OLYCameraLiveViewListener;
7	7	import jp.co.olympus.camerakit.OLYCameraStatusListener;
	8	+import jp.osdn.gokigen.aira01b.olycamerawrapper.ble.ICameraPowerOn;
8	9
9	10	/**
10	11	*

		@@ -12,6 +13,9 @@
12	13	*/
13	14	public interface IOlyCameraCoordinator
14	15	{
	16	+ // Bluetooth Smartでカメラを起こす
	17	+ void wakeup(ICameraPowerOn.PowerOnCameraCallback callback);
	18	+
15	19	// WIFI 接続系
16	20	void startWatchWifiStatus(Context context);
17	21	void stopWatchWifiStatus(Context context);

--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java (revision 423)

+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/OlyCameraCoordinator.java (revision 424)

		@@ -7,15 +7,12 @@
7	7	import android.content.SharedPreferences;
8	8	import android.graphics.PointF;
9	9	import android.net.ConnectivityManager;
10		-import android.net.wifi.WifiInfo;
11	10	import android.net.wifi.WifiManager;
	11	+import android.support.v7.app.AppCompatActivity;
12	12	import android.support.v7.preference.PreferenceManager;
13	13	import android.util.Log;
14	14	import android.view.MotionEvent;
15	15
16		-import java.text.SimpleDateFormat;
17		-import java.util.Date;
18		-import java.util.Locale;
19	16	import java.util.concurrent.Executor;
20	17	import java.util.concurrent.Executors;
21	18

		@@ -28,6 +25,8 @@
28	25	import jp.osdn.gokigen.aira01b.R;
29	26	import jp.osdn.gokigen.aira01b.liveview.IAutoFocusFrameDisplay;
30	27	import jp.osdn.gokigen.aira01b.liveview.ICameraStatusDisplay;
	28	+import jp.osdn.gokigen.aira01b.olycamerawrapper.ble.ICameraPowerOn;
	29	+import jp.osdn.gokigen.aira01b.olycamerawrapper.ble.PowerOnCamera;
31	30	import jp.osdn.gokigen.aira01b.olycamerawrapper.takepicture.AutoFocusControl;
32	31	import jp.osdn.gokigen.aira01b.olycamerawrapper.takepicture.BracketingShotControl;
33	32	import jp.osdn.gokigen.aira01b.olycamerawrapper.takepicture.MovieRecordingControl;

		@@ -63,6 +62,7 @@
63	62	private final MovieRecordingControl movieShot;
64	63	private final BracketingShotControl bracketingShot;
65	64	private final OlyCameraPropertyProxy propertyProxy;
	65	+ private final PowerOnCamera powerOnCamera;
66	66	private final LoadSaveCameraProperties loadSaveCameraProperties;
67	67
68	68	private boolean isWatchingWifiStatus = false;

		@@ -75,7 +75,7 @@
75	75	/**
76	76	* コンストラクタ
77	77	*/
78		- public OlyCameraCoordinator(Context context, IAirA01BInterfacesProvider interfaceProvider)
	78	+ public OlyCameraCoordinator(AppCompatActivity context, IAirA01BInterfacesProvider interfaceProvider)
79	79	{
80	80	this.interfaceProvider = interfaceProvider;
81	81	this.context = context;

		@@ -95,6 +95,8 @@
95	95
96	96	loadSaveCameraProperties = new LoadSaveCameraProperties(context, propertyProxy, this);
97	97
	98	+ powerOnCamera = new PowerOnCamera(context, camera);
	99	+
98	100	connectionReceiver = new BroadcastReceiver() {
99	101	@Override
100	102	public void onReceive(Context context, Intent intent) {

		@@ -104,6 +106,17 @@
104	106	}
105	107
106	108	/**
	109	+ * Bluetooth Smart経由でのカメラ起動指示
	110	+ *
	111	+ * @param callback 接続完了の通知先
	112	+ */
	113	+ @Override
	114	+ public void wakeup(ICameraPowerOn.PowerOnCameraCallback callback)
	115	+ {
	116	+ powerOnCamera.wakeup(callback);
	117	+ }
	118	+
	119	+ /**
107	120	* Wifi接続状態の監視
108	121	* (接続の実処理は onReceiveBroadcastOfConnection() で実施)
109	122	*/

		@@ -199,14 +212,21 @@
199	212	interfaceProvider.getStatusReceiver().onStatusNotify(context.getString(R.string.connect_check_wifi));
200	213
201	214	String action = intent.getAction();
202		- if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION))
	215	+ if ((action != null)&&(action.equals(ConnectivityManager.CONNECTIVITY_ACTION)))
203	216	{
204	217	WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
	218	+ if ((wifiManager != null)&&(wifiManager.isWifiEnabled()))
	219	+ {
	220	+ // カメラとの接続処理を行う
	221	+ connectToCamera();
	222	+ }
	223	+ /--------- Network id は使用していないようなので...接続処理では見なくする
205	224	WifiInfo info = wifiManager.getConnectionInfo();
206	225	if (wifiManager.isWifiEnabled() && info != null && info.getNetworkId() != -1) {
207	226	// カメラとの接続処理を行う
208	227	connectToCamera();
209	228	}
	229	+ ---------/
210	230	}
211	231	}
212	232

--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java (revision 423)

+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java (revision 424)

		@@ -20,9 +20,12 @@
20	20	import android.app.Activity;
21	21	import android.app.AlertDialog;
22	22	import android.content.Context;
	23	+import android.content.SharedPreferences;
23	24	import android.graphics.Bitmap;
24	25	import android.graphics.BitmapFactory;
25	26	import android.graphics.Matrix;
	27	+import android.preference.PreferenceManager;
	28	+import android.support.annotation.NonNull;
26	29	import android.support.media.ExifInterface;
27	30	import android.os.Bundle;
28	31	import android.support.v4.app.Fragment;

		@@ -82,12 +85,12 @@
82	85	}
83	86
84	87	@Override
85		- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
	88	+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
86	89	{
87	90	Log.v(TAG, "ImageGridViewFragment::onCreateView()");
88	91	View view = inflater.inflate(R.layout.fragment_image_grid_view, container, false);
89	92
90		- gridView = (GridView)view.findViewById(R.id.gridView1);
	93	+ gridView = view.findViewById(R.id.gridView1);
91	94	gridView.setAdapter(new GridViewAdapter(inflater));
92	95	gridView.setOnItemClickListener(new GridViewOnItemClickListener());
93	96	gridView.setOnScrollListener(new GridViewOnScrollListener());

		@@ -96,16 +99,20 @@
96	99	}
97	100
98	101	@Override
99		- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
	102	+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
	103	+ {
100	104	inflater.inflate(R.menu.image_grid_view, menu);
101	105
102	106	String title = getString(R.string.app_name);
103	107	AppCompatActivity activity = (AppCompatActivity)getActivity();
104		- ActionBar bar = activity.getSupportActionBar();
105		- if (bar != null)
	108	+ if (activity != null)
106	109	{
107		- bar.setTitle(title);
108		- }
	110	+ ActionBar bar = activity.getSupportActionBar();
	111	+ if (bar != null)
	112	+ {
	113	+ bar.setTitle(title);
	114	+ }
	115	+ }
109	116	}
110	117
111	118	@Override

		@@ -148,11 +155,27 @@
148	155	super.onResume();
149	156	Log.v(TAG, "onResume() Start");
150	157	AppCompatActivity activity = (AppCompatActivity)getActivity();
151		- ActionBar bar = activity.getSupportActionBar();
152		- if (bar != null)
	158	+ if (activity != null)
153	159	{
154		- bar.hide(); // ActionBarの表示を消す
155		- // bar.show(); // ActionBarの表示を出す
	160	+ ActionBar bar = activity.getSupportActionBar();
	161	+ if (bar != null)
	162	+ {
	163	+ // アクションバーの表示をするかどうか
	164	+ boolean isShowActionBar = false;
	165	+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
	166	+ if (preferences != null)
	167	+ {
	168	+ isShowActionBar = preferences.getBoolean("use_playback_menu", false);
	169	+ }
	170	+ if (isShowActionBar)
	171	+ {
	172	+ bar.show(); // ActionBarの表示を出す
	173	+ }
	174	+ else
	175	+ {
	176	+ bar.hide(); // ActionBarの表示を消す
	177	+ }
	178	+ }
156	179	}
157	180	////////////////////////////////////////////////////////////////////////////////////
158	181	try

--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java (revision 423)

+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/ICameraPropertyAccessor.java (revision 424)

		@@ -78,6 +78,10 @@
78	78
79	79	String SHARE_AFTER_SAVE = "share_after_save";
80	80
	81	+ String USE_PLAYBACK_MENU = "use_playback_menu";
	82	+ String BLE_POWER_ON = "ble_power_on";
	83	+
	84	+
81	85	String USE_BRACKETING = "use_bracketing";
82	86
83	87	String BRACKETING_TYPE = "bracketing_type";

--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java (revision 423)

+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/preference/PreferenceFragment.java (revision 424)

		@@ -8,6 +8,7 @@
8	8	import android.database.Cursor;
9	9	import android.os.Bundle;
10	10	import android.provider.MediaStore;
	11	+import android.support.v7.app.AppCompatActivity;
11	12	import android.support.v7.preference.CheckBoxPreference;
12	13	import android.support.v7.preference.ListPreference;
13	14	import android.support.v7.preference.Preference;

		@@ -25,12 +26,12 @@
25	26
26	27	import jp.osdn.gokigen.aira01b.IAirA01BInterfacesProvider;
27	28	import jp.osdn.gokigen.aira01b.R;
28		-import jp.osdn.gokigen.aira01b.olycamerawrapper.CameraDateTimeSynchronizer;
29	29	import jp.osdn.gokigen.aira01b.olycamerawrapper.IOlyCameraProperty;
30	30	import jp.osdn.gokigen.aira01b.olycamerawrapper.CameraPowerOff;
31	31	import jp.osdn.gokigen.aira01b.olycamerawrapper.ICameraRunMode;
32	32	import jp.osdn.gokigen.aira01b.olycamerawrapper.ICameraHardwareStatus;
33	33	import jp.osdn.gokigen.aira01b.olycamerawrapper.IOlyCameraPropertyProvider;
	34	+import jp.osdn.gokigen.aira01b.olycamerawrapper.ble.OlyCameraPowerOnSelector;
34	35
35	36	/**
36	37	* SettingFragment

		@@ -43,12 +44,13 @@
43	44	private ICameraHardwareStatus hardwareStatusInterface = null;
44	45	private ICameraRunMode changeRunModeExecutor = null;
45	46	private CameraPowerOff powerOffController = null;
	47	+ private OlyCameraPowerOnSelector powerOnSelector = null;
46	48	private PreferenceScreenArbitrator screenArbitrator = null;
47	49	private SharedPreferences preferences = null;
48	50	private ProgressDialog busyDialog = null;
49	51	private PreferenceSynchronizer preferenceSynchronizer = null;
50	52
51		- public static PreferenceFragment newInstance(Context context, IAirA01BInterfacesProvider factory, ICameraRunMode runModeExecutor)
	53	+ public static PreferenceFragment newInstance(AppCompatActivity context, IAirA01BInterfacesProvider factory, ICameraRunMode runModeExecutor)
52	54	{
53	55	PreferenceFragment instance = new PreferenceFragment();
54	56

		@@ -68,7 +70,7 @@
68	70	*
69	71	*
70	72	*/
71		- private void setInterface(Context context, IAirA01BInterfacesProvider factory, ICameraRunMode runModeExecutor)
	73	+ private void setInterface(AppCompatActivity context, IAirA01BInterfacesProvider factory, ICameraRunMode runModeExecutor)
72	74	{
73	75	Log.v(TAG, "setInterface()");
74	76	this.propertyInterface = factory.getPropertyProvider();

		@@ -76,6 +78,8 @@
76	78	hardwareStatusInterface = this.propertyInterface.getHardwareStatus();
77	79	powerOffController = new CameraPowerOff(context, factory.getChangeSceneCoordinator());
78	80	powerOffController.prepare();
	81	+ powerOnSelector = new OlyCameraPowerOnSelector(context);
	82	+ powerOnSelector.prepare();
79	83	screenArbitrator = new PreferenceScreenArbitrator(factory.getChangeSceneCoordinator(), this);
80	84	screenArbitrator.prepare();
81	85	}

		@@ -245,7 +249,7 @@
245	249	findPreference("exit_application").setOnPreferenceClickListener(powerOffController);
246	250	findPreference("playback_camera").setOnPreferenceClickListener(screenArbitrator);
247	251	//findPreference("playback_phone").setOnPreferenceClickListener(screenArbitrator);
248		-
	252	+ findPreference("olympus_air_bt").setOnPreferenceClickListener(powerOnSelector);
249	253	findPreference("select_sample_image").setOnPreferenceClickListener(screenArbitrator);
250	254	findPreference("select_splash_image").setOnPreferenceClickListener(screenArbitrator);
251	255	findPreference("manipulate_image").setOnPreferenceClickListener(screenArbitrator);

		@@ -395,6 +399,16 @@
395	399	setBooleanPreference(key, key, value);
396	400	break;
397	401
	402	+ case ICameraPropertyAccessor.USE_PLAYBACK_MENU:
	403	+ value = preferences.getBoolean(key, false);
	404	+ setBooleanPreference(key, key, value);
	405	+ break;
	406	+
	407	+ case ICameraPropertyAccessor.BLE_POWER_ON:
	408	+ value = preferences.getBoolean(key, false);
	409	+ setBooleanPreference(key, key, value);
	410	+ break;
	411	+
398	412	case ICameraPropertyAccessor.USE_BRACKETING:
399	413	value = preferences.getBoolean(key, false);
400	414	setBooleanPreference(key, key, value);

		@@ -585,6 +599,8 @@
585	599	setBooleanPreference("capture_live_view", ICameraPropertyAccessor.CAPTURE_LIVE_VIEW, false);
586	600	setBooleanPreference("share_live_view_image", ICameraPropertyAccessor.SHARE_LIVE_VIEW_IMAGE, false);
587	601	setBooleanPreference("share_after_save", ICameraPropertyAccessor.SHARE_AFTER_SAVE, false);
	602	+ setBooleanPreference("use_playback_menu", ICameraPropertyAccessor.USE_PLAYBACK_MENU, false);
	603	+ setBooleanPreference("ble_power_on", ICameraPropertyAccessor.BLE_POWER_ON, false);
588	604	setBooleanPreference("use_bracketing", ICameraPropertyAccessor.USE_BRACKETING, false);
589	605
590	606	// カメラキットのバージョン

--- android/AirA01b/trunk/app/src/main/res/menu/image_grid_view.xml (revision 423)

+++ android/AirA01b/trunk/app/src/main/res/menu/image_grid_view.xml (revision 424)

		@@ -1,7 +1,6 @@
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<menu xmlns:android="http://schemas.android.com/apk/res/android"
3	3	xmlns:compat="http://schemas.android.com/apk/res-auto" >
4		-
5	4
6	5	<item
7	6	android:id="@+id/action_refresh"

		@@ -8,7 +7,7 @@
8	7	compat:showAsAction="ifRoom"
9	8	android:icon="@drawable/ic_menu_refresh"
10	9	android:title="@string/action_refreash"
11		- android:visible="true" />
	10	+ android:visible="false" />
12	11
13	12	<item
14	13	android:id="@+id/action_datetime_synchronize"

--- android/AirA01b/trunk/app/src/main/res/values/strings.xml (revision 423)

+++ android/AirA01b/trunk/app/src/main/res/values/strings.xml (revision 424)

		@@ -105,7 +105,7 @@
105	105	<string name="pref_call_share_after_save">Share after Save</string>
106	106	<string name="pref_manipulate_image">Manipulate Image</string>
107	107	<string name="pref_opencv_version">OpenCV Version</string>
108		- <string name="pref_cat_gokigen">GOKIGEN(Currently not open directly)</string>
	108	+ <string name="pref_cat_gokigen">GOKIGEN Project</string>
109	109	<string name="pref_instruction_manual">AirA01b Instructions</string>
110	110	<string name="pref_privacy_policy">Privacy Policy</string>
111	111

		@@ -223,6 +223,9 @@
223	223	<string name="ble_setting_is_off">Bluetooth is currently off.</string>
224	224	<string name="launch_fail_via_ble"> Launch fail. via BLE : </string>
225	225
	226	+ <string name="pref_cat_initialize">App. Startup</string>
	227	+ <string name="pref_bluetooth_power_on">Bluetooth Power On</string>
	228	+ <string name="pref_summary_bluetooth_power_on">Camera Power on via Bluetooth</string>
226	229
227	230	<string name="hint_save_bt_name">Name</string>
228	231	<string name="hint_save_bt_passcode">Passcode</string>

		@@ -229,5 +232,8 @@
229	232	<string name="pref_air_bt">Olympus Air Settings</string>
230	233	<string name="pref_summary_air_bt">Entry your Olympus Air</string>
231	234	<string name="saved_my_camera">Registerd : </string>
	235	+
	236	+ <string name="pref_use_playback_menu">Use playback screen menu</string>
	237	+
232	238	</resources>
233	239

--- android/AirA01b/trunk/app/src/main/res/values-ja/strings.xml (revision 423)

+++ android/AirA01b/trunk/app/src/main/res/values-ja/strings.xml (revision 424)

		@@ -105,7 +105,7 @@
105	105	<string name="pref_call_share_after_save">画像保存後に共有呼出</string>
106	106	<string name="pref_manipulate_image">画像の加工</string>
107	107	<string name="pref_opencv_version">OpenCV Version</string>
108		- <string name="pref_cat_gokigen">GOKIGEN Project(現在、直接開けません)</string>
	108	+ <string name="pref_cat_gokigen">GOKIGEN Project</string>
109	109	<string name="pref_instruction_manual">AirA01b 操作説明</string>
110	110	<string name="pref_privacy_policy">プライバシーポリシー</string>
111	111

		@@ -218,13 +218,19 @@
218	218	<string name="taking_picture">撮影中</string>
219	219	<string name="notify_sequential">OK!</string>
220	220
221		-
222	221	<string name="ble_setting_is_off">BluetoothがOFFです</string>
223	222	<string name="launch_fail_via_ble">Bluetooth経由のカメラ起動に失敗 : </string>
224	223
	224	+ <string name="pref_cat_initialize">起動時設定</string>
	225	+ <string name="pref_bluetooth_power_on">BluetoothでカメラON</string>
	226	+ <string name="pref_summary_bluetooth_power_on">起動時BluetoothでカメラをONにします。</string>
	227	+
225	228	<string name="hint_save_bt_name">名前</string>
226	229	<string name="hint_save_bt_passcode">パスコード</string>
227		- <string name="pref_air_bt">OLYMPUS AIR設定</string>
228		- <string name="pref_summary_air_bt">Olympus AIRの設定を登録します。</string>
	230	+ <string name="pref_air_bt">カメラBluetooth設定</string>
	231	+ <string name="pref_summary_air_bt">Olympus AIRのBluetooth設定を登録します。</string>
229	232	<string name="saved_my_camera">登録しました : </string>
	233	+
	234	+ <string name="pref_use_playback_menu">画像一覧でメニューを表示</string>
	235	+
230	236	</resources>

--- android/AirA01b/trunk/app/src/main/res/xml/preferences.xml (revision 423)

+++ android/AirA01b/trunk/app/src/main/res/xml/preferences.xml (revision 424)

		@@ -225,8 +225,21 @@
225	225	android:defaultValue="0"/>
226	226
227	227	</PreferenceCategory>
	228	+ <PreferenceCategory
	229	+ android:title="@string/pref_cat_initialize">
228	230
	231	+ <CheckBoxPreference
	232	+ android:key="ble_power_on"
	233	+ android:title="@string/pref_bluetooth_power_on"
	234	+ android:summary="@string/pref_summary_bluetooth_power_on" />
229	235
	236	+ <PreferenceScreen
	237	+ android:key="olympus_air_bt"
	238	+ android:title="@string/pref_air_bt"
	239	+ android:summary="@string/pref_summary_air_bt" />
	240	+
	241	+ </PreferenceCategory>
	242	+
230	243	<PreferenceCategory
231	244	android:title="@string/pref_cat_others">
232	245

		@@ -242,6 +255,10 @@
242	255	android:key="select_splash_image"
243	256	android:title="@string/pref_select_splash_image" />
244	257
	258	+ <CheckBoxPreference
	259	+ android:key="use_playback_menu"
	260	+ android:title="@string/pref_use_playback_menu"
	261	+ />
245	262	</PreferenceCategory>
246	263
247	264	<PreferenceCategory

旧リポジトリブラウザで表示

GOKIGEN ForkLegacyGpsAdapterA01cBondImageA01dGokigenClockGokigenAlignmentCheckerJoggingTimerPKRemoteGokigenDiaryTestSampleAppTheWarikanMeMoMaGr2ControlFujiCamGokigenCameraControlLibraryBLEControlmangleThetaThoughtShutterThetaViewmCalendarA01fprpr1TransportHub

gokigen: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

GOKIGEN
Fork
LegacyGpsAdapter
A01c
BondImage
A01d
GokigenClock
GokigenAlignmentChecker
JoggingTimer
PKRemote
GokigenDiary
TestSampleApp
TheWarikan
MeMoMa
Gr2Control
FujiCam
GokigenCameraControlLibrary
BLEControl
mangle
ThetaThoughtShutter
ThetaView
mCalendar
A01f
prpr1
TransportHub