#32576 作業指示ボタンの改善（ピン表示）バリデーション処理

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

@@ -19,8 +19,6 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.Point;
-import android.graphics.PointF;
 import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -73,10 +71,8 @@ import org.json.adf.JSONArray;
 import org.json.adf.JSONException;
 import org.json.adf.JSONObject;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -117,11 +113,9 @@ import jp.agentec.abook.abv.bl.logic.EnqueteLogic;
 import jp.agentec.abook.abv.bl.websocket.MeetingManager;
 import jp.agentec.abook.abv.cl.environment.DeviceInfo;
 import jp.agentec.abook.abv.cl.helper.ContentMarkingFileHelper;
-import jp.agentec.abook.abv.cl.util.AndroidStringUtil;
 import jp.agentec.abook.abv.cl.util.BitmapUtil;
 import jp.agentec.abook.abv.cl.util.ContentLogUtil;
 import jp.agentec.abook.abv.cl.util.PreferenceUtil;
-import jp.agentec.abook.abv.launcher.android.PDFFileProvider;
 import jp.agentec.abook.abv.launcher.android.R;
 import jp.agentec.abook.abv.launcher.android.R.id;
 import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity;
@@ -141,8 +135,6 @@ import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
 import jp.agentec.abook.abv.ui.common.vo.Size;
 import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
-import jp.agentec.abook.abv.ui.home.helper.ContentViewHelper;
-import jp.agentec.abook.abv.ui.home.helper.ContentViewHelper.LinkContentStatus;
 import jp.agentec.abook.abv.ui.Interface.MovePageInterface;
 import jp.agentec.abook.abv.ui.Interface.UnAuthorizedContentListener;
 import jp.agentec.abook.abv.ui.viewer.adapter.ContentBookmarkAdapter;
@@ -177,8 +169,6 @@ import jp.agentec.abook.abv.ui.viewer.view.action.TapMediaPlayer;
 import jp.agentec.abook.abv.ui.viewer.view.action.VideoMountAction;
 import jp.agentec.adf.net.http.HttpDownloadSimpleNotification;
 import jp.agentec.adf.net.http.HttpDownloadState;
-import jp.agentec.adf.util.DateTimeUtil;
-import jp.agentec.adf.util.DateTimeUtil.DateUnit;
 import jp.agentec.adf.util.FileUtil;
 import jp.agentec.adf.util.StringUtil;
 
@@ -274,7 +264,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
     private LinearLayout mScaleZoomLayout;
     private boolean isOpenedProjectTask = false;
     private TaskHotspotJSON mTaskHotspotJSON;
-    protected ImageButton btnChangePin;
+    protected ImageButton btnChangeIcon;
     protected ImageButton btnHideTaskDirectBtn;
     protected ImageButton btnScaleZoomPlus;
     protected ImageButton btnScaleZoom03;
@@ -5033,16 +5023,16 @@ public class ContentViewActivity extends ABVContentViewActivity {
 
         mScaleZoomLayout.setVisibility(View.VISIBLE);
         mMainLayout.addView(mScaleZoomLayout, params);
-		btnChangePin = (ImageButton) mScaleZoomLayout.findViewById(id.btn_pin);
-		btnChangePin.setOnClickListener(new View.OnClickListener() {
+		btnChangeIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_pin);
+		btnChangeIcon.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				mShowPinFlg = !mShowPinFlg;
-				changeTaskPinOrCode(mShowPinFlg);
+				changeTaskMainIcon(mShowPinFlg);
 			}
 		});
 
-		btnChangePin.setVisibility(View.VISIBLE);
+		btnChangeIcon.setVisibility(View.VISIBLE);
         btnHideTaskDirectBtn = (ImageButton) mScaleZoomLayout.findViewById(R.id.btn_hide_task_direct);
         btnHideTaskDirectBtn.setOnTouchListener(new View.OnTouchListener() {
             @Override
@@ -5198,15 +5188,21 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	 * 作業のアイコンをピン・作業コードに切替
 	 * @param isShowPin
 	 */
-	public void changeTaskPinOrCode(boolean isShowPin) {
+	public void changeTaskMainIcon(boolean isShowPin) {
+		// mShowPageLayoutに存在するzoomLayoutの子ビューであるActionProjectTaskPin、ActionProjectTaskCodeを全て削除して、新たにアイコンを再描画する
 		for (int i = 0; i < mShowPageLayout.size(); i++) {
 			int key = mShowPageLayout.keyAt(i);
 			ZoomRelativeLayout zoomRelativeLayout = mShowPageLayout.get(key);
+			List<View> deleteViewList = new ArrayList<View>();
 			for (int j = 0; j < zoomRelativeLayout.getChildCount(); j++) {
 				View view = zoomRelativeLayout.getChildAt(j);
 				if (view instanceof ActionProjectTaskCode || view instanceof ActionProjectTaskPin) {
-					zoomRelativeLayout.removeView(view);
+					// 削除対象のビューをリストViewに追加する
+					deleteViewList.add(view);
+				}
 			}
+			for (View view : deleteViewList) {
+				zoomRelativeLayout.removeView(view);
 			}
 			List<ProjectTaskDto> tasks = mTaskHotspotJSON.getPageTasks(i);
 			projectTaskLayout.addAllProjectTaskIcon(this, zoomRelativeLayout, tasks);
@@ -5271,6 +5267,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
         Matrix matrix = new Matrix();
         matrix.postScale(scaleFactor, scaleFactor, centerX, centerY);
         zoomLayout.setZoomMatrix(matrix);
+		zoomLayout.changeTaskChildView();
 
         setToolbarVisable(false);
         mShowPageLayout.get(mCurrentPageNumber).setScaleFactorAndMatrix(scaleFactor);

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

@@ -37,8 +37,6 @@ public class ActionProjectTaskPin extends ImageView {
             setImageResource(R.drawable.s_pin1);
         }
         setBackgroundColor(Color.TRANSPARENT);
-        setAdjustViewBounds(true);
-        setScaleType(ScaleType.FIT_START);
     }
 
     public void stopAnimation() {