ルームタイプによって協業中にユーザー招待ボタンを非表示にするように修正

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

@@ -139,10 +139,10 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
 
 
                                     Logger.d("tempDate","date : " + tempDate);
                                     Logger.d("tempDate","date : " + tempDate);
                                 }
                                 }
-                                if (!StringUtil.isNullOrEmpty(collaborationType)) {
-                                    ActivityHandlingHelper.getInstance().startChatWebviewActivityWithCollaboration(roomId, roomName, collaborationType);
-                                } else {
+                                if (StringUtil.isNullOrEmpty(collaborationType)) {
                                     ActivityHandlingHelper.getInstance().startChatWebviewActivity(roomId, roomName);
                                     ActivityHandlingHelper.getInstance().startChatWebviewActivity(roomId, roomName);
+                                } else {
+                                    ActivityHandlingHelper.getInstance().startChatWebviewActivityWithCollaboration(roomId, roomName, collaborationType);
                                 }
                                 }
                             }
                             }
                         }
                         }

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

@@ -273,8 +273,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
             Integer integerRoomId = Integer.parseInt(roomId.toString());
             Integer integerRoomId = Integer.parseInt(roomId.toString());
+            roomType = communicationLogic.getChatRoom(integerRoomId).type.toString();
             if (StringUtil.isNullOrEmpty(collaborationType)) {
             if (StringUtil.isNullOrEmpty(collaborationType)) {
-                roomType = communicationLogic.getChatRoom(integerRoomId).type.toString();
                 String parameterData = "sid=" + sid + "&loginId=" + loginId + "&shopName=" + shopName + "&roomId=" + roomId + "&roomName=" + roomName + fixedParam;
                 String parameterData = "sid=" + sid + "&loginId=" + loginId + "&shopName=" + shopName + "&roomId=" + roomId + "&roomName=" + roomName + fixedParam;
                 mChatWebView.postUrl(CHAT_ROOM_PAGE_URL, parameterData.getBytes());
                 mChatWebView.postUrl(CHAT_ROOM_PAGE_URL, parameterData.getBytes());
             } else {
             } else {