ネイティブ通信共通化

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

@@ -71,6 +71,7 @@ public class ABookKeys {
     public static final String CMD_SHOW_RELATED_CONTENT = "showRelatedContent";
     public static final String CMD_SHOW_RELATED_CONTENT = "showRelatedContent";
     public static final String CMD_PAGE_NUM = "pageNum";
     public static final String CMD_PAGE_NUM = "pageNum";
     public static final String CMD_GET_GROUP_TREE_INFO = "getGroupTreeInfo";
     public static final String CMD_GET_GROUP_TREE_INFO = "getGroupTreeInfo";
+    public static final String CMD_CLOSE_TASK_LIST = "closeTaskList";
 
 
     public static final String GPS_TYPE = "gpsType";
     public static final String GPS_TYPE = "gpsType";
     public static final String STATUS_CODE = "statusCode";
     public static final String STATUS_CODE = "statusCode";

check @ 9d257da9

-Subproject commit 77868961630429fffe6adafe3742bb79ceb30754
+Subproject commit 9d257da9af57170f9b5308f33832d01ebc55a2da

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

@@ -1125,6 +1125,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 		} else if (mCmd.equals(ABookKeys.CMD_GET_GROUP_TREE_INFO)) {
 		} else if (mCmd.equals(ABookKeys.CMD_GET_GROUP_TREE_INFO)) {
 			List<JSONObject> groups = groupLogic.getAllGroupsJson();
 			List<JSONObject> groups = groupLogic.getAllGroupsJson();
 			afterABookCheckApi(mCmd, null, 0, "getAllGroups", groups.toString());
 			afterABookCheckApi(mCmd, null, 0, "getAllGroups", groups.toString());
+		} else if (mCmd.equals(ABookKeys.CMD_CLOSE_TASK_LIST)) {
+			if (mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
+				showConfirmSavePanoEdit();
+			} else {
+				// 作業終了する時、作業ID設定して作業一覧で使用するメソットを行う。
+				putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
+				finishActivity();  // 開いてる画面を閉じる
+			}
 		}
 		}
     }
     }
 
 

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

@@ -792,7 +792,6 @@ public class OperationListActivity extends ABVUIActivity {
                         scanTypeKey = ABookKeys.SCAN_TYPE_KEY.RFID;
                         scanTypeKey = ABookKeys.SCAN_TYPE_KEY.RFID;
                     }
                     }
                     path.append("&scanType=" + scanTypeKey);
                     path.append("&scanType=" + scanTypeKey);
-                    path.append("&scanDate=" + DateTimeUtil.toString(new Date(), "yyyy-MM-dd hh:mm:ss"));
                     mScanType = null;
                     mScanType = null;
                 }
                 }
                 Logger.d(TAG, "path : " + path);
                 Logger.d(TAG, "path : " + path);

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

@@ -488,17 +488,6 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
         }
         }
 
 
         @JavascriptInterface
         @JavascriptInterface
-        public void goOperationHome() {
-            if (mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
-                showConfirmSavePanoEdit();
-            } else {
-                // 作業終了する時、作業ID設定して作業一覧で使用するメソットを行う。
-                putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
-                finishActivity();  // 開いてる画面を閉じる
-            }
-        }
-
-        @JavascriptInterface
         public String getOperation() {
         public String getOperation() {
             ArrayList<OperationDto> operationDtos = new ArrayList<OperationDto>();
             ArrayList<OperationDto> operationDtos = new ArrayList<OperationDto>();
             OperationDto opertaionDto = mOperationLogic.getOperation(mOperationId);
             OperationDto opertaionDto = mOperationLogic.getOperation(mOperationId);