Skip to content

Commit d77c7cb

Browse files
committed
文件浏览器打开
搜索文件
1 parent 2fdd346 commit d77c7cb

File tree

10 files changed

+65
-23
lines changed

10 files changed

+65
-23
lines changed

conf/nbs.db

0 Bytes
Binary file not shown.

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,25 @@
4646
<artifactId>fastjson</artifactId>
4747
<version>1.2.47</version>
4848
</dependency>
49-
<!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
49+
5050
<dependency>
5151
<groupId>org.mybatis</groupId>
5252
<artifactId>mybatis</artifactId>
5353
<version>3.4.5</version>
5454
</dependency>
55-
<!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
55+
5656
<dependency>
5757
<groupId>org.xerial</groupId>
5858
<artifactId>sqlite-jdbc</artifactId>
5959
<version>3.20.1</version>
6060
</dependency>
61-
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
61+
6262
<dependency>
6363
<groupId>commons-codec</groupId>
6464
<artifactId>commons-codec</artifactId>
6565
<version>1.11</version>
6666
</dependency>
67-
<!-- https://mvnrepository.com/artifact/com.melloware/jintellitype -->
67+
6868
<dependency>
6969
<groupId>com.melloware</groupId>
7070
<artifactId>jintellitype</artifactId>

src/main/java/io/nbs/client/listener/IPFSFileUploader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class IPFSFileUploader {
4747
public IPFSFileUploader(IPFS ipfs, SqlSession sqlSession,MessagePanel panel,List<MessageItem> messageItems) {
4848
this.ipfs = ipfs;
4949
this.service = new AttachmentInfoService(sqlSession);
50-
cureent = Launcher.currentPeer;
50+
cureent = MainFrame.getContext().getCurrentPeer();
5151
this.messagePanel = panel;
5252
this.messageItems = messageItems;
5353
}

src/main/java/io/nbs/client/services/IpfsMessageReceiver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.nbs.client.Launcher;
77
import io.nbs.client.listener.IPFSSubscribeListener;
88
import io.nbs.client.listener.OnlineNotifier;
9+
import io.nbs.client.ui.frames.MainFrame;
910
import io.nbs.client.ui.panels.im.ChatPanel;
1011
import io.nbs.commons.helper.ConfigurationHelper;
1112

@@ -128,7 +129,7 @@ private void proccessMessage(List<String> jsonMessages){
128129
if(subscribeListener==null)continue;
129130
MessageItem item = IPMParser.convertMessageItem(standardIPFSMessage);
130131
item.setMessageType(1);
131-
PeerInfo info =Launcher.currentPeer;
132+
PeerInfo info =MainFrame.getContext().getCurrentPeer();
132133
logger.info("{}<=====>{}",info.getId(),item.getFrom());
133134
item.setId(UUIDGenerator.getUUID());
134135
subscribeListener.notifyRecvMessage(item);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public void refreshAvatar(){
258258
*
259259
*/
260260
private void notifyWorldOnline(){
261-
PeerInfo info = Launcher.currentPeer;
261+
PeerInfo info = getCurrentPeer();
262262
if(info==null)return;
263263

264264
//IP 解析

src/main/java/io/nbs/client/ui/panels/manage/MMCubePanel.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.nbs.client.ui.frames.MainFrame;
44
import io.nbs.client.ui.panels.ParentAvailablePanel;
55
import io.nbs.commons.utils.DataSizeFormatUtil;
6+
import org.apache.commons.lang3.StringUtils;
67

78
import javax.swing.*;
89
import javax.swing.border.Border;
@@ -37,6 +38,29 @@ public MMCubePanel(String hash,Long size,boolean pined) {
3738
init(hash,size,pined);
3839
}
3940

41+
public MMCubePanel(String hash,Integer size,boolean pined) {
42+
long lSize = size==null?0L : size.longValue();
43+
init(hash,lSize,pined);
44+
}
45+
46+
/**
47+
*
48+
* @param hash
49+
* @param size
50+
* @param pined
51+
*/
52+
public MMCubePanel(String hash, String size,boolean pined) {
53+
long lSize = 0l;
54+
if(StringUtils.isNotBlank(size)){
55+
try{
56+
lSize = Long.parseLong(size);
57+
}catch (RuntimeException e){
58+
59+
}
60+
}
61+
init(hash,lSize,pined);
62+
}
63+
4064
private void init(String hash,Long size,boolean pined){
4165
this.hash = hash;
4266
this.pined = pined;

src/main/java/io/nbs/client/ui/panels/manage/adapter/AttachmentDataAdapter.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,6 @@ private void processBLKAttachView(AttachDataViewHolder viewHolder,AttachmentData
127127
String title = StringUtils.isNotBlank(dataDTO.getFname()) ? dataDTO.getFname() : dataDTO.getId();
128128
BLKAttachDataViewHolder holder = (BLKAttachDataViewHolder)viewHolder;
129129
holder.attachmentTitle.setText(title);
130-
131-
Map<String,Object> map = new HashMap<>();
132-
map.put("attachmentHash",dataDTO.getId());
133-
map.put("fname",dataDTO.getCachedfile());
134-
map.put("inlocal",dataDTO.getInlocal());
135-
map.put("messageId",dataDTO.getSeqno());//messageId uuid
136-
137130
holder.attachmentPanel.setTag(dataDTO);
138131
ImageIcon icon = IconUtil.getIcon(this,"/icons/data-works.png",80,80);
139132
holder.attachIcon.setIcon(icon);

src/main/java/io/nbs/client/ui/panels/manage/body/MMRightPanel.java

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import io.nbs.client.ui.panels.manage.MMCubePanel;
1717
import io.nbs.client.ui.panels.manage.listener.FillDetailInfoListener;
1818
import io.nbs.client.vo.AttachmentDataDTO;
19+
import io.nbs.commons.helper.RadomCharactersHelper;
1920
import io.nbs.commons.utils.DataSizeFormatUtil;
2021
import net.miginfocom.swing.MigLayout;
2122
import org.apache.commons.lang3.StringUtils;
@@ -24,6 +25,7 @@
2425
import javax.swing.border.LineBorder;
2526
import java.awt.*;
2627
import java.io.IOException;
28+
import java.util.List;
2729
import java.util.Map;
2830

2931
/**
@@ -170,13 +172,7 @@ private void initViewTop(){
170172

171173

172174

173-
for(int i = 0;i<30;i++){
174-
boolean pined = i%5==1 ? true : false;
175-
String hash="Hash_"+i;
176-
long ds = i*1000l;
177-
MMCubePanel cubePanel = new MMCubePanel(hash,ds,pined);
178-
middlePanel.add(cubePanel);
179-
}
175+
180176
}
181177

182178

@@ -212,6 +208,8 @@ public void setAttachmentDetailInfo(AttachmentDataDTO detailInfo){
212208
context.updateUI();
213209
}
214210

211+
212+
215213
private void getBlockInfo(AttachmentDataDTO detailInfo){
216214
Multihash multihash = Multihash.fromBase58(detailInfo.getId());
217215
new Thread(()->{
@@ -230,11 +228,36 @@ private void getBlockInfo(AttachmentDataDTO detailInfo){
230228
}
231229
MerkleNode node = ipfs.object.links(multihash);
232230
logger.info("Node:{}", JSON.toJSONString(node));
231+
radomDramCube(node);
233232
context.updateUI();
234233
} catch (IOException e) {
235234
e.printStackTrace();
236235
}
237236
}).start();
238237
}
239238

239+
240+
private void radomDramCube(MerkleNode node){
241+
if(node==null)return;
242+
List<MerkleNode> list = node.links;
243+
String hash = node.hash.toBase58();
244+
RadomCharactersHelper helper = RadomCharactersHelper.getInstance();
245+
middlePanel.removeAll();
246+
if(list.size()==0){
247+
Integer largeSize = node.size.isPresent() ? node.size.get() : 0;
248+
MMCubePanel cubePanel = new MMCubePanel(hash,largeSize.longValue(),true);
249+
middlePanel.add(cubePanel);
250+
}else {
251+
int num = list.size();
252+
int i=0;
253+
for(MerkleNode mn: list){
254+
i++;
255+
int radom = helper.getRadom(i);
256+
System.out.println(radom);
257+
boolean pined = (radom%2==1 );
258+
MMCubePanel cubePanel = new MMCubePanel(hash,mn.size.get(),pined);
259+
middlePanel.add(cubePanel);
260+
}
261+
}
262+
}
240263
}

src/main/java/io/nbs/client/ui/panels/manage/holder/BLKAttachDataViewHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void initView(){
7474
//iconInfoPanel.add(new JLabel(),"split,span 2,growx,gaptop 20");
7575
iconInfoPanel.add(openBtn,"split,span,growx,gaptop 20");
7676
iconInfoPanel.add(downloadBtn,"span,growx,gapright 20,wrap");
77-
77+
downloadBtn.setVisible(false);
7878

7979
messageBubble.add(attachmentPanel,BorderLayout.CENTER);
8080
messageBubble.add(iconInfoPanel,BorderLayout.EAST);

src/main/java/io/nbs/commons/helper/RadomCharactersHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ public String generatedOnlyCharater(String suffix,int len){
9090
result.append(suffix);
9191
return result.toString();
9292
}
93-
private int getRadom(int len){
93+
public int getRadom(int len){
9494
return (int)Math.round(Math.random()*len);
9595
}
9696

97+
9798
}

0 commit comments

Comments
 (0)