Skip to content

A
abook_check
Commit 313c6077 by Lee Jaebin
Options

#34868 作業種別改善

parent 5d60379c
Showing with 347 additions and 340 deletions
ABVJE_Res_Default_Android/res/values-ja/strings.xml
......@@ -519,10 +519,6 @@
<string name="msg_help_360_move">このボタンを押すと作業コードラベルを移動させることができるようになります。</string>
<string name="msg_help_360_touch">このボタンを押すと作業コードボタンのタップが可能になり、報告できるようになります。</string>
<!-- 1.1.0 -->
<string name="operation_category">カテゴリ</string>
<string name="type_all">全て</string>
<!-- 1.2.0 -->
<string name="msg_operation_enable_meeting_room_connected">会議室入室中の為、このボタンは利用できません。\n共通資料画面から資料を選択してください。</string>
<string name="batch_sync">一括同期</string>
......@@ -533,6 +529,9 @@
<string name="msg_batch_sync_new_content_updating">新着更新処理中の為、一括同期できません。</string>
<string name="msg_batch_sync_error">「%1$s」の同期に失敗しました。同期処理を中止します。\n</string>
<string name="msg_batch_sync_move_operation_view">一括同期中には点検作業報告画面へ遷移できません。</string>
<string name="select_category">カテゴリ選択</string>
<string name="title_category">カテゴリ</string>
<string name="title_all_operation">全作業</string>
<!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0-->
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml
......@@ -521,10 +521,6 @@
<string name="msg_help_360_move">이 버튼을 누르면 작업 코드 버튼의 이동이 가능하게 됩니다.</string>
<string name="msg_help_360_touch">이 버튼을 누르면 작업 코드 버튼의 탭이 가능하게 되므로 보고 화면 표시가 가능하게 됩니다.</string>
<!-- 1.1.0 -->
<string name="operation_category">분류</string>
<string name="type_all">전체</string>
<!-- 1.2.0 -->
<string name="msg_operation_enable_meeting_room_connected">회의실 접속 중에는 이 버튼을 사용하실수 없습니다. \n공통자료화면에서 자료를 선택해 주세요.</string>
<string name="batch_sync">일괄 동기</string>
......@@ -535,6 +531,9 @@
<string name="msg_batch_sync_new_content_updating">새로운 정보갱신 중에는 일괄 동기을 하실 수 없습니다.</string>
<string name="msg_batch_sync_error">「%1$s」정보갱신에 실패하였습니다. 동기처리을 중지합니다.\n</string>
<string name="msg_batch_sync_move_operation_view">일괄 동기 처리 중에는 점검작업 보고화면으로 이동하실 수 없습니다.</string>
<string name="select_category">カテゴリ選択</string>
<string name="title_category">カテゴリ</string>
<string name="title_all_operation">全作業</string>
<!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0-->
......
ABVJE_Res_Default_Android/res/values/strings.xml
......@@ -525,10 +525,7 @@
<string name="msg_help_360_move">Press this button to move the work code label.</string>
<string name="msg_help_360_touch">If you press this button, you will be able to touch the work code button, so you can report the work.</string>
<!-- 1.1.0 -->
<string name="operation_category">Category</string>
<string name="type_all">All</string>
<!-- 1.2.0 -->
<string name="msg_operation_enable_meeting_room_connected">Because you are in a conference room, this button is not available right now. \n Please select the document from common document</string>
<string name="batch_sync">batch sync</string>
<string name="batch_syncing">batch syncing...</string>
......@@ -538,6 +535,9 @@
<string name="msg_batch_sync_new_content_updating">Batch synchronization can not be performed because new data is being updated.</string>
<string name="msg_batch_sync_error">「%1$s」 failed. Cancel synchronization processing.\n</string>
<string name="msg_batch_sync_move_operation_view">You can not transition to the inspection work report screen because you are in a batch synchronization.</string>
<string name="select_category">カテゴリ選択</string>
<string name="title_category">カテゴリ</string>
<string name="title_all_operation">全作業</string>
<!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0-->
......
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
......@@ -10,163 +10,143 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/operation_color"
android:minHeight="50dp"
android:visibility="visible">
<ImageButton
android:id="@+id/btn_view_mode"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:background="@drawable/ic_display_list" />
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
<ImageButton
android:id="@+id/icon_filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/btn_view_mode"
android:onClick="onClickOperationFilterList"
android:background="@drawable/ic_filter" />
android:id="@+id/btn_view_mode"
android:layout_alignParentLeft="true"
style="@style/ToolBarIcon"
android:src="@drawable/ic_display_list" />
<ImageButton
android:id="@+id/btn_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/icon_filter"
android:background="@drawable/ic_operation_search" />
android:id="@+id/btn_category_location"
style="@style/ToolBarIcon"
android:layout_toRightOf="@+id/btn_view_mode"
android:onClick="onClickGroupLocationByTablet"
android:src="@drawable/ic_filter" />
<RadioGroup
android:id="@+id/segment_group"
<TextView
android:id="@+id/operation_title"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_height="wrap_content"
android:maxWidth="250dp"
android:ellipsize="end"
android:singleLine="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/btn_search"
android:orientation="horizontal"
android:visibility="visible">
<RadioButton
android:id="@+id/operation_location_type_all"
android:layout_width="80dp"
android:layout_height="match_parent"
android:background="@drawable/operation_location_segment_background"
android:button="@null"
android:checked="true"
android:gravity="center"
android:onClick="onClickOperationLocationType"
android:textColor="@drawable/operation_location_text_color"
android:text="@string/type_all"
android:textStyle="bold" />
<RadioButton
android:id="@+id/operation_location_type_group"
android:layout_width="80dp"
android:layout_height="match_parent"
android:background="@drawable/operation_location_segment_background"
android:button="@null"
android:gravity="center"
android:onClick="onClickOperationLocationType"
android:textColor="@drawable/operation_location_text_color"
android:text="@string/operation_category"
android:textColor="@color/operation_bg"
android:textSize="@dimen/app_normal_text_size"
android:textStyle="bold" />
</RadioGroup>
<ImageButton
android:id="@+id/btc_batch_sync"
android:id="@+id/btn_batch_sync"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/segment_group"
android:layout_toRightOf="@+id/operation_title"
android:src="@drawable/ic_batch_sync"
android:visibility="gone"/>
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_sort"
style="@style/ToolBarIcon"
android:layout_toLeftOf="@+id/btn_search"
android:onClick="onClickSortMenuByTablet"
android:src="@drawable/ic_filter" />
<ImageButton
android:id="@+id/btn_search"
style="@style/ToolBarIcon"
android:layout_alignParentRight="true"
android:src="@drawable/ic_operation_search" />
</RelativeLayout>
</RelativeLayout>
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/content_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_weight="1"></FrameLayout>
<LinearLayout
android:id="@+id/search_result"
android:layout_width="wrap_content"
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginTop="5dp"
android:layout_toLeftOf="@+id/btn_communication_menu"
android:background="@drawable/radius_frame"
android:gravity="center"
android:visibility="gone">
android:background="@color/operation_color"
android:minHeight="50dp"
android:visibility="visible">
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:text="@string/search_result"
android:textColor="@color/app_color"
android:textSize="@dimen/app_normal_text_size"
android:textStyle="bold" />
</LinearLayout>
android:layout_gravity="center"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp">
<ImageButton
android:id="@+id/btn_sort"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_communication_menu"
android:background="@drawable/ic_communication_menu"
android:onClick="onClickSortMenuByTablet"/>
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_communication_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_setting"
android:background="@drawable/ic_communication_menu" />
android:id="@+id/btn_operation_home"
style="@style/ToolBarIcon"
android:src="@drawable/ic_operation_home" />
<ImageButton
android:id="@+id/btn_setting"
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_common_content"
android:background="@drawable/ic_operation_setting"
android:onClick="onClickSetting" />
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_common_content"
style="@style/ToolBarIcon"
android:src="@drawable/ic_common_content_off" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_help"
android:background="@drawable/ic_common_content_off" />
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_help"
android:id="@+id/btn_communication_menu"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_communication_menu" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_operation_help"
android:onClick="onClickShowHelpView" />
</RelativeLayout>
android:layout_weight="1"
android:gravity="center">
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/operation_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true" />
<ImageButton
android:id="@+id/btn_setting"
style="@style/ToolBarIcon"
android:onClick="onClickSetting"
android:src="@drawable/ic_operation_setting" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
......@@ -10,104 +10,82 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/operation_color"
android:minHeight="50dp"
android:visibility="visible">
<ImageButton
android:id="@+id/btn_view_mode"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:background="@drawable/ic_display_list" />
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
<ImageButton
android:id="@+id/icon_filter"
android:id="@+id/btn_view_mode"
android:layout_alignParentLeft="true"
style="@style/ToolBarIcon"
android:layout_marginRight="10dp"
android:src="@drawable/ic_display_list" />
<ImageButton
android:id="@+id/btn_category_location"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/btn_view_mode"
android:onClick="onClickOperationFilterList"
android:onClick="onClickGroupLocationByNormalSize"
android:src="@drawable/ic_filter" />
<RadioGroup
android:id="@+id/segment_group"
<TextView
android:id="@+id/operation_title"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_height="wrap_content"
android:maxWidth="100dp"
android:ellipsize="end"
android:singleLine="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/icon_filter"
android:orientation="horizontal"
android:visibility="visible">
<RadioButton
android:id="@+id/operation_location_type_all"
android:layout_width="60dp"
android:layout_height="match_parent"
android:background="@drawable/operation_location_segment_background"
android:button="@null"
android:checked="true"
android:gravity="center"
android:onClick="onClickOperationLocationType"
android:textColor="@drawable/operation_location_text_color"
android:text="@string/type_all"
android:textSize="10sp"
android:textStyle="bold" />
<RadioButton
android:id="@+id/operation_location_type_group"
android:layout_width="60dp"
android:layout_height="match_parent"
android:background="@drawable/operation_location_segment_background"
android:button="@null"
android:gravity="center"
android:textSize="10sp"
android:onClick="onClickOperationLocationType"
android:textColor="@drawable/operation_location_text_color"
android:text="@string/operation_category"
android:textColor="@color/operation_bg"
android:textSize="@dimen/app_normal_text_size"
android:textStyle="bold" />
</RadioGroup>
<ImageButton
android:id="@+id/btc_batch_sync"
android:id="@+id/btn_batch_sync"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/segment_group"
android:src="@drawable/ic_batch_sync" />
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/operation_title"
android:src="@drawable/ic_batch_sync"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_sort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_communication_menu"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_common_content"
android:onClick="onClickSortMenuByNormalSize"/>
<ImageButton
android:id="@+id/btn_common_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_help"
android:background="@drawable/ic_common_content_off" />
style="@style/ToolBarIcon"
android:layout_toLeftOf="@+id/btn_search"
android:layout_marginRight="10dp"
android:onClick="onClickSortMenuByNormalSize"
android:src="@drawable/ic_filter" />
<ImageButton
android:id="@+id/btn_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btn_search"
style="@style/ToolBarIcon"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_operation_help"
android:onClick="onClickShowHelpView"/>
android:src="@drawable/ic_operation_search" />
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/content_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_weight="1">
</FrameLayout>
<LinearLayout
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -115,65 +93,63 @@
android:minHeight="50dp"
android:visibility="visible">
<ImageButton
android:id="@+id/btn_communication_menu"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:background="@drawable/ic_communication_menu" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_home"
style="@style/ToolBarIcon"
android:src="@drawable/ic_operation_home" />
</LinearLayout>
<LinearLayout
android:id="@+id/search_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:layout_toLeftOf="@+id/btn_search"
android:layout_marginRight="10dp"
android:background="@drawable/radius_frame"
android:visibility="gone">
android:layout_weight="1"
android:gravity="center">
<TextView
<ImageButton
android:id="@+id/btn_common_content"
style="@style/ToolBarIcon"
android:src="@drawable/ic_common_content_off" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:text="@string/search_result"
android:textColor="@color/app_color"
android:textSize="@dimen/app_normal_text_size"
android:textStyle="bold" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
</LinearLayout>
<ImageButton
android:id="@+id/btn_search"
android:id="@+id/btn_communication_menu"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_communication_menu" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:background="@drawable/ic_operation_search"
android:contentDescription="@string/list" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_alignParentRight="true"
android:background="@drawable/ic_operation_setting"
android:src="@drawable/ic_operation_setting"
android:onClick="onClickSetting" />
</LinearLayout>
</RelativeLayout>
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/content_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/item_dialog_list.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="50dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center_vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:textColor="@color/text_select"
android:text="@string/dummy_str"
/>
\ No newline at end of file
ABVJE_UI_Android/res/layout/popup_simple_list.xml
......@@ -3,7 +3,7 @@
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/mydata_bg"
android:background="@color/operation_color"
android:orientation="vertical" >
<RelativeLayout
......
ABVJE_UI_Android/res/values-ja/arrays.xml
......@@ -8,4 +8,9 @@
<item>報告タイプ順</item>
<item>閲覧日が新しい順</item>
</string-array>
<string-array name="category_types">
<item>全て</item>
<item>カテゴリ</item>
</string-array>
</resources>
\ No newline at end of file
ABVJE_UI_Android/res/values-ko/arrays.xml
......@@ -8,4 +8,9 @@
        <item>보고타입</item>
        <item>열람최신순</item>
