Merge branch 'features/1.3.200_42933' into 'features/1.3.200'

Bug #42933【android10不具合対応 Check 1.3.200】「プッシュメッセージ送信」で、報告できる作業数が多すぎる

See merge request !164

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java

@@ -124,7 +124,7 @@ public class OperationDao extends AbstractDao {
      * @return
      */
     public List<OperationDto> getAllOperation() {
-        return rawQueryGetDtoList("select tp.*, rpc.content_id from t_operation AS tp left outer join r_operation_content AS rpc on tp.operation_id = rpc.operation_id ORDER BY operation_id DESC", null, OperationDto.class);
+        return rawQueryGetDtoList("select tp.*, rpc.content_id from t_operation AS tp left outer join r_operation_content AS rpc on tp.operation_id = rpc.operation_id AND rpc.operation_content_flg = 1 ORDER BY operation_id DESC", null, OperationDto.class);
     }
 
     public List<OperationDto> getLatestOperations() {

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -237,7 +237,7 @@
     <string name="L120">서버와의 통신에 실패하였습니다.</string>
     <string name="L121">다시 시작할 수 없습니다.</string>
     <string name="L122">현재 이 기능은 Android 버전 앱에서 \n 대응하고 있지 않습니다.</string>
-    <string name="L123">표시가 제한된 컨테츠 입니다.\n로그인 패스워드를 입력해 주세요.</string>
+    <string name="L123">표시가 제한된 컨텐츠 입니다.\n로그인 패스워드를 입력해 주세요.</string>
     <string name="L124">시스템에러가 발생하였습니다.앱을 리로드합니다.</string>
 
     <string name="C_E_SYSTEM_0001">예기치 않은 오류가 발생하였습니다.</string>

ABVJE_UI_Android/res/layout-normal/push_message_list_dialog.xml

@@ -127,5 +127,7 @@
     <ListView
         android:id="@+id/lv_push_message"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/res/layout/operation_select_dialog.xml

@@ -38,6 +38,8 @@
     <ListView
         android:id="@+id/lv_operation_select"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/res/layout/push_message_list_dialog.xml

@@ -126,5 +126,7 @@
     <ListView
         android:id="@+id/lv_push_message"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/res/layout/push_message_send_dialog.xml

@@ -234,7 +234,9 @@
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:visibility="gone"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 
 
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java

@@ -1029,8 +1029,12 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 		mPushMessageSendDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				showOperationSelectDialog();
-				mPushMessageSendDialog.dismiss();
+				if (mFixPushMessageListView.getVisibility() == View.VISIBLE) { //定型文表示状態
+					showSendPushMessgeView(true);
+				} else { //送信画面表示状態
+					showOperationSelectDialog();
+					mPushMessageSendDialog.dismiss();
+				}
 			}
 		});
 
@@ -1086,8 +1090,6 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 	private void showSendPushMessgeView(boolean sendPushMessageViewFlg) {
 		if (sendPushMessageViewFlg) {
 			mFixPushMessageListView.setVisibility(View.GONE);
-			mPushMessageSendDialog.findViewById(R.id.back_btn).setVisibility(View.GONE);
-
 			mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.VISIBLE);
 			mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
 			EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);