ベースシーンと通常のシーン登録失敗時、ベースシーン登録完了しても登録してエラー発生問題対応

ベースシーンを重複して登録時のエラーメッセージ表示

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/DeviceImageListActivity.java

@@ -479,7 +479,7 @@ public class DeviceImageListActivity extends ABVUIActivity {
                 });
                 });
             }
             }
         });
         });
-        mSceneSendHelper.sendSceneImages(sendImages, mOperationId, mOperationName, mIsBaseSceneUpload);
+        mSceneSendHelper.sendSceneImages(sendImages, mOperationId, mOperationName, mIsBaseSceneUpload, mIsBaseSceneUploadSuccess);
     }
     }
 
 
     /**
     /**

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/helper/SceneSendHelper.java

@@ -43,8 +43,9 @@ public class SceneSendHelper {
      * @param operationId 作業ID
      * @param operationId 作業ID
      * @param OperationName 作業名
      * @param OperationName 作業名
      * @param isBaseSceneUpload ベースシーン登録フラグ（true:登録、false:登録しない）
      * @param isBaseSceneUpload ベースシーン登録フラグ（true:登録、false:登録しない）
+     * @param isBaseSceneUploadSuccess ベースシーン登録済みフラグ（true:登録済み、false:未登録）
      */
      */
-    public void sendSceneImages(final List<String> sendImages, final Long operationId, final String OperationName, final boolean isBaseSceneUpload) {
+    public void sendSceneImages(final List<String> sendImages, final Long operationId, final String OperationName, final boolean isBaseSceneUpload, final boolean isBaseSceneUploadSuccess) {
         CommonExecutor.execute(new Runnable() {
         CommonExecutor.execute(new Runnable() {
             @Override
             @Override
             public void run() {
             public void run() {
@@ -53,7 +54,7 @@ public class SceneSendHelper {
                 for(String filePath : sendImages){
                 for(String filePath : sendImages){
                     File file = new File(filePath);
                     File file = new File(filePath);
                     try {
                     try {
-                        if (isBaseSceneUpload && firstFilePath.equals(filePath)) {
+                        if (isBaseSceneUpload && !isBaseSceneUploadSuccess && firstFilePath.equals(filePath)) {
                             AbstractLogic.getLogic(OperationLogic.class).sendPanoContent(operationId, OperationName, file);
                             AbstractLogic.getLogic(OperationLogic.class).sendPanoContent(operationId, OperationName, file);
                         } else {
                         } else {
                             AbstractLogic.getLogic(OperationLogic.class).sendScene(file);
                             AbstractLogic.getLogic(OperationLogic.class).sendScene(file);
@@ -72,6 +73,8 @@ public class SceneSendHelper {
                         Logger.e(TAG, ex.toString());
                         Logger.e(TAG, ex.toString());
                         if (ex.getCode() == ABVExceptionCode.P_E_ACMS_P007) {
                         if (ex.getCode() == ABVExceptionCode.P_E_ACMS_P007) {
                             listener.sceneSendFail(mContext.getString(R.string.error_msg_open_pano_edit));
                             listener.sceneSendFail(mContext.getString(R.string.error_msg_open_pano_edit));
+                        } else if (ex.getCode() == ABVExceptionCode.P_E_ACMS_P002) {
+                            listener.sceneSendFail(mContext.getString(R.string.P002));
                         } else {
                         } else {
                             listener.sceneSendFailRetry(needSendImages);
                             listener.sceneSendFailRetry(needSendImages);
                         }
                         }