From 329c765754732f30103006ddaf908d4d3e30304b Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 13 Mar 2023 16:56:26 +0800 Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E6=94=B9=E5=A4=BA=E5=AE=9D?= =?UTF-8?q?=E7=B2=BE=E7=81=B5=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yizhuan/erban/common/EmptyViewHelper.java | 8 ++++++++ .../treasurefairy/dialog/MyFairyRecordDialog.kt | 8 +++++++- .../dialog/TestFairyRecordDialog.kt | 8 +++++++- .../fragment/ExchangeDebrisFragment.kt | 8 +++++++- .../fragment/ExchangeDebrisRecordFragment.kt | 6 +++++- .../fragment/ExchangeFairyRecordFragment.kt | 11 +++++++++-- .../fragment/ForestPrizesChildFragment.kt | 6 +++++- .../fragment/ForestRecordFragment.kt | 8 +++++++- .../treasurefairy/fragment/TestFairyFragment.kt | 5 ++++- app/src/main/res/layout/layout_text_empty.xml | 16 ++++++++++++++++ app/src/main/res/values/strings.xml | 1 + 11 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/layout/layout_text_empty.xml diff --git a/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java b/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java index 47d293269..9c3965fbf 100644 --- a/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java +++ b/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java @@ -22,6 +22,14 @@ public class EmptyViewHelper { return view; } + public static View createEmptyTextViewNoImage(Context context, String text) { + if (!NetworkUtils.isNetworkAvailable(context)) text = ResUtil.getString(R.string.erban_common_emptyviewhelper_01); + View view = LayoutInflater.from(context).inflate(R.layout.layout_text_empty, null); + view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); + ((TextView) view.findViewById(R.id.tv_hint)).setText(text); + return view; + } + public static View createDarkEmptyView(Context context, String text) { if (!NetworkUtils.isNetworkAvailable(context)) text = ResUtil.getString(R.string.erban_common_emptyviewhelper_02); View view = LayoutInflater.from(context).inflate(R.layout.layout_ktv_empty, null); diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyRecordDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyRecordDialog.kt index 50dac2b57..3fe6834f0 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyRecordDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyRecordDialog.kt @@ -6,6 +6,7 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager +import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseDialog import com.yizhuan.erban.common.EmptyViewHelper import com.yizhuan.erban.databinding.TreasureFairyDialogMyFairyRecordBinding @@ -41,7 +42,12 @@ class MyFairyRecordDialog : BaseDialog( rvDelegate = RVDelegate.Builder() .setAdapter(recordAdapter) .setRecyclerView(binding.recyclerView) - .setEmptyView(EmptyViewHelper.createEmptyTextView(context,"暫無記錄")) + .setEmptyView( + EmptyViewHelper.createEmptyTextViewNoImage( + context, + getString(R.string.fairy_no_further_data_is_available) + ) + ) .setLayoutManager(LinearLayoutManager(context)) .build() diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyRecordDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyRecordDialog.kt index f82c7d6f3..340ccccf8 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyRecordDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyRecordDialog.kt @@ -5,6 +5,7 @@ import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.common.util.sys.ScreenUtil +import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseDialog import com.yizhuan.erban.common.EmptyViewHelper import com.yizhuan.erban.databinding.TreasureFairyDialogTestFairyRecordBinding @@ -41,7 +42,12 @@ class TestFairyRecordDialog : BaseDialog() .setAdapter(debrisAdapter) .setRecyclerView(binding.recyclerView) - .setEmptyView(EmptyViewHelper.createEmptyTextView(context,"暫無數據")) + .setEmptyView( + EmptyViewHelper.createEmptyTextViewNoImage( + context, + getString(R.string.fairy_no_further_data_is_available) + ) + ) .setLayoutManager(GridLayoutManager(context, 2, LinearLayoutManager.VERTICAL, false)) .build() viewModel.getDebrisExchangeList() diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt index f2a4c56a8..0903d0d68 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager +import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingFragment import com.yizhuan.erban.common.EmptyViewHelper import com.yizhuan.erban.databinding.TreasureFairyFragmentExchangeRecordDebrisBinding @@ -38,7 +39,10 @@ class ExchangeDebrisRecordFragment : BaseViewBindingFragment() { +class ExchangeFairyRecordFragment : + BaseViewBindingFragment() { companion object { @@ -37,7 +39,12 @@ class ExchangeFairyRecordFragment : BaseViewBindingFragment() .setAdapter(prizeAdapter) .setPageSize(pageSize) - .setEmptyView(EmptyViewHelper.createEmptyTextView(context,"暫無數據")) + .setEmptyView( + EmptyViewHelper.createEmptyTextViewNoImage( + context, + getString(R.string.fairy_no_further_data_is_available) + ) + ) .setRecyclerView(binding.recyclerView) .setLayoutManager(LinearLayoutManager(context)) .build() diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesChildFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesChildFragment.kt index 914864654..d08e06f74 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesChildFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesChildFragment.kt @@ -5,6 +5,7 @@ import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager +import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingFragment import com.yizhuan.erban.common.EmptyViewHelper import com.yizhuan.erban.databinding.TreasureFairyFragmentForestPrizesChildBinding @@ -35,7 +36,10 @@ class ForestPrizesChildFragment : prizeAdapter = ForestPrizesChildAdapter() rvDelegate = RVDelegate.Builder() .setAdapter(prizeAdapter) - .setEmptyView(EmptyViewHelper.createEmptyTextView(context,"暫無數據")) + .setEmptyView(EmptyViewHelper.createEmptyTextViewNoImage( + context, + getString(R.string.fairy_no_further_data_is_available) + )) .setRecyclerView(binding.recyclerView) .setLayoutManager(GridLayoutManager(context, 3, LinearLayoutManager.VERTICAL, false)) .build() diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestRecordFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestRecordFragment.kt index 8e7acd6c5..6e09fc334 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestRecordFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestRecordFragment.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager +import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingFragment import com.yizhuan.erban.common.EmptyViewHelper import com.yizhuan.erban.databinding.TreasureFairyFragmentForestRecordBinding @@ -37,7 +38,12 @@ class ForestRecordFragment : BaseViewBindingFragment() .setAdapter(prizeAdapter) .setPageSize(pageSize) - .setEmptyView(EmptyViewHelper.createEmptyTextView(context,"暫無數據")) + .setEmptyView( + EmptyViewHelper.createEmptyTextViewNoImage( + context, + getString(R.string.fairy_no_further_data_is_available) + ) + ) .setRecyclerView(binding.recyclerView) .setLayoutManager(LinearLayoutManager(context)) .build() diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt index 6652d8b76..48fdaa6f9 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt @@ -60,7 +60,10 @@ class TestFairyFragment : BaseViewBindingFragment() .setAdapter(testFairyAdapter) - .setEmptyView(EmptyViewHelper.createEmptyTextView(context,"暫無數據")) + .setEmptyView(EmptyViewHelper.createEmptyTextViewNoImage( + context, + getString(R.string.fairy_no_further_data_is_available) + )) .setRecyclerView(binding.recyclerView) .setLayoutManager(GridLayoutManager(context, 5, LinearLayoutManager.VERTICAL, false)) .build() diff --git a/app/src/main/res/layout/layout_text_empty.xml b/app/src/main/res/layout/layout_text_empty.xml new file mode 100644 index 000000000..45383020a --- /dev/null +++ b/app/src/main/res/layout/layout_text_empty.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f5c77dfbc..6e07782c7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5108,5 +5108,6 @@ 抓捕十次 >]]> 記錄 + 暫無更多數據~ \ No newline at end of file