Merge branch 'communication/develop' of…

Merge branch 'communication/develop' of https://gitlab.agentec.jp/abook_android/abook_check into features/abcomm_sp6_document_collaboration

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

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java

@@ -71,6 +71,7 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.GetMessagesParameters;
 import jp.agentec.abook.abv.bl.acms.client.parameters.GetNameCardParameters;
 import jp.agentec.abook.abv.bl.acms.client.parameters.GetOperationDataParameters;
 import jp.agentec.abook.abv.bl.acms.client.parameters.GetTaskFileParameters;
+import jp.agentec.abook.abv.bl.acms.client.parameters.InviteCollaborationParameters;
 import jp.agentec.abook.abv.bl.acms.client.parameters.InviteUsersParameters;
 import jp.agentec.abook.abv.bl.acms.client.parameters.JoinCollaborationParameters;
 import jp.agentec.abook.abv.bl.acms.client.parameters.NewAppStoreLoginParameters;
@@ -801,6 +802,24 @@ public class AcmsClient implements AcmsClientResponseListener {
 	}
 
 	/**
+	 *  協業内ユーザー招待
+	 *
+	 * @param sid
+	 * @param roomId
+	 * @param roomName
+	 * @param inveitedUserIds
+	 * @param collaborationType
+	 * @return
+	 * @throws NetworkDisconnectedException
+	 * @throws AcmsException
+	 */
+	public ArchiveDetailJSON inviteCollaboration(String sid, Integer roomId, String roomName, String inveitedUserIds, String collaborationType) throws NetworkDisconnectedException, AcmsException {
+		HttpResponse response = send(AcmsApis.ApigetCollaboration, new InviteCollaborationParameters(sid, AcmsApis.CollaborationCmds.invite, roomId, roomName, inveitedUserIds, collaborationType));
+		ArchiveDetailJSON json = new ArchiveDetailJSON(response.httpResponseBody);
+		return json;
+	}
+
+	/**
 	 * 作業報告データ送信
 	 * @param sid
 	 * @param operationId

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/InviteCollaborationParameters.java

+package jp.agentec.abook.abv.bl.acms.client.parameters;
+
+import jp.agentec.adf.net.http.HttpParameterObject;
+
+public class InviteCollaborationParameters extends HttpParameterObject {
+    /**
+     * セッションID
+     * @since 1.0.0
+     */
+    private String sid;
+    private String cmd;
+    private Integer roomId;
+    private String roomName;
+    private String inviteUserIds;
+    private String collaborationType;
+
+    /**
+     * {@link InviteCollaborationParameters} のインスタンスを初期化します。
+     * @param sid ログインした時のセッションIDです。
+     * @param cmd Apiリクエストに必要なコマンド（ABOOK COMM専用）。
+     * @param roomId 協業を開始したルームIDです。（ABOOK COMM専用）。
+     * @param roomName 協業を開始したルームNAMEです。（ABOOK COMM専用）。
+     * @param inviteUserIds 協業に招待されたユーザーIDです。（ABOOK COMM専用）。
+     * @param collaborationType 協業タイプです。（ABOOK COMM専用）。
+     * @since 1.0.0
+     */
+    public InviteCollaborationParameters(String sid, String cmd, Integer roomId, String roomName, String inviteUserIds, String collaborationType) {
+        this.sid = sid;
+        this.cmd = cmd;
+        this.roomId = roomId;
+        this.roomName = roomName;
+        this.inviteUserIds = inviteUserIds;
+        this.collaborationType = collaborationType;
+    }
+
+    /**
+     * セッションIDを返します。
+     * @return ログインした時のセッションIDです。
+     * @since 1.0.0
+     */
+    public String getSid() {
+        return sid;
+    }
+
+    /**
+     * コマンドを返します。
+     * @return Apiリクエストに必要なコマンドです。
+     * @since 1.0.0
+     */
+    public String getCmd() {
+        return cmd;
+    }
+
+    /**
+     * RoomIdを返します。
+     * @return 協業を開始したルームIDです。
+     * @since 1.0.0
+     */
+    public Integer getRoomId() {
+        return roomId;
+    }
+
+    /**
+     * RoomNameを返します。
+     * @return 協業を開始したルームNAMEです。
+     * @since 1.0.0
+     */
+    public String getRoomName() {
+        return roomName;
+    }
+
+    /**
+     * InviteUserIdsを返します。
+     * @return 協業に招待されたユーザーIDです。
+     * @since 1.0.0
+     */
+    public String getInviteUserIds() {
+        return inviteUserIds;
+    }
+
+    /**
+     * collaborationTypeを返します。
+     * @return 協業タイプです。
+     * @since 1.0.0
+     */
+    public String getCollaborationType() {
+        return collaborationType;
+    }
+
+}

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java

@@ -212,6 +212,7 @@ public class AcmsApis {
 		public static final String start = "1";
 		public static final String join = "2";
 		public static final String finish = "3";
+		public static final String invite = "4";
 	}
 
 	//	download

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

