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

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

@@ -5043,6 +5043,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 
 
         //
         //
 		btnMoveOrClickToggleIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_move_click_toggle);
 		btnMoveOrClickToggleIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_move_click_toggle);
+
+		if (isDirector()) {
+			// 指示者の場合
+			btnMoveOrClickToggleIcon.setVisibility(View.VISIBLE);
 			btnMoveOrClickToggleIcon.setOnClickListener(new View.OnClickListener() {
 			btnMoveOrClickToggleIcon.setOnClickListener(new View.OnClickListener() {
 				@Override
 				@Override
 				public void onClick(View v) {
 				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);
 		btnPinToggleIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_pin_toggle);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java

@@ -250,11 +250,12 @@ public class OperationTaskLayout extends RelativeLayout {
             }
             }
         }
         }
 
 
-        if (rootLayout.isEnableOperationTaskNewOrMove()) {
+        // 作業のタップイベント
         taskView.setOnTouchListener(new View.OnTouchListener() {
         taskView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             @Override
             public boolean onTouch(View view, MotionEvent event) {
             public boolean onTouch(View view, MotionEvent event) {
-                    if (mContext.mMoveTaskFlg) {
+                if (mContext.mMoveTaskFlg && rootLayout.isEnableOperationTaskNewOrMove()) {
+                    // 指示者且つ、移動モードの場合
                     if (event.getAction() == MotionEvent.ACTION_DOWN) {
                     if (event.getAction() == MotionEvent.ACTION_DOWN) {
                         ClipData data = ClipData.newPlainText("", "");
                         ClipData data = ClipData.newPlainText("", "");
                         View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
                         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) {
     public void addAllOperationTaskIcon(final ZoomRelativeLayout rootLayout, final List<OperationTaskDto> dto) {
         for (OperationTaskDto task : dto) {
         for (OperationTaskDto task : dto) {