Merge branch 'features/abcomm_sp6' of…

Merge branch 'features/abcomm_sp6' of https://gitlab.agentec.jp/abook_android/abook_check into features/abcomm_sp6

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) {
@@ -987,9 +987,15 @@ public class CommunicationLogic extends AbstractLogic {
 	public String getUserInfo(Integer shopMemberId) {
 		ShopMemberDto shopMemberDto = shopMemberDao.getShopMember(shopMemberId);
 		Map<String, Object> userMap = new HashMap<String, Object>();
-		userMap.put(ABookCommConstants.KEY.SHOP_MEMBER_ID, shopMemberDto.shopMemberId);
-		userMap.put(ABookCommConstants.KEY.SHOP_MEMBER_NAME, shopMemberDto.shopMemberName);
-		userMap.put(ABookCommConstants.KEY.PROFILE_URL, shopMemberDto.profileUrl);
+		if (shopMemberDto == null) {
+			userMap.put(ABookCommConstants.KEY.SHOP_MEMBER_ID, null);
+			userMap.put(ABookCommConstants.KEY.SHOP_MEMBER_NAME, "不明");
+			userMap.put(ABookCommConstants.KEY.PROFILE_URL, null);
+		} else {
+			userMap.put(ABookCommConstants.KEY.SHOP_MEMBER_ID, shopMemberDto.shopMemberId);
+			userMap.put(ABookCommConstants.KEY.SHOP_MEMBER_NAME, shopMemberDto.shopMemberName);
+			userMap.put(ABookCommConstants.KEY.PROFILE_URL, shopMemberDto.profileUrl);
+		}
 		JSONObject jsonObject = new JSONObject(userMap);
 		return jsonObject.toString();
 	}

chat @ fae1ca86

-Subproject commit e7818679a5c0fb656aac352da1b99e64b2b9afac
+Subproject commit fae1ca86912e642865fde24bcd8f4dde129936c2

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

@@ -940,6 +940,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() {
@@ -951,7 +953,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() {