Merge branch 'features/abcomm_sp6_invite_user_in_collaboration' into 'features/abcomm_sp6'

協業中ユーザー招待機能実装

See merge request !139

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

@@ -189,6 +189,7 @@ public class CommunicationLogic extends AbstractLogic {
 			groupPathJsonArray.put(jsonObject);
 		}
 		resultJson.put(ABookCommConstants.KEY.SHOP_MEMBER_ID, shopMemberDto.shopMemberId);
+		resultJson.put(ABookCommConstants.KEY.LOGIN_ID, shopMemberDto.loginId);
 		resultJson.put(ABookCommConstants.KEY.SHOP_MEMBER_NAME, shopMemberDto.shopMemberName);
 		resultJson.put(ABookCommConstants.KEY.PROFILE_URL, getProfileUrlPath(shopMemberDto.profileUrl));
 		resultJson.put(ABookCommConstants.KEY.GROUP_PATH_LIST, groupPathJsonArray);

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1479,6 +1479,7 @@
     <string name="msg_error_chat_name_has_invalid_character">特殊文字 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` はルーム名に含めることができません。</string>
     <string name="msg_error_chat_room_sc_forbidden">認証に失敗しました。再度ログインが必要です。</string>
     <string name="msg_error_already_exist_same_room">同じルームが既に存在します。</string>
+    <string name="msg_confirm_send_host_change">ホスト権限を渡しますか？</string>
 
     <!-- 連続作業 -->
     <string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1486,4 +1486,5 @@
     <string name="msg_error_chat_room_sc_forbidden">사용자 정보를 확인할 수 없습니다. 다시 로그인하시기 바랍니다.</string>
     <string name="msg_error_all_process_delete">모두 삭제 송신에 실패하였습니다.</string>
     <string name="msg_error_already_exist_same_room">동일한 채팅방이 이미 존재합니다.</string>
+    <string name="msg_confirm_send_host_change">방장 권한을 전달 받으시겠습니까?</string>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1483,4 +1483,5 @@
     <string name="msg_error_chat_room_sc_forbidden">Failed to authenticate. Please login again.</string>
     <string name="msg_error_all_process_delete">Failed to send all deletes.</string>
     <string name="msg_error_already_exist_same_room">Already exist same room.</string>
+    <string name="msg_confirm_send_host_change">Do you want to receive host permissions?</string>
 </resources>

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

@@ -395,10 +395,9 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                     message = getString(R.string.msg_chat_confirm_delete);
                 }  else if (message.equals("error_already_exist_same_user")) {
                     message = getString(R.string.msg_error_already_exist_same_room);
-                } else {
-                    message = message;
+                } else if (message.equals("방장 권한을 전달 받으시겠습니까?")){
+                    message = getString(R.string.msg_confirm_send_host_change);
                 }
-
                 ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebviewActivity.this, R.string.app_name);
                 confirmAlert.setMessage(message);
 
@@ -425,7 +424,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                 });
                 confirmAlert.setCancelable(false);
                 showAlertDialog(confirmAlert);
-
                 return true;
             }
         });
@@ -974,16 +972,18 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         }
 
         @JavascriptInterface
-        public void inviteUsers(String userIds) throws NetworkDisconnectedException, AcmsException {
+        public void inviteUsers(String userIds, boolean isCollaboration) throws NetworkDisconnectedException, AcmsException {
             final UserInviteResultJSON result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).inviteUsers(sid, roomId.intValue(), roomName, userIds);
             if (result.roomId == null) {
                 communicationLogic.addUserInRoom(userIds, roomId.intValue());
+                if (!isCollaboration) {
                     mChatWebView.post(new Runnable() {
                         @Override
                         public void run() {
                             mChatWebView.loadUrl(CHAT_ROOM_PAGE_URL);
                         }
                     });
+                }
             } else {
                 mChatWebView.post(new Runnable() {
                     @Override

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

@@ -17,8 +17,8 @@ public class PreSplashActivity extends Activity {
         try {
             // アーキテクチャがx86以外の場合のみ、以下のライブラリをロードする。
             if (!Build.CPU_ABI.contains("x86")) {
-                System.loadLibrary("skia_android");
-                System.loadLibrary("ozrv");
+//                System.loadLibrary("skia_android");
+//                System.loadLibrary("ozrv");
             }
         } catch (Exception e) {
             e.printStackTrace();