Merge branch 'feature/contract/sato/1.0.300_51898_look6' into 'contract/sato/1.0.300'

ダッシュボードから開いた報告を閉じるとダッシュボードに戻るようにした

See merge request !284

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

@@ -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 {
     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 {
 
 
         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,14 @@ 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_CANCEL_TASK_REPORT))) {
+                        handler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                finishActivity();
+                            }
+                        });
+                    }
                     return true;
                     return true;
                 }
                 }
                 return false;
                 return false;