调整图片上传后第二次不刷新

lamborc · lamborc · commit c6b01cca9926 · 2018-07-02T14:31:50.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
@@ -96,7 +96,7 @@ public void launch(){
         try{
             ipfs =  new IPFS(cfgHelper.getIPFSAddress());
             boolean first = needInitConfig(ipfs);
-           // first = true;
+            //first = true;
             if(first){
                 currentFrame = new InitialFrame(ipfs);
             }else {
@@ -156,6 +156,8 @@ private boolean needInitConfig(IPFS ipfs) throws IOException {
                 currentPeer.setAvatar(avatar.toString());
                 currentPeer.setAvatarSuffix(avatarSuffix.toString());
             }
+            Object avatarName = cfg.get(ConfigurationHelper.JSON_AVATAR_NAME_KEY);
+            if(avatarName!=null)currentPeer.setAvatarName((String)avatarName);
             return false;
         }else {
             return true;
diff --git a/src/main/java/io/nbs/client/adapter/ContactsItemAdapter.java b/src/main/java/io/nbs/client/adapter/ContactsItemAdapter.java
@@ -82,13 +82,13 @@ public AvatarViewHolder onCreateHeaderViewHolder(int viewType, int position) {
     public void onBindHeaderViewHolder(AvatarViewHolder viewHolder, int position) {
         ContactsAvatarViewHolder holder = (ContactsAvatarViewHolder) viewHolder;
         holder.setPreferredSize(new Dimension(100, 25));
-        holder.setBackground(ColorCnst.ITEM_SELECTED_LIGHT);
-        holder.setBorder(new NbsBorder(NbsBorder.BOTTOM));
+        holder.setBackground(ColorCnst.CONTACTS_ITEM_GRAY_MAIN);//字母分类背景
+        holder.setBorder(new NbsBorder(NbsBorder.BOTTOM,ColorCnst.CONTACTS_ITEM_LINE_GRAY));
         holder.setOpaque(true);
 
         holder.letterLabel = new JLabel();
         holder.letterLabel.setText(holder.getLetter());
-        holder.letterLabel.setForeground(ColorCnst.FONT_GRAY);
+        holder.letterLabel.setForeground(ColorCnst.FONT_GRAY_DARKER);
 
         holder.setLayout(new BorderLayout());
         holder.add(holder.letterLabel, BorderLayout.WEST);
diff --git a/src/main/java/io/nbs/client/cnsts/ColorCnst.java b/src/main/java/io/nbs/client/cnsts/ColorCnst.java
@@ -20,22 +20,23 @@ public class ColorCnst {
     public static Color WINDOW_BACKGROUND = new Color(238, 238, 238);
     public static final Color WINDOW_BACKGROUND_LIGHT = new Color(250, 250, 250);
 
-    public static Color SCROLL_BAR_TRACK_LIGHT = new Color(214, 214, 214);
+
     public static Color FONT_WHITE = new Color(255, 255, 255);
     public static Color FONT_GRAY = new Color(152, 152, 152);
     public static Color FONT_GRAY_DARKER = new Color(152, 152, 152);
     public static Color DARKER = new Color(38, 41, 46);
     public static Color ITEM_SELECTED_DARK = new Color(57, 63, 68);
     public static Color ITEM_SELECTED = new Color(65, 71, 78);
-    public static Color ITEM_SELECTED_LIGHT = new Color(228, 228, 228);
-    public static Color LIGHT_GRAY = new Color(222, 222, 222);
+    public static Color ITEM_SELECTED_LIGHT = new Color(168, 168, 168);
+    public static Color LIGHT_GRAY = new Color(228, 228, 228);
     public static Color DIALOG_BORDER = new Color(204, 204, 204);
     public static Color PROGRESS_BAR_START = new Color(178, 226, 129);
     public static Color PROGRESS_BAR_END = new Color(133, 194, 97);
     public static Color MAIN_COLOR = new Color(54, 172, 72);
     public static Color MAIN_COLOR_DARKER = new Color(51, 154, 69);
     public static final Color SCROLL_BAR_THUMB = new Color(122, 122, 122);
     public static final Color SCROLL_BAR_TTRACK = new Color(175, 175, 175);
+    public static Color SCROLL_BAR_TRACK_LIGHT = new Color(214, 214, 214);
 
     public static final Color CONTACTS_ITEM_GRAY_MAIN = new Color(221, 221, 221);
     public static final Color CONTACTS_ITEM_LINE_GRAY = new Color(207, 207, 207);
diff --git a/src/main/java/io/nbs/client/ui/components/EditableAvatarPanel.java b/src/main/java/io/nbs/client/ui/components/EditableAvatarPanel.java
@@ -0,0 +1,36 @@
+package io.nbs.client.ui.components;
+
+import javax.swing.*;
+import java.io.File;
+
+/**
+ * @Package : io.nbs.client.ui.components
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/7/2-13:51
+ * Copyright (c) 2018, NBS , lambor.c<lanbery@gmail.com>.
+ * All rights reserved.
+ */
+public class EditableAvatarPanel extends JPanel {
+    private static EditableAvatarPanel context;
+    private static String text;
+
+    private NBSButton editorBTN;
+    private File selectFile;
+
+    private int imageMaxW = 200;
+    private int imageMaxH = 200;
+
+
+    public static EditableAvatarPanel getContext() {
+        return context;
+    }
+
+    /**
+     * 自适应图片
+     */
+    class ImageAdjustLabel extends JLabel
+    {
+
+    }
+}
diff --git a/src/main/java/io/nbs/client/ui/components/NbsListView.java b/src/main/java/io/nbs/client/ui/components/NbsListView.java
@@ -79,7 +79,7 @@ public void setScrollHiddenOnMouseLeave(JComponent jComponent){
             scrollMouseListener = new MouseAdapter() {
                 @Override
                 public void mouseEntered(MouseEvent e) {
-                    setScrollBarColor(ColorCnst.SCROLL_BAR_THUMB,ColorCnst.WINDOW_BACKGROUND);
+                    setScrollBarColor(ColorCnst.SCROLL_BAR_THUMB,ColorCnst.SCROLL_BAR_TTRACK);
                     getVerticalScrollBar().repaint();
                     super.mouseEntered(e);
                 }
diff --git a/src/main/java/io/nbs/client/ui/components/ScrollUI.java b/src/main/java/io/nbs/client/ui/components/ScrollUI.java
@@ -51,7 +51,7 @@ public void setTrackColor(Color trackColor) {
     @Override
     protected void configureScrollBarColors() {
         //滑道
-        setThumbBounds(0,0,3,10);
+        setThumbBounds(0,0,2,5);
     }
 
     /**
@@ -65,7 +65,7 @@ protected void configureScrollBarColors() {
      */
     @Override
     public Dimension getPreferredSize(JComponent c) {
-        c.setPreferredSize(new Dimension(7,0));
+        c.setPreferredSize(new Dimension(5,0));
         return super.getPreferredSize(c);
     }
 
diff --git a/src/main/java/io/nbs/client/ui/filters/ImageFileFilter.java b/src/main/java/io/nbs/client/ui/filters/ImageFileFilter.java
diff --git a/src/main/java/io/nbs/client/ui/filters/ImagesFiltFilter.java b/src/main/java/io/nbs/client/ui/filters/ImagesFiltFilter.java
@@ -0,0 +1,26 @@
+package io.nbs.client.ui.filters;
+
+import javax.swing.filechooser.FileFilter;
+import java.io.File;
+
+/**
+ * @Package : io.nbs.client.ui.filters
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/7/2-13:23
+ * Copyright (c) 2018, NBS , lambor.c<lanbery@gmail.com>.
+ * All rights reserved.
+ */
+public class ImagesFiltFilter extends FileFilter {
+    @Override
+    public boolean accept(File f) {
+        String name = f.getName();
+        name = name.toLowerCase();
+        return f.isDirectory()|| name.endsWith(".png")||name.endsWith("jpg")||name.endsWith("gif")||name.endsWith("jpeg");
+    }
+
+    @Override
+    public String getDescription() {
+        return ".jpg,.jpeg,.gif,.png";
+    }
+}
diff --git a/src/main/java/io/nbs/client/ui/frames/InitialFrame.java b/src/main/java/io/nbs/client/ui/frames/InitialFrame.java
@@ -13,6 +13,7 @@
 import io.nbs.client.cnsts.ColorCnst;
 import io.nbs.client.cnsts.FontUtil;
 import io.nbs.client.cnsts.OSUtil;
+import io.nbs.client.ui.filters.ImagesFiltFilter;
 import io.nbs.commons.helper.AvatarImageHandler;
 import io.nbs.commons.helper.ConfigurationHelper;
 import io.nbs.sdk.beans.PeerInfo;
@@ -399,7 +400,10 @@ public void actionPerformed(ActionEvent e) {
         avatarLabel.addMouseListener(new AbstractMouseListener(){
             @Override
             public void mouseClicked(MouseEvent e) {
-                uploadAvatar();
+                boolean res = uploadAvatar();
+                if(!res){
+
+                }
                 super.mouseClicked(e);
             }
 
@@ -535,13 +539,17 @@ private void initWorkDist(){
      * 64*64 .nbs/profile/avatars/thumbs/peerId
      * 40*40 .nbs/cache/avatars/thumbs/hash
      */
-    private void uploadAvatar(){
+    private boolean uploadAvatar(){
         fileChooser = new JFileChooser();
         fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         fileChooser.showDialog(this,"选择图片");
-       // fileChooser.setFileFilter(new ImageFileFilter());
+        ImagesFiltFilter filtFilter = new ImagesFiltFilter();
+        fileChooser.addChoosableFileFilter(filtFilter);
+        fileChooser.setFileFilter(filtFilter);
+
         File file = fileChooser.getSelectedFile();
-        if(file!=null){
+        if(file!=null)
+        {
             String name = file.getName();//源文件名
             String avatarPeerName = tempInfo.getId() + name.substring(name.lastIndexOf("."));
             new Thread(()->{
@@ -550,8 +558,8 @@ private void uploadAvatar(){
                 FileOutputStream fos = null;
                 try {
                     //上传前先压缩
-                    imageHandler.createdAvatar4Profile(file,avatarPeerName);
-                    File file128 = new File(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),avatarPeerName));
+                    imageHandler.createdAvatar4Profile(file,null);
+                    File file128 = new File(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),name));
                     NamedStreamable.FileWrapper fileWrapper = new NamedStreamable.FileWrapper(file128);
 
                     nodes = ipfs.add(fileWrapper);
@@ -563,7 +571,7 @@ private void uploadAvatar(){
                     String avatarFileName = fileHash+ name.substring(name.lastIndexOf("."));
                     try {
                         imageHandler.createContactsAvatar(file,avatarFileName);
-                        ImageIcon icon = new ImageIcon(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),avatarPeerName));
+                        ImageIcon icon = new ImageIcon(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),name));
                         if(icon!=null){
                             logger.info(fileHash);
                             avatarLabel.setIcon(icon);
@@ -580,6 +588,10 @@ private void uploadAvatar(){
                    statusPanel.setVisible(true);
                 }
             }).start();
+            return true;
+        }else {
+            JOptionPane.showMessageDialog(this,"请选择图片类型文件.");
+            return false;
         }
     }
 }
diff --git a/src/main/java/io/nbs/client/ui/panels/ToolbarPanel.java b/src/main/java/io/nbs/client/ui/panels/ToolbarPanel.java
@@ -94,7 +94,7 @@ private ImageIcon getAvatarIcon(PeerInfo peer){
         ImageIcon icon;
         if(peer!=null&&StringUtils.isNotBlank(peer.getId())
                 &&StringUtils.isNotBlank(peer.getAvatarSuffix())){
-            String a48Path = AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),"thumbs",peer.getId()+peer.getAvatarSuffix());
+            String a48Path = AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),"thumbs",peer.getAvatarName());
             System.out.println(a48Path);
             if((new File(a48Path)).exists()){
                 icon = new ImageIcon(a48Path);
diff --git a/src/main/java/io/nbs/client/ui/panels/im/IMPeersPanel.java b/src/main/java/io/nbs/client/ui/panels/im/IMPeersPanel.java
@@ -61,6 +61,9 @@ public IMPeersPanel(JPanel parent) {
      */
     private void initComponents() {
         peerlistView = new NbsListView();
+        peerlistView.setScrollBarColor(ColorCnst.SCROLL_BAR_THUMB,ColorCnst.SCROLL_BAR_TRACK_LIGHT);
+        peerlistView.setContentPanelBackground(ColorCnst.DARK);
+
 
         peerService = new PeerServiceImpl(Launcher.getContext().getIpfs());
 
diff --git a/src/main/java/io/nbs/client/ui/panels/im/views/ContactsItemViewHolder.java b/src/main/java/io/nbs/client/ui/panels/im/views/ContactsItemViewHolder.java
@@ -32,12 +32,12 @@ public ContactsItemViewHolder() {
     private void initComponents(){
         setPreferredSize(new Dimension(100,50));
         setBackground(ColorCnst.CONTACTS_ITEM_GRAY_MAIN);
-        setBorder(new NbsBorder(NbsBorder.BOTTOM,ColorCnst.CONTACTS_ITEM_LINE_GRAY));
+        setBorder(new NbsBorder(NbsBorder.BOTTOM,ColorCnst.LIGHT_GRAY));
         setOpaque(true);
         setForeground(ColorCnst.FONT_WHITE);
 
         roomName.setFont(FontUtil.getDefaultFont(13));
-        roomName.setForeground(ColorCnst.ITEM_SELECTED);
+        roomName.setForeground(ColorCnst.FONT_BLACK);//ITEM_SELECTED
     }
 
     /**
diff --git a/src/main/java/io/nbs/client/ui/panels/info/InfoHeaderPanel.java b/src/main/java/io/nbs/client/ui/panels/info/InfoHeaderPanel.java
@@ -11,13 +11,15 @@
 import io.nbs.client.cnsts.FontUtil;
 import io.nbs.commons.helper.AvatarImageHandler;
 import io.nbs.commons.helper.ConfigurationHelper;
+import io.nbs.commons.utils.IconUtil;
 import io.nbs.sdk.beans.PeerInfo;
 import io.nbs.client.ui.components.GBC;
 import io.nbs.client.ui.components.LCJlabel;
 import io.nbs.client.ui.frames.MainFrame;
 import io.nbs.client.ui.panels.ParentAvailablePanel;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
@@ -90,8 +92,11 @@ private void initView(){
         /**
          * avatar
          */
-        String avatar128Path = AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),self.getId()+self.getAvatarSuffix());
+        String avatar128Path = AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),self.getAvatarName());
         ImageIcon avatar = new ImageIcon(avatar128Path);
+        if(avatar.getImage().getWidth(null)<=0||avatar.getImage().getHeight(null)<=0){
+            avatar = IconUtil.getIcon(this,"/icons/nbs128.png");
+        }
         avatarLabel.setIcon(avatar);
 
         leftPanel.setPreferredSize(new Dimension(150,150));
@@ -198,34 +203,41 @@ private void uploadAvatar(){
         if(file!=null) {
             String name = file.getName();//源文件名
             String avatarPeerName = self.getId() + name.substring(name.lastIndexOf("."));
-            new Thread(()->{
                 List<MerkleNode> nodes;
 
                 FileOutputStream fos = null;
                 try {
                     //上传前先压缩
-                    imageHandler.createdAvatar4Profile(file,avatarPeerName);
-                    File file128 = new File(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),avatarPeerName));
+                    imageHandler.createdAvatar4Profile(file,name);
+                    File file128 = new File(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),name));
+                    file128.getAbsolutePath();
                     NamedStreamable.FileWrapper fileWrapper = new NamedStreamable.FileWrapper(file128);
-
+                    //上传ipfs
                     nodes = ipfs.add(fileWrapper);
                     String fileHash = nodes.get(0).hash.toBase58();
 
                     self.setAvatar(fileHash);
+                    self.setAvatarName(name);
                     self.setAvatarSuffix(name.substring(name.lastIndexOf(".")));
 
                     ipfs.config.set(ConfigurationHelper.JSON_AVATAR_KEY,fileHash);
                     ipfs.config.set(ConfigurationHelper.JSON_AVATAR_SUFFIX_KEY,self.getAvatarSuffix());
                     ipfs.config.set(ConfigurationHelper.JSON_AVATAR_NAME_KEY,name);
 
                     //TODO 存数据库upload
-                    String avatarFileName = fileHash+ name.substring(name.lastIndexOf("."));
+                    /**
+                     * 40*40
+                     */
+                    String hashFileName = fileHash+ name.substring(name.lastIndexOf("."));
                     try {
-                        imageHandler.createContactsAvatar(file,avatarFileName);
-                        ImageIcon icon = new ImageIcon(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),avatarPeerName));
+                        imageHandler.createContactsAvatar(file,hashFileName);
+                        Image img =Toolkit.getDefaultToolkit().getImage(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),name));
+                        ImageIcon icon = new ImageIcon(img);
+                        logger.warn(icon.getDescription());
                         if(icon!=null){
                             logger.info(fileHash);
                             avatarLabel.setIcon(icon);
+                            avatarLabel.validate();
                             avatarLabel.updateUI();
                             MainFrame.getContext().refreshAvatar();
                         }
@@ -238,7 +250,7 @@ private void uploadAvatar(){
                     JOptionPane.showMessageDialog(context,"上传失败");
                     return;
                 }
-            }).start();
+           // new Thread(()->{ }).start();
         }
     }
 
diff --git a/src/main/java/io/nbs/commons/helper/AvatarImageHandler.java b/src/main/java/io/nbs/commons/helper/AvatarImageHandler.java
diff --git a/src/main/java/io/nbs/sdk/beans/PeerInfo.java b/src/main/java/io/nbs/sdk/beans/PeerInfo.java

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void setScrollHiddenOnMouseLeave(JComponent jComponent){`
`79`	`79`	`scrollMouseListener = new MouseAdapter() {`
`80`	`80`	`@Override`
`81`	`81`	`public void mouseEntered(MouseEvent e) {`
`82`		`- setScrollBarColor(ColorCnst.SCROLL_BAR_THUMB,ColorCnst.WINDOW_BACKGROUND);`
	`82`	`+ setScrollBarColor(ColorCnst.SCROLL_BAR_THUMB,ColorCnst.SCROLL_BAR_TTRACK);`
`83`	`83`	`getVerticalScrollBar().repaint();`
`84`	`84`	`super.mouseEntered(e);`
`85`	`85`	`}`