Merge branch 'release_sp3' into 'feature/abcomm_sp3_archive'

# Conflicts:
#   public_new/archive_detail.html

public_new/archive.html

@@ -18,7 +18,7 @@
 
   <script>
     window.addEventListener('DOMContentLoaded', function() {
-      CHAT_DB.getArchiveList();
+      CHAT_UI.refreshArchiveScreen();
     });
   </script>
 </head>

public_new/chat.html

@@ -53,7 +53,7 @@
     </div>
     <!-- タブ -->
     <div class="content tabs">
-      <input id="tabGroup" type="radio" name="tab_item" checked>
+      <input id="tabGroup" type="radio" name="tab_item">
       <label class="tab_item" for="tabGroup">グループ</label>
       <input id="tabDM" type="radio" name="tab_item">
       <label class="tab_item" for="tabDM">DM</label>

public_new/chat_add_user.html

@@ -24,13 +24,13 @@
     <div class="col-4 pr-0">
       <div class="nav-item">
         <div class="nav_prev">
-          <a href="chat_room.html"><span>ルーム</span></a>
+          <a href="chat_room.html"><span style="font-size: 13px;">ルーム</span></a>
         </div>
       </div>
     </div>
     <div class="col-4 p-0">
       <div class="nav-item p-0">
-        <h1 class="nav-ttl" id="title" style="font-size: 13px;">ユーザ招待</h1>
+        <h1 class="nav-ttl" id="addUserTitle">ユーザー招待</h1>
       </div>
     </div>
     <div class="col-4 pl-0">
@@ -113,7 +113,7 @@
       </div>
     </div>
     <div class="chat_make_room">
-      <ul class="overlay_src_msg">
+      <ul class="overlay_src_msg" style="padding-inline-start: 20px;">
       </ul>
     </div>
     <!-- ルーム解説ボタン -->

public_new/chat_make_room.html

@@ -24,13 +24,13 @@
       <div class="col-4 pr-0">
         <div class="nav-item">
           <div class="nav_prev">
-            <a href="chat.html"><span>チャット</span></a>
+            <a href="chat.html"><span style="font-size: 13px;">チャット</span></a>
           </div>
         </div>
       </div>
       <div class="col-4 p-0">
         <div class="nav-item p-0">
-          <h1 class="nav-ttl" id="title" style="font-size: 13px;">ルーム開設</h1>
+          <h1 class="nav-ttl" id="makeRoomTitle">ルーム開設</h1>
         </div>
       </div>
       <div class="col-4 pl-0">

public_new/chat_room.html

@@ -178,9 +178,11 @@
     $("#pictureModal").load("./modal_chat_picture.html");
     $("#chatMenuModal").load("./modal_chat_menu.html");
     $("#loadingArea").load("./loading.html");
+
     if (typeof(android) != "undefined") {
       android.getLoginParameter();
       android.getGlobalParameter();
+      android.saveSelectedUserList("");
     } else {
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});

public_new/css/common.css

