调整默认内存

Author: lamborc

conf/nbs.db

@@ -236,7 +236,7 @@ private void processTimeAndAvatar(MessageItem item, MessageItem preItem, BaseMes
                 PeerInfo currentPeer = MainFrame.getContext().getCurrentPeer();
                 try {
                     image =  AvatarUtil.getPeerAvatar(currentPeer);
-                    AvatarUtil.updateCacheIamge(currentPeer.getAvatarName(),image);
+                    AvatarUtil.updateCacheIamge(currentPeer.getAvatar(),image);
                 } catch (IOException e) {
 
                 }

src/main/java/io/nbs/client/adapter/MessageAdapter.java

@@ -387,6 +387,8 @@ public void actionPerformed(ActionEvent e) {
                 if(b){
                     complete = operatorService.initSaveSelf(tempInfo,"首次登陆初始化");
                 }
+                //更新缓存
+
                 if(complete){
                     openMainFrame();
                 }else {
@@ -450,7 +452,8 @@ private boolean saveIpfsConfig(String originAvatarName){
         try {
             String nick = IPMParser.urlEncode(tempInfo.getNick());
             ipfs.config.set(ConfigurationHelper.JSON_NICKNAME_KEY,nick);
-            ipfs.config.set(ConfigurationHelper.JSON_CFG_FROMID_KEY,tempInfo.getFrom());
+            String enFromId =IPMParser.urlEncode(tempInfo.getFrom());
+            ipfs.config.set(ConfigurationHelper.JSON_CFG_FROMID_KEY,enFromId);
             ipfs.config.set(ConfigurationHelper.JSON_AVATAR_KEY,tempInfo.getAvatar());
             ipfs.config.set(ConfigurationHelper.JSON_AVATAR_SUFFIX_KEY,tempInfo.getAvatarSuffix());
             if(StringUtils.isNotBlank(originAvatarName)){
@@ -511,7 +514,8 @@ private void getFromid(PeerInfo info){
             List<Map<String, Object>> lst = subs.limit(1).collect(Collectors.toList());
             Object fromidObj = JSONParser.getValue(lst.get(0),"from");
             if(fromidObj!=null){
-                info.setFrom((String)fromidObj);
+                String fromid = (String)fromidObj;
+                info.setFrom(fromid);
             }
         } catch (Exception e) {
             logger.error("获取消息失败,{}",e.getMessage());
@@ -575,14 +579,14 @@ private boolean uploadAvatar(){
 
                     tempInfo.setAvatar(fileHash);
                     tempInfo.setAvatarSuffix(name.substring(name.lastIndexOf(".")));
+                    tempInfo.setAvatarName(name);
                     //TODO 存数据库upload
                     String avatarFileName = fileHash+".png";
                     try {
                         imageHandler.createContactsAvatar(file,avatarFileName);
                         ImageIcon icon = AvatarImageHandler.getInstance().getImageIconFromOrigin(file128,100);
                         if(icon!=null){
                             logger.info(fileHash);
-
                             avatarLabel.setIcon(icon);
                             avatarLabel.updateUI();
                             upFileName = file.getName();

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

@@ -16,6 +16,7 @@
 import java.awt.*;
 import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -177,6 +178,7 @@ public static Image createOrLoadUserAvatar(String identify,boolean isHash,String
                             AvatarImageHandler.getInstance().getFileFromIPFS(url,temCacheFile);
                             Image nAvatar = ImageIO.read(url);
                             avatarCache.put(identify,nAvatar);
+
                         } catch (MalformedURLException e) {
                             e.printStackTrace();
                         } catch (Exception e) {
@@ -204,13 +206,15 @@ public static Image createOrLoadUserAvatar(String identify,boolean isHash,String
      * @throws IOException
      */
     public static Image getPeerAvatar(PeerInfo info) throws IOException {
-        if(info==null||StringUtils.isBlank(info.getAvatarName())){
+        if(info==null||StringUtils.isBlank(info.getAvatar())){
             return null;
         }
-        if(avatarCache.containsKey(info.getAvatarName()))return avatarCache.get(info.getAvatarName());
+        if(avatarCache.containsKey(info.getAvatar()))return avatarCache.get(info.getAvatar());
         File infoFile = new File(AppGlobalCnst.consturactPath(AvatarImageHandler.getAvatarProfileHome(),info.getAvatarName()));
         if(infoFile.exists()&&infoFile.isFile()){
-            return ImageIO.read(infoFile);
+            BufferedImage bimage = ImageIO.read(infoFile);
+            avatarCache.put(info.getAvatar(),bimage);
+            return bimage;
         }
         return null;
     }