</string-array>
<string-array name="category_types">
<item>전체</item>
<item>분류</item>
</string-array>
</resources>
ABVJE_UI_Android/res/values/arrays.xml
......@@ -9,4 +9,9 @@
<item>Order by operation Type</item>
<item>Order by browse date(descend)</item>
</string-array>
<string-array name="category_types">
<item>All</item>
<item>Category</item>
</string-array>
</resources>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java
......@@ -15,7 +15,7 @@ public interface AppDefType {
// 作業種別モードフラグ
interface OperationLocationType {
int ALL = 0;
int GROUP = 1;
int CATEGORY = 1;
}
interface DefPrefKey {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/view/ABVPopupListWindow.java
......@@ -164,7 +164,7 @@ public class ABVPopupListWindow extends PopupWindow {
int maxWidth = 0;
View view = null;
FrameLayout fakeParent = new FrameLayout(context);
for (int i=0, count=adapter.getCount(); i<count; i++) {
for (int i = 0, count = adapter.getCount(); i < count; i++) {
view = adapter.getView(i, view, fakeParent);
view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int width = view.getMeasuredWidth();
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
......@@ -122,7 +122,6 @@ import jp.agentec.adf.util.DateTimeUtil;
import jp.agentec.adf.util.FileUtil;
import jp.agentec.adf.util.StringUtil;
import static jp.agentec.abook.abv.cl.util.PreferenceUtil.getUserPref;
/**
* Created by leej on 2018/08/17
......@@ -131,21 +130,24 @@ import static jp.agentec.abook.abv.cl.util.PreferenceUtil.getUserPref;
public class OperationListActivity extends ABVUIActivity {
private static final String TAG = "OperationListActivity";
private ImageButton mViewModeButton; // リスト・パンネル切り替えボタン
private ImageButton mViewModeButton; // パンネル・リスト表示ボタン
private ImageButton mSearchButton; // 検索ボタン
private ImageButton mFilterButton; // フィルタボタン
private ImageButton mCommunicationButton; // コミュニケーションボタン
private ImageButton mCommonContentButton; // 共通資料ボタン
private ImageButton mOperationBatchSyncButton; // 一括同期ボタン
private ImageButton mOperationBatchSyncButton; // カテゴリの一括同期ボタン
private ImageButton mCategoryLocationButton; // カテゴリ選択ボタン
public String mSearchWord;
public String mStartDateStr;
public String mEndDateStr;
private TextView mOperationTitle; // 一覧のタイトル
private EditText mSearchTextView;
private TextView mStartDate;
private TextView mEndDate;
private LinearLayout mSearchResultLayout;
// 検索画面の条件（文字列）
public String mSearchWord; // 検索画面の値（作業名）
public String mStartDateStr; // 検索画面の値（作業開始日）
public String mEndDateStr; // 検索画面の値（作業終了日）
private EditText mSearchTextView; // 検索画面の作業名
private TextView mStartDate; // 検索画面の作業開始日
private TextView mEndDate; // 検索画面の作業終了日
private Dialog mSearchDialog;
private Date mOperationLastEditDate;
......@@ -224,12 +226,13 @@ public class OperationListActivity extends ABVUIActivity {
mViewModeButton = (ImageButton) findViewById(R.id.btn_view_mode);
// 検索ボタン
mSearchButton = (ImageButton) findViewById(R.id.btn_search);
// ツールバーのタイトル表示
mOperationTitle = (TextView) findViewById(R.id.operation_title);
mOperationBatchSyncButton = (ImageButton) findViewById(R.id.btn_batch_sync);
mSearchResultLayout = (LinearLayout) findViewById(R.id.search_result);
mCommunicationButton = (ImageButton) findViewById(R.id.btn_communication_menu);
mCommonContentButton = (ImageButton) findViewById(R.id.btn_common_content);
mLocationTypeRadioGroup = (RadioGroup) findViewById(R.id.segment_group);
mOperationBatchSyncButton = (ImageButton) findViewById(R.id.btc_batch_sync);
mCategoryLocationButton = (ImageButton) findViewById(R.id.btn_category_location);
// 定期点検で同期ボタンタップの日付と現在の日付が異なる且つ、作業するデータが存在しない場合、needSyncFlgをtrueに更新
updateNeedSyncRoutineOperation();
......@@ -250,9 +253,6 @@ public class OperationListActivity extends ABVUIActivity {
// サービスオプション(作業種別使用)をセット
mOperationGroupMasterServiceOperationFlg = ABVDataCache.getInstance().serviceOption.isOperationGroupMaster();
// 全て・作業種別のセグメントチェック設定
checkOperationGroupType(getABVUIDataCache().getOperationGroupMasterMode());
// 検索アイコンのクリックイベント
mSearchButton.setOnClickListener(new View.OnClickListener() {
@Override
......@@ -261,13 +261,6 @@ public class OperationListActivity extends ABVUIActivity {
}
});
mSearchResultLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showSearchDialog();
}
});
mSelectedFixPuchMessagePosition = 0;
mSendType = 0;
......@@ -407,10 +400,11 @@ public class OperationListActivity extends ABVUIActivity {
// 作業種別表示・非表示
if (mOperationGroupMasterServiceOperationFlg) {
mLocationTypeRadioGroup.setVisibility(View.VISIBLE);
mCategoryLocationButton.setVisibility(View.VISIBLE);
// アイコンの変更
if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.GROUP) {
if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.CATEGORY) {
mOperationTitle.setText(R.string.title_category);
// 検索ワード削除
clearSearch();
// 検索ボタンを無効にする
......@@ -424,20 +418,17 @@ public class OperationListActivity extends ABVUIActivity {
setEnabledImageButton(mSearchButton, true);
// 一括同期ボタン非表示
mOperationBatchSyncButton.setVisibility(View.GONE);
mOperationTitle.setText(R.string.title_all_operation);
}
// 全て・作業種別のセグメントチェック設定
checkOperationGroupType(getABVUIDataCache().getOperationGroupMasterMode());
} else {
mOperationTitle.setText(R.string.title_all_operation);
// アイコン非表示
mLocationTypeRadioGroup.setVisibility(View.GONE);
mCategoryLocationButton.setVisibility(View.GONE);
// 一括同期ボタンを非表示
mOperationBatchSyncButton.setVisibility(View.GONE);
// ボタンを活性化
setEnabledImageButton(mSearchButton, true);
}
// ツールバーの検索結果レイアウトの表示・非表示
checkShowSearchResult();
}
// 検索ワードのクリア
......@@ -722,17 +713,6 @@ public class OperationListActivity extends ABVUIActivity {
return result;
}
// ツールバーの検索結果レイアウトの表示・非表示
private void checkShowSearchResult() {
if (StringUtil.isNullOrEmpty(mSearchWord) && StringUtil.isNullOrEmpty(mStartDateStr) && StringUtil.isNullOrEmpty(mEndDateStr)) {
// 検索ワードが存在しない場合、検索結果ではないので非表示
mSearchResultLayout.setVisibility(View.GONE);
} else {
// 検索ワードが存在するため、検索結果と見做し、表示
mSearchResultLayout.setVisibility(View.VISIBLE);
}
}
public void startTaskDirectionOrReportView(OperationDto operationDto) {
ContentDto contentDto = contentDao.getContent(operationDto.contentId);
try {
......@@ -1951,10 +1931,9 @@ public class OperationListActivity extends ABVUIActivity {
/**
* 作業種別の選択のダイアログ画面表示
* @param isInit
* @param autoClose 直下階層が存在しない場合、ダイアログを自動で閉じる
* @param isInit 初期表示
*/
public void showOperationGroupMasterDialog(boolean isInit, boolean autoClose) {
public void showOperationGroupMasterDialog(boolean isInit) {
if (isInit || operationCountMap == null) {
// 最後の階層レベルを取得
Integer lastLevel = mOperationGroupMasterLogic.getLastGroupLevel();
......@@ -1986,11 +1965,6 @@ public class OperationListActivity extends ABVUIActivity {
}
});
// autoCloseがtrueの場合、下位階層が存在しなければreturnで以下の処理は行わない
if (autoClose && (operationGroupMasterDtoList == null || operationGroupMasterDtoList.size() < 1)) {
return;
}
boolean[] haveChildFlags = new boolean[operationGroupMasterDtoList.size()];
int[] operationCounts = new int[operationGroupMasterDtoList.size()];
int i = 0;
......@@ -2021,7 +1995,7 @@ public class OperationListActivity extends ABVUIActivity {
helper.popList(1, true);
// ポップアップ再表示
dialog.dismiss();
showOperationGroupMasterDialog(false, false);
showOperationGroupMasterDialog(false);
}
});
} else {
......@@ -2037,7 +2011,7 @@ public class OperationListActivity extends ABVUIActivity {
helper.pushList(operationGroupMasterDto);
// ポップアップ再表示
dialog.dismiss();
showOperationGroupMasterDialog(false, true);
showOperationGroupMasterDialog(false);
}
});
......@@ -2056,7 +2030,7 @@ public class OperationListActivity extends ABVUIActivity {
*/
private OperationListHelper getListHelper() {
OperationListHelper operationListHelper;
if (mOperationGroupMasterServiceOperationFlg && getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.GROUP) {
if (mOperationGroupMasterServiceOperationFlg && getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.CATEGORY) {
operationListHelper = new OperationGroupMasterListHelper(this);
} else {
operationListHelper = new HomeOperationListHelper(this);
......@@ -2090,44 +2064,6 @@ public class OperationListActivity extends ABVUIActivity {
}
/**
* セグメント（全て・カテゴリ）のクリックイベント
* @param view
*/
public void onClickOperationLocationType(View view) {
if (view.getId() == R.id.operation_location_type_group) {
// カテゴリ
getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.GROUP);
} else {
// 全て
getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.ALL);
}
// プログレスバー表示（ビューが作り終わるとcloseProgressPopup()が呼ばれる
showProgressPopup();
setOperationListView();
if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.GROUP) {
//作業種別モードの場合は、作業種別選択ダイアログ画面を表示
showOperationGroupMasterDialog(true, false);
}
}
/**
* セグメントのチェック設定
* @param operationGroupType
*/
private void checkOperationGroupType(final int operationGroupType) {
switch (operationGroupType) {
case OperationLocationType.GROUP:
mLocationTypeRadioGroup.check(R.id.operation_location_type_group);
break;
case OperationLocationType.ALL:
default:
mLocationTypeRadioGroup.check(R.id.operation_location_type_all);
break;
}
}
/**
* 絞り検索の日付を設定
*/
private void setApertureMasterDataFetchDate() {
......@@ -2248,7 +2184,9 @@ public class OperationListActivity extends ABVUIActivity {
public void onDestroy() {
Logger.d(TAG, "onDestroy");
contentDownloader.removeContentDownloadListener(this);
if (batchSyncView != null) {
batchSyncView.setActivityDestroy();
}
super.onDestroy();
}
......@@ -2273,7 +2211,7 @@ public class OperationListActivity extends ABVUIActivity {
popup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Logger.d(TAG, "onClickShowSortConditionList.onItemClick:" + id);
Logger.d(TAG, "onClickSortMenuByTablet id:" + id);
getABVUIDataCache().setSortCondition((int)id);
// ビューア更新
refreshOperationList();
......@@ -2332,8 +2270,91 @@ public class OperationListActivity extends ABVUIActivity {
// 並び替えの表示するソートリスト
private ArrayAdapter<String> setSortListView(ListView listView) {
final List<String> sortMembers = Arrays.asList(getRStringArray(R.array.sort_names));
listView.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
return new ArrayAdapter<>(this, R.layout.item_checked_list, sortMembers);
return new ArrayAdapter<>(this, R.layout.item_checked_list, Arrays.asList(getRStringArray(R.array.sort_names)));
}
/**
* 並べ替え画面表示
*
* @param anchor
*/
public void onClickGroupLocationByTablet(final View anchor) {
Logger.d(TAG, "onClickGroupLocationByTablet start");
final ABVPopupListWindow popup = new ABVPopupListWindow(this, R.layout.popup_simple_list);
popup.setTitle(getRString(R.string.select_category));
popup.setWidth(getRDimensionSize(R.dimen.popup_size_large));
// 表示するコンテンツタイプのリストを作成
ListView listView = popup.getListView();
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, R.layout.item_dialog_list, Arrays.asList(getRStringArray(R.array.category_types)));
popup.setListViewAdapter(adapter);
popup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
popup.dismiss();
setGroupLocation(id);
}
});
if (anchor == null) {
// 呼び出したViewが存在しない場合、真ん中に表示する
popup.showAtLocation(getWindow().getDecorView().findViewById(android.R.id.content), Gravity.CENTER, 0,0);
} else {
popup.showAsDropDown(anchor);
}
}
// 全て・カテゴリ選択画面(スマートフォン)
public void onClickGroupLocationByNormalSize(View view) {
final ABVListDialog dialog = new ABVListDialog(this);
// 外側タップしてもダイアログ画面が閉じられないように設定
final ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.item_dialog_list, Arrays.asList(getRStringArray(R.array.category_types)));
dialog.setTitle(getRString(R.string.select_category));
dialog.setListViewAdapter(adapter);
dialog.setCanceledOnTouchOutside(false);
// 閉じるボタン
dialog.setRightItemOnClickListener(R.drawable.ic_operation_close, new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
dialog.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// ポップアップ再表示
dialog.dismiss();
setGroupLocation(id);
}
});
if (isNormalSize()) {
dialog.showHalfSize();
} else {
dialog.show();
}
}
// カテゴリ選択した内容で設定・表示する
private void setGroupLocation(long id) {
Logger.d(TAG, "setGroupLocation id :" + id);
if (id == OperationLocationType.CATEGORY) {
getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.CATEGORY);
} else {
// 全て
getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.ALL);
}
// プログレスバー
showProgressPopup();
setOperationListView();
if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.CATEGORY) {
//作業種別モードの場合は、作業種別選択ダイアログ画面を表示
showOperationGroupMasterDialog(true);
}
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/HierarchyOperationListHelper.java
......@@ -56,7 +56,7 @@ public abstract class HierarchyOperationListHelper<StackObject> extends Operatio
panListLayout.findViewById(R.id.btn_show_list_view).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mAppActivity.showOperationGroupMasterDialog(true,false);
mAppActivity.showOperationGroupMasterDialog(true);
}
});
......
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