Skip to content

A
abook_check
Commit 57aa57f2 by onuma
Options

帳票コンポーネント削除。ログレベルのデフォルトをInfoに変更

parent 4edb8e88
Showing with 23 additions and 39 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -115,7 +115,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -115,7 +115,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
protected boolean isOperationPdf = false; protected boolean isOperationPdf = false;
protected OperationDto operationDto = null; protected OperationDto operationDto = null;
protected String linkUrl; protected String linkUrl;
private String mReportFileName;
protected TextView operationNameTitle; protected TextView operationNameTitle;
protected Button operationHomeButton; protected Button operationHomeButton;
...@@ -1005,18 +1004,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1005,18 +1004,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME); mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME);
getAttachedDataUrl(abookCheckParam.get(ABookKeys.TASK_KEY)); getAttachedDataUrl(abookCheckParam.get(ABookKeys.TASK_KEY));
} else if (mCmd.equals(ABookKeys.CMD_SHOW_REPORT_OZD)) { } else if (mCmd.equals(ABookKeys.CMD_SHOW_REPORT_OZD)) {
mReportFileName = abookCheckParam.get(ABookKeys.REPORT_FILE_NAME); // 帳票コンポーネントを削除したので、ダイアログを表示するだけで何もしない
// 作業報告画面改善 showOzFileOpenErrorDialog();
boolean mLocalSave = false; // 一時保存情報
if (abookCheckParam.containsKey(ABookKeys.LOCAL_SAVE)) {
mLocalSave = Integer.parseInt(abookCheckParam.get(ABookKeys.LOCAL_SAVE)) > 0 ? true : false;
}
// 帳票コンポーネント削除
ActivityHandlingHelper.getInstance().showOzFileOpenErrorDialog();
} else if (mCmd.equals(ABookKeys.CMD_PREVIEW_REPORT_OZD)) { } else if (mCmd.equals(ABookKeys.CMD_PREVIEW_REPORT_OZD)) {
mReportFileName = abookCheckParam.get(ABookKeys.REPORT_FILE_NAME); // 帳票コンポーネントを削除したので、ダイアログを表示するだけで何もしない
// 帳票コンポーネント削除 showOzFileOpenErrorDialog();
ActivityHandlingHelper.getInstance().showOzFileOpenErrorDialog();
} else if (mCmd.equals(ABookKeys.CMD_CONTENT_EDIT_CLOSE)) { } else if (mCmd.equals(ABookKeys.CMD_CONTENT_EDIT_CLOSE)) {
showProgressPopup(); showProgressPopup();
handler.postDelayed(new Runnable() { handler.postDelayed(new Runnable() {
...@@ -1082,6 +1074,24 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1082,6 +1074,24 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} }
} }
/**
* 帳票コンポーネントが削除されたので、OZが使えなくなったので、エラーダイアログを表示する。
*/
private void showOzFileOpenErrorDialog() {
final ABookAlertDialog confirmDialog = AlertDialogUtil.createAlertDialog(ABVContentViewActivity.this, R.string.confirm);
confirmDialog.setCancelable(false);
confirmDialog.setMessage(R.string.msg_error_open_ozd_content);
confirmDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
mStatusCode = Constant.XWalkWebViewDisplayStatus.TaskListView;
commonConfigureHeader();
confirmDialog.dismiss();
}
});
confirmDialog.show();
}
public void commonAttachedDataUrl (String taskKey, String data) { public void commonAttachedDataUrl (String taskKey, String data) {
boolean isError = false; boolean isError = false;
if (data != null) { if (data != null) {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
...@@ -80,7 +80,6 @@ import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity; ...@@ -80,7 +80,6 @@ import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.PreviewActivity; import jp.agentec.abook.abv.ui.viewer.activity.PreviewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.VideoViewActivity; import jp.agentec.abook.abv.ui.viewer.activity.VideoViewActivity;
import jp.agentec.adf.net.http.HttpDownloadSimpleNotification; import jp.agentec.adf.net.http.HttpDownloadSimpleNotification;
import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil; import jp.agentec.adf.util.DateTimeUtil;
import jp.agentec.adf.util.FileUtil; import jp.agentec.adf.util.FileUtil;
import jp.agentec.adf.util.RuntimeUtil; import jp.agentec.adf.util.RuntimeUtil;
...@@ -119,8 +118,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -119,8 +118,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
// Chat // Chat
private ParentWebViewActivity previousOfSettingActivity2; private ParentWebViewActivity previousOfSettingActivity2;
private ABookAlertDialog ozFileOpenErrorDialog;
private ActivityHandlingHelper() { private ActivityHandlingHelper() {
} }
...@@ -1243,29 +1240,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -1243,29 +1240,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
} }
/** /**
* 帳票コンポーネント削除により、OZファイル
*/
public void showOzFileOpenErrorDialog() {
if (ozFileOpenErrorDialog != null && ozFileOpenErrorDialog.isShowing()) {
ozFileOpenErrorDialog.dismiss();
}
ozFileOpenErrorDialog = AlertDialogUtil.createAlertDialog(getCurrentActivity(), R.string.confirm);
ozFileOpenErrorDialog.setCancelable(false);
ozFileOpenErrorDialog.setMessage(R.string.msg_error_open_ozd_content);
ozFileOpenErrorDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
ozFileOpenErrorDialog.dismiss();
ozFileOpenErrorDialog = null;
}
});
ozFileOpenErrorDialog.show();
}
/**
* 資料の更新ダイアログ生成処理 * 資料の更新ダイアログ生成処理
* @param contentId * @param contentId
*/ */
......
gradle.properties
...@@ -93,7 +93,7 @@ hope_page=http://www.sato.co.jp ...@@ -93,7 +93,7 @@ hope_page=http://www.sato.co.jp
contact_email=grp-atform_support@sato-global.com contact_email=grp-atform_support@sato-global.com
#Log Settings #Log Settings
log_level=0 log_level=2
default_log_name=abvje default_log_name=abvje
#エラーレポート/Exportログ送信方法 1:acms 2:平文メール（開発・テスト時のみ） 3:暗号化添付メール #エラーレポート/Exportログ送信方法 1:acms 2:平文メール（開発・テスト時のみ） 3:暗号化添付メール
error_report_flg=1 error_report_flg=1
......
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