@@ -125,6 +125,7 @@ public interface ABookCommConstants {
         interface COLLABORATION_JOIN_FLG {
             Integer CREATE = 0;
             Integer JOIN = 1;
+            Integer INVITE = 2;
         }
 
         interface ROOM_VIEW_FLAG {

chat @ a1097bef

-Subproject commit de7a33d34ccf3a0307abe0c4bfbb0be2f233b54f
+Subproject commit a1097bef37149c535417bb3030e583ce9dd0a9c0

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1480,7 +1480,7 @@
     <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_invite_collaboration">協業に招待されました。</string>
     <!-- 連続作業 -->
     <string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>
 

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1487,4 +1487,5 @@
     <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>
+    <string name="msg_invite_collaboration">협업에 초대되셨습니다.</string>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1484,4 +1484,5 @@
     <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>
+    <string name="msg_invite_collaboration">You are invited to collaboration.</string>
 </resources>

ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java

@@ -33,6 +33,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
     private static final String TAG = "ABVFcmListenerService";
     private NotificationManager mNotificationManager;
     private static int mNotificationConnect = 0;
+    private final String INVITE_COLLABORATION = "inviteCollaboration<::split>";
 
     @Override
     public void onCreate() {
@@ -94,6 +95,21 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
                     if (AppUtil.isAppForground(this)) {
                         msg.put(AppDefType.PushMessageKey.message, pushMsg);
                     }
+
+                    if (pushMsg.contains(INVITE_COLLABORATION)) {
+                        String[] inviteMessage = pushMsg.split("<::split>");
+                        tempMsg = getString(R.string.msg_invite_collaboration);
+                        Intent pushMsgDialog = new Intent(ABVFcmListenerService.this, ShowPushMessageDailogActivity.class);
+                        pushMsgDialog.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        pushMsgDialog.putExtra(AppDefType.PushMessageKey.message, tempMsg);
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomId, roomId);  // Room Id
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName);  // Room Name
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, pushSendLoginId); // sendLoginId
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, pushSendDate);
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.collaborationType, inviteMessage[1]);
+                        startActivity(pushMsgDialog);
+                        return;
+                    }
                 }
 
                 if (AppUtil.isAppForground(this)) {

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

@@ -123,6 +123,7 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                             String roomName = extras.getString(AppDefType.ChatPushMessageKey.roomName);
                             String pushSendLoginId = extras.getString(AppDefType.ChatPushMessageKey.pushSendLoginId);
                             long pushSendDate = extras.getLong(AppDefType.ChatPushMessageKey.pushSendDate);
+                            String collaborationType = extras.getString(AppDefType.ChatPushMessageKey.collaborationType);
                             if (roomId > 0 && !StringUtil.isNullOrEmpty(roomName)) {
                                 List<PushMessageDto> pushMessageDtoList = AbstractLogic.getLogic(PushMessageLogic.class).getAllPushMessageList();
 
@@ -138,8 +139,11 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
 
                                     Logger.d("tempDate","date : " + tempDate);
                                 }
-
-                                ActivityHandlingHelper.getInstance().startChatWebviewActivity(roomId, roomName);
+                                if (StringUtil.isNullOrEmpty(collaborationType)) {
+                                    ActivityHandlingHelper.getInstance().startChatWebviewActivity(roomId, roomName);
+                                } else {
+                                    ActivityHandlingHelper.getInstance().startChatWebviewActivityWithCollaboration(roomId, roomName, collaborationType);
+                                }
                             }
                         }
                         finish();

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java

@@ -141,5 +141,6 @@ public interface AppDefType {
 		String roomName = "roomName";
 		String pushSendLoginId = "pushSendLoginId";
 		String pushSendDate = "pushSendDate";
+		String collaborationType = "collaborationType";
 	}
 }

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

