Skip to content

Commit 0def862

Browse files
committed
Merge branch 'feature_live_streaming' of https://github.com/TakayukiHoshi1984/DeviceConnect-Android into feature_live_streaming
2 parents bc06ffb + 634f068 commit 0def862

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/fragment/BaseConfirmationFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public void onReceive(Context context, Intent intent) {
312312

313313
@Override
314314
public void onConnected(final ThetaDevice device) {
315-
mLogger.info("onConnected: device = " + device.getName());
315+
// mLogger.info("onConnected: device = " + device.getName());
316316

317317
if (mDialog != null) {
318318
mDialog.dismiss();

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/res/values-ja/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<string name="theta_error_limit_shooting_time">撮影可能時間に達したため、動画の撮影を終了しました。</string>
7777
<string name="theta_error_shooting">撮影に失敗しました。</string>
7878
<string name="theta_error_record_start">動画撮影開始に失敗しました。</string>
79-
<string name="theta_error_record_stop">動画撮影停止に失敗しました。</string>
79+
<string name="theta_error_record_stop">すでに停止しています。</string>
8080
<string name="theta_error_change_mode">切り替えに失敗しました。</string>
8181
<string name="theta_error_get_mode">切り替えに失敗しました。</string>
8282
<string name="theta_error_usb_live_streaming">ライブストリーミング中は撮影できません。</string>

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<string name="theta_error_limit_shooting_time">Ended shooting the movie because the enable shooting time has been reached.</string>
7777
<string name="theta_error_shooting">Failed to shoot.</string>
7878
<string name="theta_error_record_start">Failed to start to shoot a movie.</string>
79-
<string name="theta_error_record_stop">Failed to stop to shoot a movie.</string>
79+
<string name="theta_error_record_stop">Video recording has stopped already.</string>
8080
<string name="theta_error_change_mode">Failed to change the mode.</string>
8181
<string name="theta_error_get_mode">Failed to change the mode.</string>
8282
<string name="theta_error_usb_live_streaming">Cannot shoot during live streaming.</string>

0 commit comments

Comments
 (0)