Skip to content

A
abook_check
Commit 16ca9515 by Jung Kwangkyu
Options

Merge branch 'features/1.4.202_dev_lmk' into 'features/1.4.202' 

#45375対応

See merge request !250
parents d09f38ca be5be749
Showing with 6 additions and 6 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java
...@@ -400,13 +400,13 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -400,13 +400,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