From f3fa5cf12cf429b1a57b85f885ab65113d0dea6a Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Wed, 26 Oct 2022 19:04:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BC=E7=89=A9=E5=A2=99ui?= =?UTF-8?q?=EF=BC=8C=E9=A6=96=E9=A1=B5=E6=88=BF=E9=97=B4ui=E5=92=8CGoogle?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/google-services.json | 2 +- .../erban/home/adapter/HomeHotAdapter.kt | 12 --- .../erban/ui/user/UserInfoGiftFragment.java | 21 ++++- .../ui/user/adapter/UserGiftAdapter.java | 21 ++++- .../GridSpacingItemNewDecoration.java | 88 ++++++++++++++++++ .../main/res/drawable-xhdpi/ic_gift_one.webp | Bin 0 -> 1956 bytes .../res/drawable-xhdpi/ic_gift_three.webp | Bin 0 -> 2642 bytes .../main/res/drawable-xhdpi/ic_gift_two.webp | Bin 0 -> 2698 bytes app/src/main/res/drawable/bg_f3f5fa_r8.xml | 6 ++ app/src/main/res/layout/activity_charge.xml | 2 +- .../res/layout/fragment_user_info_gift.xml | 9 +- .../res/layout/fragment_userinfo_dynamic.xml | 3 +- .../layout/fragment_userinfo_gift_wall.xml | 2 +- app/src/main/res/layout/item_room_common.xml | 3 +- app/src/main/res/layout/list_item_charge.xml | 10 -- .../res/layout/list_item_gift_wall_info.xml | 49 +++++++--- .../xchat_android_core/bean/UserInfoItem.java | 1 + mob.gradle | 2 +- tmpmob/ShareSDK/assets/ShareSDK.xml | 2 +- 19 files changed, 179 insertions(+), 54 deletions(-) create mode 100644 app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java create mode 100644 app/src/main/res/drawable-xhdpi/ic_gift_one.webp create mode 100644 app/src/main/res/drawable-xhdpi/ic_gift_three.webp create mode 100644 app/src/main/res/drawable-xhdpi/ic_gift_two.webp create mode 100644 app/src/main/res/drawable/bg_f3f5fa_r8.xml diff --git a/app/google-services.json b/app/google-services.json index eeea09fbf..7549d6ea8 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -14,7 +14,7 @@ }, "oauth_client": [ { - "client_id": "766987211654-2b4de5kbhe7tpgtfto4bjll3dj7ih26u.apps.googleusercontent.com", + "client_id": "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com", "client_type": 1, "android_info": { "package_name": "com.vele.peko", diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt index daa9dab51..efec2f7da 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt @@ -27,17 +27,5 @@ class HomeHotAdapter : helper.setGone(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) - val avatars: Array = arrayOf( - helper.getView(R.id.iv_avatar_0), - helper.getView(R.id.iv_avatar_1), - helper.getView(R.id.iv_avatar_2), - helper.getView(R.id.iv_avatar_3), - helper.getView(R.id.iv_avatar_4) - ) - for (i in avatars.indices) { - val avatarUrl = item.micUsers?.getOrNull(i)?.avatar - avatars[i].isGone = avatarUrl.isNullOrBlank() - avatars[i].load(avatarUrl) - } } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java index 04baf6313..3c43a51fd 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java @@ -16,6 +16,8 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingFragment; import com.yizhuan.erban.databinding.FragmentUserInfoGiftBinding; import com.yizhuan.erban.ui.user.adapter.UserGiftAdapter; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration; import com.yizhuan.xchat_android_core.bean.UserInfoItem; import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; import com.yizhuan.xchat_android_core.user.UserModel; @@ -87,7 +89,10 @@ public class UserInfoGiftFragment extends BaseBindingFragment list = userGiftAdapter.getData(); if (ListUtils.isListEmpty(list)) - return 4; + return 12; UserInfoItem userInfoItem = list.get(position); int type = userInfoItem.getItemType(); if (type == UserInfoItem.TYPE_DIV || type == UserInfoItem.TYPE_GIFT_EMPTY) { + return 12; + } else if (type == UserInfoItem.TYPE_GIFT_ITEM_TOP) { return 4; } else - return 1; + return 3; } }); @@ -149,10 +156,14 @@ public class UserInfoGiftFragment extends BaseBindingFragment userInfoItem; for (int i = 0; i < giftWallInfoList.size(); i++) { - userInfoItem = new UserInfoItem<>(UserInfoItem.TYPE_GIFT_ITEM, giftWallInfoList.get(i)); + if (i < 3) { + userInfoItem = new UserInfoItem<>(UserInfoItem.TYPE_GIFT_ITEM_TOP, giftWallInfoList.get(i)); + } else { + userInfoItem = new UserInfoItem<>(UserInfoItem.TYPE_GIFT_ITEM, giftWallInfoList.get(i)); + } userInfoItems.add(userInfoItem); //非礼物详情页主需要12个就够了 - if (!isDetails && i == 11){ + if (!isDetails && i == 11) { break; } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserGiftAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserGiftAdapter.java index 56e929236..2a91191eb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserGiftAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserGiftAdapter.java @@ -1,6 +1,7 @@ package com.yizhuan.erban.ui.user.adapter; import android.content.Context; +import android.view.View; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; @@ -17,6 +18,7 @@ public class UserGiftAdapter extends UserTabBaseAdapter { public UserGiftAdapter(Context context, List data, boolean isDetails) { super(context, data); + addItemType(UserInfoItem.TYPE_GIFT_ITEM_TOP, R.layout.list_item_gift_wall_info); addItemType(UserInfoItem.TYPE_GIFT_ITEM, R.layout.list_item_gift_wall_info); addItemType(UserInfoItem.TYPE_GIFT_EMPTY, R.layout.layout_gift_empty); this.isDetails = isDetails; @@ -31,8 +33,11 @@ public class UserGiftAdapter extends UserTabBaseAdapter { super.convert(helper, item); switch (item.getItemType()) { + case UserInfoItem.TYPE_GIFT_ITEM_TOP: + setGiftItem(helper, item, UserInfoItem.TYPE_GIFT_ITEM_TOP); + case UserInfoItem.TYPE_GIFT_ITEM: - setGiftItem(helper, item); + setGiftItem(helper, item, UserInfoItem.TYPE_GIFT_ITEM); break; case UserInfoItem.TYPE_GIFT_EMPTY: @@ -41,7 +46,7 @@ public class UserGiftAdapter extends UserTabBaseAdapter { } - private void setGiftItem(BaseViewHolder helper, UserInfoItem item) { + private void setGiftItem(BaseViewHolder helper, UserInfoItem item, int type) { GiftWallInfo giftWallInfo = (GiftWallInfo) item.getData(); if (giftWallInfo != null) { @@ -49,12 +54,22 @@ public class UserGiftAdapter extends UserTabBaseAdapter { helper.setText(R.id.gift_name, giftWallInfo.getGiftName()) .setGone(R.id.gift_name, isDetails) .setText(R.id.gift_num, "x" + giftWallInfo.getReciveCount()) - .setBackgroundRes(R.id.gift_num, isDetails ? R.drawable.bg_user_gift_item_details : R.drawable.bg_user_gift_item) .setText(R.id.gift_price, giftWallInfo.getGiftPrice() + "") .setGone(R.id.gift_price, isDetails); ImageView giftPic = helper.itemView.findViewById(R.id.gift_img); ImageLoadUtils.loadImage(mContext, giftWallInfo.getPicUrl(), giftPic); + + ImageView giftLevel = helper.itemView.findViewById(R.id.iv_gift_level); + if(type == UserInfoItem.TYPE_GIFT_ITEM_TOP){ + if(helper.getAdapterPosition() == 0) { + giftLevel.setImageResource(R.drawable.ic_gift_one); + }else if(helper.getAdapterPosition() == 1){ + giftLevel.setImageResource(R.drawable.ic_gift_two); + }else if(helper.getAdapterPosition() == 2){ + giftLevel.setImageResource(R.drawable.ic_gift_three); + } + } } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java new file mode 100644 index 000000000..e9a67fe49 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java @@ -0,0 +1,88 @@ +package com.yizhuan.erban.ui.widget.recyclerview.decoration; + +import android.graphics.Rect; +import android.view.View; + +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; + +/** + * User: wukai + * Date: 2017/03/26 + * Description: 设置RecyclerView布局垂直和水平间隔 + */ +public class GridSpacingItemNewDecoration extends RecyclerView.ItemDecoration { + + private int mVerSpacing; + private int mHorSpacing; + private boolean mIncludeEdge; + private boolean mHasHeaderView; + + public GridSpacingItemNewDecoration(int spacing, boolean includeEdge) { + this(spacing, spacing, includeEdge); + } + + public GridSpacingItemNewDecoration(int verSpacing, int horSpacing, boolean includeEdge) { + mVerSpacing = verSpacing; + mHorSpacing = horSpacing; + mIncludeEdge = includeEdge; + } + + public GridSpacingItemNewDecoration(int verSpacing, int horSpacing, boolean includeEdge, boolean hasHeaderView) { + mVerSpacing = verSpacing; + mHorSpacing = horSpacing; + mIncludeEdge = includeEdge; + mHasHeaderView = hasHeaderView; + } + + private int getSpanCount(RecyclerView parent) { + int spanCount = -1; + RecyclerView.LayoutManager layoutManager = parent.getLayoutManager(); + if (layoutManager instanceof GridLayoutManager) { + spanCount = ((GridLayoutManager) layoutManager).getSpanCount(); + } else if (layoutManager instanceof StaggeredGridLayoutManager) { + spanCount = ((StaggeredGridLayoutManager) layoutManager).getSpanCount(); + } + return spanCount; + } + + private int getSpanIndex(View view, RecyclerView parent) { + int spanIndex = parent.getChildAdapterPosition(view); + RecyclerView.LayoutManager layoutManager = parent.getLayoutManager(); + if (layoutManager instanceof StaggeredGridLayoutManager) { + StaggeredGridLayoutManager.LayoutParams layoutParams = (StaggeredGridLayoutManager.LayoutParams) view.getLayoutParams(); + spanIndex = layoutParams.getSpanIndex(); + } + return spanIndex; + } + + @Override + public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { + int spanCount = getSpanCount(parent); + int position = parent.getChildAdapterPosition(view); // item position + int spanIndex = getSpanIndex(view, parent); + int column = spanIndex % spanCount; // item column + + if(position == 0 && mHasHeaderView) { + return; + } + + if (mIncludeEdge) { + outRect.left = mHorSpacing - column * mHorSpacing / spanCount; // spacing - column * ((1f / spanCount) * spacing) + outRect.right = (column + 1) * mHorSpacing / spanCount; // (column + 1) * ((1f / spanCount) * spacing) + + if (position < spanCount) { // top edge 第一行设置top + outRect.top = mVerSpacing; + } + outRect.bottom = mVerSpacing; // item bottom 每次都是设置bottom + } else { + outRect.left = column * mHorSpacing / spanCount; // column * ((1f / spanCount) * spacing) + outRect.right = mHorSpacing - (column + 1) * mHorSpacing / spanCount; // spacing - (column + 1) * ((1f / spanCount) * spacing) + if (position >= spanCount) { // 第二行开始设置top + outRect.top = mVerSpacing; // item top + } + } + } + +} diff --git a/app/src/main/res/drawable-xhdpi/ic_gift_one.webp b/app/src/main/res/drawable-xhdpi/ic_gift_one.webp new file mode 100644 index 0000000000000000000000000000000000000000..63a079dca633e40241e6a73101b87a467503bed8 GIT binary patch literal 1956 zcmb`Hc~nzp7Qk;3q$Yt86R4Z#j=) zfAnbnX8ULUP7W*V; zy+VUN@gH~;!14<~EWl3&e=z>PLfCWOp)MYV?WRH0nC>GFc}*$&%XmyB>uicN|=)NdL)5V%^si?jZyjOAWg-cvtsJ9F=< z|JE+5z3321>WD6`@n0Oaaw4dKXr;DjjOwu`-oKM=J$PKQ|BnQigVPik)lTO+mpq0%QQ;#$jy9Nt@;r zIVCv?M-TQ_GU7b{fdMUztcHWrH;mB^Xl4eML*BGKQ%Q119)NRrd}1%^^CDDIK1PcY zt3uTQGDTp6ZJw@s3SA!Wy-mEW)1?rhFlDP#4EpNh*W zS^YcumqlJ>e|{SnZk%=VzPKuGHaxnzEGO8aW{r3yDq`3(mVRB* z1iT=9M^}~c$6#5uXx8lds2`0+qtog5rnKpvdV}IHYaK^Y5o(ie`c&UN=iy*G8s@c4 zBCE<+(qmTMzjgU4qeXGLH)YnMqOkDi?l2mL$PC5fLzzU(<7uH@Q`;nIqNbxUabJz1 zL;hXs+S;hd+B&Pd-#REPNAk_9@|+?JlX6%N`h$@#0tRZAMjFfV%t9vr*|~Euf~Ne;BhG_ zINW?_+-jBnvPcw7pHS+wvNoToD7({hbhyCE`v9}4T;IJ(dEY{8q*;X9%jhCeQcyBc zchG;Vdg!EwV{7@_@P{S~t7g}|Q}NR1DeJanhDD*Z#+q*Zfp6U3?7Pq{>{x$w@#cCF zqgd`uO?%s-;+?h4+v&lAg~rzZ89a(I%(({LUqZnP09gD{s@Mu$3GuW5+b*)ReY4P`?UWUH48m!rVBBe%Cs0 zTrS>YSrJ)r+B!hpbNni^@BR80cEpL88Qer9#?vlLG&JisV#FSVVE^S9%_(UN z9qKGKqFp2O_qgjF9=45G9LIJnT(&{{C6#Bo6~^fXQCoVGd508i*yPfq&EGFQoU`g! z7%^Kkex~bReqt9+UX5mF8=v#xN|6gGTj4{NmhFM#N4!@$*Njjfwo0O{D19+f9w{O7 zmoGDSXQ!0#q!@1)?Z?|<3nrdClJbuC)q%l(qzqr)!js1B&4mbV^y@Pmmn34QWcJi| z*QASsi?`z+3qd}0N${A>X-e`UGRdTp692!cq`b_XEJ@*IKk0pZ1yvN@<&@e7LI!_S zIQ$@LZv~&v*Ia0ycJCRz#q>b6UYFbqtU%?q@ICK&)C3!Ao0z;FOY?W};P4*4m zb`G$BTK(j7UUFJZgo&Z44*7vpg%fc)=Y?|cerTwfmxy|~++LAnco;vWI#8%MX|e0o ul#A@2tYK1rtVXQ2G;Z|uZN{y2=Sfp~gur7h>14jy<&im5orS#-7vSG*_~AkT literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_gift_three.webp b/app/src/main/res/drawable-xhdpi/ic_gift_three.webp new file mode 100644 index 0000000000000000000000000000000000000000..cf98b16b4dccd18982561dd30c2f4e7c59e2a740 GIT binary patch literal 2642 zcmb`Jc~nzJ7r-Yh5)dI08j(hfVXbUJKOjLx7G+Zb!y-!r*%b&00ilXOK%gL~?1Bj) zqHGE%P!beb1Z|YaVg;2TR78v-U^Ni6K+=aj9{WeX^ZoPP_wJqF+`0G6%$<4XJc5(G zy|V%U2lv>zdAZ@dAq3kX)&BB2+1a_NNkLs8rM7BipdnIp9F^c;i}CjH#jN_iN?>p- zR9F}QA8G(t z=K}z82ml4YuM7Q_`|T|L%U&^14jS4g8G6D&6bJc4<^BUdHs(keKU*O=PsrS)`Hm#fbsjja{&^s>Jp@iLq*13FSl7wQwOx*;O#j!uM-lg!_S~FrWJVf@=0vh z2az9M8I`<)y}pd&g7r9T#`_grdl`E%vq%BvhBja{^G%W~3f&lyv-r_vi;UNxC&f_FU4eKG@D{~KYj3l%OJAru9jx^)pJr-j$3w# zmt*nkQkIkA%}w`&VEY1t@}xB_v{Zh>rshe(^EfowzO9+G5#0L(rN)K&(dOL|IlIJG z+Y^PN;L>hgtNQ6kea4-`9&3DZLtfgasi!HxE=mE4sp8{PHyyaiLi$Lq#`9*v70ZDb}uPGLiNzo%rT(m=efZ;Zcs#@&e;#>gx!dmC+R;K zw*_+9#Ae5!qNWSe#Ds48<+nNE9W3uLiW1a|%|AbkfU>eqz0I-(dvYz+ zN8upum2-m8-0Xh6RtAEgX*^Z8j(2>!?r>D<@5xqOvs$uyW_75V#p&{nN$n061Cq8x z;-{IIvB4+%r+%Z4C%Q_8?zY=7xd985_)LaQqC zwC`3K;1bH{_Z~Z?-@-sTq3bfGK(0D)Jb+d-DPUpHhjZ5eL%AzmpVJ8`KtApFhGgVm3f&^1A=C&_{`+Od0V-0;_C;+e==IB`xR)n zC$`;ki4G}yeKF0^@QydI9;qrsbsM$nySc=j6w>X|IxO75FUN z+K^)aOx~m;!KC6^T4_Hnm}*ov#;sb4ZJ0CPW|o@qBf`baphxlW8hC9sR<)v*ZOb86^j9v!*Ze6i_T3rM+5;zAd%^#CvMRhZg&fjV%qP$XbU!dC=Os zQwj{3Vr}YFT!5FJfG@|gT7UiY?r1y?a~a_9l9mpOas*JL59ma^nuorT+ga(JtbCRY zM#O78D|;ji*XF(P7lhv0x(Q+%Ma-+^^-Yix$dpUW{zo;E(%d9Dl%9-XZ{OXEWs@?v zfjZ%WXymhUN1w4~zM~<`W0Z)K$PPE(IJqnh&mWfY5*=x|L+;(2$Pr>an!5HfwWm&#fs{>(IK-p?PmH@3sP)uM|LSwlP) zt(F6Znb!i&&U1gydzmZBJr#Lyce-O0cGlPGQ|vhhfn4(%xn0(E27%71$U)=9M=!Gb2v5yqIHkrCK#Pe#!LY zlHkm<`xaSOd9xpP9}Nv!c+_Ir^gwR__BF z#BDc^9<{NxF$>>f;(%AN0S#PkJ`7w{_YPmd1L# zZ!?={|BCc+d5{O4NSFJrE&*M9RVb8u-m>J!yI_Y@j|k7UG?PCJ4(V>0>kOzLcw6H- KAee#vKmGzyJ~2B0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_gift_two.webp b/app/src/main/res/drawable-xhdpi/ic_gift_two.webp new file mode 100644 index 0000000000000000000000000000000000000000..02673d77078315b89b38f2956928999ebb55377d GIT binary patch literal 2698 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_f3f5fa_r8.xml b/app/src/main/res/drawable/bg_f3f5fa_r8.xml new file mode 100644 index 000000000..4f6325a8f --- /dev/null +++ b/app/src/main/res/drawable/bg_f3f5fa_r8.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index 77f864242..c5f41db52 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -66,7 +66,7 @@ android:text="0.0" android:textColor="@color/color_333333" android:textSize="@dimen/text_size_30" - android:layout_marginTop="18dp" + android:layout_marginTop="12dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_title_diamond" diff --git a/app/src/main/res/layout/fragment_user_info_gift.xml b/app/src/main/res/layout/fragment_user_info_gift.xml index d794a10e1..5e76115f3 100644 --- a/app/src/main/res/layout/fragment_user_info_gift.xml +++ b/app/src/main/res/layout/fragment_user_info_gift.xml @@ -8,13 +8,16 @@ + android:layout_marginBottom="@dimen/dp_10"> + android:layout_height="match_parent" /> diff --git a/app/src/main/res/layout/fragment_userinfo_dynamic.xml b/app/src/main/res/layout/fragment_userinfo_dynamic.xml index 531f8f92c..94c7c4ce9 100644 --- a/app/src/main/res/layout/fragment_userinfo_dynamic.xml +++ b/app/src/main/res/layout/fragment_userinfo_dynamic.xml @@ -5,6 +5,7 @@ android:id="@+id/rv_dynamic" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_14" /> + android:layout_marginTop="@dimen/dp_14" + android:layout_marginBottom="@dimen/dp_14"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml b/app/src/main/res/layout/fragment_userinfo_gift_wall.xml index 7c32712c1..2d684ad11 100644 --- a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml +++ b/app/src/main/res/layout/fragment_userinfo_gift_wall.xml @@ -23,7 +23,7 @@ + android:layout_height="320dp" /> diff --git a/app/src/main/res/layout/item_room_common.xml b/app/src/main/res/layout/item_room_common.xml index c0903846f..bd4a400a9 100644 --- a/app/src/main/res/layout/item_room_common.xml +++ b/app/src/main/res/layout/item_room_common.xml @@ -92,7 +92,7 @@ android:layout_marginTop="14dp" android:layout_marginEnd="@dimen/dp_12" android:drawablePadding="2dp" - android:gravity="bottom" + android:gravity="center" android:includeFontPadding="false" android:textColor="@color/color_333333" android:textSize="12sp" @@ -107,6 +107,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="18dp" android:layout_marginBottom="20dp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"> diff --git a/app/src/main/res/layout/list_item_charge.xml b/app/src/main/res/layout/list_item_charge.xml index 0d5ac73df..1f0a2de4e 100644 --- a/app/src/main/res/layout/list_item_charge.xml +++ b/app/src/main/res/layout/list_item_charge.xml @@ -31,16 +31,6 @@ android:layout_height="0dp" android:layout_weight="1" /> - - - + android:layout_marginStart="@dimen/dp_8" + android:layout_marginTop="@dimen/dp_8" + android:background="@drawable/bg_f3f5fa_r8"> + + + android:layout_marginTop="2dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java index 4f2fd5c6a..b2d824f7e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java @@ -32,6 +32,7 @@ public class UserInfoItem implements MultiItemEntity, Pa public static final transient int TYPE_DES_HALL = 14;// 资料_模厅 public static final transient int TYPE_DES_GAME = 15;// 资料_本周战绩 public static final transient int TYPE_DES_JOIN_WORLDS = 17;// 资料_话题列表 + public static final transient int TYPE_GIFT_ITEM_TOP = 18;// 礼物_礼物列表置顶 //类型 private int itemType; diff --git a/mob.gradle b/mob.gradle index ed90f23b3..b884aabf3 100644 --- a/mob.gradle +++ b/mob.gradle @@ -25,7 +25,7 @@ MobSDK { } GooglePlus { - appId "766987211654-2b4de5kbhe7tpgtfto4bjll3dj7ih26u.apps.googleusercontent.com" + appId "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com" callbackUri "http://localhost" officialVersion "default" enable true diff --git a/tmpmob/ShareSDK/assets/ShareSDK.xml b/tmpmob/ShareSDK/assets/ShareSDK.xml index ff1339d5a..dadda017b 100644 --- a/tmpmob/ShareSDK/assets/ShareSDK.xml +++ b/tmpmob/ShareSDK/assets/ShareSDK.xml @@ -10,7 +10,7 @@ - +