Commit 81bcfb97 by Kim Jinsung

Merge branch 'communication/develop_44453' into 'communication/develop'

Bug #44453【ABook Communication Android 1.4.200】文書協業中にホストがHTMLを開き閉じると、メンバー側で閉じない

See merge request !221
parents 8d88d0f9 fc469828
......@@ -334,6 +334,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
// 移動・タップモードのフラグ
public boolean mMoveTaskFlg = false;
private long currentRemoteObjectId = 0;
/**
......@@ -4239,6 +4240,12 @@ public class ContentViewActivity extends ABVContentViewActivity {
}
if (cmd.equals(MeetingManager.CMD_ACTION)) { // 通常アクションボタン
//同じアクションが連続で呼ばれる問題対応(司会者は1回送信しますが、2回受信される問題)
if (currentRemoteObjectId == remoteObjectId) {
Logger.e(TAG, "same remoteObjectId");
return;
}
currentRemoteObjectId = remoteObjectId;
View targetView = objectIdButtonMap.get(remoteObjectId);
if (targetView == null) {
VideoMountAction videoMountAction = findVideoMountAction(pageNumber, remoteObjectId); // 埋め込み動画の最初のアクション
......@@ -4248,8 +4255,15 @@ public class ContentViewActivity extends ABVContentViewActivity {
Logger.e(TAG, "[performRemoteEvent] targetView not found. remoteObjectId=" + remoteObjectId); // EMAILの場合はエラーが出てしまう。
return;
}
Logger.v(TAG, "[performRemoteEvent] perform click. remoteObjectId=%s targetView=%s", remoteObjectId, targetView);
Logger.d(TAG, "[performRemoteEvent] perform click. remoteObjectId=%s targetView=%s", remoteObjectId, targetView);
targetView.performClick(); // ボタンをクリック
//なぜ2回呼ばれるのがわからないので、0.5秒後にcurrentRemoteObjectIdをリセットする。
handler.postDelayed(new Runnable() {
@Override
public void run() {
currentRemoteObjectId = 0;
}
}, 500);
}
else if (cmd.equals(MeetingManager.CMD_LINKURLACTION)) { // PDF Link
String url = JsonUtil.getString(json, MeetingManager.URL); // null可
......
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