2.0.1

Author: lamborc

conf/nbs.db

@@ -16,13 +16,15 @@
 import io.nbs.client.ui.components.NbsListView;
 import io.nbs.client.ui.holders.BaseMessageViewHolder;
 import io.nbs.sdk.beans.PeerInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import javax.swing.text.ViewFactory;
 import java.awt.*;
 import java.awt.event.MouseEvent;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -192,8 +194,7 @@ private void processSystemMessage(ViewHolder viewHolder, MessageItem item)
      * @param preItem
      * @param holder
      */
-    private void processTimeAndAvatar(MessageItem item, MessageItem preItem, BaseMessageViewHolder holder)
-    {
+    private void processTimeAndAvatar(MessageItem item, MessageItem preItem, BaseMessageViewHolder holder) {
         // 如果当前消息的时间与上条消息时间相差大于1分钟，则显示当前消息的时间
         if(preItem!=null){
             if (TimeUtil.inTheSameMinute(item.getTimestamp(), preItem.getTimestamp()))
@@ -213,10 +214,27 @@ private void processTimeAndAvatar(MessageItem item, MessageItem preItem, BaseMes
         }
 
         if (holder.avatar != null) {
-
             ImageIcon icon = new ImageIcon();
-            Image image = AvatarUtil.createOrLoadUserAvatar(item.getSenderUsername()).getScaledInstance(40, 40, Image.SCALE_SMOOTH);
-            icon.setImage(image);
+            Image image = null;
+            if(item.getMessageType()<0){
+                PeerInfo currentPeer = MainFrame.getContext().getCurrentPeer();
+                try {
+                    image =  AvatarUtil.getPeerAvatar(currentPeer);
+                    AvatarUtil.updateCacheIamge(currentPeer.getAvatarName(),image);
+                } catch (IOException e) {
+
+                }
+            }
+            if(image == null){
+                boolean bflag = false;
+                String identify = item.getSenderUsername();
+                if(StringUtils.isNotBlank(item.getAvatar())){
+                    identify = item.getAvatar();
+                    bflag = true;
+                }
+                image = AvatarUtil.createOrLoadUserAvatar(identify,bflag,item.getSuffix());
+            }
+            icon.setImage( image.getScaledInstance(36,36,Image.SCALE_SMOOTH));
             holder.avatar.setIcon(icon);
 
             //如果不是自己

src/main/java/io/nbs/client/adapter/MessageAdapter.java

@@ -2,7 +2,9 @@
 
 import io.nbs.client.Launcher;
 import io.nbs.client.cnsts.AppGlobalCnst;
+import io.nbs.client.ui.frames.MainFrame;
 import io.nbs.commons.utils.IconUtil;
+import io.nbs.sdk.beans.PeerInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -101,6 +103,9 @@ public ImageIcon getAvatar128(String hashFileName){
         return icon;
     }
 
+
+
+
     /**
      * 下载文件
      * @param url

src/main/java/io/nbs/client/helper/AvatarImageHandler.java

@@ -39,7 +39,7 @@ public class MessageRightTextViewHolder extends BaseMessageViewHolder {
     public IMRightImageMessageBubble messageBubble = new IMRightImageMessageBubble();
 
     public MessageRightTextViewHolder(){
-        defaltIcon.setImage(defaltIcon.getImage().getScaledInstance(30,30,Image.SCALE_SMOOTH));
+       // defaltIcon.setImage(defaltIcon.getImage().getScaledInstance(30,30,Image.SCALE_SMOOTH));
         initComponents();
         initView();
     }

src/main/java/io/nbs/client/ui/panels/im/messages/MessageRightTextViewHolder.java

@@ -6,6 +6,8 @@
 import io.nbs.client.cnsts.ColorCnst;
 import io.nbs.client.helper.AvatarImageHandler;
 import io.nbs.commons.helper.ConfigurationHelper;
+import io.nbs.sdk.beans.PeerInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,6 +88,9 @@ public class AvatarUtil {
         }
     }
 
+    public static void updateCacheIamge(String identify,Image image){
+        if(StringUtils.isNotBlank(identify)&&image!=null)avatarCache.put(identify,image);
+    }
 
     /**
      * 分组头像
@@ -137,7 +142,7 @@ public static Image createOrLoadGroupAvatar(String groupName, String[] members,
     /**
      * 获取联系人头像,如果是hash则先从IPFS获取
      * @param identify
-     * @param isHash
+     * @param isHash 是否hash
      * @param suffix
      * @return
      */
@@ -176,6 +181,24 @@ public static Image createOrLoadUserAvatar(String identify,boolean isHash,String
         return avatar;
     }
 
+    /**
+     *
+     * @param info
+     * @return
+     * @throws IOException
+     */
+    public static Image getPeerAvatar(PeerInfo info) throws IOException {
+        if(info==null||StringUtils.isBlank(info.getAvatarName())){
+            return null;
+        }
+        if(avatarCache.containsKey(info.getAvatarName()))return avatarCache.get(info.getAvatarName());
+        File infoFile = new File(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),info.getAvatarName()));
+        if(infoFile.exists()&&infoFile.isFile()){
+            return ImageIO.read(infoFile);
+        }
+        return null;
+    }
+
     /**
      *
      * @param username

src/main/java/io/nbs/commons/utils/AvatarUtil.java

@@ -66,7 +66,7 @@ public class MessageItem implements Comparable<MessageItem> {
      */
     private String avatar;
 
-
+    private String suffix;
 
     public MessageItem() {
     }
@@ -194,4 +194,12 @@ public String getAvatar() {
     public void setAvatar(String avatar) {
         this.avatar = avatar;
     }
+
+    public String getSuffix() {
+        return suffix;
+    }
+
+    public void setSuffix(String suffix) {
+        this.suffix = suffix;
+    }
 }