增加联系人框

Author: lamborc

.gitignore

@@ -26,4 +26,4 @@ hs_err_pid*
 # IDEA config
 *.impl
 *.iml
-.idea/
+.idea/

config/nbs-conf.properties

@@ -5,5 +5,6 @@ nbs.client.merkle.add.log.name=.merkle
 nbs.client.merkle.root.hash=skjfhsafkdasfd
 
 nbs.client.profile.root=profile
+nbs.client.files.root=nbs
 
 nbs.server.address=/ip4/127.0.0.1/tcp/5001

nbs/readme.md

@@ -0,0 +1 @@
+#NBS 文件目录

src/main/java/UI/AppMainWindow.java

@@ -71,6 +71,13 @@ public class AppMainWindow {
 
     public static String PROFILE_NICKNAME = "";
 
+    /**
+     *
+     */
+    public static String NBS_FILES_ROOT_PATH ;
+
+    public static String NBS_FILES_IPFS_ROOT;
+
     /**
      *
      */
@@ -183,6 +190,12 @@ private void loadEnv(){
             logger.info(k+"="+v);
         }
         logger.info("ENV ============================<<");
+        NBS_FILES_ROOT_PATH = ConfigHelper.CURRENT_DIR + ConfigHelper.getNbsFilesRoot();
+        NBS_FILES_IPFS_ROOT = NBS_FILES_ROOT_PATH + File.separator +"ipfs";
+        File ipfsDir = new File(NBS_FILES_IPFS_ROOT);
+        if(ipfsDir.isDirectory()&& !ipfsDir.exists()){
+            ipfsDir.mkdirs();
+        }
 
         File f = new File(ConstantsUI.PROFILE_ROOT);
         if(!f.exists()){

src/main/java/com/nbs/biz/model/ContactsModel.java

@@ -0,0 +1,114 @@
+package com.nbs.biz.model;
+
+/**
+ * @Package : com.nbs.biz.model
+ * @Description :
+ * <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/24-9:06
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class ContactsModel extends BasicModel {
+
+    private String id;
+    private String nick;
+    /**
+     * hash58
+     */
+    private String avatar;
+    /**
+     * .png
+     */
+    private String avatarSuffix;
+
+    private String remark;
+    private String extJson;
+    private String seckey;
+    private Integer ctime;
+    private Integer lmtime;
+
+    public ContactsModel(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) {
+        this.id = id;
+        this.nick = nick;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getNick() {
+        return nick;
+    }
+
+    public void setNick(String nick) {
+        this.nick = nick;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getAvatarSuffix() {
+        return avatarSuffix;
+    }
+
+    public void setAvatarSuffix(String avatarSuffix) {
+        this.avatarSuffix = avatarSuffix;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getExtJson() {
+        return extJson;
+    }
+
+    public void setExtJson(String extJson) {
+        this.extJson = extJson;
+    }
+
+    public String getSeckey() {
+        return seckey;
+    }
+
+    public void setSeckey(String seckey) {
+        this.seckey = seckey;
+    }
+
+    public Integer getCtime() {
+        return ctime;
+    }
+
+    public void setCtime(Integer ctime) {
+        this.ctime = ctime;
+    }
+
+    public Integer getLmtime() {
+        return lmtime;
+    }
+
+    public void setLmtime(Integer lmtime) {
+        this.lmtime = lmtime;
+    }
+}

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

@@ -1,41 +1,44 @@
 package com.nbs.entity;
 
+import com.nbs.utils.CharacterParser;
+
 /**
  * @Package : com.nbs.entity
  * @Description : <p></p>
  * @Author : lambor.c
- * @Date : 2018/6/23-22:44
+ * @Date : 2018/6/24-9:13
  * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
  * All rights reserved.
  */
-public class ContactsItem  implements Comparable<ContactsItem>{
-    private String hash;
+public class ContactsItem implements Comparable<ContactsItem> {
+    /**
+     * hash58
+     */
+    private String id;
+
     private String name;
+
     private String type;
 
-    private ContactsItem(String hash) {
-        this.hash = hash;
-        this.type = TYPE.p.toString();
-    }
+    public ContactsItem() { }
 
-    public ContactsItem(String hash, String name) {
-        this.hash = hash;
+    public ContactsItem(String id, String name) {
+        this.id = id;
         this.name = name;
-        this.type = TYPE.p.toString();
     }
 
-    public ContactsItem(String hash, String name, String type) {
-        this.hash = hash;
+    public ContactsItem(String id, String name, String type) {
+        this.id = id;
         this.name = name;
         this.type = type;
     }
 
-    public String getHash() {
-        return hash;
+    public String getId() {
+        return id;
     }
 
-    public void setHash(String hash) {
-        this.hash = hash;
+    public void setId(String id) {
+        this.id = id;
     }
 
     public String getName() {
@@ -54,15 +57,30 @@ public void setType(String type) {
         this.type = type;
     }
 
+    @Override
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("ContactsItem : {");
+        sb.append("id : ").append(this.id==null ? "" : this.id).append(",");
+        sb.append("name : ").append(this.name==null ? "" : this.name).append(",");
+        sb.append("type : ").append(this.type==null ? "" : this.type);
+        sb.append("}");
+        return sb.toString();
+    }
+
     @Override
     public int compareTo(ContactsItem o) {
-        return 0;
+        if(o==null)return -1;
+        String tc = CharacterParser.getSelling(this.name).toUpperCase();
+        String oc = CharacterParser.getSelling(o.name).toUpperCase();
+        int r = tc.compareTo(oc);
+        return 0==r ? this.id.compareTo(o.getId()) : r;
     }
 
     /**
-     * 群、点
+     *
      */
     public static enum TYPE{
-        p,q;
+        Q,P;
     }
 }

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

@@ -24,7 +24,11 @@
  */
 public class ConfigHelper {
     private static final Logger logger = LoggerFactory.getLogger(ConfigHelper.class);
-    private static final String CONF_ROOT = ConstantsUI.CURRENT_DIR + File.separator+"config" + File.separator;
+    /**
+     * 系统当前路径
+     */
+    public final static String CURRENT_DIR = System.getProperty("user.dir");
+    private static final String CONF_ROOT = CURRENT_DIR + File.separator+"config" + File.separator;
     private static final String CONF_FILE = "nbs-conf.properties";
     public static final String PK_SERVER_STATS = "ipfs.server.stats";
     public static final String PK_CFG_IPFS_ADDR = "nbs.server.address";
@@ -63,6 +67,16 @@ public static String getProperty(String key){
         return env.getProperty(key);
     }
 
+    /**
+     *
+     * @param key
+     * @param defaultVal
+     * @return
+     */
+    public static String getProperty(String key,String defaultVal){
+        return env.getProperty(key,defaultVal);
+    }
+
     /**
      *
      * @param key
@@ -114,6 +128,13 @@ public static String getIpfsAddress(){
         return v;
     }
 
+    /**
+     *
+     * @return
+     */
+    public static String getNbsFilesRoot(){
+        return env.getProperty("nbs.client.files.root","nbs");
+    }
     /**
      *
      * @return

src/main/java/com/nbs/ui/ContactsItemViewHolder.java

@@ -0,0 +1,48 @@
+package com.nbs.ui;
+
+import com.nbs.ui.cnst.FontUtil;
+import com.nbs.ui.components.ColorCnst;
+import com.nbs.ui.components.GBC;
+import com.nbs.ui.components.NbsBorder;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * @Package : com.nbs.ui
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/24-7:47
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class ContactsItemViewHolder extends ViewHolder {
+    public JLabel avatar = new JLabel();
+    public JLabel roomName = new JLabel();
+
+    public ContactsItemViewHolder() {
+        initComponents();
+        initView();
+    }
+
+    private void initComponents(){
+        setPreferredSize(new Dimension(100,50));
+        setBackground(ColorCnst.DARK);
+        setBorder(new NbsBorder(NbsBorder.BOTTOM));
+        setOpaque(true);
+        setForeground(ColorCnst.FONT_WHITE);
+
+        roomName.setFont(FontUtil.getDefaultFont(13));
+        roomName.setForeground(ColorCnst.FONT_WHITE);
+    }
+
+    /**
+     *
+     */
+    private void initView()
+    {
+        setLayout(new GridBagLayout());
+        add(avatar, new GBC(0, 0).setWeight(1, 1).setFill(GBC.BOTH).setInsets(0,5,0,0));
+        add(roomName, new GBC(1, 0).setWeight(10, 1).setFill(GBC.BOTH));
+    }
+}

src/main/java/com/nbs/ui/adapter/BaseAdapter.java

@@ -21,7 +21,7 @@ public abstract class BaseAdapter<T extends ViewHolder> {
     public abstract T onCreateViewHolder(int viewType);
 
 
-    public AvatarViewHolder onCreateHeaderViewHolder(int viewType,int postion){
+    public AvatarViewHolder onCreateHeaderViewHolder(int viewType,int position){
         return null;
     }