ネームカード修正

public/index.html

@@ -434,13 +434,18 @@
   <div class="text-center">
   <div class="text-center">
     <button type="button" class="btn btn-primary" id="nameCardChatBtn" onclick="CHAT_UI.startChat('{{loginId}}','{{name}}');">{{chat}}</button>
     <button type="button" class="btn btn-primary" id="nameCardChatBtn" onclick="CHAT_UI.startChat('{{loginId}}','{{name}}');">{{chat}}</button>
     <button type="button" class="btn btn-primary" id="nameCardVoiceBtn" onclick="CHAT_UI.startVoice();">{{voice}}</button>
     <button type="button" class="btn btn-primary" id="nameCardVoiceBtn" onclick="CHAT_UI.startVoice();">{{voice}}</button>
-    <button type="button" class="btn btn-primary" id="nameCardFavoriteBtn" onclick="CHAT_UI.changeFavorite();">{{favorite}}</button>
+    {{#isFavorite}}
+    <button type="button" class="btn btn-primary" onclick="CHAT_UI.changeFavorite();">{{favorite}}</button>
+    {{/isFavorite}}
+    {{^isFavotire}}
+    <button type="button" class="btn btn-primary" onclick="CHAT_UI.changeFavorite();">{{favorite}}</button>
+    {{/isFavorite}}
   </div>
   </div>
 </script>
 </script>
 <script id="message-template" type="text/template">
 <script id="message-template" type="text/template">
   <div class="incoming_msg">
   <div class="incoming_msg">
     <div class="incoming_msg_img">
     <div class="incoming_msg_img">
-      <img src={{{profileImage}}} alt="">
+      <img src={{{profileImage}}} alt="" onclick="CHAT_UI.makeNameCard({{shopMemberId}});" >
     </div>
     </div>
     <div class="received_msg">
     <div class="received_msg">
       <div class="received_withd_msg">
       <div class="received_withd_msg">

public/js/chat-db.js

@@ -68,4 +68,13 @@ CHAT_DB.getGroupInfo = function(groupId) {
         //String形式をJsonに変更してReturn
         //String形式をJsonに変更してReturn
     	return JSON.parse(android.getGroupInfo(groupId));
     	return JSON.parse(android.getGroupInfo(groupId));
     }
     }
+};
+
+CHAT_DB.getNameCardData = function(shopMemberId) {
+    if (CHAT_UTIL.isIOS()) {
+        //TODO IOS処理追加必要
+    } else if (CHAT_UTIL.isAndroid()) {
+        //String形式をJsonに変更してReturn
+    	return JSON.parse(android.getNameCardData(shopMemberId));
+    }
 };
 };
\ No newline at end of file

public/js/chat-ui.js

@@ -975,25 +975,7 @@ CHAT_UI.refreshContactScreen = function() {
         });
         });
 
 
         let obj = $(jQuery.parseHTML(html)).on('click', function(){
         let obj = $(jQuery.parseHTML(html)).on('click', function(){
-//            if (IS_ONLINE == 'true') {
-//                android.updateUserInfo(groupUser.shopMemberId);
-//            }
-            console.log('click');
-            let namecardHtml = Mustache.render(userNamecardTemplate, {
-                    loginId: groupUser.shopMemberId,
-                    profileImage: groupUser.profileImagePath,
-                    name: groupUser.shopMemberName,
-                    groupPathList: groupUser.groupPathList,
-                    chat: getLocalizedString("chat"),
-                    voice: getLocalizedString("voice"),
-                    favorite: getLocalizedString("addFavorite")
-            });
-            console.log(namecardHtml);
-            let namecardObj = $(jQuery.parseHTML(namecardHtml)).on('click', function(){
-            });
-            $('#userNamecard').html(namecardObj);
-            CHAT_UI.showNamecard('userNamecard');
-
+            CHAT_UI.makeNameCard(groupUser.shopMemberId);
         });
         });
 
 
         $('#my_group_list').append(obj);
         $('#my_group_list').append(obj);
@@ -1165,6 +1147,7 @@ CHAT_UI.loadMessages = function(messages, roomId, roomName) {
              let html = Mustache.render(template, {
              let html = Mustache.render(template, {
                  text: message.message,
                  text: message.message,
                  from: message.loginId,
                  from: message.loginId,
+                 shopMemberId: message.shopMemberId,
                  profileImage: message.profileImagePath,
                  profileImage: message.profileImagePath,
                  createdAtDay: messageTime.createdAtDay,
                  createdAtDay: messageTime.createdAtDay,
                  createdAtTime: messageTime.createdAtTime
                  createdAtTime: messageTime.createdAtTime
@@ -1237,7 +1220,7 @@ $('#allGroupBtn').on('click', function (e){
 });
 });
 
 
 CHAT_UI.refesshAllGroupSearch = function(groupId) {
 CHAT_UI.refesshAllGroupSearch = function(groupId) {
-
+    const userNamecardTemplate = $('#namecard-template').html();
     if (IS_ONLINE == 'true') {
     if (IS_ONLINE == 'true') {
         android.updateGroupInfo(groupId);
         android.updateGroupInfo(groupId);
     }
     }
@@ -1304,11 +1287,7 @@ CHAT_UI.refesshAllGroupSearch = function(groupId) {
             });
             });
 
 
             let obj = $(jQuery.parseHTML(html)).on('click', function(){
             let obj = $(jQuery.parseHTML(html)).on('click', function(){
-                //TODO need onClick Action
-                if (IS_ONLINE == 'true') {
-                    android.updateUserInfo(groupUser.shopMemberId);
-                }
-
+                CHAT_UI.makeNameCard(groupUser.shopMemberId);
             });
             });
 
 
             $('#userInGroupList').append(obj);
             $('#userInGroupList').append(obj);
@@ -1339,3 +1318,40 @@ CHAT_UI.changeFavorite = function () {
     console.log("FavoriteClick");
     console.log("FavoriteClick");
 };
 };
 
 
+CHAT_UI.removeFavoriteUser = function (shopMemberId) {
+    //add Android Chat click
+    console.log("removeFU");
+};
+
+CHAT_UI.insertFavoriteUser = function (shopMemberId) {
+    //add Android Chat click
+    console.log("insertFU");
+};
+
+CHAT_UI.changeFavorite = function () {
+    //add Android Chat click
+    console.log("FavoriteClick");
+};
+
+CHAT_UI.makeNameCard = function (shopMemberId) {
+    console.log('makeNameCard Click');
+    var nameCardInfo = CHAT_DB.getNameCardData(shopMemberId);
+    console.log(nameCardInfo);
+
+    const userNamecardTemplate = $('#namecard-template').html();
+    let namecardHtml = Mustache.render(userNamecardTemplate, {
+        loginId: nameCardInfo.shopMemberId,
+        profileImage: nameCardInfo.profileImagePath,
+        name: nameCardInfo.shopMemberName,
+        groupPathList: nameCardInfo.groupPathList,
+        chat: getLocalizedString("chat"),
+        voice: getLocalizedString("voice"),
+        favorite: getLocalizedString("addFavorite")
+    });
+
+    let namecardObj = $(jQuery.parseHTML(namecardHtml)).on('click', function(){
+    });
+
+    $('#userNamecard').html(namecardObj);
+    CHAT_UI.showNamecard('userNamecard');
+};
\ No newline at end of file