2.0.1

Author: lamborc

src/main/java/io/nbs/client/helper/AvatarImageHandler.java

@@ -43,13 +43,13 @@ public static AvatarImageHandler getInstance() {
     /**
      * 联系人头像 32 *32
      * 40*40
-     * .nbs/cache/avatars/thumbs
+     * .nbs/cache/avatars/custom
      */
-    private static String AVATAR_THUMB_HOME;
+    private static String AVATAR_CUSTOM_HOME;
     /**
-     * 用户配置头标
+     *  用户配置头标
      * .nbs/profile/avatars/
-     * 放置128*128 上传IPFS
+     *  放置128*128 上传IPFS
      * .nbs/profile/avatars/thumbs
      * 64*64 hashFileName
      */
@@ -64,7 +64,7 @@ public static AvatarImageHandler getInstance() {
     private AvatarImageHandler() {
         AVATAR_PROFILE_HOME = AppGlobalCnst.consturactPath(Launcher.appBasePath,"profile","avatars");
         AVATAR_ORIGIN_HOME = AppGlobalCnst.consturactPath(Launcher.appBasePath,"profile","origin");
-        AVATAR_THUMB_HOME = AppGlobalCnst.consturactPath(Launcher.appBasePath,"cache","avatars","thumbs");
+        AVATAR_CUSTOM_HOME = AppGlobalCnst.consturactPath(Launcher.appBasePath,"cache","avatars","custom");
     }
 
     /**
@@ -84,7 +84,7 @@ public void initAvatarLocalDir(){
         destFile = new File(AVATAR_ORIGIN_HOME);
         if(!destFile.exists())destFile.mkdirs();
 
-        destFile = new File(AVATAR_THUMB_HOME);
+        destFile = new File(AVATAR_CUSTOM_HOME);
         if(!destFile.exists())destFile.mkdirs();
     }
 
@@ -148,14 +148,14 @@ public void createdAvatar4Profile(File srcFile,String hashFileName) throws Excep
     }
 
     /**
-     * 40
+     * 40*40png
      * @param srcFile
      * @param hashFileName
      * @return
      */
     public ImageIcon createContactsAvatar(File srcFile,String hashFileName){
         if(srcFile==null||!srcFile.exists())return null;
-        String targetPath = AppGlobalCnst.consturactPath(AVATAR_THUMB_HOME,hashFileName);
+        String targetPath = AppGlobalCnst.consturactPath(AVATAR_CUSTOM_HOME,hashFileName);
         File thumbs4Contacts = new File(targetPath);
         try {
             generateThumbScale(srcFile,thumbs4Contacts,DEFAULT_CONTACTS_THUMB_SIZE);
@@ -222,10 +222,9 @@ private void compressImage(Image img,File destFile,int w,int h) throws IOExcepti
     /**
      * 联系人头像 32 *32
      * 40*40
-     * .nbs/cache/avatars/thumbs
-     */
-    public static String getAvatarThumbHome() {
-        return AVATAR_THUMB_HOME;
+     * .nbs/cache/avatars/custom
+    public static String getAvatarCustomHome() {
+        return AVATAR_CUSTOM_HOME;
     }
 
     /**

src/main/java/io/nbs/client/ui/frames/InitialFrame.java

@@ -573,7 +573,7 @@ private boolean uploadAvatar(){
                     tempInfo.setAvatar(fileHash);
                     tempInfo.setAvatarSuffix(name.substring(name.lastIndexOf(".")));
                     //TODO 存数据库upload
-                    String avatarFileName = fileHash+ name.substring(name.lastIndexOf("."));
+                    String avatarFileName = fileHash+".png";
                     try {
                         imageHandler.createContactsAvatar(file,avatarFileName);
                         ImageIcon icon = new ImageIcon(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),name));

src/main/java/io/nbs/client/ui/panels/info/InfoHeaderPanel.java

@@ -229,7 +229,7 @@ private void uploadAvatar(){
                     /**
                      * 40*40
                      */
-                    String hashFileName = fileHash+ name.substring(name.lastIndexOf("."));
+                    String hashFileName = fileHash+".png";
                     try {
                         imageHandler.createContactsAvatar(file,hashFileName);
                         Image img =Toolkit.getDefaultToolkit().getImage(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),name));