From 4186ee89208b0c418a8a4c5044944eda49457a20 Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 9 Feb 2023 16:49:12 +0800 Subject: [PATCH] =?UTF-8?q?UI=E5=AF=B9=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mango/moshen/common/EmptyViewHelper.java | 13 ++++++ .../com/mango/moshen/ui/im/InputPanel.java | 22 ++++----- .../com/mango/moshen/ui/utils/RVDelegate.java | 4 +- .../main/res/layout/activity_user_info.xml | 7 +-- .../main/res/layout/box_ranking_list_item.xml | 1 + app/src/main/res/layout/dialog_user_info.xml | 3 +- app/src/main/res/layout/fragment_me.xml | 3 +- .../main/res/layout/layout_p2p_user_card.xml | 4 -- .../res/layout/nim_msg_fragment.xml | 11 +++-- .../fragment/BoxRankingFragment.java | 44 ++++++++---------- .../fragment/BoxRecordFragment.kt | 2 +- .../widget/dialog/BoxMoreDialog.java | 5 +- .../res/drawable-xhdpi/arrow_right_box.png | Bin 0 -> 313 bytes .../res/drawable-xhdpi/icon_box_set_false.png | Bin 0 -> 1143 bytes .../res/drawable-xhdpi/icon_box_set_true.png | Bin 0 -> 1299 bytes .../res/layout/dialog_box_more.xml | 16 ++++--- .../res/layout/fragment_box_ranking.xml | 15 ++++++ .../res/layout/item_box_prize_record.xml | 6 ++- .../res/layout/item_box_rule.xml | 4 +- nim_uikit/res/layout/nim_message_item.xml | 4 +- 20 files changed, 91 insertions(+), 73 deletions(-) create mode 100644 app/src/module_treasure_box/res/drawable-xhdpi/arrow_right_box.png create mode 100644 app/src/module_treasure_box/res/drawable-xhdpi/icon_box_set_false.png create mode 100644 app/src/module_treasure_box/res/drawable-xhdpi/icon_box_set_true.png create mode 100644 app/src/module_treasure_box/res/layout/fragment_box_ranking.xml diff --git a/app/src/main/java/com/mango/moshen/common/EmptyViewHelper.java b/app/src/main/java/com/mango/moshen/common/EmptyViewHelper.java index 45c3f4d90..695be439f 100644 --- a/app/src/main/java/com/mango/moshen/common/EmptyViewHelper.java +++ b/app/src/main/java/com/mango/moshen/common/EmptyViewHelper.java @@ -1,6 +1,8 @@ package com.mango.moshen.common; import android.content.Context; +import android.graphics.Color; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,6 +11,7 @@ import android.widget.TextView; import com.mango.moshen.R; import com.mango.xchat_android_library.utils.NetworkUtils; +import com.netease.nim.uikit.common.util.sys.ScreenUtil; public class EmptyViewHelper { @@ -21,6 +24,16 @@ public class EmptyViewHelper { return view; } + public static TextView createEmptyTextView(Context context,CharSequence text) { + TextView textView = new TextView(context); + textView.setGravity(Gravity.CENTER); + textView.setTextColor(Color.WHITE); + textView.setTextSize(12); + textView.setSingleLine(true); + textView.setText(text); + return textView; + } + public static View createDarkEmptyView(Context context, String text) { if (!NetworkUtils.isNetworkAvailable(context)) text = "网络异常,请检查网络再试~"; View view = LayoutInflater.from(context).inflate(R.layout.layout_ktv_empty, null); diff --git a/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java b/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java index 4679555bf..238c386df 100644 --- a/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java +++ b/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java @@ -1,5 +1,6 @@ package com.mango.moshen.ui.im; +import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; @@ -43,6 +44,8 @@ import com.effective.android.panel.view.panel.PanelView; import com.mango.core.statistic.StatisticManager; import com.mango.core.statistic.protocol.StatisticsProtocol; import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.permission.PermissionActivity; import com.mango.moshen.ui.im.actions.GiftAction; import com.mango.moshen.ui.im.adpter.PhotoPreviewAdapter; import com.mango.xchat_android_library.utils.ListUtils; @@ -116,7 +119,6 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba protected EditText messageEditText;// 文本消息编辑框 protected Button audioRecordBtn; // 录音按钮 protected View audioAnimLayout; // 录音动画布局 - protected FrameLayout textAudioSwitchLayout; // 切换文本，语音按钮布局 protected View switchToTextButtonInInputBar;// 文本消息选择按钮 protected View switchToAudioButtonInInputBar;// 语音消息选择按钮 protected View sendMessageButtonInInputBar;// 发送消息按钮 @@ -330,7 +332,11 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba StatisticsProtocol.EVENT_CHAT_TOOLBAR_PHOTO_CLICK, "聊天对话框工具栏相册点击"); emojiButtonInInputBar.setImageResource(R.drawable.nim_message_input_emotion_pressed); - initPreviewPhotos(); + ((BaseActivity)container.activity).checkPermission( + () -> initPreviewPhotos(), + 0, + Manifest.permission.READ_EXTERNAL_STORAGE + ); } } @@ -495,9 +501,6 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba switchToTextButtonInInputBar.setVisibility(View.GONE); switchToAudioButtonInInputBar.setVisibility(View.VISIBLE); - // 文本录音按钮切换布局 - textAudioSwitchLayout = view.findViewById(R.id.switchLayout); - textAudioSwitchLayout.setVisibility(View.GONE); messageListView = view.findViewById(R.id.messageListView); ivImage = view.findViewById(R.id.iv_image); ivCamera = view.findViewById(R.id.iv_camera); @@ -581,15 +584,6 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba sendTypingCommand(); } }); - - // 不展示右侧按钮时需要添加edit间距 - try { - ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) messageEditText.getLayoutParams(); - layoutParams.setMarginStart(SizeUtils.dp2px(view.getContext(), 12)); - messageEditText.requestLayout(); - } catch (Exception ex) { - ex.printStackTrace(); - } } /** diff --git a/app/src/main/java/com/mango/moshen/ui/utils/RVDelegate.java b/app/src/main/java/com/mango/moshen/ui/utils/RVDelegate.java index 2ecbc7c18..aa6b12bd9 100644 --- a/app/src/main/java/com/mango/moshen/ui/utils/RVDelegate.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/RVDelegate.java @@ -75,7 +75,7 @@ public class RVDelegate { if (data != null && data.size() >= pageSize) { adapter.loadMoreComplete(); } else { - adapter.loadMoreEnd(); + adapter.loadMoreEnd(true); } } @@ -88,7 +88,7 @@ public class RVDelegate { if (data != null && data.size() >= pageSize) { adapter.loadMoreComplete(); } else { - adapter.loadMoreEnd(); + adapter.loadMoreEnd(true); } if (refreshLayout != null) refreshLayout.setRefreshing(false); if (dataStatus != null) { diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 7608fd427..f5d5301ba 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -70,10 +70,10 @@ android:id="@+id/ll_audio" android:layout_width="63dp" android:layout_height="@dimen/dp_25" + android:layout_gravity="end|center_vertical" android:background="@drawable/bg_userinfo_skill_audio" android:gravity="center_vertical" android:orientation="horizontal" - android:layout_gravity="end|center_vertical" android:visibility="gone" tools:visibility="visible"> @@ -174,12 +174,13 @@ android:id="@+id/tv_erban_id" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:drawableEnd="@drawable/ic_copy_id_white" + android:drawablePadding="2dp" android:gravity="center_vertical" android:includeFontPadding="false" android:maxLines="1" - android:drawableEnd="@drawable/ic_copy_id_white" android:textColor="@color/white" - android:textSize="11dp" + android:textSize="14dp" tools:text="ID:7958626" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml index f755f73f4..ce1e4c7b0 100644 --- a/app/src/main/res/layout/dialog_user_info.xml +++ b/app/src/main/res/layout/dialog_user_info.xml @@ -245,7 +245,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/white_transparent_50" - android:textSize="@dimen/sp_12" + android:textSize="@dimen/sp_14" + android:drawablePadding="2dp" android:drawableEnd="@drawable/ic_copy_id_white" tools:text="ID123456" /> diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 515265efc..a299952f5 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -132,9 +132,10 @@ android:drawableEnd="@drawable/ic_copy_id" android:gravity="center" android:maxLines="1" + android:drawablePadding="2dp" android:onClick="@{click}" android:textColor="@color/text_secondary_4f516a" - android:textSize="@dimen/dp_13" + android:textSize="@dimen/dp_14" tools:ignore="SpUsage" tools:text="ID:123456" /> diff --git a/app/src/main/res/layout/layout_p2p_user_card.xml b/app/src/main/res/layout/layout_p2p_user_card.xml index 051a31dd1..b813d3d6b 100644 --- a/app/src/main/res/layout/layout_p2p_user_card.xml +++ b/app/src/main/res/layout/layout_p2p_user_card.xml @@ -20,9 +20,7 @@ android:id="@+id/ll_skill" android:layout_width="match_parent" android:layout_height="48dp" - android:layout_marginStart="15dp" android:layout_marginTop="8dp" - android:layout_marginEnd="15dp" android:background="@drawable/shape_white_8dp_round" android:baselineAligned="true" android:gravity="center_vertical" @@ -111,9 +109,7 @@ diff --git a/app/src/module_public_chat_hall/res/layout/nim_msg_fragment.xml b/app/src/module_public_chat_hall/res/layout/nim_msg_fragment.xml index 41107a993..8b5d524d8 100644 --- a/app/src/module_public_chat_hall/res/layout/nim_msg_fragment.xml +++ b/app/src/module_public_chat_hall/res/layout/nim_msg_fragment.xml @@ -115,8 +115,8 @@ android:id="@+id/switchLayout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/bottom_component_margin_horizontal" - android:layout_marginRight="@dimen/bottom_component_margin_horizontal"> + android:layout_marginStart="15dp" + android:layout_marginEnd="8dp"> @@ -184,11 +184,12 @@ android:id="@+id/buttonSendMessage" android:layout_width="56dp" android:layout_height="30dp" - android:layout_marginEnd="6dp" + android:layout_marginEnd="15dp" + android:layout_marginStart="-9dp" android:background="@drawable/common_btn_bg" android:contentDescription="@string/empty" - android:gravity="center" android:enabled="false" + android:gravity="center" android:text="@string/send" android:textColor="@color/white" android:textSize="@dimen/sp_12" diff --git a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/BoxRankingFragment.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/BoxRankingFragment.java index c4cc1f6b9..30a16d83e 100644 --- a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/BoxRankingFragment.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/BoxRankingFragment.java @@ -9,11 +9,12 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.mango.moshen.R; -import com.mango.moshen.base.BaseMvpFragment; -import com.mango.moshen.treasure_box.adapter.BoxRankingListAdapter; import com.mango.core.room.treasure_box.bean.BoxRankingInfo; import com.mango.core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.common.EmptyViewHelper; +import com.mango.moshen.treasure_box.adapter.BoxRankingListAdapter; import com.mango.moshen.treasure_box.module.IBoxRankingView; import com.mango.moshen.treasure_box.presenter.BoxRankingPresenter; import com.mango.xchat_android_library.base.factory.CreatePresenter; @@ -37,7 +38,7 @@ public class BoxRankingFragment extends BaseMvpFragment { mAdapter.setEnableLoadMore(true); - loadData(true,datetype); + loadData(true, datetype); }); - - } @Override public void initiate() { initRecyclerView(); - loadData(true,datetype); + loadData(true, datetype); } - /** * 刷新数据 */ - private void loadData(boolean isRefresh,int datetype) { - getMvpPresenter().loadData(isRefresh,datetype); + private void loadData(boolean isRefresh, int datetype) { + getMvpPresenter().loadData(isRefresh, datetype); } @Override @@ -100,19 +98,18 @@ public class BoxRankingFragment extends BaseMvpFragment() { rvDelegate = RVDelegate.Builder() .setAdapter(adapter) .setRecyclerView(binding.recyclerView) - .setEmptyView(EmptyViewHelper.createEmptyView(context, "暂无记录")) + .setEmptyView(EmptyViewHelper.createEmptyTextView(context, "暂无记录")) .setLayoutManager(LinearLayoutManager(mContext)) .setRefreshLayout(binding.swipeRefresh) .setPageSize(pageSize) diff --git a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BoxMoreDialog.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BoxMoreDialog.java index 1279424e4..485077d24 100644 --- a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BoxMoreDialog.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BoxMoreDialog.java @@ -36,15 +36,12 @@ public class BoxMoreDialog extends BaseViewBindingFragment sendMessageSwitchLevel = requireArguments().getInt("sendMessageSwitchLevel"); getBinding().tvHistory.setOnClickListener(v -> { EventBus.getDefault().post(new MoreClickEvent(v)); - //DialogWebViewActivity.start(mContext, UriProvider.getBoxHistory(), false); }); getBinding().tvBoxRule.setOnClickListener(v -> { EventBus.getDefault().post(new MoreClickEvent(v)); - //DialogWebViewActivity.start(mContext, UriProvider.getBoxHelp(), false); }); getBinding().tvGetKey.setOnClickListener(v -> { EventBus.getDefault().post(new MoreClickEvent(v)); - //DialogWebViewActivity.start(mContext, UriProvider.getBoxKey()); }); boolean canSwitch = sendMessageSwitchLevel != 0 && UserUtils.getExpLevel() >= sendMessageSwitchLevel; @@ -64,6 +61,6 @@ public class BoxMoreDialog extends BaseViewBindingFragment private void updateMsgSwitch(boolean sendMsg) { getBinding().ivSwitch.setImageResource(sendMsg ? - R.drawable.icon_room_set_lock_true : R.drawable.icon_room_set_lock_false); + R.drawable.icon_box_set_true : R.drawable.icon_box_set_false); } } diff --git a/app/src/module_treasure_box/res/drawable-xhdpi/arrow_right_box.png b/app/src/module_treasure_box/res/drawable-xhdpi/arrow_right_box.png new file mode 100644 index 0000000000000000000000000000000000000000..1378dabca736e642a9582cc29df150bebe52802f GIT binary patch literal 313 zcmV-90mlA`P)Px#^GQTOR5(wK(?3oEK@`XF?{9-Z!&xlE%8t%NT8If}u+?}05<4q8IwF+~iFa^F zC``Nr2f$?&A6XWbKfANbR8xF@Z{C~C2*AuLlK$d-(b95i_rMVNiXz&L8_j(Ig;VJRTX?wd)p&8@)H9bkIwC{Lx4%}4! zarPw9-=*^^rjH;ipRqqPd~vLygGt+8$v8j00000 LNkvXXu0mjf3nPMX literal 0 HcmV?d00001 diff --git a/app/src/module_treasure_box/res/drawable-xhdpi/icon_box_set_false.png b/app/src/module_treasure_box/res/drawable-xhdpi/icon_box_set_false.png new file mode 100644 index 0000000000000000000000000000000000000000..999730a0f8b953a87caa14748e1fe69fe76fe9d9 GIT binary patch literal 1143 zcmV--1c>{IP)001Ni1^@s6!R*In00001b5ch_0Itp) z=>Px(F-b&0RA@u(THk9NbrAo|?wz@IcYD{QXPctfB#ITp7f~ySKd7|1`XHDZTF@8u zv4!?8QOHAIT3?hJVy-^brp4k9#8kuwMX;hK6{TrSbKdoC>$SJLBeT5?m&+x)cey=T z-7hRG?0jdw^Vym2cfK=2XmjjM<%jzcw2#5hFz^Twc7d@4ghZRHdPmN%K)A__D+K&V zpf7J*eBoksY_6R}P!Qr*F{M_t#33kr1i(`O0?iA;``@BrfC=~t4xP|VYw|;k+kR{D zReHa6W|S0un}FSZ%%b|8fy?aB@$=>@GwbQFCRk5nYE#-!CkS|>(UORO&6`v1lj=(% znN*=DiYvo$9Mozys<&&nb*t(=%#ndmEbZOD%J$J&jQ`zg)h)r=tDWASq`tF6c-)($ zD1=N#M<%U9Rqul1H*DKMu~b2^Sb^h212txRTjRt_7tNQiH|w_wteifTWm3OrbUR(& zgzUC75((80pO)V(%f{l35-OFJKdd93VNMdaB(|SDR~cVyl(PaXalMS8eh%OXk0_hX zAd}X*vbJK$#NuMHE4+HZgEvZTDVr|Cd<%x zF>q?8Joc6+U>U6aTK+{v!3A$K@1{jHYZD<0W5>b1^XAwmqJs;T#8G8K{lVL(#G1sa z!W?248lAC*IHmyPDW<>fO2~NI}jcdW$wQ(i&W~Kj)3oUQnh*qzyGl!Q0|mf zxbqm_Q_jdsgt%2C4G--I{S<80NKVDM`D@`S+8yo%u`Ef9xpBgSBRfHoR_NhiX8iK& z)gDUhP!z)wu&N;R#bEh>$gsr?Wy9DOyP>bexo#M5@V+%APU@jQmNC3l_`&mVi?qw<=f&McAdV2w9ZCv3@DcJsIO7 zD*_c+J^PEx_W{fI9$?~*p2xOB(D*>>9`{{cDL0W|tZj==x`002ov JPDHLkV1ltjGv5FJ literal 0 HcmV?d00001 diff --git a/app/src/module_treasure_box/res/drawable-xhdpi/icon_box_set_true.png b/app/src/module_treasure_box/res/drawable-xhdpi/icon_box_set_true.png new file mode 100644 index 0000000000000000000000000000000000000000..46e480cdc731b75c4aa2ec554b3ca03e20640648 GIT binary patch literal 1299 zcmV+u1?>8XP)001Ni1^@s6!R*In00001b5ch_0Itp) z=>Px(%}GQ-RA@u(T5D_+RTTct?5?fZoj!ck*AHz`XkywLK?*^EpzTgk3-n=4BsGAT zXsZ}a{6X{wh94#v!K%cjC225NOScrT52^%2LJQQ`5|b8%>JJ|jV_Vp6Y}uW;=5BZD zF5Pw?ot<`)oqxM?&pG#gbMCq4p6?JMeAXm7(i6;-$G}!FAd?6WfFTJ4bA+n&8_wVX z;W}gZjetG^ogVkFj^krR1CdOE!WmqG2Ggk3Tn2$v09XnjEV*!W&(#6B5n-HO%sV{=6oQc@Gc0_o;KBg12;{p12ppZNWM zz<_>Y@{?_&rGNX64*-jAy%f>(9e^cKS=LcV5C~f;vmg~_XkxYf$N*}pdLhe9)pvfx zDX;Y3k^x}ZMMn(*n>Dc>LnR!jx88jm%U9l~sg=%Ce_+>+b5N8Cz!*^5?kw7(8kqzu z-|Bcu5YSODQ`Po^lyJLW3-mjB@ei|0{J(e#rM;uMcj z+^b^weE9yk$r#4d3ehP)!t*dMSaxgUizLwgSWZ9--Tc)1Y=2(ZCtkER`APZe#*WET zk|}IsyQ}yMFIbZ3=md}(t#ZBO%E~kGe0ioW=Dw=yLw#MJ&lWq|<}A)7DY-raishI2 z9;-}d!oGtAG50FgEls?z0i&BDmyWp`uy&gHYv5V`2i z?Pt*4d1XS7u}ZSrnhp@L7a~`suf*2Zvmve1CZ`H_=55WFQT=hR4=ehTB%7lbgsgBC z%+4v#z4^blSQ$lxd6-KR#1}P ztb!%;ZOCudcSJFNT}9?%8(te3$4eUmw_!ZMPxINQ1o(LBF#QH;JA4_{dje92cv3nY zTvL+L_;n{ZR6(yhe5fQgb^*jGu6g~;`9+$e6ED#O`pAqWnt1Uq5Ud%Ce|)Hs%F3^7 z%Yps5*p!tyaq;=?8Oq8kt_7l_h8cjcFqsH%zqb^*Pu#0%jP3gVPwd)pc9P*Cptdy_ zVZp5$jS73YG8=Y{h>M7+Fz?A2Cs{cK7Mf&LecFih{j)y$UJR4Iclzl2qqCv!RlxX` zOchO4%s`DH7GGmXwqIk2)oSrB$>nlm(AOB!+kF*3YSkFxA2lahj+EU5TBvC>okz+T z*hQuY+oEnc@?Xm;oG>R^|0yGZcrzPkIQ6Z<#Q<2|%m%PdDA+sZy1o7+R(nF3iFnac z@}UgKN&)8?8L)^55Bl09=Wn%@LH4yt{z^bUfUX-Jv_#q_`5)MD6*M{szaans002ov JPDHLkV1meEb-Vxo literal 0 HcmV?d00001 diff --git a/app/src/module_treasure_box/res/layout/dialog_box_more.xml b/app/src/module_treasure_box/res/layout/dialog_box_more.xml index 255ba7c1d..d1419deea 100644 --- a/app/src/module_treasure_box/res/layout/dialog_box_more.xml +++ b/app/src/module_treasure_box/res/layout/dialog_box_more.xml @@ -17,11 +17,13 @@ android:paddingEnd="7dp"> @@ -30,7 +32,7 @@ android:id="@+id/tv_get_key" android:layout_width="match_parent" android:layout_height="32dp" - android:drawableEnd="@drawable/arrow_right" + android:drawableEnd="@drawable/arrow_right_box" android:gravity="center_vertical" android:text="参与活动获得糖果" android:textColor="#F8CBFF" @@ -47,7 +49,7 @@ android:id="@+id/tv_history" android:layout_width="match_parent" android:layout_height="32dp" - android:drawableEnd="@drawable/arrow_right" + android:drawableEnd="@drawable/arrow_right_box" android:gravity="center_vertical" android:text="获奖记录" android:textColor="#F8CBFF" @@ -64,7 +66,7 @@ android:id="@+id/tv_box_rule" android:layout_width="match_parent" android:layout_height="32dp" - android:drawableEnd="@drawable/arrow_right" + android:drawableEnd="@drawable/arrow_right_box" android:gravity="center_vertical" android:text="玩法规则" android:textColor="#F8CBFF" @@ -96,7 +98,7 @@ android:layout_height="@dimen/dp_15" android:layout_gravity="end|center_vertical" android:scaleType="fitCenter" - android:src="@drawable/icon_room_set_lock_false" /> + android:src="@drawable/icon_box_set_false" /> diff --git a/app/src/module_treasure_box/res/layout/fragment_box_ranking.xml b/app/src/module_treasure_box/res/layout/fragment_box_ranking.xml new file mode 100644 index 000000000..d0b6e7d54 --- /dev/null +++ b/app/src/module_treasure_box/res/layout/fragment_box_ranking.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/app/src/module_treasure_box/res/layout/item_box_prize_record.xml b/app/src/module_treasure_box/res/layout/item_box_prize_record.xml index b14601e56..57eeac0e0 100644 --- a/app/src/module_treasure_box/res/layout/item_box_prize_record.xml +++ b/app/src/module_treasure_box/res/layout/item_box_prize_record.xml @@ -24,8 +24,10 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:lines="1" + android:layout_marginStart="4dp" + android:fontFamily="sans-serif" android:textColor="#F8CBFF" - android:textSize="12sp" + android:textSize="10sp" tools:text="哈哈哈哈" /> diff --git a/nim_uikit/res/layout/nim_message_item.xml b/nim_uikit/res/layout/nim_message_item.xml index 02d1ea46e..29fb2b97c 100644 --- a/nim_uikit/res/layout/nim_message_item.xml +++ b/nim_uikit/res/layout/nim_message_item.xml @@ -6,8 +6,8 @@ android:orientation="vertical" android:paddingTop="6dp" android:paddingBottom="6dp" - android:paddingStart="11dp" - android:paddingEnd="11dp"> + android:paddingStart="15dp" + android:paddingEnd="15dp">