Commit 58b1a46c by Kazuyuki Hida

ダッシュボードからの遷移はダッシュボードに戻るようにした。

parent bf61e732
...@@ -52,6 +52,8 @@ import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow; ...@@ -52,6 +52,8 @@ import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper; import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
import jp.agentec.abook.abv.ui.viewer.view.CheckFormWebview; import jp.agentec.abook.abv.ui.viewer.view.CheckFormWebview;
import static jp.agentec.abook.abv.bl.common.constant.ABookKeys.STATUS_CODE;
//TODO: later 遠隔連動関連はContentView,NoPdfViewと共通しているので要集約 //TODO: later 遠隔連動関連はContentView,NoPdfViewと共通しているので要集約
public class HTMLWebViewActivity extends ParentWebViewActivity { public class HTMLWebViewActivity extends ParentWebViewActivity {
private static final String TAG = "HTMLWebViewActivity"; private static final String TAG = "HTMLWebViewActivity";
...@@ -71,6 +73,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -71,6 +73,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
private JsInf jsInf = new JsInf(); private JsInf jsInf = new JsInf();
private ValueCallback<Uri[]> mUploadMessage; private ValueCallback<Uri[]> mUploadMessage;
private boolean fromDashboard = false;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Logger.i(TAG, "onCreate"); Logger.i(TAG, "onCreate");
...@@ -90,7 +94,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -90,7 +94,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
final String url = intent.getStringExtra("LINKURL"); // LinkURL final String url = intent.getStringExtra("LINKURL"); // LinkURL
mOperationId = intent.getLongExtra(ABookKeys.OPERATION_ID, -1); // OperationId mOperationId = intent.getLongExtra(ABookKeys.OPERATION_ID, -1); // OperationId
fromDashboard = url.contains("taskKey");
// ***** WebViewセット // ***** WebViewセット
...@@ -335,6 +339,18 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -335,6 +339,18 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
if (url.contains(ABookKeys.ABOOK_CHECK_API)) { if (url.contains(ABookKeys.ABOOK_CHECK_API)) {
commonShouldOverrideUrlLoading(uri, null); commonShouldOverrideUrlLoading(uri, null);
} }
if (fromDashboard && url.contains(ABookKeys.CMD_CHANGE_DISPLAY_STATUS)) {
// ダッシュボードに戻る
String statusCode = uri.getQueryParameter(STATUS_CODE);
if (statusCode.equals("0")) {
handler.post(new Runnable() {
@Override
public void run() {
finishActivity();
}
});
}
}
return true; return true;
} }
return false; return false;
......
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