Lee Munkyeong · @lee-mk · Kim Peace · Lee Munkyeong · Kim Peace · Lee Munkyeong
--- a/public/js/chat-websocket.js
+++ b/public/js/chat-websocket.js
 var socket;
-connectSocket(IS_ONLINE);

-function connectSocket(isOnline) {
-    if (isOnline == 'true') {
+function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
+      CHAT_SERVER_URL = chatServerUrl;
--- a/public/js/chat-websocket.js
+++ b/public/js/chat-websocket.js
+function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
+      CHAT_SERVER_URL = chatServerUrl;
+      CMS_SERVER_URL = cmsServerUrl;
+      PLATFORM = platform;
+      IS_MOBILE = isMobile;
+      IS_ONLINE = isOnline;
+      connectSocket();
+    };
+
+android.getGlobalParameter();
+
+function connectSocket() {
+    CHAT_UI.dismissLoadingIndicator();
+    if (IS_ONLINE == 'true') {
        socket = io(CHAT_SERVER_URL);
+        console.log('insOnline');
--- a/public/js/chat-websocket.js
+++ b/public/js/chat-websocket.js
+
+android.getGlobalParameter();
+
+function connectSocket() {
+    CHAT_UI.dismissLoadingIndicator();
+    if (IS_ONLINE == 'true') {
        socket = io(CHAT_SERVER_URL);
+        console.log('insOnline');
        setSocketAction();
        android.updateRoomList();
-        CHAT_UI.refreshRoomList();
+        CHAT_UI.refreshRoomList("1");
        CHAT_UI.dismissLoadingIndicator();
        $('#createChatRoom').show();
    } else {
+        console.log('insOffline');
--- a/public/js/chat.js
+++ b/public/js/chat.js
 CHAT.leaveRoom = function() {
    socket.emit('leaveRoom', function() {
    });
+}
+
+CHAT.requestMyinfo = function() {
+    jQuery.ajax({
+            async: true,
+            url:    CMS_SERVER_URL+"/chatapi/user?sid="+CHAT.globalLoginParameter.sid+"&cmd="+userAPICmd.MYINFO,
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
 		// 検索結果が有る場合、結果を表示する
 		socket.emit('roomSearch', encodeURIComponent($('#room-search').val()));
 	} else {
-		socket.emit('getRoomList');
+        if (IS_ONLINE == 'true') {
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
 			$('#newRoomName').val('');
 			$('#userSelectionLength').text('');
 			CHAT.globalSelectedUserList = [];
-
+            $('#bottomNav').hide();
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
 			$('#newRoomName').val('');
 			$('#userSelectionLength').text('');
 			CHAT.globalSelectedUserList = [];
-
+            $('#bottomNav').hide();
 			$('#backButton').off().on('click', function() {
 				//loadingIndicatorを表示
 				CHAT_UI.showLoadingIndicator();
-				socket.emit('leaveRoom', function() {
-					CHAT.saveRoomInfo();
-					socket.emit('getRoomList');
-				});
+				CHAT.saveRoomInfo();
+				if (IS_ONLINE == 'true') {
+				    socket.emit('leaveRoom', function() {
+                        android.updateRoomList();
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
 			$('#room-search').val('');
 			// set Title
 			let roomListTitle = getLocalizedString("roomListTitle")
-
+            $('#bottomNav').show();
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
 			//loadingIndicatorを表示しない
 			CHAT_UI.dismissLoadingIndicator();
 			$('#homeButton').hide();
+			$('#bottomNav').hide();
 			$('.user_people').css("paddingLeft", "0px");
 			break;
 		case '#pills-communication':	// コミュニケーションのタブ
 		case '#pills-setting':	// 設定のタブ
 		case '#pills-profile':	// ユーザプロファイルのタブ
+		    $('#bottomNav').hide();
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
+            	//TODO need onClick Action
+            	console.log('groupClick');
+            });
+
+            $('#favorite_list').append(obj);
+     })
+
+     var favoriteUserList = CHAT_DB.getFavoriteUsers();
+     favoriteUserList.forEach(function(favoriteUser) {
+        let html = Mustache.render(groupTemplate, {
+            	id: favoriteUser.shopMemberId,
+            	profileImage: favoriteUser.profileImagePath,
+            	name: favoriteUser.shopMemberName
+            });
+
+            let obj = $(jQuery.parseHTML(html)).on('click',function(){
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
    // loadingIndicatorを表示しない
    CHAT_UI.dismissLoadingIndicator();
 };
+
+CHAT_UI.joinRoom = function(roomId,roomName) {
+    console.log(roomId);
+    if (IS_ONLINE == 'true') {
+        android.updateMessages(roomId);
+        socket.emit('joinRoom', roomId, roomName, function() {
+        });
+    } else {
--- a/public/js/libs/collapsible.js 0 → 100644
+++ b/public/js/libs/collapsible.js 0 → 100644
+var coll = document.getElementsByClassName("collapsible");
+var i;
+
+for (i = 0; i < coll.length; i++) {
+  coll[i].addEventListener("click", function() {
+    this.classList.toggle("collapsible-active");
--- a/public/js/libs/collapsible.js 0 → 100644
+++ b/public/js/libs/collapsible.js 0 → 100644
+var coll = document.getElementsByClassName("collapsible");
+var i;
+
+for (i = 0; i < coll.length; i++) {
+    coll[i].addEventListener("click", function() {
+        this.classList.toggle("collapsible-active");
+        var content = this.nextElementSibling;
+        if (content.style.display === "block") {
+        content.style.display = "none";
--- a/public/index.html
+++ b/public/index.html
  </div>

  <div class="tab-content" id="pills-tabContent">
+
    <div class="tab-pane fade show active" id="pills-chatlist" role="tabpanel" aria-labelledby="pills-chatlist-tab">
      <div class="search-group">
        <div class="input-group search-bar-fixed">
          <input style="font-family:Arial, FontAwesome !important;" id="room-search" type="text" class="write_msg form-control" name="message" placeholder="&#xF002;" autocomplete="off">
        </div>
      </div>
+      <div class="text-center">
+        <button type="button"  class="btn btn-primary chat-list-type-btn" id="dmBtn">Ok</button>
--- a/public/js/chat-ui.js
+++ b/public/js/chat-ui.js
+        });
+        // TODO 次のコミットに参考事項
+        // チャットルーム開設画面で参加ユーザー削除用チェックロジックが残っているので
+        // 影響テスト後、削除予定。 kang-dh
+        let obj = $(jQuery.parseHTML(html)).on('click',function(){
+            $(this).find('.userCheckBox').toggleClass('active');
+        });
+
+        $('#select_user_list').append(obj);
+    });
+
+    let roomListTitle = getLocalizedString("createRoomTitle")
+    $('.titleRoomName').text(roomListTitle)
+
+    // Rotate
+    if(CHAT_UI.isLandscapeMode()){
--- a/public/js/chat.js
+++ b/public/js/chat.js
 CHAT.leaveRoom = function() {
    socket.emit('leaveRoom', function() {
    });
+}
+
+CHAT.requestMyinfo = function() {
+    jQuery.ajax({
+            async: true,
+            url: CMS_SERVER_URL + "/chatapi/user?sid=" + CHAT.globalLoginParameter.sid + "&cmd=" + userAPICmd.MYINFO,
+            type: "get",
+            processData: false,
+            contentType: false
+        }).done(function(res) {
--- a/public/index.html
+++ b/public/index.html
    </li>
  </ul>
 </div>
+<nav class="navbar navbar-expand navbar-dark fixed-bottom flex-md-nowrap p-2 bg-footer talign-center border footer-nav" id="bottomNav">
+  <div class="col-4">
--- a/public/js/chat-websocket.js
+++ b/public/js/chat-websocket.js
-    if (isOnline == 'true') {
+function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
+    CHAT_SERVER_URL = chatServerUrl;
+    CMS_SERVER_URL = cmsServerUrl;
+    PLATFORM = platform;
+    IS_MOBILE = isMobile;
+    IS_ONLINE = isOnline;
+    connectSocket();
+};
+
+android.getGlobalParameter();
+
+function connectSocket() {
+    CHAT_UI.dismissLoadingIndicator();
+    if (IS_ONLINE == 'true') {
+        console.log('isOnline');