优化ipfs api调用

Author: lamborc

profile/nbs.db

@@ -142,7 +142,7 @@ public AppMainWindow(){
 
         initialize();
         //订阅世界消息
-        subCtrlWorld();
+       // subCtrlWorld();
         //广播自己上线
         broadcastOnline();
         ImPeersService imPeersService = new ImPeersService();
@@ -153,8 +153,6 @@ public AppMainWindow(){
 
     }
 
-
-
     /**
      *
      */
@@ -554,10 +552,9 @@ private void subCtrlWorld(){
             @Override
             public void run() {
                 try {
-                    Stream<Map<String,Object>> subs = ipfs.pubsub.sub(IPFSHelper.NBSWORLD_IMS_TOPIC);
+                    Stream<Map<String,Object>> subs = ipfs.pubsub.sub(IPFSHelper.NBSWORLD_CTRL_TOPIC);
                     List<Map<String,Object>> messages = subs.limit(1).collect(Collectors.toList());
                     logger.info(JSONParser.toString(messages));
-                    //TODO
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

src/main/java/UI/AppMainWindow.java

@@ -15,17 +15,16 @@
 import com.nbs.ui.components.ColorCnst;
 import com.nbs.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
-import io.ipfs.api.JSONParser;
+
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 /**
  * @Package : UI.panel.im
@@ -41,7 +40,7 @@ public class IMPanel extends NBSAbstractPanel {
     private static IMPanel context;
 
     private boolean testRunning = false;
-
+    public static AtomicInteger msgMax = new AtomicInteger(0);
     /**
      * 左侧IM peers
      */
@@ -187,7 +186,7 @@ private JPanel buildMessMainPanel(){
         messPanel = new WihteBackJPanel();
         messPanel.setLayout(new BorderLayout());
         int downHeight = 116;
-        int upHeight = ConstantsUI.MAIN_WINDOW_HEIGHT -downHeight-24;
+        int upHeight = ConstantsUI.MAIN_WINDOW_HEIGHT -24;
 
         /**
          * 上部
@@ -237,7 +236,7 @@ private JPanel buildMessMainPanel(){
         imOperPanel.add(sendButton,BorderLayout.SOUTH);
 
         //
-        imOperPanel.add(testButton,BorderLayout.NORTH);
+        //imOperPanel.add(testButton,BorderLayout.NORTH);
         imDownContainer.add(imOperPanel,BorderLayout.EAST);
 
         messPanel.add(imupContainer,BorderLayout.CENTER);
@@ -284,6 +283,13 @@ private void sendMsg(){
             AppMainWindow.ipfs.pubsub.pub(topic,Base64CodecUtil.encodeByCtrlType(sendContent,Base64CodecUtil.CtrlTypes.normal));
             inputArea.setText("");
             sb.append(ConstantsUI.ENTER_CHARACTER);
+            if(msgMax.intValue()>18){
+                msgMax.set(0);
+                imMSGShow.setText("");
+                //清空
+            }
+            int next = msgMax.intValue() +1;
+            msgMax.set(next);
             imMSGShow.append(sb.toString());
         } catch (Exception e) {
             e.printStackTrace();
@@ -332,6 +338,13 @@ public void contactsItemChanged(ContactsItem item){
 
     public static void appendMsgShow(List<ContactsItem> items,IpfsMessage ipfsMessage){
         if(ipfsMessage==null)return;
+        if(msgMax.intValue()>18){
+            msgMax.set(0);
+            imMSGShow.setText("");
+            //清空
+        }
+        int next = msgMax.intValue() +1;
+        msgMax.set(next);
         String formid = ipfsMessage.getFrom();
         String nick = formid;
         //
@@ -346,7 +359,7 @@ public static void appendMsgShow(List<ContactsItem> items,IpfsMessage ipfsMessag
 
         StringBuilder sb = new StringBuilder();
         sb.append(nick).append(">>").append(ipfsMessage.getTime()).append(ConstantsUI.ENTER_CHARACTER);
-        sb.append(ipfsMessage.getContents()).append(ConstantsUI.ENTER_CHARACTER);
+        sb.append(ConstantsUI.WSPACE_CHARACTER4).append(ipfsMessage.getContents()).append(ConstantsUI.ENTER_CHARACTER);
         imMSGShow.append(sb.toString());
     }
 

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

@@ -0,0 +1,23 @@
+package com.nbs.biz.dao;
+
+import org.apache.ibatis.session.SqlSession;
+
+
+
+/**
+ * @Package : com.nbs.biz.dao
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/27-16:36
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class ContactsDao extends BasicDao {
+    public ContactsDao(SqlSession session) {
+        super(session,ContactsDao.class);
+    }
+
+    public int existCountByPeerId(String peerId){
+       return 0;
+    }
+}

src/main/java/com/nbs/biz/dao/ContactsDao.java

@@ -9,9 +9,10 @@
  * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
  * All rights reserved.
  */
-public class ContactsModel extends BasicModel {
+public class ContactsEntity extends BasicModel {
 
     private String id;
+    private String fromid;
     private String nick;
     /**
      * hash58
@@ -28,18 +29,27 @@ public class ContactsModel extends BasicModel {
     private Integer ctime;
     private Integer lmtime;
 
-    public ContactsModel(String id, String nick, String avatar, String avatarSuffix) {
+
+    public ContactsEntity(String id, String nick, String avatar, String avatarSuffix) {
         this.id = id;
         this.nick = nick;
         this.avatar = avatar;
         this.avatarSuffix = avatarSuffix;
     }
 
-    public ContactsModel(String id, String nick) {
+    public ContactsEntity(String id, String nick) {
         this.id = id;
         this.nick = nick;
     }
 
+    public String getFromid() {
+        return fromid;
+    }
+
+    public void setFromid(String fromid) {
+        this.fromid = fromid;
+    }
+
     public String getId() {
         return id;
     }

…ava/com/nbs/biz/model/ContactsModel.java …va/com/nbs/biz/model/ContactsEntity.javasrc/main/java/com/nbs/biz/model/ContactsModel.java renamed to src/main/java/com/nbs/biz/model/ContactsEntity.java src/main/java/com/nbs/biz/model/ContactsModel.java renamed to src/main/java/com/nbs/biz/model/ContactsEntity.java

@@ -0,0 +1,73 @@
+package com.nbs.biz.service;
+
+import com.nbs.biz.dao.BasicDao;
+import com.nbs.biz.model.BasicModel;
+
+import java.util.List;
+
+/**
+ * @Package : com.nbs.biz.service
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/27-17:52
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class BasicService<T extends BasicDao, E extends BasicModel> {
+    T dao;
+
+    public void setDao(T dao)
+    {
+        this.dao = dao;
+    }
+
+    public int insert(BasicModel model)
+    {
+        return dao.insert(model);
+    }
+
+    public List<E> findAll()
+    {
+        return dao.findAll();
+    }
+
+    public E findById(String id)
+    {
+        return (E) dao.findById(id);
+    }
+
+    public List<E> find(String field, Object val)
+    {
+        return dao.find(field, val);
+    }
+
+    public int delete(String id)
+    {
+        return dao.delete(id);
+    }
+
+    public int deleteAll()
+    {
+        return dao.deleteAll();
+    }
+
+    public int update(BasicModel model)
+    {
+        return dao.update(model);
+    }
+
+    public int updateIgnoreNull(BasicModel model)
+    {
+        return dao.updateIgnoreNull(model);
+    }
+
+    public int count()
+    {
+        return dao.count();
+    }
+
+    public boolean exist(String id)
+    {
+        return dao.exist(id);
+    }
+}

src/main/java/com/nbs/biz/service/BasicService.java

@@ -0,0 +1,34 @@
+package com.nbs.biz.service;
+
+import com.nbs.biz.dao.BasicDao;
+import com.nbs.biz.dao.ContactsDao;
+import com.nbs.biz.model.ContactsEntity;
+import org.apache.ibatis.session.SqlSession;
+
+/**
+ * @Package : com.nbs.biz.service
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/27-17:42
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class ContactsService  extends BasicService<ContactsDao,ContactsEntity> {
+    /**
+     *
+     * @param session
+     */
+    public ContactsService(SqlSession session) {
+        dao = new ContactsDao(session);
+        setDao(dao);
+    }
+
+    public int insertOrUpdate(ContactsEntity entity){
+
+        if(exist(entity.getId())){
+            return update(entity);
+        }else {
+            return insert(entity);
+        }
+    }
+}

src/main/java/com/nbs/biz/service/ContactsService.java

@@ -30,6 +30,9 @@ public class ContactsItemAdapter extends BaseAdapter<ContactsItemViewHolder> {
     private List<ContactsItem> contactsItems;
     private List<ContactsItemViewHolder> viewHolders = new ArrayList<>();
 
+    /**
+     * 首拼音
+     */
     Map<Integer, String> positionMap = new HashMap<>();
     /**
      * 选中的
@@ -149,7 +152,7 @@ public void mouseExited(MouseEvent e)
             {
                 if (selectedViewHolder != viewHolder)
                 {
-                    setBackground(viewHolder, ColorCnst.DARK);
+                    setBackground(viewHolder, ColorCnst.DARKER);
                 }
             }
         });