Skip to content

A
abook_check
Commit dd7a2c6b by Jung Kwangkyu
Options

Merge branch 'features/1.4.100_develop_mk' into 'features/1.4.202' 

工程管理不具合修正

See merge request !245
parents 257f293c 5d28fbd0
Showing with 25 additions and 11 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationDataJSON.java
...@@ -68,8 +68,9 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -68,8 +68,9 @@ public class OperationDataJSON extends AcmsCommonJSON {
if (taskJson.has(TaskStatus)) { if (taskJson.has(TaskStatus)) {
dto.taskStatus = taskJson.getInt(TaskStatus); dto.taskStatus = taskJson.getInt(TaskStatus);
} }
dto.taskHotSpotInfo = taskJson.getJSONObject(TaskHotspotInfo).toString(); if (taskJson.has(TaskHotspotInfo)) {
dto.taskHotSpotInfo = taskJson.getJSONObject(TaskHotspotInfo).toString();
}
if (taskJson.has(TaskStatus)) { if (taskJson.has(TaskStatus)) {
dto.taskStatus = taskJson.getInt(TaskStatus); dto.taskStatus = taskJson.getInt(TaskStatus);
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
...@@ -1025,6 +1025,8 @@ public class OperationLogic extends AbstractLogic { ...@@ -1025,6 +1025,8 @@ public class OperationLogic extends AbstractLogic {
try { try {
OperationDto operationDto = mOperationDao.getOperation(operationId); OperationDto operationDto = mOperationDao.getOperation(operationId);
if (operationDto.reportType == Constant.ReportType.ReportContinuous) { if (operationDto.reportType == Constant.ReportType.ReportContinuous) {
contentPath = contentPath.replaceAll("panoImage","processList");
contentPath = contentPath.replaceAll("taskPdf","processList");
createContinuousTaskReportJson(operationId); createContinuousTaskReportJson(operationId);
createContinuousTaskReportSuggestJson(operationId); createContinuousTaskReportSuggestJson(operationId);
createProcessInfoJson(operationId, contentPath); createProcessInfoJson(operationId, contentPath);
...@@ -1160,6 +1162,7 @@ public class OperationLogic extends AbstractLogic { ...@@ -1160,6 +1162,7 @@ public class OperationLogic extends AbstractLogic {
OperationDto operation = mOperationDao.getOperation(operationId); OperationDto operation = mOperationDao.getOperation(operationId);
if (operation.reportType == Constant.ReportType.ReportContinuous) { if (operation.reportType == Constant.ReportType.ReportContinuous) {
contentPath = contentPath.replaceAll("panoImage","processList"); contentPath = contentPath.replaceAll("panoImage","processList");
contentPath = contentPath.replaceAll("taskPdf","processList");
} }
for (TaskDto dto : taskDtoList) { for (TaskDto dto : taskDtoList) {
if (!StringUtil.isNullOrEmpty(dto.taskHotSpotInfo)) { if (!StringUtil.isNullOrEmpty(dto.taskHotSpotInfo)) {
...@@ -1221,6 +1224,7 @@ public class OperationLogic extends AbstractLogic { ...@@ -1221,6 +1224,7 @@ public class OperationLogic extends AbstractLogic {
OperationDto operation = mOperationDao.getOperation(operationId); OperationDto operation = mOperationDao.getOperation(operationId);
if (operation.operationType == PANO || operation.operationType == DRAWING) { if (operation.operationType == PANO || operation.operationType == DRAWING) {
contentPath = contentPath.replaceAll("panoImage","processList"); contentPath = contentPath.replaceAll("panoImage","processList");
contentPath = contentPath.replaceAll("taskPdf","processList");
} }
FileUtil.createFile(contentPath + "/phaseStatus.json", phaseStatusJson.toString()); FileUtil.createFile(contentPath + "/phaseStatus.json", phaseStatusJson.toString());
} }
...@@ -1247,6 +1251,7 @@ public class OperationLogic extends AbstractLogic { ...@@ -1247,6 +1251,7 @@ public class OperationLogic extends AbstractLogic {
OperationDto operation = mOperationDao.getOperation(operationId); OperationDto operation = mOperationDao.getOperation(operationId);
if (operation.operationType == PANO || operation.operationType == DRAWING) { if (operation.operationType == PANO || operation.operationType == DRAWING) {
contentPath = contentPath.replaceAll("panoImage","processList"); contentPath = contentPath.replaceAll("panoImage","processList");
contentPath = contentPath.replaceAll("taskPdf","processList");
} }
Logger.d(TAG, "createProcessInfoJson : " + processInfoJson.toString()); Logger.d(TAG, "createProcessInfoJson : " + processInfoJson.toString());
FileUtil.createFile(contentPath + "/processInfo.json", processInfoJson.toString()); FileUtil.createFile(contentPath + "/processInfo.json", processInfoJson.toString());
......
check @ 4313eb50
Subproject commit 535f7af15eef6ec47c49b3fe79665e53e6113ead Subproject commit 4313eb5084533edc7b622189bb928a4724c5bf29
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -1902,7 +1902,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1902,7 +1902,7 @@ public class OperationListActivity extends ABVUIActivity {
public void run() { public void run() {
try { try {
createJsonForOperationList(getCacheDir().getAbsolutePath()); createJsonForOperationList(getCacheDir().getAbsolutePath());
mCheckWebView.loadUrl("javascript:CHK.initReportApp();"); mCheckWebView.loadUrl("javascript:CHK.initOperationList();");
} catch (Exception e) { } catch (Exception e) {
Logger.d("Update error"); Logger.d("Update error");
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
...@@ -5210,8 +5210,14 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5210,8 +5210,14 @@ public class ContentViewActivity extends ABVContentViewActivity {
private void getTaskHotspotJSON() { private void getTaskHotspotJSON() {
try { try {
String contentPath = ABVEnvironment.getInstance().getTaskPdfDirName(ContentFileExtractor.getInstance().getContentCacheDirWithExtract(operationDto.contentId)); String contentPath = ABVEnvironment.getInstance().getTaskPdfDirName(ContentFileExtractor.getInstance().getContentCacheDirWithExtract(operationDto.contentId));
String hotspots = FileUtil.readTextFile(contentPath + "/" + ABookKeys.TASK_HOTSPOT + ".json"); if (operationDto.reportType == Constant.ReportType.ReportContinuous) {
mTaskHotspotJSON = new TaskHotspotJSON(hotspots); contentPath = contentPath.replaceAll("panoImage","processList");
contentPath = contentPath.replaceAll("taskPdf","processList");
}
String hotspots = FileUtil.readTextFile(contentPath + "/" + ABookKeys.TASK_HOTSPOT + ".json");
if (hotspots != null) {
mTaskHotspotJSON = new TaskHotspotJSON(hotspots);
}
} catch (IOException e) { } catch (IOException e) {
Logger.e(TAG, "read taskHotspot.json failed.", e); Logger.e(TAG, "read taskHotspot.json failed.", e);
initError(); initError();
...@@ -5388,10 +5394,11 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5388,10 +5394,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
case ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT: // 一時保存 case ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT: // 一時保存
if (taskReportLevel == Constant.TaskReportLevel.ReportType) { if (taskReportLevel == Constant.TaskReportLevel.ReportType) {
JSONObject hotspot = new JSONObject(checkParam.get(ABookKeys.HOT_SPOT)); JSONObject hotspot = null;
if (checkParam.get(ABookKeys.HOT_SPOT) != null) {
taskCode = hotspot.getString(ABookKeys.TASK_CODE); hotspot = new JSONObject(checkParam.get(ABookKeys.HOT_SPOT));
taskCode = hotspot.getString(ABookKeys.TASK_CODE);
}
operationTaskLayout.setIconStatus(taskKey, true); operationTaskLayout.setIconStatus(taskKey, true);
operationTaskLayout.currentTaskDto.taskKey = taskKey; operationTaskLayout.currentTaskDto.taskKey = taskKey;
operationTaskLayout.currentTaskDto.taskCode = taskCode; operationTaskLayout.currentTaskDto.taskCode = taskCode;
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java
...@@ -51,6 +51,7 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -51,6 +51,7 @@ public class OperationTaskLayout extends RelativeLayout {
private static final String TEMP_TASK_KEY = "00000000-0000-0000-0000-000000000000"; private static final String TEMP_TASK_KEY = "00000000-0000-0000-0000-000000000000";
private static final String SCRIPT_SHOW_TASK_LIST = "javascript:CHK_P.updateTaskListForApp(%d)";//CHK.updateTaskListForApp(pageNum) private static final String SCRIPT_SHOW_TASK_LIST = "javascript:CHK_P.updateTaskListForApp(%d)";//CHK.updateTaskListForApp(pageNum)
private static final String SCRIPT_SHOW_TASK_REPORT = "javascript:CHK.showReportForm('%s')";//CHK.showTaskReportForm(name, taskKey, lookto) private static final String SCRIPT_SHOW_TASK_REPORT = "javascript:CHK.showReportForm('%s')";//CHK.showTaskReportForm(name, taskKey, lookto)
private static final String SCRIPT_BEFORE_SHOW_TASK_REPORT = "javascript:CHK.beforeShowReportForm('%s')";//CHK.beforeShowReportForm(name, taskKey, lookto)
private static final int ICON_WIDTH = 32; private static final int ICON_WIDTH = 32;
private static final int ICON_HEIGHT = 32; private static final int ICON_HEIGHT = 32;
...@@ -335,7 +336,7 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -335,7 +336,7 @@ public class OperationTaskLayout extends RelativeLayout {
final String script; final String script;
script = String.format(SCRIPT_SHOW_TASK_REPORT, operationTaskDto.taskKey.equals(TEMP_TASK_KEY) ? "" : operationTaskDto.taskKey); script = String.format(SCRIPT_BEFORE_SHOW_TASK_REPORT, operationTaskDto.taskKey.equals(TEMP_TASK_KEY) ? "" : operationTaskDto.taskKey);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
......
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