Skip to content

A
abook_check
Commit 99e0cbc2 by Jeong Gilmo
Options

Merge branch 'feature/1.0.1' into feature/1.0.1_33006

parents 30c2a398 3493050a
Showing with 167 additions and 154 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
...@@ -578,67 +578,6 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -578,67 +578,6 @@ public class AcmsClient implements AcmsClientResponseListener {
return json; return json;
} }
/**
* 定期点検データ送信
* @param sid
* @param operationId
* @param taskReportId
* @param taskReportInfoId
* @param reportStartDate
* @param taskReportInfo
* @param formFile
* @param attachedChangeFlag
* @param taskReportSendSaveDate
* @return
* @throws ABVException
* @throws NetworkDisconnectedException
* @throws IOException
*/
public AcmsMessageJSON sendRoutineTaskReportData(String sid, long operationId, int taskReportId, int taskReportInfoId
, Date reportStartDate, String taskReportInfo, File formFile, boolean attachedChangeFlag, Date taskReportSendSaveDate) throws ABVException, NetworkDisconnectedException, IOException {
if (networkAdapter != null && !networkAdapter.isNetworkConnected()) { // NWのチェック
throw new NetworkDisconnectedException();
}
HttpResponse result;
String apiUrl = AcmsApis.getApiUrl(env.acmsAddress, urlPath, AcmsApis.ApiSendRoutineTaskData);
List<HttpMultipart> HttpMultipartList = new ArrayList<HttpMultipart>();
HttpMultipartList.add(new HttpMultipart(ABookKeys.SID, sid));
HttpMultipartList.add(new HttpMultipart(ABookKeys.OPERATION_ID, StringUtil.toString(operationId)));
HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_REPORT_ID, StringUtil.toString(taskReportId)));
HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_REPORT_INFO_ID, StringUtil.toString(taskReportInfoId)));
HttpMultipartList.add(new HttpMultipart(ABookKeys.REPORT_START_DATE, DateTimeUtil.toStringForCmsGMT(reportStartDate)));
HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_REPORT_INFO, taskReportInfo));
HttpMultipartList.add(new HttpMultipart(ABookKeys.ATTACHED_CHANGE_FLAG, attachedChangeFlag ? "1" : "0"));
HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_REPORT_SAVE_DATE, DateTimeUtil.toStringForCmsGMT(taskReportSendSaveDate)));
if (formFile != null) {
HttpMultipartList.add(new HttpMultipart(ABookKeys.FORM_FILE, formFile));
}
result = HttpRequestSender.post(apiUrl, HttpMultipartList.toArray(new HttpMultipart[HttpMultipartList.size()]));
Logger.d(TAG, "[sendRoutineTaskReportData].request: operationId=%d, taskReportId=%d, taskReportInfoId=%d, reportStartDate=%tc, taskReportInfo=%s, attachedChangeFlag=%b, taskReportSendSaveDate=%tc"
, operationId, taskReportId, taskReportInfoId, reportStartDate, taskReportInfo, attachedChangeFlag, taskReportSendSaveDate);
AcmsMessageJSON json = new AcmsMessageJSON(result.httpResponseBody);
Logger.d(TAG, "[sendRoutineTaskReportData].response: %s", json);
if (json.errorMessage != null) {
if (json.errorMessage[0].equals("P003")) {
throw new ABVException(ABVExceptionCode.P_E_ACMS_P003);
} else if (json.errorMessage[0].equals("P004")) {
throw new ABVException(ABVExceptionCode.P_E_ACMS_P004);
} else if (json.errorMessage[0].equals("P005")) {
throw new ABVException(ABVExceptionCode.P_E_ACMS_P005);
}
}
if (json.httpStatus != 200) {
throw new AcmsException(ABVExceptionCode.S_E_ACMS_0001, json);
}
return json;
}
/** /**
* プロジェクトの作業データ取得 * プロジェクトの作業データ取得
* @param param * @param param
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
...@@ -156,4 +156,10 @@ public class Constant { ...@@ -156,4 +156,10 @@ public class Constant {
int NO = 0; int NO = 0;
int YES = 1; int YES = 1;
} }
// 作業可能区分
public interface EnableReport {
int NO = 0;
int YES = 1;
}
} }
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationContentDao.java
...@@ -62,6 +62,15 @@ public class OperationContentDao extends AbstractDao { ...@@ -62,6 +62,15 @@ public class OperationContentDao extends AbstractDao {
return rawQueryGetLongList("select content_id from r_operation_content where operation_id=?", new String[]{""+ operationId}); return rawQueryGetLongList("select content_id from r_operation_content where operation_id=?", new String[]{""+ operationId});
} }
/**
* 資料IDに紐づいた作業が存在しないと資料を削除する判定
* @param contentId
* @return
*/
public boolean isDeleteContent (Long contentId) {
return rawQueryGetInt("select COUNT(*) from r_operation_content where content_id=?", new String[]{"" + contentId }) == 0;
}
public boolean insertOperationContent(OperationContentDto dto) { public boolean insertOperationContent(OperationContentDto dto) {
StringBuffer sql = new StringBuffer(); StringBuffer sql = new StringBuffer();
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
...@@ -100,6 +100,11 @@ public class OperationDao extends AbstractDao { ...@@ -100,6 +100,11 @@ public class OperationDao extends AbstractDao {
dto.enableReportEdit = cursor.getInt(column); dto.enableReportEdit = cursor.getInt(column);
} }
column = cursor.getColumnIndex("report_type");
if (column != -1) {
dto.reportType = cursor.getInt(column);
}
return dto; return dto;
} }
...@@ -206,13 +211,13 @@ public class OperationDao extends AbstractDao { ...@@ -206,13 +211,13 @@ public class OperationDao extends AbstractDao {
public void deleteAll() { public void deleteAll() {
delete("t_push_message", null, null); delete("t_push_message", null, null);
delete("r_operation_content", null, null); delete("r_operation_content", null, null);
delete("r_task_worker_group", null, null);
delete("t_operation", null, null); delete("t_operation", null, null);
delete("t_task", null, null); delete("t_task", null, null);
delete("t_task_report", null, null); delete("t_task_report", null, null);
delete("t_task_report_send", null, null); delete("t_task_report_send", null, null);
delete("t_task_report_items", null, null); delete("t_task_report_items", null, null);
delete("m_worker_group", null, null); delete("m_worker_group", null, null);
delete("r_task_worker_group", null, null);
} }
public List<OperationDto> getOperations(String searchOperationName, String searchStartDateStr, String searchEndDateStr, String reportTypeStr) { public List<OperationDto> getOperations(String searchOperationName, String searchStartDateStr, String searchEndDateStr, String reportTypeStr) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
...@@ -60,6 +60,16 @@ public class TaskReportDao extends AbstractDao { ...@@ -60,6 +60,16 @@ public class TaskReportDao extends AbstractDao {
if (column != -1) { if (column != -1) {
dto.reportedFlag = toBool(cursor.getInt(column)); dto.reportedFlag = toBool(cursor.getInt(column));
} }
column = cursor.getColumnIndex("enable_report");
if (column != -1) {
dto.enableReport = cursor.getInt(column);
}
column = cursor.getColumnIndex("task_report_level");
if (column != -1) {
dto.taskReportLevel = cursor.getInt(column);
}
return dto; return dto;
} }
...@@ -76,12 +86,20 @@ public class TaskReportDao extends AbstractDao { ...@@ -76,12 +86,20 @@ public class TaskReportDao extends AbstractDao {
+ "task_report_info_id, " + "task_report_info_id, "
+ "report_start_date, " + "report_start_date, "
+ "report_end_date, " + "report_end_date, "
+ "reported_flg) " + "enable_report, "
+ "reported_flg, "
+ "task_report_level) "
+ "values " + "values "
+ "(?,?,?,?,?,?,?,?,?,?,?)", + "(?,?,?,?,?,?,?,?,?,?,?,?,?)",
dto.getInsertValues()); dto.getInsertValues());
} }
/**
* 作業IDで報告取得
* （作業報告タイプ　昇順、作業報告ID 昇順、報告開始日　昇順）
* @param operationId
* @return
*/
public List<TaskReportDto> getTaskReportByOperationId(Long operationId) { public List<TaskReportDto> getTaskReportByOperationId(Long operationId) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(" select ttr.* "); sb.append(" select ttr.* ");
...@@ -91,7 +109,7 @@ public class TaskReportDao extends AbstractDao { ...@@ -91,7 +109,7 @@ public class TaskReportDao extends AbstractDao {
sb.append(" ON tt.task_key == ttr.task_key "); sb.append(" ON tt.task_key == ttr.task_key ");
sb.append(" WHERE tt.del_flg = 0"); sb.append(" WHERE tt.del_flg = 0");
sb.append(" AND tt.operation_id = ?"); sb.append(" AND tt.operation_id = ?");
sb.append(" ORDER BY task_report_id ASC, report_start_date ASC"); sb.append(" ORDER BY task_report_level ASC, task_report_id ASC, report_start_date ASC");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskReportDto.class); return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskReportDto.class);
} }
...@@ -127,8 +145,10 @@ public class TaskReportDao extends AbstractDao { ...@@ -127,8 +145,10 @@ public class TaskReportDao extends AbstractDao {
+ "task_report_info_id=?, " + "task_report_info_id=?, "
+ "report_start_date=?, " + "report_start_date=?, "
+ "report_end_date=?, " + "report_end_date=?, "
+ "reported_flg=? " + "enable_report=?, "
+ "where task_key=?", + "reported_flg=?, "
+ "task_report_level=? "
+ "where task_key=? AND task_report_level=?",
dto.getUpdateValues()); dto.getUpdateValues());
return count > 0; return count > 0;
} }
...@@ -189,7 +209,7 @@ public class TaskReportDao extends AbstractDao { ...@@ -189,7 +209,7 @@ public class TaskReportDao extends AbstractDao {
} }
public List<TaskReportDto> selectByTaskKey(String taskKey, int taskReportLevel) { public List<TaskReportDto> selectByTaskKey(String taskKey, int taskReportLevel) {
return rawQueryGetDtoList("select * from t_task_report where task_key=? and task_report_level", new String[]{ "" + taskKey, "" + taskReportLevel }, TaskReportDto.class); return rawQueryGetDtoList("select * from t_task_report where task_key=? and task_report_level=?", new String[]{ "" + taskKey, "" + taskReportLevel }, TaskReportDto.class);
} }
public List<TaskReportDto> selectAll() { public List<TaskReportDto> selectAll() {
...@@ -227,6 +247,14 @@ public class TaskReportDao extends AbstractDao { ...@@ -227,6 +247,14 @@ public class TaskReportDao extends AbstractDao {
} }
/** /**
* テーブル物理削除
* @param dto
*/
public void delete(TaskReportDto dto) {
delete("t_task_report", "task_key=? and task_report_level=?", new String[] { dto.taskKey, "" + dto.taskReportLevel });
}
/**
* テーブル物理削除（定期点検専用） * テーブル物理削除（定期点検専用）
* @param dto * @param dto
*/ */
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskWorkerGroupDao.java
...@@ -73,7 +73,7 @@ public class TaskWorkerGroupDao extends AbstractDao { ...@@ -73,7 +73,7 @@ public class TaskWorkerGroupDao extends AbstractDao {
sql.append(" INNER JOIN m_worker_group AS mwg "); sql.append(" INNER JOIN m_worker_group AS mwg ");
sql.append(" ON rtwg.group_id = mwg.group_id "); sql.append(" ON rtwg.group_id = mwg.group_id ");
sql.append(" WHERE rtwg.operation_id = ? "); sql.append(" WHERE rtwg.operation_id = ? ");
sql.append(" ORDER BY rtwg.task_report_level DESC "); sql.append(" ORDER BY rtwg.task_report_level ASC ");
Logger.v(TAG, "sql=%s", sql); Logger.v(TAG, "sql=%s", sql);
return rawQueryGetDtoList(sql.toString(), new String[]{""+ operationId}, TaskWorkerGroupDto.class); return rawQueryGetDtoList(sql.toString(), new String[]{""+ operationId}, TaskWorkerGroupDto.class);
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
...@@ -29,12 +29,12 @@ public class TaskReportDto extends AbstractDto { ...@@ -29,12 +29,12 @@ public class TaskReportDto extends AbstractDto {
@Override @Override
public Object[] getInsertValues() { public Object[] getInsertValues() {
return new Object[] { taskKey, jsonData, attachedFileName, localAttachedFileName, attachedFileSendFlg, dataSendFlg, taskReportId, taskReportInfoId, reportStartDate, reportEndDate, reportedFlag}; return new Object[] { taskKey, jsonData, attachedFileName, localAttachedFileName, attachedFileSendFlg, dataSendFlg, taskReportId, taskReportInfoId, reportStartDate, reportEndDate, enableReport, reportedFlag, taskReportLevel};
} }
@Override @Override
public Object[] getUpdateValues() { public Object[] getUpdateValues() {
return new Object[] { jsonData, attachedFileName, localAttachedFileName, attachedFileSendFlg, dataSendFlg, taskReportId, taskReportInfoId, reportStartDate, reportEndDate, reportedFlag, taskKey }; return new Object[] { jsonData, attachedFileName, localAttachedFileName, attachedFileSendFlg, dataSendFlg, taskReportId, taskReportInfoId, reportStartDate, reportEndDate, enableReport, reportedFlag, taskReportLevel, taskKey, taskReportLevel };
} }
@Override @Override
......
ABVJE_UI_Android/res/values-ja/arrays.xml
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
</string-array> </string-array>
<string-array name="operation_report_types"> <string-array name="operation_report_types">
<item>タイプ1</item> <item>報告</item>
<item>タイプ2</item> <item>定期点検</item>
<item>タイプ3</item> <item>報告(回答)</item>
</string-array> </string-array>
</resources> </resources>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -107,7 +107,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -107,7 +107,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
public Long mOperationId; public Long mOperationId;
protected int mXWalkOpenType = -1; protected int mXWalkOpenType = -1;
protected int mOperationType; protected int mOperationType;
protected int enableReportHistory; //0:履歴無し 1:履歴可 protected int mEnableReportHistory; //0:履歴無し 1:履歴可
// 報告可能区分
protected int mEnableReportEdit; //0:報告無し 1:報告可
protected String mContentPath; protected String mContentPath;
protected int mStatusCode; protected int mStatusCode;
protected boolean isOperationPdf = false; protected boolean isOperationPdf = false;
...@@ -154,8 +156,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -154,8 +156,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
if (!isLinkedContent) { if (!isLinkedContent) {
operationDto = AbstractLogic.getLogic(OperationLogic.class).getOperation(mOperationId); operationDto = AbstractLogic.getLogic(OperationLogic.class).getOperation(mOperationId);
mXWalkOpenType = intent.getIntExtra(Constant.ABookCheck.XWALK_OPEN_TYPE, Constant.XWalkOpenType.DEFAULT); mXWalkOpenType = intent.getIntExtra(Constant.ABookCheck.XWALK_OPEN_TYPE, Constant.XWalkOpenType.DEFAULT);
if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) { if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION) { if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) {
mOperationType = operationDto.operationType; mOperationType = operationDto.operationType;
if (mOperationType != OperationType.PDF && isNormalSize()) { if (mOperationType != OperationType.PDF && isNormalSize()) {
// 縦画面固定 // 縦画面固定
...@@ -171,8 +173,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -171,8 +173,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
}).start(); }).start();
mStatusCode = 0; mStatusCode = 0;
} }
mEnableReportEdit = operationDto.enableReportEdit;
enableReportHistory = operationDto.enableReportHistory; mEnableReportHistory = operationDto.enableReportHistory;
linkUrl = intent.getStringExtra("LINKURL"); // LinkURL linkUrl = intent.getStringExtra("LINKURL"); // LinkURL
...@@ -646,8 +648,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -646,8 +648,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
protected void createCheckToolbar() { protected void createCheckToolbar() {
final RelativeLayout fl; final RelativeLayout fl;
if (operationDto != null && operationDto.operationType == OperationType.PDF && if (operationDto != null && operationDto.operationType == OperationType.PDF && mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) {
(mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT)) {
fl = (RelativeLayout) findViewById(R.id.RelativeLayout2); fl = (RelativeLayout) findViewById(R.id.RelativeLayout2);
} else { } else {
fl = (RelativeLayout) findViewById(R.id.frameTopbar); fl = (RelativeLayout) findViewById(R.id.frameTopbar);
...@@ -689,8 +690,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -689,8 +690,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} }
}); });
if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) { if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION) { if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) {
if (mOperationType != OperationType.PDF && isNormalSize()) { if (mOperationType != OperationType.PDF && isNormalSize()) {
// 縦画面固定 // 縦画面固定
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
...@@ -923,7 +924,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -923,7 +924,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
}; };
ABookCheckWebViewHelper.getInstance().doABookCheckParam(ABVContentViewActivity.this, ABookCheckWebViewHelper.getInstance().doABookCheckParam(ABVContentViewActivity.this,
mCmd, mTaskKey, enableReportHistory, abookCheckParam, mOperationId, mContentPath, getContentId(), mCmd, mTaskKey, mEnableReportHistory, abookCheckParam, mOperationId, mContentPath, getContentId(),
operationDto.reportType, finishCallback, operationDto.reportType, finishCallback,
taskReportLevel); taskReportLevel);
...@@ -1181,8 +1182,12 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1181,8 +1182,12 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
return isOperationPdf; return isOperationPdf;
} }
public boolean isDirector() { /**
return mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION; * 報告可能フラグ
* @return
*/
public boolean isReportEdit() {
return mEnableReportEdit == Constant.EnableReportEdit.YES;
} }
/** /**
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -77,7 +77,6 @@ import jp.agentec.abook.abv.bl.download.ContentFileExtractor; ...@@ -77,7 +77,6 @@ import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification; import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
import jp.agentec.abook.abv.bl.dto.ContentDto; import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.FixPushMessageDto; import jp.agentec.abook.abv.bl.dto.FixPushMessageDto;
import jp.agentec.abook.abv.bl.dto.RoutineTaskReportDto;
import jp.agentec.abook.abv.bl.dto.OperationContentDto; import jp.agentec.abook.abv.bl.dto.OperationContentDto;
import jp.agentec.abook.abv.bl.dto.OperationDto; import jp.agentec.abook.abv.bl.dto.OperationDto;
import jp.agentec.abook.abv.bl.dto.PushMessageDto; import jp.agentec.abook.abv.bl.dto.PushMessageDto;
...@@ -829,6 +828,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -829,6 +828,7 @@ public class OperationListActivity extends ABVUIActivity {
OperationDto operationDto = mOperationLogic.getOperation(operationId); OperationDto operationDto = mOperationLogic.getOperation(operationId);
OperationContentDto operationContentDto = mOperationContentDao.getOperationMainContent(operationId); OperationContentDto operationContentDto = mOperationContentDao.getOperationMainContent(operationId);
List<TaskDto> localTaskList = mTaskDao.selectAllTaskByOperationId(operationId); List<TaskDto> localTaskList = mTaskDao.selectAllTaskByOperationId(operationId);
Date lastEditDate; Date lastEditDate;
OperationDataJSON json = AcmsClient.getInstance(ABVDataCache.getInstance().getUrlPath(), ABVEnvironment.getInstance().networkAdapter).getOpereationData(param); OperationDataJSON json = AcmsClient.getInstance(ABVDataCache.getInstance().getUrlPath(), ABVEnvironment.getInstance().networkAdapter).getOpereationData(param);
...@@ -839,26 +839,35 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -839,26 +839,35 @@ public class OperationListActivity extends ABVUIActivity {
progress = 40 / json.taskDtoList.size(); progress = 40 / json.taskDtoList.size();
} }
boolean isRoutineTask = operationDto.reportType == Constant.ReportType.Routine;
JSONObject taskReportJson; JSONObject taskReportJson;
for (TaskDto serverTaskDto : json.taskDtoList) { for (TaskDto serverTaskDto : json.taskDtoList) {
if (operationDto.reportType == Constant.ReportType.Routine) {
if (isExistsTaskInList(localTaskList, serverTaskDto)) {
mTaskDao.update(serverTaskDto);
} else {
mTaskDao.insert(serverTaskDto);
}
List<TaskReportDto> localTaskReportList = mTaskReportDao.getNotNullStartDateTaskReportByTaskKey(serverTaskDto.taskKey);
List<TaskReportDto> localRemove = new ArrayList(); List<TaskReportDto> localRemove = new ArrayList();
// 先にローカルにしか存在しない事を削除 : DB, files List<TaskReportDto> localTaskReportList = mTaskReportDao.getTaskReportListByTaskKey(serverTaskDto.taskKey);
for (TaskReportDto localTaskReportDto : localTaskReportList) { for (TaskReportDto localTaskReportDto : localTaskReportList) {
if (!isExistsRoutinTaskReportInList(serverTaskDto.taskReportDtoList, localTaskReportDto)) { if (!isExistsTaskReportInList(serverTaskDto.taskReportDtoList, localTaskReportDto, isRoutineTask)) {
mOperationLogic.deleteRoutineTaskReport(operationId, operationContentDto.contentId, localTaskReportDto); if (isRoutineTask) {
localRemove.add(localTaskReportDto); mOperationLogic.deleteRoutineTaskReport(operationId, operationContentDto.contentId, localTaskReportDto);
} else {
// taskDtoが存在するとtaskReportLevel 0 (作業報告)が存在しないことはないので、報告（回答）のみチェックして削除
if (localTaskReportDto.taskReportLevel == Constant.TaskReportLevel.ReportReplyType) {
// 作業報告のディレクトリ削除
mOperationLogic.deleteTaskReportReplyFileData(operationId, operationContentDto.contentId, serverTaskDto.taskKey);
mTaskReportDao.delete(localTaskReportDto);
}
}
localTaskReportList.remove(localTaskReportDto);
} }
} }
localTaskReportList.removeAll(localRemove); if (operationDto.reportType == Constant.ReportType.Routine) {
if (isExistsTaskInList(localTaskList, serverTaskDto)) {
mTaskDao.update(serverTaskDto);
} else {
mTaskDao.insert(serverTaskDto);
}
// サーバーからの情報で更新 // サーバーからの情報で更新
for (TaskReportDto taskReportDto : serverTaskDto.taskReportDtoList) { for (TaskReportDto taskReportDto : serverTaskDto.taskReportDtoList) {
...@@ -870,7 +879,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -870,7 +879,7 @@ public class OperationListActivity extends ABVUIActivity {
if (isSyncGetTaskFileError) { if (isSyncGetTaskFileError) {
return null; return null;
} }
if (isExistsRoutinTaskReportInList(localTaskReportList, taskReportDto)) { if (isExistsTaskReportInList(localTaskReportList, taskReportDto, true)) {
// 報告データが存在すると作業報告を更新する // 報告データが存在すると作業報告を更新する
if (taskReportDto.jsonData != null) { if (taskReportDto.jsonData != null) {
mOperationLogic.updateRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, taskReportDto, false, false, false, false); mOperationLogic.updateRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, taskReportDto, false, false, false, false);
...@@ -900,14 +909,19 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -900,14 +909,19 @@ public class OperationListActivity extends ABVUIActivity {
taskReportJson.put(ABookKeys.TASK_STATUS, serverTaskDto.taskStatus); taskReportJson.put(ABookKeys.TASK_STATUS, serverTaskDto.taskStatus);
// 作業報告を更新 // 作業報告を更新
// update // update
mOperationLogic.updateTaskReport(serverTaskDto.taskKey, serverTaskDto.operationId, operationContentDto.contentId, mOperationLogic.updateTaskReport(serverTaskDto.taskKey, serverTaskDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
taskReportJson, serverTaskDto.taskHotSpotInfo, attachedFileName, false, false); taskReportJson, serverTaskDto.taskHotSpotInfo, attachedFileName, false, false);
} else { } else {
// 作業報告（回答） // 作業報告（回答）
if (taskReportDto.jsonData != null) { if (taskReportDto.jsonData != null) {
mOperationLogic.updateTaskReportReplyLevel(serverTaskDto.taskKey, serverTaskDto.operationId, operationContentDto.contentId, // データの更新
mOperationLogic.updateTaskReportReply(serverTaskDto.taskKey, serverTaskDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
new JSONObject(taskReportDto.jsonData), attachedFileName, false, false); new JSONObject(taskReportDto.jsonData), attachedFileName, false, false);
} } else {
// jsonDataがない場合
mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
null, attachedFileName, false, false);
}
} }
// 更新済みの場合、localTaskListから削除 // 更新済みの場合、localTaskListから削除
localTaskList.remove(serverTaskDto); localTaskList.remove(serverTaskDto);
...@@ -928,12 +942,16 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -928,12 +942,16 @@ public class OperationListActivity extends ABVUIActivity {
taskReportJson = new JSONObject(taskReportDto.jsonData); taskReportJson = new JSONObject(taskReportDto.jsonData);
taskReportJson.put(ABookKeys.TASK_STATUS, serverTaskDto.taskStatus); taskReportJson.put(ABookKeys.TASK_STATUS, serverTaskDto.taskStatus);
mOperationLogic.insertTaskReport(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, mOperationLogic.insertTaskReport(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
taskReportJson, serverTaskDto.taskHotSpotInfo, attachedFileName, false, false); taskReportJson, serverTaskDto.taskHotSpotInfo, attachedFileName, false, false);
} else { } else {
if (taskReportDto.jsonData != null) { if (taskReportDto.jsonData != null) {
mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
new JSONObject(taskReportDto.jsonData), attachedFileName, false, false); new JSONObject(taskReportDto.jsonData), attachedFileName, false, false);
} else {
// jsonDataがない場合
mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
null, attachedFileName, false, false);
} }
} }
} }
...@@ -1553,17 +1571,26 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1553,17 +1571,26 @@ public class OperationListActivity extends ABVUIActivity {
} }
/** /**
* 定期点検の報告存在チェック * 報告存在チェック
* @param listDto * @param listDto
* @param rDto * @param rDto
* @return * @return
*/ */
private boolean isExistsRoutinTaskReportInList(List<TaskReportDto> listDto, TaskReportDto rDto) { private boolean isExistsTaskReportInList(List<TaskReportDto> listDto, TaskReportDto rDto, boolean isRoutineTask) {
for (TaskReportDto lDto : listDto) { for (TaskReportDto lDto : listDto) {
if (lDto.taskKey.equals(rDto.taskKey) && if (isRoutineTask) {
lDto.taskReportId == rDto.taskReportId && // 定期点検の場合、taskKey,taskReportId,reportStartDateで判定
lDto.reportStartDate.equals(rDto.reportStartDate)) { if (lDto.taskKey.equals(rDto.taskKey) &&
return true; lDto.taskReportId == rDto.taskReportId &&
lDto.reportStartDate.equals(rDto.reportStartDate)) {
return true;
}
} else {
// taskKeyと作業報告階層で判定
if (lDto.taskKey.equals(rDto.taskKey) &&
lDto.taskReportLevel == rDto.taskReportLevel) {
return true;
}
} }
} }
return false; return false;
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
...@@ -90,37 +90,37 @@ public class ABookCheckWebViewHelper extends ABookHelper { ...@@ -90,37 +90,37 @@ public class ABookCheckWebViewHelper extends ABookHelper {
String reportStartDate = ""; String reportStartDate = "";
boolean sendTaskReportDataFlg = false; boolean sendTaskReportDataFlg = false;
// TODO検討 if (reportType == Constant.ReportType.Routine) {
// copyTaskAttachedMovie(operationId, contentId, taskKey, String.valueOf(taskReportLevel)); taskReportId = Integer.valueOf(param.get(ABookKeys.TASK_REPORT_ID));
if (reportType == Constant.ReportType.Routine) { reportStartDate = param.get(ABookKeys.REPORT_START_DATE).replace("T", " ");
taskReportId = Integer.valueOf(param.get(ABookKeys.TASK_REPORT_ID)); mOperationLogic.deleteRoutineTaskReport(operationId, contentId, taskKey, taskReportId, reportStartDate);
reportStartDate = param.get(ABookKeys.REPORT_START_DATE).replace("T", " "); mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
mOperationLogic.deleteRoutineTaskReport(operationId, contentId, taskKey, taskReportId, reportStartDate); copyRoutineTaskReportAttachedMovie(operationId, contentId, taskKey, taskReportId, reportStartDate);
mOperationLogic.createJsonForOperationContent(operationId, contentPath, false); } else {
copyRoutineTaskReportAttachedMovie(operationId, contentId, taskKey, taskReportId, reportStartDate); if (taskReportLevel == Constant.TaskReportLevel.ReportType) {
mOperationLogic.deleteTaskReport(operationId, contentId, taskKey);
} else { } else {
mOperationLogic.deleteTaskReportReply(operationId, contentId, taskKey); mOperationLogic.deleteTaskReportReply(operationId, contentId, taskKey);
mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
} }
mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
}
if (enableReportHistory == Constant.EnableReportHistory.Invalid) { if (enableReportHistory == Constant.EnableReportHistory.Invalid) {
taskReportSendId = mOperationLogic.getLastTaskReportSendId(taskKey); taskReportSendId = mOperationLogic.getLastTaskReportSendId(taskKey);
mOperationLogic.updateTaskReportSend(taskKey, taskReportId, reportStartDate, null, true); mOperationLogic.updateTaskReportSend(taskKey, taskReportId, reportStartDate, null, true);
deleteReportTaskSendFiles(operationId, taskKey, taskReportSendId, taskReportLevel); deleteReportTaskSendFiles(operationId, taskKey, taskReportSendId, taskReportLevel);
} else if (enableReportHistory == Constant.EnableReportHistory.Enable) { } else if (enableReportHistory == Constant.EnableReportHistory.Enable) {
mOperationLogic.insertTaskReportSend(taskKey, taskReportId, reportStartDate, null, true); mOperationLogic.insertTaskReportSend(taskKey, taskReportId, reportStartDate, null, true);
} }
sendTaskData(context, operationId, taskKey, taskReportLevel); sendTaskData(context, operationId, taskKey, taskReportLevel);
break; break;
// #32782 指示者テーブル関連削除 end
case ABookKeys.CMD_MOVE_HOT_SPOT: case ABookKeys.CMD_MOVE_HOT_SPOT:
mOperationLogic.updateTaskHotspot(taskKey, param); mOperationLogic.updateTaskHotspot(taskKey, param);
mOperationLogic.createHopSpotJson(operationId, contentPath); mOperationLogic.createHopSpotJson(operationId, contentPath);
break; break;
// case ABookKeys.CMD_CANCEL_TASK_DIRECTIONS:
case ABookKeys.CMD_CANCEL_TASK_REPORT: case ABookKeys.CMD_CANCEL_TASK_REPORT:
FileUtil.delete(ABVEnvironment.getInstance().getTempTaskDirPath(contentId, taskKey)); FileUtil.delete(ABVEnvironment.getInstance().getTempTaskDirPath(contentId, taskKey));
mFinishCallback.callback(false); mFinishCallback.callback(false);
...@@ -164,12 +164,11 @@ public class ABookCheckWebViewHelper extends ABookHelper { ...@@ -164,12 +164,11 @@ public class ABookCheckWebViewHelper extends ABookHelper {
OperationDto operationDto = mOperationLogic.getOperation(operationId); OperationDto operationDto = mOperationLogic.getOperation(operationId);
boolean isError = false; boolean isError = false;
try { try {
mOperationLogic.updateSyncOperation(operationId, true);
if (mOperationLogic.sendTaskReportSendData(operationId, taskKey, taskReportLevel, progressCallback)) { if (mOperationLogic.sendTaskReportSendData(operationId, taskKey, taskReportLevel, progressCallback)) {
context.handleErrorMessageToast(R.string.P005); context.handleErrorMessageToast(R.string.P005);
} }
mOperationLogic.updateSyncOperation(operationId, true);
} catch (ABVException ex) { } catch (ABVException ex) {
Logger.e(TAG, "sendTaskData", ex); Logger.e(TAG, "sendTaskData", ex);
// if (isDirections) { // if (isDirections) {
...@@ -300,15 +299,15 @@ public class ABookCheckWebViewHelper extends ABookHelper { ...@@ -300,15 +299,15 @@ public class ABookCheckWebViewHelper extends ABookHelper {
if (taskReportLevel == Constant.TaskReportLevel.ReportType) { if (taskReportLevel == Constant.TaskReportLevel.ReportType) {
String hotSpotInfo = param.get(ABookKeys.HOT_SPOT); String hotSpotInfo = param.get(ABookKeys.HOT_SPOT);
if (insertFlg) { if (insertFlg) {
mOperationLogic.insertTaskReport(taskKey, operationId, contentId, taskReportJson, hotSpotInfo, null, attachedChangeFlag, true); mOperationLogic.insertTaskReport(taskKey, operationId, contentId, Constant.EnableReport.YES, taskReportJson, hotSpotInfo, null, attachedChangeFlag, true);
} else { } else {
mOperationLogic.updateTaskReport(taskKey, operationId, contentId, taskReportJson, hotSpotInfo, null, attachedChangeFlag, true); mOperationLogic.updateTaskReport(taskKey, operationId, contentId, Constant.EnableReport.YES, taskReportJson, hotSpotInfo, null, attachedChangeFlag, true);
} }
} else { } else {
if (insertFlg) { if (insertFlg) {
mOperationLogic.insertTaskReportReply(taskKey, operationId, contentId, taskReportJson, null, attachedChangeFlag, true); mOperationLogic.insertTaskReportReply(taskKey, operationId, contentId, Constant.EnableReport.YES, taskReportJson, null, attachedChangeFlag, true);
} else { } else {
mOperationLogic.updateTaskReportReplyLevel(taskKey, operationId, contentId, taskReportJson, null, attachedChangeFlag, true); mOperationLogic.updateTaskReportReply(taskKey, operationId, contentId, Constant.EnableReport.YES, taskReportJson, null, attachedChangeFlag, true);
} }
} }
mOperationLogic.createJsonForOperationContent(operationId, contentPath, false); mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
...@@ -340,6 +339,7 @@ public class ABookCheckWebViewHelper extends ABookHelper { ...@@ -340,6 +339,7 @@ public class ABookCheckWebViewHelper extends ABookHelper {
copyTaskAttachedMovie(operationId, contentId, taskDto.taskKey, taskReportDto.taskReportLevel); copyTaskAttachedMovie(operationId, contentId, taskDto.taskKey, taskReportDto.taskReportLevel);
} }
} }
} }
} catch (IOException e) { } catch (IOException e) {
Logger.e(TAG, "fileCopyToCacheAttachedDir error. ", e); Logger.e(TAG, "fileCopyToCacheAttachedDir error. ", e);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
...@@ -89,7 +89,6 @@ import jp.agentec.abook.abv.bl.acms.client.json.content.PageInfoJSON; ...@@ -89,7 +89,6 @@ import jp.agentec.abook.abv.bl.acms.client.json.content.PageInfoJSON;
import jp.agentec.abook.abv.bl.acms.client.json.content.PageInfoJSON.PageInfoJSONData; import jp.agentec.abook.abv.bl.acms.client.json.content.PageInfoJSON.PageInfoJSONData;
import jp.agentec.abook.abv.bl.acms.client.json.content.PageObjectJSON; import jp.agentec.abook.abv.bl.acms.client.json.content.PageObjectJSON;
import jp.agentec.abook.abv.bl.acms.client.json.content.TaskHotspotJSON; import jp.agentec.abook.abv.bl.acms.client.json.content.TaskHotspotJSON;
import jp.agentec.abook.abv.bl.acms.type.OperationAuthLevel;
import jp.agentec.abook.abv.bl.acms.type.OperationType; import jp.agentec.abook.abv.bl.acms.type.OperationType;
import jp.agentec.abook.abv.bl.common.ABVEnvironment; import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.CommonExecutor; import jp.agentec.abook.abv.bl.common.CommonExecutor;
...@@ -4913,7 +4912,6 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -4913,7 +4912,6 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
switch (mXWalkOpenType) { switch (mXWalkOpenType) {
case Constant.XWalkOpenType.TASK_DERECTION:
case Constant.XWalkOpenType.TASK_REPORT: case Constant.XWalkOpenType.TASK_REPORT:
if (mOperationType == OperationType.LIST) { if (mOperationType == OperationType.LIST) {
taskListButton.setVisibility(View.GONE); taskListButton.setVisibility(View.GONE);
...@@ -5041,8 +5039,8 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5041,8 +5039,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
// 移動・タップの切り替えボタン // 移動・タップの切り替えボタン
btnMoveOrClickToggleIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_move_click_toggle); btnMoveOrClickToggleIcon = (ImageButton) mScaleZoomLayout.findViewById(id.btn_move_click_toggle);
if (isDirector()) { if (isReportEdit()) {
// 指示者の場合 // 報告の場合
btnMoveOrClickToggleIcon.setVisibility(View.VISIBLE); btnMoveOrClickToggleIcon.setVisibility(View.VISIBLE);
btnMoveOrClickToggleIcon.setOnClickListener(new View.OnClickListener() { btnMoveOrClickToggleIcon.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -5058,7 +5056,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5058,7 +5056,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
}); });
} else { } else {
// 作業者の場合 // 報告（回答）の場合
btnMoveOrClickToggleIcon.setVisibility(View.INVISIBLE); btnMoveOrClickToggleIcon.setVisibility(View.INVISIBLE);
} }
...@@ -5243,7 +5241,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5243,7 +5241,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
public int getOperationReportUpdateType() { public int getOperationReportUpdateType() {
return enableReportHistory; return mEnableReportHistory;
} }
/** /**
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
...@@ -329,7 +329,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -329,7 +329,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
} }
}); });
if (mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) { if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) {
webView.addJavascriptInterface(jsInf, "android"); webView.addJavascriptInterface(jsInf, "android");
} }
Logger.d(TAG, "loadUrl: " + url); Logger.d(TAG, "loadUrl: " + url);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLXWalkWebViewActivity.java
...@@ -349,7 +349,7 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity { ...@@ -349,7 +349,7 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
return false; return false;
} }
}); });
if (mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) { if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) {
webView.addJavascriptInterface(jsInf, "android"); webView.addJavascriptInterface(jsInf, "android");
} }
// webView.postUrl(url,EncodingUtils.getBytes("", "utf-8")); // webView.postUrl(url,EncodingUtils.getBytes("", "utf-8"));
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
...@@ -184,7 +184,6 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -184,7 +184,6 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
} }
switch (mXWalkOpenType) { switch (mXWalkOpenType) {
case Constant.XWalkOpenType.TASK_DERECTION:
case Constant.XWalkOpenType.TASK_REPORT: case Constant.XWalkOpenType.TASK_REPORT:
if (mOperationType == OperationType.LIST) { if (mOperationType == OperationType.LIST) {
taskListButton.setVisibility(View.GONE); taskListButton.setVisibility(View.GONE);
...@@ -212,7 +211,7 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -212,7 +211,7 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
Logger.d(TAG, "onDestroy"); Logger.d(TAG, "onDestroy");
if (mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) { if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT) {
// tempファイル削除 // tempファイル削除
FileUtil.delete(ABVEnvironment.getInstance().getTempDirPath(contentId)); FileUtil.delete(ABVEnvironment.getInstance().getTempDirPath(contentId));
FileUtil.delete(ABVEnvironment.getInstance().getAttachedMoviesFilePath(contentId)); FileUtil.delete(ABVEnvironment.getInstance().getAttachedMoviesFilePath(contentId));
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java
...@@ -244,7 +244,7 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -244,7 +244,7 @@ public class OperationTaskLayout extends RelativeLayout {
taskView.setOnTouchListener(new View.OnTouchListener() { taskView.setOnTouchListener(new View.OnTouchListener() {
@Override @Override
public boolean onTouch(View view, MotionEvent event) { public boolean onTouch(View view, MotionEvent event) {
if (mContext.mMoveTaskFlg && rootLayout.isEnableOperationTaskNewOrMove()) { if (mContext.mMoveTaskFlg && mContext.isReportEdit()) {
// 指示者且つ、移動モードの場合 // 指示者且つ、移動モードの場合
if (event.getAction() == MotionEvent.ACTION_DOWN) { if (event.getAction() == MotionEvent.ACTION_DOWN) {
ClipData data = ClipData.newPlainText("", ""); ClipData data = ClipData.newPlainText("", "");
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ZoomRelativeLayout.java
...@@ -924,7 +924,7 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -924,7 +924,7 @@ public class ZoomRelativeLayout extends RelativeLayout {
Logger.v(TAG, "[OnDoubleTapListener]:[onDoubleTap]"); Logger.v(TAG, "[OnDoubleTapListener]:[onDoubleTap]");
if (isOperationPdf && mContext instanceof ContentViewActivity) { if (isOperationPdf && mContext instanceof ContentViewActivity) {
if(((ContentViewActivity) mContext).getOpenedProjestTask() || !isEnableOperationTaskNewOrMove() || ((ContentViewActivity) mContext).mMoveTaskFlg) { if(((ContentViewActivity) mContext).getOpenedProjestTask() || !((ContentViewActivity) mContext).isReportEdit() || ((ContentViewActivity) mContext).mMoveTaskFlg) {
return true; return true;
} }
...@@ -999,10 +999,6 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -999,10 +999,6 @@ public class ZoomRelativeLayout extends RelativeLayout {
} }
}; };
public boolean isEnableOperationTaskNewOrMove() {
return ((ContentViewActivity)mContext).isDirector();
}
public boolean isZooming() { public boolean isZooming() {
return mScaleFactor > 1.0f; return mScaleFactor > 1.0f;
} }
......
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