yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.0版本UI对稿

Browse Source
This commit is contained in:
huangjian
2022-08-25 17:10:01 +08:00
parent 42908eb822
commit c464778834
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

@@ -173,7 +173,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
private CompositeDisposable compositeDisposable;
private GiftInfoVm lastSelectedItem;
private List<List<GiftInfoVm>> pagerList;
private WalletInfo goldWalletInfo;
private WalletInfo goldWalletInfo = PayModel.get().getCurrentWalletInfo();
private int itemType = ITEM_TYPE_GOLD;
private HorizontalScrollView hsvTabs;
private View rlGifts;
@@ -475,8 +475,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
updateGiftView(giftIndicator.getCurrrentType(), giftInfo);
}
goldWalletInfo = PayModel.get().getCurrentWalletInfo();
View descLayout = root.findViewById(R.id.desc_layout);
if (isInRoom && (userOnMic || uid == 0)) {

2
app/src/main/res/layout/dialog_bottom_gift.xml
View File

@@ -11,7 +11,7 @@
<LinearLayout
android:id="@+id/ll_draw_gift"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_height="50dp"
android:background="@drawable/bg_draw_gift_operation"
android:gravity="center_vertical"
android:orientation="horizontal"

8
app/src/main/res/layout/pull_radish_ranking_list_item.xml
View File

@@ -21,7 +21,7 @@
<ImageView
android:id="@+id/iv_position"
android:layout_width="@dimen/dp_20"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center" />
@@ -31,6 +31,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center"
android:textStyle="bold"
android:textColor="#CFAD79"
android:textSize="@dimen/dp_18"
tools:text="100" />
@@ -63,14 +64,15 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:layout_weight="0.7"
android:layout_weight="0.8"
android:drawableStart="@drawable/treasure_box_diamond"
android:drawablePadding="5dp"
android:textStyle="bold"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:textColor="#64472E"
android:textSize="@dimen/dp_18"
tools:text="1236843" />
tools:text="999999999" />
</LinearLayout>

6
app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java
View File

@@ -110,7 +110,7 @@ public class RadishRankingFragment extends BaseMvpFragment<IRadishRankingView, R
swipeRefresh.setRefreshing(false);
if (rankingInfo.getRankVos() == null || rankingInfo.getRankVos().size() == 0) {
showNoData(getString(R.string.empty_newbie_list));
showNoData("暂无数据");
} else {
mAdapter.setNewData(rankingInfo.getRankVos());
}
@@ -124,7 +124,7 @@ public class RadishRankingFragment extends BaseMvpFragment<IRadishRankingView, R
int page = getMvpPresenter().getPage();
if (page <= 1) {
showNoData(getString(R.string.empty_newbie_list));
showNoData("暂无数据");
}
}
@@ -143,7 +143,7 @@ public class RadishRankingFragment extends BaseMvpFragment<IRadishRankingView, R
hideStatus();
int page = getMvpPresenter().getPage();
if (page <= 1) {
showNoData(getString(R.string.empty_newbie_list));
showNoData("暂无数据");
}
}

6
app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java
View File

@@ -38,17 +38,17 @@ public class RadishRankingListAdapter extends BaseQuickAdapter<BoxRankingInfo.Ra
case 0:
tvPosition.setVisibility(View.GONE);
ivPosition.setVisibility(View.VISIBLE);
ivPosition.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_box_ranking_first));
ivPosition.setImageResource(R.drawable.ic_radish_ranking_first);
break;
case 1:
tvPosition.setVisibility(View.GONE);
ivPosition.setVisibility(View.VISIBLE);
ivPosition.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_box_ranking_second));
ivPosition.setImageResource(R.drawable.ic_radish_ranking_second);
break;
case 2:
tvPosition.setVisibility(View.GONE);
ivPosition.setVisibility(View.VISIBLE);
ivPosition.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_box_ranking_third));
ivPosition.setImageResource(R.drawable.ic_radish_ranking_third);
break;
default:
tvPosition.setVisibility(View.VISIBLE);

BIN
app/src/module_treasure_box/res/drawable-xhdpi/ic_radish_ranking_first.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
app/src/module_treasure_box/res/drawable-xhdpi/ic_radish_ranking_second.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/module_treasure_box/res/drawable-xhdpi/ic_radish_ranking_third.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

2
app/src/module_treasure_box/res/drawable/bg_radish_rank_item.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#fff9f0d9" />
<solid android:color="#FFEEC3" />
<corners
android:bottomLeftRadius="6dp"
android:bottomRightRadius="6dp"