Commit 4184e2f4 by Lee Munkyeong

43271対応

parent 82126ce6
...@@ -173,7 +173,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity { ...@@ -173,7 +173,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
private int mCollaborationType; private int mCollaborationType;
private int mHostRequestFlg = 0; private int mHostRequestFlg = 0;
private boolean needHostAlert = false;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
...@@ -1565,6 +1565,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity { ...@@ -1565,6 +1565,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface @JavascriptInterface
public int createContentView() { public int createContentView() {
finishBeforeContentListActivity();
PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder(); PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
enterPictureInPictureMode(mPipBuilder.build()); enterPictureInPictureMode(mPipBuilder.build());
Integer meetingId = null; Integer meetingId = null;
...@@ -1589,6 +1590,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity { ...@@ -1589,6 +1590,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface @JavascriptInterface
public void startContentView() throws InterruptedException { public void startContentView() throws InterruptedException {
finishBeforeContentListActivity();
PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder(); PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
enterPictureInPictureMode(mPipBuilder.build()); enterPictureInPictureMode(mPipBuilder.build());
meetingManager.close(); meetingManager.close();
...@@ -1605,6 +1607,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity { ...@@ -1605,6 +1607,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface @JavascriptInterface
public void joinMeetingRoom(int newMeetingId) throws InterruptedException { public void joinMeetingRoom(int newMeetingId) throws InterruptedException {
finishBeforeContentListActivity();
PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder(); PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
enterPictureInPictureMode(mPipBuilder.build()); enterPictureInPictureMode(mPipBuilder.build());
meetingManager.close(); meetingManager.close();
...@@ -1680,6 +1683,20 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity { ...@@ -1680,6 +1683,20 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
} }
@JavascriptInterface @JavascriptInterface
public void setExitHostAlert() {
needHostAlert = true;
}
@JavascriptInterface
public boolean getExitHostAlert() {
if (needHostAlert) {
needHostAlert = false;
return true;
}
return needHostAlert;
}
@JavascriptInterface
public void updatePreMessage(String messageId) throws NetworkDisconnectedException, AcmsException { public void updatePreMessage(String messageId) throws NetworkDisconnectedException, AcmsException {
if (messageId.equals("0")) { if (messageId.equals("0")) {
return; return;
......
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