Commit c9363234 by onuma

#44078 文書協業接続時にホスト切り替え要求した場合、Android端末のみPIPモード時にその画面に要求ダイアログ表示し、全画面表示できない

parent 99424cef
......@@ -111,10 +111,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
private ChatData chatData;
private String selectedUserIdList;
private String mSkey;
private boolean isPIP;
private boolean startPIP = false; // PIPモードを開始していたらtrue;
private boolean needFinishOnStop = false; // ×ボタンでPIP閉じた時用
private boolean isStop;
private boolean doneOnStopEvent = false;
private String collaborationType = null;
private String meetingId = null;
......@@ -819,13 +817,20 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
* PIPモードから元にもどる
*/
public void finishPIPMode() {
if (!isPIP) {
return;
}
if (startPIP) {
Intent intent = new Intent();
intent.setClass(this, ChatWebViewActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(ABookCommConstants.KEY.SID, chatData.sid);
intent.putExtra(ABookCommConstants.KEY.ROOM_ID, chatData.roomId);
intent.putExtra(ABookCommConstants.KEY.ROOM_NAME, chatData.roomName);
intent.putExtra(ABookCommConstants.KEY.ROOM_TYPE, chatData.roomType);
intent.putExtra(ABookCommConstants.KEY.LOGIN_ID, chatData.loginId);
intent.putExtra(ABookCommConstants.KEY.SHOP_NAME, chatData.shopName);
intent.putExtra(ABookCommConstants.KEY.COLLABORATION_TYPE, chatData.getStrCollaborationType());
intent.putExtra(AppDefType.ChatPushMessageKey.baseActivityName, baseActivityName);
getApplication().startActivity(intent);
collaborationType = Integer.toString(0);
startPIP = false;
......@@ -898,7 +903,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
@Override
public void onPictureInPictureModeChanged (boolean isInPictureInPictureMode, Configuration newConfig) {
isPIP = isInPictureInPictureMode;
if (isInPictureInPictureMode) {
// true になったら、PIPのインディケーターを消す
mChatWebView.removePIPIndicator();
......
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