Skip to content

Commit 965fba9

Browse files
healergylhealergyl
committed
Add a new cloud node address under the mainnet and optimize some functions.
1 parent 1f8ae7f commit 965fba9

4 files changed

Lines changed: 32 additions & 11 deletions

File tree

‎app/src/main/java/com/omni/wallet_mainnet/ui/activity/BalanceDetailActivity.java‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
import java.util.Arrays;
109109
import java.util.Calendar;
110110
import java.util.Collections;
111+
import java.util.Comparator;
111112
import java.util.Date;
112113
import java.util.HashMap;
113114
import java.util.List;
@@ -873,11 +874,21 @@ public void run() {
873874
LightningOuterClass.TransactionDetails resp = LightningOuterClass.TransactionDetails.parseFrom(bytes);
874875
LogUtils.e(TAG, "------------------getPendingTxsChainOnResponse-----------------" + resp);
875876
for (LightningOuterClass.Transaction transaction : resp.getTransactionsList()) {
876-
if (StringUtils.isEmpty(String.valueOf(transaction.getNumConfirmations())) || transaction.getNumConfirmations() < 3) {
877+
if (StringUtils.isEmpty(String.valueOf(transaction.getNumConfirmations())) || transaction.getNumConfirmations() < 1) {
877878
mPendingTxsChainData.add(transaction);
878879
}
879880
}
880-
mToBePaidNumTv.setText(mPendingTxsChainData.size() + "");
881+
Collections.sort(mPendingTxsChainData, new Comparator<LightningOuterClass.Transaction>() {
882+
@Override
883+
public int compare(LightningOuterClass.Transaction o1, LightningOuterClass.Transaction o2) {
884+
return (int) (o2.getTimeStamp() - o1.getTimeStamp());
885+
}
886+
});
887+
try {
888+
mToBePaidNumTv.setText(mPendingTxsChainData.size() + "");
889+
} catch (Exception e) {
890+
LogUtils.e(TAG, "Error: " + e.getMessage());
891+
}
881892
mPendingTxsChainAdapter.notifyDataSetChanged();
882893
} catch (InvalidProtocolBufferException e) {
883894
e.printStackTrace();
@@ -965,7 +976,17 @@ public void run() {
965976
}
966977
mPendingTxsAssetData.add(resp);
967978
}
968-
mToBePaidNumTv.setText(mPendingTxsAssetData.size() + "");
979+
Collections.sort(mPendingTxsAssetData, new Comparator<LightningOuterClass.AssetTx>() {
980+
@Override
981+
public int compare(LightningOuterClass.AssetTx o1, LightningOuterClass.AssetTx o2) {
982+
return (int) (o2.getBlocktime() - o1.getBlocktime());
983+
}
984+
});
985+
try {
986+
mToBePaidNumTv.setText(mPendingTxsAssetData.size() + "");
987+
} catch (Exception e) {
988+
LogUtils.e(TAG, "Error: " + e.getMessage());
989+
}
969990
mPendingTxsAssetAdapter.notifyDataSetChanged();
970991
} catch (InvalidProtocolBufferException e) {
971992
e.printStackTrace();
@@ -1327,7 +1348,7 @@ public void convert(ViewHolder holder, final int position, final LightningOuterC
13271348
DecimalFormat df = new DecimalFormat("0.00######");
13281349
if (item.getAmount() <= 0) {
13291350
holder.setText(R.id.tv_amount, df.format(Double.parseDouble(String.valueOf(item.getAmount())) / 100000000).replace("-", ""));
1330-
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 3) {
1351+
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 1) {
13311352
holder.setText(R.id.tv_receiver, "PENDING");
13321353
holder.setImageResource(R.id.iv_state, R.mipmap.icon_alarm_clock_blue);
13331354
} else {
@@ -1336,7 +1357,7 @@ public void convert(ViewHolder holder, final int position, final LightningOuterC
13361357
}
13371358
} else if (item.getAmount() > 0) {
13381359
holder.setText(R.id.tv_amount, df.format(Double.parseDouble(String.valueOf(item.getAmount())) / 100000000));
1339-
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 3) {
1360+
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 1) {
13401361
holder.setText(R.id.tv_receiver, "PENDING");
13411362
holder.setImageResource(R.id.iv_state, R.mipmap.icon_alarm_clock_blue);
13421363
} else {

‎app/src/main/java/com/omni/wallet_mainnet/view/TransactionsChainView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void convert(ViewHolder holder, int position, LightningOuterClass.Transac
101101
DecimalFormat df = new DecimalFormat("0.00######");
102102
if (item.getAmount() <= 0) {
103103
holder.setText(R.id.tv_amount, "- " + df.format(Double.parseDouble(String.valueOf(item.getAmount())) / 100000000).replace("-", ""));
104-
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 3) {
104+
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 1) {
105105
holder.setText(R.id.tv_state, "Unnamed");
106106
holder.setImageResource(R.id.iv_state, R.mipmap.icon_alarm_clock_blue);
107107
} else {
@@ -110,7 +110,7 @@ public void convert(ViewHolder holder, int position, LightningOuterClass.Transac
110110
}
111111
} else if (item.getAmount() > 0) {
112112
holder.setText(R.id.tv_amount, "+ " + df.format(Double.parseDouble(String.valueOf(item.getAmount())) / 100000000));
113-
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 3) {
113+
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 1) {
114114
holder.setText(R.id.tv_state, "Unnamed");
115115
holder.setImageResource(R.id.iv_state, R.mipmap.icon_alarm_clock_blue);
116116
} else {

‎app/src/main/java/com/omni/wallet_mainnet/view/popupwindow/TransactionsDetailsChainPopupWindow.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void show(final View view, LightningOuterClass.Transaction item, long ass
7070
amountTv.setText(df.format(Double.parseDouble(String.valueOf(item.getAmount())) / 100000000).replace("-", ""));
7171
String totalValue = (long) (Double.parseDouble(String.valueOf(item.getAmount()).replace("-", ""))) + item.getTotalFees() + "";
7272
totalAmountTv.setText(df1.format(Double.parseDouble(totalValue) / 100000000 * Double.parseDouble(User.getInstance().getBtcPrice(mContext))));
73-
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 3) {
73+
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 1) {
7474
typeTv.setText("PENDING");
7575
typeIv.setImageResource(R.mipmap.icon_failed_red);
7676
statusTv.setText("Pending");
@@ -93,7 +93,7 @@ public void show(final View view, LightningOuterClass.Transaction item, long ass
9393
amountTv.setText(df.format(Double.parseDouble(String.valueOf(item.getAmount())) / 100000000));
9494
String totalValue = (long) (Double.parseDouble(String.valueOf(item.getAmount()))) + item.getTotalFees() + "";
9595
totalAmountTv.setText(df1.format(Double.parseDouble(totalValue) / 100000000 * Double.parseDouble(User.getInstance().getBtcPrice(mContext))));
96-
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 3) {
96+
if (StringUtils.isEmpty(String.valueOf(item.getNumConfirmations())) || item.getNumConfirmations() < 1) {
9797
typeTv.setText("PENDING");
9898
typeIv.setImageResource(R.mipmap.icon_failed_red);
9999
statusTv.setText("Pending");

‎config.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ext {
66
targetSdkVersion: 28,
77
compileVersion : 28,
88
buildToolVersion: "28.0.3",
9-
versionCode : 5,
10-
versionName : "0.1.4"
9+
versionCode : 6,
10+
versionName : "0.1.5"
1111
]
1212
// 依赖相关版本控制
1313
depVersion = [

0 commit comments

Comments
 (0)