Skip to content
This repository was archived by the owner on Sep 25, 2019. It is now read-only.

Commit 53a21a5

Browse files
tikeda1110tikeda1110
committed
Moved from RICOH_THETA_v2_SDK_for_Android.0.1.1.zip
1 parent 343db5c commit 53a21a5

File tree

8 files changed

+59
-42
lines changed

8 files changed

+59
-42
lines changed

‎README.txt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
==================================================
22
README for "RICOH THETA v2 SDK for Android"
33

4-
Version :0.1.0
4+
Version :0.1.1
55
==================================================
66

77
This file is an explanation document for RICOH THETA v2 SDK for Android.
@@ -44,31 +44,32 @@ This file is an explanation document for RICOH THETA v2 SDK for Android.
4444
* Required environment for development
4545

4646
[About RICOH THETA S]
47-
Dedicated sample applications for the RICOH THETA S that meet the following conditions.
47+
Dedicated sample applications for the RICOH THETA S or above that meet the following conditions.
4848

4949
* Hardware
50-
RICOH THETA S
50+
RICOH THETA S or above
5151
* Firmware
52-
Version 1.11 or higher
52+
* RICOH THETA S: Version 1.11 or above
53+
* RICOH THETA SC: All versions
5354
(Method for checking and updating the firmware: https://theta360.com/en/support/manual/s/content/pc/pc_09.html)
5455

5556

5657
[About the Development Environment for Sample Application]
5758
Operation of the sample application has been verified under the following conditions.
5859

5960
* Verified operating environment
60-
Nexus 5
61+
Nexus 5X
6162
* Development/Build Environment
62-
Android Studio 1.4
63-
Android SDK (API Level 21)
63+
Android Studio 2.2.3
64+
Android SDK (API Level 24)
6465

6566
----------------------------------------
6667

6768
* How to Use
6869

6970
[Operating the Sample Application]
7071
1. Import ricoh-theta-sample-for-androidv2 as a project into Android Studio, and build it in the Android device.
71-
2. Connect the RICOH THETA S to the Android device using Wi-Fi.
72+
2. Connect the RICOH THETA S or above to the Android device using Wi-Fi.
7273
(Usage instructions, connecting the camera to a smartphone: https://theta360.com/en/support/manual/s/content/prepare/prepare_06.html)
7374
3. Viewer section within the sample program is created using OpenGL ES2.0.
7475
Use a device that is compatible with the operation.
@@ -111,3 +112,4 @@ This file is an explanation document for RICOH THETA v2 SDK for Android.
111112
* Update History
112113

113114
12/22/2015 0.1.0 Initial release
115+
02/07/2017 0.1.1 Bug fix

‎README_ja.txt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
==================================================
22
README for "RICOH THETA v2 SDK for Android"
33

4-
Version :0.1.0
4+
Version :0.1.1
55
==================================================
66

77
このファイルはRICOH THETA v2 SDK for Androidに関する説明文書です。
@@ -44,31 +44,32 @@
4444
* 開発に必要な環境に関して
4545

4646
[ RICOH THETA Sについて ]
47-
以下の条件を満たすRICOH THETA S専用のサンプルアプリケーションです。
47+
以下の条件を満たすRICOH THETA S以降の機種専用のサンプルアプリケーションです。
4848

4949
* ハードウェア
50-
RICOH THETA S
50+
RICOH THETA S以降の機種
5151
* ファームウェア
52-
バージョン 1.11 以上
52+
* RICOH THETA S: バージョン 1.11 以上
53+
* RICOH THETA SC: すべてのバージョン
5354
(ファームウェアの確認およびアップデート方法はこちらです： https://theta360.com/ja/support/manual/s/content/pc/pc_09.html )
5455

5556

5657
[ サンプルアプリケーションの開発環境について ]
5758
サンプルアプリケーションは以下の条件で動作確認済みです。
5859

5960
* 動作確認環境
60-
Nexus 5
61+
Nexus 5X
6162
* 開発・ビルド環境
62-
Android Studio 1.4
63-
Android SDK (API Level 21)
63+
Android Studio 2.2.3
64+
Android SDK (API Level 24)
6465

6566
----------------------------------------
6667

6768
* 使い方に関して
6869

6970
[ サンプルアプリケーションを動かす場合 ]
7071
1. ricoh-theta-sample-for-androidv2をプロジェクトとしてAndroid Studioにインポートし、Android端末にビルドしてください。
71-
2. RICOH THETA SをAndroid端末とWi-Fiで接続してください。
72+
2. RICOH THETA S以降の機種をAndroid端末とWi-Fiで接続してください。
7273
(使用説明書、カメラとスマートフォンを接続する：https://theta360.com/ja/support/manual/s/content/prepare/prepare_06.html)
7374
3. サンプルプログラムの内、 ビューア部はOpenGL ES2.0を使用して作成しています。
7475
動作に際して対応した実機を使用してください。
@@ -111,3 +112,4 @@
111112
* 更新履歴
112113

113114
2015/12/22 0.1.0 初回リリース
115+
2017/02/07 0.1.1 バグ修正

‎ricoh-theta-sample-for-androidv2/app/app.iml‎

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,65 +25,88 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3532
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3633
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3734
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3836
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4341
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4948
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5049
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5150
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5251
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5563
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5664
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5765
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5866
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5967
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6077
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6178
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6279
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6380
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6481
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6582
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6683
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7489
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7997
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
8399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
84101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
85103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
86105
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
87106
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
88107
</content>
89108
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
90109
<orderEntry type="sourceFolder" forTests="false" />
110+
<orderEntry type="library" exported="" name="android-android-21" level="project" />
91111
</component>
92112
</module>

‎ricoh-theta-sample-for-androidv2/app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
7-
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
87

98
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
109

‎ricoh-theta-sample-for-androidv2/app/src/main/java/com/theta360/sample/v2/ImageListActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ public void onLost(Network network) {
732732
}
733733
};
734734

735-
cm.requestNetwork(requestedNetwork, callback);
735+
cm.registerNetworkCallback(requestedNetwork, callback);
736736
}
737737
} else {
738738
mConnectionSwitchEnabled = true;

‎ricoh-theta-sample-for-androidv2/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:1.2.3'
7+
classpath 'com.android.tools.build:gradle:2.2.3'
88
}
99
}
1010

‎ricoh-theta-sample-for-androidv2/gradle/wrapper/gradle-wrapper.jar‎

-48.7 KB
Binary file not shown.

‎ricoh-theta-sample-for-androidv2/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)