Skip to content

A
abook_check
Commit 8d0010b3 by Lee Jaebin
Options

レビュー後、コメント追加・ソース整理

parent fb34f60a
Showing with 39 additions and 36 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
......@@ -1176,8 +1176,8 @@ public class OperationLogic extends AbstractLogic {
/**
* 作業報告履歴データ送信(全体)
* @param operationId
* @param progressCallback
* @param operationId 作業ID
* @param progressCallback コールバック用
* @return
* @throws Exception
*/
......@@ -1187,8 +1187,9 @@ public class OperationLogic extends AbstractLogic {
/**
* 作業報告履歴データ送信
* @param operationId
* @param taskKey
* @param operationId 作業ID
* @param taskKey 報告・回答のキー
* @param progressCallback コールバック用
* @throws Exception
*/
public void sendTaskReportSendData(long operationId, String taskKey, Integer taskReportLevel, Callback progressCallback) throws Exception {
......@@ -1301,9 +1302,10 @@ public class OperationLogic extends AbstractLogic {
/**
* 作業関連ディレクトリ削除
*
* @param operationId
* @param contentId
* @param taskKey
* @param operationId 作業ID
* @param contentId 資料ID
* @param taskKey 報告・回答のキー
* @param taskReportLevel 報告・回答のレベル
*/
public void deleteTaskFileData(long operationId, long contentId, String taskKey, int taskReportLevel) {
FileUtil.delete(ABVEnvironment.getInstance().getTempTaskDirPath(contentId, taskKey));
......@@ -1539,9 +1541,9 @@ public class OperationLogic extends AbstractLogic {
/**
* 作業報告の取得
* @param taskKey
* @param taskReportlevel
* @return
* @param taskKey 報告・回答キー
* @param taskReportlevel 作業レベル
* @return TaskReportDto 作業報告
*/
public TaskReportDto getTaskReport(String taskKey, int taskReportlevel) {
return mTaskReportDao.getTaskReport(taskKey, taskReportlevel);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
......@@ -25,7 +25,6 @@ import android.widget.FrameLayout;
import android.widget.GridView;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.RadioGroup;
import android.widget.TextView;
......@@ -41,7 +40,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -63,7 +61,6 @@ import jp.agentec.abook.abv.bl.common.CommonExecutor;
import jp.agentec.abook.abv.bl.common.Constant;
import jp.agentec.abook.abv.bl.common.Constant.ReportType;
import jp.agentec.abook.abv.bl.common.Constant.TaskReportLevel;
import jp.agentec.abook.abv.bl.common.Constant.PushMessageSendType;
import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
import jp.agentec.abook.abv.bl.common.exception.ABVException;
import jp.agentec.abook.abv.bl.common.exception.ABVExceptionCode;
......@@ -79,17 +76,14 @@ import jp.agentec.abook.abv.bl.data.dao.TaskReportDao;
import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.FixPushMessageDto;
import jp.agentec.abook.abv.bl.dto.OperationContentDto;
import jp.agentec.abook.abv.bl.dto.OperationDto;
import jp.agentec.abook.abv.bl.dto.OperationGroupMasterDto;
import jp.agentec.abook.abv.bl.dto.PushMessageDto;
import jp.agentec.abook.abv.bl.dto.TaskDto;
import jp.agentec.abook.abv.bl.dto.TaskReportDto;
import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.OperationGroupMasterLogic;
import jp.agentec.abook.abv.bl.logic.OperationLogic;
import jp.agentec.abook.abv.bl.logic.PushMessageLogic;
import jp.agentec.abook.abv.cl.util.PreferenceUtil;
import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.activity.ABVUIActivity;
......@@ -100,18 +94,13 @@ import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
import jp.agentec.abook.abv.ui.common.helper.ProgressDialogHelper;
import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
import jp.agentec.abook.abv.ui.common.util.KeyboardUtils;
import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
import jp.agentec.abook.abv.ui.common.view.ABVBatchSyncView;
import jp.agentec.abook.abv.ui.common.view.ABVListDialog;
import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
import jp.agentec.abook.abv.ui.home.adapter.FixPushMessageAdapter;
import jp.agentec.abook.abv.ui.home.adapter.HierarchyOperationGroupListAdapter;
import jp.agentec.abook.abv.ui.home.adapter.OperationSelectAdapter;
import jp.agentec.abook.abv.ui.home.adapter.PushMessageListAdapter;
import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
import jp.agentec.abook.abv.ui.home.helper.HomeOperationListHelper;
......@@ -357,9 +346,11 @@ public class OperationListActivity extends ABVUIActivity {
private void showCommonContent() {
Intent intent = new Intent();
intent.setClass(OperationListActivity.this, OperationRelatedContentActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intent, NaviConsts.Right);
}
// ツールバーの設定
private void configurationToolbarIcon() {
// バッチを付けるか判定して、イメージを設定
......@@ -1914,7 +1905,7 @@ public class OperationListActivity extends ABVUIActivity {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
popup.dismiss();
setGroupLocation(id);
setOperationLocation(id);
}
});
if (anchor == null) {
......@@ -1947,7 +1938,7 @@ public class OperationListActivity extends ABVUIActivity {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// ポップアップ再表示
dialog.dismiss();
setGroupLocation(id);
setOperationLocation(id);
}
});
......@@ -1958,18 +1949,23 @@ public class OperationListActivity extends ABVUIActivity {
}
}
// カテゴリ選択した内容で設定・表示する
private void setGroupLocation(long id) {
Logger.d(TAG, "setGroupLocation id :" + id);
if (id == OperationLocationType.CATEGORY) {
getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.CATEGORY);
} else {
// 全て
getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.ALL);
}
/**
* カテゴリ選択した内容で設定・表示する
* @param type 0 : 全て 1: カテゴリ
*/
private void setOperationLocation(long type) {
Logger.d(TAG, "setOperationLocation type :" + type);
int localType = getABVUIDataCache().getOperationGroupMasterMode();
boolean loadFlg = localType != type;
// typeの値をxmlに書き込み
getABVUIDataCache().setOperationGroupMasterMode((int) type);
// プログレスバー
showProgressPopup();
// loadFlgがtrueの場合のみ、画面を再作成する
if (loadFlg) {
setOperationListView();
}
if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.CATEGORY) {
//作業種別モードの場合は、作業種別選択ダイアログ画面を表示
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
......@@ -338,6 +338,10 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
});
}
/**
* 資料の削除ダイアログ表示
* @param contentDto 資料情報
*/
public void showContentDeleteDialog(final ContentDto contentDto) {
ABookAlertDialog contentsDeleteDialog = AlertDialogUtil.deleteContentAlertDialog(this);
contentsDeleteDialog.setNegativeButton(R.string.cancel, null);
......@@ -360,10 +364,9 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
* 作業一覧へ戻る
*/
private void backToHome() {
Intent intent = new Intent(getApplicationContext(), OperationListActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intent, NaviConsts.Left);
finish();
// 終了後、アニメーション追加（左へ移動）
overridePendingTransition(R.anim.viewin_left_to_right, R.anim.viewout_left_to_right);
}
public void showCancelDownloadDialog(final ContentDto contentDto) {
......@@ -389,8 +392,10 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
// 端末の戻るボタン処理
Logger.d(TAG, "onKeyUp.Back");
backToHome();
return true;
}
return super.onKeyUp(keyCode, event);
}
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java
......@@ -59,7 +59,7 @@ public class OperationGroupMasterListHelper extends CategoryOperationListHelper<
/**
* データの取得処理（新着更新処理完了後行われる）
* @return
* @return 作業一覧に表示されるリスト
* @throws Exception
*/
@Override
......
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