diff --git a/app/src/main/java/com/chwl/app/audio/view/BottleLayout.java b/app/src/main/java/com/chwl/app/audio/view/BottleLayout.java index 7bd58bce0..03146df79 100644 --- a/app/src/main/java/com/chwl/app/audio/view/BottleLayout.java +++ b/app/src/main/java/com/chwl/app/audio/view/BottleLayout.java @@ -35,6 +35,8 @@ import com.chwl.library.utils.TimeUtils; import java.math.BigDecimal; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.Locale; import java.util.concurrent.TimeUnit; import io.reactivex.Single; @@ -519,6 +521,7 @@ public class BottleLayout extends FrameLayout { double num = likeCountDouble / 10000; DecimalFormat decimalFormat = new DecimalFormat("0.00");// 构造方法的字符格式这里如果小数不足2位,会以0补足. + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); BigDecimal bigDecimal = new BigDecimal(num); double likeCountFormat = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); if (likeCountFormat > 9999) { diff --git a/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordPresenter.java b/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordPresenter.java index 65b1a1c8e..551d979c0 100644 --- a/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordPresenter.java +++ b/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordPresenter.java @@ -6,6 +6,8 @@ import com.chwl.core.radish.RadishModel; import java.math.RoundingMode; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.Locale; public class RadishRecordPresenter extends BaseMvpPresenter { public void getRadishWallet() { @@ -16,6 +18,7 @@ public class RadishRecordPresenter extends BaseMvpPresenter { public String formatBigDecimal(long bigDecimal) { try { DecimalFormat decimalFormat = new DecimalFormat("#,###"); + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); decimalFormat.setRoundingMode(RoundingMode.HALF_UP); return decimalFormat.format(bigDecimal); } catch (Exception e) { diff --git a/app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java b/app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java index 5a3afd38e..8769dacdf 100644 --- a/app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java +++ b/app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java @@ -39,6 +39,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.Locale; @@ -169,6 +170,7 @@ public final class PhotoMetadataUtils { public static float getSizeInMB(long sizeInBytes) { DecimalFormat df = (DecimalFormat) NumberFormat.getNumberInstance(Locale.US); + df.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); df.applyPattern("0.0"); String result = df.format((float) sizeInBytes / 1024 / 1024); Log.e(TAG, "getSizeInMB: " + result); diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/ClanIncomeAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/ClanIncomeAdapter.java index 9ddb88498..f32a60526 100644 --- a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/ClanIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/ClanIncomeAdapter.java @@ -10,6 +10,8 @@ import com.chwl.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.Locale; public class ClanIncomeAdapter extends BaseQuickAdapter { @@ -24,7 +26,7 @@ public class ClanIncomeAdapter extends BaseQuickAdapter { @@ -19,6 +21,7 @@ public class HallIncomeAdapter extends BaseQuickAdapter { @@ -34,6 +36,7 @@ public class IncomeAdapter extends BaseQuickAdapter helper.setText(R.id.tv_row_num, item.getRowNum()); String nick = item.getNick(); DecimalFormat decimalFormat = new DecimalFormat("###################.###########"); + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); if (!TextUtils.isEmpty(nick) && nick.length() > 4) nick = nick.substring(0, 4) + "..."; helper.setText(R.id.tv_name, nick); diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomePresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomePresenter.java index 4eeab56dc..e8cf5726c 100644 --- a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomePresenter.java +++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomePresenter.java @@ -12,8 +12,10 @@ import com.chwl.library.utils.TimeUtils; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; public class ClanIncomePresenter extends BaseMvpPresenter { @@ -56,7 +58,7 @@ public class ClanIncomePresenter extends BaseMvpPresenter public String setTotal(double total) { DecimalFormat decimalFormat = new DecimalFormat("###################.###########"); - + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); return decimalFormat.format(total); } diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeStatisticsPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeStatisticsPresenter.java index 08796325f..f8f437388 100644 --- a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeStatisticsPresenter.java +++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeStatisticsPresenter.java @@ -13,8 +13,10 @@ import com.example.lib_utils.AppUtils; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; public class IncomeStatisticsPresenter extends BaseMvpPresenter { @@ -57,6 +59,7 @@ public class IncomeStatisticsPresenter extends BaseMvpPresenter { @@ -58,6 +60,7 @@ public class RoomIncomePresenter extends BaseMvpPresenter RelativeSizeSpan sizeSpan = new RelativeSizeSpan(0.5f); DecimalFormat decimalFormat = new DecimalFormat("###################.###########"); + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); String unit = AppUtils.getApp().getString(R.string.avroom_widget_messageview_027); String str = decimalFormat.format(total) + unit; diff --git a/library/src/main/java/com/chwl/library/utils/FormatUtils.java b/library/src/main/java/com/chwl/library/utils/FormatUtils.java index 556f9fc24..6a5338bec 100644 --- a/library/src/main/java/com/chwl/library/utils/FormatUtils.java +++ b/library/src/main/java/com/chwl/library/utils/FormatUtils.java @@ -5,6 +5,8 @@ import com.chwl.library.R; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.Locale; /** *

格式化工具类

@@ -18,6 +20,7 @@ public class FormatUtils { try { DecimalFormat decimalFormat = new DecimalFormat("#,##0.00"); decimalFormat.setRoundingMode(RoundingMode.HALF_UP); + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); return decimalFormat.format(bigDecimal); } catch (Exception e) { } @@ -28,6 +31,7 @@ public class FormatUtils { try { DecimalFormat decimalFormat = new DecimalFormat("#,##0"); decimalFormat.setRoundingMode(RoundingMode.HALF_UP); + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); return decimalFormat.format(bigDecimal); } catch (Exception e) { } @@ -66,6 +70,7 @@ public class FormatUtils { public static String formatToShort(double num, RoundingMode roundingMode) { try { DecimalFormat decimalFormat = new DecimalFormat("#,##0.00"); + decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); decimalFormat.setRoundingMode(roundingMode); double wan = Math.pow(10.0f, 4); double yi = Math.pow(10.0f, 8); diff --git a/library/src/main/java/com/chwl/library/utils/JavaUtil.java b/library/src/main/java/com/chwl/library/utils/JavaUtil.java index f23cc534f..98c9411c7 100644 --- a/library/src/main/java/com/chwl/library/utils/JavaUtil.java +++ b/library/src/main/java/com/chwl/library/utils/JavaUtil.java @@ -15,7 +15,9 @@ import java.io.ObjectOutputStream; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.util.List; +import java.util.Locale; /** * 数据类型转换 @@ -67,6 +69,7 @@ public class JavaUtil { public static String str2double2len(String str){ try { DecimalFormat df = new DecimalFormat("######0.00"); + df.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); String format = df.format(str2double(str)); return format; } catch (Exception e) { @@ -78,6 +81,7 @@ public class JavaUtil { public static String str2double0len(String str){ try { DecimalFormat df = new DecimalFormat("######0"); + df.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); String format = df.format(str2double(str)); return format; } catch (Exception e) { @@ -128,6 +132,7 @@ public class JavaUtil { */ public static String formatDecimal (double value){ final DecimalFormat formatter = new DecimalFormat(); + formatter.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); formatter.setMaximumFractionDigits(2); formatter.setGroupingSize(0); formatter.setRoundingMode(RoundingMode.FLOOR); diff --git a/library/src/main/java/com/chwl/library/utils/file/JXFileUtils.java b/library/src/main/java/com/chwl/library/utils/file/JXFileUtils.java index 3920f0756..6ffb35182 100644 --- a/library/src/main/java/com/chwl/library/utils/file/JXFileUtils.java +++ b/library/src/main/java/com/chwl/library/utils/file/JXFileUtils.java @@ -35,8 +35,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.regex.Pattern; public class JXFileUtils extends BasicFileUtils { @@ -661,6 +663,7 @@ public class JXFileUtils extends BasicFileUtils { float kbs = bytes / 1024.0f; float mbs = kbs / 1024; DecimalFormat df = new DecimalFormat("0.00M"); + df.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); String ret = df.format(mbs); return ret; } diff --git a/library/src/module_common/java/com/chwl/library/common/file/FileHelper.java b/library/src/module_common/java/com/chwl/library/common/file/FileHelper.java index 6a2156c4f..beac53914 100644 --- a/library/src/module_common/java/com/chwl/library/common/file/FileHelper.java +++ b/library/src/module_common/java/com/chwl/library/common/file/FileHelper.java @@ -21,8 +21,10 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.util.ArrayList; import java.util.HashMap; +import java.util.Locale; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -715,6 +717,7 @@ public class FileHelper { int MB = 1024 * 1024;//定义MB的计算常量 int KB = 1024;//定义KB的计算常量 DecimalFormat df = new DecimalFormat("0.0");//格式化小数 + df.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); String resultSize = ""; if (size / GB >= 1) { //如果当前Byte的值大于等于1GB diff --git a/library/src/module_common/java/com/chwl/library/common/util/DoubleUtils.java b/library/src/module_common/java/com/chwl/library/common/util/DoubleUtils.java index f99ee30a3..f4904c2e6 100644 --- a/library/src/module_common/java/com/chwl/library/common/util/DoubleUtils.java +++ b/library/src/module_common/java/com/chwl/library/common/util/DoubleUtils.java @@ -2,6 +2,8 @@ package com.chwl.library.common.util; import java.math.BigDecimal; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.Locale; /** * 由于Java的简单类型不能够精确的对浮点数进行运算，这个工具类提供精 确的浮点数运算，包括加减乘除和四舍五入。 @@ -86,6 +88,7 @@ public class DoubleUtils{ String str="1234.5678"; double num; DecimalFormat myformat = new DecimalFormat("#0.00"); + myformat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); num = Double.parseDouble(str);//直接转换为double类型 num = Double.parseDouble(myformat.format(num));//保留2为小数 System.out.println(num); @@ -93,6 +96,7 @@ public class DoubleUtils{ public static String convertDoubleToString(double number) { DecimalFormat df = new DecimalFormat("######0"); + df.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH)); return df.format(number); }