#34190 作業種別毎に作業を絞り込み機能追加

ABVJE_UI_Android/res/layout/item_popup_list_item.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/RelativeLayout1"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal" >
@@ -15,34 +15,41 @@
         android:paddingBottom="8dp"
         android:src="@drawable/icon_folder_empty_on" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
         <TextView
             android:id="@+id/itemText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
             android:layout_toRightOf="@+id/imageView1"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:layout_gravity="center"
             android:text="@string/dummy_str"
-        android:textColor="@color/text_select"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/text_select" />
 
         <TextView
             android:id="@+id/itemCountText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-        android:paddingRight="30dp"
-        android:textSize="20sp"/>
+            android:layout_toLeftOf="@+id/nextLevel"
+            android:layout_gravity="center"
+            android:textSize="20sp" />
 
         <ImageView
             android:id="@+id/nextLevel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:src="@drawable/ic_navigation_next_item"
-        android:visibility="gone" />
-
-
+            android:layout_gravity="center"
+            android:visibility="invisible" />
 
-</RelativeLayout>
\ No newline at end of file
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java

@@ -2030,6 +2030,8 @@ public class OperationListActivity extends ABVUIActivity {
             return;
         }
         final ABVListDialog dialog = new ABVListDialog(this);
+        // 外側タップしてもダイアログ画面が閉じられないように設定
+        dialog.setCanceledOnTouchOutside(false);
         mShowDialog = dialog;
         OperationGroupMasterListHelper helper = (OperationGroupMasterListHelper) mListHelper;
         ArrayList<String> groupNames = new ArrayList<>();
@@ -2039,6 +2041,14 @@ public class OperationListActivity extends ABVUIActivity {
 
         dialog.setTitle(helper.getPeekName(), R.drawable.ic_title_group_operation);
 
+        // 閉じるボタン
+        dialog.setRightItemOnClickListener(R.drawable.ic_operation_close, new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
         // autoCloseがtrueの場合、下位階層が存在しなければreturnで以下の処理は行わない
         if (autoClose && operationGroupMasterDtoList.size() < 1) {
             return;

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/HierarchyOperationGroupListAdapter.java

@@ -64,6 +64,8 @@ public class HierarchyOperationGroupListAdapter extends BaseAdapter {
 		// 子作業種別がある場合、「>」を表示
 		if (mHaveChildFlags[position]) {
 			holder.nextLevel.setVisibility(View.VISIBLE);
+		} else {
+			holder.nextLevel.setVisibility(View.INVISIBLE);
 		}
 		// 作業数
 		holder.itemCount.setText("" + mOperationCounts[position]);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java

@@ -73,13 +73,6 @@ public class OperationGroupMasterListHelper extends HierarchyOperationListHelper
         } else {
             // 表示する作業種別が既に削除された場合、最上位階層に戻る（リセット）
             popList(breadCrumbList.size() - 1, false);
-            // 最上位階層のデータ取得（全体）
-            OperationGroupMasterDto topLevelOperationGroupMasterDto = mOperationGroupMasterDao.getTopOperationGroupMaster();
-            if (topLevelOperationGroupMasterDto != null) {
-                operationGroupMasterId = topLevelOperationGroupMasterDto.operationGroupMasterId;
-                // 最上位階層のoperationGroupMasterIdをセット
-                mAppActivity.setOperationGroupMasterId(operationGroupMasterId);
-            }
             ABVEnvironment.getInstance().setOperationGroupMasterClearFlg(false);
             // 作業種別の選択画面を閉じる
             mAppActivity.closeOperationGroupMasterDialog();
@@ -100,6 +93,10 @@ public class OperationGroupMasterListHelper extends HierarchyOperationListHelper
             // パンくずリスト削除
             removeBreadCrumbs(breadCrumbList.get(breadCrumbList.size() - 1));
         }
+        // 移動した作業種別のIDセット
+        mAppActivity.setOperationGroupMasterId(stack.get(getStackSize() - 1).parentOperationGroupMasterId);
+
+        breadCrumbList.get(breadCrumbList.size() - 1);
         if (isReload) {
             // 作業一覧画面を更新する
             refreshList();

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/view/BreadCrumbButton.java

@@ -24,6 +24,5 @@ public class BreadCrumbButton extends Button {
 		setPadding(10, 0, 40, 0);
 	}
 	public int level;
-	public long dtoId;
 	public String name;
 }