Merge branch 'communication/feature/finish_all_collaboration' into 'communication/develop'

Communication/feature/finish all collaboration

See merge request !177

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

@@ -809,6 +809,10 @@ public class AcmsClient implements AcmsClientResponseListener {
 		HttpResponse response = send(AcmsApis.ApigetCollaboration, new FinishCollaborationParameters(sid, AcmsApis.CollaborationCmds.finish, roomId));
 		HttpResponse response = send(AcmsApis.ApigetCollaboration, new FinishCollaborationParameters(sid, AcmsApis.CollaborationCmds.finish, roomId));
 	}
 	}
 
 
+	public void finishAllCollaboration(String sid, int roomId) throws NetworkDisconnectedException, AcmsException {
+		send(AcmsApis.ApigetCollaboration, new FinishCollaborationParameters(sid, AcmsApis.CollaborationCmds.finishAll, roomId));
+	}
+
 	public void changeCollaboration(String sid, int roomId, int changeCollaborationType, int meetingId) throws NetworkDisconnectedException, AcmsException {
 	public void changeCollaboration(String sid, int roomId, int changeCollaborationType, int meetingId) throws NetworkDisconnectedException, AcmsException {
 		HttpResponse response = send(AcmsApis.ApigetCollaboration, new ChangeCollaborationParameters(sid, AcmsApis.CollaborationCmds.change, roomId, changeCollaborationType, meetingId));
 		HttpResponse response = send(AcmsApis.ApigetCollaboration, new ChangeCollaborationParameters(sid, AcmsApis.CollaborationCmds.change, roomId, changeCollaborationType, meetingId));
 	}
 	}

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

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

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

@@ -352,11 +352,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
             // WebView内のAlert Dialogを処理する
             // WebView内のAlert Dialogを処理する
             @Override
             @Override
             public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
             public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
+                if (mChatWebView.getUrl() != null && mChatWebView.getUrl().equals(COLLABORATION_PAGE_URL)) {
+                    mChatWebView.loadUrl("javascript:coview_api.HeartBeatUser(globalUserInfo.loginId);");
+                }
                 if (myAlertDialog != null && myAlertDialog.isShowing()) {
                 if (myAlertDialog != null && myAlertDialog.isShowing()) {
                     result.confirm();
                     result.confirm();
                     return true;
                     return true;
                 }
                 }
-
                 if (message.equals("server error Ocurred")) {
                 if (message.equals("server error Ocurred")) {
                     message = getString(R.string.msg_error_chat_server);
                     message = getString(R.string.msg_error_chat_server);
                 } else if (message.equals("Disconnected from the server")) {
                 } else if (message.equals("Disconnected from the server")) {
@@ -1483,6 +1485,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         }
         }
 
 
         @JavascriptInterface
         @JavascriptInterface
+        public void finishAllCollaboration() throws NetworkDisconnectedException, AcmsException {
+            AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).finishAllCollaboration(sid, roomId.intValue());
+        }
+
+        @JavascriptInterface
         public String getCollaborationJoinFlg() {
         public String getCollaborationJoinFlg() {
             return collaborationJoinFlg.toString();
             return collaborationJoinFlg.toString();
         }
         }

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

@@ -310,7 +310,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
             public void run() {
             public void run() {
                 final ABookAlertDialog nonTargetMeetingContentDialog = AlertDialogUtil.createAlertDialog(OperationRelatedContentActivity.this, R.string.app_name);
                 final ABookAlertDialog nonTargetMeetingContentDialog = AlertDialogUtil.createAlertDialog(OperationRelatedContentActivity.this, R.string.app_name);
                 nonTargetMeetingContentDialog.setCancelable(false);
                 nonTargetMeetingContentDialog.setCancelable(false);
-                nonTargetMeetingContentDialog.setMessage(isCollaboration? R.string.msg_non_target_meeting_content : R.string.msg_non_target_meeting_content);
+                nonTargetMeetingContentDialog.setMessage(isCollaboration? R.string.msg_non_target_collaboration_content : R.string.msg_non_target_meeting_content);
                 nonTargetMeetingContentDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                 nonTargetMeetingContentDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     @Override
                     public void onClick(DialogInterface dialog, int whichButton) {
                     public void onClick(DialogInterface dialog, int whichButton) {