Kazuyuki Hida · @hida-k · Kazuyuki Hida · Yujin Seo · Kazuyuki Hida · Yujin Seo
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
+        int count;
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT count(*) FROM t_task_report");
+        sql.append("  WHERE task_status = 1 ");
+        if (reportStartDate == null) {
+            // 報告
+            sql.append("  AND task_key=?");
+            count = rawQueryGetInt(sql.toString(), new String[] { taskKey });
+        } else {
+            // 点検
+            sql.append("  AND task_report_id=?");
+            sql.append("  AND datetime(report_start_date)=datetime(?, 'utc')");
+            count = rawQueryGetInt(sql.toString(), new String[] { String.valueOf(taskReportId), reportStartDate });
+        }
+        return count > 0;
+    }
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
        if (!routineTaskFlg) {
            String jsonText = FileUtil.readTextFile(contentPath + "/" + ABookKeys.TASK_REPORT + ".json");
            JSONObject jsonObject = new JSONObject(jsonText);
-            JSONArray  taskReportJsonArray = jsonObject.getJSONArray(ABookKeys.KEY_TASK_REPORT_0);
+            JSONArray  taskReportJsonArray = jsonObject.has(ABookKeys.KEY_TASK_REPORT_0) ? jsonObject.getJSONArray(ABookKeys.KEY_TASK_REPORT_0) : new JSONArray();
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
                        }
                        throw ex;
                    } catch (Exception ex) {
-                        throw ex;
+                        Logger.e(TAG, ex);
+                        if (ex instanceof NetworkDisconnectedException) {
+                            // オフラインの場合、エラー扱いにしないで、設問の状況から、taskStatusを推測する
+                            taskReportDto.taskStatus = recoveryTaskStatus(taskReportDto.jsonData);
+                            taskReportDto.dataSendFlg = true;
+                            taskReportDto.attachedFileSendFlg = true;
+                            mTaskReportDao.update(taskReportDto);
+                            // CMSへの送信は打ち切り
+                            return;
+                        } else {
+                            throw ex;
+                        }
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+            String key = keys.next();
+            if (key.startsWith("q_3_")) {   // 状況入力欄
+                try {
+                    int taskStatus = Integer.parseInt(taskObject.getString(key));
+                    if (taskStatus != 0 && taskStatus != 999) {
+                        taskStatus = 1;
+                    }
+                    return taskStatus;
+                } catch (Throwable ignored) {
+                    return 0;
+                }
+            }
+        }
+        return 0;
+    }
+
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java

    public Result unlock(String taskKey, Long taskReportId, Date reportStartDate) {
        Result r = sendUnlockReport(taskKey, taskReportId, reportStartDate);
-        if (r.result == 0) {
+        if (r.result == 0 || r.extParam.reportStatus == 3) {
            updateLocalDB(taskKey, taskReportId, reportStartDate, r.extParam.getReportStatus());
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
 			// アンロック
 			UnlockReportLogic.Result r = UnlockReportLogic.newInstance().unlock(taskKey, taskReportId, startDate);
 			// JSコールバック
-			// アンロックの失敗は無視
-			afterABookCheckApi(mCmd, mTaskKey, 0, "", "{'reportStatus':0}");
+			JSONObject extParam = new JSONObject();
+			extParam.put(ReportStatus, 0);
+			extParam.put(TaskReportId, taskReportId);
+			extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(startDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
+			afterABookCheckApi(mCmd, mTaskKey, 0, "", extParam.toString());
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
            case ABookKeys.CMD_UPDATE_TASK_REPORT: {
                // もとから作業中だったかを調べる
                TaskReportDao taskReportDao = AbstractDao.getDao(TaskReportDao.class);
-                int rportId = Integer.parseInt(String.valueOf(param.getOrDefault(TaskReportId, "0")));
+                int reportId = Integer.parseInt(String.valueOf(param.getOrDefault(TaskReportId, "0")));
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
                insertOrUpdateTaskReport(taskKey, enableReportHistory, operationId, contentId, param, contentPath, reportType, taskReportLevel, false);
                copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
                sendTaskData(context, operationId, taskKey, taskReportLevel);
-                // 作業ステータスのカウントを変える
+                // 作業ステータスのカウントを変える todo:要リファクタリング(直すのはともかく動作確認する時間が惜しい)
                OperationDao operationDao = AbstractDao.getDao(OperationDao.class);
                if (isLocalSaved) {
                    operationDao.coutUpCompletedFromWorking(operationId);
                } else if (! isCompleted) {
-                    operationDao.countUpCompleted(operationId);
+                    boolean nowWorking = taskReportDao.isWorking(taskKey, reportId, startDate);
+                    if (!isWorking && nowWorking) {
+                        operationDao.countUpWorking(operationId);
+                    } else {
+                        operationDao.countUpCompleted(operationId);
+                    }