Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/nbs/ui/panels/ContactsPanel.java

Author: lamborc

pom.xml

@@ -63,6 +63,18 @@
             <artifactId>commons-codec</artifactId>
             <version>1.11</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.melloware/jintellitype -->
+        <dependency>
+            <groupId>com.melloware</groupId>
+            <artifactId>jintellitype</artifactId>
+            <version>1.3.9</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.vdurmont/emoji-java -->
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+            <version>4.0.0</version>
+        </dependency>
 
 
     </dependencies>

profile/.merkle

@@ -1,10 +1,11 @@
 #add nbs1.0.rar
-#Tue Jun 26 14:17:32 CST 2018
-QmQD445aW3Ge6bgD6Lv9RJG48WfveAMgXket15GYsuysYb=nbs.rp
+#Tue Jun 26 18:13:02 CST 2018
 QmdNQYHjg2d6PKsXu5DSRWJHPUgSMVqWttAAp3bqaHq2Z8=Girls-Gee-\u300Aoh\u300B.mp3
-QmWuoJzhZkMjEe9ybfFeaSn6jDzTgvPd6UkC6RLZUbZVyf=NBS.jpg
-QmNgp7Lt1JYRiWYVpzV7s8nUxeHgScudkSbn36p8HmySAY=nbs1.0.rar
 Qmc5QhR1WeUhGW12tT3WND3qxfLRmnci1PYjogjGy56X3n=Monica.mp3
+QmWuoJzhZkMjEe9ybfFeaSn6jDzTgvPd6UkC6RLZUbZVyf=NBS.jpg
 QmfK5QwVKDod3Bwjdmcgyf1qGxEzmGayfSSFTcv4BxxRXR=nbs.rp
-QmW4dKs2KXqCWc9TQXzSc41HTNBPtFJJf7crwSbLGkQmVa=nbs64.png
+QmQD445aW3Ge6bgD6Lv9RJG48WfveAMgXket15GYsuysYb=nbs.rp
 QmeLUM8e8WRKBLsRp3Pme39yiTz4nTMGURm7unUQbrWhCn=\u5FAE\u4FE1\u56FE\u7247_20180608230516.jpg
+QmNgp7Lt1JYRiWYVpzV7s8nUxeHgScudkSbn36p8HmySAY=nbs1.0.rar
+QmW4dKs2KXqCWc9TQXzSc41HTNBPtFJJf7crwSbLGkQmVa=nbs64.png
+QmfFhhc1Woo4hE5d14jBPdotng7j9vx6UA4My8Xk597Di8=nbs1.0.rar

src/main/java/UI/AppMainWindow.java

@@ -15,6 +15,7 @@
 import com.nbs.tools.ConfigHelper;
 
 import com.nbs.tools.DateHelper;
+import com.nbs.ui.frames.MainFrame;
 import com.nbs.utils.Base64CodecUtil;
 import com.nbs.utils.RadomCharactersHelper;
 import io.ipfs.api.IPFS;
