Commit 893d16ef by Lee Munkyeong

文書協業実装

parent 86abd366
...@@ -469,13 +469,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -469,13 +469,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
// } // }
} }
else { // 会議室退室ボタン非表示 else { // 会議室退室ボタン非表示
exitMeetingBtn.setVisibility(View.GONE); if (exitMeetingBtn != null) {
RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(WC, WC); exitMeetingBtn.setVisibility(View.GONE);
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(WC, WC);
params.addRule(RelativeLayout.CENTER_VERTICAL); params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
params.rightMargin = (int) (getResources().getDisplayMetrics().density * 5); params.addRule(RelativeLayout.CENTER_VERTICAL);
subMenuBtn.setLayoutParams(params); params.rightMargin = (int) (getResources().getDisplayMetrics().density * 5);
subMenuBtn.setLayoutParams(params);
}
// if (helpButton != null && helpButton.getVisibility() == View.VISIBLE) { // if (helpButton != null && helpButton.getVisibility() == View.VISIBLE) {
// helpButton.setLayoutParams(params); // helpButton.setLayoutParams(params);
// } // }
......
...@@ -1374,6 +1374,28 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -1374,6 +1374,28 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
return communicationLogic.getUserListByLoginId(loginIdList); return communicationLogic.getUserListByLoginId(loginIdList);
} }
@JavascriptInterface
public String createContentView() {
Integer meetingId = null;
try {
connectMeetingServer();
List<MeetingDto> meetingList= meetingManager.getMeetingList(mSkey);
for (MeetingDto meeting : meetingList) {
if (meeting.title.equals("Collaboration__"+roomId) && meetingManager.isOwner()) {
meetingManager.deleteMeeting(meeting.meetingId, mSkey);
}
}
meetingId = meetingManager.createMeeting(mSkey,"Collaboration_"+roomId, roomId.toString());
meetingManager.join(meetingId, mSkey, roomId.toString(), true);
} catch (Exception e) {
mChatWebView.loadUrl("javascript:alert('" + "会議室サーバに接続できませんでした。" + "');");
}
PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
enterPictureInPictureMode(mPipBuilder.build());
return meetingId.toString();
}
@JavascriptInterface @JavascriptInterface
public void startContentView(String joinMeetingId) { public void startContentView(String joinMeetingId) {
Integer meetingId; Integer meetingId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment