解决低分辨率屏幕横向滚动条问题

lamborc · lamborc · commit 80ce8de39491 · 2018-07-16T20:12:51.000+08:00
diff --git a/conf/nbs.db b/conf/nbs.db
diff --git a/src/main/java/com/nbs/biz/data/entity/AttachmentInfoEntity.java b/src/main/java/com/nbs/biz/data/entity/AttachmentInfoEntity.java
@@ -17,6 +17,7 @@ public class AttachmentInfoEntity extends BasicEntity {
     private String peername;
     private String peerhash;
     private String prehash;
+    private String whash;
     private String fname;
     private Long fsize;
     private String fsuffix;
@@ -62,6 +63,14 @@ public void setPrehash(String prehash) {
         this.prehash = prehash;
     }
 
+    public String getWhash() {
+        return whash;
+    }
+
+    public void setWhash(String whash) {
+        this.whash = whash;
+    }
+
     public String getFname() {
         return fname;
     }
diff --git a/src/main/java/io/nbs/client/Launcher.java b/src/main/java/io/nbs/client/Launcher.java
@@ -231,7 +231,6 @@ private boolean needInitConfig(IPFS ipfs) throws IOException {
             currentPeer.setId(peerid);
             currentPeer.setNick(nick);
             //
-            fromid = Base64CodecUtil.base64From(fromid);
             currentPeer.setFrom(fromid);
 
             Object avatar = cfg.get(ConfigurationHelper.JSON_AVATAR_KEY);
diff --git a/src/main/java/io/nbs/client/services/IpfsMessageSender.java b/src/main/java/io/nbs/client/services/IpfsMessageSender.java
@@ -48,7 +48,7 @@ public IpfsMessageSender(IPFS ipfs) {
      */
     public String sendOnline(OnlineMessage message) throws Exception {
         String encodeData = IPMParser.encode(message,IPMTypes.online);
-        logger.info("NBS Client 发送上线消息{}:{}",NBSWORLD_IMS_TOPIC,encodeData);
+        //logger.info("NBS Client 发送上线消息{}:{}",NBSWORLD_IMS_TOPIC,encodeData);
         ipfs.pubsub.pub(NBSWORLD_IMS_TOPIC,encodeData);
         return encodeData;
     }
diff --git a/src/main/java/io/nbs/client/ui/frames/InitialFrame.java b/src/main/java/io/nbs/client/ui/frames/InitialFrame.java
@@ -454,8 +454,8 @@ private boolean saveIpfsConfig(String originAvatarName){
         try {
             String nick = IPMParser.urlEncode(tempInfo.getNick());
             ipfs.config.set(ConfigurationHelper.JSON_NICKNAME_KEY,nick);
-            //String enFromId =IPMParser.urlEncode(tempInfo.getFrom());
-            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)){
@@ -506,6 +506,10 @@ private void saveDBPContacts(PeerInfo peerInfo){
 
     }
 
+    /**
+     * 获取fromid
+     * @param info
+     */
     private void getFromid(PeerInfo info){
         String tmpTopic = RadomCharactersHelper.getInstance().generated(8);
 
@@ -519,12 +523,11 @@ private void getFromid(PeerInfo info){
             Object fromidObj = JSONParser.getValue(lst.get(0),"from");
 
             if(fromidObj!=null){
-
                 String fromid = (String)fromidObj;
                 String ss= Base16.encode(fromid.getBytes());
                 logger.info("base16={}",ss);
                 logger.info("tostring>>{},String>>{},decode>>{}",fromidObj.toString(),fromid,IPMParser.urlDecode(fromid));
-                fromid = Base64CodecUtil.base64From(fromid);
+                //fromid = Base64CodecUtil.base64From(fromid);
                 info.setFrom(fromid);
             }
         } catch (Exception e) {
diff --git a/src/main/java/io/nbs/client/ui/panels/manage/adapter/AttachmentDataAdapter.java b/src/main/java/io/nbs/client/ui/panels/manage/adapter/AttachmentDataAdapter.java
@@ -133,6 +133,8 @@ private void processBLKAttachView(AttachDataViewHolder viewHolder,AttachmentData
         holder.srcPanel.setText(dataDTO.getPeername()==null ? "" : dataDTO.getPeername());
         holder.hashTitle.setText(dataDTO.getId());
 
+        holder.downloadBtn.setVisible(true);
+
         String sizeShow = DataSizeFormatUtil.formatDataSize(dataDTO.getFsize());
         holder.sizeLabel.setText(sizeShow);
 
diff --git a/src/main/java/io/nbs/client/ui/panels/manage/holder/AttachDataViewHolder.java b/src/main/java/io/nbs/client/ui/panels/manage/holder/AttachDataViewHolder.java
@@ -47,7 +47,7 @@ public abstract class AttachDataViewHolder extends ViewHolder {
     public JLabel time = new JLabel();
     protected FillDetailInfoListener listener;
     protected NBSIconButton openBtn;
-    protected NBSIconButton downloadBtn;
+    public NBSIconButton downloadBtn;
 
     public LCAttachMessageBubble messageBubble;
 
@@ -63,8 +63,9 @@ public AttachDataViewHolder() {
      */
     private void initComponents(){
         int maxWidth = (int)(MainFrame.getContext().currentWindowWidth*0.35);
-        attachmentTitle = new SizeAutoAdjustTextArea(maxWidth);
-        hashTitle = new SizeAutoAdjustTextArea(maxWidth);
+        int pmaxWidth = (int)(getWidth()*0.65);
+        attachmentTitle = new SizeAutoAdjustTextArea(pmaxWidth);
+        hashTitle = new SizeAutoAdjustTextArea(pmaxWidth);
         attachmentTitle.setEditable(false);
         hashTitle.setEditable(false);
 
@@ -76,7 +77,7 @@ private void initComponents(){
         ImageIcon lactived =  IconUtil.getIcon(Launcher.getContext(),"/icons/link_actived.png",iconSize,iconSize);
         openBtn = new NBSIconButton(lnormal,lactived, "查看");
         downloadBtn = new NBSIconButton(
-                IconUtil.getIcon(Launcher.getContext(),"/icons/download_normal.png",iconSize,iconSize),
+                IconUtil.getIcon(Launcher.getContext(),"/icons/download.png",iconSize,iconSize),
                 IconUtil.getIcon(Launcher.getContext(),"/icons/download_actived.png",iconSize,iconSize),
                 "下载到本地");
 
@@ -131,6 +132,8 @@ public void mouseClicked(MouseEvent e) {
         attachmentPanel.addMouseListener(adapter);
         attachmentTitle.addMouseListener(adapter);
 
+
+
         /**
          *
          */
@@ -158,5 +161,23 @@ public void actionPerformed(ActionEvent e) {
                 }
             }
         });
+
+        downloadBtn.addMouseListener(new BaseBtnMouseAdapter(){
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                logger.info(">>>>>>>>>>>>>>>>>>>>>>>>");
+            }
+        });
+
+    }
+
+
+
+    private class BaseBtnMouseAdapter extends MouseAdapter{
+        @Override
+        public void mouseEntered(MouseEvent e) {
+            super.mouseEntered(e);
+            e.getComponent().setCursor(MainFrame.handCursor);
+        }
     }
 }
diff --git a/src/main/java/io/nbs/client/vo/AttachmentDataDTO.java b/src/main/java/io/nbs/client/vo/AttachmentDataDTO.java
@@ -23,6 +23,7 @@ public class AttachmentDataDTO{
     private String peername;
     private String peerhash;
     private String prehash;
+    private String whash;
     private String fname;
     private Long fsize;
     private String fsuffix;
@@ -163,4 +164,12 @@ public String getCtime() {
     public void setCtime(String ctime) {
         this.ctime = ctime;
     }
+
+    public String getWhash() {
+        return whash;
+    }
+
+    public void setWhash(String whash) {
+        this.whash = whash;
+    }
 }
diff --git a/src/main/java/io/nbs/sdk/prot/IPMParser.java b/src/main/java/io/nbs/sdk/prot/IPMParser.java
@@ -138,7 +138,7 @@ public static StandardIPFSMessage decodeStandardIPFSMessage(String json) throws
 
         String fromid = Base64CodecUtil.base64From(simsg.getFrom());
                 //URLDecoder.decode(simsg.getFrom(),DEFAULT_ENCODING);
-        simsg.setFrom(fromid);
+        //simsg.setFrom(fromid);
         String endata = simsg.getData();
         String deData = Base64CodecUtil.decode(endata);
         IPMTypes types = IPMTypes.parserProtocol(deData);
diff --git a/src/main/resources/icons/download.png b/src/main/resources/icons/download.png
diff --git a/src/main/resources/icons/download_actived.png b/src/main/resources/icons/download_actived.png
diff --git a/src/main/resources/icons/link.png b/src/main/resources/icons/link.png
diff --git a/src/main/resources/icons/link_actived.png b/src/main/resources/icons/link_actived.png
diff --git a/src/main/resources/mybatis/AttactmentInfoMapper.xml b/src/main/resources/mybatis/AttactmentInfoMapper.xml
@@ -7,6 +7,7 @@
         <result column="peername" property="peername" jdbcType="VARCHAR"/>
         <result column="peerhash" property="peerhash" jdbcType="VARCHAR"/>
         <result column="prehash" property="prehash" jdbcType="VARCHAR"/>
+        <result column="whash" property="whash" jdbcType="VARCHAR"/>
         <result column="fname" property="fname" jdbcType="VARCHAR"/>
         <result column="fsize" property="fsize" jdbcType="BIGINT"/>
         <result column="fsuffix" property="fsuffix" jdbcType="VARCHAR"/>
@@ -22,8 +23,8 @@
     </resultMap>
 
     <insert id="insert">
-        INSERT INTO attac_info (id, peername,peerhash,prehash, fname,fsize,fsuffix,fromid,seqno,cached,cachedfile,inlocal,ftype,sortno)
-        VALUES (#{id},#{peername},#{peerhash}, #{prehash}, #{fname}, #{fsize}, #{fsuffix}, #{fromid}, #{seqno}, #{cached}, #{cachedfile}, #{inlocal},#{ftype},#{sortno})
+        INSERT INTO attac_info (id, peername,peerhash,prehash,whash, fname,fsize,fsuffix,fromid,seqno,cached,cachedfile,inlocal,ftype,sortno)
+        VALUES (#{id},#{peername},#{peerhash}, #{prehash},#{whash}, #{fname}, #{fsize}, #{fsuffix}, #{fromid}, #{seqno}, #{cached}, #{cachedfile}, #{inlocal},#{ftype},#{sortno})
     </insert>
 
     <select id="findById" resultMap="BaseResultMap">
@@ -60,6 +61,7 @@
         <set>
             fname=#{fname},
             fsize=#{fsize},
+            whash=#{whash},
             fsuffix=#{fsuffix},
             seqno=#{seqno},
             cached=#{cached},
@@ -78,6 +80,7 @@
             <if test="fname!= null">fname=#{fname},</if>
             <if test="peername!= null">peername=#{peername},</if>
             <if test="cachedfile!= null">cachedfile=#{cachedfile},</if>
+            <if test="whash!= null">whash=#{whash},</if>
             <if test="cached!= null">cached=#{cached},</if>
             <if test="inlocal!= null">inlocal=#{inlocal},</if>
             <if test="fsize!= null">fsize=#{fsize},</if>
diff --git a/src/main/resources/mybatis/TableMapper.xml b/src/main/resources/mybatis/TableMapper.xml
@@ -85,6 +85,7 @@
         peername varchar(128),
         peerhash varchar(64),
         prehash varchar(64),
+        whash varchar(64),
         fname varchar (128),
         fsize bigint,
         fsuffix varchar (32),

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public IpfsMessageSender(IPFS ipfs) {`
`48`	`48`	`*/`
`49`	`49`	`public String sendOnline(OnlineMessage message) throws Exception {`
`50`	`50`	`String encodeData = IPMParser.encode(message,IPMTypes.online);`
`51`		`- logger.info("NBS Client 发送上线消息{}:{}",NBSWORLD_IMS_TOPIC,encodeData);`
	`51`	`+ //logger.info("NBS Client 发送上线消息{}:{}",NBSWORLD_IMS_TOPIC,encodeData);`
`52`	`52`	`ipfs.pubsub.pub(NBSWORLD_IMS_TOPIC,encodeData);`
`53`	`53`	`return encodeData;`
`54`	`54`	`}`