Skip to content

A
abook_check
Commit a534737c by Lee Jaebin
Options

#32824 作業一覧画面改善 スマートフォン対応

parent 4da293d2
Showing with 29 additions and 18 deletions
ABVJE_Res_Default_Android/res/values-large/dimens.xml
...@@ -17,4 +17,6 @@ ...@@ -17,4 +17,6 @@
<dimen name="operation_scale_zoom_margin_dp">25dp</dimen> <dimen name="operation_scale_zoom_margin_dp">25dp</dimen>
<dimen name="operation_pin_icon_width">35dp</dimen> <dimen name="operation_pin_icon_width">35dp</dimen>
<dimen name="operation_pin_icon_height">60dp</dimen> <dimen name="operation_pin_icon_height">60dp</dimen>
<dimen name="operation_name_size">24sp</dimen>
</resources> </resources>
ABVJE_Res_Default_Android/res/values-normal/dimens.xml
...@@ -17,4 +17,8 @@ ...@@ -17,4 +17,8 @@
<dimen name="operation_scale_zoom_margin_dp">10dp</dimen> <dimen name="operation_scale_zoom_margin_dp">10dp</dimen>
<dimen name="operation_pin_icon_width">18dp</dimen> <dimen name="operation_pin_icon_width">18dp</dimen>
<dimen name="operation_pin_icon_height">23dp</dimen> <dimen name="operation_pin_icon_height">23dp</dimen>
<dimen name="operation_name_size">18sp</dimen>
<dimen name="operation_normal_text_size">10sp</dimen>
</resources> </resources>
ABVJE_Res_Default_Android/res/values/dimens.xml
...@@ -22,4 +22,5 @@ ...@@ -22,4 +22,5 @@
<dimen name="operation_title_normal_width">200dp</dimen> <dimen name="operation_title_normal_width">200dp</dimen>
<dimen name="operation_title_large_width">400dp</dimen> <dimen name="operation_title_large_width">400dp</dimen>
<dimen name="operation_name_size">24sp</dimen>
</resources> </resources>
ABVJE_UI_Android/res/layout-large/item_operation_list.xml
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:maxLines="1" android:maxLines="1"
android:text="@string/dummy_str" android:text="@string/dummy_str"
android:textColor="@color/operation_name" android:textColor="@color/operation_name"
android:textSize="@dimen/app_large_text_size" android:textSize="@dimen/operation_name_size"
android:textStyle="bold" android:textStyle="bold"
android:visibility="visible" /> android:visibility="visible" />
......
ABVJE_UI_Android/res/layout-normal/item_operation_list.xml
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/list_selector_holo_light" android:background="@drawable/list_selector_holo_light"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:padding="10dp"
android:orientation="vertical"> android:orientation="vertical">
...@@ -15,35 +16,35 @@ ...@@ -15,35 +16,35 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="left" android:gravity="left"
android:orientation="horizontal"> android:orientation="vertical">
<ImageButton <ImageButton
android:id="@+id/operation_type" android:id="@+id/operation_type"
android:layout_width="wrap_content" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginRight="10dp" /> android:layout_marginRight="10dp" />
<ImageButton <ImageButton
android:id="@+id/report_type" android:id="@+id/report_type"
android:layout_width="wrap_content" android:layout_width="50dp"
android:layout_height="wrap_content" /> android:layout_height="50dp"
android:layout_marginTop="10dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:gravity="left"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/operation_name" 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:layout_marginTop="5dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="@string/dummy_str" android:text="@string/dummy_str"
...@@ -67,20 +68,23 @@ ...@@ -67,20 +68,23 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_gravity="center"
android:layout_margin="3dp" android:layout_margin="3dp"
android:gravity="right"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/btn_pano_edit" android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/ic_edit_list" /> android:background="@drawable/ic_edit_list" />
<ImageButton <ImageButton
android:id="@+id/btn_sync" android:id="@+id/btn_sync"
android:layout_width="wrap_content" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/ic_reload_list" /> android:background="@drawable/ic_reload_list" />
</LinearLayout> </LinearLayout>
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -831,7 +831,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -831,7 +831,7 @@ public class OperationListActivity extends ABVUIActivity {
boolean isRoutineTask = operationDto.reportType == ReportType.RoutineTask; boolean isRoutineTask = operationDto.reportType == ReportType.RoutineTask;
JSONObject taskReportJson = null;
for (TaskDto serverTaskDto : json.taskDtoList) { for (TaskDto serverTaskDto : json.taskDtoList) {
List<TaskReportDto> localRemove = new ArrayList(); List<TaskReportDto> localRemove = new ArrayList();
...@@ -890,7 +890,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -890,7 +890,7 @@ public class OperationListActivity extends ABVUIActivity {
mOperationLogic.insertRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, serverTaskReportDto, false, false); mOperationLogic.insertRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, serverTaskReportDto, false, false);
} }
} else { } else {
JSONObject taskReportJson = null;
// 添付ファイルが存在する場合、取得して解凍する。 // 添付ファイルが存在する場合、取得して解凍する。
try { try {
refreshTaskFile(operationId, serverTaskReportDto.taskReportLevel, operationContentDto.contentId, serverTaskDto.taskId, serverTaskDto.taskKey, serverTaskReportDto.attachedFileName); refreshTaskFile(operationId, serverTaskReportDto.taskReportLevel, operationContentDto.contentId, serverTaskDto.taskId, serverTaskDto.taskKey, serverTaskReportDto.attachedFileName);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
...@@ -2475,7 +2475,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -2475,7 +2475,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
imgBtn.setText(str); imgBtn.setText(str);
contentPageView.addView(imgBtn); contentPageView.addView(imgBtn);
}else{ } else {
contentPageView.addView(imgBtn); contentPageView.addView(imgBtn);
} }
final int pageNumber = pageObject.getPageNumber(); final int pageNumber = pageObject.getPageNumber();
......
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