図面工程管理不具合修正

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java

@@ -1160,6 +1160,7 @@ public class OperationLogic extends AbstractLogic {
         OperationDto operation = mOperationDao.getOperation(operationId);
         if (operation.reportType == Constant.ReportType.ReportContinuous) {
             contentPath = contentPath.replaceAll("panoImage","processList");
+            contentPath = contentPath.replaceAll("taskPdf","processList");
         }
         for (TaskDto dto : taskDtoList) {
             if (!StringUtil.isNullOrEmpty(dto.taskHotSpotInfo)) {
@@ -1221,6 +1222,7 @@ public class OperationLogic extends AbstractLogic {
         OperationDto operation = mOperationDao.getOperation(operationId);
         if (operation.operationType == PANO || operation.operationType == DRAWING) {
             contentPath = contentPath.replaceAll("panoImage","processList");
+            contentPath = contentPath.replaceAll("taskPdf","processList");
         }
         FileUtil.createFile(contentPath + "/phaseStatus.json", phaseStatusJson.toString());
     }
@@ -1247,6 +1249,7 @@ public class OperationLogic extends AbstractLogic {
         OperationDto operation = mOperationDao.getOperation(operationId);
         if (operation.operationType == PANO || operation.operationType == DRAWING) {
             contentPath = contentPath.replaceAll("panoImage","processList");
+            contentPath = contentPath.replaceAll("taskPdf","processList");
         }
         Logger.d(TAG, "createProcessInfoJson : " + processInfoJson.toString());
         FileUtil.createFile(contentPath + "/processInfo.json", processInfoJson.toString());

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -5210,8 +5210,14 @@ public class ContentViewActivity extends ABVContentViewActivity {
     private void getTaskHotspotJSON() {
         try {
             String contentPath = ABVEnvironment.getInstance().getTaskPdfDirName(ContentFileExtractor.getInstance().getContentCacheDirWithExtract(operationDto.contentId));
+			if (operationDto.reportType == Constant.ReportType.ReportContinuous) {
+				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) {
             Logger.e(TAG, "read taskHotspot.json failed.", e);
             initError();