增加成员控制

lamborc · lamborc · commit 673bb99d92bb · 2018-07-05T19:38:21.000+08:00
diff --git a/conf/nbs.db b/conf/nbs.db
diff --git a/src/main/java/io/nbs/client/Launcher.java b/src/main/java/io/nbs/client/Launcher.java
@@ -206,4 +206,12 @@ public IPFS getIpfs() {
     public static SqlSession getSqlSession() {
         return sqlSession;
     }
+
+    /**
+     *
+     * @return
+     */
+    public JFrame getCurrentFrame() {
+        return currentFrame;
+    }
 }
diff --git a/src/main/java/io/nbs/client/listener/IPFSFileUploader.java b/src/main/java/io/nbs/client/listener/IPFSFileUploader.java
@@ -1,14 +1,26 @@
 package io.nbs.client.listener;
 
+import com.alibaba.fastjson.JSON;
 import com.nbs.biz.service.AttachmentInfoService;
 import io.ipfs.api.IPFS;
 import io.ipfs.api.MerkleNode;
 import io.ipfs.api.NamedStreamable;
+import io.nbs.client.Launcher;
+import io.nbs.client.cnsts.AppGlobalCnst;
+import io.nbs.client.services.IpfsMessageSender;
+import io.nbs.client.ui.frames.MainFrame;
+import io.nbs.client.ui.panels.im.messages.MessagePanel;
+import io.nbs.commons.utils.UUIDGenerator;
 import io.nbs.sdk.beans.MessageItem;
