ABCOMM-93-協業転換実装中

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java

@@ -129,6 +129,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
     private final String VOICE_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_voice.html";
     private final String VOICE_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_voice.html";
     private final String DOCUMENT_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_documents.html";
     private final String DOCUMENT_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_documents.html";
     private final String WHITE_BOARD_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_whiteboard.html";
     private final String WHITE_BOARD_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_whiteboard.html";
+    private final String COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration.html";
 
 
     private final String DEFAULT_CHECKSUM = "0000000000";
     private final String DEFAULT_CHECKSUM = "0000000000";
     //AISDevelop
     //AISDevelop
@@ -150,6 +151,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
     private String selectedUserIdList;
     private String selectedUserIdList;
     private String mSkey;
     private String mSkey;
     private Integer joinMeetingId;
     private Integer joinMeetingId;
+
     // 0:協業生成, 1:協業参加
     // 0:協業生成, 1:協業参加
     private Integer collaborationJoinFlg = 0;
     private Integer collaborationJoinFlg = 0;
     private MeetingManager meetingManager = MeetingManager.getInstance();
     private MeetingManager meetingManager = MeetingManager.getInstance();
@@ -162,7 +164,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
     private BroadcastReceiver receiver;
     private BroadcastReceiver receiver;
 
 
     private CommunicationLogic communicationLogic = AbstractLogic.getLogic(CommunicationLogic.class);
     private CommunicationLogic communicationLogic = AbstractLogic.getLogic(CommunicationLogic.class);
-
+    private int mCollaborationType;
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
@@ -1447,6 +1449,16 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         public void exitMeetingRoom() {
         public void exitMeetingRoom() {
             exitAndDeleteMeetingRoom();
             exitAndDeleteMeetingRoom();
         }
         }
+
+        @JavascriptInterface
+        public int getJoinCollaborationType() {
+            return mCollaborationType;
+        }
+
+        @JavascriptInterface
+        public void setJoinCollaborationType(int collaborationType) {
+            mCollaborationType = collaborationType;
+        }
     }
     }
 
 
     /**
     /**
@@ -1547,50 +1559,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
 
 
     }
     }
     private void moveCollaborationScreen(Integer collaborationType) {
     private void moveCollaborationScreen(Integer collaborationType) {
-        switch (collaborationType) {
-            case 0:
-                mChatWebView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mChatWebView.loadUrl(VOICE_COLLABORATION_PAGE_URL);
-                    }
-                });
-                break;
-            case 2:
+        mCollaborationType = collaborationType;
         mChatWebView.post(new Runnable() {
         mChatWebView.post(new Runnable() {
             @Override
             @Override
             public void run() {
             public void run() {
-                        mChatWebView.loadUrl(PICTURE_COLLABORATION_PAGE_URL);
+                mChatWebView.loadUrl(COLLABORATION_PAGE_URL);
             }
             }
         });
         });
-                break;
-            case 3:
-                mChatWebView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mChatWebView.loadUrl(VIDEO_COLLABORATION_PAGE_URL);
-                    }
-                });
-                break;
-            case 4:
-                mChatWebView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mChatWebView.loadUrl(DOCUMENT_COLLABORATION_PAGE_URL);
-                    }
-                });
-                break;
-            case 5:
-                mChatWebView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mChatWebView.loadUrl(WHITE_BOARD_COLLABORATION_PAGE_URL);
-                    }
-                });
-                break;
-            default:
-                break;
-        }
     }
     }
 
 
     private boolean deleteFavoriteGroup(String groupId) throws NetworkDisconnectedException, AcmsException {
     private boolean deleteFavoriteGroup(String groupId) throws NetworkDisconnectedException, AcmsException {