#49091, #49092, #49093 implement params: directPage, backPage, directTaskKey

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java

@@ -250,4 +250,10 @@ public class ABookKeys {
     public static final String PUSH_MESSAGE_ID = "pushMessageId";
     public static final String PUSH_MESSAGE_ACTION = "pushMessageAction";
 
+    public static class GO_OPERATION_KEY {
+        public static final String DIRECT_PAGE = "directPage";
+        public static final String BACK_PAGE = "backPage";
+        public static final String DIRECT_TASK_KEY = "directTaskKey";
+    }
+
 }

check @ b491f777

-Subproject commit 5fb3d18c66297d4a79b13dea06fb5865210e43f6
+Subproject commit b491f77706e90f0cfcd3593dc6d9b2dd593162fa

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java

@@ -157,6 +157,11 @@ public class OperationListActivity extends ABVUIActivity {
 
     private Integer mScanType;
 
+    //redirect page
+    private String directPage;
+    private String backPage;
+    private String directTaskKey;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
@@ -325,6 +330,21 @@ public class OperationListActivity extends ABVUIActivity {
                         if (jsonParam.has(ABookKeys.SCAN_TYPE)) {
                             mScanType = jsonParam.getInt(ABookKeys.SCAN_TYPE);
                         }
+                        directPage = null;
+                        if (jsonParam.has(ABookKeys.GO_OPERATION_KEY.DIRECT_PAGE)
+                                && !jsonParam.isNull(ABookKeys.GO_OPERATION_KEY.DIRECT_PAGE)) {
+                            directPage = jsonParam.getString(ABookKeys.GO_OPERATION_KEY.DIRECT_PAGE);
+                        }
+                        backPage = null;
+                        if (jsonParam.has(ABookKeys.GO_OPERATION_KEY.BACK_PAGE)
+                                && !jsonParam.isNull(ABookKeys.GO_OPERATION_KEY.BACK_PAGE)) {
+                            backPage = jsonParam.getString(ABookKeys.GO_OPERATION_KEY.BACK_PAGE);
+                        }
+                        directTaskKey = null;
+                        if (jsonParam.has(ABookKeys.GO_OPERATION_KEY.DIRECT_TASK_KEY)
+                                && !jsonParam.isNull(ABookKeys.GO_OPERATION_KEY.DIRECT_TASK_KEY)) {
+                            directTaskKey = jsonParam.getString(ABookKeys.GO_OPERATION_KEY.DIRECT_TASK_KEY);
+                        }
                         final OperationDto tempOperationDto = mOperationDao.getOperationJoinContent(jsonParam.getInt(ABookKeys.OPERATION_ID));
                         if (tempOperationDto.operationType == Constant.operationType.CONTENT360
                                 && tempOperationDto.contentId == null) {
@@ -885,6 +905,15 @@ public class OperationListActivity extends ABVUIActivity {
                         path.append("&sid=" + ABVDataCache.getInstance().getMemberInfo().sid);
                         path.append("&quickReport=" + operationDto.quickReport);
                         path.append("&shopName=" + ABVDataCache.getInstance().getUrlPath());
+                        if (directPage != null && directPage.length() > 0) {
+                            path.append("&directPage=" + directPage);
+                        }
+                        if (backPage != null && backPage.length() > 0) {
+                            path.append("&backPage=" + backPage);
+                        }
+                        if (directTaskKey != null && directTaskKey.length() > 0) {
+                            path.append("&directTaskKey=" + directTaskKey);
+                        }
                         path.append("&acmsAddress=" + ABVEnvironment.getInstance().acmsAddress);
                         if (mScanType != null) {
                             String scanTypeKey = null;