Commit 479d019d by Lee Jaebin

作業コードが更新できない問題・作業登録ホットスポットでドラッグ&ドロップの修正

parent ff95d636
...@@ -316,7 +316,7 @@ public class ProjectLogic extends AbstractLogic { ...@@ -316,7 +316,7 @@ public class ProjectLogic extends AbstractLogic {
if (!newValue.equals(taskDirectionsItemsDto.inputValue)) { if (!newValue.equals(taskDirectionsItemsDto.inputValue)) {
// 値が異なる場合のみ、更新する // 値が異なる場合のみ、更新する
taskDirectionsItemsDto.inputValue = newValue; taskDirectionsItemsDto.inputValue = newValue;
if (taskDirectionsItemsDto.inputValue.startsWith("q_1_")) { if (taskDirectionsItemsDto.itemKey.startsWith("q_1_")) {
// 値が異なるため、作業コードの入力値を変更する // 値が異なるため、作業コードの入力値を変更する
taskDto.taskCode = taskDirectionsItemsDto.inputValue; taskDto.taskCode = taskDirectionsItemsDto.inputValue;
} }
......
...@@ -92,7 +92,7 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -92,7 +92,7 @@ public class ZoomRelativeLayout extends RelativeLayout {
@Override @Override
public boolean onDrag(View v, DragEvent event) { public boolean onDrag(View v, DragEvent event) {
View view = (View) event.getLocalState(); View view = (View) event.getLocalState();
if (view instanceof ActionProjectTaskCode || view instanceof ActionProjectTaskPin) {
switch (event.getAction()) { switch (event.getAction()) {
case DragEvent.ACTION_DRAG_STARTED: case DragEvent.ACTION_DRAG_STARTED:
//理由不明、イベントが二回くる、二回目でgetX()だけがマイナス //理由不明、イベントが二回くる、二回目でgetX()だけがマイナス
...@@ -146,7 +146,9 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -146,7 +146,9 @@ public class ZoomRelativeLayout extends RelativeLayout {
// 座標を更新する // 座標を更新する
((ContentViewActivity) mContext).updateProjectTaskPosition(pdfPoint.x, pdfPoint.y); ((ContentViewActivity) mContext).updateProjectTaskPosition(pdfPoint.x, pdfPoint.y);
if (view instanceof ActionProjectTaskCode || view instanceof ActionProjectTaskPin) {
((ContentViewActivity) mContext).updateProjectTaskPosition(); ((ContentViewActivity) mContext).updateProjectTaskPosition();
}
if (view.getVisibility() == View.INVISIBLE) { if (view.getVisibility() == View.INVISIBLE) {
view.setVisibility(View.VISIBLE); view.setVisibility(View.VISIBLE);
...@@ -157,7 +159,6 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -157,7 +159,6 @@ public class ZoomRelativeLayout extends RelativeLayout {
default: default:
break; break;
} }
}
return true; return true;
} }
} }
......
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