From 8e76cd98ae05bec8237ba58a29ca4e06e90aa12d Mon Sep 17 00:00:00 2001 From: PanD <748308648@qq.com> Date: Fri, 17 Aug 2018 15:06:30 +0800 Subject: [PATCH] change(block info)use "v2/bolcks/*id *height" interface to get block info --- .../asch/so/wallet/model/entity/Block.java | 125 +++++++----------- .../presenter/BlockDetailPresenter.java | 2 +- .../presenter/BlockExplorerPresenter.java | 4 +- .../presenter/MyDelegateInfoPresenter.java | 2 +- .../view/fragment/BlockDetailFragment.java | 16 ++- .../main/res/layout/fragment_block_detail.xml | 2 +- .../src/main/java/so/asch/sdk/Block.java | 9 +- asch-java/src/main/java/so/asch/sdk/Dapp.java | 2 +- asch-java/src/main/java/so/asch/sdk/Main.java | 2 +- .../so/asch/sdk/impl/AschServiceUrls.java | 8 +- .../java/so/asch/sdk/impl/BlockService.java | 43 +++--- .../java/so/asch/sdk/impl/DappService.java | 2 +- 12 files changed, 99 insertions(+), 118 deletions(-) diff --git a/app/src/main/java/asch/so/wallet/model/entity/Block.java b/app/src/main/java/asch/so/wallet/model/entity/Block.java index 83ef892..8470fd9 100755 --- a/app/src/main/java/asch/so/wallet/model/entity/Block.java +++ b/app/src/main/java/asch/so/wallet/model/entity/Block.java @@ -25,38 +25,32 @@ } */ public class Block { - private String id; - private int timestamp; - private int version; - private int height; + /* V1的字段 private String previousBlock; private int numberOfTransactions; private long totalAmount; private long totalFee; - private long reward; private int payloadLength; - private String payloadHash; private String generatorPublicKey; private String generatorId; private String blockSignature; private String confirmations; private long totalForged; + */ - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - - public int getTimestamp() { - return timestamp; - } + private int version; + private String delegate; + private int height; + private String prevBlockId; + private int timestamp; + private int count; + private int fees; + private String payloadHash; + private long reward; + private String signature; + private String id; - public void setTimestamp(int timestamp) { - this.timestamp = timestamp; - } public int getVersion() { return version; @@ -66,60 +60,52 @@ public void setVersion(int version) { this.version = version; } - public int getHeight() { - return height; - } - - public void setHeight(int height) { - this.height = height; + public String getDelegate() { + return delegate; } - public String getPreviousBlock() { - return previousBlock; + public void setDelegate(String delegate) { + this.delegate = delegate; } - public void setPreviousBlock(String previousBlock) { - this.previousBlock = previousBlock; + public int getHeight() { + return height; } - public int getNumberOfTransactions() { - return numberOfTransactions; + public void setHeight(int height) { + this.height = height; } - public void setNumberOfTransactions(int numberOfTransactions) { - this.numberOfTransactions = numberOfTransactions; + public String getPrevBlockId() { + return prevBlockId; } - public long getTotalAmount() { - return totalAmount; + public void setPrevBlockId(String prevBlockId) { + this.prevBlockId = prevBlockId; } - public void setTotalAmount(long totalAmount) { - this.totalAmount = totalAmount; + public int getTimestamp() { + return timestamp; } - public long getTotalFee() { - return totalFee; + public void setTimestamp(int timestamp) { + this.timestamp = timestamp; } - public void setTotalFee(long totalFee) { - this.totalFee = totalFee; + public int getCount() { + return count; } - public long getReward() { - return reward; + public void setCount(int count) { + this.count = count; } - public void setReward(long reward) { - this.reward = reward; + public int getFees() { + return fees; } - public int getPayloadLength() { - return payloadLength; - } - - public void setPayloadLength(int payloadLength) { - this.payloadLength = payloadLength; + public void setFees(int fees) { + this.fees = fees; } public String getPayloadHash() { @@ -130,43 +116,30 @@ public void setPayloadHash(String payloadHash) { this.payloadHash = payloadHash; } - public String getGeneratorPublicKey() { - return generatorPublicKey; - } - - public void setGeneratorPublicKey(String generatorPublicKey) { - this.generatorPublicKey = generatorPublicKey; + public long getReward() { + return reward; } - public String getGeneratorId() { - return generatorId; + public void setReward(long reward) { + this.reward = reward; } - public void setGeneratorId(String generatorId) { - this.generatorId = generatorId; + public String getSignature() { + return signature; } - public String getBlockSignature() { - return blockSignature; + public void setSignature(String signature) { + this.signature = signature; } - public void setBlockSignature(String blockSignature) { - this.blockSignature = blockSignature; + public String getId() { + return id; } - public String getConfirmations() { - return confirmations; + public void setId(String id) { + this.id = id; } - public void setConfirmations(String confirmations) { - this.confirmations = confirmations; - } - public long getTotalForged() { - return totalForged; - } - public void setTotalForged(long totalForged) { - this.totalForged = totalForged; - } } diff --git a/app/src/main/java/asch/so/wallet/presenter/BlockDetailPresenter.java b/app/src/main/java/asch/so/wallet/presenter/BlockDetailPresenter.java index 3b59e74..b0edeb1 100644 --- a/app/src/main/java/asch/so/wallet/presenter/BlockDetailPresenter.java +++ b/app/src/main/java/asch/so/wallet/presenter/BlockDetailPresenter.java @@ -57,7 +57,7 @@ public void unSubscribe() { @Override public void loadBlockInfo(String tid) { Subscription subscription = Observable.create((Observable.OnSubscribe) subscriber -> { - AschResult result = AschSDK.Block.getBlockById(tid,false); + AschResult result = AschSDK.Block.getBlockById(tid); if (result != null && result.isSuccessful()) { subscriber.onNext(result); subscriber.onCompleted(); diff --git a/app/src/main/java/asch/so/wallet/presenter/BlockExplorerPresenter.java b/app/src/main/java/asch/so/wallet/presenter/BlockExplorerPresenter.java index 35dff69..310c565 100755 --- a/app/src/main/java/asch/so/wallet/presenter/BlockExplorerPresenter.java +++ b/app/src/main/java/asch/so/wallet/presenter/BlockExplorerPresenter.java @@ -81,9 +81,9 @@ private void loadBlocks(int pageIndex, int pageSize,String idOrHeight) { result = AschSDK.Block.queryBlocksV2(params); }else{ if(isBlockHeight(idOrHeight)){ - result = AschSDK.Block.getBlockByHeight(Integer.valueOf(idOrHeight),true); + result = AschSDK.Block.getBlockByHeight(Integer.valueOf(idOrHeight)); }else{ - result = AschSDK.Block.getBlockById(idOrHeight,true); + result = AschSDK.Block.getBlockById(idOrHeight); } } diff --git a/app/src/main/java/asch/so/wallet/presenter/MyDelegateInfoPresenter.java b/app/src/main/java/asch/so/wallet/presenter/MyDelegateInfoPresenter.java index 06fb11a..5f1c792 100755 --- a/app/src/main/java/asch/so/wallet/presenter/MyDelegateInfoPresenter.java +++ b/app/src/main/java/asch/so/wallet/presenter/MyDelegateInfoPresenter.java @@ -70,7 +70,7 @@ private void loadBlocks(int pageIndex, int pageSize) { .setOffset(offset) .setLimit(limit); - AschResult result = AschSDK.Block.queryBlocks(params); + AschResult result = AschSDK.Block.queryBlocksV2(params); if (result.isSuccessful()) { JSONObject resultJSONObj = JSONObject.parseObject(result.getRawJson()); JSONArray blocksJsonArray = resultJSONObj.getJSONArray("blocks"); diff --git a/app/src/main/java/asch/so/wallet/view/fragment/BlockDetailFragment.java b/app/src/main/java/asch/so/wallet/view/fragment/BlockDetailFragment.java index 5ff9271..78907eb 100755 --- a/app/src/main/java/asch/so/wallet/view/fragment/BlockDetailFragment.java +++ b/app/src/main/java/asch/so/wallet/view/fragment/BlockDetailFragment.java @@ -126,13 +126,19 @@ private void showDetail(Block blk){ String dateTime = TimeUtils.date2String(dateT,new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")); date.setText(dateTime); id.setText(blk.getId()); - transaction.setText(blk.getNumberOfTransactions()+""); - money.setText(AppUtil.decimalFormat(AppUtil.decimalFromBigint(blk.getTotalAmount(), AppConstants.PRECISION))+" XAS"); - cost.setText(AppUtil.decimalFormat(AppUtil.decimalFromBigint(blk.getTotalFee(), AppConstants.PRECISION))+" XAS"); + transaction.setText(blk.getCount()+""); + cost.setText(AppUtil.decimalFormat(AppUtil.decimalFromBigint(blk.getFees(), AppConstants.PRECISION))+" XAS"); award.setText(AppUtil.decimalFormat(AppUtil.decimalFromBigint(blk.getReward(), AppConstants.PRECISION))+" XAS"); - address.setText(blk.getGeneratorId()); - public_key.setText(blk.getGeneratorPublicKey()); + public_key.setText(blk.getDelegate()); + + /*已隐藏的，v2接口没有对应数据 + //确认数 confirmationsTv.setText(blk.getConfirmations()); + //总金额字段 + money.setText(AppUtil.decimalFormat(AppUtil.decimalFromBigint(blk.getTotalAmount(), AppConstants.PRECISION))+" XAS"); + //生产者地址 + address.setText(blk.getGeneratorId()); + */ } @Override diff --git a/app/src/main/res/layout/fragment_block_detail.xml b/app/src/main/res/layout/fragment_block_detail.xml index f64ac37..062910c 100755 --- a/app/src/main/res/layout/fragment_block_detail.xml +++ b/app/src/main/res/layout/fragment_block_detail.xml @@ -351,7 +351,7 @@ />