Skip to content

A
abook_check
Commit d17f9d1c by Lee Jaebin
Options

#32825 作業一覧画面改善

parent 7b1a7fd9
Showing with 204 additions and 335 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationDataJSON.java
...@@ -59,8 +59,12 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -59,8 +59,12 @@ public class OperationDataJSON extends AcmsCommonJSON {
dto.operationId = taskJson.getLong(OperationId); dto.operationId = taskJson.getLong(OperationId);
dto.taskId = taskJson.getLong(TaskId); dto.taskId = taskJson.getLong(TaskId);
dto.taskKey = taskJson.getString(TaskKey); dto.taskKey = taskJson.getString(TaskKey);
dto.taskCode = taskJson.getString(TaskCode); if (taskJson.has(TaskCode)) {
dto.taskStatus = taskJson.getInt(TaskStatus); dto.taskCode = taskJson.getString(TaskCode);
}
if (taskJson.has(TaskStatus)) {
dto.taskStatus = taskJson.getInt(TaskStatus);
}
dto.taskHotSpotInfo = taskJson.getJSONObject(TaskHotspotInfo).toString(); dto.taskHotSpotInfo = taskJson.getJSONObject(TaskHotspotInfo).toString();
...@@ -79,6 +83,11 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -79,6 +83,11 @@ public class OperationDataJSON extends AcmsCommonJSON {
taskReportDto.enableReport = taskReportJson.getInt(EnableReport); taskReportDto.enableReport = taskReportJson.getInt(EnableReport);
} }
if (taskJson.has(TaskReportId)) {
// taskListの中にtaskReportIdキーが存在
taskReportDto.taskReportId = taskJson.getInt(TaskReportId);
}
if (taskReportJson.has(TaskReportInfoId)) { if (taskReportJson.has(TaskReportInfoId)) {
// 定期点検の場合 // 定期点検の場合
taskReportDto.taskReportInfoId = taskReportJson.getInt(TaskReportInfoId); taskReportDto.taskReportInfoId = taskReportJson.getInt(TaskReportInfoId);
...@@ -97,10 +106,14 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -97,10 +106,14 @@ public class OperationDataJSON extends AcmsCommonJSON {
if (taskReportJson.has(TaskReportInfo)) { if (taskReportJson.has(TaskReportInfo)) {
Object object = taskReportJson.get(TaskReportInfo); Object object = taskReportJson.get(TaskReportInfo);
if (object instanceof String) { if (object instanceof String) {
taskReportDto.jsonData = null; taskReportDto.jsonData = (String)object;
} else if (object instanceof JSONObject) {
taskReportDto.jsonData = object.toString();
} else { } else {
taskReportDto.jsonData = taskReportJson.getJSONObject(TaskReportInfo).toString(); taskReportDto.jsonData = "";
} }
} else {
taskReportDto.jsonData = "";
} }
dto.taskReportDtoList.add(taskReportDto); dto.taskReportDtoList.add(taskReportDto);
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/MemberInfoDao.java
...@@ -104,11 +104,11 @@ public class MemberInfoDao extends AbstractDao { ...@@ -104,11 +104,11 @@ public class MemberInfoDao extends AbstractDao {
} }
public void insertMemberInfo(MemberInfoDto dto) { public void insertMemberInfo(MemberInfoDto dto) {
insert("insert into m_member_info (login_id, password, member_name, sid, login_status, invalid_password_count, last_login_date, last_change_password_date, last_cms_access_date, user_id, last_update_infor, operation_auth_level, worker_code) values (?,?,?,?,?,?,?,?,?,?,?,?,?)", dto.getInsertValues()); insert("insert into m_member_info (login_id, password, member_name, sid, login_status, invalid_password_count, last_login_date, last_change_password_date, last_cms_access_date, user_id, last_update_infor, worker_code) values (?,?,?,?,?,?,?,?,?,?,?,?)", dto.getInsertValues());
} }
public boolean updateMemberInfo(MemberInfoDto dto) { public boolean updateMemberInfo(MemberInfoDto dto) {
long count = update("update m_member_info set password=?, member_name=?, sid=?, login_status=?, invalid_password_count=?, last_login_date=?, last_change_password_date=?, last_cms_access_date=?, last_update_infor = ?, operation_auth_level = ?, worker_code = ? where login_id=?", dto.getUpdateValues()); long count = update("update m_member_info set password=?, member_name=?, sid=?, login_status=?, invalid_password_count=?, last_login_date=?, last_change_password_date=?, last_cms_access_date=?, last_update_infor = ?, worker_code = ? where login_id=?", dto.getUpdateValues());
return count > 0; return count > 0;
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReport.java
...@@ -23,7 +23,7 @@ public class TTaskReport extends SQLiteTableScript { ...@@ -23,7 +23,7 @@ public class TTaskReport extends SQLiteTableScript {
sql.append(" CREATE TABLE t_task_report ( "); sql.append(" CREATE TABLE t_task_report ( ");
sql.append(" task_key TEXT NOT NULL "); sql.append(" task_key TEXT NOT NULL ");
sql.append(" , json_data TEXT NOT NULL "); sql.append(" , json_data TEXT NOT NULL");
sql.append(" , attached_file_name TEXT "); sql.append(" , attached_file_name TEXT ");
sql.append(" , local_attached_file_name TEXT "); sql.append(" , local_attached_file_name TEXT ");
sql.append(" , attached_file_send_flg BOOLEAN DEFAULT 0 "); sql.append(" , attached_file_send_flg BOOLEAN DEFAULT 0 ");
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
...@@ -259,24 +259,24 @@ public class OperationLogic extends AbstractLogic { ...@@ -259,24 +259,24 @@ public class OperationLogic extends AbstractLogic {
TaskDto taskDto = new TaskDto(); TaskDto taskDto = new TaskDto();
TaskReportDto taskReportDto = new TaskReportDto(); TaskReportDto taskReportDto = new TaskReportDto();
JSONObject taskJson = taskDirectionsJson.getJSONObject("task"); JSONObject suggestJson = taskDirectionsJson.getJSONObject("suggest");
taskDto.taskKey = taskKey; taskDto.taskKey = taskKey;
taskDto.operationId = operationId; taskDto.operationId = operationId;
taskDto.taskHotSpotInfo = hotSpotInfo; taskDto.taskHotSpotInfo = hotSpotInfo;
Iterator taskKeys = taskJson.keys(); Iterator taskKeys = suggestJson.keys();
while (taskKeys.hasNext()) { while (taskKeys.hasNext()) {
TaskReportItemsDto taskReportItemsDto = new TaskReportItemsDto(); TaskReportItemsDto taskReportItemsDto = new TaskReportItemsDto();
String itemKey = (String) taskKeys.next(); String itemKey = (String) taskKeys.next();
if (itemKey.startsWith("q_1_")) { if (itemKey.startsWith("q_1_")) {
taskDto.taskCode = taskJson.getString(itemKey); taskDto.taskCode = suggestJson.getString(itemKey);
} }
taskReportItemsDto.taskKey = taskKey; taskReportItemsDto.taskKey = taskKey;
taskReportItemsDto.itemKey = itemKey; taskReportItemsDto.itemKey = itemKey;
taskReportItemsDto.taskReportLevel = Constant.TaskReportLevel.ReportType; taskReportItemsDto.taskReportLevel = Constant.TaskReportLevel.ReportType;
try { try {
taskReportItemsDto.inputValue = taskJson.getString(itemKey); taskReportItemsDto.inputValue = suggestJson.getString(itemKey);
} catch (JSONException e) { } catch (JSONException e) {
// 値がStringではない場合、無視する // 値がStringではない場合、無視する
continue; continue;
...@@ -341,13 +341,12 @@ public class OperationLogic extends AbstractLogic { ...@@ -341,13 +341,12 @@ public class OperationLogic extends AbstractLogic {
TaskReportDto taskReportDto = mTaskReportDao.getTaskReport(taskKey, Constant.TaskReportLevel.ReportType); TaskReportDto taskReportDto = mTaskReportDao.getTaskReport(taskKey, Constant.TaskReportLevel.ReportType);
taskDto.operationId = operationId; taskDto.operationId = operationId;
taskDto.taskHotSpotInfo = hotSpotInfo; taskDto.taskHotSpotInfo = hotSpotInfo;
JSONObject taskJson = taskReportJson.getJSONObject("task"); JSONObject suggestJson = taskReportJson.getJSONObject("suggest");
Iterator taskKeys = taskJson.keys();
List<TaskReportItemsDto> taskReportItemsDtoList = mTaskReportItemsDao.getTaskReportItemByTaskKey(taskKey, Constant.TaskReportLevel.ReportType); List<TaskReportItemsDto> taskReportItemsDtoList = mTaskReportItemsDao.getTaskReportItemByTaskKey(taskKey, Constant.TaskReportLevel.ReportType);
for (TaskReportItemsDto taskReportItemsDto : taskReportItemsDtoList) { for (TaskReportItemsDto taskReportItemsDto : taskReportItemsDtoList) {
try { try {
String newValue = taskJson.getString(taskReportItemsDto.itemKey); String newValue = suggestJson.getString(taskReportItemsDto.itemKey);
if (!newValue.equals(taskReportItemsDto.inputValue)) { if (!newValue.equals(taskReportItemsDto.inputValue)) {
// 値が異なる場合のみ、更新する // 値が異なる場合のみ、更新する
taskReportItemsDto.inputValue = newValue; taskReportItemsDto.inputValue = newValue;
...@@ -448,19 +447,19 @@ public class OperationLogic extends AbstractLogic { ...@@ -448,19 +447,19 @@ public class OperationLogic extends AbstractLogic {
TaskReportDto taskReportDto = new TaskReportDto(); TaskReportDto taskReportDto = new TaskReportDto();
// taskReportJsonがnullではない場合のみ以下の処理を行う // taskReportJsonがnullではない場合のみ以下の処理を行う
if (taskReportJson != null) { if (taskReportJson != null) {
JSONObject taskJson = taskReportJson.getJSONObject("task"); JSONObject suggestJson = taskReportJson.getJSONObject("suggest");
Iterator taskKeys = taskJson.keys(); Iterator taskKeys = suggestJson.keys();
while (taskKeys.hasNext()) { while (taskKeys.hasNext()) {
TaskReportItemsDto taskReportItemsDto = new TaskReportItemsDto(); TaskReportItemsDto taskReportItemsDto = new TaskReportItemsDto();
String itemKey = (String) taskKeys.next(); String itemKey = (String) taskKeys.next();
if (itemKey.startsWith("q_3_")) { if (itemKey.startsWith("q_3_")) {
taskDto.taskStatus = taskJson.getInt(itemKey); taskDto.taskStatus = suggestJson.getInt(itemKey);
} }
taskReportItemsDto.taskKey = taskKey; taskReportItemsDto.taskKey = taskKey;
taskReportItemsDto.itemKey = itemKey; taskReportItemsDto.itemKey = itemKey;
try { try {
taskReportItemsDto.inputValue = taskJson.getString(itemKey); taskReportItemsDto.inputValue = suggestJson.getString(itemKey);
} catch (JSONException e) { } catch (JSONException e) {
// 値がStringではない場合、無視する // 値がStringではない場合、無視する
continue; continue;
...@@ -566,12 +565,12 @@ public class OperationLogic extends AbstractLogic { ...@@ -566,12 +565,12 @@ public class OperationLogic extends AbstractLogic {
// #32926 作業報告画面改善 end // #32926 作業報告画面改善 end
return; return;
} }
JSONObject taskJson = taskReport.getJSONObject("task"); JSONObject suggestJson = taskReport.getJSONObject("suggest");
TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey); TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey);
List<TaskReportItemsDto> taskReportItemsDaoList = mTaskReportItemsDao.getTaskReportItemByTaskKey(taskKey, Constant.TaskReportLevel.ReportReplyType); List<TaskReportItemsDto> taskReportItemsDaoList = mTaskReportItemsDao.getTaskReportItemByTaskKey(taskKey, Constant.TaskReportLevel.ReportReplyType);
for (TaskReportItemsDto taskReportItemsDto : taskReportItemsDaoList) { for (TaskReportItemsDto taskReportItemsDto : taskReportItemsDaoList) {
try { try {
String newValue = taskJson.getString(taskReportItemsDto.itemKey); String newValue = suggestJson.getString(taskReportItemsDto.itemKey);
if (!newValue.equals(taskReportItemsDto.inputValue)) { if (!newValue.equals(taskReportItemsDto.inputValue)) {
// 値が異なる場合のみ、更新する // 値が異なる場合のみ、更新する
taskReportItemsDto.inputValue = newValue; taskReportItemsDto.inputValue = newValue;
...@@ -1111,7 +1110,7 @@ public class OperationLogic extends AbstractLogic { ...@@ -1111,7 +1110,7 @@ public class OperationLogic extends AbstractLogic {
List<JSONObject> taskReportInfoList = new ArrayList<JSONObject>(); List<JSONObject> taskReportInfoList = new ArrayList<JSONObject>();
if (!StringUtil.isNullOrEmpty(dto.jsonData)) { if (!StringUtil.isNullOrEmpty(dto.jsonData)) {
taskReportInfoList.add(new JSONObject(dto.jsonData).put(ABookKeys.HAS_AUTHORITY, dto.enableReport)); taskReportInfoList.add(new JSONObject(dto.jsonData));
} }
taskReportJsonRow.put(ABookKeys.TASK_REPORT_INFO, taskReportInfoList); taskReportJsonRow.put(ABookKeys.TASK_REPORT_INFO, taskReportInfoList);
taskReportJsonList.add(taskReportJsonRow); taskReportJsonList.add(taskReportJsonRow);
......
ABVJE_Res_Default_Android/res/values/colors.xml
...@@ -82,10 +82,10 @@ ...@@ -82,10 +82,10 @@
<color name="operation_date">#37648C</color> <color name="operation_date">#37648C</color>
<color name="operation_color">#095395</color> <color name="operation_color">#095395</color>
<color name="operation_disable_color">#CCCCCC</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_header">#CCCCCC</color>
<color name="operation_search_button_color">#0068CB</color> <color name="operation_search_button_color">#0068CB</color>
<color name="operation_search_label_color">#555555</color> <color name="operation_search_label_color">#555555</color>
<color name="operation_related_content_new_mark">#ff0000</color> <color name="operation_related_content_new_mark">#ff0000</color>
<color name="operation_bg">#FFFFFF</color>
</resources> </resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/style.xml
...@@ -68,6 +68,9 @@ ...@@ -68,6 +68,9 @@
<style name="content_list_bg"> <style name="content_list_bg">
<item name="android:background">@color/background</item> <item name="android:background">@color/background</item>
</style> </style>
<style name="operation_list_bg">
<item name="android:background">@color/operation_bg</item>
</style>
<style name="Theme.MyTheme.ModalDialog" parent="@android:style/Theme.Dialog"> <style name="Theme.MyTheme.ModalDialog" parent="@android:style/Theme.Dialog">
<item name="android:windowCloseOnTouchOutside">false</item> <item name="android:windowCloseOnTouchOutside">false</item>
......
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<FrameLayout <FrameLayout
android:id="@+id/operation_list_layout" android:id="@+id/operation_list_layout"
style="@style/content_list_bg" style="@style/operation_list_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
......
ABVJE_UI_Android/res/layout-large/item_operation_list.xml
...@@ -6,109 +6,88 @@ ...@@ -6,109 +6,88 @@
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:orientation="horizontal">
android:layout_marginLeft="30dp"
android:orientation="vertical">
<TextView <LinearLayout
android:id="@+id/operation_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:ellipsize="end" android:layout_marginLeft="30dp"
android:maxLines="1" android:layout_marginTop="10dp"
android:text="@string/dummy_date" android:gravity="left"
android:textColor="@color/operation_date" android:orientation="horizontal">
android:textSize="@dimen/operation_normal_text_size" />
<TextView <ImageButton
android:id="@+id/operation_name" android:id="@+id/operation_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginRight="10dp"
android:ellipsize="end" android:background="@drawable/btn_pano_edit" />
android:maxLines="1"
android:text="@string/dummy_str"
android:textColor="@color/operation_name"
android:textSize="@dimen/app_large_text_size"
android:textStyle="bold"
android:visibility="visible" />
</LinearLayout> <ImageButton
android:id="@+id/operation_report_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_information_update" />
<LinearLayout </LinearLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginLeft="30dp"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_marginLeft="30dp"
android:orientation="horizontal" android:layout_marginTop="10dp"
android:layout_gravity="bottom"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/description" android:id="@+id/operation_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/operation_description" android:layout_marginTop="5dp"
android:textSize="@dimen/operation_normal_text_size"/> android:ellipsize="end"
android:maxLines="1"
android:text="@string/dummy_str"
android:textColor="@color/operation_name"
android:textSize="@dimen/app_large_text_size"
android:textStyle="bold"
android:visibility="visible" />
<TextView
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/operation_date"
android:textSize="@dimen/operation_normal_text_size" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:gravity="right"
android:layout_margin="3dp" android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <ImageButton
android:id="@+id/layout_pano_edit" android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:orientation="vertical" android:background="@drawable/btn_pano_edit"
android:visibility="invisible"> android:visibility="invisible" />
<ImageView <ImageButton
android:id="@+id/btn_pano_edit" android:id="@+id/btn_information_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_pano_edit" />
<TextView
android:id="@+id/txt_pano_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ProjectIconText"
android:text="@string/pano_edit" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:background="@drawable/btn_information_update" />
android:orientation="vertical">
<ImageButton
android:id="@+id/btn_information_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_information_update"/>
<TextView
android:id="@+id/txt_information_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ProjectIconText"
android:text="@string/information_update" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout-normal/item_operation_list.xml
...@@ -45,70 +45,25 @@ ...@@ -45,70 +45,25 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="4"
android:textColor="@color/operation_description"
android:textSize="@dimen/operation_normal_text_size" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_margin="3dp" android:layout_margin="3dp"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <ImageView
android:id="@+id/layout_pano_edit" android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_weight="1"
android:orientation="vertical" android:background="@drawable/btn_pano_edit" />
android:visibility="invisible">
<ImageView
android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_pano_edit" />
<TextView <ImageButton
android:id="@+id/txt_pano_edit" android:id="@+id/btn_information_update"
style="@style/ProjectIconText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pano_edit" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_weight="1"
android:orientation="vertical"> android:background="@drawable/btn_information_update" />
<ImageButton
android:id="@+id/btn_information_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_information_update" />
<TextView
android:id="@+id/txt_information_update"
style="@style/ProjectIconText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/information_update" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
ABVJE_UI_Android/res/layout/communication_menu_dialog.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="300dp"
android:minHeight="200dp" android:minHeight="200dp"
android:background="@color/operation_search_background" android:background="@color/operation_bg"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
......
ABVJE_UI_Android/res/layout/item_operation_panel.xml
...@@ -10,157 +10,106 @@ ...@@ -10,157 +10,106 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_margin="10dp"
android:layout_marginBottom="10dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/panel_frame" android:background="@drawable/panel_frame"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp"> android:paddingTop="10dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView <LinearLayout
android:id="@+id/operation_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginTop="5dp" android:padding="5dp">
android:ellipsize="end"
android:maxLines="1"
android:text="@string/dummy_str"
android:textColor="@color/operation_name"
android:textSize="@dimen/app_large_text_size"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dp">
<RelativeLayout <ImageButton
android:id="@+id/content_thumbnail_layout" android:id="@+id/operation_type"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="2" android:background="@drawable/btn_information_update" />
android:layout_gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_information_update1" android:id="@+id/operation_report_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginLeft="5dp"
android:layout_centerHorizontal="true" android:background="@drawable/btn_information_update" />
android:background="@drawable/btn_information_update" />
</RelativeLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/operation_date_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerInParent="true" android:padding="5dp"
android:layout_weight="1" android:gravity="right"
android:layout_marginBottom="10dp" android:orientation="horizontal">
android:layout_marginTop="10dp"
android:layout_toRightOf="@+id/content_thumbnail_layout"
android:background="#dce6e6"
android:orientation="vertical"
android:padding="3dp"
android:paddingBottom="10dp">
<TextView <ImageButton
android:id="@+id/operation_date" android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:visibility="invisible"
android:maxLines="1" android:background="@drawable/btn_pano_edit" />
android:text="@string/dummy_date"
android:textColor="@color/operation_date"
android:textSize="@dimen/operation_normal_text_size" />
<ImageButton
android:id="@+id/btn_information_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:background="@drawable/btn_information_update" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<View
android:id="@+id/view3"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_weight="1"
android:background="@color/line_side" />
<LinearLayout <LinearLayout
android:id="@+id/button_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/operation_border" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal">
android:padding="5dp"
android:visibility="visible">
<LinearLayout
android:id="@+id/edit_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:padding="5dp"
android:visibility="visible">
<LinearLayout
android:id="@+id/layout_pano_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:orientation="vertical"
android:visibility="visible">
<ImageView
android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_pano_edit" />
<TextView
android:id="@+id/txt_pano_edit"
style="@style/ProjectIconText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pano_edit" />
</LinearLayout>
</LinearLayout>
<LinearLayout <TextView
android:id="@+id/update_layout" android:id="@+id/operation_name"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_marginTop="5dp"
android:gravity="center" android:ellipsize="end"
android:orientation="horizontal" android:maxLines="2"
android:padding="5dp" android:text="@string/dummy_str"
android:visibility="visible"> android:textColor="@color/operation_name"
android:textSize="@dimen/app_large_text_size"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:id="@+id/operation_date_layout"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginRight="10dp" android:layout_height="match_parent"
android:orientation="vertical"> android:layout_centerInParent="true"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:orientation="vertical"
android:padding="3dp"
android:paddingBottom="10dp">
<ImageButton <TextView
android:id="@+id/btn_information_update" android:id="@+id/operation_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/btn_information_update" /> android:ellipsize="end"
android:maxLines="1"
android:text="@string/dummy_date"
android:textColor="@color/operation_date"
android:textSize="@dimen/operation_normal_text_size" />
<TextView
android:id="@+id/txt_information_update"
style="@style/ProjectIconText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/information_update" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/operation_pano_entry_dialog.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:id="@+id/root_layout" android:id="@+id/root_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/operation_search_background" android:background="@color/operation_bg"
android:orientation="vertical" android:orientation="vertical"
android:weightSum="1"> android:weightSum="1">
......
ABVJE_UI_Android/res/layout/operation_search_dialog.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:id="@+id/root_layout" android:id="@+id/root_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/operation_search_background" android:background="@color/operation_bg"
android:minWidth="500dp" android:minWidth="500dp"
android:orientation="vertical"> android:orientation="vertical">
......
ABVJE_UI_Android/res/layout/operation_select_dialog.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="420dp" android:layout_height="420dp"
android:minHeight="300dp" android:minHeight="300dp"
android:background="@color/operation_search_background" android:background="@color/operation_bg"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
......
ABVJE_UI_Android/res/layout/push_message_list_dialog.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="420dp" android:layout_height="420dp"
android:minHeight="300dp" android:minHeight="300dp"
android:background="@color/operation_search_background" android:background="@color/operation_bg"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
......
ABVJE_UI_Android/res/layout/push_message_send_dialog.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:id="@+id/root_layout" android:id="@+id/root_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="420dp" android:layout_height="420dp"
android:background="@color/operation_search_background" android:background="@color/operation_bg"
android:minWidth="500dp" android:minWidth="500dp"
android:orientation="vertical"> android:orientation="vertical">
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -875,7 +875,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -875,7 +875,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
if (StringUtil.equalsAny(mCmd, ABookKeys.CMD_MOVE_HOT_SPOT, ABookKeys.CMD_INSERT_TASK_REPORT, ABookKeys.CMD_UPDATE_TASK_REPORT, if (StringUtil.equalsAny(mCmd, ABookKeys.CMD_MOVE_HOT_SPOT, ABookKeys.CMD_INSERT_TASK_REPORT, ABookKeys.CMD_UPDATE_TASK_REPORT,
ABookKeys.CMD_DELETE_TASK_REPORT, ABookKeys.CMD_CANCEL_TASK_REPORT, ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT)) { ABookKeys.CMD_DELETE_TASK_REPORT, ABookKeys.CMD_CANCEL_TASK_REPORT, ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT)) {
boolean isError = false;
try { try {
if (StringUtil.equalsAny(mCmd, ABookKeys.CMD_INSERT_TASK_REPORT, ABookKeys.CMD_UPDATE_TASK_REPORT)) { if (StringUtil.equalsAny(mCmd, ABookKeys.CMD_INSERT_TASK_REPORT, ABookKeys.CMD_UPDATE_TASK_REPORT)) {
...@@ -921,12 +920,17 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -921,12 +920,17 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
public Object callback(Object ret) { public Object callback(Object ret) {
final boolean isError = (boolean)ret; final boolean isError = (boolean)ret;
closeProgressPopup(); closeProgressPopup();
if (mAddReport) {
if (StringUtil.equalsAny(mCmd,
ABookKeys.CMD_INSERT_TASK_REPORT,
ABookKeys.CMD_UPDATE_TASK_REPORT,
ABookKeys.CMD_DELETE_TASK_REPORT,
ABookKeys.CMD_CANCEL_TASK_REPORT) && !mAddReport && !isError) {
finish();
} else {
// #32861 作業情報追加 start // #32861 作業情報追加 start
afterABookCheckApi(mCmd, mTaskKey, isNetWorkError(isError), "", null, isOperationPdf()); afterABookCheckApi(mCmd, mTaskKey, 0, "", null, isOperationPdf());
// #32861 作業情報追加 end // #32861 作業情報追加 end
} else {
finish();
} }
return null; return null;
} }
...@@ -934,8 +938,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -934,8 +938,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
ABookCheckWebViewHelper.getInstance().doABookCheckParam(ABVContentViewActivity.this, ABookCheckWebViewHelper.getInstance().doABookCheckParam(ABVContentViewActivity.this,
mCmd, mTaskKey, mEnableReportHistory, abookCheckParam, mOperationId, mContentPath, getContentId(), mCmd, mTaskKey, mEnableReportHistory, abookCheckParam, mOperationId, mContentPath, getContentId(),
operationDto.reportType, finishCallback, operationDto.reportType, finishCallback, taskReportLevel);
taskReportLevel);
} catch(Exception e) { } catch(Exception e) {
Logger.e(TAG, "doABookCheckParam error", e); Logger.e(TAG, "doABookCheckParam error", e);
...@@ -1096,9 +1099,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1096,9 +1099,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
Logger.i(TAG, String.format("javascript:%sCHK.afterABookCheckApi('%s', '%s', '%s', '%s')", finalParent, cmd, taskKey, result, message)); Logger.i(TAG, String.format("javascript:%sCHK.afterABookCheckApi('%s', '%s', '%s', '%s')", finalParent, cmd, taskKey, result, message));
webViewLoadUrl(String.format("javascript:%sCHK.afterABookCheckApi('%s', '%s', '%s', '%s')", finalParent, cmd, taskKey, result, message)); webViewLoadUrl(String.format("javascript:%sCHK.afterABookCheckApi('%s', '%s', '%s', '%s')", finalParent, cmd, taskKey, result, message));
} }
// #32861 作業情報追加 start
doneProcess(result); // HTML側の処理が終わった後の処理を行う
// #32861 作業情報追加 end
} }
}); });
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java
...@@ -331,7 +331,7 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity { ...@@ -331,7 +331,7 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
isNeedCheck = true; isNeedCheck = true;
} }
} }
if (isNeedCheck) { if (isNeedCheck) {
final ABVDataCache dataCache = ABVDataCache.getInstance(); final ABVDataCache dataCache = ABVDataCache.getInstance();
final ABVEnvironment abvEnvironment = ABVEnvironment.getInstance(); final ABVEnvironment abvEnvironment = ABVEnvironment.getInstance();
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -867,15 +867,11 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -867,15 +867,11 @@ public class OperationListActivity extends ABVUIActivity {
if (isSyncGetTaskFileError) { if (isSyncGetTaskFileError) {
return null; return null;
} }
if (isExistsTaskReportInList(localTaskReportList, taskReportDto, true)) { if (localTaskReportList.size() > 0 && isExistsTaskReportInList(localTaskReportList, taskReportDto, true)) {
// 報告データが存在すると作業報告を更新する // 報告データが存在すると作業報告を更新する
if (taskReportDto.jsonData != null) { mOperationLogic.updateRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, taskReportDto, false, false, false);
mOperationLogic.updateRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, taskReportDto, false, false, false);
}
} else { } else {
if (taskReportDto.jsonData != null) { mOperationLogic.insertRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, taskReportDto, false, false);
mOperationLogic.insertRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, taskReportDto, false, false);
}
} }
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/OperationListAdapter.java
...@@ -67,16 +67,12 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -67,16 +67,12 @@ public class OperationListAdapter extends AbstractOperationAdapter {
holder = new ViewHolder(); holder = new ViewHolder();
holder.tvOperationName = (TextView) convertView.findViewById(R.id.operation_name); holder.tvOperationName = (TextView) convertView.findViewById(R.id.operation_name);
holder.tvDate = (TextView) convertView.findViewById(R.id.operation_date); holder.tvDate = (TextView) convertView.findViewById(R.id.operation_date);
holder.tvDescription = (TextView) convertView.findViewById(R.id.description);
// 360編集関連 // 360編集関連
holder.lyPanoEditLayout = (LinearLayout) convertView.findViewById(R.id.layout_pano_edit);
holder.ivPanoEdit = (ImageView) convertView.findViewById(R.id.btn_pano_edit); holder.ivPanoEdit = (ImageView) convertView.findViewById(R.id.btn_pano_edit);
holder.tvPanoEditText = (TextView) convertView.findViewById(R.id.txt_pano_edit);
// 情報更新関連 // 情報更新関連
holder.ivInformationUpdate = (ImageView) convertView.findViewById(R.id.btn_information_update); holder.ivInformationUpdate = (ImageView) convertView.findViewById(R.id.btn_information_update);
holder.tvInformationUpdateText = (TextView) convertView.findViewById(R.id.txt_information_update);
convertView.setTag(holder); convertView.setTag(holder);
} else { } else {
...@@ -97,7 +93,6 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -97,7 +93,6 @@ public class OperationListAdapter extends AbstractOperationAdapter {
} else { } else {
holder.tvDate.setText(mContext.getString(R.string.date_label) + " : " + DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMdd_slash) + " ~ " + DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMdd_slash)); holder.tvDate.setText(mContext.getString(R.string.date_label) + " : " + DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMdd_slash) + " ~ " + DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMdd_slash));
} }
holder.tvDescription.setText(operationDto.operationDescriptions);
// 同期ボタン表示・非表示 // 同期ボタン表示・非表示
if (operationDto.contentId != null && operationDto.contentId != 0) { if (operationDto.contentId != null && operationDto.contentId != 0) {
...@@ -127,7 +122,7 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -127,7 +122,7 @@ public class OperationListAdapter extends AbstractOperationAdapter {
if(operationDto.operationType == OperationType.PANO) { if(operationDto.operationType == OperationType.PANO) {
// 360タイプのみ360編集ボタン表示 // 360タイプのみ360編集ボタン表示
holder.lyPanoEditLayout.setVisibility(View.VISIBLE); holder.ivPanoEdit.setVisibility(View.VISIBLE);
if (operationDto.contentCreatingFlg) { //Panoコンテンツ作成中の状態 if (operationDto.contentCreatingFlg) { //Panoコンテンツ作成中の状態
setButtonEnabled(holder, OperationButtonType.PANO_EDIT, false); setButtonEnabled(holder, OperationButtonType.PANO_EDIT, false);
setButtonEnabled(holder, OperationButtonType.INFORMATION_UPDATE, false); setButtonEnabled(holder, OperationButtonType.INFORMATION_UPDATE, false);
...@@ -139,11 +134,11 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -139,11 +134,11 @@ public class OperationListAdapter extends AbstractOperationAdapter {
} }
} }
} else { } else {
holder.lyPanoEditLayout.setVisibility(View.INVISIBLE); holder.ivPanoEdit.setVisibility(View.INVISIBLE);
} }
if(operationDto.enableReportEdit == Constant.EnableReportEdit.NO) { if(operationDto.enableReportEdit == Constant.EnableReportEdit.NO) {
holder.lyPanoEditLayout.setVisibility(View.GONE); holder.ivPanoEdit.setVisibility(View.GONE);
} }
holder.ivPanoEdit.setOnClickListener(new View.OnClickListener() { holder.ivPanoEdit.setOnClickListener(new View.OnClickListener() {
...@@ -167,15 +162,11 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -167,15 +162,11 @@ public class OperationListAdapter extends AbstractOperationAdapter {
private static class ViewHolder { private static class ViewHolder {
TextView tvOperationName; TextView tvOperationName;
TextView tvDate; TextView tvDate;
TextView tvDescription;
// 360編集関連 // 360編集関連
LinearLayout lyPanoEditLayout;
ImageView ivPanoEdit; ImageView ivPanoEdit;
TextView tvPanoEditText;
// 情報更新関連 // 情報更新関連
ImageView ivInformationUpdate; ImageView ivInformationUpdate;
TextView tvInformationUpdateText;
} }
/** /**
...@@ -188,11 +179,9 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -188,11 +179,9 @@ public class OperationListAdapter extends AbstractOperationAdapter {
switch (buttonType) { switch (buttonType) {
case OperationButtonType.PANO_EDIT : case OperationButtonType.PANO_EDIT :
holder.ivPanoEdit.setEnabled(isEnabled); holder.ivPanoEdit.setEnabled(isEnabled);
holder.tvPanoEditText.setTextColor(mContext.getResources().getColor(isEnabled ? R.color.operation_color : R.color.operation_disable_color));
break; break;
case OperationButtonType.INFORMATION_UPDATE: case OperationButtonType.INFORMATION_UPDATE:
holder.ivInformationUpdate.setEnabled(isEnabled); holder.ivInformationUpdate.setEnabled(isEnabled);
holder.tvInformationUpdateText.setTextColor(mContext.getResources().getColor(isEnabled ? R.color.operation_color : R.color.operation_disable_color));
break; break;
} }
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/OperationPanelAdapter.java
...@@ -70,7 +70,7 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -70,7 +70,7 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
@Override @Override
public long getItemId(int position) { public long getItemId(int position) {
return listItem.get(position).contentId; return listItem.get(position).operationId;
} }
public List<OperationDto> getListItem() { public List<OperationDto> getListItem() {
...@@ -82,13 +82,10 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -82,13 +82,10 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
TextView tvDate; TextView tvDate;
TextView tvDescription; TextView tvDescription;
// 360編集関連 // 360編集関連
LinearLayout lyPanoEditLayout;
ImageView ivPanoEdit; ImageView ivPanoEdit;
TextView tvPanoEditText;
// 情報更新関連 // 情報更新関連
ImageView ivInformationUpdate; ImageView ivInformationUpdate;
TextView tvInformationUpdateText;
} }
@Override @Override
...@@ -99,16 +96,12 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -99,16 +96,12 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
holder = new OperationPanelAdapter.ViewHolder(); holder = new OperationPanelAdapter.ViewHolder();
holder.tvOperationName = (TextView) convertView.findViewById(R.id.operation_name); holder.tvOperationName = (TextView) convertView.findViewById(R.id.operation_name);
holder.tvDate = (TextView) convertView.findViewById(R.id.operation_date); holder.tvDate = (TextView) convertView.findViewById(R.id.operation_date);
// holder.tvDescription = (TextView) convertView.findViewById(R.id.description);
// 360編集関連 // 360編集関連
holder.lyPanoEditLayout = (LinearLayout) convertView.findViewById(R.id.layout_pano_edit);
holder.ivPanoEdit = (ImageView) convertView.findViewById(R.id.btn_pano_edit); holder.ivPanoEdit = (ImageView) convertView.findViewById(R.id.btn_pano_edit);
holder.tvPanoEditText = (TextView) convertView.findViewById(R.id.txt_pano_edit);
// 情報更新関連 // 情報更新関連
holder.ivInformationUpdate = (ImageView) convertView.findViewById(R.id.btn_information_update); holder.ivInformationUpdate = (ImageView) convertView.findViewById(R.id.btn_information_update);
holder.tvInformationUpdateText = (TextView) convertView.findViewById(R.id.txt_information_update);
convertView.setTag(holder); convertView.setTag(holder);
} else { } else {
...@@ -158,7 +151,7 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -158,7 +151,7 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
if(operationDto.operationType == OperationType.PANO) { if(operationDto.operationType == OperationType.PANO) {
// 360タイプのみ360編集ボタン表示 // 360タイプのみ360編集ボタン表示
holder.lyPanoEditLayout.setVisibility(View.VISIBLE); holder.ivPanoEdit.setVisibility(View.VISIBLE);
if (operationDto.contentCreatingFlg) { //Panoコンテンツ作成中の状態 if (operationDto.contentCreatingFlg) { //Panoコンテンツ作成中の状態
setButtonEnabled(holder, OperationButtonType.PANO_EDIT, false); setButtonEnabled(holder, OperationButtonType.PANO_EDIT, false);
setButtonEnabled(holder, OperationButtonType.INFORMATION_UPDATE, false); setButtonEnabled(holder, OperationButtonType.INFORMATION_UPDATE, false);
...@@ -170,13 +163,9 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -170,13 +163,9 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
} }
} }
} else { } else {
holder.lyPanoEditLayout.setVisibility(View.INVISIBLE); holder.ivPanoEdit.setVisibility(View.INVISIBLE);
} }
// if(mOperationAuthLevel.equals(OperationAuthLevel.WORKER)) {
holder.lyPanoEditLayout.setVisibility(View.GONE);
// }
holder.ivPanoEdit.setOnClickListener(new View.OnClickListener() { holder.ivPanoEdit.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -199,11 +188,9 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -199,11 +188,9 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
switch (buttonType) { switch (buttonType) {
case OperationButtonType.PANO_EDIT : case OperationButtonType.PANO_EDIT :
holder.ivPanoEdit.setEnabled(isEnabled); holder.ivPanoEdit.setEnabled(isEnabled);
holder.tvPanoEditText.setTextColor(mContext.getResources().getColor(isEnabled ? R.color.operation_color : R.color.operation_disable_color));
break; break;
case OperationButtonType.INFORMATION_UPDATE: case OperationButtonType.INFORMATION_UPDATE:
holder.ivInformationUpdate.setEnabled(isEnabled); holder.ivInformationUpdate.setEnabled(isEnabled);
holder.tvInformationUpdateText.setTextColor(mContext.getResources().getColor(isEnabled ? R.color.operation_color : R.color.operation_disable_color));
break; break;
} }
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
...@@ -7,6 +7,7 @@ import android.graphics.Matrix; ...@@ -7,6 +7,7 @@ import android.graphics.Matrix;
import android.media.ExifInterface; import android.media.ExifInterface;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.util.Base64; import android.util.Base64;
import android.widget.Toast;
import org.json.adf.JSONObject; import org.json.adf.JSONObject;
...@@ -33,6 +34,7 @@ import jp.agentec.abook.abv.bl.logic.AbstractLogic; ...@@ -33,6 +34,7 @@ import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.OperationLogic; import jp.agentec.abook.abv.bl.logic.OperationLogic;
import jp.agentec.abook.abv.launcher.android.R; import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity; import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity;
import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
import jp.agentec.adf.util.DateTimeFormat; import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil; import jp.agentec.adf.util.DateTimeUtil;
import jp.agentec.adf.util.FileUtil; import jp.agentec.adf.util.FileUtil;
...@@ -73,10 +75,6 @@ public class ABookCheckWebViewHelper extends ABookHelper { ...@@ -73,10 +75,6 @@ public class ABookCheckWebViewHelper extends ABookHelper {
public void doABookCheckParam(ABVContentViewActivity context, String cmd, String taskKey, int enableReportHistory, Map<String, String> param, long operationId, String contentPath, long contentId, int reportType, Callback finishCallback, int taskReportLevel) throws IOException { public void doABookCheckParam(ABVContentViewActivity context, String cmd, String taskKey, int enableReportHistory, Map<String, String> param, long operationId, String contentPath, long contentId, int reportType, Callback finishCallback, int taskReportLevel) throws IOException {
int taskReportSendId = 0; int taskReportSendId = 0;
mFinishCallback = finishCallback; mFinishCallback = finishCallback;
boolean isAddReport = false;
if (param.containsKey(ABookKeys.ADD_REPORT)) {
isAddReport = Integer.parseInt(param.get(ABookKeys.ADD_REPORT)) > 0 ? true : false;
}
switch (cmd) { switch (cmd) {
case ABookKeys.CMD_INSERT_TASK_REPORT: case ABookKeys.CMD_INSERT_TASK_REPORT:
case ABookKeys.CMD_UPDATE_TASK_REPORT: case ABookKeys.CMD_UPDATE_TASK_REPORT:
...@@ -87,6 +85,7 @@ public class ABookCheckWebViewHelper extends ABookHelper { ...@@ -87,6 +85,7 @@ public class ABookCheckWebViewHelper extends ABookHelper {
case ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT: case ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT:
insertOrUpdateTaskReport(taskKey, enableReportHistory, operationId, contentId, param, contentPath, reportType, taskReportLevel, false); insertOrUpdateTaskReport(taskKey, enableReportHistory, operationId, contentId, param, contentPath, reportType, taskReportLevel, false);
copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel); copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
ABVToastUtil.showMakeText(context, R.string.msg_temp_save_result, Toast.LENGTH_SHORT);
mFinishCallback.callback(true); mFinishCallback.callback(true);
break; break;
case ABookKeys.CMD_DELETE_TASK_REPORT: case ABookKeys.CMD_DELETE_TASK_REPORT:
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
...@@ -537,7 +537,7 @@ public class CheckOZDViewActivity extends ABVContentViewActivity { ...@@ -537,7 +537,7 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
param.append("export.mode=silent#"); param.append("export.mode=silent#");
param.append("export.filename=" + FileUtil.getFilenameWithoutExt(mSaveOzdTempFileName) + "#"); param.append("export.filename=" + FileUtil.getFilenameWithoutExt(mSaveOzdTempFileName) + "#");
// #32926 作業報告画面改善 start // #32926 作業報告画面改善 start
param.append("export.path=" + OzdFileHelper.getTempTaskDirPath(contentId, mTaskKey) + "/" + mTaskReportLevel + "#"); param.append("export.path=" + OzdFileHelper.getTempTaskDirPath(contentId, mTaskKey) + "#");
// #32926 作業報告画面改善 end // #32926 作業報告画面改善 end
param.append("export.confirmsave=false#"); param.append("export.confirmsave=false#");
param.append("export.format=ozd"); param.append("export.format=ozd");
......
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