@@ -142,6 +142,7 @@ public class ChatWebviewActivity extends CommunicationWebViewActivity {
     private boolean isOnline;
     private Long roomId;
     private String roomType;
+    private String collaborationType;
     private String groupId;
     private String beforeRoomType;
     private Integer shopMemberId;
@@ -188,6 +189,7 @@ public class ChatWebviewActivity extends CommunicationWebViewActivity {
         roomName = intent.getStringExtra("roomName");
         loginId = intent.getStringExtra("loginId");
         shopName = intent.getStringExtra("shopName");
+        collaborationType = intent.getStringExtra("collaborationType");
         isOnline = false;
 
     }
@@ -284,8 +286,20 @@ public class ChatWebviewActivity extends CommunicationWebViewActivity {
             }
             Integer integerRoomId = Integer.parseInt(roomId.toString());
             roomType = communicationLogic.getChatRoom(integerRoomId).type.toString();
-            String parameterData = "sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + roomId + "&roomName=" + roomName + fixedParam;
-            mChatWebView.postUrl(CHAT_ROOM_PAGE_URL, parameterData.getBytes());
+            if (StringUtil.isNullOrEmpty(collaborationType)) {
+                String parameterData = "sid=" + sid + "&loginId=" + loginId + "&shopName=" + shopName + "&roomId=" + roomId + "&roomName=" + roomName + fixedParam;
+                mChatWebView.postUrl(CHAT_ROOM_PAGE_URL, parameterData.getBytes());
+            } else {
+                collaborationJoinFlg = ABookCommConstants.FLAG.COLLABORATION_JOIN_FLG.INVITE;
+                try {
+                    AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).joinCollaboration(sid, roomId.intValue());
+                } catch (NetworkDisconnectedException e) {
+                    e.printStackTrace();
+                } catch (AcmsException e) {
+                    e.printStackTrace();
+                }
+                moveCollaborationScreen(Integer.parseInt(collaborationType));
+            }
         } else {  // Chat
             if (lastRoomName.length() > 0 && lastRoomId.length() > 0) {
                 String parameterData = "sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + lastRoomId + "&roomName=" + lastRoomName + fixedParam;
@@ -838,6 +852,15 @@ public class ChatWebviewActivity extends CommunicationWebViewActivity {
             showCommunicationMenuDialog();
         }
 
+        @JavascriptInterface
+        public void openCommunicationHome() {
+            mChatWebView.post(new Runnable() {
+                @Override
+                public void run() {
+                    mChatWebView.loadUrl(CHAT_PAGE_URL);
+                }
+            });
+        }
 
         @JavascriptInterface
         public void reload() {
@@ -1324,6 +1347,11 @@ public class ChatWebviewActivity extends CommunicationWebViewActivity {
         }
 
         @JavascriptInterface
+        public void inviteCollaboration(String inviteUserIds, String collaborationType) throws NetworkDisconnectedException, AcmsException {
+            AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).inviteCollaboration(sid, roomId.intValue(), roomName, inviteUserIds, collaborationType);
+        }
+
+        @JavascriptInterface
         public void startCollaboration(String collaborationType) {
             collaborationJoinFlg = ABookCommConstants.FLAG.COLLABORATION_JOIN_FLG.CREATE;
             moveCollaborationScreen(Integer.parseInt(collaborationType));
@@ -1335,6 +1363,11 @@ public class ChatWebviewActivity extends CommunicationWebViewActivity {
         }
 
         @JavascriptInterface
+        public String getCollaborationType() {
+            return collaborationType;
+        }
+
+        @JavascriptInterface
         public String getToMoveGroupId() {
             return groupId;
         }
@@ -1725,5 +1758,4 @@ public class ChatWebviewActivity extends CommunicationWebViewActivity {
     public void onPause() {
         super.onPause();
     }
-
 }

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();

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -1561,7 +1561,12 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
     }
 
     public String getLocaleFileName() {
-        Locale primaryLocale = mContext.getResources().getConfiguration().getLocales().get(0);
+        Locale primaryLocale;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            primaryLocale = mContext.getResources().getConfiguration().getLocales().get(0);
+        } else {
+            primaryLocale = mContext.getResources().getConfiguration().locale;
+        }
         String locale = primaryLocale.getDisplayName();
         String localeLanguage = "en";
         if (primaryLocale.equals(Locale.JAPAN) || primaryLocale.equals(Locale.JAPANESE)) {
@@ -1916,4 +1921,44 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         this.previousOfSettingActivity = null;
         this.previousOfSettingActivity2 = activity;
     }
+
+    public void startChatWebviewActivityWithCollaboration(Long roomId, String roomName, String collaborationType) {
+        String className = ChatWebviewActivity.class.getName();
+        boolean isNormalSize = (mContext.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_NORMAL;
+        Intent intent = new Intent();
+        intent.putExtra("chatWebviewUrl",ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/chatapi/chat/");
+        String sid = ABVDataCache.getInstance().getMemberInfo().sid;
+        intent.putExtra("sid", sid);
+        String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
+        String shopName = ABVDataCache.getInstance().getUrlPath();
+        intent.putExtra("loginId", loginId);
+        intent.putExtra("collaborationType", collaborationType);
+        intent.putExtra("shopName", shopName);
+        intent.putExtra("roomId", roomId);
+        intent.putExtra("roomName", roomName);
+
+        intent.setClassName(mContext.getPackageName(), className);
+
+        Activity activity2 = null;
+        if (!currentActivityStack.isEmpty()) {
+            int size = currentActivityStack.size();
+
+            for (int i = size - 1; i >= 0; i--) {
+                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
+                if (activity instanceof ChatWebviewActivity) {
+                    activity2 = (ChatWebviewActivity) activity;
+                }
+            }
+        }
+
+        if (activity2 != null) {
+            activity2.finish();
+            activity2.startActivity(intent);
+        } else {
+            Activity activity = getCurrentActivity();
+            if (activity != null) {
+                activity.startActivity(intent);
+            }
+        }
+    }
 }