Merge branch 'features/1.3.200_41596' into features/1.3.200

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -1310,7 +1310,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 			@Override
 			public void run () {
 				// 実行Javascript - 閉じる
-				ActivityHandlingHelper.getInstance().callOzdHtmlScript("javascript:CHK.cancelOzReport()");
+				ActivityHandlingHelper.getInstance().callOzdHtmlScript("javascript:CHK.afterABookCheckApi('"+ABookKeys.CMD_CANCEL_TASK_REPORT+"', '', '0', '')");
+				ActivityHandlingHelper.getInstance().reloadPdfTaskIcon(mTaskKey);
 				Logger.d(TAG, "ozdCancelProcess");
 			}
 		});

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -1955,4 +1955,19 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             }
         }
     }
+
+    /**
+     * 図面タイプのみ利用
+     * OZ画面閉じた後、タスクアイコンの再描画
+     * @param taskKey
+     */
+    public void reloadPdfTaskIcon(String taskKey) {
+        if (!currentActivityStack.isEmpty()) {
+            for (final ABVAuthenticatedActivity activity : currentActivityStack) {
+                if (activity instanceof ContentViewActivity) {
+                    ((ContentViewActivity) activity).reloadPdfTaskIcon(taskKey);
+                }
+            }
+        }
+    }
 }

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

@@ -181,9 +181,8 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
             public void onClick(View v) {
                 mButtonStatus = R.id.btn_close;  // HTML側の分岐処理を行うため変数に値を渡す
                 //#41596 OZの報告入力フォームで☓をタップした際の動作がおかしい
-                //Javascript呼ばないようにし、連続作業と関係なく閉じる処理追加
                 finishActivity();
-//                doProcess();  // HTML側の処理を行う
+                doProcess();  // HTML側に閉じる処理を行う
 //                if (mProcessKey != null && mPhaseNo != 0) {  //連続作業用のOZView画面非表示
 //                    finishActivity();
 //                }

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

@@ -5463,5 +5463,13 @@ public class ContentViewActivity extends ABVContentViewActivity {
             mPageScrollView.setZoomingFlag(false);
         }
     }
+
+	/**
+	 * OZ画面閉じた後、タスクアイコンの再描画
+	 */
+	public void reloadPdfTaskIcon(String taskKey) {
+		operationTaskLayout.setIconStatus(taskKey,false);
+	}
+
 }