文書協業実装

08b20c80 · Lee Munkyeong · d2806542 · 08b20c80 · 08b20c80 · 08b20c80
Commit 08b20c80 authored May 06, 2021 by Lee Munkyeong
6 changed files
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
@@ -732,7 +732,7 @@ public class CommunicationLogic extends AbstractLogic {
 		for (String userId : userIdArray) {
 			userIdList.add(Integer.parseInt(userId));
 		}
-		chatRoomDao.insertChatRoomUsers(userIdList, roomId);
+		chatRoomDao.insertChatRoomUsersForInvite(userIdList, roomId);
 	}
 	public void insertChatMessage(ChatMessageDto chatMessageDto) {

--- a/ABVJE_Launcher_Android/AndroidManifest.xml
+++ b/ABVJE_Launcher_Android/AndroidManifest.xml
@@ -243,7 +243,9 @@
            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
        </activity>
-        <activity android:name="jp.agentec.abook.abv.ui.home.activity.ChatWebviewActivity" android:configChanges="orientation|screenSize"/>
+        <activity android:name="jp.agentec.abook.abv.ui.home.activity.ChatWebviewActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:resizeableActivity="true"
+            android:supportsPictureInPicture="true"/>
    </application>
 </manifest>
\ No newline at end of file
--- a/ABVJE_Launcher_Android/build.gradle
+++ b/ABVJE_Launcher_Android/build.gradle
@@ -89,7 +89,7 @@ android {
            armv7 {
                versionCode defaultConfig.versionCode
                ndk {
-                    abiFilters "armeabi-v7a", ""
+                    abiFilters "armeabi-v7a", "x86", ""
                }
            }
@@ -124,7 +124,7 @@ android {
            armv7 {
                versionCode defaultConfig.versionCode
                ndk {
-                    abiFilters "armeabi-v7a", ""
+                    abiFilters "armeabi-v7a", "x86", ""
                }
            }
            armv8 {

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
 package jp.agentec.abook.abv.ui.home.activity;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DownloadManager;
+import android.app.PictureInPictureParams;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -54,6 +56,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Stack;
 import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
 import jp.agentec.abook.abv.bl.acms.client.json.ArchiveDetailJSON;
@@ -79,12 +82,15 @@ import jp.agentec.abook.abv.bl.dto.ArchiveDto;
 import jp.agentec.abook.abv.bl.dto.ChatGroupDto;
 import jp.agentec.abook.abv.bl.dto.ChatMessageDto;
 import jp.agentec.abook.abv.bl.dto.ChatRoomDto;
+import jp.agentec.abook.abv.bl.dto.MeetingDto;
 import jp.agentec.abook.abv.bl.dto.PushMessageDto;
 import jp.agentec.abook.abv.bl.dto.ShopMemberDto;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
 import jp.agentec.abook.abv.bl.logic.CommunicationLogic;
+import jp.agentec.abook.abv.bl.websocket.MeetingManager;
 import jp.agentec.abook.abv.cl.util.PreferenceUtil;
 import jp.agentec.abook.abv.launcher.android.R;
+import jp.agentec.abook.abv.ui.common.activity.ABVAuthenticatedActivity;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
 import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
 import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
@@ -136,7 +142,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
    private String beforeRoomType;
    private Integer shopMemberId;
    private String selectedUserIdList;
+    private String mSkey;
    // 0:協業生成, 1:協業参加
    private Integer collaborationJoinFlg = 0;
@@ -1354,6 +1360,36 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
        public String getUserListByLoginId(String loginIdList) {
            return communicationLogic.getUserListByLoginId(loginIdList);
        }
+        @JavascriptInterface
+        public void startContentView() {
+            Integer meetingId;
+            Intent intent = new Intent();
+            Activity test = ActivityHandlingHelper.getInstance().getPreviousOfSettingActivity();
+            intent.putExtra("Comm", true);
+            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            Stack<ABVAuthenticatedActivity> activityStack = ActivityHandlingHelper.getInstance().getCurrentActivityStack();
+            Activity testb = activityStack.get(activityStack.size()-2);
+            intent.setClass(testb, OperationRelatedContentActivity.class);
+            try {
+                connectMeetingServer();
+                List<MeetingDto> meetingList= meetingManager.getMeetingList(mSkey);
+                for (MeetingDto meeting : meetingList) {
+                    if (meeting.title.equals("Comm_"+"testMK") && 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());
+            startActivity(intent, NaviConsts.Left);
+            //ActivityHandlingHelper.getInstance().checkContentActivity(Long.valueOf(3114), 0, intent);
+        }
    }
    /**
@@ -1368,6 +1404,11 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
        startActivity(intent, NaviConsts.Left);
    }
+    public void connectMeetingServer() throws Exception {
+        meetingManager = MeetingManager.getInstance();
+        mSkey = meetingManager.getSessionKey(true);
+    }
    private void updateMyInfoFromServer() throws NetworkDisconnectedException, AcmsException {
        MyInfoJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getMyInfo(sid);
        if (resultJson.shopMemberDto != null) {

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
@@ -66,6 +66,8 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        boolean commFlg = intent.getBooleanExtra("Comm",false);
        setContentView(R.layout.ac_operation_related_content);
        // ホームボタン（作業一覧へ遷移ボタン）

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
@@ -30,12 +30,10 @@ import java.util.Stack;
 import jp.agentec.abook.abv.bl.acms.client.json.DownloadedContentInfoJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON;
-import jp.agentec.abook.abv.bl.acms.type.DeliveryType;
 import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType;
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
-import jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException;
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.common.util.ContentFileUtil;
 import jp.agentec.abook.abv.bl.common.util.JsonUtil;
@@ -69,7 +67,6 @@ import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.DefPrefKey;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.UserPrefKey;
 import jp.agentec.abook.abv.ui.common.appinfo.AppNaviType;
-import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
 import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
 import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
 import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
@@ -81,7 +78,6 @@ import jp.agentec.abook.abv.ui.home.activity.OperationRelatedContentActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.AudioPlayActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.CheckOZDViewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.ContentViewActivity;
-import jp.agentec.abook.abv.ui.viewer.activity.DeviceImageListActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.EnqueteWebViewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.HTMLWebViewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity;
@@ -90,7 +86,6 @@ import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.PreviewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.VideoViewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaActivity;
-import jp.agentec.abook.abv.ui.viewer.view.OperationTaskLayout;
 import jp.agentec.adf.net.http.HttpDownloadSimpleNotification;
 import jp.agentec.adf.util.CollectionUtil;
 import jp.agentec.adf.util.DateTimeFormat;
@@ -842,6 +837,10 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
        }
    }
+    public Stack<ABVAuthenticatedActivity> getCurrentActivityStack() {
+        return currentActivityStack;
+    }
    public void setRequireHomeReload(boolean requireHomeReload) {
        this.requireHomeReload = requireHomeReload;
    }