Merge branch 'features/1.2.0_ogawa-y' into 'contract/kagome/1.2.1'

Features/1.2.0 ogawa y

See merge request !66

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java

@@ -1024,7 +1024,7 @@ public class AcmsClient implements AcmsClientResponseListener {
 	 * @throws AcmsException
 	 * @throws AcmsException
 	 */
 	 */
 	public JSONObject checkRunningStatus(CheckRunningOperationParameters param) throws NetworkDisconnectedException, AcmsException {
 	public JSONObject checkRunningStatus(CheckRunningOperationParameters param) throws NetworkDisconnectedException, AcmsException {
-		HttpResponse response = send(AcmsApis.ApiGetOperationData, param);
+		HttpResponse response = send(AcmsApis.ApiCheckRunningStatus, param);
 		JSONObject json = new JSONObject(response.httpResponseBody);
 		JSONObject json = new JSONObject(response.httpResponseBody);
 		return json;
 		return json;
 	}
 	}

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java

@@ -160,7 +160,7 @@ public class AcmsApis {
 	// 絞り検索マスタデータ取得
 	// 絞り検索マスタデータ取得
 	public static final String ApiGetApertureMasterData = "getApertureMasterData";
 	public static final String ApiGetApertureMasterData = "getApertureMasterData";
 	// KAGOME Ph2 稼働時間登録可否チェック
 	// KAGOME Ph2 稼働時間登録可否チェック
-	public static final String ApiCheckRunningOperation = "checkRunningOperation";
+	public static final String ApiCheckRunningStatus = "checkRunningStatus";
 
 
 	//	download
 	//	download
 	/**
 	/**
@@ -206,7 +206,7 @@ public class AcmsApis {
 				methodName.equals(ApiGetTaskFile) || methodName.equals(ApiSceneEntry) || methodName.equals(ApiTaskContentEntry) ||
 				methodName.equals(ApiGetTaskFile) || methodName.equals(ApiSceneEntry) || methodName.equals(ApiTaskContentEntry) ||
 				methodName.equals(ApiSendPushMessage) || methodName.equals(ApiGetPushMessages) || methodName.equals(ApiSendRoutineTaskData) ||
 				methodName.equals(ApiSendPushMessage) || methodName.equals(ApiGetPushMessages) || methodName.equals(ApiSendRoutineTaskData) ||
 				methodName.equals(ApiOperationGroupMaster) || methodName.equals(ApiGetApertureMasterData) || methodName.equals(ApiGetMasterData) ||
 				methodName.equals(ApiOperationGroupMaster) || methodName.equals(ApiGetApertureMasterData) || methodName.equals(ApiGetMasterData) ||
-				methodName.equals(ApiCheckRunningOperation)) {
+				methodName.equals(ApiCheckRunningStatus)) {
 			apiValue = Constant.ApiValue.checkapi;
 			apiValue = Constant.ApiValue.checkapi;
 		}
 		}
 
 

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

@@ -37,7 +37,7 @@ public class ABookKeys {
     public static final String CMD_LABEL_PRINT = "labelPrint";
     public static final String CMD_LABEL_PRINT = "labelPrint";
     public static final String CMD_ABNORMALITY_REPORT = "abnormalityReport";
     public static final String CMD_ABNORMALITY_REPORT = "abnormalityReport";
     public static final String CMD_WEBVIEW_FINISH = "webviewFinish";
     public static final String CMD_WEBVIEW_FINISH = "webviewFinish";
-    public static final String CMD_CHECK_RUNNING_OPERATION = "checkRunningOperation";
+    public static final String CMD_CHECK_RUNNING_OPERATION = "runningDataRegistable";
 
 
     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";
@@ -72,7 +72,7 @@ public class ABookKeys {
     public static final String RUNNING_INFO_OPERATION_NO = "operationNo";
     public static final String RUNNING_INFO_OPERATION_NO = "operationNo";
     public static final String RUNNING_INFO_RUNNING_STATUS = "runningStatus";
     public static final String RUNNING_INFO_RUNNING_STATUS = "runningStatus";
     public static final String RUNNING_INFO_TIME = "time";
     public static final String RUNNING_INFO_TIME = "time";
-    public static final String RUNNING_INFO_EMPLOYEE_CODE_LIST = "employeeCodeList";
+    public static final String RUNNING_INFO_EMPLOYEE_CODE_LIST = "employeeCodeListStr";
     // KAGOME対応Ph2　品質異常報告パラメータend
     // KAGOME対応Ph2　品質異常報告パラメータend
 
 
     // #32782 指示者テーブル関連削除 start
     // #32782 指示者テーブル関連削除 start

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

@@ -1397,7 +1397,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 		try {
 		try {
 			JSONObject json = AcmsClient.getInstance(ABVDataCache.getInstance().getUrlPath(), ABVEnvironment.getInstance().networkAdapter).checkRunningStatus(param);
 			JSONObject json = AcmsClient.getInstance(ABVDataCache.getInstance().getUrlPath(), ABVEnvironment.getInstance().networkAdapter).checkRunningStatus(param);
 			Logger.w(TAG,"check running info complete");
 			Logger.w(TAG,"check running info complete");
-			afterABookCheckApi(mCmd, "", 0, "", json.getString("errMsgList"));
+			afterABookCheckApi(mCmd, "", 0, "", json.getJSONObject("errMsgMap").toString());
 		} catch (NetworkDisconnectedException e) {
 		} catch (NetworkDisconnectedException e) {
 			Logger.w(TAG,e);
 			Logger.w(TAG,e);
 			afterABookCheckApi(mCmd, "", 1, PatternStringUtil.patternToString(getApplicationContext(),
 			afterABookCheckApi(mCmd, "", 1, PatternStringUtil.patternToString(getApplicationContext(),