Commit be5be749 by Lee Munkyeong

submodule更新及び45375対応

parent 257f293c
Subproject commit 535f7af15eef6ec47c49b3fe79665e53e6113ead Subproject commit 4313eb5084533edc7b622189bb928a4724c5bf29
...@@ -399,13 +399,13 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -399,13 +399,13 @@ public class OperationTaskLayout extends RelativeLayout {
operationTaskDto.taskKey = taskDto.taskKey; operationTaskDto.taskKey = taskDto.taskKey;
operationTaskDto.taskCode = taskDto.taskCode; operationTaskDto.taskCode = taskDto.taskCode;
JSONObject hotSpot = new JSONObject(taskDto.taskHotSpotInfo); if (!StringUtil.isNullOrEmpty(taskDto.taskHotSpotInfo)) {
operationTaskDto.pdfX = hotSpot.getInt(ABookKeys.PDF_X); JSONObject hotSpot = new JSONObject(taskDto.taskHotSpotInfo);
operationTaskDto.pdfY = hotSpot.getInt(ABookKeys.PDF_Y); operationTaskDto.pdfX = hotSpot.getInt(ABookKeys.PDF_X);
operationTaskDto.pdfY = hotSpot.getInt(ABookKeys.PDF_Y);
}
currentTaskDto = operationTaskDto; currentTaskDto = operationTaskDto;
if (operationTaskDto.pdfY != 0 && currentLayout.isLeftSideOfPdf((int)operationTaskDto.pdfX)) {
if (currentLayout.isLeftSideOfPdf((int)operationTaskDto.pdfX)) {
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
} else { } else {
params.addRule(RelativeLayout.ALIGN_PARENT_LEFT); params.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
......
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