UI適用

public_new/css/chat.css

@@ -37,6 +37,11 @@ input[name="tab_item"] {
   display: block;
 }
 
+#tabMyGroup:checked ~ #tab1_content,
+#tabAllGroup:checked ~ #tab2_content{
+  display: block;
+}
+
 .tabs input:checked + .tab_item {
   background-color: #0070CA;
   color: #fff;

public_new/js/chat-db.js

@@ -56,6 +56,7 @@ CHAT_DB.getMyGroupUsers = function() {
         //TODO IOS処理追加必要
     } else if (CHAT_UTIL.isAndroid()) {
         //String形式をJsonに変更してReturn
+        console.log(JSON.parse(android.getMyGroupUsers()));
     	return JSON.parse(android.getMyGroupUsers());
     }
 };

public_new/js/chat.js

@@ -29,7 +29,7 @@ CHAT.getProfileImgUrl = function(path) {
         return ASSET_PATH + 'img/noImage.png';
     } else {
         var userInfo = path.split("/").reverse();
-        return CMS_SERVER_URL + '/file/getProfileImage?profileFileName=' + userInfo[0] + '&profileGetLoginId=' + userInfo[1];
+        return CMS_SERVER_URL + '/chatapi/user?profileFileName=' + userInfo[0] + '&profileGetLoginId=' + userInfo[1] + '&sid=' + CHAT.globalLoginParameter.sid + '&cmd=12';
     }
 }
 

public_new/template/template_group_list.html

+<li class="d-flex align-items-center">
+  <a href="chat_room.html" class="w-100">
+    <div class="chat_item d-flex flex-row align-items-center">
+      <div class="chat_item_l">
+        <div class="thubnail">
+          <img src="icon/icon_folder.png" alt="フォルダ" />
+        </div>
+      </div>
+      <div class="chat_item_m px-0">
+        <div class="d-flex flex-column">
+          <div class="chat_item_t">
+            <span class="chat_item_ttl">{{name}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a>
+  <div class="chat_item_r">
+    <div class="d-flex flex-column">
+      <span class="star disable"></span>
+    </div>
+  </div>
+</li>
\ No newline at end of file

public_new/template/template_group_user_list.html

+<div class="category"><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">
+    <a href="#" onclick="CHAT_UI.makeNameCard({{shopMemberId}})" style="width: 100%;">
+      <div class="chat_item d-flex flex-row align-items-center">
+        <div class="chat_item_l">
+          <div class="thubnail">
+            <div class="img_wrap"><img src="{{profileImagePath}}" onError="this.src='./img/noImage.png'"/></div>
+          </div>
+        </div>
+        <div class="chat_item_m px-0">
+          <div class="d-flex flex-column">
+            <div class="chat_item_t">
+              <span class="chat_item_ttl">{{shopMemberName}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a>
+    <div class="chat_item_r">
+      <div class="d-flex flex-column">
+        {{#isFavorite}}
+        <span class="star active"></span>
+        {{/isFavorite}}
+        {{^isFavorite}}
+        <span class="star disable"></span>
+        {{/isFavorite}}
+      </div>
+    </div>
+  </li>
+  {{/groupUserList}}
+</ul>
\ No newline at end of file

public_new/template/template_my_name_card.html

@@ -3,8 +3,7 @@
     <div class="modal-content">
       <div class="modal-header border-0">
         <div class="prifile_desc d-flex flex-row">
-          <img src="{{profileImage}}" alt="プロフィール画像">
-          <!--<div class="namedard-img-upload" >Upload</div>-->
+          <img src="{{profileImage}}" onError="this.src='./img/noImage.png'">
           <div class="prifile_name"><span>{{name}}</span></div>
         </div>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">

public_new/template/template_user_list.html

 <ul class="p-0 chat_make_room_list">
   <li class="d-flex align-items-center">
-    <a href="#" data-toggle="modal" data-target="#userNameCard" class="w-100">
+    <a href="#" onclick="CHAT_UI.makeNameCard({{shopMemberId}})" style="width: 100%;">
       <div class="chat_item d-flex flex-row align-items-center">
         <div class="chat_item_l">
           <div class="thubnail">
-            <div class="img_wrap"><img src="{{profileImage}}" alt="サムネイル画像" /></div>
+            <div class="img_wrap"><img src="{{profileImage}}" onError="this.src='./img/noImage.png'" /></div>
           </div>
         </div>
         <div class="chat_item_m px-0">
@@ -18,7 +18,12 @@
     </a>
     <div class="chat_item_r">
       <div class="d-flex flex-column">
+        {{#isFavorite}}
+        <span class="star active"></span>
+        {{/isFavorite}}
+        {{^isFavorite}}
         <span class="star disable"></span>
+        {{/isFavorite}}
       </div>
     </div>
   </li>

public_new/template/template_user_name_card.html

@@ -3,7 +3,7 @@
     <div class="modal-content">
       <div class="modal-header border-0">
         <div class="prifile_desc d-flex flex-row">
-          <img src="{{profileImage}}" alt="プロフィール画像">
+          <img src="{{profileImage}}" onError="this.src='./img/noImage.png'"/>
           <div class="prifile_name"><span>{{name}}</span></div>
         </div>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -17,7 +17,7 @@
       </div>
       <div class="modal-footer border-0 justify-content-center">
         {{#isFavorite}}
-        <button type="button" class="border-0 bg_navy">
+        <button type="button" class="border-0 bg_navy" onclick="CHAT_UI.removeFavoriteUser({{shopMemberId}})">
           <div class="d-flex flex-column">
             <div class="img_wrap">
               <img src="icon/icon_profile_favorite.png" alt="お気に入り">
@@ -26,8 +26,8 @@
           </div>
         </button>
         {{/isFavorite}}
-        {{^isFavotire}}
-        <button type="button" class="border-0 bg_navy">
+        {{^isFavorite}}
+        <button type="button" class="border-0 bg_navy" onclick="CHAT_UI.insertFavoriteUser({{shopMemberId}})">
           <div class="d-flex flex-column">
             <div class="img_wrap">
               <img src="icon/icon_profile_favorite_white.png" alt="お気に入り">
@@ -36,7 +36,7 @@
           </div>
         </button>
         {{/isFavorite}}
-        <button type="button" class="border-0 bg_green">
+        <button type="button" class="border-0 bg_green" >
           <div class="d-flex flex-column">
             <div class="img_wrap">
               <img src="icon/icon_profile_phone.png" alt="通話">