#33006 事業者毎のリソース多重化(Android)

- APIと連携対応の修正

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

@@ -29,8 +29,8 @@ public class ContentVersionsJSON extends AcmsCommonJSON {
     public String fetchDate;
 
     // #33006 start
-	public static final String ResourcePattern = "resourcepattern"; // リソースパターン
-	public int resourcePattern;
+	public static final String ResourcePatternType = "resourcePatternType"; // 文言リソースパターン
+	public int resourcePatternType;
 	// #33006 end
 	
 	public ContentVersionsJSON(String jsonString) throws AcmsException {
@@ -40,8 +40,8 @@ public class ContentVersionsJSON extends AcmsCommonJSON {
 	@Override
 	protected void parse(JSONObject json) throws JSONValidationException {
 		// #33006 start
-		if (json.has(ResourcePattern)) {
-			resourcePattern = json.getInt(ResourcePattern);
+		if (json.has(ResourcePatternType)) {
+			resourcePatternType = json.getInt(ResourcePatternType);
 		}
 		// #33006 end
 		if (json.has(FetchDate)) {

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/ABVEnvironment.java

@@ -61,7 +61,7 @@ public class ABVEnvironment {
 
 	// #33006 start
 	// Serverから取得したcontentVersion時のリソースパターンを一時的に保存するための変数
-	public int resourcePattern;
+	public int resourcePatternType;
 	// #33006 end
 
 	//////////////////////////////    定数    //////////////////////////////////

ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentRefresher.java

@@ -267,7 +267,7 @@ public class ContentRefresher {
 
             // #33006 start
 			// リソースパターンの値を取得する
-			ABVEnvironment.getInstance().resourcePattern = json.resourcePattern;
+			ABVEnvironment.getInstance().resourcePatternType = json.resourcePatternType;
 			// #33006 end
 
             // 一時値を保存。ダウンロード処理が完了したあとにlastFetchDateを更新

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java

@@ -56,7 +56,7 @@ public interface AppDefType {
 		String OPERATION_REPORT_TYPES = "operationReportTypes";
 
 		// #33006 start
-		String RESOURCE_PATTERN = "resourcePattern"; // リソースパターン
+		String RESOURCE_PATTERN_TYPE = "resourcePatternType"; // 文言リソースパターン
 		// #33006 end
 	}
 

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

@@ -1806,11 +1806,11 @@ public class OperationListActivity extends ABVUIActivity {
     // #33006 start
     // ログイン成功した後、新着更新時の「ContentVersion」APIからリソースパターンを取得し、ローカルに保存する。
     private void getResourcePattern() {
-        Logger.d(TAG, "ABVEnvironment.getInstance().resourcePattern : " + ABVEnvironment.getInstance().resourcePattern);
-        if (ABVEnvironment.getInstance().resourcePattern != 0) {
+        Logger.d(TAG, "ABVEnvironment.getInstance().resourcePatternType : " + ABVEnvironment.getInstance().resourcePatternType);
+        if (ABVEnvironment.getInstance().resourcePatternType != 0) {
         } else {
         }
-        putUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN, ABVEnvironment.getInstance().resourcePattern);
+        putUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, ABVEnvironment.getInstance().resourcePatternType);
     }
     // #33006 end
 }