Skip to content

A
abook_check
Commit 253738c9 by Kazuyuki Hida
Options

Revert "Merge branch 'contract/sato/1.0.301_53022_group_id' into 'contract/sato/1.0.301'" 

This reverts merge request !312
parent c7799992
Showing with 16 additions and 36 deletions
ABVJE_BL/build.gradle
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.8 sourceCompatibility = 1.6
targetCompatibility = 1.8 targetCompatibility = 1.6
version = '1.0' version = '1.0'
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
...@@ -832,15 +832,11 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -832,15 +832,11 @@ public class AcmsClient implements AcmsClientResponseListener {
Logger.d(TAG, "[url : %s], [param : %s]", apiUrl, param==null?"":param.toHttpParameterString()); Logger.d(TAG, "[url : %s], [param : %s]", apiUrl, param==null?"":param.toHttpParameterString());
HttpTaskWorker<HttpParameterObject> httpTaskThread = null; HttpTaskWorker<HttpParameterObject> httpTaskThread = new HttpTaskWorker<HttpParameterObject>(methodName, apiUrl, param);
try { try {
long t = HttpRequestSender.DefaultConnectionTimeout * 2;
for (int i = 0; i < 3; i++, t *= 2) {
httpTaskThread = new HttpTaskWorker<HttpParameterObject>(methodName, apiUrl, param);
httpTaskThread.start(); httpTaskThread.start();
httpTaskThread.join(t); httpTaskThread.join(HttpRequestSender.DefaultConnectionTimeout);
}
} catch (Exception e) { } catch (Exception e) {
Logger.e(TAG, e); Logger.e(TAG, e);
Logger.d(TAG, ExceptionDetailMessage.SERVER_IS_DISCONNECTED); Logger.d(TAG, ExceptionDetailMessage.SERVER_IS_DISCONNECTED);
...@@ -884,14 +880,12 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -884,14 +880,12 @@ public class AcmsClient implements AcmsClientResponseListener {
} }
String apiUrl = url; String apiUrl = url;
HttpMultipartTaskWorker<HttpMultipart> httpTaskThread = null;
HttpMultipartTaskWorker<HttpMultipart> httpTaskThread = new HttpMultipartTaskWorker<HttpMultipart>(apiUrl, param);
try{ try{
long t = HttpRequestSender.DefaultConnectionTimeout * 2;
for (int i = 0; i < 3; i++, t *= 2) {
httpTaskThread = new HttpMultipartTaskWorker<HttpMultipart>(apiUrl, param);
httpTaskThread.start(); httpTaskThread.start();
httpTaskThread.join(t); httpTaskThread.join(HttpRequestSender.DefaultConnectionTimeout);
}
} catch (Exception e) { } catch (Exception e) {
Logger.d(TAG, ExceptionDetailMessage.SERVER_IS_DISCONNECTED); Logger.d(TAG, ExceptionDetailMessage.SERVER_IS_DISCONNECTED);
// サーバとの通信中、予期せぬ問題が発生しました。（1） // サーバとの通信中、予期せぬ問題が発生しました。（1）
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentRefresher.java
...@@ -86,6 +86,10 @@ import jp.agentec.adf.util.DateTimeUtil; ...@@ -86,6 +86,10 @@ import jp.agentec.adf.util.DateTimeUtil;
private ContentRefresher() { private ContentRefresher() {
} }
public void setContentDownloadListener(ContentDownloadListener contentDownloadListener) {
this.contentDownloadListener = contentDownloadListener;
}
/** /**
* コンテンツ情報をACMSから更新します。 * コンテンツ情報をACMSから更新します。
* @throws ABVException　キャッシュにユーザ情報がありません。再度ログインする必要があります。 * @throws ABVException　キャッシュにユーザ情報がありません。再度ログインする必要があります。
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/MasterDataLogic.java
...@@ -9,7 +9,6 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.FetchDateParameters; ...@@ -9,7 +9,6 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.FetchDateParameters;
import jp.agentec.abook.abv.bl.common.ABVEnvironment; import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.exception.ABVException; import jp.agentec.abook.abv.bl.common.exception.ABVException;
import jp.agentec.abook.abv.bl.common.exception.AcmsException; import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException;
import jp.agentec.abook.abv.bl.common.log.Logger; import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.adf.util.FileUtil; import jp.agentec.adf.util.FileUtil;
...@@ -26,7 +25,7 @@ public class MasterDataLogic extends AbstractLogic { ...@@ -26,7 +25,7 @@ public class MasterDataLogic extends AbstractLogic {
* @throws Exception その他、例外です。 * @throws Exception その他、例外です。
* @since 1.0.0 * @since 1.0.0
*/ */
public String initializeMasterData(String lastFetchDate) throws AcmsException, NetworkDisconnectedException, IOException { public String initializeMasterData(String lastFetchDate) {
String fetchDate = null; String fetchDate = null;
try { try {
FetchDateParameters param = new FetchDateParameters(cache.getMemberInfo().sid, lastFetchDate); FetchDateParameters param = new FetchDateParameters(cache.getMemberInfo().sid, lastFetchDate);
...@@ -48,7 +47,6 @@ public class MasterDataLogic extends AbstractLogic { ...@@ -48,7 +47,6 @@ public class MasterDataLogic extends AbstractLogic {
fetchDate = masterDataJson.fetchDate; fetchDate = masterDataJson.fetchDate;
} catch (Exception e) { } catch (Exception e) {
Logger.e(TAG, "masterDataSend error : ", e); Logger.e(TAG, "masterDataSend error : ", e);
throw e;
} }
// masterData の fetchDateを渡す。 // masterData の fetchDateを渡す。
return fetchDate; return fetchDate;
......
ABVJE_BL/src/jp/agentec/adf/net/http/HttpRequestSender.java
...@@ -42,10 +42,10 @@ public class HttpRequestSender { ...@@ -42,10 +42,10 @@ public class HttpRequestSender {
/** /**
* ホストに接続するまでのタイムアウト時間をミリ秒で設定します。<br> * ホストに接続するまでのタイムアウト時間をミリ秒で設定します。<br>
* デフォルトは5,000ミリ秒（5秒）です。 * デフォルトは20,000ミリ秒（20秒）です。
* @since 1.0.0 * @since 1.0.0
*/ */
public static final int DefaultConnectionTimeout = 5 * 1000; public static final int DefaultConnectionTimeout = 20 * 1000;
/** /**
* 通信に利用する既定の文字セットです。UTF-8となります。 * 通信に利用する既定の文字セットです。UTF-8となります。
* @since 1.0.0 * @since 1.0.0
......
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -1462,5 +1462,4 @@ ...@@ -1462,5 +1462,4 @@
<string name="msg_permission_dialog_bluetooth">Bluetooth利用権限が必要です。\nアプリ設定画面へ遷移します。</string> <string name="msg_permission_dialog_bluetooth">Bluetooth利用権限が必要です。\nアプリ設定画面へ遷移します。</string>
<string name="dashboard">ダッシュボード</string> <string name="dashboard">ダッシュボード</string>
<string name="failed_get_master_data">マスタデータの取得に失敗しました。画面を更新してください。</string>
</resources> </resources>
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -1475,5 +1475,4 @@ ...@@ -1475,5 +1475,4 @@
<string name="msg_permission_dialog_bluetooth">Bluetooth usage authority is required. \n To transition to the application setting screen.</string> <string name="msg_permission_dialog_bluetooth">Bluetooth usage authority is required. \n To transition to the application setting screen.</string>
<string name="dashboard">Dashboard</string> <string name="dashboard">Dashboard</string>
<string name="failed_get_master_data">Failed to get master data. Refresh Home screen.</string>
</resources> </resources>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -423,23 +423,10 @@ public class OperationListActivity extends OperationActivity { ...@@ -423,23 +423,10 @@ public class OperationListActivity extends OperationActivity {
@Override @Override
public void onRefreshedContent(final boolean result, long contentId, Exception e) { public void onRefreshedContent(final boolean result, long contentId, Exception e) {
final Exception ex = e; super.onRefreshedContent(result, contentId, e);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
if (ex != null) {
// ヘッダーの新着更新処理を完了にさせる
stopUpdateAnimation();
final ABookAlertDialog messageDialog = AlertDialogUtil.createAlertDialog(OperationListActivity.this, R.string.app_name);
messageDialog.setMessage(getString(R.string.failed_get_master_data));
messageDialog.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
messageDialog.dismiss();
}
});
messageDialog.show();
}
if (!contentRefresher.isRefreshing()) { if (!contentRefresher.isRefreshing()) {
// 新着処理が終わったら以下の処理が実行 // 新着処理が終わったら以下の処理が実行
stopUpdateAnimation(); stopUpdateAnimation();
......
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