文書協業の場合非表示項目設定

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -71,6 +71,7 @@ import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
 import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
 import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
+import jp.agentec.abook.abv.ui.home.activity.ChatWebViewActivity;
 import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
 import jp.agentec.abook.abv.ui.home.helper.ABookPermissionHelper;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
@@ -147,11 +148,17 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 	protected String mEnablePhotoEdit; //最初ファイルをアップロードする時、Webからもらう編集可能可否のパラメタ	0:編集する。 1:編集しない。
 	protected PhotoEditActivity mPhotoEditDialog;
 
+	protected boolean isCollaboration = false;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		ChatWebViewActivity chatWebViewActivity = ActivityHandlingHelper.getInstance().getActivity(ChatWebViewActivity.class);
+		if (chatWebViewActivity != null && chatWebViewActivity.isInPictureInPictureMode()) {
+			isCollaboration = true;
+		}
+
 		Intent intent = getIntent();
 	    contentId = intent.getLongExtra(ABookKeys.CONTENT_ID, 0);
 	    contentType = intent.getStringExtra(ABookKeys.CONTENT_TYPE);
@@ -462,7 +469,12 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 					params.addRule(RelativeLayout.CENTER_VERTICAL);
 					params.rightMargin = (int) (getResources().getDisplayMetrics().density * 5);
 					subMenuBtn.setLayoutParams(params);
-					exitMeetingBtn.setVisibility(View.VISIBLE);
+					if (isCollaboration) {
+						exitMeetingBtn.setVisibility(View.GONE);
+					} else {
+						exitMeetingBtn.setVisibility(View.VISIBLE);
+					}
+
 
 //					if (helpButton != null && helpButton.getVisibility() == View.VISIBLE) {
 //                        helpButton.setLayoutParams(params);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -76,6 +76,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Stack;
 import java.util.concurrent.ConcurrentHashMap;
 
 import jp.agentec.abook.abv.bl.acms.client.json.DownloadedContentInfoJSON;
@@ -118,6 +119,7 @@ import jp.agentec.abook.abv.cl.util.ContentLogUtil;
 import jp.agentec.abook.abv.cl.util.PreferenceUtil;
 import jp.agentec.abook.abv.launcher.android.R;
 import jp.agentec.abook.abv.launcher.android.R.id;
+import jp.agentec.abook.abv.ui.common.activity.ABVAuthenticatedActivity;
 import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity;
 import jp.agentec.abook.abv.ui.common.appinfo.AppColor;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
@@ -135,6 +137,7 @@ import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
 import jp.agentec.abook.abv.ui.common.view.ABVEditText;
 import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
 import jp.agentec.abook.abv.ui.common.vo.Size;
+import jp.agentec.abook.abv.ui.home.activity.ChatWebViewActivity;
 import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
 import jp.agentec.abook.abv.ui.Interface.MovePageInterface;
@@ -332,6 +335,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	public boolean mShowPinFlg = true;
 	// 移動・タップモードのフラグ
 	public boolean mMoveTaskFlg = false;
+
+
 	
 	/**
 	 * スクロールステータス
@@ -347,6 +352,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
 		Logger.i(TAG, "[onCreate]:contentId=" + getContentId());
 		super.onCreate(savedInstanceState);
 
+
 		// 全画面表示
 		getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
@@ -941,6 +947,13 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				showMeetingExitDialog();
 			}
 		});
+
+		if (isCollaboration) {
+			pauseBtn.setVisibility(View.GONE);
+			exitMeetingBtn.setVisibility(View.GONE);
+			exitBtn.setVisibility(View.GONE);
+			promoteBtn.setVisibility(View.GONE);
+		}
 	}
 
 	private boolean addPageViewFinish;
@@ -1390,6 +1403,15 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				mBtnRemoteStart.setVisibility(View.GONE);
 			}
 		}
+
+		if (isCollaboration) {
+			mHistoryBtn.setVisibility(View.GONE);
+			indexBtn.setVisibility(View.GONE);
+			search.setVisibility(View.GONE);
+			marking.setVisibility(View.GONE);
+			bookmark.setVisibility(View.GONE);
+			subMenuBtn.setVisibility(View.GONE);
+		}
 	}
 
 	private void setMarkingViewVisibility(boolean visible){
@@ -1823,6 +1845,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
                 exitMeetingBtn.setVisibility(View.VISIBLE);
             }
         }
+
         mToolBar.setVisibility(visability);
     }