增加图片处理

Author: lamborc

conf/nbs.db

@@ -14,7 +14,7 @@
 import io.nbs.commons.helper.DateHelper;
 import io.nbs.client.cnsts.ColorCnst;
 import io.nbs.client.ui.panels.im.ChatPanel;
-import UI.common.Base64CodecUtil;
+import io.nbs.commons.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
 
 import org.apache.commons.lang3.StringUtils;
@@ -290,7 +290,7 @@ private void sendMsg(){
             sb.append(ConstantsUI.WSPACE_CHARACTER4).append(sendContent);
 
             //send pub
-            AppMainWindow.ipfs.pubsub.pub(topic,Base64CodecUtil.encodeByCtrlType(sendContent,Base64CodecUtil.CtrlTypes.normal));
+           // AppMainWindow.ipfs.pubsub.pub(topic,Base64CodecUtil.encodeByCtrlType(sendContent,Base64CodecUtil.CtrlTypes.normal));
             inputArea.setText("");
             sb.append(ConstantsUI.ENTER_CHARACTER);
             if(msgMax.intValue()>18){
@@ -319,11 +319,11 @@ private void appenRevcMsg(String json){
         IpfsMessage message = JSON.parseObject(json,IpfsMessage.class);
         ContactsItem item = AppMainWindow.findContactsItemByFrom(message.getFrom());
         String nick = (item==null||item.getName()==null) ? message.getFrom() : item.getName();
-        message = Base64CodecUtil.parseIpmsMessageCtrlType(message);
-        if(message==null||message.getTypes()!=Base64CodecUtil.CtrlTypes.normal){
+       // message = Base64CodecUtil.parseIpmsMessageCtrlType(message);
+       /* if(message==null||message.getTypes()!=Base64CodecUtil.CtrlTypes.normal){
             logger.info("message is null");
             return;
-        }
+        }*/
         String msg = message.getContents();
         StringBuffer sb = new StringBuffer();
         sb.append(nick).append("  ").append(DateHelper.currentTime()).append(ConstantsUI.ENTER_CHARACTER);

src/main/java/UI/common/Base64CodecUtil.java

@@ -1,6 +1,7 @@
 package com.nbs.ipfs.entity;
 
-import UI.common.Base64CodecUtil;
+import io.nbs.commons.utils.Base64CodecUtil;
+import io.nbs.sdk.prot.IPMTypes;
 
 /**
  * @Package : com.nbs.ipfs.entity
@@ -23,7 +24,9 @@ public class IpfsMessage {
 
     private String time;
 
-    private Base64CodecUtil.CtrlTypes types;
+    private IPMTypes types;
+
+
 
     public String getFrom() {
         return from;
@@ -73,11 +76,11 @@ public void setPeerId(String peerId) {
         this.peerId = peerId;
     }
 
-    public Base64CodecUtil.CtrlTypes getTypes() {
+    public IPMTypes getTypes() {
         return types;
     }
 
-    public void setTypes(Base64CodecUtil.CtrlTypes types) {
+    public void setTypes(IPMTypes types) {
         this.types = types;
     }
 

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

@@ -0,0 +1,77 @@
+package io.nbs.client.adapter;
+
+import io.nbs.client.listener.OnlineNotifier;
+import io.nbs.client.ui.components.NbsListView;
+import io.nbs.client.ui.panels.im.IMPeersPanel;
+import io.nbs.client.vo.ContactsItem;
+import io.nbs.sdk.beans.OnlineMessage;
+import io.nbs.sdk.beans.PeerInfo;
+import io.nbs.sdk.beans.SystemCtrlMessageBean;
+import io.nbs.sdk.prot.IPMTypes;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.SqlSession;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Package : io.nbs.client.adapter
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/7/4-2:45
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class ContactOnlineAdapter implements OnlineNotifier {
+    private SqlSession sqlSession;
+
+    private static Map<String,ContactsItem> contactsCacheMap ;
+
+    public ContactOnlineAdapter(SqlSession sqlSession, List<ContactsItem> contactItems) {
+        this.sqlSession = sqlSession;
+        contactsCacheMap = new HashMap<>();
+
+
+    }
+
+    @Override
+    public void notifyRecvSystemMessage(SystemCtrlMessageBean messageBean) {
+        if(messageBean!=null&&messageBean.getContent()!=null&&messageBean.getMtype().equals(IPMTypes.online.name())){
+           if(messageBean.getContent() instanceof OnlineMessage){
+               IMPeersPanel peersPanel = IMPeersPanel.getContext();
+               OnlineMessage onlineMessage = (OnlineMessage)messageBean.getContent();
+
+               ContactsItem item  = new ContactsItem();
+               item.setFormid(messageBean.getFrom());
+               item.setName(onlineMessage.getNick());
+               item.setAvatar(onlineMessage.getAvatar());
+               item.setAvatarSuffix(onlineMessage.getAvatarSuffix());
+               item.setId(onlineMessage.getId());
+               item.setIp(onlineMessage.getIp());
+               item.setLocations(onlineMessage.getLocations());
+               item.setOnline(1);
+               peersPanel.getContactItems().add(item);
+               int size = peersPanel.getContactItems().size();
+               peersPanel.getPeerlistView().notifyItemInserted(size-1,true);
+               peersPanel.getPeerlistView().setAutoScrollToBottom();
+               //存库TODO
+
+           }
+        }
+    }
+
+    /**
+     * TODO 数据库中查找并缓存到MAP 供消息用
+     * @param contactItems
+     */
+    private void loadContactPeersMap(List<ContactsItem> contactItems){
+
+    }
+
+    private void updataCacheMap(ContactsItem item){
+        if(item!=null&&StringUtils.isNotBlank(item.getFormid())){
+            contactsCacheMap.put(item.getFormid(),item);
+        }
+    }
+}

src/main/java/com/nbs/ipfs/entity/IpfsMessage.java

@@ -0,0 +1,50 @@
+package io.nbs.client.adapter;
+
+import io.nbs.client.listener.IPFSSubscribeListener;
+import io.nbs.client.ui.components.NbsListView;
+import io.nbs.client.ui.frames.MainFrame;
+import io.nbs.sdk.beans.MessageItem;
+import io.nbs.sdk.beans.PeerInfo;
+
+import java.util.List;
+
+/**
+ * @Package : io.nbs.client.adapter
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/7/4-2:51
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class ReceiverMessageAdapter implements IPFSSubscribeListener {
+
+    private List<MessageItem> items;
+    private NbsListView listView;
+
+
+    public ReceiverMessageAdapter(List<MessageItem> items, NbsListView listView) {
+        this.items = items;
+        this.listView = listView;
+    }
+
+    @Override
+    public void notifyRecvMessage(MessageItem item) {
+        PeerInfo peerInfo = MainFrame.getContext().getCurrentPeer();
+        if(item.getFrom().equals(peerInfo.getFrom())){
+            item.setMessageType(MessageItem.RIGHT_TEXT);
+            item.setId(peerInfo.getId());
+            item.setSenderUsername(peerInfo.getNick());
+            //TODO 未来忽略自己发的
+            items.add(item);
+            listView.notifyItemInserted(items.size()-1,true);
+            listView.setAutoScrollToBottom();
+        }else {
+            item.setMessageType(MessageItem.LEFT_TEXT);
+            //TODO
+           // item.setId(peerInfo.getId());
+            item.setSenderUsername(peerInfo.getNick());
+            listView.notifyItemInserted(items.size()-1,true);
+            listView.setAutoScrollToBottom();
+        }
+    }
+}

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

@@ -19,9 +19,5 @@ public interface IPFSSubscribeListener {
      */
     void notifyRecvMessage(MessageItem item);
 
-    /**
-     *
-     * @param messageBean
-     */
-    void notifyRecvSystemMessage(SystemCtrlMessageBean messageBean);
+
 }