2.0.1

Author: lamborc

conf/nbs.db

@@ -72,6 +72,7 @@ public synchronized MessageRightTextViewHolder tryGetRightTextViewHolder(){
         MessageRightTextViewHolder holder =null;
         if(rightTextPosition <CACHE_CAPACITY && rightTextViewHolders.size()>0){
             holder = rightTextViewHolders.get(rightTextPosition);
+            rightTextPosition++;
         }
         return holder;
     }

src/main/java/io/ipfs/nbs/helper/MessageViewHolderCacheHelper.java

@@ -106,7 +106,7 @@ public void onBindViewHolder(ContactsItemViewHolder viewHolder, int position) {
 
         ImageIcon icon = new ImageIcon();
         icon.setImage(AvatarUtil.createOrLoadUserAvatar(item.getName())
-                .getScaledInstance(32, 32, Image.SCALE_SMOOTH));
+                .getScaledInstance(40, 40, Image.SCALE_SMOOTH));
         viewHolder.avatar.setIcon(icon);
 
         viewHolder.roomName.setText(item.getName());

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

@@ -1,5 +1,8 @@
 package io.nbs.client.adapter;
 
+import io.nbs.client.Launcher;
+import io.nbs.client.cnsts.AppGlobalCnst;
+import io.nbs.client.helper.AvatarImageHandler;
 import io.nbs.client.ui.components.adapters.MessageMouseListener;
 import io.nbs.client.ui.frames.MainFrame;
 import io.nbs.client.ui.holders.ViewHolder;
@@ -70,8 +73,7 @@ public void onBindViewHolder(BaseMessageViewHolder viewHolder, int position) {
         if(viewHolder==null)return;
         final MessageItem item = messageItems.get(position);
         MessageItem prevItem = 0 == position ? null : messageItems.get(position-1);
-
-
+        processTimeAndAvatar(item, prevItem, viewHolder);
         if(viewHolder instanceof MessageSystemMessageViewHolder){
             processSystemMessage(viewHolder,item);
         }
@@ -131,6 +133,9 @@ private void processLeftTextMessage(ViewHolder viewHolder, final MessageItem ite
         holder.text.setTag(item.getId());
 
         holder.sender.setText(item.getSenderUsername());
+        ImageIcon selfIcon = new ImageIcon(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),currentPeer.getAvatarName()));
+        selfIcon.setImage(selfIcon.getImage().getScaledInstance(40,40,Image.SCALE_SMOOTH));
+        holder.avatar.setIcon(selfIcon);
 
         listView.setScrollHiddenOnMouseLeave(holder.messageBubble);
         listView.setScrollHiddenOnMouseLeave(holder.text);
@@ -208,16 +213,17 @@ 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);
             holder.avatar.setIcon(icon);
 
-            //如果是自己
-            if (item.getMessageType() == MessageItem.LEFT_ATTACHMENT
+            //如果不是自己
+            if (item.getMessageType() == MessageItem.LEFT_TEXT
                     || item.getMessageType() == MessageItem.LEFT_IMAGE
                     || item.getMessageType() == MessageItem.LEFT_TEXT) {
-                bindAvatarAction(holder.avatar, item.getSenderUsername());
+               // bindAvatarAction(holder.avatar, item.getSenderUsername());
             }
 
         }

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

@@ -6,7 +6,9 @@
 import io.nbs.client.services.IpfsMessageSender;
 import io.nbs.client.ui.frames.MainFrame;
 import io.nbs.client.ui.panels.im.chatstmp.TMChatShowPanel;
+import io.nbs.commons.helper.DateHelper;
 import io.nbs.commons.helper.RadomCharactersHelper;
+import io.nbs.commons.utils.UUIDGenerator;
 import io.nbs.sdk.beans.IMMessageBean;
 import io.nbs.sdk.beans.MessageItem;
 import io.ipfs.nbs.helper.MessageViewHolderCacheHelper;
@@ -236,6 +238,9 @@ private void sendMessage(){
         item.setMessageType(MessageItem.RIGHT_TEXT);
         item.setSenderUsername(current.getNick());
         item.setNeedToResend(false);
+        item.setId(UUIDGenerator.getUUID());
+        item.setSenderId(current.getId());
+        item.setTimestamp(DateHelper.timestamp());
         addMessageItemToEnd(item);
     }
 

src/main/java/io/nbs/client/ui/panels/im/ChatPanel.java

@@ -1,6 +1,5 @@
 package io.nbs.client.ui.panels.im.messages;
 
-import UI.AppMainWindow;
 import io.nbs.client.Launcher;
 import io.nbs.client.ui.components.NBSIconButton;
 import io.nbs.client.cnsts.FontUtil;
