Commit 30444f63 by Kim Jinsung

THETA接続エラー発生し、インジケーター非表示する問題対応

parent c537891a
...@@ -198,7 +198,6 @@ public class ThetaCameraActivity extends ThetaActivity { ...@@ -198,7 +198,6 @@ public class ThetaCameraActivity extends ThetaActivity {
* @param fileId ファイルID * @param fileId ファイルID
*/ */
public void shootTaskFinish(final String fileId) { public void shootTaskFinish(final String fileId) {
closeProgressPopup();
handler.post(new Runnable() { handler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
...@@ -206,6 +205,7 @@ public class ThetaCameraActivity extends ThetaActivity { ...@@ -206,6 +205,7 @@ public class ThetaCameraActivity extends ThetaActivity {
if (fileId.equals(ABookValues.FAIL)) { if (fileId.equals(ABookValues.FAIL)) {
thetaConnectError(R.string.msg_theta_shoot_fail); thetaConnectError(R.string.msg_theta_shoot_fail);
} else { } else {
closeProgressPopup();
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(ABookKeys.THETA_FILE_ID, fileId); intent.putExtra(ABookKeys.THETA_FILE_ID, fileId);
intent.setClassName(getPackageName(), ThetaImagePreviewActivity.class.getName()); intent.setClassName(getPackageName(), ThetaImagePreviewActivity.class.getName());
...@@ -220,7 +220,7 @@ public class ThetaCameraActivity extends ThetaActivity { ...@@ -220,7 +220,7 @@ public class ThetaCameraActivity extends ThetaActivity {
* @param mJpegInputStream Live画像データ * @param mJpegInputStream Live画像データ
*/ */
public void showLiveViewTaskFinish(MJpegInputStream mJpegInputStream) { public void showLiveViewTaskFinish(MJpegInputStream mJpegInputStream) {
closeProgressPopup();
if (mJpegInputStream != null) { if (mJpegInputStream != null) {
mLiveView.setSource(mJpegInputStream); mLiveView.setSource(mJpegInputStream);
new GetOptionExposureTask(ThetaCameraActivity.this).execute(); new GetOptionExposureTask(ThetaCameraActivity.this).execute();
...@@ -248,6 +248,7 @@ public class ThetaCameraActivity extends ThetaActivity { ...@@ -248,6 +248,7 @@ public class ThetaCameraActivity extends ThetaActivity {
*/ */
public void getOptionExposureTaskFinish(String exposure) { public void getOptionExposureTaskFinish(String exposure) {
if (exposure != null) { if (exposure != null) {
closeProgressPopup();
int progress = mExposureValues.indexOf(exposure); int progress = mExposureValues.indexOf(exposure);
if (progress != 1) { if (progress != 1) {
mExposureSeekBar.setProgress(progress); mExposureSeekBar.setProgress(progress);
......
...@@ -184,10 +184,11 @@ public class ThetaImageListActivity extends ThetaActivity { ...@@ -184,10 +184,11 @@ public class ThetaImageListActivity extends ThetaActivity {
imageListArrayAdapter.notifyDataSetChanged(); imageListArrayAdapter.notifyDataSetChanged();
} }
}); });
closeProgressPopup();
} else { } else {
Logger.e(TAG,"failed to delete image"); Logger.e(TAG,"failed to delete image");
thetaConnectError(R.string.msg_theta_image_delete_fail); thetaConnectError(R.string.msg_theta_image_delete_fail);
} }
closeProgressPopup();
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment