Commit 62dd14c1 by Kim Jinsung

不要なログ削除

シーン登録失敗時にシーン画像選択画面非表示されない問題対応
parent c502b1a8
......@@ -85,18 +85,14 @@ public abstract class ImageWorker {
}
if (mImageCache != null) {
if (mImageCache.mCacheParams.memoryCacheEnabled) {
Logger.d(TAG, "mImageCache.mCacheParams.memoryCacheEnabled true");
BitmapDrawable value = mImageCache.getBitmapFromMemCache(String.valueOf(data));
if (value != null) {
Logger.d(TAG, "memoryCache get image success");
imageView.setImageDrawable(value);
return;
}
} else if (mImageCache.mCacheParams.diskCacheEnabled) {
Logger.d(TAG, "mImageCache.mCacheParams.diskCacheEnabled true");
Bitmap value = mImageCache.getBitmapFromDiskCache(String.valueOf(data));
if (value != null) {
Logger.d(TAG, "diskCache get image success");
imageView.setImageBitmap(value);
return;
}
......
......@@ -42,6 +42,24 @@ public class AlertDialogUtil {
alertDialog.setMessage(message);
return alertDialog;
}
/**
* 共通ダイアログ表示用(Cancel表示・非表示、OKボタンコールバック)
* @param context コンテキスト
* @param title タイトル 文字列
* @param message メッセージ 文字列
* @param isCancleButtonHidden Cancelボタン表示(false)・非表示(true)
* @param okOnClick OKボタンコールバック
*/
public static void showAlertDialog(Context context, String title, String message, boolean isCancleButtonHidden, DialogInterface.OnClickListener okOnClick) {
ABookAlertDialog alertDialog = createAlertDialog(context, title, message);
if (!isCancleButtonHidden) {
alertDialog.setNegativeButton(R.string.cancel, null);
}
alertDialog.setCancelable(false);
alertDialog.setPositiveButton(R.string.ok, okOnClick);
alertDialog.show();
}
/**
* 共通ダイアログ表示用(OKボタンコールバック、CANCELボタンコールバック)
......
......@@ -434,7 +434,17 @@ public class DeviceImageListActivity extends ABVUIActivity {
@Override
public void run() {
closeProgressPopup();
showSimpleAlertDialog(errorMessage);
if (mIsBaseSceneUpload) {
AlertDialogUtil.showAlertDialog(DeviceImageListActivity.this, getString(R.string.app_name), errorMessage, true, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) { //OKボタン
activityClose();
}
});
} else {
showSimpleAlertDialog(errorMessage);
}
}
});
}
......
......@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import jp.agentec.abook.abv.bl.common.CommonExecutor;
import jp.agentec.abook.abv.bl.common.exception.ABVException;
import jp.agentec.abook.abv.bl.common.exception.ABVExceptionCode;
import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import jp.agentec.abook.abv.bl.common.log.Logger;
......@@ -79,6 +80,11 @@ public class SceneSendHelper {
listener.sceneSendFailRetry(needSendImages);
}
break;
} catch (ABVException abve) {
Logger.e(TAG, abve.toString());
if (abve.getCode() == ABVExceptionCode.P_E_ACMS_P002) {
listener.sceneSendFail(mContext.getString(R.string.P002));
}
} catch (Exception e) {
Logger.e(TAG, e.toString());
listener.sceneSendFailRetry(needSendImages);
......
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