@@ -29,7 +28,7 @@ public class MessageRightTextViewHolder extends BaseMessageViewHolder {
     /**
      * TODO
      */
-    ImageIcon defaltIcon = new ImageIcon(Launcher.appBasePath +"avatars/default_avatar.png");
+    public ImageIcon defaltIcon = new ImageIcon("/icons/nbs128.png");
     public NBSIconButton messageButton = new NBSIconButton(defaltIcon,defaltIcon,"");
     public JLabel resend = new JLabel(); // 重发按钮
     public JLabel sendingProgress = new JLabel(); // 正在发送
@@ -40,6 +39,7 @@ public class MessageRightTextViewHolder extends BaseMessageViewHolder {
     public IMRightImageMessageBubble messageBubble = new IMRightImageMessageBubble();
 
     public MessageRightTextViewHolder(){
+        defaltIcon.setImage(defaltIcon.getImage().getScaledInstance(30,30,Image.SCALE_SMOOTH));
         initComponents();
         initView();
     }
@@ -54,11 +54,7 @@ private void initComponents(){
 
         time.setForeground(ColorCnst.FONT_GRAY);
         time.setFont(FontUtil.getDefaultFont(12));
-
-        ImageIcon resendIcon = new ImageIcon(AppMainWindow.class.getResource("/icon/zh_cn/resend.png"));
-
-        resendIcon.setImage(resendIcon.getImage().getScaledInstance(20,20,Image.SCALE_SMOOTH));
-        resend.setIcon(resendIcon);
+       // resend.setIcon(resendIcon);
         resend.setVisible(false);
         resend.setToolTipText("消息发送失败.");
         resend.setCursor(new Cursor(Cursor.HAND_CURSOR));
@@ -71,21 +67,25 @@ private void initView(){
 
         timePanel.add(time);
 
+        avatar.setIcon(defaltIcon);
+        avatar.setVisible(true);
+
         messageBubble.add(text,BorderLayout.CENTER);
 
         //JPanel res
         JPanel resendTextPanel = new JPanel();
         resendTextPanel.setBackground(ColorCnst.WINDOW_BACKGROUND);
-
         resendTextPanel.add(resend, BorderLayout.WEST);
         resendTextPanel.add(sendingProgress, BorderLayout.WEST);
         resendTextPanel.add(messageBubble, BorderLayout.CENTER);
 
         messageAvatarPanel.setLayout(new GridBagLayout());
+
+        //messageAvatarPanel.setBorder(MainFrame.redBorder);
         messageAvatarPanel.add(resendTextPanel,
                 new GBC(1,0).setWeight(1000,1).setAnchor(GBC.EAST).setInsets(0,0,5,0));
         messageAvatarPanel.add(avatar,new GBC(2,0).setWeight(1,1).setAnchor(GBC.NORTH).setInsets(5,0,0,10));
-        add(timePanel,BorderLayout.NORTH);
+        add(timePanel,BorderLayout.NORTH);//
         add(messageAvatarPanel,BorderLayout.CENTER);
     }
 

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

@@ -36,4 +36,10 @@ public static String currentTime(){
     public static int currentSecond(){
         return (int)(System.currentTimeMillis()/1000);
     }
+
+    /**
+     *
+     * @return
+     */
+    public static long timestamp(){return System.currentTimeMillis();}
 }

src/main/java/io/nbs/commons/helper/DateHelper.java

@@ -55,11 +55,14 @@ public class AvatarUtil {
     private static final int DEFAULT_AVATAR = 0;
     private static final int CUSTOM_AVATAR = 1;
 
+    /**
+     * 头像缓存
+     */
     private static Map<String, Image> avatarCache = new HashMap<>();
 
     static
     {
-        AVATAR_CACHE_ROOT = AppGlobalCnst.consturactPath(Launcher.appBasePath,"avatars");
+        AVATAR_CACHE_ROOT = AppGlobalCnst.consturactPath(Launcher.appBasePath,"cache","avatars");
 
         File file = new File(AVATAR_CACHE_ROOT);
         if (!file.exists())
@@ -78,6 +81,13 @@ public class AvatarUtil {
     }
 
 
+    /**
+     * 分组头像
+     * @param groupName
+     * @param members
+     * @param type
+     * @return
+     */
     public static Image createOrLoadGroupAvatar(String groupName, String[] members, String type)
     {
         Image avatar;
@@ -118,6 +128,11 @@ public static Image createOrLoadGroupAvatar(String groupName, String[] members,
         return avatar;
     }
 
+    /**
+     *
+     * @param username
+     * @return
+     */
     public static Image createOrLoadUserAvatar(String username)
     {
         Image avatar;

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

@@ -0,0 +1,56 @@
+package io.nbs.commons.utils;
+
+import java.util.UUID;
+
+/**
+ * @Package : io.nbs.commons.utils
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/7/4-11:06
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class UUIDGenerator {
+    /**
+     * UUID 36 e393c8ab-8f25-40da-90cf-007b5650af48
+     */
+    public static final String UUID_36 = "36";
+    /**
+     * UUID 32 LOWWER e393c8ab8f2540da90cf007b5650af48
+     */
+    public static final String UUID_LOWEER = "32l";
+
+    private UUIDGenerator() {
+    }
+
+    /**
+     *
+     * @Author :wdcai
+     * @Comment :
+     * @param type
+     *            :36 OR 32l
+     * @return
+     */
+    public static String getUUID(String type) {
+        if (type.equalsIgnoreCase(UUID_36)) {
+            return UUID.randomUUID().toString();
+        } else if (type.equalsIgnoreCase(UUID_LOWEER)) {
+            return UUID.randomUUID().toString().replaceAll("-", "")
+                    .toLowerCase();
+        } else {
+            return UUID.randomUUID().toString();
+        }
+
+    }
+
+    /**
+     * 32 UPPER :4B11CAA83B8741FC835C5440F68C2BEC
+     *
+     * @Author :wdcai
+     * @Comment :
+     * @return
+     */
+    public static String getUUID() {
+        return getUUID(UUID_36).replaceAll("-", "").toUpperCase();
+    }
+}

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

@@ -25,6 +25,7 @@ public class MessageItem implements Comparable<MessageItem> {
      * uuid
      */
     private String id;
+
     /**
      *
      */
@@ -61,6 +62,8 @@ public class MessageItem implements Comparable<MessageItem> {
 
     private long updatedAt;
 
+
+
     public MessageItem() {
     }