#32861 作業情報追加(Android)

- CMSと連携の修正

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

@@ -932,8 +932,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 									ABookKeys.CMD_DELETE_TASK_REPORT, ABookKeys.CMD_CANCEL_TASK_REPORT) && !mAddReport && !isError)  {
 									ABookKeys.CMD_DELETE_TASK_REPORT, ABookKeys.CMD_CANCEL_TASK_REPORT) && !mAddReport && !isError)  {
 							operationFinish();
 							operationFinish();
 						} else {
 						} else {
-							afterABookCheckApi(mCmd, mTaskKey, 0, "", null, isOperationPdf());
 							if (!isError) {  // エラーがない場合のみ画面遷移処理を行う。
 							if (!isError) {  // エラーがない場合のみ画面遷移処理を行う。
+								afterABookCheckApi(mCmd, mTaskKey, 0, "", null, isOperationPdf());
 								doneProcess();
 								doneProcess();
 							}
 							}
 						}
 						}

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

@@ -1601,8 +1601,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         if (!currentActivityStack.isEmpty()) {
         if (!currentActivityStack.isEmpty()) {
             for (final ABVAuthenticatedActivity activity : currentActivityStack) {
             for (final ABVAuthenticatedActivity activity : currentActivityStack) {
                 final String scriptUrl = url;
                 final String scriptUrl = url;
-                if (activity instanceof HTMLWebViewActivity) {
-                    ((HTMLWebViewActivity) activity).callViewLoadUrl(scriptUrl);
+                if (activity instanceof ParentWebViewActivity) {
+                    ((ParentWebViewActivity) activity).callViewLoadUrl(scriptUrl);
                 }
                 }
             }
             }
         }
         }
@@ -1631,12 +1631,13 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         }
         }
     }
     }
 
 
+    // ActivityであるClassからCheckOZDViewActivityを確認してContextの値を変更する。
     public Context selectedAtivityContext() {
     public Context selectedAtivityContext() {
         Context context = null;
         Context context = null;
         if (!currentActivityStack.isEmpty()) {
         if (!currentActivityStack.isEmpty()) {
             for (final ABVAuthenticatedActivity activity : currentActivityStack) {
             for (final ABVAuthenticatedActivity activity : currentActivityStack) {
                 if (activity instanceof CheckOZDViewActivity) {
                 if (activity instanceof CheckOZDViewActivity) {
-                    context = ((CheckOZDViewActivity) activity);
+                    context = activity;
                     return context;
                     return context;
                 }
                 }
             }
             }

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

@@ -722,11 +722,4 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
         }
         }
         mUploadMessage = null;
         mUploadMessage = null;
     }
     }
-
-    // #32861 start
-    // 上位のClassからHTML側のコールを行うための処理
-    public void callViewLoadUrl(String url) {
-        webViewLoadUrl(url);
-    }
-    // #32861 end
 }
 }

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

@@ -401,4 +401,11 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
 
 
         return null;
         return null;
     }
     }
+
+    // #32861 start
+    // 上位のClassからHTML側のコールを行うための処理
+    public void callViewLoadUrl(String url) {
+        webViewLoadUrl(url);
+    }
+    // #32861 end
 }
 }