Commit 81cb69bf by Lee Jaebin

#32775_作業指示タップ・タップモード切替で指示者と作業者の制御

parent 040cfa61
......@@ -5043,6 +5043,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
//
btnMoveOrClickToggleIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_move_click_toggle);
if (isDirector()) {
// 指示者の場合
btnMoveOrClickToggleIcon.setVisibility(View.VISIBLE);
btnMoveOrClickToggleIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -5056,6 +5060,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
}
}
});
} else {
// 作業者の場合
btnMoveOrClickToggleIcon.setVisibility(View.INVISIBLE);
}
// ピンと作業コードの切替ボタン
btnPinToggleIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_pin_toggle);
......
......@@ -250,11 +250,12 @@ public class OperationTaskLayout extends RelativeLayout {
}
}
if (rootLayout.isEnableOperationTaskNewOrMove()) {
// 作業のタップイベント
taskView.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent event) {
if (mContext.mMoveTaskFlg) {
if (mContext.mMoveTaskFlg && rootLayout.isEnableOperationTaskNewOrMove()) {
// 指示者且つ、移動モードの場合
if (event.getAction() == MotionEvent.ACTION_DOWN) {
ClipData data = ClipData.newPlainText("", "");
View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
......@@ -272,7 +273,6 @@ public class OperationTaskLayout extends RelativeLayout {
}
});
}
}
public void addAllOperationTaskIcon(final ZoomRelativeLayout rootLayout, final List<OperationTaskDto> dto) {
for (OperationTaskDto task : dto) {
......
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