#32565 PDF作業登録改善

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java

@@ -66,7 +66,7 @@ public class TaskReportDao extends AbstractDao {
                         + "attached_file_send_flg, "
                         + "attached_file_send_flg, "
                         + "data_send_flg) "
                         + "data_send_flg) "
                         + "values "
                         + "values "
-                        + "(?,?,?,?,?,?,?)",
+                        + "(?,?,?,?,?,?)",
                 dto.getInsertValues());
                 dto.getInsertValues());
     }
     }
 
 

ABVJE_UI_Android/res/layout/scale_zoom_toolbar.xml

@@ -10,21 +10,24 @@
         android:id="@+id/btn_pin_toggle"
         android:id="@+id/btn_pin_toggle"
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="2px"
         android:layout_alignParentLeft="true"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_centerVertical="true"
+        android:layout_marginBottom="20px"
+        android:layout_marginEnd="2px"
+        android:layout_marginLeft="2px"
+        android:layout_marginRight="2px"
         android:background="@drawable/ic_hidden_show_directions_button"
         android:background="@drawable/ic_hidden_show_directions_button"
-        android:visibility="visible"/>
+        android:visibility="visible" />
 
 
     <ImageButton
     <ImageButton
         android:id="@+id/btn_hide_task_direct"
         android:id="@+id/btn_hide_task_direct"
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="2px"
         android:layout_alignParentLeft="true"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_centerVertical="true"
+        android:layout_margin="2px"
         android:background="@drawable/ic_hidden_show_directions_button"
         android:background="@drawable/ic_hidden_show_directions_button"
-        android:visibility="visible"/>
+        android:visibility="visible" />
 
 
     <ImageButton
     <ImageButton
         android:id="@+id/btn_scale_zoom_plus"
         android:id="@+id/btn_scale_zoom_plus"

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

@@ -5122,7 +5122,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
     public void showOperationTaskLayout(ZoomRelativeLayout layout, OperationTaskDto operationTaskDto, float clickX) {
     public void showOperationTaskLayout(ZoomRelativeLayout layout, OperationTaskDto operationTaskDto, float clickX) {
         //setCurrentOperationTask(layout, currentTaskDto);
         //setCurrentOperationTask(layout, currentTaskDto);
         operationTaskLayout.showTaskForm(layout, mXWalkOpenType, operationTaskDto, isNormalSize(), clickX);
         operationTaskLayout.showTaskForm(layout, mXWalkOpenType, operationTaskDto, isNormalSize(), clickX);
-
+		// 拡大・縮小・切替ボタンの非表示
+		mScaleZoomLayout.setVisibility(View.INVISIBLE);
         isOpenedOperationTask = true;
         isOpenedOperationTask = true;
     }
     }
 
 
@@ -5130,8 +5131,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
         String taskKey = checkParam.get(ABookKeys.TASK_KEY);
         String taskKey = checkParam.get(ABookKeys.TASK_KEY);
         String taskCode = "";
         String taskCode = "";
 
 
-        // フォームが閉いているフラグをfalseに設定
+        // フォームが閉じられたと見做すので、以下の処理を行う
         isOpenedOperationTask = false;
         isOpenedOperationTask = false;
+		// 拡大・縮小・切替ボタンの表示
+		mScaleZoomLayout.setVisibility(View.VISIBLE);
+
         if (operationTaskLayout.currentLayout != null && !StringUtil.isNullOrEmpty(taskKey)) {
         if (operationTaskLayout.currentLayout != null && !StringUtil.isNullOrEmpty(taskKey)) {
             switch(cmd){
             switch(cmd){
                 case ABookKeys.CMD_INSERT_TASK_DIRECTIONS:
                 case ABookKeys.CMD_INSERT_TASK_DIRECTIONS:
@@ -5163,8 +5167,14 @@ public class ContentViewActivity extends ABVContentViewActivity {
         }
         }
     }
     }
 
 
-    public void hideOperationTaskLayout() {
-        operationTaskLayout.setVisibility(View.INVISIBLE);
+	/**
+	 * 作業一覧レイアウトを非表示処理
+	 */
+	public void hideOperationTaskLayout() {
+		// 拡大・縮小・切替ボタンの表示
+		mScaleZoomLayout.setVisibility(View.VISIBLE);
+
+		operationTaskLayout.setVisibility(View.INVISIBLE);
         operationTaskLayout.currentTaskDto = null;
         operationTaskLayout.currentTaskDto = null;
         setOperationTaskViewStatus(false);
         setOperationTaskViewStatus(false);
     }
     }
@@ -5228,6 +5238,9 @@ public class ContentViewActivity extends ABVContentViewActivity {
 
 
     @Override
     @Override
     public void showTaskList() {
     public void showTaskList() {
+		// 拡大・縮小・切替ボタンの非表示
+		mScaleZoomLayout.setVisibility(View.INVISIBLE);
+
         operationTaskLayout.showTaskList(mCurrentPageNumber, isNormalSize());
         operationTaskLayout.showTaskList(mCurrentPageNumber, isNormalSize());
     }
     }