@@ -59,7 +60,7 @@ public class AppMainWindow {
 
     private static boolean boradcastSuccess = false;
 
-    public static JFrame frame;
+    public static MainFrame frame;
     /**
      * 主窗口
      */
@@ -210,7 +211,7 @@ private void initialize(){
             e.printStackTrace();
         }
 
-        frame = new JFrame();
+        frame = new MainFrame();
         //set window Size
         frame.setBounds(ConstantsUI.MAIN_WINDOW_X,ConstantsUI.MAIN_WINDOW_Y
                 ,ConstantsUI.MAIN_WINDOW_WIDTH,ConstantsUI.MAIN_WINDOW_HEIGHT);

src/main/java/UI/ConstantsUI.java

@@ -56,7 +56,8 @@ public class ConstantsUI {
     /**
      * 图标路径
      */
-    private static final String BUTTON_ICON_ROOT = "/icon/"+PropertyUtil.getProperty("nbs.button.dir","")+"/";
+    public static final String BUTTON_ICON_ROOT = "/icon"+File.separator
+            +PropertyUtil.getProperty("nbs.button.dir","")+ File.separator;
 
     /**
      * 主图标

src/main/java/UI/button/NBSIconButton.java

@@ -74,6 +74,8 @@ private void initialize(){
         this.setMargin(new Insets(0,0,0,0));
     }
 
+
+
     /**
      * 设置按钮样式：
      */

src/main/java/UI/panel/im/IMPanel.java

@@ -13,6 +13,7 @@
 import com.nbs.ipfs.entity.IpfsMessage;
 import com.nbs.tools.DateHelper;
 import com.nbs.ui.components.ColorCnst;
+import com.nbs.ui.panels.ChatPanel;
 import com.nbs.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
 
@@ -45,13 +46,17 @@ public class IMPanel extends NBSAbstractPanel {
      * 左侧IM peers
      */
     private ImLeftPanel leftPanel;
+    /**
+     * 右侧聊天面板
+     */
+    private  ChatPanel chatPanel;
 
 
     private static JTextArea imMSGShow = new JTextArea();
     /**
      * 顶部显示
      */
-    private static ToolbarStatsPanel toolbarStatsPanel = new ToolbarStatsPanel(PKUI_PANEL_IM_LABEL);;
+    private static ToolbarStatsPanel toolbarStatsPanel = new ToolbarStatsPanel(PKUI_PANEL_IM_LABEL);
 
     private static JTextArea inputArea = new JTextArea();
 
@@ -86,7 +91,7 @@ protected void init() {
 
     @Override
     protected void addComponent() {
-        this.add(toolbarStatsPanel,BorderLayout.NORTH);
+       // this.add(toolbarStatsPanel,BorderLayout.NORTH);
         /**
          *
          */
@@ -121,7 +126,9 @@ private JPanel getCenterPanel(){
         /**
          * 聊天主窗口
          */
-        centerPanel.add(buildMessMainPanel(),BorderLayout.CENTER);
+        //centerPanel.add(buildMessMainPanel(),BorderLayout.CENTER);
+        chatPanel = new ChatPanel(this);
+        centerPanel.add(chatPanel,BorderLayout.CENTER);
         return centerPanel;
     }
 
@@ -130,6 +137,9 @@ public void load() {
 
     }
 
+    /**
+     *
+     */
     @Override
     protected void addListener() {
         sendButton.addActionListener(new AbstractAction() {

src/main/java/UI/panel/im/RightPanel.java

@@ -0,0 +1,17 @@
+package UI.panel.im;
+
+import javax.swing.*;
+
+/**
+ * @Package : UI.panel.im
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/26-20:55
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class RightPanel extends JPanel {
+    private static RightPanel context;
+
+
+}

src/main/java/com/nbs/entity/MessageItem.java

@@ -0,0 +1,140 @@
+package com.nbs.entity;
+
+import com.nbs.ipfs.entity.IpfsMessage;
+
+/**
+ * @Package : com.nbs.entity
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/26-23:34
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class MessageItem implements Comparable<MessageItem> {
+    public static final int SYSTEM_MESSAGE = 0;
+    public static final int LEFT_TEXT = 1;
+    public static final int LEFT_IMAGE = 2;
+    public static final int LEFT_ATTACHMENT = 3;
+
+    public static final int RIGHT_TEXT = -1;
+    public static final int RIGHT_IMAGE = -2;
+    public static final int RIGHT_ATTACHMENT = -3;
+
+    /**
+     *
+     */
+    private String seqno;
+    /**
+     * 群聊
+     */
+    private String roomId;
+    /**
+     * 消息内容
+     */
+    private String messageContent;
+    private long timestamp;
+    /**
+     * nickname
+     */
+    private String senderUsername;
+    /**
+     * peerID
+     */
+    private String senderId;
+    /**
+     *
+     */
+    private String from;
+    private boolean needToResend;
+
+    public MessageItem() {
+    }
+
+    public MessageItem(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public MessageItem(String seqno, String messageContent, String senderId) {
+        this.seqno = seqno;
+        this.messageContent = messageContent;
+        this.senderId = senderId;
+    }
+
+    /**
+     * TODO
+     * @param item
+     * @param message
+     */
+    public MessageItem(ContactsItem item,IpfsMessage message) {
+        this.senderUsername = senderUsername;
+    }
+
+    @Override
+    public int compareTo(MessageItem o) {
+        return (int) (this.getTimestamp() - o.getTimestamp());
+    }
+
+    public String getSeqno() {
+        return seqno;
+    }
+
+    public void setSeqno(String seqno) {
+        this.seqno = seqno;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getMessageContent() {
+        return messageContent;
+    }
+
+    public void setMessageContent(String messageContent) {
+        this.messageContent = messageContent;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getSenderUsername() {
+        return senderUsername;
+    }
+
+    public void setSenderUsername(String senderUsername) {
+        this.senderUsername = senderUsername;
+    }
+
+    public String getSenderId() {
+        return senderId;
+    }
+
+    public void setSenderId(String senderId) {
+        this.senderId = senderId;
+    }
+
+    public boolean isNeedToResend() {
+        return needToResend;
+    }
+
+    public void setNeedToResend(boolean needToResend) {
+        this.needToResend = needToResend;
+    }
+
+    public String getFrom() {
+        return from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+}

src/main/java/com/nbs/tools/ConfigHelper.java

@@ -32,6 +32,10 @@ public class ConfigHelper {
     public static final String PROFILE_ROOT = CURRENT_DIR + File.separator+"profile" + File.separator;
     public static final String NBS_FILES_ROOT_PATH = CURRENT_DIR + File.separator +"nbs" + File.separator;
     public static final String NBS_FILES_IPFS_ROOT = NBS_FILES_ROOT_PATH + "ipfs"+  File.separator;
+    /**
+     * 临时文件
+     */
+    public static final String NBS_TEMP_ROOT = NBS_FILES_ROOT_PATH + "_temp" + File.separator;
     public static final String NBS_CACHE_AVATAR_ROOT_PATH = NBS_FILES_ROOT_PATH +"cache"+ File.separator+ "avatar" + File.separator;
     private static final String CONF_FILE = "nbs-conf.properties";
 

src/main/java/com/nbs/tools/MessageViewHolderCacheHelper.java

@@ -0,0 +1,61 @@
+package com.nbs.tools;
+
+import com.nbs.ui.holder.MessageLeftTextViewHolder;
+import com.nbs.ui.holder.MessageRightTextViewHolder;
+import com.nbs.ui.holder.MessageSystemMessageViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Package : com.nbs.tools
+ * @Description :
+ * <p>
+ *     提供消息ViewHolder缓存,
+ *     对消息的ViewHolder进入缓存能大大加速消息列表的加载速度，在刚进入房间时，默认先加载10条消息，
+ * </p>
+ * @Author : lambor.c
+ * @Date : 2018/6/26-23:46
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class MessageViewHolderCacheHelper {
+    private final int CACHE_CAPACITY = 20;
+    private List<MessageRightTextViewHolder> rightTextViewHolders = new ArrayList<>();
+
+    private List<MessageLeftTextViewHolder> leftTextViewHolders = new ArrayList<>();
+
+    private List<MessageSystemMessageViewHolder> systemMessageViewHolders = new ArrayList<>();
+
+    private int rightTextPosition = 0;
+    private int rightImagePosition = 0;
+    private int rightAttachmentPosition = 0;
+    private int leftTextPosition = 0;
+    private int leftImagePosition = 0;
+    private int leftAttachmentPosition = 0;
+    private int systemMessagePosition = 0;
+
+    public MessageViewHolderCacheHelper() {
+        initHolders();
+    }
+
+    private void initHolders(){
+        new Thread(()->{
+            long startTime = System.currentTimeMillis();
+            initLeftTextViewHolder();
+            initRightTextViewHolder();
+        }).start();
+    }
+
+    private void initRightTextViewHolder(){
+        for(int i=0;i<CACHE_CAPACITY;i++){
+            rightTextViewHolders.add(new MessageRightTextViewHolder());
+        }
+    }
+
+    private void initLeftTextViewHolder(){
+        for(int i=0;i<CACHE_CAPACITY;i++){
+            leftTextViewHolders.add(new MessageLeftTextViewHolder());
+        }
+    }
+}