Merge branch 'bugFix/#625-非表示されたルームに入るとルーム一覧に表示できない' into 'features/abcomm_sp6'

#42612 ルーム非表示後、同じルームを作成し入室して退室すると、一覧に表示されない

See merge request !128

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java

@@ -127,6 +127,11 @@ public interface ABookCommConstants {
             Integer JOIN = 1;
         }
 
+        interface ROOM_VIEW_FLAG {
+            Integer VISIBLE = 0;
+            Integer INVISIBLE = 1;
+        }
+
         Integer GROUP_REQUEST_ALL = 0;
     }
 

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

@@ -164,8 +164,8 @@ public class ChatRoomDao extends AbstractDao {
 		update("update t_chat_room set chat_room_name = ? where chat_room_id = ?", new Object[]{roomName, roomId});
 	}
 
-	public void changeRoomViewFlg(Integer roomId) {
-		update("update t_chat_room set view_flg = 1 where chat_room_id = ?", new String[]{"" + roomId});
+	public void changeRoomViewFlg(Integer roomId, Integer viewFlg) {
+		update("update t_chat_room set view_flg = ? where chat_room_id = ?", new Object[]{viewFlg, roomId});
 	}
 
 	public void insertChatRoom(List<ChatRoomDto> chatRoomDtoList) {

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java

@@ -875,8 +875,8 @@ public class CommunicationLogic extends AbstractLogic {
 		archiveDao.deleteArchiveAllData();
 	}
 
-	public void roomDisplayOff(Integer roomId) {
-		chatRoomDao.changeRoomViewFlg(roomId);
+	public void roomDisplayOff(Integer roomId, Integer viewFlg) {
+		chatRoomDao.changeRoomViewFlg(roomId, viewFlg);
 	}
 
 	public String getUserList(String userIdList) {

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

@@ -933,6 +933,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
             roomName = chatRoom.chatRoomName;
             roomType = chatRoom.type.toString();
             beforeRoomType = chatRoom.type.toString();
+            communicationLogic.roomDisplayOff(roomId.intValue(), ABookCommConstants.FLAG.ROOM_VIEW_FLAG.VISIBLE);
+
             mChatWebView.post(new Runnable() {
                 @Override
                 public void run() {
@@ -944,7 +946,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
 
         @JavascriptInterface
         public void roomDisplayOff() {
-            communicationLogic.roomDisplayOff(roomId.intValue());
+            communicationLogic.roomDisplayOff(roomId.intValue(), ABookCommConstants.FLAG.ROOM_VIEW_FLAG.INVISIBLE);
             mChatWebView.post(new Runnable() {
                 @Override
                 public void run() {