+import io.nbs.sdk.beans.PeerInfo;
+import io.nbs.sdk.prot.IPMParser;
 import org.apache.ibatis.session.SqlSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.util.List;
 
 /**
@@ -20,31 +32,37 @@
  * All rights reserved.
  */
 public class IPFSFileUploader {
+    private static Logger logger = LoggerFactory.getLogger(IPFSFileUploader.class);
     private static IPFS ipfs;
     private AttachmentInfoService service;
+    private PeerInfo cureent;
+    private MessagePanel messagePanel;
+    private List<MessageItem> messageItems;
 
     /**
      *
      * @param ipfs
      * @param sqlSession
      */
-    public IPFSFileUploader(IPFS ipfs, SqlSession sqlSession) {
+    public IPFSFileUploader(IPFS ipfs, SqlSession sqlSession,MessagePanel panel,List<MessageItem> messageItems) {
         this.ipfs = ipfs;
         this.service = new AttachmentInfoService(sqlSession);
+        cureent = Launcher.currentPeer;
+        this.messagePanel = panel;
+        this.messageItems = messageItems;
     }
 
     /**
      *
      * @param file
      */
     public void addFileToIPFS(File file){
-
         if(!file.exists()||file.isDirectory())return;
-
         try {
             NamedStreamable.FileWrapper fileWrapper = new NamedStreamable.FileWrapper(file);
             List<MerkleNode> list = ipfs.add(fileWrapper);
-            uploadSuccessNotify();
+            logger.info(JSON.toJSONString(list.get(0)));
+            uploadSuccessNotify(list.get(0));
             uploadSuccessSaveDB(list);
         } catch (IOException e) {
             e.printStackTrace();
@@ -56,7 +74,39 @@ public void addFileToIPFS(File file){
     /**
      * 上传成功系统展示
      */
-    private void uploadSuccessNotify(){
+    private void uploadSuccessNotify(MerkleNode node){
+        MessageItem item = new MessageItem();
+        item.setId(UUIDGenerator.getUUID());
+        item.setTimestamp(System.currentTimeMillis());
+        item.setSenderId(cureent.getId());
+        item.setSenderUsername(cureent.getNick());
+        item.setMessageType(MessageItem.RIGHT_TEXT);
+        item.setAvatar(cureent.getAvatar());
+        item.setFrom(cureent.getFrom());
+        StringBuilder contentSb = new StringBuilder();
+        String fileName = IPMParser.urlDecode(node.name.get());
+        logger.info(fileName);
+        contentSb.append("分享文件【").append(fileName).append("】成功.\n");
+        contentSb.append("可通下面串码查询:\n");
+        contentSb.append(node.hash.toBase58()).append("\n");
+        //contentSb.append("或在浏览器输入链接：\n");
+        //contentSb.append("http://127.0.0.1:8080/ipfs/").append(node.hash.toBase58());
+        item.setMessageContent(contentSb.toString());
+        boolean need = false;
+        try {
+            MainFrame.getContext().getMessageSender().ipfsSendMessage(contentSb.toString());
+        } catch (Exception e) {
+            need = true;
+            e.printStackTrace();
+        }
+        if(messagePanel!=null&&messageItems!=null){
+            item.setNeedToResend(need);
+            messageItems.add(item);
+            int pos = messageItems.size();
+            messagePanel.getListView().notifyItemInserted(pos-1,true);
+        }
+
+        // ipfs.pubsub.pub(IpfsMessageSender.NBSWORLD_IMS_TOPIC,)
 
     }
 
@@ -66,4 +116,6 @@ private void uploadSuccessNotify(){
     private void uploadSuccessSaveDB( List<MerkleNode> list){
 
     }
+
+
 }
diff --git a/src/main/java/io/nbs/client/ui/panels/im/ChatPanel.java b/src/main/java/io/nbs/client/ui/panels/im/ChatPanel.java
@@ -1,13 +1,16 @@
 package io.nbs.client.ui.panels.im;
 
 import com.nbs.ui.components.NbsBorder;
+import io.nbs.client.Launcher;
 import io.nbs.client.adapter.ReceiverMessageAdapter;
 import io.nbs.client.cnsts.ColorCnst;
+import io.nbs.client.listener.IPFSFileUploader;
 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.DataBaseUtil;
 import io.nbs.commons.utils.UUIDGenerator;
 import io.nbs.sdk.beans.MessageItem;
 import io.ipfs.nbs.helper.MessageViewHolderCacheHelper;
@@ -55,19 +58,22 @@ public class ChatPanel extends ParentAvailablePanel {
     // 每次加载的消息条数
     private static final int PAGE_LENGTH = 20;
 
-
     private static List<String> remoteHistoryLoadedRooms = new ArrayList<>();
 
     private java.util.List<MessageItem> messages = new ArrayList<>();
 
-
     private MessageViewHolderCacheHelper messageViewHolderCacheHelper;
     private MessageAdapter adapter;
 
-    private TMChatShowPanel chatShowPanel;
+
     private PeerInfo current;
 
     private ReceiverMessageAdapter receiverMessageAdapter;
+    /**
+     *
+     */
+    private IPFSFileUploader ipfsFileUploader;
+
 
     /**
      *
@@ -79,6 +85,7 @@ public ChatPanel(JPanel parent) {
         current = MainFrame.getContext().getCurrentPeer();
         messageViewHolderCacheHelper = new MessageViewHolderCacheHelper();
 
+
         initComponents();
         /**
          * 消息接收
@@ -101,7 +108,8 @@ private void initComponents(){
 //        chatShowPanel = new TMChatShowPanel(this);
 //        chatShowPanel.setBorder(null);
 
-        messageEditorPanel = new MessageEditorPanel(this);
+        ipfsFileUploader = new IPFSFileUploader(Launcher.getContext().getIpfs(),DataBaseUtil.getSqlSession(),messagePanel,messages);
+        messageEditorPanel = new MessageEditorPanel(this,ipfsFileUploader);
         //messageEditorPanel.setPreferredSize(new Dimension(MainFrame.DEFAULT_WIDTH*2/5,200));
 
     }
@@ -329,4 +337,7 @@ public static ChatPanel getContext() {
     }
 
 
+    public IPFSFileUploader getIpfsFileUploader() {
+        return ipfsFileUploader;
+    }
 }
diff --git a/src/main/java/io/nbs/client/ui/panels/im/IMFileActionListener.java b/src/main/java/io/nbs/client/ui/panels/im/IMFileActionListener.java
@@ -0,0 +1,43 @@
+package io.nbs.client.ui.panels.im;
+
+import UI.AppMainWindow;
+import io.nbs.client.Launcher;
+import io.nbs.client.listener.IPFSFileUploader;
+import io.nbs.client.ui.frames.MainFrame;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+/**
+ * @Package : io.nbs.client.ui.panels.im
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/7/5-17:57
+ * Copyright (c) 2018, NBS , lambor.c<lanbery@gmail.com>.
+ * All rights reserved.
+ */
+public class IMFileActionListener implements ActionListener {
+    private static Logger logger = LoggerFactory.getLogger(IMFileActionListener.class);
+
+    private IPFSFileUploader fileUploader;
+
+    private JFileChooser jFileChooser;
+    public IMFileActionListener(IPFSFileUploader fileUploader,JFileChooser fileChooser) {
+        this.fileUploader = fileUploader;
+        this.jFileChooser = fileChooser;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        this.jFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        this.jFileChooser.showDialog(Launcher.getContext().getCurrentFrame(),"选择");
+        File selection = jFileChooser.getSelectedFile();
+        if(selection==null)return;
+        logger.info(selection.getAbsolutePath());
+        fileUploader.addFileToIPFS(selection);
+    }
+}
diff --git a/src/main/java/io/nbs/client/ui/panels/im/messages/MessageEditorPanel.java b/src/main/java/io/nbs/client/ui/panels/im/messages/MessageEditorPanel.java
@@ -2,6 +2,7 @@
 
 import UI.AppMainWindow;
 import UI.ConstantsUI;
+import io.nbs.client.listener.IPFSFileUploader;
 import io.nbs.client.ui.components.NBSIconButton;
 import io.nbs.client.ui.components.NBSButton;
 import io.nbs.client.cnsts.FontUtil;
@@ -13,9 +14,12 @@
 import com.nbs.ui.frames.ScreenShot;
 import io.nbs.client.ui.components.NBSIcon;
 import io.nbs.client.ui.panels.ParentAvailablePanel;
+import io.nbs.client.ui.panels.im.IMFileActionListener;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
@@ -51,14 +55,17 @@ public class MessageEditorPanel extends ParentAvailablePanel {
     private NBSIconButton cutIcon;
     private NBSIconButton fileIcon;
 
-
+    private JFileChooser jFileChooser;
+    private IMFileActionListener imFileActionListener;
 
     /**
      *
      * @param parent
      */
-    public MessageEditorPanel(JPanel parent) {
+    public MessageEditorPanel(JPanel parent, IPFSFileUploader uploader) {
         super(parent);
+        jFileChooser = new JFileChooser();
+        imFileActionListener = new IMFileActionListener(uploader,jFileChooser);
         initComponents();
         initView();
         setListeners();
@@ -162,6 +169,10 @@ private void initView(){
      *
      */
     private void setListeners(){
+        if(this.imFileActionListener!=null){
+            fileIcon.addActionListener(imFileActionListener);
+        }
+
         fileIcon.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -238,4 +249,6 @@ public JPanel getSendPanel() {
     public NBSButton getSendButton() {
         return sendButton;
     }
+
+
 }
diff --git a/src/main/java/io/nbs/sdk/prot/IPMParser.java b/src/main/java/io/nbs/sdk/prot/IPMParser.java
@@ -24,7 +24,7 @@
  * All rights reserved.
  */
 public class IPMParser {
-    private static final String DEFAULT_ENCODING = "UTF-8";
+    public static final String DEFAULT_ENCODING = "UTF-8";
 
     /**
      * 默认NORMAL
@@ -54,6 +54,22 @@ public static String urlEncode(String content){
             return content;
         }
     }
+
+    /**
+     *
+     * @param url
+     * @return
+     */
+    public static String urlDecode(String url){
+        if(null==url)return "";
+
+        try {
+            url = URLDecoder.decode(url,DEFAULT_ENCODING);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return url;
+    }
     /**
      *
      * @param data

Original file line number	Diff line number	Diff line change
`@@ -206,4 +206,12 @@ public IPFS getIpfs() {`
`206`	`206`	`public static SqlSession getSqlSession() {`
`207`	`207`	`return sqlSession;`
`208`	`208`	`}`
	`209`	`+`
	`210`	`+ /**`
	`211`	`+ *`
	`212`	`+ * @return`
	`213`	`+ */`
	`214`	`+ public JFrame getCurrentFrame() {`
	`215`	`+ return currentFrame;`
	`216`	`+ }`
`209`	`217`	`}`