Skip to content

A
abook_check
Commit ac2bc7f4 by Lee Jaebin
Options

ソース分離（未使用のリソース削除）

parent 40f44ee0
Showing with 1 additions and 3218 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
...@@ -18,7 +18,6 @@ import jp.agentec.abook.abv.bl.acms.client.json.AppLatestVersionJSON; ...@@ -18,7 +18,6 @@ import jp.agentec.abook.abv.bl.acms.client.json.AppLatestVersionJSON;
import jp.agentec.abook.abv.bl.acms.client.json.AuthLevelJSON; import jp.agentec.abook.abv.bl.acms.client.json.AuthLevelJSON;
import jp.agentec.abook.abv.bl.acms.client.json.CategoriesJSON; import jp.agentec.abook.abv.bl.acms.client.json.CategoriesJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ContentCheckDeliverableJSON; import jp.agentec.abook.abv.bl.acms.client.json.ContentCheckDeliverableJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ContentSetJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ContentVersionsJSON; import jp.agentec.abook.abv.bl.acms.client.json.ContentVersionsJSON;
import jp.agentec.abook.abv.bl.acms.client.json.GroupsJSON; import jp.agentec.abook.abv.bl.acms.client.json.GroupsJSON;
import jp.agentec.abook.abv.bl.acms.client.json.LogSendFlagJSON; import jp.agentec.abook.abv.bl.acms.client.json.LogSendFlagJSON;
...@@ -27,7 +26,6 @@ import jp.agentec.abook.abv.bl.acms.client.json.RequirePasswordChangeJSON; ...@@ -27,7 +26,6 @@ import jp.agentec.abook.abv.bl.acms.client.json.RequirePasswordChangeJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ResultJSON; import jp.agentec.abook.abv.bl.acms.client.json.ResultJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ServerTimeZoneJSON; import jp.agentec.abook.abv.bl.acms.client.json.ServerTimeZoneJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ServiceOptionsJSON; import jp.agentec.abook.abv.bl.acms.client.json.ServiceOptionsJSON;
import jp.agentec.abook.abv.bl.acms.client.json.SubscriptionHistoryJSON;
import jp.agentec.abook.abv.bl.acms.client.json.FixPushMessageJSON; import jp.agentec.abook.abv.bl.acms.client.json.FixPushMessageJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ProjectDataJSON; import jp.agentec.abook.abv.bl.acms.client.json.ProjectDataJSON;
import jp.agentec.abook.abv.bl.acms.client.json.ProjectInspectDataJSON; import jp.agentec.abook.abv.bl.acms.client.json.ProjectInspectDataJSON;
...@@ -39,14 +37,11 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsContentParameters; ...@@ -39,14 +37,11 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsContentParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.AddMemberGroupParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AddMemberGroupParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.AppStoreNewLoginParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AppStoreNewLoginParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.BackgroundPicParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.CheckSendLogParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.CheckSendLogParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ContentReadingLogParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.ContentReadingLogParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ContentSearchParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.EnqueteReplyParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.EnqueteReplyParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseLoginParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseLoginParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseNewLoginParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseNewLoginParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetBackupFileParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetContentParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.GetContentParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetEnqueteReplyParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.GetEnqueteReplyParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetProjectDataParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.GetProjectDataParameters;
...@@ -56,9 +51,6 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.PasswordChangeParameters; ...@@ -56,9 +51,6 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.PasswordChangeParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.PostEnqueteReplyParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.PostEnqueteReplyParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.SendPushMessageParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.SendPushMessageParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ServerTimeParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.ServerTimeParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.StandByPicParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.SubscriptionHistoryParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.SubscriptionHistorySendParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.UpdateDeviceTokenParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.UpdateDeviceTokenParameters;
import jp.agentec.abook.abv.bl.acms.type.AcmsApis; import jp.agentec.abook.abv.bl.acms.type.AcmsApis;
import jp.agentec.abook.abv.bl.acms.type.LoginStatus; import jp.agentec.abook.abv.bl.acms.type.LoginStatus;
...@@ -81,7 +73,6 @@ import jp.agentec.abook.abv.bl.dto.ContentDto; ...@@ -81,7 +73,6 @@ import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.GroupDto; import jp.agentec.abook.abv.bl.dto.GroupDto;
import jp.agentec.abook.abv.bl.dto.MemberInfoDto; import jp.agentec.abook.abv.bl.dto.MemberInfoDto;
import jp.agentec.abook.abv.bl.dto.ServiceOptionDto; import jp.agentec.abook.abv.bl.dto.ServiceOptionDto;
import jp.agentec.abook.abv.bl.dto.SubscriptionDto;
import jp.agentec.adf.net.http.HttpDownloadState; import jp.agentec.adf.net.http.HttpDownloadState;
import jp.agentec.adf.net.http.HttpFileDownloader; import jp.agentec.adf.net.http.HttpFileDownloader;
import jp.agentec.adf.net.http.HttpMultipart; import jp.agentec.adf.net.http.HttpMultipart;
...@@ -376,41 +367,6 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -376,41 +367,6 @@ public class AcmsClient implements AcmsClientResponseListener {
return new ContentVersionsJSON(response.httpResponseBody); return new ContentVersionsJSON(response.httpResponseBody);
} }
/**
* ACMSから、コンテンツセット情報を取得します。
* @since 1.5.0
*/
public ArrayList<SubscriptionDto> contentSet(SubscriptionHistoryParameters param) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApiUrlContentSet, param);
ContentSetJSON json = new ContentSetJSON(response.httpResponseBody);
lastPresentTime = json.presentTime;
return json.SubscriptionDtoList;
}
/**
* ACMSに、定期購読履歴を送信します。
* @since 1.5.0
*/
public int sendHistory(SubscriptionHistorySendParameters param) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApiUrlSendSubscriptionHistory, param);
AcmsCommonJSON json = new AcmsCommonJSON(response.httpResponseBody);
lastPresentTime = json.presentTime;
return json.httpStatus;
}
/**
* ACMSから、コンテンツ検索結果を取得します。
* @param param {@link ContentSearchParameters} オブジェクトです。
* @return コンテンツ検索結果を格納した {@link ContentDto} のリストを返します。
* @since 1.0.0
*/
public List<ContentDto> contentSearch(ContentSearchParameters param) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApiUrlContentSearch, param);
ContentVersionsJSON json = new ContentVersionsJSON(response.httpResponseBody);
lastPresentTime = json.presentTime;
return json.contentVersions;
}
public Thread getContentInfoAsync(GetContentParameters param, String outputFilePath, Observer observer, Long contentId) public Thread getContentInfoAsync(GetContentParameters param, String outputFilePath, Observer observer, Long contentId)
throws MalformedURLException { throws MalformedURLException {
Logger.d(TAG, "call api : getContentForAndroid [getContentInfoAsync]"); Logger.d(TAG, "call api : getContentForAndroid [getContentInfoAsync]");
...@@ -422,70 +378,6 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -422,70 +378,6 @@ public class AcmsClient implements AcmsClientResponseListener {
return downloader.downloadAsync(); return downloader.downloadAsync();
} }
public String getContentDetail(GetContentParameters param, String outputFilePath) throws MalformedURLException, ABVException, InterruptedException {
Logger.d(TAG, "call api : getContentForAndroid [getContentDetail]");
String downloadUrl = AcmsApis.getDownloadUrl(env.downloadServerAddress, urlPath, param.getContentId(), param.getSid(), param.getContentType());
Logger.d(TAG, "[url : %s], [param : %s]", downloadUrl, param.toHttpParameterString());
HttpFileDownloader downloader = new HttpFileDownloader(downloadUrl, null, outputFilePath);
downloader.downloadSync();
if (downloader.getState() != HttpDownloadState.finished) {
throw new ABVException(ABVExceptionCode.C_E_CONTENT_1001, downloader.getError());
}
return downloader.getOutputFileName();
}
/**
* サイネージ待ち受け画面をダウンロードします。
* @since 1.6.0
*/
public void downloadStandByPic(StandByPicParameters params) {
Logger.d(TAG, "call api : standByPic [downloadStandByPic]");
try {
String downloadUrl = AcmsApis.getDownloadStandByPicUrl(env.downloadServerAddress, urlPath);
String outputFilePath = ABVEnvironment.getInstance().getStandByPicFilePath(params.getType());
HttpFileDownloader downloader = new HttpFileDownloader(downloadUrl, params, outputFilePath);
downloader.setRequireFileSizeFirst(false);
downloader.downloadSync();
if (downloader.getState() == HttpDownloadState.finished) {
Logger.d(TAG, "[downloadStandByPic]:finished");
} else {
Logger.d(TAG, "[downloadStandByPic]:State:" + downloader.getState()); // 失敗しても画面には表示しない
}
} catch (Exception e) {
Logger.w(TAG, "[downloadStandByPic]:Error:" + e.getLocalizedMessage());
}
}
/**
* サイネージ下敷き画像をダウンロードします。
* @since 1.6.0
*/
public void downloadBackgroundPic(BackgroundPicParameters params) {
Logger.d(TAG, "call api : BackgroundPic [downloadBackgroundPic]");
try {
String downloadUrl = AcmsApis.getDownloadBackgroundPicUrl(env.downloadServerAddress, urlPath);
String outputFilePath = ABVEnvironment.getInstance().getBackgroundPicFilePath();
HttpFileDownloader downloader = new HttpFileDownloader(downloadUrl, params, outputFilePath);
downloader.setRequireFileSizeFirst(false);
downloader.downloadSync();
if (downloader.getState() == HttpDownloadState.finished) {
Logger.d(TAG, "[downloadBackgroundPic]:finished");
} else {
Logger.d(TAG, "[downloadBackgroundPic]:State:" + downloader.getState()); // 失敗しても画面には表示しない
}
} catch (Exception e) {
Logger.w(TAG, "[downloadBackgroundPic]:Error:" + e.getLocalizedMessage());
}
}
/** /**
* ログインしたユーザの所属する事業者のアプリ最新バージョン情報を取得します。 * ログインしたユーザの所属する事業者のアプリ最新バージョン情報を取得します。
* @param param {@link ServerTimeParameters} オブジェクトです。 * @param param {@link ServerTimeParameters} オブジェクトです。
...@@ -533,30 +425,6 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -533,30 +425,6 @@ public class AcmsClient implements AcmsClientResponseListener {
return json; return json;
} }
public boolean getBackupFile(GetBackupFileParameters param, String path) throws MalformedURLException {
Logger.d(TAG, "call api : getBackupFile [getBackupFile]");
boolean result = true;
try {
String downloadUrl = AcmsApis.getGetBackupFileUrl(env.acmsAddress, urlPath);
HttpFileDownloader downloader = new HttpFileDownloader(downloadUrl, param, path);
downloader.setRequireFileSizeFirst(false);
downloader.downloadSync();
if (downloader.getState() == HttpDownloadState.finished) {
Logger.d(TAG, "Download BackupFile finished");
} else {
Logger.e(TAG, "Download BackupFile State:" + downloader.getState()); // 成功以外はすべて失敗とみなす
result = false;
}
} catch (Exception e) {
Logger.e(TAG, "Download BackupFile failed");
result = false;
}
return result;
}
public AcmsMessageJSON uploadLogFile(String sid, File uploadFile, String appVersion, String deviceTypeId, String uid, String ma) throws AcmsException, NetworkDisconnectedException, IOException { public AcmsMessageJSON uploadLogFile(String sid, File uploadFile, String appVersion, String deviceTypeId, String uid, String ma) throws AcmsException, NetworkDisconnectedException, IOException {
String apiUrl = AcmsApis.getApiUrl(env.acmsAddress, urlPath, AcmsApis.ApiUrlUploadLogFile); String apiUrl = AcmsApis.getApiUrl(env.acmsAddress, urlPath, AcmsApis.ApiUrlUploadLogFile);
HttpMultipart part1 = new HttpMultipart("sid", sid); HttpMultipart part1 = new HttpMultipart("sid", sid);
...@@ -576,20 +444,6 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -576,20 +444,6 @@ public class AcmsClient implements AcmsClientResponseListener {
return json; return json;
} }
public AcmsMessageJSON contentRegist(String sid, File uploadFile, boolean autoDeliveryFlag) throws AcmsException, NetworkDisconnectedException, IOException {
String apiUrl = AcmsApis.getApiUrl(env.acmsAddress, urlPath, AcmsApis.ApiUrlContentRegist);
HttpMultipart part1 = new HttpMultipart("sid", sid);
HttpMultipart part2 = new HttpMultipart("record", "{\"autoDeliveryFlag\":" + (autoDeliveryFlag?"1":"0") + "}");
HttpMultipart part3 = new HttpMultipart("formFile", uploadFile);
HttpResponse result = HttpRequestSender.post(apiUrl, new HttpMultipart[] {part1, part2, part3});
AcmsMessageJSON json = new AcmsMessageJSON(result.httpResponseBody);
Logger.d(TAG, "uploadLogFile res: %s", json);
return json;
}
// TODO: リファクタリングの結果をABook+ブランチにも反映 // TODO: リファクタリングの結果をABook+ブランチにも反映
public String enqueteReply(EnqueteReplyParameters postParam, GetEnqueteReplyParameters getParam) throws AcmsException, NetworkDisconnectedException { public String enqueteReply(EnqueteReplyParameters postParam, GetEnqueteReplyParameters getParam) throws AcmsException, NetworkDisconnectedException {
...@@ -635,14 +489,6 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -635,14 +489,6 @@ public class AcmsClient implements AcmsClientResponseListener {
return json.result; return json.result;
} }
public SubscriptionHistoryJSON getSubscriptionHistory(SubscriptionHistoryParameters param) throws AcmsException, NetworkDisconnectedException {
HttpResponse response = send(AcmsApis.ApiUrlGetSubscriptionHistory, param);
SubscriptionHistoryJSON json = new SubscriptionHistoryJSON(response.httpResponseBody);
Logger.d(TAG, "json : %s", json);
return json;
}
public int checkSendLogFile(CheckSendLogParameters param) throws NetworkDisconnectedException, AcmsException { public int checkSendLogFile(CheckSendLogParameters param) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.CheckSendLogFileFormat, param); HttpResponse response = send(AcmsApis.CheckSendLogFileFormat, param);
LogSendFlagJSON json = new LogSendFlagJSON(response.httpResponseBody); LogSendFlagJSON json = new LogSendFlagJSON(response.httpResponseBody);
...@@ -1115,12 +961,10 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -1115,12 +961,10 @@ public class AcmsClient implements AcmsClientResponseListener {
private AcmsClientResponseListener listener = null; private AcmsClientResponseListener listener = null;
private String[] postMethod = new String[]{ // postで送るメソッド private String[] postMethod = new String[]{ // postで送るメソッド
AcmsApis.ApiUrlContentSearch,
AcmsApis.ApiUrlEnqueteReply, AcmsApis.ApiUrlEnqueteReply,
AcmsApis.ApiUrlContentReadingLog, AcmsApis.ApiUrlContentReadingLog,
AcmsApis.ApiUrlAddMemberGroup, AcmsApis.ApiUrlAddMemberGroup,
AcmsApis.ApiUrlContentVersion, AcmsApis.ApiUrlContentVersion,
AcmsApis.ApiUrlGetUserGroupList,
AcmsApis.ApiUrlNewAppStoreLogin, AcmsApis.ApiUrlNewAppStoreLogin,
AcmsApis.ApiUrlAppStoreNewLogin, AcmsApis.ApiUrlAppStoreNewLogin,
AcmsApis.ApiGetPushMessages, AcmsApis.ApiGetPushMessages,
...@@ -1183,5 +1027,4 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -1183,5 +1027,4 @@ public class AcmsClient implements AcmsClientResponseListener {
} }
} }
} }
} }
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ContentSetJSON.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.json;
import java.util.ArrayList;
import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
import jp.agentec.abook.abv.bl.common.util.JsonUtil;
import jp.agentec.abook.abv.bl.dto.SubscriptionDto;
import org.json.adf.JSONArray;
import org.json.adf.JSONObject;
public class ContentSetJSON extends AcmsCommonJSON {
public ArrayList<SubscriptionDto> SubscriptionDtoList;
public ContentSetJSON(String jsonString) throws AcmsException {
super(jsonString);
}
@Override
protected void parse(JSONObject json) throws JSONValidationException {
if (json.has("allSubscriptionList")) {
JSONArray array = json.getJSONArray("allSubscriptionList");
SubscriptionDtoList = new ArrayList<SubscriptionDto>();
for (int i = 0; i < array.length(); i++) {
JSONObject subJson = array.getJSONObject(i);
SubscriptionDto dto = new SubscriptionDto();
dto.productId = getString(subJson, "productId", null);
dto.delFlg = JsonUtil.getInt(subJson, "delFlg");
JSONArray historyList = JsonUtil.getJSONArray(subJson, "historyList");
if (historyList != null) {
for (int j = 0; j < historyList.length(); j++) {
JSONObject history = historyList.getJSONObject(j);
dto.addPeriod(JsonUtil.getLong(history, "start"), JsonUtil.getLong(history, "end"), JsonUtil.getString(history, "purchaseToken"));
}
}
SubscriptionDtoList.add(dto);
}
} else {
throw new JSONValidationException(json.toString(), "allSubscriptionList property not found.");
}
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/SubscriptionHistoryJSON.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.json;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
import jp.agentec.abook.abv.bl.common.util.JsonUtil;
import jp.agentec.abook.abv.bl.dto.SubscriptionHistoryDto;
import org.json.adf.JSONArray;
import org.json.adf.JSONObject;
public class SubscriptionHistoryJSON extends AcmsJSONParser {
public static final String HttpStatus = "httpStatus";
public static final String PurchaseHistoryId = "purchaseHistoryId";
public static final String PurchaseHistoryList = "purchaseHistoryList";
public static final String ContentSetId = "contentSetId";
// public static final String ContentSetName = "contentSetName";
public static final String AllFlg = "allFlg";
public static final String ProductId = "productId";
public static final String OrderId = "orderId";
public static final String PackageName = "packageName";
public static final String PurchaseTime = "purchaseTime";
public static final String PurchaseState = "purchaseState";
public static final String DeveloperPayload = "developerPayload";
public static final String PurchaseToken = "purchaseToken";
public static final String AutoRenewing = "autoRenewing";
public static final String StartTimeMillis = "startTimeMillis";
public static final String ExpiryTimeMillis = "expiryTimeMillis";
public static final String SentFlg = "sentFlg";
public static final String DelFlg = "delFlg";
public static final String InsertDate = "insertDate";
public static final String UpdateDate = "updateDate";
public static final String ErrorMessage = "errorMessage";
public static final String LoginErrorMessage = "loginErrorMessage";
public List<SubscriptionHistoryDto> dtoList;
public boolean isSuccess;
public String errorMessage;
public SubscriptionHistoryJSON(String jsonString) throws AcmsException {
super(jsonString);
}
@Override
protected void parse(JSONObject json) throws JSONValidationException {
if (json.getInt(HttpStatus) == 200) {
dtoList = new ArrayList<SubscriptionHistoryDto>();
JSONArray purchaseHistoryList = json.getJSONArray(PurchaseHistoryList);
for (int i = 0; i < purchaseHistoryList.length(); i++) {
JSONObject purchaseHistoryJson = purchaseHistoryList.getJSONObject(i);
SubscriptionHistoryDto dto = new SubscriptionHistoryDto();
dto.purchaseHistoryId = purchaseHistoryJson.getLong(PurchaseHistoryId);
dto.contentSetId = purchaseHistoryJson.getInt(ContentSetId);
// dto.contentSetName = json.getString(contentSetName);
dto.allFlg = purchaseHistoryJson.getInt(AllFlg);
dto.productId = purchaseHistoryJson.getString(ProductId);
dto.orderId = purchaseHistoryJson.getString(OrderId);
dto.packageName = purchaseHistoryJson.getString(PackageName);
dto.purchaseTime = purchaseHistoryJson.getLong(PurchaseTime);
dto.purchaseState = purchaseHistoryJson.getInt(PurchaseState);
dto.developerPayload = purchaseHistoryJson.getString(DeveloperPayload);
dto.purchaseToken = purchaseHistoryJson.getString(PurchaseToken);
dto.autoRenewing = JsonUtil.getBoolean(purchaseHistoryJson, AutoRenewing);
dto.startTimeMillis = JsonUtil.getLong(purchaseHistoryJson, StartTimeMillis);
dto.expiryTimeMillis = JsonUtil.getLong(purchaseHistoryJson, ExpiryTimeMillis);
dto.sentFlg = 1;
dto.delFlg = purchaseHistoryJson.getInt(DelFlg);
dto.insertDate = new Date();
dto.updateDate = new Date();
dtoList.add(dto);
}
isSuccess = true;
} else {
errorMessage = json.getString(LoginErrorMessage); // Localeに合わせたメッセージ
}
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/BackgroundPicParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import java.sql.Timestamp;
import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil;
/**
* サイネージ再生時の下敷き画像ダウンロード用のパラメータです。
* @author jang
* @version 1.6.0
*/
public class BackgroundPicParameters extends AcmsParameters {
private String type;
private Timestamp lastFetchDate;
public BackgroundPicParameters(String sid, String type, Timestamp lastFetchDate) {
super(sid);
this.type = type;
this.lastFetchDate = lastFetchDate;
}
public String getType() {
return type;
}
public String getLastFetchDate() {
if (lastFetchDate == null) {
return null;
}
return DateTimeUtil.toStringInTimeZone(lastFetchDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "GMT") + ",GMT";
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/ContentCheckDeliveryStartDateParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import java.util.Date;
/**
* コンテンツの公開開始日が正しいか確認するためのパラメータです。
* @author Taejin Hong
* @version 1.0.0
*/
public class ContentCheckDeliveryStartDateParameters extends AcmsContentParameters {
private Date deliveryStartDate;
/**
* {@link ContentCheckDeliveryStartDateParameters} クラスのインスタンスを初期化します。
* @param sid ログインした時のセッションIDです。
* @param contentId 確認するコンテンツのIDです。
* @param deliveryStartDate　コンテンツの公開開始日です。
* @since 1.0.0
*/
public ContentCheckDeliveryStartDateParameters(String sid, long contentId, Date deliveryStartDate) {
super(sid, contentId);
this.deliveryStartDate = deliveryStartDate;
}
/**
* コンテンツの公開開始日を返します。
* @return　コンテンツの公開開始日です。
* @since 1.0.0
*/
public Date getDeliveryStartDate() {
return deliveryStartDate;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/ContentSearchParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import jp.agentec.abook.abv.bl.acms.type.SearchDivisionType;
import jp.agentec.abook.abv.bl.common.exception.ABVRuntimeException;
import jp.agentec.adf.util.StringUtil;
/**
* コンテンツ検索用のパラメータです。
* @author Taejin Hong
* @version 1.1.0
*/
public class ContentSearchParameters extends AcmsParameters {
private String searchText;
private SearchDivisionType searchDivision;
/**
* @since 1.1.0
*/
private int groupId;
/**
* @since 1.1.0
*/
private int categoryId;
public static int None = -1;
/**
* {@link ContentSearchParameters} クラスのインスタンスを初期化します。
* @param sid ログインした時のセッションIDです。
* @param searchText　検索キーワードです。
* @param searchDivision　検索をかける項目です。
* @since 1.0.0
*/
public ContentSearchParameters(String sid, String searchText, SearchDivisionType searchDivision) {
super(sid);
this.searchText = searchText;
this.searchDivision = searchDivision;
this.groupId = None;
this.categoryId = None;
}
/**
* 検索キーワードを返します。
* @return　検索キーワードです。
* @since 1.0.0
*/
public String getSearchText() {
return searchText;
}
/**
* 検索をかける項目を返します。
*
* @return　検索をかける項目です。
* @since 1.0.0
*/
public int getSearchDivision() {
return searchDivision.type();
}
public int getGroupId() {
return groupId;
}
public void setGroupId(int groupId) {
this.groupId = groupId;
}
public int getCategoryId() {
return categoryId;
}
public void setCategoryId(int categoryId) {
this.categoryId = categoryId;
}
@Override
public String toHttpParameterString(String encoding) {
try {
StringBuffer sb = new StringBuffer();
sb.append(URLEncoder.encode("sid", encoding));
sb.append(DelimiterKeyValue);
if (!StringUtil.isNullOrEmpty(getSid())) {
sb.append(URLEncoder.encode(getSid(), encoding));
}
sb.append(DelimiterKeyKey);
sb.append(URLEncoder.encode("searchText", encoding));
sb.append(DelimiterKeyValue);
if (!StringUtil.isNullOrEmpty(searchText)) {
sb.append(URLEncoder.encode(getSearchText(), encoding));
}
sb.append(DelimiterKeyKey);
sb.append(URLEncoder.encode("searchDivision", encoding));
sb.append(DelimiterKeyValue);
//noinspection VariableNotUsedInsideIf
if (searchDivision != null) {
sb.append(getSearchDivision());
}
if (groupId != None) {
sb.append(DelimiterKeyKey);
sb.append(URLEncoder.encode("groupId", encoding));
sb.append(DelimiterKeyValue);
sb.append(getGroupId());
}
if (categoryId != None) {
sb.append(DelimiterKeyKey);
sb.append(URLEncoder.encode("categoryId", encoding));
sb.append(DelimiterKeyValue);
sb.append(getCategoryId());
}
return sb.toString();
} catch (UnsupportedEncodingException e) {
throw new ABVRuntimeException(e);
}
}
}
\ No newline at end of file
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetBackupFileParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
/**
* グループ取得用のパラメータです。
* @author Taejin Hong
* @version 1.0.0
*/
public class GetBackupFileParameters extends AcmsParameters {
private String fileType;
/**
* {@link GetBackupFileParameters} のインスタンスを初期化します。
* @param sid ログインした時のセッションIDです。
* @since 1.0.0
*/
public GetBackupFileParameters(String sid, String fileType) {
super(sid);
this.fileType=fileType;
}
public String getFileType() {
return fileType;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetContentPageImageParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
/**
* コンテンツ(PDF)の全ページのサムネイルのダウンロード用のパラメータです。
* @author Taejin Hong
* @version 1.0.0
*/
public class GetContentPageImageParameters extends AcmsContentParameters {
private String resolution;
/**
* {@link GetContentPageImageParameters} のインスタンスを初期化します。
* @param contentId ダウンロードするコンテンツのIDです。
* @param sid ログインした時のセッションIDです。
* @param resolution 端末の解像度を800x600のように指定します。
* @since 1.0.0
*/
public GetContentPageImageParameters(long contentId, String sid, String resolution) {
super(sid, contentId);
this.resolution = resolution;
}
/**
* 端末の解像度を取得します。
* @return 端末の解像度を返します。
* @since 1.0.0
*/
public String getResolution() {
return resolution;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/ReaderShareParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import java.util.Date;
import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil;
public class ReaderShareParameters extends AcmsParameters {
private long contentId;
private Date validStartDate;
private Date validEndDate;
private int maxDlCount;
private String password;
private String language;
public ReaderShareParameters(String sid, long contentId, Date validStartDate, Date validEndDate, int maxDlCount, String password, String language) {
super(sid);
this.contentId = contentId;
this.validStartDate = validStartDate;
this.validEndDate = validEndDate;
this.maxDlCount = maxDlCount;
this.password = password;
this.language = language;
}
public long getContentId() {
return contentId;
}
public String getValidStartDate() {
if (validStartDate != null) {
return DateTimeUtil.toStringInTimeZone(validStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "GMT") + ",GMT";
}
return null;
}
public String getValidEndDate() {
if (validEndDate != null) {
return DateTimeUtil.toStringInTimeZone(validEndDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "GMT") + ",GMT";
}
return null;
}
public int getMaxDlCount() {
return maxDlCount;
}
public String getPassword() {
return password;
}
public String getLanguage() {
return language;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/ReceiveDeviceTokenParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import jp.agentec.adf.net.http.HttpParameterObject;
import jp.agentec.adf.util.StringUtil;
/**
* 端末登録用のパラメータです。
* @author Taejin Hong
* @version 1.0.0
*/
public class ReceiveDeviceTokenParameters extends HttpParameterObject {
private String udid;
private String deviceToken;
private int appId;
private String appVersion;
private int deviceTypeId;
/**
* {@link ReceiveDeviceTokenParameters} クラスのインスタンスを初期化します。
* @param udid 端末のUDIDです。
* @param deviceToken デバイストークンです。
* @param appId アプリケーションIDです。
* @param appVersion アプリケーションの現在バージョンです。
* @param deviceTypeId 端末タイプです。
* @since 1.0.0
*/
public ReceiveDeviceTokenParameters(String udid, String deviceToken, int appId, String appVersion, int deviceTypeId) {
if (StringUtil.isNullOrWhiteSpace(udid)) {
throw new IllegalArgumentException("argument udid not allowed null or white space.");
}
if (StringUtil.isNullOrWhiteSpace(deviceToken)) {
throw new IllegalArgumentException("argument deviceToken not allowed null or white space.");
}
if (StringUtil.isNullOrWhiteSpace(appVersion)) {
throw new IllegalArgumentException("argument appVersion not allowed null or white space.");
}
this.udid = udid;
this.deviceToken = deviceToken;
this.appId = appId;
this.appVersion = appVersion;
this.deviceTypeId = deviceTypeId;
}
/**
* 端末のUDIDを返します。
* @return 端末のUDIDです。
* @since 1.0.0
*/
public String getUdid() {
return udid;
}
/**
* デバイストークンを返します。
* @return　デバイストークンです。
* @since 1.0.0
*/
public String getDeviceToken() {
return deviceToken;
}
/**
* アプリケーションIDを返します。
* @return アプリケーションIDです。
* @since 1.0.0
*/
public int getAppId() {
return appId;
}
/**
* アプリケーションの現在バージョンを返します。
* @return アプリケーションの現在バージョンです。
* @since 1.0.0
*/
public String getAppVersion() {
return appVersion;
}
/**
* 端末タイプを返します。
* @return 端末タイプです。
* @since 1.0.0
*/
public int getDeviceTypeId() {
return deviceTypeId;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/StandByPicParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import java.sql.Timestamp;
import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil;
/**
* サイネージ待ち受け画面ダウンロード用のパラメータです。
* @author tauchi
* @version 1.6.0
*/
public class StandByPicParameters extends AcmsParameters {
private String type;
private Timestamp lastFetchDate;
public StandByPicParameters(String sid, String type, Timestamp lastFetchDate) {
super(sid);
this.type = type;
this.lastFetchDate = lastFetchDate;
}
public String getType() {
return type;
}
public String getLastFetchDate() {
if (lastFetchDate == null) {
return null;
}
return DateTimeUtil.toStringInTimeZone(lastFetchDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "GMT") + ",GMT";
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/SubscriptionHistoryParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
/**
* 定期購読の履歴を取得するパラメータ
* @version 1.5.0
*/
public class SubscriptionHistoryParameters extends AcmsParameters {
private String account;
public SubscriptionHistoryParameters(String sid, String account) {
super(sid);
this.account = account;
}
public String getAccount() {
return account;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/SubscriptionHistorySendParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import jp.agentec.abook.abv.bl.dto.SubscriptionHistoryDto;
/**
* 定期購読の履歴を送信するパラメータ
* @version 1.5.0
*/
public class SubscriptionHistorySendParameters extends AcmsParameters {
private String account;
private String productId;
private Integer productType;
private String purchaseToken;
private String orderId;
private Long purchaseTime;
private Integer purchaseState;
private String developerPayload;
public SubscriptionHistorySendParameters(String sid, String account, SubscriptionHistoryDto subscriptionHistoryDto) {
super(sid);
this.account = account;
this.productId = subscriptionHistoryDto.productId;
this.productType = 2;
this.purchaseToken = subscriptionHistoryDto.purchaseToken;
this.orderId = subscriptionHistoryDto.orderId;
this.purchaseTime = subscriptionHistoryDto.purchaseTime;
this.purchaseState = subscriptionHistoryDto.purchaseState;
this.developerPayload = subscriptionHistoryDto.developerPayload;
}
public String getProductId() {
return productId;
}
public Integer getProductType() {
return productType;
}
public String getPurchaseToken() {
return purchaseToken;
}
public String getOrderId() {
return orderId;
}
public Long getPurchaseTime() {
return purchaseTime;
}
public Integer getPurchaseState() {
return purchaseState;
}
public String getDeveloperPayload() {
return developerPayload;
}
public String getAccount() {
return account;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/UploadBackupFileParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters;
import java.io.File;
/**
* グループ取得用のパラメータです。
* @author Taejin Hong
* @version 1.0.0
*/
public class UploadBackupFileParameters extends AcmsParameters {
private final File file;
/**
* {@link UploadBackupFileParameters} のインスタンスを初期化します。
* @param sid ログインした時のセッションIDです。
* @since 1.0.0
*/
public UploadBackupFileParameters(String sid, File file) {
super(sid);
this.file = file;
}
public File getFile() {
return file;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/reader/UserAccountParameters.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.acms.client.parameters.reader;
/**
* Readerユーザアカウント登録パラメータです
* @author tauchi
* @version 1.4.0
*/
public class UserAccountParameters {
public String loginId;
public String command;
public String deviceToken;
public Integer deviceTypeId;
public String appVersion;
public String siteContractIds;
public String language;
public UserAccountParameters(String loginId, String command, String deviceToken, Integer deviceTypeId, String appVersion, String siteContractIds, String language) {
this.loginId = loginId;
this.command = command;
this.deviceToken = deviceToken;
this.deviceTypeId = deviceTypeId;
this.appVersion = appVersion;
this.siteContractIds = siteContractIds;
this.language = language;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java
...@@ -34,11 +34,6 @@ public class AcmsApis { ...@@ -34,11 +34,6 @@ public class AcmsApis {
public static final String CheckApiUrlFormat = "%s/%s/checkapi/%s/"; public static final String CheckApiUrlFormat = "%s/%s/checkapi/%s/";
/** /**
* モバイルデバイスからのログイン
* @since 1.0.0
*/
public static final String ApiUrlMobileLogin = "mobileLogin";
/**
* モバイルデバイスからのログインで、初ログインの際に使う<br> * モバイルデバイスからのログインで、初ログインの際に使う<br>
* ACMS1.6に対応 * ACMS1.6に対応
* @since 1.1.0 * @since 1.1.0
...@@ -101,11 +96,6 @@ public class AcmsApis { ...@@ -101,11 +96,6 @@ public class AcmsApis {
*/ */
public static final String ApiUrlServiceOption = "serviceOption"; public static final String ApiUrlServiceOption = "serviceOption";
/** /**
* コンテンツを検索
* @since 1.0.0
*/
public static final String ApiUrlContentSearch = "contentSearch";
/**
* ログインしたユーザが所属する事業者のアプリ最新バージョンを取得 * ログインしたユーザが所属する事業者のアプリ最新バージョンを取得
* @since 1.0.0 * @since 1.0.0
*/ */
...@@ -116,18 +106,6 @@ public class AcmsApis { ...@@ -116,18 +106,6 @@ public class AcmsApis {
*/ */
public static final String ApiUrlContentCheckDeliverable = "contentCheckDeliverable"; public static final String ApiUrlContentCheckDeliverable = "contentCheckDeliverable";
/** /**
* アカウントの初期化。ユーザＩＤとＵＤＩＤの関連性を削除
* @since 1.0.0
*/
public static final String ApiUrlAccountInitialize = "accoundInitialize";
/**
* 着せ替え画像（トップ縦横/起動縦横）を取得
* TODO: later Androidでは対応予定がない
* @since 1.0.0
*/
@Deprecated
public static final String ApiUrlReplacementPic = "replacementPic";
/**
* パスワード変更が必要かどうかを取得 * パスワード変更が必要かどうかを取得
* @since 1.0.0 * @since 1.0.0
*/ */
...@@ -148,22 +126,12 @@ public class AcmsApis { ...@@ -148,22 +126,12 @@ public class AcmsApis {
public static final String ApiUrlUploadLogFile = "uploadLogFile"; public static final String ApiUrlUploadLogFile = "uploadLogFile";
public static final String ApiUrlContentRegist = "contentRegist";
public static final String ApiUrlGetAuthLevel = "getAuthLevel"; public static final String ApiUrlGetAuthLevel = "getAuthLevel";
public static final String ApiUrlAddMemberGroup = "addMemberGroup"; public static final String ApiUrlAddMemberGroup = "addMemberGroup";
public static final String ApiUrlContentSet = "contentSet";
public static final String ApiUrlGetSubscriptionHistory = "purchaseHistory/restore";
public static final String ApiUrlSendSubscriptionHistory = "purchaseHistory/register";
// デバイストークン更新 // デバイストークン更新
public static final String ApiUrlUpdateDeviceToken = "updateDeviceToken"; public static final String ApiUrlUpdateDeviceToken = "updateDeviceToken";
//ユーザ・グループ通信対象取得
public static final String ApiUrlGetUserGroupList = "userGroupList";
// プロジェクト一覧取得 // プロジェクト一覧取得
public static final String ApiProjectList = "projectList"; public static final String ApiProjectList = "projectList";
// 作業者グループ取得 // 作業者グループ取得
...@@ -200,23 +168,8 @@ public class AcmsApis { ...@@ -200,23 +168,8 @@ public class AcmsApis {
public static final String DownloadContentZipFileUrlFormat = "%s/%s/dl/contentZipFile/getContentForAndroid/%d/%s/%d"; public static final String DownloadContentZipFileUrlFormat = "%s/%s/dl/contentZipFile/getContentForAndroid/%d/%s/%d";
//public static final String DownloadContentZipFileUrlFormat = "%s/%s/dl/contentZipFile/getContent/%d/%s/%d"; //public static final String DownloadContentZipFileUrlFormat = "%s/%s/dl/contentZipFile/getContent/%d/%s/%d";
/**
* コンテンツ（PDF）の全ページのサムネイルを取得します。<br>
* 以下のフォーマットになります。<br>
* {host}/{url_path}/dl/contentZipFile/getPageImage/{contentId}/{sid}/{解像度}<br>
* 解像度は 800x600 のように表記します。
* @since 1.0.0
*/
public static final String DownloadContentPageImageUrlFormat = "%s/%s/dl/contentZipFile/getPageImage/%d/%s/%s";
public static final String DownloadApplicationAPKFile = "%s/%s/appdl/downloadApp/android/3/%s/%s"; public static final String DownloadApplicationAPKFile = "%s/%s/appdl/downloadApp/android/3/%s/%s";
public static final String DownloadStandByPicUrlFormat = "%s/%s/abvapi/standByPic/";
public static final String GetBackupFileUrlFormat = "%s/%s/abvapi/getBackupFile/";
public static final String DownloadBackgroundPicUrlFormat = "%s/%s/abvapi/backgroundPic/";
/** /**
* 端末からログ取得要求があるかどうかを判定する * 端末からログ取得要求があるかどうかを判定する
* @since 1.8.4 * @since 1.8.4
...@@ -286,51 +239,6 @@ public class AcmsApis { ...@@ -286,51 +239,6 @@ public class AcmsApis {
return url; return url;
} }
/**
* サイネージ待ち受け画面ダウンロードURLを完成します。
* @since 1.6.0
*/
public static String getGetBackupFileUrl(String host, String urlPath) {
return String.format(GetBackupFileUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath));
}
/**
* サイネージ待ち受け画面ダウンロードURLを完成します。
* @since 1.6.0
*/
public static String getDownloadStandByPicUrl(String host, String urlPath) {
return String.format(DownloadStandByPicUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath));
}
/**
* サイネージ再生時の下敷き画像ダウンロードURLを完成します。
* @since 1.6.0
*/
public static String getDownloadBackgroundPicUrl(String host, String urlPath) {
return String.format(DownloadBackgroundPicUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath));
}
/**
* コンテンツ（PDF）の全ページのサムネイルのZIPファイルのダウンロードURLを完成します。
* @param host ACMSのFQDNです。
* @param urlPath 事業者のurl_pathです。
* @param contentId ダウンロードするZIPファイルのコンテンツIDです。
* @param sid セッションIDです。
* @param resolution 端末の解像度を800x600のような文字列を指定します。
* @return 完成されたURLを返します。引数に誤りがあると空文字を返します。
* @since 1.0.0
*/
public static String getDownloadPageImageUrl(String host, String urlPath, long contentId, String sid, String resolution) {
String url = StringUtil.Empty;
if (!StringUtil.isNullOrWhiteSpace(host) && !StringUtil.isNullOrWhiteSpace(urlPath) && !StringUtil.isNullOrWhiteSpace(sid)
&& !StringUtil.isNullOrWhiteSpace(resolution)) {
url = String.format(DownloadContentPageImageUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath), contentId, sid, resolution);
}
return url;
}
public static String getDownloadApplicationFileUrl(String host, String urlPath, String sid, String currentDate) { public static String getDownloadApplicationFileUrl(String host, String urlPath, String sid, String currentDate) {
String url = StringUtil.Empty; String url = StringUtil.Empty;
if (!StringUtil.isNullOrWhiteSpace(host) && !StringUtil.isNullOrWhiteSpace(urlPath) && !StringUtil.isNullOrWhiteSpace(sid)) { if (!StringUtil.isNullOrWhiteSpace(host) && !StringUtil.isNullOrWhiteSpace(urlPath) && !StringUtil.isNullOrWhiteSpace(sid)) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/ABVEnvironment.java
...@@ -107,14 +107,6 @@ public class ABVEnvironment { ...@@ -107,14 +107,6 @@ public class ABVEnvironment {
public static final String TimeFileDirectoryFormat = "%s/ABook/time"; public static final String TimeFileDirectoryFormat = "%s/ABook/time";
public static final String CommonDirectoryFormat = "%s/ABook/common"; public static final String CommonDirectoryFormat = "%s/ABook/common";
public static final String StandByPicFileFormat = "standby_%s.jpg";
public static final String BacgroundPicFileFormat = "backPic_%s.jpg";
public static final String ScheduleJsonFileFormat = "%s/ABook/schedule.json";
//1.6.4から追加
public static final String WeatherJsonFormat = CommonDirectoryFormat + "/weather/weather.json";
public static final String TelopDirectoryFormat = "%s/ABook/telop";
public static final String PlaylistIDDirectoryFormat = TelopDirectoryFormat + "/%d";
public static final String ListOrderDirectoryFormat = PlaylistIDDirectoryFormat + "/%d";
public static final String ProjectDirFormat = "%s/ABook/projects/%d"; public static final String ProjectDirFormat = "%s/ABook/projects/%d";
public static final String ProjectTaskKeyDirFormat = "%s/ABook/projects/%d/%s"; public static final String ProjectTaskKeyDirFormat = "%s/ABook/projects/%d/%s";
...@@ -426,18 +418,6 @@ public class ABVEnvironment { ...@@ -426,18 +418,6 @@ public class ABVEnvironment {
return path; return path;
} }
public String getStandByPicFilePath(String type) {
return getCommonDirectoryPath() + File.separator + String.format(StandByPicFileFormat, type);
}
public String getBackgroundPicFilePath() {
return getCommonDirectoryPath() + File.separator + String.format(BacgroundPicFileFormat, aspectType);
}
public String getScheduleJsonFilePath() {
return String.format(ScheduleJsonFileFormat, rootDirectory);
}
public String getContentDownloadPath(long contentId) { public String getContentDownloadPath(long contentId) {
return String.format("%s/%s_%s.zip", getContentDownloadsDirectoryPath(), ContentZipType.ContentDownload, contentId); return String.format("%s/%s_%s.zip", getContentDownloadsDirectoryPath(), ContentZipType.ContentDownload, contentId);
} }
...@@ -558,22 +538,6 @@ public class ABVEnvironment { ...@@ -558,22 +538,6 @@ public class ABVEnvironment {
} }
} }
public String getWeatherJsonFile() {
return String.format(WeatherJsonFormat, rootDirectory);
}
public String getPlaylistIDDirectory(int playlistID) {
String path = String.format(PlaylistIDDirectoryFormat, rootDirectory, playlistID);
FileUtil.createNewDirectory(path);
return path;
}
public String getListOrderDirectory(int playlistId, int listOrder) {
String path = String.format(ListOrderDirectoryFormat, rootDirectory, playlistId, listOrder);
FileUtil.createNewDirectory(path);
return path;
}
public String getWebCacheDirectory() { public String getWebCacheDirectory() {
String webCacheDir = String.format(WebCacheDirectoryFormat, cacheDirectory); String webCacheDir = String.format(WebCacheDirectoryFormat, cacheDirectory);
FileUtil.createNewDirectory(webCacheDir); FileUtil.createNewDirectory(webCacheDir);
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java
...@@ -32,7 +32,6 @@ public class ABVDataCache { ...@@ -32,7 +32,6 @@ public class ABVDataCache {
private MemberInfoDto memberInfoDto = null; private MemberInfoDto memberInfoDto = null;
private List<ServiceOptionDto> serviceOptionDtoList = null; private List<ServiceOptionDto> serviceOptionDtoList = null;
public ArrayList<DashboardDto> dashboardList = null;
private String urlPath; private String urlPath;
private Integer diffMinFromUTC; // ACMSサーバ時間におけるUTCから差分 deliveryStartDateUTCを含まない旧コンテンツ用に必要 private Integer diffMinFromUTC; // ACMSサーバ時間におけるUTCから差分 deliveryStartDateUTCを含まない旧コンテンツ用に必要
...@@ -64,36 +63,6 @@ public class ABVDataCache { ...@@ -64,36 +63,6 @@ public class ABVDataCache {
} }
/** /**
* 指定したログインＩＤとパスワードと一致するユーザ情報をキャッシュから返します。<br>
* 該当ユーザが存在しないとnullを返します。<br>
* このメソッドはユーザ認証を行う時に利用します。
* @param loginId ユーザのログインＩＤです。
* @param password　ユーザのログインパスワードです。
* @return　ユーザ情報を格納した {@link MemberInfoDto} のインスタンスを返します。
* @since 1.0.0
*/
public MemberInfoDto getMemberInfo(String loginId, String password) {
if (!StringUtil.isNullOrWhiteSpace(loginId) && !StringUtil.isNullOrWhiteSpace(password)
&& memberInfoDto != null && memberInfoDto.loginId.equals(loginId) && memberInfoDto.password.equals(password)) {
return memberInfoDto;
}
return null;
}
/**
* サービスオプションの数を返します。
* @return　サービスオプションの数です。
* @since 1.0.0
*/
public int getServiceOptionCount() {
if (serviceOptionDtoList != null) {
return serviceOptionDtoList.size();
} else {
return 0;
}
}
/**
* 指定したserviceOptionIdに当てはまるサービスオプション情報を返します。 * 指定したserviceOptionIdに当てはまるサービスオプション情報を返します。
* @param serviceOptionId　サービスオプションリストから取り出す情報の番号です。 * @param serviceOptionId　サービスオプションリストから取り出す情報の番号です。
* @return サービスオプション情報です。指定したserviceOptionIdがサービスオプションリストに存在しない場合はnullを返します。 * @return サービスオプション情報です。指定したserviceOptionIdがサービスオプションリストに存在しない場合はnullを返します。
...@@ -123,16 +92,6 @@ public class ABVDataCache { ...@@ -123,16 +92,6 @@ public class ABVDataCache {
return memberInfoDto; return memberInfoDto;
} }
/**
* ログイン中か否かを返します。
*
* @return
*/
public boolean isLogin() {
MemberInfoDto dto = getMemberInfo() ;
return dto != null && dto.sid != null;
}
public int getDefaultCategoryId() { public int getDefaultCategoryId() {
return defaultCategoryId; return defaultCategoryId;
} }
...@@ -274,12 +233,6 @@ public class ABVDataCache { ...@@ -274,12 +233,6 @@ public class ABVDataCache {
defaultCategoryId = -1; defaultCategoryId = -1;
defaultGroupId = -1; defaultGroupId = -1;
urlPath = null; urlPath = null;
dashboardList = null;
}
public Date getLastPresentTime() {
return lastPresentTime;
} }
public void setLastPresentTime(Date lasttime) { public void setLastPresentTime(Date lasttime) {
...@@ -414,20 +367,4 @@ public class ABVDataCache { ...@@ -414,20 +367,4 @@ public class ABVDataCache {
} }
return null; return null;
} }
/**
* 端末のシステム日付と前回サーバアクセス日付のチェックを行う
*/
public boolean checkSysDateDiff() {
//前後の期間の判定
Calendar srvAcessdate = Calendar.getInstance();
srvAcessdate.setTime(lastPresentTime);
Calendar beforeDate = Calendar.getInstance();
Calendar afterDate = Calendar.getInstance();
beforeDate.add(Calendar.MINUTE, -1 * SEVER_ALERT_INTERVAL);
afterDate.add(Calendar.MINUTE, 1 * SEVER_ALERT_INTERVAL);
//範囲期間チェック True:範囲外（警告対象）
return srvAcessdate.compareTo(beforeDate) < 0 || srvAcessdate.compareTo(afterDate) > 0;
}
} }
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataOpenHelper.java
...@@ -18,7 +18,6 @@ import jp.agentec.abook.abv.bl.data.tables.MServiceOption; ...@@ -18,7 +18,6 @@ import jp.agentec.abook.abv.bl.data.tables.MServiceOption;
import jp.agentec.abook.abv.bl.data.tables.MWorkerGroup; import jp.agentec.abook.abv.bl.data.tables.MWorkerGroup;
import jp.agentec.abook.abv.bl.data.tables.RProjectContent; import jp.agentec.abook.abv.bl.data.tables.RProjectContent;
import jp.agentec.abook.abv.bl.data.tables.RContentCategory; import jp.agentec.abook.abv.bl.data.tables.RContentCategory;
import jp.agentec.abook.abv.bl.data.tables.RContentFolder;
import jp.agentec.abook.abv.bl.data.tables.RContentGroup; import jp.agentec.abook.abv.bl.data.tables.RContentGroup;
import jp.agentec.abook.abv.bl.data.tables.SQLiteTableScript; import jp.agentec.abook.abv.bl.data.tables.SQLiteTableScript;
import jp.agentec.abook.abv.bl.data.tables.TContent; import jp.agentec.abook.abv.bl.data.tables.TContent;
...@@ -32,7 +31,6 @@ import jp.agentec.abook.abv.bl.data.tables.TContentResource; ...@@ -32,7 +31,6 @@ import jp.agentec.abook.abv.bl.data.tables.TContentResource;
import jp.agentec.abook.abv.bl.data.tables.TContentServerSearched; import jp.agentec.abook.abv.bl.data.tables.TContentServerSearched;
import jp.agentec.abook.abv.bl.data.tables.TContentTag; import jp.agentec.abook.abv.bl.data.tables.TContentTag;
import jp.agentec.abook.abv.bl.data.tables.TEnquete; import jp.agentec.abook.abv.bl.data.tables.TEnquete;
import jp.agentec.abook.abv.bl.data.tables.TFolder;
import jp.agentec.abook.abv.bl.data.tables.TInspectTaskReport; import jp.agentec.abook.abv.bl.data.tables.TInspectTaskReport;
import jp.agentec.abook.abv.bl.data.tables.TMarkingSetting; import jp.agentec.abook.abv.bl.data.tables.TMarkingSetting;
import jp.agentec.abook.abv.bl.data.tables.TProject; import jp.agentec.abook.abv.bl.data.tables.TProject;
...@@ -67,10 +65,8 @@ public class ABVDataOpenHelper { ...@@ -67,10 +65,8 @@ public class ABVDataOpenHelper {
iTableScripts.add(new MMemberInfo()); iTableScripts.add(new MMemberInfo());
iTableScripts.add(new MGroup()); iTableScripts.add(new MGroup());
iTableScripts.add(new MCategory()); iTableScripts.add(new MCategory());
iTableScripts.add(new TFolder());
iTableScripts.add(new RContentCategory()); iTableScripts.add(new RContentCategory());
iTableScripts.add(new RContentGroup()); iTableScripts.add(new RContentGroup());
iTableScripts.add(new RContentFolder());
iTableScripts.add(new TContentDownloadQueue()); iTableScripts.add(new TContentDownloadQueue());
iTableScripts.add(new TContentTag()); iTableScripts.add(new TContentTag());
iTableScripts.add(new LContentReadingLog()); iTableScripts.add(new LContentReadingLog());
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ContentDao.java
...@@ -6,14 +6,11 @@ import java.util.List; ...@@ -6,14 +6,11 @@ import java.util.List;
import jp.agentec.abook.abv.bl.acms.type.ContentSortingType; import jp.agentec.abook.abv.bl.acms.type.ContentSortingType;
import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType; import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType;
import jp.agentec.abook.abv.bl.acms.type.SearchDivisionType;
import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.db.Cursor; import jp.agentec.abook.abv.bl.common.db.Cursor;
import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase; import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
import jp.agentec.abook.abv.bl.common.log.Logger; import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.data.SortDirection; import jp.agentec.abook.abv.bl.data.SortDirection;
import jp.agentec.abook.abv.bl.dto.ContentDto; import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.ContentSearchDto;
import jp.agentec.abook.abv.bl.dto.MydataDto; import jp.agentec.abook.abv.bl.dto.MydataDto;
import jp.agentec.adf.util.DateTimeFormat; import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil; import jp.agentec.adf.util.DateTimeUtil;
...@@ -328,276 +325,6 @@ public class ContentDao extends AbstractDao { ...@@ -328,276 +325,6 @@ public class ContentDao extends AbstractDao {
return (count > 0); return (count > 0);
} }
public List<ContentDto> getContents(ContentSearchDto contentSearchDto) {
String sql = generateGetcontentQuery(contentSearchDto);
String[] args = generateGetContentArguments(contentSearchDto);
return rawQueryGetDtoList(sql, args, ContentDto.class);
}
private String[] generateGetContentArguments(ContentSearchDto contentSearchDto) {
List<String> argList = new ArrayList<String>();
switch (contentSearchDto.contentGroupingType) {
case Folder:
if (contentSearchDto.contentGroupingId != null && !"0".equals(contentSearchDto.contentGroupingId.toString())) {
argList.add(StringUtil.toString(contentSearchDto.contentGroupingId));
}
break;
case Category:
case Group:
case Publisher:
if (!contentSearchDto.isOnlineSearched && contentSearchDto.searchDivisionType != null && !StringUtil.isNullOrWhiteSpace(contentSearchDto.searchKeyword)) {
if (contentSearchDto.searchDivisionType.equals(SearchDivisionType.FullText)) {
argList.add("%" + contentSearchDto.searchKeyword + "%");
}
}
if (contentSearchDto.contentGroupingId != null) {
argList.add(StringUtil.toString(contentSearchDto.contentGroupingId));
}
if (contentSearchDto.contentSubGroupingId != null) {
argList.add(StringUtil.toString(contentSearchDto.contentSubGroupingId));
}
if (!contentSearchDto.isOnlineSearched && contentSearchDto.searchDivisionType != null && !StringUtil.isNullOrWhiteSpace(contentSearchDto.searchKeyword)) {
switch (contentSearchDto.searchDivisionType) {
case Title:
case Tag:
argList.add("%" + contentSearchDto.searchKeyword + "%");
break;
case FullText:
case Memo:
default:
break;
}
}
break;
case All:
case Favorite:
default:
if (!contentSearchDto.isOnlineSearched && contentSearchDto.searchDivisionType != null && !StringUtil.isNullOrWhiteSpace(contentSearchDto.searchKeyword)) {
argList.add("%" + contentSearchDto.searchKeyword + "%");
}
break;
}
if (contentSearchDto.listCount > 0) {
argList.add(StringUtil.toString(contentSearchDto.listCount));
argList.add(StringUtil.toString(contentSearchDto.startContent));
}
return argList.toArray(new String[argList.size()]);
}
private String generateGetcontentQuery(ContentSearchDto contentSearchDto) {
StringBuffer sql = new StringBuffer();
sql.append(" SELECT tc.* ");
sql.append(" FROM ( ");
sql.append(" SELECT * ");
sql.append(" FROM t_content ");
sql.append(" ) AS tc ");
switch (contentSearchDto.contentGroupingType) {
case Folder:
sql.append(" LEFT OUTER JOIN r_content_folder AS rcf ");
sql.append(" ON tc.content_id = rcf.content_id ");
break;
case Category:
sql.append(" LEFT OUTER JOIN r_content_category AS rcc ");
sql.append(" ON tc.content_id = rcc.content_id ");
break;
case Group:
sql.append(" LEFT OUTER JOIN r_content_group AS rcg ");
sql.append(" ON tc.content_id = rcg.content_id ");
break;
case All:
case Favorite:
case Publisher:
default:
break;
}
if (contentSearchDto.isOnlineSearched) {
sql.append(" INNER JOIN t_content_server_searched AS tcss ");
sql.append(" ON tc.content_id = tcss.content_id ");
} else {
// 検索対象
if (contentSearchDto.searchDivisionType != null && !StringUtil.isNullOrWhiteSpace(contentSearchDto.searchKeyword)) {
switch (contentSearchDto.searchDivisionType) {
case Tag:
sql.append(" INNER JOIN t_content_tag AS tct ");
sql.append(" ON tc.content_id = tct.content_id ");
break;
case FullText:
sql.append(" INNER JOIN ( ");
sql.append(" SELECT content_id ");
sql.append(" FROM t_content_page ");
sql.append(" WHERE page_text LIKE ? ");
sql.append(" GROUP BY content_id ");
sql.append(" ) AS tcp ");
sql.append(" ON tc.content_id = tcp.content_id ");
break;
case Memo:
sql.append(" INNER JOIN ( ");
sql.append(" SELECT content_id ");
sql.append(" FROM t_content_memo ");
sql.append(" WHERE memo LIKE ? ");
sql.append(" GROUP BY content_id ");
sql.append(" ) AS tcm ");
sql.append(" ON tc.content_id = tcm.content_id ");
break;
case Title:
default:
break;
}
}
}
if (contentSearchDto.isOnlineSearched) {
sql.append(" WHERE 1 = 1 ");
} else {
if (contentSearchDto.downloaded == null) {
sql.append(" WHERE 1 = 1 ");
} else if (contentSearchDto.downloaded) {
sql.append(" WHERE tc.downloaded_flg = 1 ");
} else {
sql.append(" WHERE tc.downloaded_flg = 0 ");
}
}
// 公開前のコンテンツを除外
sql.append(" and tc.delivery_start_date <= \"");
sql.append(DateTimeUtil.toStringInTimeZone(DateTimeUtil.getCurrentDate(), DateTimeFormat.yyyyMMddHHmmss_hyphen, "GMT"));
sql.append("\" ");
// コンテンツタイプ
if (contentSearchDto.contentTypes != null && contentSearchDto.contentTypes.length > 0) {
sql.append(" AND tc.content_type IN (");
for (int i = 0; i < contentSearchDto.contentTypes.length; i++) {
sql.append("\"");
sql.append(contentSearchDto.contentTypes[i]);
sql.append("\"");
if (i != contentSearchDto.contentTypes.length - 1) {
sql.append(",");
}
}
// 下位互換のためPDF、空文字も入れておく
sql.append(",\"PDF\",'') ");
}
// グルーピング
switch (contentSearchDto.contentGroupingType) {
case Folder:
if (contentSearchDto.contentGroupingId != null && "0".equals(contentSearchDto.contentGroupingId.toString())) {
sql.append(" AND ( tc.content_id NOT IN( SELECT content_id FROM r_content_folder ) OR rcf.folder_id = 0 )");
} else //noinspection VariableNotUsedInsideIf
if (contentSearchDto.contentGroupingId != null) {
sql.append(" AND rcf.folder_id = ? ");
}
break;
case Category:
//noinspection VariableNotUsedInsideIf
if (contentSearchDto.contentGroupingId != null) {
//sql.append(" AND rcc.category_id = ? ");
sql.append(" AND rcc.category_relation_id = (SELECT category_relation_id FROM m_category WHERE category_id = ? LIMIT 1 ) ");
}
break;
case Group:
//noinspection VariableNotUsedInsideIf
if (contentSearchDto.contentGroupingId != null) {
sql.append(" AND rcg.group_relation_id = (SELECT group_relation_id FROM m_group WHERE group_id = ? LIMIT 1 ) ");
}
break;
case Publisher:
//noinspection VariableNotUsedInsideIf
if (contentSearchDto.contentGroupingId != null) {
sql.append(" AND tcic.site_id = ? AND tcic.contract_id = ? ");
}
break;
case All:
case Favorite:
default:
break;
}
if (!contentSearchDto.isOnlineSearched) {
// 検索キーワード
if (contentSearchDto.searchDivisionType != null && !StringUtil.isNullOrWhiteSpace(contentSearchDto.searchKeyword)) {
switch (contentSearchDto.searchDivisionType) {
case Title:
sql.append(" AND tc.content_name LIKE ? ");
break;
case Tag:
sql.append(" AND tct.tag_name LIKE ? ");
break;
case FullText:
case Memo:
default:
break;
}
}
}
// 並び順
if (contentSearchDto.contentSortingType != null) {
switch (contentSearchDto.contentSortingType) {
case ContentName:
sql.append(" ORDER BY tc.content_name ");
break;
case ContentNameKana:
sql.append(" ORDER BY tc.content_name_kana ");
break;
case DeliveryStartDate:
sql.append(" ORDER BY tc.delivery_start_date ");
break;
case DownloadDate:
sql.append(" ORDER BY tc.download_end_date ");
break;
case ReadingCount:
sql.append(" ORDER BY tc.reading_count ");
break;
case ReadingDate:
sql.append(" ORDER BY tc.reading_date ");
break;
case ContentSize:
sql.append(" ORDER BY tc.content_size ");
break;
case ContentId:
sql.append(" ORDER BY tc.contract_content_id ");
break;
default:
sql.append(" ORDER BY tc.delivery_start_date ");
contentSearchDto.sortDirection = SortDirection.DESC;
break;
}
} else {
sql.append(" ORDER BY tc.delivery_start_date ");
contentSearchDto.sortDirection = SortDirection.DESC;
}
sql.append(StringUtil.Space);
if (contentSearchDto.sortDirection != null) {
sql.append(contentSearchDto.sortDirection.direction());
} else {
sql.append(SortDirection.DESC.direction());
}
sql.append(StringUtil.Space);
if (contentSearchDto.listCount > 0) {
sql.append(" LIMIT ? OFFSET ? ");
}
sql.append(StringUtil.Space);
Logger.v(TAG, "sql=%s", sql);
return sql.toString();
}
public ContentDto getContent(long contentId) { public ContentDto getContent(long contentId) {
return rawQueryGetDto("select * from t_content where content_id=?", new String[]{"" + contentId}, ContentDto.class); return rawQueryGetDto("select * from t_content where content_id=?", new String[]{"" + contentId}, ContentDto.class);
} }
...@@ -727,7 +454,6 @@ public class ContentDao extends AbstractDao { ...@@ -727,7 +454,6 @@ public class ContentDao extends AbstractDao {
delete("t_content_download_queue", "content_id=?", keyValues); delete("t_content_download_queue", "content_id=?", keyValues);
delete("t_content_resource", "content_id=?", keyValues); delete("t_content_resource", "content_id=?", keyValues);
delete("r_content_folder", "content_id=?", keyValues);
delete("t_content_bookmark", "content_id=?", keyValues); delete("t_content_bookmark", "content_id=?", keyValues);
delete("t_content_memo", "content_id=?", keyValues); delete("t_content_memo", "content_id=?", keyValues);
delete("t_content_marking", "content_id=?", keyValues); delete("t_content_marking", "content_id=?", keyValues);
...@@ -786,10 +512,6 @@ public class ContentDao extends AbstractDao { ...@@ -786,10 +512,6 @@ public class ContentDao extends AbstractDao {
return rawQueryGetDtoList("select * from t_content where downloaded_flg=1", null, ContentDto.class); return rawQueryGetDtoList("select * from t_content where downloaded_flg=1", null, ContentDto.class);
} }
public List<ContentDto> getContentsNotInFolder(int folderId) {
return rawQueryGetDtoList("select * from t_content where downloaded_flg=1 and content_id not in (select content_id from r_content_folder where folder_id = ?)", new String[]{Integer.toString(folderId)}, ContentDto.class);
}
public List<MydataDto> getAllMyDataList(ContentSortingType contentSortingType, SortDirection sortDirection, String[] contentTypes) { public List<MydataDto> getAllMyDataList(ContentSortingType contentSortingType, SortDirection sortDirection, String[] contentTypes) {
StringBuffer sql = new StringBuffer(); StringBuffer sql = new StringBuffer();
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ContentFolderDao.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.data.dao;
import jp.agentec.abook.abv.bl.common.db.Cursor;
import jp.agentec.abook.abv.bl.dto.ContentFolderDto;
import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil;
public class ContentFolderDao extends AbstractDao {
/*package*/ ContentFolderDao() {
}
@Override
public ContentFolderDto convert(Cursor cursor) {
ContentFolderDto dto = new ContentFolderDto();
int colnum = cursor.getColumnIndex("content_id");
if (colnum != -1) {
dto.contentId = cursor.getLong(colnum);
}
colnum = cursor.getColumnIndex("folder_id");
if (colnum != -1) {
dto.folderId = cursor.getInt(colnum);
}
colnum = cursor.getColumnIndex("insert_date");
if (colnum != -1) {
dto.insertDate = DateTimeUtil.toDate(cursor.getString(colnum), "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
}
colnum = cursor.getColumnIndex("update_date");
if (colnum != -1) {
dto.updateDate = DateTimeUtil.toDate(cursor.getString(colnum), "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
}
return dto;
}
public ContentFolderDto getContentFolder(long contentId) {
return rawQueryGetDto("select * from r_content_folder where content_id=?", new String[]{""+ contentId}, ContentFolderDto.class);
}
public boolean getContentFolderCheck(int folderId, long contentId) {
int ret = rawQueryGetInt("select COUNT(content_id) AS content_count from r_content_folder where folder_id=? AND content_id=?", new String[]{""+ folderId, ""+ contentId});
return ret > 0;
}
public void insertContentFolder(ContentFolderDto dto) {
insert("insert into r_content_folder (folder_id, content_id, insert_date, update_date) values (?,?,?,?)", dto.getInsertValues());
}
public void deleteContentFolder(long contentId) {
delete("r_content_folder", "content_id=?", new String[]{""+ contentId});
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/GroupDao.java
...@@ -74,20 +74,6 @@ public class GroupDao extends AbstractDao { ...@@ -74,20 +74,6 @@ public class GroupDao extends AbstractDao {
private String generateGetGroupsQuery(QueryType queryType, int[] groupRelationids, int[] parentGroupIds, Boolean downloaded, String searchKeyword, SearchDivisionType searchDivisionType, boolean isOnlineSearched) { private String generateGetGroupsQuery(QueryType queryType, int[] groupRelationids, int[] parentGroupIds, Boolean downloaded, String searchKeyword, SearchDivisionType searchDivisionType, boolean isOnlineSearched) {
StringBuffer sql = new StringBuffer(); StringBuffer sql = new StringBuffer();
//
// int[] copyParentGroupIds = null;
//
// if (parentGroupIds != null) {
// copyParentGroupIds = new int[parentGroupIds.length + 1];
// copyParentGroupIds[0] = 0;
// for (int id = 0; id < parentGroupIds.length ; id++) {
// copyParentGroupIds[id+1] = parentGroupIds[id];
// }
// }else{
// copyParentGroupIds = new int[ 1];
// copyParentGroupIds[0] = 0;
// }
//
switch (queryType) { switch (queryType) {
/* /*
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/MemberInfoDao.java
...@@ -143,8 +143,6 @@ public class MemberInfoDao extends AbstractDao { ...@@ -143,8 +143,6 @@ public class MemberInfoDao extends AbstractDao {
delete("t_content_bookmark", null, null); delete("t_content_bookmark", null, null);
delete("t_content_memo", null, null); delete("t_content_memo", null, null);
update("update r_content_folder set folder_id=0", null);
delete("t_folder", "folder_id <> 0", null);
update("update t_content set favorite_flg=0", null); update("update t_content set favorite_flg=0", null);
if (isAllDelete) { if (isAllDelete) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/RContentFolder.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.data.tables;
import java.util.ArrayList;
import java.util.List;
import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
public class RContentFolder extends SQLiteTableScript {
public RContentFolder() {
}
@Override
public List<String> getCreateScript(int version) {
List<String> ddl = new ArrayList<String>();
StringBuffer sql = new StringBuffer();
// since 1.0.0
sql.append(" CREATE TABLE r_content_folder ( ");
sql.append(" folder_id INTEGER NOT NULL ");
sql.append(" , content_id BIGINT NOT NULL ");
sql.append(" , insert_date DATETIME NOT NULL ");
sql.append(" , update_date DATETIME NOT NULL ");
sql.append(" , PRIMARY KEY (folder_id, content_id) ");
sql.append(" , FOREIGN KEY (folder_id) REFERENCES t_folder (folder_id) ");
sql.append(" , FOREIGN KEY (content_id) REFERENCES t_content (content_id) ");
sql.append(" ) ");
ddl.add(sql.toString());
return ddl;
}
@Override
public List<String> getUpgradeScript(int oldVersion, int newVersion) {
return null;
}
@Override
public List<String> getMigrationScript(SQLiteDatabase databaseConnection, int oldVersion, int newVersion, Object... params) {
return null;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TFolder.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.data.tables;
import java.util.ArrayList;
import java.util.List;
import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.db.Cursor;
import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
import jp.agentec.abook.abv.bl.data.DatabaseVersions;
import jp.agentec.adf.util.StringUtil;
public class TFolder extends SQLiteTableScript {
public static final int RootFolderId = 0;
public TFolder() {
}
@Override
public List<String> getCreateScript(int version) {
List<String> ddl = new ArrayList<String>();
StringBuffer sql = new StringBuffer();
ABVEnvironment env = ABVEnvironment.getInstance();
// since 1.0.0
sql.append(" CREATE TABLE t_folder ( ");
sql.append(" folder_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT ");
sql.append(" , folder_name VARCHAR(64) NOT NULL ");
sql.append(" , parent_folder_id INTEGER NOT NULL ");
sql.append(" , disp_order SMALLINT NOT NULL DEFAULT 1 ");
sql.append(" , folder_path TEXT NOT NULL "); // path enumaerationパターンを適用する。since DatabaseVersions.Ver1_5_2_01
sql.append(" , insert_date DATETIME NOT NULL ");
sql.append(" , update_date DATETIME NOT NULL ");
sql.append(" ) ");
ddl.add(sql.toString());
StringUtil.clear(sql);
sql.append(" CREATE INDEX idx_folder_1 ON t_folder ( ");
sql.append(" parent_folder_id ");
sql.append(" ) ");
ddl.add(sql.toString());
StringUtil.clear(sql);
// since DatabaseVersions.Ver1_5_2_01
// sql.append(" CREATE UNIQUE INDEX udx_folder_1 ON t_folder ( "); // 不要
// sql.append(" folder_id, parent_folder_id ");
// sql.append(" ) ");
//
// ddl.add(sql.toString());
// StringUtil.clear(sql);
// since DatabaseVersions.Ver1_5_2_01
sql.append(" CREATE UNIQUE INDEX udx_folder_2 ON t_folder ( ");
sql.append(" folder_path ");
sql.append(" ) ");
ddl.add(sql.toString());
StringUtil.clear(sql);
sql.append(" INSERT INTO t_folder (folder_id, folder_name, parent_folder_id, disp_order, folder_path, insert_date, update_date) ");
sql.append(" VALUES (" + RootFolderId + ", '"+ env.mainFolderName +"', -1, 0, '" + RootFolderId + "', DATETIME('NOW'), DATETIME('NOW')) ");
ddl.add(sql.toString());
return ddl;
}
@Override
public List<String> getUpgradeScript(int oldVersion, int newVersion) {
return null;
}
@Override
public List<String> getMigrationScript(SQLiteDatabase databaseConnection, int oldVersion, int newVersion, Object... params) {
return null;
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentDownloader.java
...@@ -912,8 +912,8 @@ public class ContentDownloader { ...@@ -912,8 +912,8 @@ public class ContentDownloader {
GetContentParameters param = getContentInforParameters(contentId); GetContentParameters param = getContentInforParameters(contentId);
String filename = getContentInfoZipFilePath(param); String filename = getContentInfoZipFilePath(param);
ContentRefresher.getInstance().addRefreshingContentId(contentId); ContentRefresher.getInstance().addRefreshingContentId(contentId);
Thread thread = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getContentInfoAsync(param,filename, contentInforDownloadObserver, contentId);
try { try {
Thread thread = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getContentInfoAsync(param,filename, contentInforDownloadObserver, contentId);
thread.join(); thread.join();
} catch (InterruptedException e) { } catch (InterruptedException e) {
Logger.e(TAG,e); Logger.e(TAG,e);
...@@ -1016,55 +1016,6 @@ public class ContentDownloader { ...@@ -1016,55 +1016,6 @@ public class ContentDownloader {
AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getContentInfoAsync(param,fileName, contentInforDownloadObserver, contentId); AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getContentInfoAsync(param,fileName, contentInforDownloadObserver, contentId);
} }
/// ContentDetail ///
public void downloadContentDetail(final long contentId) throws NetworkDisconnectedException {
if (!networkAdapter.isNetworkConnected()) {
throw new NetworkDisconnectedException();
}
CommonExecutor.execute(new Runnable(){
@Override
public void run() {
HttpDownloadSimpleNotification notification = new HttpDownloadSimpleNotification(HttpDownloadState.downloading, contentId);
String fileName = null;
String outputFileName = null;
try {
GetContentParameters param = new GetContentParameters(contentId, cache.getMemberInfo().sid, ContentZipType.ContentDetail);
fileName = String.format("%s/%s_%s.zip", ABVEnvironment.getInstance().getContentDownloadsDirectoryPath(), param.getContentType(), param.getContentId());
outputFileName = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getContentDetail(param, fileName); // CMSからcontentDetail.zipを取得
String contentPath = ABVEnvironment.getInstance().getContentDetailDirectoryPath(contentId, false);
FileUtil.delete(contentPath);
contentFileExtractor.extractZipFile(contentId, outputFileName, contentPath);
contentLogic.saveContentDetail(contentId, contentPath);
notification.setDownloadState(HttpDownloadState.finished);
} catch (Exception e) {
Logger.e(TAG, "DownloadContentDetailWorker run failed", e);
if (!StringUtil.isNullOrWhiteSpace(fileName)) {
FileUtil.delete(fileName);
}
if (!StringUtil.isNullOrWhiteSpace(outputFileName)) {
try {
FileUtil.delete(outputFileName);
} catch (Exception e2) {
}
}
notification.setDownloadState(HttpDownloadState.failed);
} finally {
for (ContentDownloadListener listener : contentDownloadListenerSet) { // Listenerへ通知
listener.onDownloadedContentDetail(notification);
}
}
}
});
}
public void setDownloadSucceededFlag(boolean flag) { public void setDownloadSucceededFlag(boolean flag) {
this.downloadSucceededFlag = flag; this.downloadSucceededFlag = flag;
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentFileExtractor.java
...@@ -32,26 +32,21 @@ import jp.agentec.abook.abv.bl.common.exception.ABVExceptionCode; ...@@ -32,26 +32,21 @@ import jp.agentec.abook.abv.bl.common.exception.ABVExceptionCode;
import jp.agentec.abook.abv.bl.common.log.Logger; import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.common.util.ContentFileUtil; import jp.agentec.abook.abv.bl.common.util.ContentFileUtil;
import jp.agentec.abook.abv.bl.common.util.SecurityUtil; import jp.agentec.abook.abv.bl.common.util.SecurityUtil;
import jp.agentec.abook.abv.bl.data.ABVDataCache;
import jp.agentec.abook.abv.bl.data.dao.AbstractDao; import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
import jp.agentec.abook.abv.bl.data.dao.ContentDao; import jp.agentec.abook.abv.bl.data.dao.ContentDao;
import jp.agentec.abook.abv.bl.data.dao.ContentFolderDao;
import jp.agentec.abook.abv.bl.data.dao.ContentMarkingDao; import jp.agentec.abook.abv.bl.data.dao.ContentMarkingDao;
import jp.agentec.abook.abv.bl.data.dao.ContentMemoDao; import jp.agentec.abook.abv.bl.data.dao.ContentMemoDao;
import jp.agentec.abook.abv.bl.data.dao.ContentOldPdfDao; import jp.agentec.abook.abv.bl.data.dao.ContentOldPdfDao;
import jp.agentec.abook.abv.bl.data.dao.ContentPageDao; import jp.agentec.abook.abv.bl.data.dao.ContentPageDao;
import jp.agentec.abook.abv.bl.data.dao.ContentResourceDao; import jp.agentec.abook.abv.bl.data.dao.ContentResourceDao;
import jp.agentec.abook.abv.bl.data.tables.TFolder;
import jp.agentec.abook.abv.bl.dto.AbstractDto; import jp.agentec.abook.abv.bl.dto.AbstractDto;
import jp.agentec.abook.abv.bl.dto.ContentDto; import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.ContentFolderDto;
import jp.agentec.abook.abv.bl.dto.ContentMemoDto; import jp.agentec.abook.abv.bl.dto.ContentMemoDto;
import jp.agentec.abook.abv.bl.dto.ContentOldPdfDto; import jp.agentec.abook.abv.bl.dto.ContentOldPdfDto;
import jp.agentec.abook.abv.bl.dto.ContentPageDto; import jp.agentec.abook.abv.bl.dto.ContentPageDto;
import jp.agentec.abook.abv.bl.dto.ContentResourceDto; import jp.agentec.abook.abv.bl.dto.ContentResourceDto;
import jp.agentec.abook.abv.bl.logic.AbstractLogic; import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.ContentLogic; import jp.agentec.abook.abv.bl.logic.ContentLogic;
import jp.agentec.adf.util.DateTimeUtil;
import jp.agentec.adf.util.FileUtil; import jp.agentec.adf.util.FileUtil;
import jp.agentec.adf.util.RuntimeUtil; import jp.agentec.adf.util.RuntimeUtil;
import jp.agentec.adf.util.StringUtil; import jp.agentec.adf.util.StringUtil;
...@@ -70,7 +65,6 @@ public class ContentFileExtractor { ...@@ -70,7 +65,6 @@ public class ContentFileExtractor {
private ContentDao contentDao = AbstractDao.getDao(ContentDao.class); private ContentDao contentDao = AbstractDao.getDao(ContentDao.class);
private ContentResourceDao contentResourceDao = AbstractDao.getDao(ContentResourceDao.class); private ContentResourceDao contentResourceDao = AbstractDao.getDao(ContentResourceDao.class);
private ContentFolderDao contentFolderDao = AbstractDao.getDao(ContentFolderDao.class);
private ContentOldPdfDao contentOldPdfDao = AbstractDao.getDao(ContentOldPdfDao.class); private ContentOldPdfDao contentOldPdfDao = AbstractDao.getDao(ContentOldPdfDao.class);
public static ContentFileExtractor getInstance() { public static ContentFileExtractor getInstance() {
...@@ -921,18 +915,6 @@ public class ContentFileExtractor { ...@@ -921,18 +915,6 @@ public class ContentFileExtractor {
contentDto.updatedFlg = false; contentDto.updatedFlg = false;
contentDto.newFlg = false; contentDto.newFlg = false;
contentDao.updateContent(contentDto, false); contentDao.updateContent(contentDto, false);
ContentFolderDto contentFolderDto = contentFolderDao.getContentFolder(contentId);
if (contentFolderDto == null) {
contentFolderDto = new ContentFolderDto();
contentFolderDto.contentId = contentDto.contentId;
contentFolderDto.folderId = TFolder.RootFolderId;
contentFolderDto.insertDate = DateTimeUtil.getCurrentSqlDate();
contentFolderDto.updateDate = DateTimeUtil.getCurrentSqlDate();
contentFolderDao.insertContentFolder(contentFolderDto);
}
} }
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ContentFolderDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import java.util.Date;
/**
* グループ情報を格納します。
* @author Taejin Hong
* @version　1.0.0
*/
public class ContentFolderDto extends AbstractDto {
public long contentId;
public int folderId;
public Date insertDate;
public Date updateDate;
@Override
public Object[] getInsertValues() {
return new Object[]{folderId, contentId, insertDate, updateDate};
}
@Override
public String[] getKeyValues() {
return new String[]{""+ folderId};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ContentHasCategoryDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
/**
* コンテンツとジャンルの紐付きがあるかを示します。<br>
* DatabaseVersion 1 -> 2 アップグレードのマイグレーション用のメソッドです。
* @author Taejin Hong
* @version 1.0.0
*/
public class ContentHasCategoryDto extends AbstractDto {
public long contentId;
public int contentCount;
@Override
public Object[] getInsertValues() {
return new Object[]{};
}
@Override
public String[] getKeyValues() {
return new String[] {"contentId"};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ContentIdConvDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import java.util.Date;
public class ContentIdConvDto extends AbstractDto {
public long contentId;
public int siteId;
public int contractId;
public long cmsContentId;
public int contractContentId;
public String downloadUrl;
// 初期バージョン未使用（abkで使用）
public String targetAppVersion;
public Date exportDate;
public String cmsContentUpdateId;
public String shortUrl;
public Date insertDate;
public Date updateDate;
public ContentIdConvDto() {
}
public ContentIdConvDto(long contentId, int siteId, int contractId, long cmsContentId, int contractContentId, String downloadUrl, String targetAppVersion, Date exportDate, String cmsContentUpdateId, String shortUrl) {
super();
this.contentId = contentId;
this.siteId = siteId;
this.contractId = contractId;
this.cmsContentId = cmsContentId;
this.contractContentId = contractContentId;
this.downloadUrl = downloadUrl;
this.targetAppVersion = targetAppVersion;
this.exportDate = exportDate;
this.cmsContentUpdateId = cmsContentUpdateId;
this.shortUrl = shortUrl;
}
public ContentIdConvDto(long contentId, int siteId, int contractId, long cmsContentId, int contractContentId, String downloadUrl, String shortUrl) {
super();
this.contentId = contentId;
this.siteId = siteId;
this.contractId = contractId;
this.cmsContentId = cmsContentId;
this.contractContentId = contractContentId;
this.downloadUrl = downloadUrl;
this.shortUrl = shortUrl;
}
@Override
public String[] getKeyValues() {
return new String[]{""+contentId};
}
@Override
public Object[] getInsertValues() {
return new Object[]{contentId, siteId, contractId, cmsContentId, contractContentId, downloadUrl, targetAppVersion, exportDate, cmsContentUpdateId, shortUrl};
}
@Override
public Object[] getUpdateValues() {
return new Object[]{siteId, contractId, cmsContentId, contractContentId, downloadUrl, targetAppVersion, exportDate, cmsContentUpdateId, shortUrl, contentId};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ContentSearchDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import jp.agentec.abook.abv.bl.acms.type.ContentGroupingType;
import jp.agentec.abook.abv.bl.acms.type.ContentSortingType;
import jp.agentec.abook.abv.bl.acms.type.SearchDivisionType;
import jp.agentec.abook.abv.bl.data.SortDirection;
public class ContentSearchDto {
public Boolean downloaded;
public String searchKeyword;
public SearchDivisionType searchDivisionType;
public ContentGroupingType contentGroupingType;
public Object contentGroupingId;
public Object contentSubGroupingId;
public ContentSortingType contentSortingType;
public SortDirection sortDirection;
public int startContent;
public int listCount;
public boolean isOnlineSearched;
public String[] contentTypes;
public boolean removeNoPrice;
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ContractDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import java.util.Date;
public class ContractDto extends AbstractDto {
public Integer siteId;
public Integer contractId;
public String companyName;
public String urlPath;
public String undeliverableDelete;
public String usablePushMessage;
public String usableReadinglogGps;
public String usableReadinglogObject;
public Integer delFlg;
public Date insertDate;
public Date updateDate;
public Integer receivePushMessage;
public Date userUpdateDate;
public ContractDto() {
}
public ContractDto(Integer siteId, Integer contractId, String companyName, String urlPath, String undeliverableDelete, String usablePushMessage, String usableReadinglogGps, String usableReadinglogObject, Integer delFlg, Date insertDate, Date updateDate, Integer receivePushMessage ,Date userUpdateDate ) {
super();
this.siteId = siteId;
this.contractId = contractId;
this.companyName = companyName;
this.urlPath = urlPath;
this.undeliverableDelete = undeliverableDelete;
this.usablePushMessage = usablePushMessage;
this.usableReadinglogGps = usableReadinglogGps;
this.usableReadinglogObject = usableReadinglogObject;
this.delFlg = delFlg;
this.insertDate = insertDate;
this.updateDate = updateDate;
this.receivePushMessage = receivePushMessage;
this.userUpdateDate = userUpdateDate;
}
@Override
public String[] getKeyValues() {
return new String[]{""+siteId, ""+contractId};
}
@Override
public Object[] getInsertValues() {
return new Object[]{siteId, contractId, companyName, urlPath, undeliverableDelete, usablePushMessage, usableReadinglogGps, usableReadinglogObject, delFlg, insertDate, updateDate, receivePushMessage, userUpdateDate};
}
@Override
public Object[] getUpdateValues() {
return new Object[]{companyName, urlPath, undeliverableDelete, usablePushMessage, usableReadinglogGps, usableReadinglogObject, delFlg, insertDate, updateDate, receivePushMessage, userUpdateDate, siteId, contractId};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/FolderDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import java.util.Date;
/**
* フォルダ情報を格納します。
* @author Taejin Hong
* @version　1.0.1
*/
public class FolderDto extends AbstractDto {
public int folderId;
public String folderName;
public int parentFolderId;
public Date insertDate;
public Date updateDate;
public int contentCount;
public short dispOrder;
public boolean editFlg;
public String displayCount;
public String folderPath;
@Override
public Object[] getInsertValues() {
return new Object[]{folderId, folderName, parentFolderId, insertDate, updateDate, contentCount, dispOrder, editFlg, displayCount};
}
@Override
public String[] getKeyValues() {
return new String[]{""+ folderId};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/SearchHistoryDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import java.util.Date;
public class SearchHistoryDto extends AbstractDto {
public String searchText;
public Date insertDate;
@Override
public String[] getKeyValues() {
return new String[] {searchText};
}
@Override
public Object[] getInsertValues() {
return new Object[] {searchText, insertDate};
}
@Override
public Object[] getUpdateValues() {
return new Object[] {insertDate, searchText};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/SubscriptionDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import java.util.ArrayList;
import java.util.List;
public class SubscriptionDto {
public String productId;
public int delFlg;
public List<Period> historyList = new ArrayList<Period>();
public class Period {
public long start;
public long end;
public String purchaseToken;
public Period(long start, long end, String purchaseToken) {
this.start = start;
this.end = end;
this.purchaseToken = purchaseToken;
}
}
public void addPeriod(long start, long end, String purchaseToken) {
historyList.add(new Period(start, end, purchaseToken));
}
@Override
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("productId:" + productId);
sb.append(" delFlg:" + delFlg);
for (Period period : historyList) {
sb.append("[start:" + period.start + " end:" + period.end + " purchaseToken:" + period.purchaseToken + "] ");
}
return sb.toString();
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/SubscriptionHistoryDto.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.dto;
import java.util.Date;
public class SubscriptionHistoryDto extends AbstractDto {
public Integer subscriptionHistoryId;
public Long purchaseHistoryId;
public Integer contentSetId;
public String contentSetName;
public Integer allFlg;
public String productId;
public String orderId;
public String packageName;
public Long purchaseTime;
public Integer purchaseState;
public String developerPayload;
public String purchaseToken;
public Boolean autoRenewing;
public Long startTimeMillis;
public Long expiryTimeMillis;
public Integer sentFlg;
public Integer delFlg;
public Date insertDate;
public Date updateDate;
public SubscriptionHistoryDto() {
}
@Override
public String[] getKeyValues() {
return new String[]{""+subscriptionHistoryId};
}
@Override
public Object[] getInsertValues() {
return new Object[]{subscriptionHistoryId, purchaseHistoryId, contentSetId, contentSetName, allFlg, productId, orderId, packageName, purchaseTime, purchaseState, developerPayload, purchaseToken, autoRenewing, startTimeMillis, expiryTimeMillis, sentFlg, delFlg};
}
@Override
public Object[] getUpdateValues() {
return new Object[]{purchaseHistoryId, contentSetId, contentSetName, allFlg, productId, orderId, packageName, purchaseTime, purchaseState, developerPayload, purchaseToken, autoRenewing, startTimeMillis, expiryTimeMillis, sentFlg, delFlg, insertDate, subscriptionHistoryId};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CategoryLogic.java
...@@ -17,16 +17,6 @@ import jp.agentec.adf.util.StringUtil; ...@@ -17,16 +17,6 @@ import jp.agentec.adf.util.StringUtil;
public class CategoryLogic extends AbstractLogic { public class CategoryLogic extends AbstractLogic {
private CategoryDao categoryDao = AbstractDao.getDao(CategoryDao.class); private CategoryDao categoryDao = AbstractDao.getDao(CategoryDao.class);
//해당 콘텐츠 아이디를 가지고 있는 장르정보
public ArrayList<String>getExistContentsCategoryInfo(long contentId) {
List<CategoryDto>categoryDtoList = categoryDao.getExistContentCategory(contentId);
ArrayList<String>categoryList = new ArrayList<String>();
for (CategoryDto dto : categoryDtoList) {
categoryList.add(dto.categoryName);
}
return categoryList;
}
/** /**
* ジャンル情報をサーバから受信し、ローカルに保存します。既存のデータは上書きされます。また、サーバにないジャンルがローカルにある場合、そのジャンルは削除されます。 * ジャンル情報をサーバから受信し、ローカルに保存します。既存のデータは上書きされます。また、サーバにないジャンルがローカルにある場合、そのジャンルは削除されます。
* @throws ABVException　キャッシュにユーザ情報がありません。再度ログインする必要があります。 * @throws ABVException　キャッシュにユーザ情報がありません。再度ログインする必要があります。
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/ContentLogic.java
...@@ -29,7 +29,6 @@ import jp.agentec.abook.abv.bl.data.dao.ContentTagDao; ...@@ -29,7 +29,6 @@ import jp.agentec.abook.abv.bl.data.dao.ContentTagDao;
import jp.agentec.abook.abv.bl.dto.ContentDto; import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.ContentPageDto; import jp.agentec.abook.abv.bl.dto.ContentPageDto;
import jp.agentec.abook.abv.bl.dto.ContentTagDto; import jp.agentec.abook.abv.bl.dto.ContentTagDto;
import jp.agentec.abook.abv.bl.dto.SubscriptionHistoryDto;
import jp.agentec.abook.abv.bl.dto.comparator.ContentPageDtoComparator; import jp.agentec.abook.abv.bl.dto.comparator.ContentPageDtoComparator;
import jp.agentec.adf.util.FileUtil; import jp.agentec.adf.util.FileUtil;
import jp.agentec.adf.util.StringUtil; import jp.agentec.adf.util.StringUtil;
......
ABVJE_BL/test/jp/agentec/abook/abv/bl/acms/client/AcmsClientTest.java
...@@ -9,15 +9,12 @@ import java.util.Locale; ...@@ -9,15 +9,12 @@ import java.util.Locale;
import jp.agentec.abook.abv.bl.acms.client.json.AcmsMessageJSON; import jp.agentec.abook.abv.bl.acms.client.json.AcmsMessageJSON;
import jp.agentec.abook.abv.bl.acms.client.json.AuthLevelJSON; import jp.agentec.abook.abv.bl.acms.client.json.AuthLevelJSON;
import jp.agentec.abook.abv.bl.acms.client.json.SubscriptionHistoryJSON;
import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.AddMemberGroupParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AddMemberGroupParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ContentDownloadLogParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.ContentDownloadLogParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ContentReadingLogParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.ContentReadingLogParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseLoginParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseLoginParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ServerTimeParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.ServerTimeParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.SubscriptionHistoryParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.SubscriptionHistorySendParameters;
import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType; import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType;
import jp.agentec.abook.abv.bl.acms.type.InstallType; import jp.agentec.abook.abv.bl.acms.type.InstallType;
import jp.agentec.abook.abv.bl.common.ABVEnvironment; import jp.agentec.abook.abv.bl.common.ABVEnvironment;
...@@ -30,8 +27,6 @@ import jp.agentec.abook.abv.bl.common.nw.PCNetworkAdapter; ...@@ -30,8 +27,6 @@ import jp.agentec.abook.abv.bl.common.nw.PCNetworkAdapter;
import jp.agentec.abook.abv.bl.data.DBConnector; import jp.agentec.abook.abv.bl.data.DBConnector;
import jp.agentec.abook.abv.bl.data.dao.AbstractDao; import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
import jp.agentec.abook.abv.bl.dto.MemberInfoDto; import jp.agentec.abook.abv.bl.dto.MemberInfoDto;
import jp.agentec.abook.abv.bl.dto.SubscriptionDto;
import jp.agentec.abook.abv.bl.dto.SubscriptionHistoryDto;
import jp.agentec.adf.net.http.HttpRequestSender; import jp.agentec.adf.net.http.HttpRequestSender;
import jp.agentec.adf.util.StringUtil; import jp.agentec.adf.util.StringUtil;
...@@ -156,51 +151,4 @@ public class AcmsClientTest { ...@@ -156,51 +151,4 @@ public class AcmsClientTest {
System.out.println(" result=" + result); System.out.println(" result=" + result);
} }
@Test
public void restoreSubscriptionHistory() throws AcmsException, NetworkDisconnectedException, JSONValidationException, IOException {
HttpRequestSender.testUserAgent = "Android";
ABVEnvironment.getInstance().isReader = false;
ABVEnvironment.getInstance().acmsAddress = "http://localhost:28080/acms";
SubscriptionHistoryParameters param = new SubscriptionHistoryParameters("5fe9baeeeb51e51b639a0f5c568a071a", "agt.android06@gmail.com");
SubscriptionHistoryJSON result = AcmsClient.getInstance("billgates", new PCNetworkAdapter()).getSubscriptionHistory(param);
System.out.println(" result=" + result);
for (SubscriptionHistoryDto dto : result.dtoList) {
System.out.println(dto.purchaseToken);
}
}
@Test
public void contentSet() throws AcmsException, NetworkDisconnectedException, JSONValidationException, IOException {
HttpRequestSender.testUserAgent = "Android";
ABVEnvironment.getInstance().isReader = false;
ABVEnvironment.getInstance().acmsAddress = "http://localhost:28080/acms";
SubscriptionHistoryParameters param = new SubscriptionHistoryParameters("5fe9baeeeb51e51b639a0f5c568a071a", "agentec@gmail.com");
ArrayList<SubscriptionDto> dtoList = AcmsClient.getInstance("billgates", new PCNetworkAdapter()).contentSet(param);
for (SubscriptionDto dto : dtoList) {
System.out.println(dto);
AbstractDao.getDao(SubscriptionHistoryDao.class).update(dto);
}
}
@Test
public void sendHistory() throws AcmsException, NetworkDisconnectedException, JSONValidationException, IOException {
HttpRequestSender.testUserAgent = "Android";
ABVEnvironment.getInstance().isReader = false;
ABVEnvironment.getInstance().acmsAddress = "http://localhost:28080/acms";
List<SubscriptionHistoryDto> list = AbstractDao.getDao(SubscriptionHistoryDao.class).getUnsentList();
for (SubscriptionHistoryDto subscriptionHistoryDto : list) {
AcmsClient acmsClient = AcmsClient.getInstance("billgates", new PCNetworkAdapter());
SubscriptionHistorySendParameters subParam = new SubscriptionHistorySendParameters("5fe9baeeeb51e51b639a0f5c568a071a", "agentec@gmail.com", subscriptionHistoryDto);
acmsClient.sendHistory(subParam);
AbstractDao.getDao(SubscriptionHistoryDao.class).updateAsSent(subscriptionHistoryDto.subscriptionHistoryId);
}
}
} }
ABVJE_BL/test/jp/agentec/abook/abv/bl/data/dao/ContentIdConvDaoTest.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.data.dao;
import jp.agentec.abook.abv.bl.common.db.SQLiteOpenHelper;
import jp.agentec.abook.abv.bl.common.db.impl.JDBCSQLiteOpenHelper;
import jp.agentec.abook.abv.bl.data.DBConnector;
import jp.agentec.abook.abv.bl.dto.ContentIdConvDto;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class ContentIdConvDaoTest extends TestCase {
ContentIdConvDao contractDao = AbstractDao.getDao(ContentIdConvDao.class);
public ContentIdConvDaoTest(String string) {
super(string);
}
@Override
protected void setUp() throws Exception {
super.setUp();
DBConnector conn = DBConnector.getInstance();
SQLiteOpenHelper sqlLiteOpenHelper = new JDBCSQLiteOpenHelper("test.db", 0);
conn.setSqlLiteOpenHelper(sqlLiteOpenHelper);
((JDBCSQLiteOpenHelper)sqlLiteOpenHelper).onCreate(conn.getDatabase());
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
}
public static TestSuite suite() {
TestSuite suite = new TestSuite("ContentIdConvDaoTest");
suite.addTest(new ContentIdConvDaoTest("testInsert"));
suite.addTest(new ContentIdConvDaoTest("testUpdate"));
suite.addTest(new ContentIdConvDaoTest("testExists"));
return suite;
}
public void testInsert() throws Exception {
ContentIdConvDto dto = new ContentIdConvDto(1, 1, 2, 3, 4, "http://dl", null, null, null, "http://st.agentec.jp/0000");
contractDao.insert(dto);
System.out.println(contractDao.getDto(1).downloadUrl);
}
public void testUpdate() throws Exception {
ContentIdConvDto dto = new ContentIdConvDto(1, 1, 2, 3, 4, "http://dl/u", null, null, null, "http://st.agentec.jp/0000");
contractDao.update(dto);
System.out.println(contractDao.getDto(1).downloadUrl);
}
public void testExists() throws Exception {
System.out.println(contractDao.exists(0));
System.out.println(contractDao.exists(1));
}
public void testGetDtoByCmsContentId() throws Exception {
System.out.println(contractDao.getDtoByCmsContentId(1, 3).downloadUrl);
}
}
ABVJE_BL/test/jp/agentec/abook/abv/bl/data/dao/SearchHistoryDaoTest.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.data.dao;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import jp.agentec.abook.abv.bl.common.db.SQLiteOpenHelper;
import jp.agentec.abook.abv.bl.common.db.impl.JDBCSQLiteOpenHelper;
import jp.agentec.abook.abv.bl.data.DBConnector;
import jp.agentec.abook.abv.bl.dto.SearchHistoryDto;
import junit.framework.TestCase;
public class SearchHistoryDaoTest extends TestCase {
private static String[] searchText = new String[] {"aaaa", "bbbb", "cccc", "dddd", "aaaa"};
@Override
protected void setUp() throws Exception {
super.setUp();
DBConnector conn = DBConnector.getInstance();
SQLiteOpenHelper sqlLiteOpenHelper = new JDBCSQLiteOpenHelper("test.db", 0);
conn.setSqlLiteOpenHelper(sqlLiteOpenHelper);
((JDBCSQLiteOpenHelper)sqlLiteOpenHelper).onCreate(conn.getDatabase());
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
}
public void testInsertUpdateSearchHistory() throws Exception {
SearchHistoryDao dao = AbstractDao.getDao(SearchHistoryDao.class);
for (int i = 0; i < searchText.length; i++) {
String string = searchText[i];
SearchHistoryDto dto = new SearchHistoryDto();
dto.searchText = string;
dto.insertDate = new Date(System.currentTimeMillis());
dao.insertUpdateSearchHistory(dto);
Thread.sleep(1000);
}
}
public void testGetSearchHistoryDtoList() throws Exception {
List<SearchHistoryDto> list = new SearchHistoryDao().getSearchHistoryDtoList();
for (Iterator<SearchHistoryDto> iterator = list.iterator(); iterator.hasNext();) {
SearchHistoryDto searchHistoryDto = iterator.next();
System.out.println("searchHistoryDto:searchText=" + searchHistoryDto.searchText + ", inserDate=" + searchHistoryDto.insertDate.toString());
}
}
}
ABVJE_BL/test/jp/agentec/abook/abv/bl/logic/DashboardLogicTest.java deleted 100644 → 0
package jp.agentec.abook.abv.bl.logic;
import jp.agentec.abook.abv.bl.common.db.SQLiteOpenHelper;
import jp.agentec.abook.abv.bl.common.db.impl.JDBCSQLiteOpenHelper;
import jp.agentec.abook.abv.bl.data.DBConnector;
import jp.agentec.abook.abv.bl.dto.ContentMemoDto;
import jp.agentec.adf.util.DateTimeUtil;
import junit.framework.TestCase;
public class DashboardLogicTest extends TestCase {
private DashboardLogic memoLogic = AbstractLogic.getLogic(DashboardLogic.class);
@Override
protected void setUp() throws Exception {
super.setUp();
DBConnector conn = DBConnector.getInstance();
SQLiteOpenHelper sqlLiteOpenHelper = new JDBCSQLiteOpenHelper("test.db", 0);
conn.setSqlLiteOpenHelper(sqlLiteOpenHelper);
((JDBCSQLiteOpenHelper) sqlLiteOpenHelper).onCreate(conn.getDatabase());
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
}
}
ABVJE_Res_Default_Android/res/drawable/btn_menu_category.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_checked="true" android:drawable="@drawable/btn_menu_category_selected" />
<item android:state_checked="false" android:drawable="@drawable/btn_menu_category_normal" />
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/btn_menu_content.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_checked="true" android:drawable="@drawable/btn_menu_content_selected" />
<item android:state_checked="false" android:drawable="@drawable/btn_menu_content_normal" />
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/btn_menu_group.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<!--
<item
android:state_pressed="true"
android:state_focused="false"
android:drawable="@drawable/btn_menu_group_pressed"/>
<item
android:state_pressed="true"
android:state_focused="true"
android:drawable="@drawable/btn_menu_group_pressed"/>
<item
android:drawable="@drawable/btn_menu_group_normal"/>
-->
<item android:state_checked="true" android:drawable="@drawable/btn_menu_group_selected" />
<item android:state_checked="false" android:drawable="@drawable/btn_menu_group_normal" />
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/btn_menu_mydata.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_checked="true" android:drawable="@drawable/btn_menu_mydata_selected" />
<item android:state_checked="false" android:drawable="@drawable/btn_menu_mydata_normal" />
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/btn_menu_myfolder.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_checked="true" android:drawable="@drawable/btn_menu_myfolder_selected" />
<item android:state_checked="false" android:drawable="@drawable/btn_menu_myfolder_normal" />
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/btn_menu_publisher.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_checked="true" android:drawable="@drawable/btn_menu_publisher_selected" />
<item android:state_checked="false" android:drawable="@drawable/btn_menu_publisher_normal" />
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/dashboard_border.xml deleted 100644 → 0
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1px"
android:color="#E6E6E6" />
</shape>
ABVJE_Res_Default_Android/res/drawable/menu_bbs.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/menu_bbs_on"/>
<item
android:drawable="@drawable/menu_bbs_off"/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/menu_meeting.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/menu_meeting_on"/>
<item
android:drawable="@drawable/menu_meeting_off"/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/menu_setting.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/menu_setting_on"/>
<item
android:drawable="@drawable/menu_setting_off"/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/colors.xml
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="background">#edf2f2</color> <color name="background">#edf2f2</color>
<color name="trans_background">#aaedf2f2</color> <color name="trans_background">#aaedf2f2</color>
<color name="folder_background">#D5D5D5</color>
<color name="list_background">#FFFFFF</color> <color name="list_background">#FFFFFF</color>
<color name="alert_background">#FFFFFF</color> <color name="alert_background">#FFFFFF</color>
<color name="seek">#666666</color> <color name="seek">#666666</color>
......
ABVJE_UI_Android/res/layout/ac_backup_dialog.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/background"
android:orientation="vertical"
tools:context="jp.agentec.abook.abv.ui.home.activity.ABookSettingActivity" >
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ToolBarHolo"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/btn_close"
style="@style/ButtonABookGray"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="@string/close" />
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/backup"
android:textColor="@color/text_select"
android:textSize="@dimen/app_normal_text_size" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:orientation="vertical" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/backup_message_1"
android:textColor="@color/text_select"
android:textSize="15sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/backup_message_2"
android:textColor="@color/text_select"
android:textSize="15sp" />
</LinearLayout>
<CheckedTextView
android:id="@+id/item_memo"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:drawableLeft="@drawable/icon_mydata_memo"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:gravity="center_vertical"
android:text="@string/memo"
android:textColor="@color/text_select" />
<CheckedTextView
android:id="@+id/item_marking"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:drawableLeft="@drawable/ic_backup_maker"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:gravity="center_vertical"
android:text="@string/marking"
android:textColor="@color/text_select" />
<CheckedTextView
android:id="@+id/item_bookmark"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:drawableLeft="@drawable/icon_mydata_bookmark"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:gravity="center_vertical"
android:text="@string/bookmark"
android:textColor="@color/text_select" />
<Button
android:id="@+id/backup_btn"
style="@style/ButtonABookDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/commencement"
android:textSize="15sp" />
<TextView
android:id="@+id/backup_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/text_select"
android:textSize="15sp"
android:visibility="invisible" />
<ProgressBar
android:id="@+id/progress_backup_download"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_gravity="left|center"
android:gravity="left|center"
android:max="100"
android:visibility="invisible" />
<TextView
android:id="@+id/progress_backup_rate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/text_select"
android:textSize="15sp"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/ac_restore_dialog.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/alert_background"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ToolBarHolo"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/btn_close"
style="@style/ButtonABookGray"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="@string/close" />
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/restore"
android:textColor="@color/text_select"
android:textSize="@dimen/app_normal_text_size" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:orientation="vertical" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/restore_message_1"
android:textColor="@color/text_select"
android:textSize="15sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/restore_message_2"
android:textColor="@color/text_select"
android:textSize="15sp" />
</LinearLayout>
<CheckedTextView
android:id="@+id/item_memo"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:drawableLeft="@drawable/icon_mydata_memo"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:gravity="center_vertical"
android:text="@string/memo"
android:textColor="@color/text_select" />
<CheckedTextView
android:id="@+id/item_marking"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:drawableLeft="@drawable/ic_backup_maker"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:gravity="center_vertical"
android:text="@string/marking"
android:textColor="@color/text_select" />
<CheckedTextView
android:id="@+id/item_bookmark"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:drawableLeft="@drawable/icon_mydata_bookmark"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:gravity="center_vertical"
android:text="@string/bookmark"
android:textColor="@color/text_select" />
<Button
android:id="@+id/restore_btn"
style="@style/ButtonABookDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/commencement"
android:textSize="15sp" />
<TextView
android:id="@+id/restore_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/text_select"
android:textSize="15sp"
android:visibility="invisible" />
<ProgressBar
android:id="@+id/progress_restore_download"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_gravity="left|center"
android:gravity="left|center"
android:visibility="invisible" />
<TextView
android:id="@+id/progress_restore_rate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/text_select"
android:textSize="15sp"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/content_download_.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/linear_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical"
android:background="@color/list_background" >
<LinearLayout
style="@style/menu_linear"
android:layout_gravity="center">
<include android:layout_width="match_parent"
android:layout_height="match_parent"
layout="@layout/menu_detail_" />
</LinearLayout>
<LinearLayout
android:id="@+id/linear_table"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:orientation="horizontal"
android:layout_gravity="center">
</LinearLayout>
</LinearLayout>
ABVJE_UI_Android/res/layout/content_download_message_render.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@color/list_background">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:baselineAligned="false">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/Linear_progress"
android:layout_gravity="left|center"
android:gravity="left|center"
android:layout_margin="10dip"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:orientation="vertical" >
<TextView
android:id="@+id/txt_download_message"
style="@style/img_download_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:paddingTop="5dip"
android:textSize="23sp"
android:textColor="@color/text_select" />
</LinearLayout>
<LinearLayout
android:layout_width="60dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginRight="10dp"
android:layout_alignParentRight="true"
android:gravity="center"
android:orientation="horizontal" >
<ImageButton
android:id="@+id/btn_all_cancel"
android:background="@drawable/btn_download_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/content_description"
android:layout_gravity="center"
android:gravity="center"/>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#000000"
android:gravity="bottom"
android:orientation="horizontal" >
</LinearLayout>
</LinearLayout>
ABVJE_UI_Android/res/layout/layout_folder.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/linearlayoutlist"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/folder_background"
android:orientation="vertical" >
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="#00000000"
android:background="@color/transparent"
android:cacheColorHint="@color/folder_background" >
</ListView>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/menu_btn_download.xml deleted 100644 → 0
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/btn_download"
android:background="@drawable/icon_download"
android:gravity="left|center"
android:layout_gravity="center"
style="@style/icon_menu"
android:layout_marginBottom="0dp"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_marginTop="0dp"
android:visibility="invisible"/>
\ No newline at end of file
ABVJE_UI_Android/res/layout/menu_detail_.xml deleted 100644 → 0
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/relativeLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent">
<LinearLayout
android:id="@+id/toolbarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/dialog_header_shadow"
android:orientation="horizontal" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:layout_marginLeft="10dp">
<ImageButton
android:id="@+id/btn_exit"
style="@style/icon_menu"
android:background="@drawable/btn_close_"
android:contentDescription="@string/end"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:layout_gravity="center" >
<TextView
android:id="@+id/txt_detail_menu_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:textColor="@color/text_menu"
android:textSize="10pt"
android:maxLines="1" />
<ImageButton
android:id="@+id/btn_all_cancle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/btn_download_cancel"
android:contentDescription="@string/download"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
ABVJE_UI_Android/res/layout/popup_filter_list.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/mydata_bg"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/toolbar_min_size" >
<TextView
android:id="@+id/filter_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/filter"
android:textColor="@color/text_color"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
<Button
android:id="@+id/popup_title_left"
style="@style/ButtonABookLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingRight="10dp"
android:text="@string/dummy_str"
android:textSize="@dimen/app_normal_text_size"
android:visibility="gone"
android:maxLines="1" />
<Button
android:id="@+id/filter_reset"
style="@style/ButtonABookDark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:text="@string/reset"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
</RelativeLayout>
<LinearLayout
android:id="@+id/filterLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:orientation="vertical" >
<CheckedTextView
android:id="@+id/checkedFavorite"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/radius_frame"
android:drawableLeft="@drawable/ic_favorite"
android:checkMark="?android:attr/textCheckMark"
android:gravity="center_vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:text="@string/favorite"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/text_select" />
<CheckedTextView
android:id="@+id/checkedUpdateTarget"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/radius_frame"
android:drawableLeft="@drawable/icon_update"
android:checkMark="?android:attr/textCheckMark"
android:gravity="center_vertical"
android:layout_marginTop="5dp"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:text="@string/update_target"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/text_select" />
</LinearLayout>
<RelativeLayout
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/toolbar_min_size" >
<TextView
android:id="@+id/contenttype_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/contenttype_title"
android:textColor="@color/text_color"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
<Button
android:id="@+id/popup_title_left2"
style="@style/ButtonABookLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingRight="10dp"
android:text="@string/dummy_str"
android:textSize="@dimen/app_normal_text_size"
android:visibility="gone"
android:maxLines="1" />
<Button
android:id="@+id/popup_right_title2"
style="@style/ButtonABookLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:text="@string/dummy_str"
android:textSize="@dimen/app_normal_text_size"
android:visibility="gone"
android:maxLines="1" />
</RelativeLayout>
<LinearLayout
android:id="@+id/listLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight="1"
android:background="@drawable/radius_frame"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:paddingTop="5dp" >
<ListView
android:id="@+id/popup_list_menu"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/list_background"
android:divider="#cccccc"
android:dividerHeight="1px"
android:fadingEdge="none"
android:scrollingCache="false" >
</ListView>
<LinearLayout
android:id="@+id/empty_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" >
<TextView
android:id="@+id/empty_list_item"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/text_select" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/popup_folder_addtext.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<jp.agentec.abook.abv.ui.common.view.ABVEditText
android:id="@+id/newFolderText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:imeOptions="actionDone"
android:maxLines="1">
<requestFocus />
</jp.agentec.abook.abv.ui.common.view.ABVEditText>
<LinearLayout
android:id="@+id/buttonLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/okBtn"
style="@style/ButtonABookLight"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/create" />
<Button
android:id="@+id/cancelBtn"
style="@style/ButtonABookGray"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/cancel" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/popup_folder_footer.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/app_color"
android:gravity="center_vertical" >
<Button
android:id="@+id/name_change_button"
style="@style/ButtonABookDark"
android:text="@string/name_change"
android:drawableLeft="@drawable/ic_forder_name_change" />
<Button
android:id="@+id/move_button"
style="@style/ButtonABookDark"
android:layout_toRightOf="@+id/name_change_button"
android:text="@string/move"
android:drawableLeft="@drawable/ic_folder_move" />
<Button
android:id="@+id/end_button"
style="@style/ButtonABookLight"
android:layout_alignParentRight="true"
android:text="@string/end" />
</RelativeLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/popup_select_with_checkbox.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/alert_background"
android:minWidth="320dp"
android:orientation="vertical" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/basic_blue1"
android:minHeight="@dimen/toolbar_min_size" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dp"
android:gravity="left"
android:src="@drawable/icon"
android:contentDescription="@string/dummy_str" />
<TextView
android:id="@+id/select_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:gravity="center"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textColor="@color/text_color"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:orientation="vertical" >
<TextView
android:id="@+id/checkedNonNexttimeExplain"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:text="@string/not_show_next_time_explain"
android:textColor="@color/text_select" />
<CheckedTextView
android:id="@+id/checkedNonNexttime"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checkMark="?android:attr/textCheckMark"
android:gravity="center_vertical"
android:layout_margin="5dp"
android:clickable="true"
android:text="@string/not_show_next_time"
android:textColor="@color/text_select" />
<Button
android:id="@+id/select_open"
style="@style/ButtonABookDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/radius_frame"
android:layout_margin="5dp"
android:padding="5dp"
android:gravity="center"
android:text="@string/open"
android:textColor="@color/text_select"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
<Button
android:id="@+id/select_download"
style="@style/ButtonABookDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/radius_frame"
android:layout_margin="5dp"
android:padding="5dp"
android:gravity="center"
android:text="@string/download"
android:textColor="@color/text_select"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
<Button
android:id="@+id/select_streaming"
style="@style/ButtonABookDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/radius_frame"
android:layout_margin="5dp"
android:padding="5dp"
android:gravity="center"
android:text="@string/streaming"
android:textColor="@color/text_select"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
<Button
android:id="@+id/select_cancel"
style="@style/ButtonABookDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/radius_frame"
android:layout_margin="5dp"
android:padding="5dp"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/text_select"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/search_layout.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/search_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<jp.agentec.abook.abv.ui.common.view.ABVEditText
android:id="@+id/search_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="4dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_search_left"
android:imeOptions="actionSearch"
android:inputType="text"
android:lines="1"
android:textColor="@color/text_select" >
<requestFocus />
</jp.agentec.abook.abv.ui.common.view.ABVEditText>
<Button
android:id="@+id/search"
style="@style/ButtonABookDark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="100dp"
android:onClick="onClickSearch"
android:text="@string/search" />
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/ABVUIDataCache.java
...@@ -5,7 +5,6 @@ import java.util.Stack; ...@@ -5,7 +5,6 @@ import java.util.Stack;
import jp.agentec.abook.abv.bl.common.log.Logger; import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.dto.CategoryDto; import jp.agentec.abook.abv.bl.dto.CategoryDto;
import jp.agentec.abook.abv.bl.dto.FolderDto;
import jp.agentec.abook.abv.bl.dto.GroupDto; import jp.agentec.abook.abv.bl.dto.GroupDto;
import jp.agentec.abook.abv.cl.util.PreferenceUtil; import jp.agentec.abook.abv.cl.util.PreferenceUtil;
import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.DefPrefKey; import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.DefPrefKey;
...@@ -34,7 +33,6 @@ public class ABVUIDataCache { ...@@ -34,7 +33,6 @@ public class ABVUIDataCache {
// グループ、ジャンル、マイフォルダ階層スタック // グループ、ジャンル、マイフォルダ階層スタック
public Stack<GroupDto> groupStack; public Stack<GroupDto> groupStack;
public Stack<CategoryDto> categoryStack; public Stack<CategoryDto> categoryStack;
public Stack<FolderDto> folderStack;
public boolean preIsCatalogEdition; public boolean preIsCatalogEdition;
...@@ -59,7 +57,6 @@ public class ABVUIDataCache { ...@@ -59,7 +57,6 @@ public class ABVUIDataCache {
private void init() { private void init() {
groupStack = new Stack<>(); groupStack = new Stack<>();
categoryStack = new Stack<>(); categoryStack = new Stack<>();
folderStack = new Stack<>();
} }
public long saveLastUpdateTime() { public long saveLastUpdateTime() {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java
...@@ -93,7 +93,6 @@ public interface AppDefType { ...@@ -93,7 +93,6 @@ public interface AppDefType {
String SORT_CONDITION_ALL = "sortConditionAll"; String SORT_CONDITION_ALL = "sortConditionAll";
String SELECTED_HOME_MENU = "selectedHomeMenu"; String SELECTED_HOME_MENU = "selectedHomeMenu";
String MY_DATA_SUBMENU = "myDataSubmenu"; String MY_DATA_SUBMENU = "myDataSubmenu";
String SELECTED_DASHBOARD_MENU = "selectedDashboardMenu";
String MEETING_ENTERED_TIME = "meetingEnteredTime"; String MEETING_ENTERED_TIME = "meetingEnteredTime";
String MEETING_ENTERED_FLG = "meetingEnteredFlg"; String MEETING_ENTERED_FLG = "meetingEnteredFlg";
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/dto/ContentPageSerializableDto.java deleted 100644 → 0
package jp.agentec.abook.abv.ui.common.dto;
import java.io.Serializable;
/**
* コンテンツの詳細情報を格納します。
* @author Taejin Hong
* @version 1.0.0
*/
@SuppressWarnings("serial")
public class ContentPageSerializableDto implements Serializable{
private String pageText;
private String pageThumbnailPath;
public String getPageText() {
return pageText;
}
public void setPageText(String pageText) {
this.pageText = pageText;
}
public String getPageThumbnailPath() {
return pageThumbnailPath;
}
public void setPageThumbnailPath(String pageThumbnailPath) {
this.pageThumbnailPath = pageThumbnailPath;
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/dto/HierarchicalDto.java deleted 100644 → 0
package jp.agentec.abook.abv.ui.common.dto;
import java.io.Serializable;
import java.util.Date;
/**
* ロック情報を格納します。<br>
* Ver 1.0.2 : Serializable 구현 by Taejin Hong
* @author Minhyuk Seok
* @version　1.0.2
*/
public class HierarchicalDto implements Serializable {
private static final long serialVersionUID = 4758643358702898376L;
private String folder_name; // フォルダ名
private int relation_id; // 関係IDグループのみ他のは0に設定する
private int folder_level; // フォルダ階層
private int folder_id; // フォルダID
private int parent_folderid; // 親フォルダID
private int content_count; // コンテンツ数
/**
* サイドバー表示用のコンテンツ数
* @since 1.0.1
*/
private String display_count;
private int folder_maxlength; // 表示文字列最大文字数
private boolean check_flg; // チェックボタンフラグ（true:ON, false:OFF）
private boolean open_flg = false; // 直下フォルダ表示フラグ（true:表示済み, false:未表示）
private boolean checkShow_flg; // チェックボタン表示フラグ（true:表示, false:非表示）
private boolean search_add_flg; // チェックボタン表示フラグ（true:表示, false:非表示）
private Date insert_Date; // 追加日時
private Date update_Date; // 更新日時
public void setFolderName(String folder_name_) {
this.folder_name = folder_name_;
}
public String getFolderName() {
return folder_name;
}
public void setFolderLevel(int folder_level_) {
this.folder_level = folder_level_;
}
public int getFolderLevel() {
return folder_level;
}
public void setRelationId(int relation_id_) {
this.relation_id = relation_id_;
}
public int getRelationId() {
return relation_id;
}
public void setFolderId(int folder_id_) {
this.folder_id = folder_id_;
}
public int getFolderId() {
return folder_id;
}
public void setParentFolderId(int parent_folderid_) {
this.parent_folderid = parent_folderid_;
}
public int getParentFolderId() {
return parent_folderid;
}
public void setContentCount(int content_count_) {
this.content_count = content_count_;
}
public int getContentCount() {
return content_count;
}
public String getDisplayCount() {
return display_count;
}
public void setDisplayCount(String display_count) {
this.display_count = display_count;
}
public void setFolderMaxLength(int folder_maxlength_) {
this.folder_maxlength = folder_maxlength_;
}
public int getFolderMaxLength() {
return folder_maxlength;
}
public void setOpenFlg(boolean open_flg_) {
this.open_flg = open_flg_;
}
public boolean getOpenFlg() {
return open_flg;
}
public void setCheckFlg(boolean check_flg_) {
this.check_flg = check_flg_;
}
public boolean getCheckFlg() {
return check_flg;
}
public void setCheckShowFlg(boolean checkShow_flg_) {
this.checkShow_flg = checkShow_flg_;
}
public boolean getCheckShowFlg() {
return checkShow_flg;
}
public void setSearchAddFlg(boolean search_add_flg) {
this.search_add_flg = search_add_flg;
}
public boolean getSearchAddFlg() {
return search_add_flg;
}
public void setInsertDate(Date insert_Date) {
this.insert_Date = insert_Date;
}
public Date getInsertDate() {
return insert_Date;
}
public void setUpdateDate(Date update_Date) {
this.update_Date = update_Date;
}
public Date getUpdateDate() {
return update_Date;
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
...@@ -111,7 +111,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -111,7 +111,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
private MeetingManager meetingManager; private MeetingManager meetingManager;
private ABookAlertDialog downloadConfirmDialog; private ABookAlertDialog downloadConfirmDialog;
private boolean requireHomeReload; private boolean requireHomeReload;
private boolean requireDashBoardReload;
private ABookAlertDialog promotionRequestAlertDialog; private ABookAlertDialog promotionRequestAlertDialog;
private long lastDisconnect; private long lastDisconnect;
private static Dialog meetingAlertDialog; private static Dialog meetingAlertDialog;
...@@ -822,10 +821,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -822,10 +821,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
this.requireHomeReload = requireHomeReload; this.requireHomeReload = requireHomeReload;
} }
public void setRequireDashBoardReload(boolean requireDashBoardReload) {
this.requireDashBoardReload = requireDashBoardReload;
}
/** /**
* 遠隔連動メッセージ受信処理 * 遠隔連動メッセージ受信処理
* MeetingMangerからObserver経由で呼び出される * MeetingMangerからObserver経由で呼び出される
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment