Merge pull request #2 from bluegene1/0.3.0

Solve the problem of small value of contract transfer value

Author: danielgogo

build.gradle

@@ -55,7 +55,7 @@ allprojects {
         google()
         jcenter()
         maven {
-            url "http://192.168.9.39:8081/repository/maven-public"
+            url "https://sdk.platon.network/nexus/content/groups/public/"
         }
     }
 }

framework/src/main/java/com/juzhen/framework/util/NumberParserUtils.java

@@ -255,7 +255,7 @@ public static String getPrettyNumber(double value, int maxDigit) {
             return "0.00";
         }
 
-        if (!bigDecimalStr.contains(".")) {
+        if (maxDigit > 0 && !bigDecimalStr.contains(".")) {
             return bigDecimalStr.concat(".00");
         }
 

wallet/src/main/AndroidManifest.xml

@@ -31,6 +31,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
 
         <activity

wallet/src/main/java/com/juzix/wallet/component/ui/view/SendIndividualTransationActivity.java

@@ -276,7 +276,7 @@ public void setTransferAmount(double amount) {
 
     @Override
     public void setTransferAmountTextColor(boolean isBiggerThanBalance) {
-        etWalletAmount.setTextColor(isBiggerThanBalance ? ContextCompat.getColor(this, R.color.color_ff4747) : ContextCompat.getColor(this, R.color.color_7a8092));
+        etWalletAmount.setTextColor(isBiggerThanBalance ? ContextCompat.getColor(this, R.color.color_ff4747) : ContextCompat.getColor(this, R.color.color_ffffff));
     }
 
     @Override

wallet/src/main/java/com/juzix/wallet/component/ui/view/SendSharedTransationActivity.java

@@ -295,7 +295,7 @@ public void setTransferAmount(double amount) {
 
     @Override
     public void setTransferAmountTextColor(boolean isBiggerThanBalance) {
-        etWalletAmount.setTextColor(isBiggerThanBalance ? ContextCompat.getColor(this, R.color.color_ff4747) : ContextCompat.getColor(this, R.color.color_7a8092));
+        etWalletAmount.setTextColor(isBiggerThanBalance ? ContextCompat.getColor(this, R.color.color_ff4747) : ContextCompat.getColor(this, R.color.color_ffffff));
     }
 
     @Override

wallet/src/main/java/com/juzix/wallet/engine/SharedWalletTransactionManager.java

@@ -138,7 +138,6 @@ public int createWallet(Credentials credentials, String walletName, String indiv
                 .requiredSignNumber(requiredSignNumber)
                 .owner(members)
                 .avatar(SharedWalletManager.getInstance().getWalletAvatar())
-                .linkWalletAddress(individualWalletAddress)
                 .build();
 
         SharedWalletManager.getInstance().addWallet(sharedWalletEntity);
@@ -238,7 +237,7 @@ public int submitTransaction(
         try {
             long time = System.currentTimeMillis();
             String data = org.spongycastle.util.encoders.Hex.toHexString(memo.getBytes(Charset.forName("UTF-8")));
-            String value = Convert.toWei(amount, Convert.Unit.ETHER).toPlainString();
+            String value = NumberParserUtils.getPrettyNumber(Convert.toWei(amount, Convert.Unit.ETHER).doubleValue(), 0);
             Multisig multisig = Multisig.load(FileUtil.getStringFromAssets(App.getContext(), BIN_NAME), sharedWalletEntity.getPrefixContractAddress(), Web3jManager.getInstance().getWeb3j(), credentials, new StaticGasProvider(gasPrice, INVOKE_GAS_LIMIT));
             receipt = multisig.submitTransaction(to, sharedWalletEntity.getPrefixContractAddress(), value, data, BigInteger.valueOf(data.length()), BigInteger.valueOf(time), "").send();
 

wallet/src/main/java/com/juzix/wallet/entity/SharedWalletEntity.java

@@ -266,7 +266,6 @@ public static final class Builder {
         private int unread;
         private int progress;
         private boolean finished;
-        private String linkWalletAddress;
 
         public Builder() {
         }
@@ -336,11 +335,6 @@ public Builder finished(boolean val) {
             return this;
         }
 
-        public Builder linkWalletAddress(String val) {
-            linkWalletAddress = val;
-            return this;
-        }
-
         public SharedWalletEntity build() {
             return new SharedWalletEntity(this);
         }

wallet/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="user" />
+        </trust-anchors>
+    </debug-overrides>
+</network-security-config>