@@ -6,7 +6,7 @@ body {
   font-family: "Noto Sans JP", sans-serif;
   margin: 0 auto;
   color: #323743;
-  margin-bottom: 60px;
+  margin-bottom: 70px;
   overflow-x: hidden;
 }
 a:hover {

public_new/js/chat-add-user.js

 $(function() {
   // メンバー検索
+  $('#chat_add_user .search_form input[type="search"]').click(function(e){
+  //画面タイトル設定
+      let contactListTitle = getLocalizedString("userSearch");
+      $('#addUserTitle').text(contactListTitle);
+  })
 
   $('#chat_add_user .search_form input[type="search"]').keyup(function(e){
     if (e.key == "Enter" || e.KeyCode == 13) {

public_new/js/chat-ui.js

@@ -1014,8 +1014,17 @@ CHAT_UI.refreshContactScreen = function() {
 }
 
 CHAT_UI.refreshRoomList = function(roomType) {
+    var beforeRoomType;
+    if (typeof(android) != "undefined") {
+        beforeRoomType = android.getBeforeRoomType();
+    }
+    if (beforeRoomType != null) {
+        roomType = beforeRoomType;
+        if (typeof(android) != "undefined") {
+            android.clearBeforeRoomType();
+        }
+    }
     CHAT_UI.showLoadingIndicator();
-    console.log('START');
     if (roomType == chatRoomType.DM) {
         $('#tabDM').prop('checked', true);
     } else {
@@ -1231,6 +1240,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
              profileImage: message.profileUrl,
              createdAtDay: messageTime.createdAtDay,
              createdAtTime: messageTime.createdAtTime,
+             unreadCount: message.unreadCount,
              isToday: isToday
          });
          html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html;
@@ -1390,7 +1400,7 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
         if (typeof(android) != "undefined") {
             android.updateGroupInfo(groupId);
         } else {
-            webkit.messageHandlers.updateGroupInfo.postMessage({groupId});
+            webkit.messageHandlers.updateGroupInfo.postMessage(groupId);
         }
     }
 
@@ -1898,15 +1908,13 @@ CHAT_UI.checkForMakeChat = function(checkMemberId) {
         CHAT.globalSelectedUserList = CHAT.globalSelectedUserList.filter(function(shopMemberId) {
             return checkMemberId != shopMemberId;
         });
+        $('.checkbox' + checkMemberId).prop("checked", false).trigger("change");
     } else {
         // add
         CHAT.globalSelectedUserList.push(checkMemberId);
+        $('.checkbox' + checkMemberId).prop("checked", true).trigger("change");
     }
-    if($('.checkbox' + checkMemberId).prop('checked')){
-        $('.checkbox' + checkMemberId).removeAttr('checked');
-    }else{
-      $('.checkbox' + checkMemberId).attr('checked', true);
-    }
+
     let cnt = CHAT.globalSelectedUserList.length;
     if (CHAT.globalSelectedUserList.length > 0) {
         $('.select_member_num').text(cnt);

public_new/js/chat.js

@@ -336,14 +336,14 @@ $(function() {
         $('#chatTitle').text(roomListTitle);
     });
 
-    $('#chat_add_user .search_form .cancel').click(function(){
-        CHAT.globalSelectedUserList.forEach(function(userId) {
-            if ($('.checkbox' + userId).prop('checked')) {
-              $('.checkbox' + checkMemberId).attr('checked', true);
-            } else {
-              $('.checkbox' + checkMemberId).removeAttr('checked');
-            }
+    $('#chat_add_user .search_form .cancel').click(function() {
+        let roomListTitle = getLocalizedString("inviteUsersSubtitle");
+        $('#addUserTitle').text(roomListTitle);
     });
+
+    $('#chatMakeRoom .search_form .cancel').click(function() {
+        let roomListTitle = getLocalizedString("createRoomTitle");
+        $('#makeRoomTitle').text(roomListTitle);
     });
 
     // チャットメンバー検索

public_new/js/chatMakeRoom.js

 $(function() {
   // メンバー検索
 
+  $('#chatMakeRoom .search_form input[type="search"]').click(function(e) {
+    let contactListTitle = getLocalizedString("userSearch");
+    $('#makeRoomTitle').text(contactListTitle);
+  });
+
   $('#chatMakeRoom .search_form input[type="search"]').keyup(function(e) {
+  　//画面タイトル設定
     var keyword = $('#chatMakeRoom .search_form input[type="search"]').val();
     if (e.KeyCode == 13 || e.key == "Enter") {
         if (keyword != '' && keyword.length != 0) {

public_new/js/constant.js

@@ -37,3 +37,4 @@ const nameCardAreaId = {
 }
 
 const messageSeperator = "<::split>";
+const dataMessageScheme = "::NOT_MESSAGE";

public_new/js/language_ja.js

@@ -10,7 +10,7 @@ $.lang.ja = {
     "inviteUsersTitle":"メンバー追加",
     "createRoomTitle":"ルーム開設",
     "createRoomSubtitle":"ルーム名",
-    "inviteUsersSubtitle":"ユーザ招待",
+    "inviteUsersSubtitle":"ユーザー招待",
     "roomListEmptyString":"入場できるルームがありません。",
     "left":"%@ 様が退場しました。",
     "join":"%@ 様が入場しました。",

public_new/template/template_make_room_group_user_list.html

-<div class="category"><div class="category_name"><span>{{groupName}}</span></div></div>
+<div class="category" onclick="CHAT_UI.toggleCategory(this);"><div class="category_name"><span>{{groupName}}</span></div></div>
 <ul class="p-0 chat_make_room_list">
     {{#groupUserList}}
     <li class="d-flex align-items-center">
-        <div class="chat_item d-flex flex-row align-items-center w-100">
+        <div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" >
             <div class="chat_item_l_chk">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
+                        <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
                         <span class="checkbox-parts"></span>
                     </label>
                 </div>

public_new/template/template_make_room_user_list.html

 <ul class="p-0 chat_make_room_list">
     {{#userList}}
     <li class="d-flex align-items-center">
-        <div class="chat_item d-flex flex-row align-items-center w-100">
+        <div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});">
             <div class="chat_item_l_chk">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="checkbox{{shopMemberId}}"  name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
+                        <input type="checkbox" id="checkbox{{shopMemberId}}"  name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
                         <span class="checkbox-parts"></span>
                     </label>
                 </div>

public_new/template/template_my_message.html

@@ -6,5 +6,7 @@
   {{^isToday}}
   <div class="date d-flex flex-column"><span>{{createdAtDay}}</span><span>{{createdAtTime}}</span></div>
   {{/isToday}}
-  <div class="read d-flex align-items-end"><span></span></div>
+  {{#unreadCount}}
+  <div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div>
+  {{/unreadCount}}
 </div>
\ No newline at end of file

public_new/template/template_user_message.html

@@ -14,5 +14,7 @@
   {{^isToday}}
   <div class="date d-flex flex-column"><span>{{createdAtDay}}</span><span>{{createdAtTime}}</span></div>
   {{/isToday}}
-  <div class="read d-flex align-items-end"><span></span></div>
+  {{#unreadCount}}
+  <div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div>
+  {{/unreadCount}}
 </div>
\ No newline at end of file