Commit b25b1fd9 by Kazuyuki Hida

足りていなかった情報を追加した

parent 7a5fdf31
...@@ -90,8 +90,10 @@ import jp.agentec.adf.util.FileUtil; ...@@ -90,8 +90,10 @@ import jp.agentec.adf.util.FileUtil;
import jp.agentec.adf.util.StringUtil; import jp.agentec.adf.util.StringUtil;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.Message; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.Message;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskKey; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskKey;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId;
public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
...@@ -990,7 +992,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -990,7 +992,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
try { try {
logic.createJsonForOperationContent(operationDto.operationId, mContentPath, operationDto.reportType == Constant.ReportType.RoutineTask); logic.createJsonForOperationContent(operationDto.operationId, mContentPath, operationDto.reportType == Constant.ReportType.RoutineTask);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); Logger.e(TAG, e.getLocalizedMessage());
} }
// コールバック // コールバック
ReportStatusLogic.TaskReportExtParam extParam = ReportStatusLogic.TaskReportExtParam.pick(); ReportStatusLogic.TaskReportExtParam extParam = ReportStatusLogic.TaskReportExtParam.pick();
...@@ -1121,8 +1123,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1121,8 +1123,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
// アンロック // アンロック
UnlockReportLogic.Result r = UnlockReportLogic.newInstance().unlock(taskKey, taskReportId, startDate); UnlockReportLogic.Result r = UnlockReportLogic.newInstance().unlock(taskKey, taskReportId, startDate);
// JSコールバック // JSコールバック
// アンロックの失敗は無視 JSONObject extParam = new JSONObject();
afterABookCheckApi(mCmd, mTaskKey, 0, "", "{'reportStatus':0}"); extParam.put(ReportStatus, 0);
extParam.put(TaskReportId, taskReportId);
extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(startDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
afterABookCheckApi(mCmd, mTaskKey, 0, "", extParam.toString());
} }
} }
......
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