From c2fb1a58db4557ec6d29cc744e41b466c5148d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Thu, 14 May 2020 15:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BC=E5=8C=85=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E7=99=BE=E5=88=86=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gh/gamecenter/adapter/LibaoDetailAdapter.java | 11 +++++++++--
 .../gamedetail/desc/GameLibaoAdapter.kt           | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
index a5b4632232..9d8e378bc4 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
@@ -14,7 +14,6 @@ import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LibaoUtils;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.RandomUtils;
 import com.gh.common.util.StringUtils;
 import com.gh.common.view.DownloadProgressBar;
 import com.gh.gamecenter.GameDetailActivity;
@@ -191,7 +190,15 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
         linearLayoutManager.setStackFromEnd(true);
         holder.libaoCodeRv.setLayoutManager(linearLayoutManager);
 
-        int count = RandomUtils.getInt((double) ((float) mLibaoEntity.getAvailable() / (float) mLibaoEntity.getTotal()) * 100);
+        float availablePercent = ((float) mLibaoEntity.getAvailable() / (float) mLibaoEntity.getTotal()) * 100;
+        int count;
+        if (availablePercent >= 1) {
+            count = (int) availablePercent;
+        } else if (availablePercent == 0) {
+            count = 0;
+        } else {
+            count = 1;
+        }
         Spanned content = null;
         String status = mLibaoEntity.getBeforeStatus();
         if ("coming".equals(status) || "finish".equals(status) || TextUtils.isEmpty(status)) {
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt
index 990443374f..91d6c534d9 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt
@@ -9,7 +9,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.gh.base.OnListClickListener
 import com.gh.common.util.LibaoUtils
 import com.gh.common.util.MtaHelper
-import com.gh.common.util.RandomUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.ItemGameLibaoBinding
 import com.gh.gamecenter.entity.LibaoEntity
@@ -51,7 +50,19 @@ class GameLibaoAdapter(val context: Context, val libaos: ArrayList<LibaoEntity>,
                 val available = libaoEntity.available
                 if (total != 0) {
                     holder.binding.libaoSchedulePb.progress = ((available / total.toFloat()) * 100).toInt()
-                    holder.binding.remainingTv.text = "剩余${RandomUtils.getInt((available) / total.toDouble() * 100)}%"
+                    val availablePercent = (available) / total.toFloat() * 100
+                    val count = when {
+                        availablePercent >= 1F -> {
+                            availablePercent.toInt()
+                        }
+                        availablePercent == 0F -> {
+                            0
+                        }
+                        else -> {
+                            1
+                        }
+                    }
+                    holder.binding.remainingTv.text = "剩余${count}%"
                 }
                 LibaoUtils.setLiBaoBtnStatusRound(holder.binding.receiveTv, libaoEntity.status, context)
                 holder.itemView.setOnClickListener {