Commit 0ff22555 by Jeong Gilmo

#32861 作業情報追加(Android)

- CMSと連携の修正
parent dd7aa92d
...@@ -932,8 +932,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -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();
} }
} }
......
...@@ -1601,8 +1601,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -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) { if (activity instanceof ParentWebViewActivity) {
((HTMLWebViewActivity) activity).callViewLoadUrl(scriptUrl); ((ParentWebViewActivity) activity).callViewLoadUrl(scriptUrl);
} }
} }
} }
...@@ -1630,13 +1630,14 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -1630,13 +1630,14 @@ 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;
} }
} }
......
...@@ -722,11 +722,4 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -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
} }
...@@ -401,4 +401,11 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -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
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment