From 0b1c93bb0d2e3a81dd6999039ac1a2e52a0253e1 Mon Sep 17 00:00:00 2001 From: jwinterm Date: Sun, 13 Dec 2015 09:04:25 -0800 Subject: [PATCH] Got timestamp and reward working on daemon interface. --- .../jw/lightwallet/daemon/BlockHeader.java | 12 +++--- .../jw/lightwallet/screens/DaemonView.java | 39 ++++++++++++------- .../jw/lightwallet/screens/MainScreen.java | 2 +- .../jw/lightwallet/utils/DaemonValues.java | 24 ++++++------ 4 files changed, 44 insertions(+), 33 deletions(-) diff --git a/core/src/com/jw/lightwallet/daemon/BlockHeader.java b/core/src/com/jw/lightwallet/daemon/BlockHeader.java index f6c8cfc..8545b2b 100644 --- a/core/src/com/jw/lightwallet/daemon/BlockHeader.java +++ b/core/src/com/jw/lightwallet/daemon/BlockHeader.java @@ -11,8 +11,8 @@ public class BlockHeader { int nonce; boolean orphan_status; String prev_hash; - int reward; - int timestamp; + long reward; + long timestamp; public int getDepth() { @@ -69,16 +69,16 @@ public class BlockHeader { public void setPrev_hash(String prev_hash) { this.prev_hash = prev_hash; } - public int getReward() { + public long getReward() { return reward; } - public void setReward(int reward) { + public void setReward(long reward) { this.reward = reward; } - public int getTimestamp() { + public long getTimestamp() { return timestamp; } - public void setTimestamp(int timestamp) { + public void setTimestamp(long timestamp) { this.timestamp = timestamp; } diff --git a/core/src/com/jw/lightwallet/screens/DaemonView.java b/core/src/com/jw/lightwallet/screens/DaemonView.java index e69eb17..445a8f3 100644 --- a/core/src/com/jw/lightwallet/screens/DaemonView.java +++ b/core/src/com/jw/lightwallet/screens/DaemonView.java @@ -8,6 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.jw.lightwallet.utils.Constants; import com.jw.lightwallet.utils.DaemonValues; +import java.util.Date; public class DaemonView { @@ -21,50 +22,60 @@ public class DaemonView { Label heightvalue; Label hashratelabel; Label hashratevalue; + Label timelabel; + Label timevalue; Label rewardlabel; Label rewardvalue; - + int padvalue; + + public DaemonView () { Skin uiSkin = new Skin(Gdx.files.internal("skin/uiskin.json")); daemonlayout = new Table(); - + padvalue = 15; nodelabel = new Label("Node address: ", uiSkin); nodevalue = new Label(null, uiSkin); - daemonlayout.add(nodelabel).pad(20); - daemonlayout.add(nodevalue).pad(20).row(); + daemonlayout.add(nodelabel).pad(padvalue); + daemonlayout.add(nodevalue).pad(padvalue).row(); statuslabel = new Label("Node status: ", uiSkin); statusvalue = new Label(null, uiSkin); - daemonlayout.add(statuslabel).pad(20); - daemonlayout.add(statusvalue).pad(20).row(); + daemonlayout.add(statuslabel).pad(padvalue); + daemonlayout.add(statusvalue).pad(padvalue).row(); heightlabel = new Label("Block height: ", uiSkin); heightvalue = new Label(null, uiSkin); - daemonlayout.add(heightlabel).pad(20); - daemonlayout.add(heightvalue).pad(20).row(); + daemonlayout.add(heightlabel).pad(padvalue); + daemonlayout.add(heightvalue).pad(padvalue).row(); hashratelabel = new Label("Network hashrate: ", uiSkin); hashratevalue = new Label(null, uiSkin); - daemonlayout.add(hashratelabel).pad(20); - daemonlayout.add(hashratevalue).pad(20).row(); + daemonlayout.add(hashratelabel).pad(padvalue); + daemonlayout.add(hashratevalue).pad(padvalue).row(); + + timelabel = new Label("Last block time: ", uiSkin); + timevalue = new Label(null, uiSkin); + daemonlayout.add(timelabel).pad(padvalue); + daemonlayout.add(timevalue).pad(padvalue).row(); rewardlabel = new Label("Last reward: ", uiSkin); rewardvalue = new Label(null, uiSkin); - daemonlayout.add(rewardlabel).pad(20); - daemonlayout.add(rewardvalue).pad(20).row(); + daemonlayout.add(rewardlabel).pad(padvalue); + daemonlayout.add(rewardvalue).pad(padvalue).row(); } public void Update(DaemonValues daemonvalues) { nodevalue.setText(Constants.moneroclub); statusvalue.setText(daemonvalues.getStatus()); heightvalue.setText(String.valueOf(daemonvalues.getBlockheight())); - hashratevalue.setText(String.valueOf(daemonvalues.getHashrate())); - rewardvalue.setText(String.valueOf(daemonvalues.getLastblockreward())); + hashratevalue.setText(String.valueOf(daemonvalues.getHashrate() + " Mh/s")); + timevalue.setText(String.valueOf(new java.util.Date(daemonvalues.getLastblocktime()*1000))); + rewardvalue.setText(String.valueOf(daemonvalues.getLastblockreward()/1e12 + " XMR")); } } diff --git a/core/src/com/jw/lightwallet/screens/MainScreen.java b/core/src/com/jw/lightwallet/screens/MainScreen.java index 9734166..98f14fa 100644 --- a/core/src/com/jw/lightwallet/screens/MainScreen.java +++ b/core/src/com/jw/lightwallet/screens/MainScreen.java @@ -68,7 +68,7 @@ public class MainScreen extends AbstractScreen { buttonrow.add(txhistorybutton).width(Constants.WORLD_WIDTH/4); screenlayout.add(buttonrow).row(); - screenlayout.add(logo).center().row(); + screenlayout.add(logo).pad(10).center().row(); daemonview = new DaemonView(); viewcontainer.add(daemonview.daemonlayout).expand().bottom(); diff --git a/core/src/com/jw/lightwallet/utils/DaemonValues.java b/core/src/com/jw/lightwallet/utils/DaemonValues.java index 7b148a3..62bdd1c 100644 --- a/core/src/com/jw/lightwallet/utils/DaemonValues.java +++ b/core/src/com/jw/lightwallet/utils/DaemonValues.java @@ -2,11 +2,11 @@ package com.jw.lightwallet.utils; public class DaemonValues { - int blockheight; - int diff; - int hashrate; - int lastblocktime; - int lastblockreward; + int blockheight; + int diff; + int hashrate; + long lastblocktime; + long lastblockreward; String status; @@ -24,21 +24,21 @@ public class DaemonValues { this.diff = diff; this.hashrate = diff/60; } - public int getHashrate() { - return hashrate; + public float getHashrate() { + return hashrate/1e6f; } - public int getLastblocktime() { + public long getLastblocktime() { return lastblocktime; } - public void setLastblocktime(int lastblocktime) { + public void setLastblocktime(long lastblocktime) { this.lastblocktime = lastblocktime; } - public float getLastblockreward() { - return lastblockreward/1e12f; + public long getLastblockreward() { + return lastblockreward; } - public void setLastblockreward(int lastblockreward) { + public void setLastblockreward(long lastblockreward) { this.lastblockreward = lastblockreward; }