Skip to content

A
abook_check
Commit 15f6b3ab by Kim Jinsung
Options

Merge branch 'feature/1.0.1_jeonggm' into 'feature/1.0.1' 

Feature/1.0.1 jeonggm

See merge request !2
parents 63578199 4dfce160
Showing with 610 additions and 597 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/NewAppStoreLoginJSON.java
......@@ -11,14 +11,14 @@ public class NewAppStoreLoginJSON extends AcmsBooleanResultJSON {
public static final String Sid = "sid";
public static final String UserName = "userName";
public static final String UserId = "userId";
public static final String ProjectAuthLevel = "projectAuthLevel";
public static final String OperationAuthLevel = "projectAuthLevel";
public static final String WorkerCode = "workerCode";
public String sid;
public RequirePasswordChangeCode requirePasswordChange;
public String userName;
public int userId;
public Integer projectAuthLevel;
public Integer operationAuthLevel;
public String workerCode;
public NewAppStoreLoginJSON(String jsonString) throws AcmsException {
......@@ -35,8 +35,8 @@ public class NewAppStoreLoginJSON extends AcmsBooleanResultJSON {
if (json.has(UserId)) {
userId = getInt(json,UserId);
}
if (json.has(ProjectAuthLevel)) {
projectAuthLevel = getInt(json, ProjectAuthLevel);
if (json.has(OperationAuthLevel)) {
operationAuthLevel = getInt(json, OperationAuthLevel);
}
if (json.has(WorkerCode)) {
workerCode = getString(json, WorkerCode, StringUtil.Empty);
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ProjectDataJSON.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationDataJSON.java
......@@ -19,10 +19,10 @@ import jp.agentec.adf.util.DateTimeUtil;
* Created by leej on 2018/09/10.
*/
public class ProjectDataJSON extends AcmsCommonJSON {
public static final String ProjectLastEditDate = "projectLastEditDate";
public class OperationDataJSON extends AcmsCommonJSON {
public static final String OperationLastEditDate = "projectLastEditDate";
public static final String TaskList = "taskList";
public static final String ProjectId = "projectId";
public static final String OperationId = "projectId";
public static final String TaskId = "taskId";
public static final String TaskKey = "taskKey";
public static final String TaskCode = "taskCode";
......@@ -37,13 +37,13 @@ public class ProjectDataJSON extends AcmsCommonJSON {
public List<TaskDto> taskDtoList;
public Date lastEditDate;
public ProjectDataJSON(String jsonString) throws AcmsException {
public OperationDataJSON(String jsonString) throws AcmsException {
super(jsonString);
}
@Override
protected void parse(JSONObject json) {
lastEditDate = DateTimeUtil.toDate(json.getString(ProjectLastEditDate), "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
lastEditDate = DateTimeUtil.toDate(json.getString(OperationLastEditDate), "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
taskDtoList = new ArrayList<TaskDto>();
if (json.has(TaskList)) {
JSONArray taskList = json.getJSONArray(TaskList);
......@@ -53,7 +53,7 @@ public class ProjectDataJSON extends AcmsCommonJSON {
dto.taskDirectionsDto = new TaskDirectionsDto();
dto.taskReportDto = new TaskReportDto();
dto.projectId = taskJson.getLong(ProjectId);
dto.operationId = taskJson.getLong(OperationId);
dto.taskId = taskJson.getLong(TaskId);
dto.taskKey = taskJson.getString(TaskKey);
dto.taskCode = taskJson.getString(TaskCode);
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ProjectInspectDataJSON.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/RoutineTaskDataJSON.java
......@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import jp.agentec.abook.abv.bl.dto.InspectTaskReportDto;
import jp.agentec.abook.abv.bl.dto.RoutineTaskReportDto;
import jp.agentec.abook.abv.bl.dto.TaskDirectionsDto;
import jp.agentec.abook.abv.bl.dto.TaskDto;
import jp.agentec.abook.abv.bl.dto.TaskReportDto;
......@@ -18,7 +18,7 @@ import jp.agentec.adf.util.DateTimeUtil;
* Created by seo-y on 2018/12/19.
*/
public class ProjectInspectDataJSON extends ProjectDataJSON {
public class RoutineTaskDataJSON extends OperationDataJSON {
public static final String TaskReportId = "taskReportId";
public static final String TaskReportInfoId = "taskReportInfoId";
public static final String ReportStartDate = "reportStartDate";
......@@ -26,15 +26,15 @@ public class ProjectInspectDataJSON extends ProjectDataJSON {
public static final String TaskReportInfo = "taskReportInfo";
public static final String TaskReportKey = "taskReportKey";
public static final String ReportList = "reportList";
public List<InspectTaskReportDto> reportDtoList;
public List<RoutineTaskReportDto> reportDtoList;
public ProjectInspectDataJSON(String jsonString) throws AcmsException {
public RoutineTaskDataJSON(String jsonString) throws AcmsException {
super(jsonString);
}
@Override
protected void parse(JSONObject json) {
lastEditDate = DateTimeUtil.toDate(json.getString(ProjectLastEditDate), "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
lastEditDate = DateTimeUtil.toDate(json.getString(OperationLastEditDate), "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
taskDtoList = new ArrayList<TaskDto>();
if (json.has(TaskList)) {
JSONArray taskList = json.getJSONArray(TaskList);
......@@ -44,7 +44,7 @@ public class ProjectInspectDataJSON extends ProjectDataJSON {
dto.taskDirectionsDto = new TaskDirectionsDto();
dto.taskReportDto = new TaskReportDto();
dto.projectId = taskJson.getLong(ProjectId);
dto.operationId = taskJson.getLong(OperationId);
dto.taskId = taskJson.getLong(TaskId);
dto.taskKey = taskJson.getString(TaskKey);
dto.taskReportId = taskJson.getInt(TaskReportId);
......@@ -55,13 +55,13 @@ public class ProjectInspectDataJSON extends ProjectDataJSON {
dto.taskHotSpotInfo = "";
}
reportDtoList = new ArrayList<InspectTaskReportDto>();
reportDtoList = new ArrayList<RoutineTaskReportDto>();
if (taskJson.has(ReportList)) {
JSONArray reportList = taskJson.getJSONArray(ReportList);
String taskReportInfoId;
for (int j = 0; j < reportList.length(); j++) {
JSONObject reportJson = reportList.getJSONObject(j);
InspectTaskReportDto reportDto = new InspectTaskReportDto();
RoutineTaskReportDto reportDto = new RoutineTaskReportDto();
reportDto.taskKey = dto.taskKey;
reportDto.taskReportId = dto.taskReportId;
reportDto.taskReportInfoId = reportJson.getInt(TaskReportInfoId);
......@@ -87,7 +87,7 @@ public class ProjectInspectDataJSON extends ProjectDataJSON {
reportDtoList.add(reportDto);
}
}
dto.InspectTaskReportList = reportDtoList;
dto.RoutineTaskReportList = reportDtoList;
taskDtoList.add(dto);
}
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/content/TaskHotspotJSON.java
......@@ -6,7 +6,7 @@ import org.json.adf.JSONObject;
import java.util.ArrayList;
import java.util.List;
import jp.agentec.abook.abv.bl.dto.ProjectTaskDto;
import jp.agentec.abook.abv.bl.dto.OperationTaskDto;
/**
* Created by seo-y on 2018/11/19.
......@@ -21,19 +21,19 @@ public class TaskHotspotJSON extends AbstractJSON {
public static final String VIEW_X = "x";
public static final String VIEW_Y = "y";
private List<ProjectTaskDto> listTaskHotspot;
private List<OperationTaskDto> listTaskHotspot;
public TaskHotspotJSON(String json) {
super(json);
JSONArray pageInfo = root.getJSONArray(HOTSPOT);
ProjectTaskDto taskHotspot;
listTaskHotspot = new ArrayList<ProjectTaskDto>();
OperationTaskDto taskHotspot;
listTaskHotspot = new ArrayList<OperationTaskDto>();
for (int i = 0; i < pageInfo.length(); i++) {
try {
JSONObject obj = pageInfo.getJSONObject(i);
taskHotspot = new ProjectTaskDto();
taskHotspot = new OperationTaskDto();
taskHotspot.pageNum = obj.getInt(PAGE_NUM);
taskHotspot.seqId = obj.getInt(SEQ_ID);
//taskHotspot.taskKey = obj.getLong(TASK_ID);
......@@ -47,11 +47,11 @@ public class TaskHotspotJSON extends AbstractJSON {
}
}
public List<ProjectTaskDto> getPageTasks(int pageNumber) {
List<ProjectTaskDto> pageTaskHotspot = new ArrayList<ProjectTaskDto>();
public List<OperationTaskDto> getPageTasks(int pageNumber) {
List<OperationTaskDto> pageTaskHotspot = new ArrayList<OperationTaskDto>();
pageNumber++;
for (ProjectTaskDto task: listTaskHotspot) {
for (OperationTaskDto task: listTaskHotspot) {
if (task.pageNum == pageNumber) {
pageTaskHotspot.add(task);
}
......@@ -60,8 +60,8 @@ public class TaskHotspotJSON extends AbstractJSON {
return pageTaskHotspot;
}
public void setTaskPosition(ProjectTaskDto dto) {
for (ProjectTaskDto lDto : listTaskHotspot) {
public void setTaskPosition(OperationTaskDto dto) {
for (OperationTaskDto lDto : listTaskHotspot) {
if (lDto.taskKey.equals(dto.taskKey)) {
lDto.pdfX = dto.pdfX;
lDto.pdfY = dto.pdfY;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetProjectDataParameters.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetOperationDataParameters.java
......@@ -4,17 +4,19 @@ package jp.agentec.abook.abv.bl.acms.client.parameters;
* Created by leej on 2018/09/10.
*/
public class GetProjectDataParameters extends AcmsParameters {
public class GetOperationDataParameters extends AcmsParameters {
private long projectId;
private long operationId;
public GetProjectDataParameters(String sid, long projectId) {
public GetOperationDataParameters(String sid, long operationId) {
super(sid);
this.projectId = projectId;
this.operationId = operationId;
}
public long getprojectId() {
return projectId;
// TODO
// サーバ作業後、対応必要「project」→「operation」
public long getProjectId() {
return operationId;
}
}
\ No newline at end of file
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/SendPushMessageParameters.java
......@@ -5,7 +5,7 @@ package jp.agentec.abook.abv.bl.acms.client.parameters;
*/
public class SendPushMessageParameters extends AcmsParameters {
private long projectId;
private long operationId;
private int sendType;
private String message;
......@@ -15,15 +15,15 @@ public class SendPushMessageParameters extends AcmsParameters {
* @param sid ログインした時のセッションIDです。
* @since 1.0.0
*/
public SendPushMessageParameters(String sid, long projectId, int sendType, String message) {
public SendPushMessageParameters(String sid, long operationId, int sendType, String message) {
super(sid);
this.projectId = projectId;
this.operationId = operationId;
this.sendType = sendType;
this.message = message;
}
public long getProjectId() {
return projectId;
public long getOperationId() {
return operationId;
}
public int getSendType() {
return sendType;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java
......@@ -133,15 +133,15 @@ public class AcmsApis {
// デバイストークン更新
public static final String ApiUrlUpdateDeviceToken = "updateDeviceToken";
// プロジェクト一覧取得
public static final String ApiProjectList = "projectList";
public static final String ApiOperationList = "projectList";
// 作業者グループ取得
public static final String ApiWorkerGroupList = "workerGroupList";
// 作業データ送信
public static final String ApiSendTaskData = "taskData";
// 作業データ取得
public static final String ApiGetProjectData = "getProjectData";
public static final String ApiGetOperationData = "getProjectData";
// 定期点検データ取得
public static final String ApiGetProjectInspectData = "getProjectInspectData";
public static final String ApiGetRoutineTaskData = "getProjectInspectData";
// 作業ファイル取得
public static final String ApiGetTaskFile = "getTaskFile";
// コンテンツ登録
......@@ -153,7 +153,7 @@ public class AcmsApis {
// プッシュメッセージ定型文取得
public static final String ApiGetPushMessages = "getPushMessage";
// 定期点検データ送信
public static final String ApiSendProjectInspectData = "projectInspectData";
public static final String ApiSendRoutineTaskData = "routineTaskData";
// download
......@@ -196,9 +196,9 @@ public class AcmsApis {
if (methodName.equals(ApiUrlNewAppStoreLogin) || methodName.equals(ApiUrlAppStoreNewLogin) || methodName.equals(ApiUrlServerTime) || methodName.equals(ApiUrlServerTimeZone)) {
apiValue = Constant.ApiValue.nuapi;
} else if (methodName.equals(ApiProjectList) || methodName.equals(ApiWorkerGroupList) || methodName.equals(ApiSendTaskData) || methodName.equals(ApiGetProjectData) ||
} else if (methodName.equals(ApiOperationList) || methodName.equals(ApiWorkerGroupList) || methodName.equals(ApiSendTaskData) || methodName.equals(ApiGetOperationData) ||
methodName.equals(ApiGetTaskFile) || methodName.equals(ApiSceneEntry) || methodName.equals(ApiTaskContentEntry) ||
methodName.equals(ApiSendPushMessage) || methodName.equals(ApiGetPushMessages) || methodName.equals(ApiGetProjectInspectData) || methodName.equals(ApiSendProjectInspectData)) {
methodName.equals(ApiSendPushMessage) || methodName.equals(ApiGetPushMessages) || methodName.equals(ApiGetRoutineTaskData) || methodName.equals(ApiSendRoutineTaskData)) {
apiValue = Constant.ApiValue.checkapi;
}
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ProjectAuthLevel.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/OperationAuthLevel.java
package jp.agentec.abook.abv.bl.acms.type;
public interface ProjectAuthLevel {
public interface OperationAuthLevel {
//1:作業者権限、2:指示者権限
int WORKER = 1;
int PROJECT_INSTRUCTOR = 2;
int OPERATION_INSTRUCTOR = 2;
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ProjectButtonType.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/OperationButtonType.java
package jp.agentec.abook.abv.bl.acms.type;
public interface ProjectButtonType {
public interface OperationButtonType {
// 0:リスト、1:図面、2:360
int PANO_EDIT = 0;
int INFORMATION_UPDATE = 1;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ProjectType.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/OperationType.java
package jp.agentec.abook.abv.bl.acms.type;
public interface ProjectType {
public interface OperationType {
// 0:リスト、1:図面、2:360、3:PDF
int LIST = 0;
int DRAWING = 1;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ServiceOption.java
......@@ -146,6 +146,6 @@ public interface ServiceOption {
/**
* 報告タイプ：N(通常)、Y(定期点検)
*/
int ProjectReportType = 171;
int OperationReportType = 171;
}
}
\ No newline at end of file
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
......@@ -88,41 +88,41 @@ public class Constant {
String REPORT_GPS = "reportGps";
}
public interface ProjectUpdateType {
public interface OperationUpdateType {
int HISTORY_NO = 0;
int HISTORY_ADD = 1;
int HISTORY_UPDATE = 2;
}
public interface ProjectReportType {
public interface OperationReportType {
int DEFAULT = 0;
int INSPECT_REPORT = 1;
}
public interface PushMessageSendType {
int InGroup = 0;
int AllProject = 1;
int AllOperation = 1;
}
public interface HelpViewType {
int ProjectListDirector = 0;
int ProjectListReporter = 1;
int ProjectDetail = 2;
int OperationListDirector = 0;
int OperationListReporter = 1;
int OperationDetail = 2;
int PanoContentEdit = 3;
int ListProjectDirector = 4;
int ListProjectReporter = 5;
int DrawingProjectDirector = 6;
int DrawingProjectReporter = 7;
int PanoProjectDirector = 8;
int PanoProjectReporter = 9;
int ListOperationDirector = 4;
int ListOperationReporter = 5;
int DrawingOperationDirector = 6;
int DrawingOperationReporter = 7;
int PanoOperationDirector = 8;
int PanoOperationReporter = 9;
int DirectorTask = 10;
int ReportTask = 11;
int DirectorTaskList = 12;
int ReportTaskList = 13;
int ReportPreview = 14;
int CommonContent = 15;
int InspectProject = 16;
int InspectProjectReport = 17;
int RoutineTaskOperation = 16;
int RoutineTaskOperationReport = 17;
}
public interface XWalkWebViewDisplayStatus {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
......@@ -12,8 +12,8 @@ public class ABookKeys {
public static final String CONTENT_ID = "contentId";
public static final String CONTENT_NAME = "contentName";
public static final String CONTENT_TYPE = "contentType";
public static final String PROJECT_ID = "projectId";
public static final String PROJECT_NAME = "projectName";
public static final String OPERATION_ID = "projectId";
public static final String OPERATION_NAME = "projectName";
// ABOOKCHECK SCHEME
public static final String ABOOK_CHECK_API = "abookcheck-api";
......@@ -75,7 +75,7 @@ public class ABookKeys {
public static final String TASK_REPORT_SAVE_DATE = "saveDate";
// 定期点検用
public static final String PROJECT_INSPECT = "projectInspect";
public static final String ROUTINE_TASK = "routineTask";
public static final String TASK_REPORT_ID = "taskReportId";
public static final String TASK_REPORT_INFO_ID = "taskReportInfoId";
public static final String REPORT_START_DATE = "reportStartDate";
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java
......@@ -302,8 +302,8 @@ public class ABVDataCache {
return isServiceOptionEnable(ServiceOptionId.REPORT_GPS);
}
public boolean isInspectTaskReport() {
return isServiceOptionEnable(ServiceOptionId.ProjectReportType);
public boolean isRoutineTaskReport() {
return isServiceOptionEnable(ServiceOptionId.OperationReportType);
}
public boolean isEnquete() {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataOpenHelper.java
......@@ -16,7 +16,7 @@ import jp.agentec.abook.abv.bl.data.tables.MMemberInfo;
import jp.agentec.abook.abv.bl.data.tables.MPasswordLockInfo;
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.RProjectContent;
import jp.agentec.abook.abv.bl.data.tables.ROperationContent;
import jp.agentec.abook.abv.bl.data.tables.RContentCategory;
import jp.agentec.abook.abv.bl.data.tables.RContentGroup;
import jp.agentec.abook.abv.bl.data.tables.SQLiteTableScript;
......@@ -31,9 +31,9 @@ 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.TContentTag;
import jp.agentec.abook.abv.bl.data.tables.TEnquete;
import jp.agentec.abook.abv.bl.data.tables.TInspectTaskReport;
import jp.agentec.abook.abv.bl.data.tables.TRoutineTaskReport;
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.TOperation;
import jp.agentec.abook.abv.bl.data.tables.TPushMessage;
import jp.agentec.abook.abv.bl.data.tables.TTask;
import jp.agentec.abook.abv.bl.data.tables.TTaskDirections;
......@@ -88,8 +88,8 @@ public class ABVDataOpenHelper {
iTableScripts.add(new TEnquete());
iTableScripts.add(new MWorkerGroup());
iTableScripts.add(new TProject());
iTableScripts.add(new RProjectContent());
iTableScripts.add(new TOperation());
iTableScripts.add(new ROperationContent());
iTableScripts.add(new TTask());
iTableScripts.add(new TTaskDirections());
iTableScripts.add(new TTaskDirectionsItems());
......@@ -97,7 +97,7 @@ public class ABVDataOpenHelper {
iTableScripts.add(new TTaskReportSend());
iTableScripts.add(new TTaskReportItems());
iTableScripts.add(new TPushMessage());
iTableScripts.add(new TInspectTaskReport());
iTableScripts.add(new TRoutineTaskReport());
return iTableScripts;
}
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ContentDao.java
......@@ -620,7 +620,7 @@ public class ContentDao extends AbstractDao {
return rawQueryGetDtoList(sql.toString(), null, ContentDto.class);
}
public List<ContentDto> getProjectRelatedContent(Long projectId) {
public List<ContentDto> getOperationRelatedContent(Long operationId) {
StringBuffer sql = new StringBuffer();
sql.append(" SELECT ");
......@@ -647,11 +647,11 @@ public class ContentDao extends AbstractDao {
sql.append(" AND rpc.project_content_flg = 0");
sql.append(" ORDER BY mc.category_id, tc.content_id DESC ");
return rawQueryGetDtoList(sql.toString(), new String[]{"" + projectId}, ContentDto.class);
return rawQueryGetDtoList(sql.toString(), new String[]{"" + operationId}, ContentDto.class);
}
public boolean isProjectRelatedContent(long contentId, long projectId) {
return rawQueryGetInt("select count(tc.content_id) from t_content as tc inner join r_project_content as rpc on tc.content_id = rpc.content_id where rpc.project_id = ? and rpc.project_content_flg = 0 and tc.content_id = ?", new String[]{"" + projectId, "" + contentId}) > 0;
public boolean isOperationRelatedContent(long contentId, long operationId) {
return rawQueryGetInt("select count(tc.content_id) from t_content as tc inner join r_project_content as rpc on tc.content_id = rpc.content_id where rpc.project_id = ? and rpc.project_content_flg = 0 and tc.content_id = ?", new String[]{"" + operationId, "" + contentId}) > 0;
}
public List<ContentDto> getCommonContent() {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/MemberInfoDao.java
......@@ -74,7 +74,7 @@ public class MemberInfoDao extends AbstractDao {
}
column = cursor.getColumnIndex("project_auth_level");
if (column != -1) {
dto.projectAuthLevel = cursor.getInt(column);
dto.operationAuthLevel = cursor.getInt(column);
}
column = cursor.getColumnIndex("worker_code");
if (column != -1) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ProjectContentDao.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationContentDao.java
......@@ -7,25 +7,25 @@ import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
import jp.agentec.abook.abv.bl.common.db.SQLiteStatement;
import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.ProjectContentDto;
import jp.agentec.abook.abv.bl.dto.OperationContentDto;
/**
* Created by leej on 2018/08/23.
*/
public class ProjectContentDao extends AbstractDao {
private static final String TAG = "ProjectContentDao";
/*package*/ ProjectContentDao() {
public class OperationContentDao extends AbstractDao {
private static final String TAG = "OperationContentDao";
/*package*/ OperationContentDao() {
}
private ContentDao contentDao = AbstractDao.getDao(ContentDao.class);
@Override
public ProjectContentDto convert(Cursor cursor) {
ProjectContentDto dto = new ProjectContentDto();
public OperationContentDto convert(Cursor cursor) {
OperationContentDto dto = new OperationContentDto();
int colnum = cursor.getColumnIndex("project_id");
if (colnum != -1) {
dto.projectId = cursor.getLong(colnum);
dto.operationId = cursor.getLong(colnum);
}
colnum = cursor.getColumnIndex("content_id");
if (colnum != -1) {
......@@ -33,47 +33,47 @@ public class ProjectContentDao extends AbstractDao {
}
colnum = cursor.getColumnIndex("project_content_flg");
if (colnum != -1) {
dto.projectContentFlg = toBool(cursor.getInt(colnum));
dto.operationContentFlg = toBool(cursor.getInt(colnum));
}
return dto;
}
public List<ProjectContentDto> getProjectContent(Long projectId) {
return rawQueryGetDtoList("select * from r_project_content where project_id=?", new String[]{""+ projectId}, ProjectContentDto.class);
public List<OperationContentDto> getOperationContent(Long operationId) {
return rawQueryGetDtoList("select * from r_project_content where project_id=?", new String[]{""+ operationId}, OperationContentDto.class);
}
public ProjectContentDto getProjectMainContent(Long projectId) {
return rawQueryGetDto("select * from r_project_content where project_content_flg = 1 AND project_id=?", new String[]{""+ projectId}, ProjectContentDto.class);
public OperationContentDto getOperationMainContent(Long operationId) {
return rawQueryGetDto("select * from r_project_content where project_content_flg = 1 AND project_id=?", new String[]{""+ operationId}, OperationContentDto.class);
}
public List<ContentDto> getProjectRelatedContent(Long projectId) {
return rawQueryGetDtoList("select * from r_project_content where project_content_flg = 0 AND project_id=?", new String[]{""+ projectId}, ContentDto.class);
public List<ContentDto> getOperationRelatedContent(Long operationId) {
return rawQueryGetDtoList("select * from r_project_content where project_content_flg = 0 AND project_id=?", new String[]{""+ operationId}, ContentDto.class);
}
public ProjectContentDto getProjectContentForContentId(Long contentId) {
return rawQueryGetDto("select * from r_project_content where project_content_flg = 1 AND content_id=?", new String[]{""+ contentId}, ProjectContentDto.class);
public OperationContentDto getOperationContentForContentId(Long contentId) {
return rawQueryGetDto("select * from r_project_content where project_content_flg = 1 AND content_id=?", new String[]{""+ contentId}, OperationContentDto.class);
}
public boolean isExistMainProjectContent(Long projectId) {
return getProjectMainContent(projectId) != null;
public boolean isExistMainOperationContent(Long operationId) {
return getOperationMainContent(operationId) != null;
}
public List<Long> getContentIds(Long projectId) {
return rawQueryGetLongList("select content_id from r_project_content where project_id=?", new String[]{""+ projectId});
public List<Long> getContentIds(Long operationId) {
return rawQueryGetLongList("select content_id from r_project_content where project_id=?", new String[]{""+ operationId});
}
public boolean insertProjectContent(ProjectContentDto dto) {
public boolean insertOperationContent(OperationContentDto dto) {
StringBuffer sql = new StringBuffer();
sql.append(" INSERT OR IGNORE INTO r_project_content ");
sql.append(" SELECT " + dto.projectId);
sql.append(" SELECT " + dto.operationId);
sql.append(" , " + dto.contentId);
sql.append(" , " + (dto.projectContentFlg ? 1 : 0));
sql.append(" , " + (dto.operationContentFlg ? 1 : 0));
sql.append(" FROM t_content AS tc ");
sql.append(" LEFT OUTER JOIN r_project_content AS rpc ");
sql.append(" ON rpc.project_id = ? ");
sql.append(" AND rpc.project_content_flg = " + (dto.projectContentFlg ? 1 : 0));
sql.append(" AND rpc.project_content_flg = " + (dto.operationContentFlg ? 1 : 0));
sql.append(" AND tc.content_id <> rpc.content_id ");
sql.append(" WHERE tc.content_id = ? ");
sql.append(" GROUP BY rpc.project_id ");
......@@ -84,7 +84,7 @@ public class ProjectContentDao extends AbstractDao {
try {
SQLiteDatabase db = getDatabase();
stmt = db.compileStatement(sql.toString());
stmt.bindLong(1, dto.projectId);
stmt.bindLong(1, dto.operationId);
stmt.bindLong(2, dto.contentId);
return (stmt.executeInsert() > 0);
......@@ -97,10 +97,10 @@ public class ProjectContentDao extends AbstractDao {
/**
* リストを削除
* @param projectId
* @param operationId
* @param contentId
*/
public void deleteProjectContent(Long projectId, Long contentId) {
delete("r_project_content", "project_id=? and content_id=?", new String[] { ""+projectId, "" + contentId });
public void deleteOperationContent(Long operationId, Long contentId) {
delete("r_project_content", "project_id=? and content_id=?", new String[] { ""+operationId, "" + contentId });
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/PushMessageDao.java
......@@ -26,7 +26,7 @@ public class PushMessageDao extends AbstractDao {
column = cursor.getColumnIndex("project_id");
if (column != -1) {
dto.projectId = cursor.getLong(column);
dto.operationId = cursor.getLong(column);
}
column = cursor.getColumnIndex("push_send_login_id");
......@@ -48,7 +48,7 @@ public class PushMessageDao extends AbstractDao {
}
column = cursor.getColumnIndex("project_name");
if (column != -1) {
dto.projectName = cursor.getString(column);
dto.operationName = cursor.getString(column);
}
return dto;
}
......@@ -87,8 +87,8 @@ public class PushMessageDao extends AbstractDao {
Logger.v(TAG, "sql=%s", sql);
}
public void delete(long projectId) {
String[] args = new String[] { "" + projectId };
public void delete(long operationId) {
String[] args = new String[] { "" + operationId };
delete("t_push_message", "project_id=?", args);
}
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/InspectTaskReportDao.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/RoutineTaskReportDao.java
......@@ -3,7 +3,7 @@ package jp.agentec.abook.abv.bl.data.dao;
import java.util.List;
import jp.agentec.abook.abv.bl.common.db.Cursor;
import jp.agentec.abook.abv.bl.dto.InspectTaskReportDto;
import jp.agentec.abook.abv.bl.dto.RoutineTaskReportDto;
import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil;
......@@ -11,12 +11,12 @@ import jp.agentec.adf.util.DateTimeUtil;
* Created by seo-y on 2018/12/17.
*/
public class InspectTaskReportDao extends AbstractDao {
public class RoutineTaskReportDao extends AbstractDao {
private static final String TAG = "InspectTaskReportDao";
@Override
public InspectTaskReportDto convert(Cursor cursor) {
InspectTaskReportDto dto = new InspectTaskReportDto();
public RoutineTaskReportDto convert(Cursor cursor) {
RoutineTaskReportDto dto = new RoutineTaskReportDto();
int column = cursor.getColumnIndex("task_key");
if (column != -1) {
......@@ -76,7 +76,7 @@ public class InspectTaskReportDao extends AbstractDao {
return dto;
}
public void insert(InspectTaskReportDto dto) {
public void insert(RoutineTaskReportDto dto) {
insert("insert into t_inspect_task_report "
+ "(task_key, "
+ "task_report_id, "
......@@ -93,7 +93,7 @@ public class InspectTaskReportDao extends AbstractDao {
dto.getInsertValues());
}
public boolean update(InspectTaskReportDto dto, boolean reportedFlg) {
public boolean update(RoutineTaskReportDto dto, boolean reportedFlg) {
long count;
if (reportedFlg) {
dto.reportedFlag = true;
......@@ -125,11 +125,11 @@ public class InspectTaskReportDao extends AbstractDao {
return count > 0;
}
public void delete(InspectTaskReportDto dto) {
public void delete(RoutineTaskReportDto dto) {
delete("t_inspect_task_report", "task_key=? and task_report_id=? and datetime(report_start_date)=datetime(?, 'utc')", new String[] { dto.taskKey, "" + dto.taskReportId, DateTimeUtil.toString(dto.reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen) });
}
public InspectTaskReportDto getLastInspectTaskReportData(long projectId) {
public RoutineTaskReportDto getLastRoutineTaskReportData(long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select tr.* ");
sb.append(" from t_inspect_task_report tr ");
......@@ -137,26 +137,26 @@ public class InspectTaskReportDao extends AbstractDao {
sb.append(" t_task tt ");
sb.append(" ON tr.task_key == tt.task_key");
sb.append(" WHERE tt.project_id = ? ORDER BY tr.report_start_date DESC LIMIT 1");
List<InspectTaskReportDto> dtoList = rawQueryGetDtoList(sb.toString(), new String[]{ "" + projectId }, InspectTaskReportDto.class);
List<RoutineTaskReportDto> dtoList = rawQueryGetDtoList(sb.toString(), new String[]{ "" + operationId }, RoutineTaskReportDto.class);
if (dtoList != null && dtoList.size() > 0) {
return dtoList.get(0);
} else {
InspectTaskReportDto dto = new InspectTaskReportDto();
RoutineTaskReportDto dto = new RoutineTaskReportDto();
dto.taskReportId = 0;
return dto;
}
}
public InspectTaskReportDto getInspectTaskReportUtc(String taskKey, int taskReportId, String reportStartDate){
return rawQueryGetDto("select * from t_inspect_task_report where task_key=? and task_report_id=? and datetime(report_start_date)=datetime(?, 'utc')", new String[]{ taskKey, "" + taskReportId, reportStartDate }, InspectTaskReportDto.class);
public RoutineTaskReportDto getRoutineTaskReportUtc(String taskKey, int taskReportId, String reportStartDate){
return rawQueryGetDto("select * from t_inspect_task_report where task_key=? and task_report_id=? and datetime(report_start_date)=datetime(?, 'utc')", new String[]{ taskKey, "" + taskReportId, reportStartDate }, RoutineTaskReportDto.class);
}
public List<InspectTaskReportDto> selectInspectTaskReportByTaskKey(String taskKey) {
return rawQueryGetDtoList("select * from t_inspect_task_report where task_key=?", new String[]{ taskKey }, InspectTaskReportDto.class);
public List<RoutineTaskReportDto> selectRoutineTaskReportByTaskKey(String taskKey) {
return rawQueryGetDtoList("select * from t_inspect_task_report where task_key=?", new String[]{ taskKey }, RoutineTaskReportDto.class);
}
public List<InspectTaskReportDto> getInspectTaskReportByProjectId(Long projectId) {
public List<RoutineTaskReportDto> getRoutineTaskReportByOperationId(Long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select tr.* ");
sb.append(" from t_inspect_task_report tr ");
......@@ -166,10 +166,10 @@ public class InspectTaskReportDao extends AbstractDao {
sb.append(" WHERE tt.del_flg = 0");
sb.append(" AND tt.project_id = ?");
sb.append(" ORDER BY task_report_id ASC, report_start_date ASC");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId}, InspectTaskReportDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, RoutineTaskReportDto.class);
}
public List<InspectTaskReportDto> getSendableInspectTaskReportData(long projectId) {
public List<RoutineTaskReportDto> getSendableRoutineTaskReportData(long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select * ");
sb.append(" from t_inspect_task_report tr ");
......@@ -178,10 +178,10 @@ public class InspectTaskReportDao extends AbstractDao {
sb.append(" ON tr.task_key == tt.task_key");
sb.append(" WHERE tr.data_send_flag = 1");
sb.append(" AND tt.project_id = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{ "" + projectId }, InspectTaskReportDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{ "" + operationId }, RoutineTaskReportDto.class);
}
public List<InspectTaskReportDto> getSendableInspectTaskReportData(long projectId, String taskKey) {
public List<RoutineTaskReportDto> getSendableRoutineTaskReportData(long operationId, String taskKey) {
StringBuilder sb = new StringBuilder();
sb.append(" select * ");
sb.append(" from t_inspect_task_report tr ");
......@@ -191,14 +191,14 @@ public class InspectTaskReportDao extends AbstractDao {
sb.append(" WHERE tr.data_send_flag = 1");
sb.append(" AND tt.project_id = ?");
sb.append(" AND tt.task_key = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{ "" + projectId, "" + taskKey }, InspectTaskReportDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{ "" + operationId, "" + taskKey }, RoutineTaskReportDto.class);
}
public boolean isExistSendInspectTaskData(Long projectId) {
return getSendableInspectTaskReportData(projectId).size() > 0;
public boolean isExistSendRoutineTaskData(Long operationId) {
return getSendableRoutineTaskReportData(operationId).size() > 0;
}
public boolean existsToDoInspectTaskReportData(long projectId) {
public boolean existsToDoRoutineTaskReportData(long operationId) {
String currDate = DateTimeUtil.toString(DateTimeUtil.getCurrentSqlDate(), DateTimeFormat.yyyyMMddHHmmss_hyphen);
StringBuilder sb = new StringBuilder();
sb.append(" select count(*) ");
......@@ -207,19 +207,19 @@ public class InspectTaskReportDao extends AbstractDao {
sb.append(" WHERE tt.del_flg = 0 ");
sb.append(" AND tt.project_id = ? ");
sb.append(" AND datetime(report_end_date) >= datetime(?, 'utc') ");
return rawQueryGetInt(sb.toString(), new String[]{ "" + projectId, currDate }) > 0;
return rawQueryGetInt(sb.toString(), new String[]{ "" + operationId, currDate }) > 0;
}
public List<InspectTaskReportDto> geInspectTaskReportByTaskKey(String taskKey) {
public List<RoutineTaskReportDto> geRoutineTaskReportByTaskKey(String taskKey) {
StringBuilder sb = new StringBuilder();
sb.append(" SELECT * ");
sb.append(" FROM t_inspect_task_report ");
sb.append(" WHERE task_key = ? ");
sb.append(" ORDER BY task_report_id, report_start_date ");
return rawQueryGetDtoList(sb.toString(), new String[]{ taskKey }, InspectTaskReportDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{ taskKey }, RoutineTaskReportDto.class);
}
public String getInspectTaskReportAttachedFileName(String taskKey, int taskReportId, String reportStartDate) {
public String getRoutineTaskReportAttachedFileName(String taskKey, int taskReportId, String reportStartDate) {
return rawQueryGetString("select local_attached_file_name from t_inspect_task_report where task_key=? and task_report_id=? and datetime(report_start_date)=datetime(?)", new String[]{ taskKey, "" + taskReportId, reportStartDate });
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskDao.java
......@@ -30,7 +30,7 @@ public class TaskDao extends AbstractDao {
}
column = cursor.getColumnIndex("project_id");
if (column != -1) {
dto.projectId = cursor.getLong(column);
dto.operationId = cursor.getLong(column);
}
column = cursor.getColumnIndex("task_code");
if (column != -1) {
......@@ -51,12 +51,12 @@ public class TaskDao extends AbstractDao {
return dto;
}
public List<TaskDto> selectTaskByProjectId(Long projectId) {
return rawQueryGetDtoList("select * from t_task where project_id = ? and del_flg = 0 ", new String[]{"" + projectId}, TaskDto.class);
public List<TaskDto> selectTaskByOperationId(Long operationId) {
return rawQueryGetDtoList("select * from t_task where project_id = ? and del_flg = 0 ", new String[]{"" + operationId}, TaskDto.class);
}
public List<TaskDto> selectAllTaskByProjectId(Long projectId) {
return rawQueryGetDtoList("select * from t_task where project_id = ? ", new String[]{"" + projectId}, TaskDto.class);
public List<TaskDto> selectAllTaskByOperationId(Long operationId) {
return rawQueryGetDtoList("select * from t_task where project_id = ? ", new String[]{"" + operationId}, TaskDto.class);
}
public TaskDto getTaskByTaskKey(String taskKey) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskDirectionsDao.java
......@@ -70,7 +70,7 @@ public class TaskDirectionsDao extends AbstractDao {
dto.getInsertValues());
}
public List<TaskDirectionsDto> getTaskDirectionsByProjectId(Long projectId) {
public List<TaskDirectionsDto> getTaskDirectionsByOperationId(Long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select ttd.* ");
sb.append(" from t_task_directions ttd ");
......@@ -79,7 +79,7 @@ public class TaskDirectionsDao extends AbstractDao {
sb.append(" ON tt.task_key == ttd.task_key ");
sb.append(" WHERE tt.del_flg = 0");
sb.append(" AND tt.project_id = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId}, TaskDirectionsDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskDirectionsDto.class);
}
public TaskDirectionsDto getTaskDirections(String taskKey) {
......@@ -103,11 +103,11 @@ public class TaskDirectionsDao extends AbstractDao {
return count > 0;
}
public boolean isExistSendTaskData(Long projectId) {
return getSendableTaskData(projectId).size() > 0;
public boolean isExistSendTaskData(Long operationId) {
return getSendableTaskData(operationId).size() > 0;
}
public List<TaskDirectionsDto> getSendableTaskData(Long projectId) {
public List<TaskDirectionsDto> getSendableTaskData(Long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select * ");
sb.append(" from t_task_directions ttd ");
......@@ -116,10 +116,10 @@ public class TaskDirectionsDao extends AbstractDao {
sb.append(" ON tt.task_key == ttd.task_key ");
sb.append(" WHERE ttd.data_send_flg = 1");
sb.append(" AND tt.project_id = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId}, TaskDirectionsDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskDirectionsDto.class);
}
public List<TaskDirectionsDto> getSendableTaskData(Long projectId, String taskKey) {
public List<TaskDirectionsDto> getSendableTaskData(Long operationId, String taskKey) {
StringBuilder sb = new StringBuilder();
sb.append(" select * ");
sb.append(" from t_task_directions ttd ");
......@@ -129,6 +129,6 @@ public class TaskDirectionsDao extends AbstractDao {
sb.append(" WHERE ttd.data_send_flg = 1");
sb.append(" AND tt.project_id = ?");
sb.append(" AND tt.task_key = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId, "" + taskKey}, TaskDirectionsDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId, "" + taskKey}, TaskDirectionsDto.class);
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskDirectionsItemsDao.java
......@@ -42,7 +42,7 @@ public class TaskDirectionsItemsDao extends AbstractDao {
return rawQueryGetDtoList("select * from t_task_directions_items where task_key=?", new String[]{"" + taskKey}, TaskDirectionsItemsDto.class);
}
public List<TaskDirectionsItemsDto> getTaskDirectionsItemByProjectId(Long projectId) {
public List<TaskDirectionsItemsDto> getTaskDirectionsItemByOperationId(Long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select distinct ttdi.* ");
sb.append(" from t_task_directions_items ttdi ");
......@@ -51,7 +51,7 @@ public class TaskDirectionsItemsDao extends AbstractDao {
sb.append(" ON tt.task_key == ttdi.task_key ");
sb.append(" WHERE tt.del_flg = 0");
sb.append(" AND tt.project_id = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId}, TaskDirectionsItemsDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskDirectionsItemsDto.class);
}
public boolean updateTaskDirectionsItems(TaskDirectionsItemsDto dto) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
......@@ -66,11 +66,11 @@ public class TaskReportDao extends AbstractDao {
+ "attached_file_send_flg, "
+ "data_send_flg) "
+ "values "
+ "(?,?,?,?,?,?)",
+ "(?,?,?,?,?,?,?)",
dto.getInsertValues());
}
public List<TaskReportDto> getTaskReportByProjectId(Long projectId) {
public List<TaskReportDto> getTaskReportByOperationId(Long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select ttr.* ");
sb.append(" from t_task_report ttr ");
......@@ -79,7 +79,7 @@ public class TaskReportDao extends AbstractDao {
sb.append(" ON tt.task_key == ttr.task_key ");
sb.append(" WHERE tt.del_flg = 0");
sb.append(" AND tt.project_id = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId}, TaskReportDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskReportDto.class);
}
public TaskReportDto getTaskReport(String taskKey) {
......@@ -102,14 +102,14 @@ public class TaskReportDao extends AbstractDao {
/**
* 送信フラグのあるデータが存在するか
*
* @param projectId
* @param operationId
* @return
*/
public boolean isExistSendTaskData(Long projectId) {
return getSendableTaskData(projectId).size() > 0;
public boolean isExistSendTaskData(Long operationId) {
return getSendableTaskData(operationId).size() > 0;
}
public List<TaskReportDto> getSendableTaskData(Long projectId) {
public List<TaskReportDto> getSendableTaskData(Long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select * ");
sb.append(" from t_task_report ttr ");
......@@ -118,10 +118,10 @@ public class TaskReportDao extends AbstractDao {
sb.append(" ON tt.task_key == ttr.task_key ");
sb.append(" WHERE ttr.data_send_flg = 1");
sb.append(" AND tt.project_id = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId}, TaskReportDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskReportDto.class);
}
public List<TaskReportDto> getSendableTaskData(Long projectId, String taskKey) {
public List<TaskReportDto> getSendableTaskData(Long operationId, String taskKey) {
StringBuilder sb = new StringBuilder();
sb.append(" select * ");
sb.append(" from t_task_report ttr ");
......@@ -131,7 +131,7 @@ public class TaskReportDao extends AbstractDao {
sb.append(" WHERE ttr.data_send_flg = 1");
sb.append(" AND tt.project_id = ?");
sb.append(" AND tt.task_key = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId, "" + taskKey}, TaskReportDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId, "" + taskKey}, TaskReportDto.class);
}
public String getTaskReportAttachedFileName(String taskKey) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportItemsDao.java
......@@ -42,7 +42,7 @@ public class TaskReportItemsDao extends AbstractDao {
return rawQueryGetDtoList("select * from t_task_report_items where task_key=?", new String[]{"" + taskKey}, TaskReportItemsDto.class);
}
public List<TaskReportItemsDto> getTaskReportItemByProjectId(Long projectId) {
public List<TaskReportItemsDto> getTaskReportItemByOperationId(Long operationId) {
StringBuilder sb = new StringBuilder();
sb.append(" select distinct ttri.* ");
sb.append(" from t_task_report_items ttri ");
......@@ -51,7 +51,7 @@ public class TaskReportItemsDao extends AbstractDao {
sb.append(" ON tt.task_key == ttri.task_key ");
sb.append(" WHERE tt.del_flg = 0");
sb.append(" AND tt.project_id = ?");
return rawQueryGetDtoList(sb.toString(), new String[]{"" + projectId}, TaskReportItemsDto.class);
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskReportItemsDto.class);
}
public boolean updateTaskReportItems(TaskReportItemsDto dto) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportSendDao.java
......@@ -137,7 +137,7 @@ public class TaskReportSendDao extends AbstractDao {
return rawQueryGetDtoList(sb.toString(), new String[]{ taskKey, "" + taskReportId, reportStartDate }, TaskReportSendDto.class);
}
public int getSendableTaskReportSendDataCount(Long projectId, String taskKey) {
public int getSendableTaskReportSendDataCount(Long operationId, String taskKey) {
StringBuilder sb = new StringBuilder();
sb.append(" select count(ttrs.task_report_send_id) ");
sb.append(" from t_task_report_send ttrs ");
......@@ -147,12 +147,12 @@ public class TaskReportSendDao extends AbstractDao {
sb.append(" AND tt.project_id = ?");
if (taskKey != null) {
sb.append(" AND ttrs.task_key = ?");
return rawQueryGetInt(sb.toString(), new String[]{ "" + projectId, "" + taskKey });
return rawQueryGetInt(sb.toString(), new String[]{ "" + operationId, "" + taskKey });
}
return rawQueryGetInt(sb.toString(), new String[]{ "" + projectId });
return rawQueryGetInt(sb.toString(), new String[]{ "" + operationId });
}
public int getSendableTaskReportSendDataCount(Long projectId, String taskKey, int taskReportId, String reportStartDate) {
public int getSendableTaskReportSendDataCount(Long operationId, String taskKey, int taskReportId, String reportStartDate) {
StringBuilder sb = new StringBuilder();
sb.append(" select count(ttrs.task_report_send_id) ");
sb.append(" from t_task_report_send ttrs ");
......@@ -162,8 +162,8 @@ public class TaskReportSendDao extends AbstractDao {
sb.append(" AND tt.project_id = ?");
if (!StringUtil.isNullOrEmpty(taskKey) && taskReportId > 0 && !StringUtil.isNullOrEmpty(reportStartDate)) {
sb.append(" AND ttrs.task_key = ? and task_report_id = ? and report_start_date = ?");
return rawQueryGetInt(sb.toString(), new String[]{ "" + projectId, taskKey, "" + taskReportId, reportStartDate });
return rawQueryGetInt(sb.toString(), new String[]{ "" + operationId, taskKey, "" + taskReportId, reportStartDate });
}
return rawQueryGetInt(sb.toString(), new String[]{ "" + projectId });
return rawQueryGetInt(sb.toString(), new String[]{ "" + operationId });
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/RProjectContent.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/ROperationContent.java
......@@ -9,9 +9,9 @@ import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
* Created by leej on 2018/08/17.
*/
public class RProjectContent extends SQLiteTableScript {
public class ROperationContent extends SQLiteTableScript {
public RProjectContent() {
public ROperationContent() {
super();
}
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TProject.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TOperation.java
......@@ -10,9 +10,9 @@ import jp.agentec.abook.abv.bl.data.DatabaseVersions;
* Created by leej on 2018/08/17.
*/
public class TProject extends SQLiteTableScript {
public class TOperation extends SQLiteTableScript {
public TProject() {
public TOperation() {
super();
}
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TInspectTaskReport.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TRoutineTaskReport.java
......@@ -10,9 +10,9 @@ import jp.agentec.abook.abv.bl.data.DatabaseVersions;
* Created by seo-y on 2018/12/17.
*/
public class TInspectTaskReport extends SQLiteTableScript {
public class TRoutineTaskReport extends SQLiteTableScript {
public TInspectTaskReport() {
public TRoutineTaskReport() {
super();
}
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentRefresher.java
......@@ -29,7 +29,7 @@ import jp.agentec.abook.abv.bl.logic.ContentReadingLogLogic;
import jp.agentec.abook.abv.bl.logic.ContractLogic;
import jp.agentec.abook.abv.bl.logic.EnqueteLogic;
import jp.agentec.abook.abv.bl.logic.GroupLogic;
import jp.agentec.abook.abv.bl.logic.ProjectLogic;
import jp.agentec.abook.abv.bl.logic.OperationLogic;
import jp.agentec.adf.util.CollectionUtil;
import jp.agentec.adf.util.DateTimeUtil;
......@@ -48,7 +48,7 @@ public class ContentRefresher {
private CategoryLogic categoryLogic = AbstractLogic.getLogic(CategoryLogic.class);
private EnqueteLogic enqueteLogic = AbstractLogic.getLogic(EnqueteLogic.class);
private ContentLogic contentLogic = AbstractLogic.getLogic(ContentLogic.class);
private ProjectLogic projectLogic = AbstractLogic.getLogic(ProjectLogic.class);
private OperationLogic operationLogic = AbstractLogic.getLogic(OperationLogic.class);
private ContentDao contentDao = AbstractDao.getDao(ContentDao.class);
private ABVDataCache cache = ABVDataCache.getInstance();
......@@ -327,7 +327,7 @@ public class ContentRefresher {
// 新着処理が終わったら以下の処理が実行
try {
// サーバー通信でプロジェクト取得
projectLogic.initializeProjects();
operationLogic.initializeOperations();
} catch (Exception e1) {
Logger.e(TAG, e1);
e = e1;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/MemberInfoDto.java
......@@ -25,19 +25,19 @@ public class MemberInfoDto extends AbstractDto {
public Date lastCMSAccessDate;
public Date passwordExpiryDate;
public String lastUpdateInfor; //ABookSee 1.8.1
public Integer projectAuthLevel;
public Integer operationAuthLevel;
public String workerCode;
public RequirePasswordChangeCode requiredPasswordChange;
@Override
public Object[] getInsertValues() {
return new Object[]{loginId, password, memberName, sid, loginStatus, invalidPasswordCount, lastLoginDate, lastChangePasswordDate, lastCMSAccessDate, userId, lastUpdateInfor, projectAuthLevel, workerCode};
return new Object[]{loginId, password, memberName, sid, loginStatus, invalidPasswordCount, lastLoginDate, lastChangePasswordDate, lastCMSAccessDate, userId, lastUpdateInfor, operationAuthLevel, workerCode};
}
@Override
public Object[] getUpdateValues() {
return new Object[]{password, memberName, sid, loginStatus, invalidPasswordCount, lastLoginDate, lastChangePasswordDate, lastCMSAccessDate, lastUpdateInfor, projectAuthLevel, workerCode, loginId};
return new Object[]{password, memberName, sid, loginStatus, invalidPasswordCount, lastLoginDate, lastChangePasswordDate, lastCMSAccessDate, lastUpdateInfor, operationAuthLevel, workerCode, loginId};
}
@Override
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ProjectContentDto.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/OperationContentDto.java
......@@ -4,18 +4,18 @@ package jp.agentec.abook.abv.bl.dto;
* Created by leej on 2018/08/23.
*/
public class ProjectContentDto extends AbstractDto {
public long projectId;
public class OperationContentDto extends AbstractDto {
public long operationId;
public long contentId;
public boolean projectContentFlg;
public boolean operationContentFlg;
@Override
public Object[] getInsertValues() {
return new Object[]{projectId, contentId, projectContentFlg};
return new Object[]{operationId, contentId, operationContentFlg};
}
@Override
public String[] getKeyValues() {
return new String[]{""+ projectId};
return new String[]{""+ operationId};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ProjectDto.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/OperationDto.java
......@@ -7,32 +7,32 @@ import java.util.List;
* Created by leej on 2018/08/17.
*/
public class ProjectDto extends AbstractDto {
public Long projectId;
public int projectType;
public String projectName;
public String projectDescriptions;
public Date projectStartDate;
public Date projectEndDate;
public class OperationDto extends AbstractDto {
public Long operationId;
public int operationType;
public String operationName;
public String operationDescriptions;
public Date operationStartDate;
public Date operationEndDate;
public Date lastEditDate;
public boolean editLockFlg;
public boolean needSyncFlg;
public boolean contentCreatingFlg;
public Long contentId;
public List<ProjectContentDto> projectContentDtoList;
public List<OperationContentDto> operationContentDtoList;
public List<TaskDto> taskDtoList;
public List<PushMessageDto> pushMessageList;
public int reportUpdateType; //0:履歴無し 1:新規追加 2:更新
public int projectReportType; //0:通常 1:定期点検
public int operationReportType; //0:通常 1:定期点検
public int reportCycle; //0:日次 1:月次 2:年次
public int enableReportUpdate; //0:不可 1:可
public String reportPeriod; //定期点検、2018/12/20 08:10:00 ~ 2018/12/21 18:10:00
public int reportCount; //定期点検、作業数
public boolean equalsLastEdit(ProjectDto dto) {
public boolean equalsLastEdit(OperationDto dto) {
if (dto != null) {
if (projectId.equals(dto.projectId) && lastEditDate.equals(dto.lastEditDate)) {
if (operationId.equals(dto.operationId) && lastEditDate.equals(dto.lastEditDate)) {
return true;
}
}
......@@ -41,16 +41,16 @@ public class ProjectDto extends AbstractDto {
@Override
public Object[] getInsertValues() {
return new Object[] { projectId, projectName, projectDescriptions, projectStartDate, projectEndDate, projectType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportUpdateType, projectReportType, reportCycle, enableReportUpdate };
return new Object[] { operationId, operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportUpdateType, operationReportType, reportCycle, enableReportUpdate };
}
@Override
public Object[] getUpdateValues() {
return new Object[] { projectName, projectDescriptions, projectStartDate, projectEndDate, projectType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportUpdateType, projectReportType, reportCycle, enableReportUpdate, projectId };
return new Object[] { operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportUpdateType, operationReportType, reportCycle, enableReportUpdate, operationId };
}
@Override
public String[] getKeyValues() {
return new String[] { "" + projectId };
return new String[] { "" + operationId };
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ProjectTaskDto.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/OperationTaskDto.java
......@@ -6,8 +6,8 @@ import java.util.Date;
* Created by seo-y on 2018/11/14.
*/
public class ProjectTaskDto extends AbstractDto {
public long projectId;
public class OperationTaskDto extends AbstractDto {
public long operationId;
public int pageNum;
public String taskKey;
public String taskCode;
......@@ -20,16 +20,16 @@ public class ProjectTaskDto extends AbstractDto {
@Override
public Object[] getInsertValues() {
return new Object[]{projectId, pageNum, taskKey, taskCode, pdfX, pdfY};
return new Object[]{operationId, pageNum, taskKey, taskCode, pdfX, pdfY};
}
@Override
public Object[] getUpdateValues() {
return new Object[]{projectId, pageNum, taskKey, taskCode, pdfX, pdfY};
return new Object[]{operationId, pageNum, taskKey, taskCode, pdfX, pdfY};
}
@Override
public String[] getKeyValues() {
return new String[]{""+ projectId, ""+ pageNum, ""+ taskKey, ""+ taskCode, ""+ pdfX, ""+ pdfY};
return new String[]{""+ operationId, ""+ pageNum, ""+ taskKey, ""+ taskCode, ""+ pdfX, ""+ pdfY};
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/PushMessageDto.java
......@@ -8,11 +8,11 @@ import java.util.Date;
public class PushMessageDto extends AbstractDto {
public Long pushMessageId;
public Long projectId;
public Long operationId;
public String pushSendLoginId;
public Date pushSendDate;
public String pushMessage;
public String projectName;
public String operationName;
public boolean readingFlg;
@Override
......@@ -22,6 +22,6 @@ public class PushMessageDto extends AbstractDto {
@Override
public Object[] getInsertValues() {
return new Object[] { pushMessageId, projectId, pushSendLoginId, pushSendDate, pushMessage, readingFlg };
return new Object[] { pushMessageId, operationId, pushSendLoginId, pushSendDate, pushMessage, readingFlg };
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/InspectTaskReportDto.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/RoutineTaskReportDto.java
......@@ -6,7 +6,7 @@ import java.util.Date;
* Created by seo-y on 2018/12/17.
*/
public class InspectTaskReportDto extends AbstractDto {
public class RoutineTaskReportDto extends AbstractDto {
public String taskKey;
public int taskReportId;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskDto.java
......@@ -10,7 +10,7 @@ public class TaskDto extends AbstractDto {
public String taskKey;
public Long taskId;
public Long projectId;
public Long operationId;
public String taskCode;
public Integer taskStatus;
public String taskHotSpotInfo;
......@@ -20,17 +20,17 @@ public class TaskDto extends AbstractDto {
public TaskReportDto taskReportDto;
public int taskReportId;
public List<InspectTaskReportDto> InspectTaskReportList;
public List<RoutineTaskReportDto> RoutineTaskReportList;
@Override
public Object[] getInsertValues() {
return new Object[] { taskKey, taskId, projectId, taskCode, taskStatus, taskHotSpotInfo };
return new Object[] { taskKey, taskId, operationId, taskCode, taskStatus, taskHotSpotInfo };
}
@Override
public Object[] getUpdateValues() {
return new Object[] { taskId, projectId, taskCode, taskStatus, taskHotSpotInfo, delFlg, taskKey };
return new Object[] { taskId, operationId, taskCode, taskStatus, taskHotSpotInfo, delFlg, taskKey };
}
@Override
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
......@@ -15,7 +15,6 @@ public class TaskReportDto extends AbstractDto {
public String taskHotSpotInfo;
public boolean delFlg;
@Override
public Object[] getInsertValues() {
return new Object[] { taskKey, jsonData, attachedFileName, localAttachedFileName, attachedFileSendFlg, dataSendFlg };
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/PushMessageLogic.java
......@@ -21,7 +21,7 @@ import jp.agentec.abook.abv.bl.dto.PushMessageDto;
*/
public class PushMessageLogic extends AbstractLogic {
private static final String TAG = "ProjectRelatedContentActivity";
private static final String TAG = "OperationRelatedContentActivity";
private PushMessageDao mPushMessageDao = AbstractDao.getDao(PushMessageDao.class);
/**
* プッシュメッセージの定型文取得
......@@ -40,8 +40,8 @@ public class PushMessageLogic extends AbstractLogic {
* @throws IOException
* @throws AcmsException
*/
public boolean sendPushMessageRequest(int sendType, String message, long projectId) throws IOException, AcmsException, NetworkDisconnectedException {
SendPushMessageParameters param = new SendPushMessageParameters(cache.getMemberInfo().sid, projectId, sendType, message);
public boolean sendPushMessageRequest(int sendType, String message, long operationId) throws IOException, AcmsException, NetworkDisconnectedException {
SendPushMessageParameters param = new SendPushMessageParameters(cache.getMemberInfo().sid, operationId, sendType, message);
AcmsMessageJSON json = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).sendPushMessageRequest(param);
Logger.d(TAG, " status=" + json.httpStatus);
if (json.httpStatus == ABookKeys.HTTP_STATUS_SUCCESS) {
......
ABVJE_Launcher_Android/AndroidManifest.xml
......@@ -200,12 +200,12 @@
</activity>
<!-- ABookCheck対応 -->
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ProjectListActivity"
<activity android:name="jp.agentec.abook.abv.ui.home.activity.OperationListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ProjectRelatedContentActivity"
<activity android:name="jp.agentec.abook.abv.ui.home.activity.OperationRelatedContentActivity"
android:configChanges="keyboardHidden|orientation|screenSize"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ProjectMeetingListActivity"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ProjectMeetingListActivityDialog" android:theme="@style/Theme.MyTheme.ModalDialog"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.OperationMeetingListActivity"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.OperationMeetingListActivityDialog" android:theme="@style/Theme.MyTheme.ModalDialog"/>
<activity android:name="jp.agentec.abook.abv.ui.viewer.activity.CheckOZDViewActivity" android:configChanges="orientation|screenSize"/>
......
ABVJE_Res_Default_Android/res/drawable/project_radius_frame.xml → ABVJE_Res_Default_Android/res/drawable/operation_radius_frame.xml
......@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<stroke android:width="1dp" android:color="#cccccc" />
<corners android:radius="10dp"/>
<solid android:color="@color/project_search_button_color"/>
<solid android:color="@color/operation_search_button_color"/>
</shape>
ABVJE_Res_Default_Android/res/values/colors.xml
......@@ -76,16 +76,16 @@
<color name="search_view_bg">#edf2f2</color>
<color name="black_translucent">#7A000000</color>
<color name="project_default_text_color">#000000</color>
<color name="project_name">#333333</color>
<color name="project_description">#333333</color>
<color name="project_date">#37648C</color>
<color name="project_color">#095395</color>
<color name="project_disable_color">#CCCCCC</color>
<color name="project_search_background">#FFFFFF</color>
<color name="project_search_header">#CCCCCC</color>
<color name="project_search_button_color">#0068CB</color>
<color name="project_search_label_color">#555555</color>
<color name="project_related_content_new_mark">#ff0000</color>
<color name="operation_default_text_color">#000000</color>
<color name="operation_name">#333333</color>
<color name="operation_description">#333333</color>
<color name="operation_date">#37648C</color>
<color name="operation_color">#095395</color>
<color name="operation_disable_color">#CCCCCC</color>
<color name="operation_search_background">#FFFFFF</color>
<color name="operation_search_header">#CCCCCC</color>
<color name="operation_search_button_color">#0068CB</color>
<color name="operation_search_label_color">#555555</color>
<color name="operation_related_content_new_mark">#ff0000</color>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/dimens.xml
......@@ -16,10 +16,10 @@
<dimen name="weather_icon_size">60dp</dimen>
<dimen name="project_icon_text_size">10sp</dimen>
<dimen name="project_normal_text_size">16sp</dimen>
<dimen name="project_title_text_size">20sp</dimen>
<dimen name="project_title_normal_width">200dp</dimen>
<dimen name="project_title_large_width">400dp</dimen>
<dimen name="operation_icon_text_size">10sp</dimen>
<dimen name="operation_normal_text_size">16sp</dimen>
<dimen name="operation_title_text_size">20sp</dimen>
<dimen name="operation_title_normal_width">200dp</dimen>
<dimen name="operation_title_large_width">400dp</dimen>
</resources>
ABVJE_UI_Android/res/layout-large/ac_project_list.xml → ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
......@@ -10,7 +10,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/project_color"
android:background="@color/operation_color"
android:minHeight="50dp"
android:visibility="visible">
......@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/project_list"
android:text="@string/operation_list"
android:textColor="@color/text_dialog"
android:textSize="15dp"
android:textStyle="bold" />
......@@ -68,7 +68,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/btn_sub_menu"
android:background="@drawable/ic_project_search"
android:background="@drawable/ic_operation_search"
android:contentDescription="@string/list" />
<ImageButton
......@@ -78,8 +78,8 @@
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/btn_common_content"
android:background="@drawable/ic_project_setting"
android:onClick="onClickProjectSubMenu" />
android:background="@drawable/ic_operation_setting"
android:onClick="onClickOperationSubMenu" />
<ImageButton
android:id="@+id/btn_common_content"
......@@ -97,12 +97,12 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:onClick="onClickShowHelpView" />
</RelativeLayout>
<com.handmark.pulltorefresh.library.PullToRefreshListView
android:id="@+id/projectListView"
android:id="@+id/operationListView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
......
ABVJE_UI_Android/res/layout-large/ac_project_related_content.xml → ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
......@@ -16,10 +16,10 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/project_related_content_toolbar"
android:id="@+id/operation_related_content_toolbar"
style="@style/ToolBarHolo"
android:minHeight="50dp"
android:background="@color/project_color"
android:background="@color/operation_color"
android:gravity="center" >
<LinearLayout
......@@ -29,12 +29,12 @@
android:gravity="left|center" >
<ImageButton
android:id="@+id/btn_project_home"
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:background="@drawable/ic_project_home"
android:background="@drawable/ic_operation_home"
android:contentDescription="@null" />
</LinearLayout>
......@@ -54,10 +54,10 @@
android:visibility="gone" />
<TextView
android:id="@+id/txt_project_related_content"
android:id="@+id/txt_operation_related_content"
style="@style/txt_menu"
android:layout_centerVertical="true"
android:text="@string/project_related_content"
android:text="@string/operation_related_content"
android:textColor="@color/text_dialog"
android:textStyle="bold" />
</LinearLayout>
......@@ -69,12 +69,12 @@
android:gravity="right|center" >
<ImageButton
android:id="@+id/btn_project_help"
android:id="@+id/btn_operation_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:contentDescription="@null"
android:onClick="onClickShowHelpView"/>
</LinearLayout>
......@@ -82,7 +82,7 @@
<LinearLayout
android:id="@+id/ll_project_name"
android:id="@+id/ll_operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
......@@ -91,7 +91,7 @@
android:paddingRight="10dp" >
<TextView
android:id="@+id/txt_project_name"
android:id="@+id/txt_operation_name"
style="@style/txt_menu"
android:gravity="left"
android:layout_width="match_parent"
......@@ -127,7 +127,7 @@
android:layout_height="30dp"
android:layout_gravity="right|center"
android:gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/save_all" />
</LinearLayout>
......
ABVJE_UI_Android/res/layout-large/item_project_list.xml → ABVJE_UI_Android/res/layout-large/item_operation_list.xml
......@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/project_underline"
android:background="@drawable/operation_underline"
android:orientation="vertical">
......@@ -14,24 +14,24 @@
android:orientation="vertical">
<TextView
android:id="@+id/project_date"
android:id="@+id/operation_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/dummy_date"
android:textColor="@color/project_date"
android:textSize="@dimen/project_normal_text_size" />
android:textColor="@color/operation_date"
android:textSize="@dimen/operation_normal_text_size" />
<TextView
android:id="@+id/project_name"
android:id="@+id/operation_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/dummy_str"
android:textColor="@color/project_name"
android:textColor="@color/operation_name"
android:textSize="@dimen/app_large_text_size"
android:textStyle="bold"
android:visibility="visible" />
......@@ -56,8 +56,8 @@
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/project_description"
android:textSize="@dimen/project_normal_text_size"/>
android:textColor="@color/operation_description"
android:textSize="@dimen/operation_normal_text_size"/>
</LinearLayout>
<LinearLayout
......
ABVJE_UI_Android/res/layout-large/item_project_meeting_list_render.xml → ABVJE_UI_Android/res/layout-large/item_operation_meeting_list_render.xml
......@@ -53,7 +53,7 @@
android:layout_gravity="center"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/meeting_enter" />
</TableRow>
......
ABVJE_UI_Android/res/layout-large/item_push_message_list.xml
......@@ -43,7 +43,7 @@
android:singleLine="true"
android:text="@string/dummy_str"
android:textSize="@dimen/app_normal_text_size"
android:textColor="@color/project_default_text_color" />
android:textColor="@color/operation_default_text_color" />
</LinearLayout>
<LinearLayout
......@@ -58,10 +58,10 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/dummy_date_time"
android:textColor="@color/project_default_text_color" />
android:textColor="@color/operation_default_text_color" />
<TextView
android:id="@+id/tv_project_name"
android:id="@+id/tv_operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
......@@ -71,7 +71,7 @@
android:maxLines="1"
android:paddingLeft="3dp"
android:text="@string/dummy_str"
android:textColor="@color/project_default_text_color" />
android:textColor="@color/operation_default_text_color" />
</LinearLayout>
</LinearLayout>
......
ABVJE_UI_Android/res/layout-normal/ac_help_dialog.xml
......@@ -7,7 +7,7 @@
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_width="match_parent"
android:layout_height="50dp">
......@@ -20,7 +20,7 @@
android:layout_centerVertical="true"
android:text="@string/title_help"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<ImageButton
android:id="@+id/close_btn"
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:onClick="onClickCloseView" />
</RelativeLayout>
......@@ -43,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Help Detail"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="18sp" />
<View
......@@ -52,7 +52,7 @@
android:layout_height="1dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@color/project_color" />
android:background="@color/operation_color" />
<ListView
android:id="@+id/lv_help"
......
ABVJE_UI_Android/res/layout-normal/ac_project_list.xml → ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
......@@ -10,7 +10,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/project_color"
android:background="@color/operation_color"
android:minHeight="50dp"
android:visibility="visible">
......@@ -25,7 +25,7 @@
style="@style/DialogToolBarTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/project_list"
android:text="@string/operation_list"
android:layout_marginRight="25dp"
android:layout_centerVertical="true"
android:textColor="@color/text_dialog"
......@@ -50,7 +50,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:onClick="onClickShowHelpView"/>
</RelativeLayout>
......@@ -59,7 +59,7 @@
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/project_color"
android:background="@color/operation_color"
android:minHeight="50dp"
android:visibility="visible">
......@@ -103,7 +103,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:background="@drawable/ic_project_search"
android:background="@drawable/ic_operation_search"
android:contentDescription="@string/list" />
<ImageButton
......@@ -113,13 +113,13 @@
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_alignParentRight="true"
android:background="@drawable/ic_project_setting"
android:onClick="onClickProjectSubMenu" />
android:background="@drawable/ic_operation_setting"
android:onClick="onClickOperationSubMenu" />
</RelativeLayout>
<com.handmark.pulltorefresh.library.PullToRefreshListView
android:id="@+id/projectListView"
android:id="@+id/operationListView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
......
ABVJE_UI_Android/res/layout-normal/ac_project_related_content.xml → ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
......@@ -16,10 +16,10 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/project_related_content_toolbar"
android:id="@+id/operation_related_content_toolbar"
style="@style/ToolBarHolo"
android:minHeight="50dp"
android:background="@color/project_color"
android:background="@color/operation_color"
android:gravity="center" >
<LinearLayout
......@@ -29,12 +29,12 @@
android:gravity="left|center" >
<ImageButton
android:id="@+id/btn_project_home"
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:background="@drawable/ic_project_home"
android:background="@drawable/ic_operation_home"
android:contentDescription="@null" />
</LinearLayout>
......@@ -45,11 +45,11 @@
android:layout_gravity="center"
android:layout_marginRight="25dp">
<TextView
android:id="@+id/txt_project_related_content"
android:id="@+id/txt_operation_related_content"
style="@style/txt_menu"
android:gravity="center"
android:layout_centerVertical="true"
android:text="@string/project_related_content"
android:text="@string/operation_related_content"
android:textSize="@dimen/app_normal_text_size"
android:textColor="@color/text_dialog"
android:textStyle="bold" />
......@@ -62,12 +62,12 @@
android:gravity="right|center" >
<ImageButton
android:id="@+id/btn_project_help"
android:id="@+id/btn_operation_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:contentDescription="@null"
android:onClick="onClickShowHelpView"/>
</LinearLayout>
......@@ -75,7 +75,7 @@
<LinearLayout
android:id="@+id/ll_project_name"
android:id="@+id/ll_operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
......@@ -84,7 +84,7 @@
android:paddingRight="10dp" >
<TextView
android:id="@+id/txt_project_name"
android:id="@+id/txt_operation_name"
style="@style/txt_menu"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -121,7 +121,7 @@
android:layout_height="30dp"
android:layout_gravity="right|center"
android:gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/save_all" />
</LinearLayout>
......
ABVJE_UI_Android/res/layout-normal/item_project_list.xml → ABVJE_UI_Android/res/layout-normal/item_operation_list.xml
......@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/project_underline"
android:background="@drawable/operation_underline"
android:orientation="vertical">
......@@ -19,24 +19,24 @@
android:orientation="vertical">
<TextView
android:id="@+id/project_date"
android:id="@+id/operation_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/dummy_date"
android:textColor="@color/project_date"
android:textSize="@dimen/project_normal_text_size" />
android:textColor="@color/operation_date"
android:textSize="@dimen/operation_normal_text_size" />
<TextView
android:id="@+id/project_name"
android:id="@+id/operation_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/dummy_str"
android:textColor="@color/project_name"
android:textColor="@color/operation_name"
android:textSize="@dimen/app_large_text_size"
android:textStyle="bold"
android:visibility="visible" />
......@@ -56,8 +56,8 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="4"
android:textColor="@color/project_description"
android:textSize="@dimen/project_normal_text_size" />
android:textColor="@color/operation_description"
android:textSize="@dimen/operation_normal_text_size" />
</LinearLayout>
<LinearLayout
......
ABVJE_UI_Android/res/layout-normal/item_project_meeting_list_render.xml → ABVJE_UI_Android/res/layout-normal/item_operation_meeting_list_render.xml
......@@ -77,7 +77,7 @@
android:layout_gravity="center"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/meeting_enter" />
</TableRow>
......
ABVJE_UI_Android/res/layout-normal/item_push_message_list.xml
......@@ -43,7 +43,7 @@
android:singleLine="true"
android:text="@string/dummy_str"
android:textSize="@dimen/app_normal_text_size"
android:textColor="@color/project_default_text_color" />
android:textColor="@color/operation_default_text_color" />
</LinearLayout>
<LinearLayout
......@@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/dummy_date_time"
android:textColor="@color/project_default_text_color" />
android:textColor="@color/operation_default_text_color" />
</LinearLayout>
<LinearLayout
......@@ -68,14 +68,14 @@
android:orientation="horizontal">
<TextView
android:id="@+id/tv_project_name"
android:id="@+id/tv_operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:maxLines="1"
android:text="@string/dummy_str"
android:textColor="@color/project_default_text_color" />
android:textColor="@color/operation_default_text_color" />
</LinearLayout>
</LinearLayout>
......@@ -87,7 +87,7 @@
android:layout_gravity="center_vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/detail"
android:textColor="@color/text_color" />
</LinearLayout>
......
ABVJE_UI_Android/res/layout-normal/push_message_list_dialog.xml
......@@ -9,7 +9,7 @@
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_height="50dp"
android:layout_width="match_parent">
......@@ -34,7 +34,7 @@
android:maxLines="1"
android:text="@string/push_message_list"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<Button
android:id="@+id/close_btn"
......@@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -80,21 +80,21 @@
android:textColor="@android:color/black" />
<TextView
android:id="@+id/tv_project_name_title"
android:id="@+id/tv_operation_name_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/project_name"
android:text="@string/operation_name"
android:textColor="@android:color/black"/>
<TextView
android:id="@+id/tv_project_name"
android:id="@+id/tv_operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:paddingLeft="3dp"
android:text="@string/dummy_str"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="18sp"
android:textStyle="bold" />
......
ABVJE_UI_Android/res/layout/ac_help_dialog.xml
......@@ -7,7 +7,7 @@
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_width="match_parent"
android:layout_height="50dp">
......@@ -20,7 +20,7 @@
android:layout_centerVertical="true"
android:text="@string/title_help"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<ImageButton
android:id="@+id/close_btn"
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:onClick="onClickCloseView" />
</RelativeLayout>
......@@ -43,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Help Detail"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="18sp" />
<View
......@@ -52,7 +52,7 @@
android:layout_height="1dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@color/project_color" />
android:background="@color/operation_color" />
<ListView
android:id="@+id/lv_help"
......
ABVJE_UI_Android/res/layout/ac_html_webview.xml
......@@ -50,14 +50,14 @@
android:textStyle="bold" />
</LinearLayout>
<Button
android:id="@+id/btn_project_home"
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:visibility="gone"
android:background="@drawable/ic_project_home"
android:background="@drawable/ic_operation_home"
android:contentDescription="@string/cont_desc" />
<ImageButton
android:id="@+id/btn_remote_pause"
......@@ -168,7 +168,7 @@
android:id="@+id/btn_add_scene"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_add_scene"
android:background="@drawable/ic_operation_add_scene"
android:layout_marginRight="10dp"
android:visibility="gone" />
......@@ -176,7 +176,7 @@
android:id="@+id/btn_show_task_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_task_list"
android:background="@drawable/ic_operation_task_list"
android:layout_marginRight="10dp"
android:visibility="gone" />
......@@ -184,7 +184,7 @@
android:id="@+id/btn_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:layout_marginRight="10dp"
android:visibility="gone"
android:onClick="onClickShowHelpView"/>
......
ABVJE_UI_Android/res/layout/ac_html_xwalk.xml
......@@ -53,14 +53,14 @@
android:textStyle="bold" />
</LinearLayout>
<Button
android:id="@+id/btn_project_home"
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:visibility="gone"
android:background="@drawable/ic_project_home"
android:background="@drawable/ic_operation_home"
android:contentDescription="@string/cont_desc" />
<ImageButton
......@@ -173,7 +173,7 @@
android:id="@+id/btn_add_scene"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_add_scene"
android:background="@drawable/ic_operation_add_scene"
android:layout_marginRight="10dp"
android:visibility="gone" />
......@@ -181,7 +181,7 @@
android:id="@+id/btn_show_task_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_task_list"
android:background="@drawable/ic_operation_task_list"
android:layout_marginRight="10dp"
android:visibility="gone" />
......@@ -189,7 +189,7 @@
android:id="@+id/btn_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:layout_marginRight="10dp"
android:visibility="gone"
android:onClick="onClickShowHelpView"/>
......
ABVJE_UI_Android/res/layout/ac_project_meeting_list.xml → ABVJE_UI_Android/res/layout/ac_operation_meeting_list.xml
......@@ -10,7 +10,7 @@
android:id="@+id/meeting_list_toolbar"
android:layout_width="match_parent"
android:layout_height="50dp"
style="@style/ProjectSearchToolBar">
style="@style/OperationSearchToolBar">
<TextView
android:id="@+id/meeting_list_title"
......@@ -21,7 +21,7 @@
android:layout_centerVertical="true"
android:text="@string/room_list"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<ProgressBar
android:id="@+id/progressbar_small"
......@@ -40,7 +40,7 @@
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -215,7 +215,7 @@
style="@style/ButtonABookDark"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:paddingBottom="10dp"
......@@ -227,7 +227,7 @@
style="@style/ButtonABookDark"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:paddingBottom="10dp"
......
ABVJE_UI_Android/res/layout/ac_project_related_content.xml → ABVJE_UI_Android/res/layout/ac_operation_related_content.xml
......@@ -16,10 +16,10 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/project_related_content_toolbar"
android:id="@+id/operation_related_content_toolbar"
style="@style/ToolBarHolo"
android:minHeight="50dp"
android:background="@color/project_color"
android:background="@color/operation_color"
android:gravity="center" >
<LinearLayout
......@@ -29,12 +29,12 @@
android:gravity="left|center" >
<ImageButton
android:id="@+id/btn_project_home"
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:background="@drawable/ic_project_home"
android:background="@drawable/ic_operation_home"
android:contentDescription="@null" />
</LinearLayout>
......@@ -45,10 +45,10 @@
android:gravity="center" >
<TextView
android:id="@+id/txt_project_related_content"
android:id="@+id/txt_operation_related_content"
style="@style/txt_menu"
android:layout_centerVertical="true"
android:text="@string/project_related_content"
android:text="@string/operation_related_content"
android:textColor="@color/text_dialog"
android:textStyle="bold" />
</LinearLayout>
......@@ -60,12 +60,12 @@
android:gravity="right|center" >
<ImageButton
android:id="@+id/btn_project_help"
android:id="@+id/btn_operation_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:contentDescription="@null"
android:onClick="onClickShowHelpView"/>
</LinearLayout>
......@@ -73,7 +73,7 @@
<LinearLayout
android:id="@+id/ll_project_name"
android:id="@+id/ll_operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
......@@ -82,7 +82,7 @@
android:paddingRight="10dp" >
<TextView
android:id="@+id/txt_project_name"
android:id="@+id/txt_operation_name"
style="@style/txt_menu"
android:gravity="left"
android:layout_width="match_parent"
......@@ -118,7 +118,7 @@
android:layout_height="30dp"
android:layout_gravity="right|center"
android:gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/save_all" />
</LinearLayout>
......
ABVJE_UI_Android/res/layout/ac_ozd_webview.xml
......@@ -8,7 +8,7 @@
android:id="@+id/frame_top_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:minHeight="50dp">
<LinearLayout
......@@ -42,7 +42,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:background="@drawable/ic_project_close" />
android:background="@drawable/ic_operation_close" />
</LinearLayout>
</RelativeLayout>
<FrameLayout
......
ABVJE_UI_Android/res/layout/ac_projcet_meeting_add.xml
......@@ -11,7 +11,7 @@
android:id="@+id/meeting_add_toolbar"
android:layout_width="match_parent"
android:layout_height="50dp"
style="@style/ProjectSearchToolBar">
style="@style/OperationSearchToolBar">
<TextView
android:id="@+id/meeting_add_title"
......@@ -22,7 +22,7 @@
android:layout_centerVertical="true"
android:text="@string/create_room"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size"/>
android:textSize="@dimen/operation_title_text_size"/>
<Button
android:id="@+id/close"
......@@ -30,7 +30,7 @@
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -91,7 +91,7 @@
style="@style/ButtonABookDark"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:layout_gravity="center"
android:layout_margin="20dp"
android:padding="10dp"
......
ABVJE_UI_Android/res/layout/communication_menu_dialog.xml
......@@ -3,12 +3,12 @@
android:layout_width="match_parent"
android:layout_height="300dp"
android:minHeight="200dp"
android:background="@color/project_search_background"
android:background="@color/operation_search_background"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_height="50dp"
android:layout_width="match_parent">
......@@ -32,7 +32,7 @@
android:singleLine="true"
android:text="@string/communication"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<Button
android:id="@+id/close_btn"
......@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -68,7 +68,7 @@
android:visibility="visible">
<ImageView
android:id="@+id/btn_project_meeting"
android:id="@+id/btn_operation_meeting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
......
ABVJE_UI_Android/res/layout/content_view_toolbar.xml
......@@ -27,14 +27,14 @@
android:contentDescription="@string/end" />
<Button
android:id="@+id/btn_project_home"
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:visibility="gone"
android:background="@drawable/ic_project_home"
android:background="@drawable/ic_operation_home"
android:contentDescription="@string/cont_desc" />
<LinearLayout
......@@ -145,7 +145,7 @@
android:id="@+id/btn_show_task_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_task_list"
android:background="@drawable/ic_operation_task_list"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/btn_help"
android:layout_marginRight="10dp"
......@@ -155,7 +155,7 @@
android:id="@+id/btn_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_project_help"
android:background="@drawable/ic_operation_help"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="5dp"
......
ABVJE_UI_Android/res/layout/guid_view_toolbar.xml
......@@ -9,7 +9,7 @@
<RelativeLayout
android:id="@+id/RelativeLayout2"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_width="match_parent"
android:layout_height="50dp"
>
......@@ -21,7 +21,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
<TextView
......@@ -32,7 +32,7 @@
android:gravity="center_vertical|center_horizontal"
android:text="@string/push_message_list"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/item_fix_push_message_list.xml
......@@ -21,7 +21,7 @@
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:text="TextView"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="22sp"
android:textStyle="bold"
android:visibility="visible" />
......@@ -34,7 +34,7 @@
android:layout_marginLeft="35dp"
android:layout_marginRight="8dp"
android:text="TextView"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="18sp"
android:visibility="visible" />
</LinearLayout>
......
ABVJE_UI_Android/res/layout/item_help_list.xml
......@@ -26,7 +26,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:text="TextView"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="18sp" />
</LinearLayout>
......
ABVJE_UI_Android/res/layout/item_project_meeting_list_render.xml → ABVJE_UI_Android/res/layout/item_operation_meeting_list_render.xml
......@@ -52,7 +52,7 @@
android:layout_height="30dp"
android:layout_gravity="right"
android:layout_marginLeft="10dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/meeting_enter" />
</TableRow>
......
ABVJE_UI_Android/res/layout/item_project_select.xml → ABVJE_UI_Android/res/layout/item_operation_select.xml
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_project_select"
android:id="@+id/item_operation_select"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<TextView
android:id="@+id/project_name"
android:id="@+id/operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="10dp"
......
ABVJE_UI_Android/res/layout/item_related_content_panel_render.xml
......@@ -13,7 +13,7 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/project_content_panel_frame"
android:background="@drawable/operation_content_panel_frame"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
......@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:background="@color/project_related_content_new_mark"
android:background="@color/operation_related_content_new_mark"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:text="@string/new_content"
......@@ -169,7 +169,7 @@
android:layout_width="125dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/save" />
<Button
......@@ -177,7 +177,7 @@
android:layout_width="125dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/pause"
android:visibility="gone" />
......@@ -186,7 +186,7 @@
android:layout_width="125dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/restart"
android:visibility="gone" />
......@@ -195,7 +195,7 @@
android:layout_width="125dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/open"
android:visibility="gone" />
......@@ -205,7 +205,7 @@
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginTop="18dp"
android:background="@drawable/project_radius_frame_white"
android:background="@drawable/operation_radius_frame_white"
android:text="@string/delete"
android:textColor="@color/app_color"
android:visibility="gone" />
......@@ -216,7 +216,7 @@
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginTop="18dp"
android:background="@drawable/project_radius_frame_white"
android:background="@drawable/operation_radius_frame_white"
android:text="@string/cancel"
android:textColor="@color/app_color"
android:visibility="gone" />
......@@ -227,7 +227,7 @@
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginTop="18dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/content_update"
android:visibility="gone" />
......
ABVJE_UI_Android/res/layout/item_related_content_panel_render_sht_w09.xml
......@@ -13,7 +13,7 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/project_content_panel_frame"
android:background="@drawable/operation_content_panel_frame"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
......@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:background="@color/project_related_content_new_mark"
android:background="@color/operation_related_content_new_mark"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/new_content"
......@@ -169,7 +169,7 @@
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/save" />
<Button
......@@ -177,7 +177,7 @@
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/pause"
android:visibility="gone" />
......@@ -186,7 +186,7 @@
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/restart"
android:visibility="gone" />
......@@ -195,7 +195,7 @@
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/open"
android:visibility="gone" />
......@@ -205,7 +205,7 @@
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginTop="18dp"
android:background="@drawable/project_radius_frame_white"
android:background="@drawable/operation_radius_frame_white"
android:text="@string/delete"
android:textColor="@color/app_color"
android:visibility="gone" />
......@@ -216,7 +216,7 @@
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginTop="18dp"
android:background="@drawable/project_radius_frame_white"
android:background="@drawable/operation_radius_frame_white"
android:text="@string/cancel"
android:textColor="@color/app_color"
android:visibility="gone" />
......@@ -227,7 +227,7 @@
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginTop="18dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/content_update"
android:visibility="gone" />
......
ABVJE_UI_Android/res/layout/item_related_content_section.xml
......@@ -10,16 +10,16 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/project_section_border"
android:background="@drawable/operation_section_border"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:text="TextView"
android:textColor="@color/project_search_button_color"
android:textColor="@color/operation_search_button_color"
android:textSize="18sp" />
<jp.agentec.abook.abv.ui.common.view.ABVProjectContentGridView
<jp.agentec.abook.abv.ui.common.view.ABVOpearationContentGridView
android:id="@+id/gv_content_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
......
ABVJE_UI_Android/res/layout/project_pano_entry_dialog.xml → ABVJE_UI_Android/res/layout/operation_pano_entry_dialog.xml
......@@ -4,7 +4,7 @@
android:id="@+id/root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/project_search_background"
android:background="@color/operation_search_background"
android:orientation="vertical"
android:weightSum="1">
......@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="50dp"
style="@style/ProjectSearchToolBar">
style="@style/OperationSearchToolBar">
<TextView
android:id="@+id/title"
......@@ -23,8 +23,8 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/pano_entry_title"
android:textColor="@color/project_default_text_color"
android:textSize="@dimen/project_title_text_size" />
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/opeartion_title_text_size" />
<Button
android:id="@+id/closeBtn"
......@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -59,20 +59,20 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_weight="1"
android:text="@string/project_name"
android:textColor="@color/project_default_text_color"
android:textSize="@dimen/project_normal_text_size"
android:text="@string/operation_name"
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/operation_normal_text_size"
android:textStyle="bold" />
<TextView
android:id="@+id/project_name"
android:id="@+id/operation_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:gravity="left|center"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:layout_weight="1"
android:textSize="@dimen/project_normal_text_size"
android:textSize="@dimen/operation_normal_text_size"
android:maxLines="1" />
</LinearLayout>
......@@ -90,8 +90,8 @@
android:gravity="center_vertical"
android:layout_weight="1"
android:text="@string/label_base_file"
android:textColor="@color/project_default_text_color"
android:textSize="@dimen/project_normal_text_size"
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/operation_normal_text_size"
android:textStyle="bold" />
<LinearLayout
......@@ -106,7 +106,7 @@
android:id="@+id/select_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textSize="@dimen/project_normal_text_size"
android:textSize="@dimen/operation_normal_text_size"
android:text="@string/select_image"
android:maxLines="1" />
</LinearLayout>
......@@ -140,7 +140,7 @@
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_margin="10dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/label_entry"
android:textColor="@color/text_color" />
......
ABVJE_UI_Android/res/layout/project_search_dialog.xml → ABVJE_UI_Android/res/layout/operation_search_dialog.xml
......@@ -3,13 +3,13 @@
android:id="@+id/root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/project_search_background"
android:background="@color/operation_search_background"
android:minWidth="500dp"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_width="match_parent"
android:layout_height="50dp">
......@@ -22,7 +22,7 @@
android:layout_centerVertical="true"
android:text="@string/search"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<Button
android:id="@+id/closeBtn"
......@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -59,8 +59,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/project_name"
android:textColor="@color/project_search_label_color"
android:text="@string/operation_name"
android:textColor="@color/operation_search_label_color"
android:textSize="@dimen/app_small_text_size"
android:textStyle="bold" />
</LinearLayout>
......@@ -76,7 +76,7 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/date_label"
android:textColor="@color/project_search_label_color"
android:textColor="@color/operation_search_label_color"
android:textSize="@dimen/app_small_text_size"
android:textStyle="bold" />
</LinearLayout>
......@@ -93,8 +93,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/label_project_report_type"
android:textColor="@color/project_search_label_color"
android:text="@string/label_operation_report_type"
android:textColor="@color/operation_search_label_color"
android:textSize="@dimen/app_small_text_size"
android:textStyle="bold" />
</LinearLayout>
......@@ -111,7 +111,7 @@
android:orientation="vertical">
<jp.agentec.abook.abv.ui.common.view.ABVEditText
android:id="@+id/project_name"
android:id="@+id/operation_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="10dp"
......@@ -130,7 +130,7 @@
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/project_border"
android:background="@drawable/operation_border"
android:gravity="center"
android:textColor="@color/text_select"
android:textSize="@dimen/text_size_noraml" />
......@@ -148,7 +148,7 @@
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/project_border"
android:background="@drawable/operation_border"
android:gravity="center"
android:textColor="@color/text_select"
android:textSize="@dimen/text_size_noraml" />
......@@ -166,28 +166,28 @@
android:visibility="gone">
<Button
android:id="@+id/btn_project_type_all"
android:id="@+id/btn_operation_type_all"
android:layout_width="0dp"
android:layout_weight=".3"
android:layout_height="40dp"
android:background="@color/project_search_button_color"
android:text="@string/label_project_report_type_all"
android:background="@color/operation_search_button_color"
android:text="@string/label_operation_report_type_all"
android:textColor="@color/text_color" />
<Button
android:id="@+id/btn_project_type_default"
android:id="@+id/btn_operation_type_default"
android:layout_width="0dp"
android:layout_weight=".3"
android:layout_height="40dp"
android:background="@color/project_disable_color"
android:text="@string/label_project_report_type_default"
android:background="@color/operation_disable_color"
android:text="@string/label_operation_report_type_default"
android:textColor="@color/text_color" />
<Button
android:id="@+id/btn_project_type_inspect"
android:id="@+id/btn_operation_type_routineTask"
android:layout_width="0dp"
android:layout_weight=".3"
android:layout_height="40dp"
android:background="@color/project_disable_color"
android:text="@string/label_project_report_type_inspect"
android:background="@color/operation_disable_color"
android:text="@string/label_operation_report_type_routineTask"
android:textColor="@color/text_color" />
</LinearLayout>
......@@ -208,7 +208,7 @@
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_margin="10dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/search"
android:textColor="@color/text_color" />
......@@ -217,7 +217,7 @@
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_margin="10dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/clear"
android:textColor="@color/text_color" />
......
ABVJE_UI_Android/res/layout/project_select_dialog.xml → ABVJE_UI_Android/res/layout/operation_select_dialog.xml
......@@ -3,12 +3,12 @@
android:layout_width="match_parent"
android:layout_height="420dp"
android:minHeight="300dp"
android:background="@color/project_search_background"
android:background="@color/operation_search_background"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_height="50dp"
android:layout_width="match_parent">
......@@ -21,9 +21,9 @@
android:layout_centerVertical="true"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/project_select"
android:text="@string/operation_select"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<Button
android:id="@+id/close_btn"
......@@ -31,12 +31,12 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
<ListView
android:id="@+id/lv_project_select"
android:id="@+id/lv_operation_select"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
ABVJE_UI_Android/res/layout/push_message_list_dialog.xml
......@@ -3,12 +3,12 @@
android:layout_width="match_parent"
android:layout_height="420dp"
android:minHeight="300dp"
android:background="@color/project_search_background"
android:background="@color/operation_search_background"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_height="50dp"
android:layout_width="match_parent">
......@@ -32,7 +32,7 @@
android:singleLine="true"
android:text="@string/push_message_list"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<Button
android:id="@+id/close_btn"
......@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -79,21 +79,21 @@
android:textColor="@android:color/black" />
<TextView
android:id="@+id/tv_project_name_title"
android:id="@+id/tv_operation_name_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/project_name"
android:text="@string/operation_name"
android:textColor="@android:color/black"/>
<TextView
android:id="@+id/tv_project_name"
android:id="@+id/tv_operation_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:paddingLeft="3dp"
android:text="@string/dummy_str"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="18sp"
android:textStyle="bold" />
......
ABVJE_UI_Android/res/layout/push_message_send_dialog.xml
......@@ -3,13 +3,13 @@
android:id="@+id/root_layout"
android:layout_width="match_parent"
android:layout_height="420dp"
android:background="@color/project_search_background"
android:background="@color/operation_search_background"
android:minWidth="500dp"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/toolbar_layout"
style="@style/ProjectSearchToolBar"
style="@style/OperationSearchToolBar"
android:layout_height="50dp"
android:layout_width="match_parent">
......@@ -31,7 +31,7 @@
android:layout_centerVertical="true"
android:text="@string/push_message_send"
android:textColor="@color/edt_text"
android:textSize="@dimen/project_title_text_size" />
android:textSize="@dimen/opeartion_title_text_size" />
<Button
android:id="@+id/close_btn"
......@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_project_close"
android:background="@drawable/ic_operation_close"
android:contentDescription="@string/cont_desc" />
</RelativeLayout>
......@@ -59,7 +59,7 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/project_name_layout"
android:id="@+id/operation_layout"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_weight="2"
......@@ -67,17 +67,17 @@
android:orientation="horizontal">
<TextView
android:id="@+id/title_project_name"
android:id="@+id/title_operation_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.3"
android:text="@string/project_name"
android:textColor="@color/project_default_text_color"
android:text="@string/operation_name"
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/app_small_text_size"
android:textStyle="bold" />
<TextView
android:id="@+id/project_name"
android:id="@+id/operation_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.7"
......@@ -85,7 +85,7 @@
android:ellipsize="end"
android:singleLine="true"
android:text=""
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/app_normal_text_size" />
</LinearLayout>
......@@ -115,7 +115,7 @@
android:gravity="center_vertical"
android:paddingTop="3dp"
android:text="@string/send_destination"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/app_small_text_size"
android:textStyle="bold" />
......@@ -132,14 +132,14 @@
android:textColor="@color/text_select" />
<RadioButton
android:id="@+id/all_project"
android:id="@+id/all_operation"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/radio_right"
android:button="@null"
android:gravity="center"
android:text="@string/all_project"
android:text="@string/all_operation"
android:textColor="@color/text_select" />
</RadioGroup>
......@@ -165,7 +165,7 @@
android:layout_height="wrap_content"
android:layout_weight="0.3"
android:text="@string/send_message"
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/app_small_text_size"
android:textStyle="bold" />
......@@ -176,7 +176,7 @@
android:layout_weight="0.7"
android:gravity="end"
android:text=""
android:textColor="@color/project_default_text_color"
android:textColor="@color/operation_default_text_color"
android:textSize="@dimen/app_small_text_size"
android:textStyle="bold" />
</LinearLayout>
......@@ -220,7 +220,7 @@
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_margin="10dp"
android:background="@drawable/project_radius_frame"
android:background="@drawable/operation_radius_frame"
android:text="@string/send"
android:textColor="@color/text_color" />
......
ABVJE_UI_Android/res/values/dimens.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="opeartion_title_text_size" />
</resources>
\ No newline at end of file
ABVJE_UI_Android/res/values/styles_abook.xml
......@@ -130,14 +130,14 @@
</style>
<!-- ABookCheck Style-->
<style name="ProjectSearchToolBar" parent="@style/ToolBar">
<item name="android:background">@color/project_search_header</item>
<style name="OperationSearchToolBar" parent="@style/ToolBar">
<item name="android:background">@color/operation_search_header</item>
<item name="android:clickable">true</item>
</style>
<style name="ProjectIconText">
<item name="android:layout_marginTop">5dp</item>
<item name="android:textColor">@color/project_color</item>
<item name="android:textColor">@color/operation_color</item>
<item name="android:textSize">10sp</item>
<item name="android:textStyle">bold</item>
<item name="android:layout_gravity">center</item>
......
ABVJE_UI_Android/res/xml/pref.xml
......@@ -55,7 +55,7 @@
</PreferenceScreen>
<PreferenceScreen
android:key="abookCheckManual"
android:title="@string/project_manual" >
android:title="@string/operation_manual" >
</PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>
\ No newline at end of file
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