diff --git a/app/src/main/assets/mp4/cp_userinfo_anim_3.mp4 b/app/src/main/assets/mp4/cp_userinfo_anim_3.mp4 index 68a1a35b2..10a5e9ac8 100644 Binary files a/app/src/main/assets/mp4/cp_userinfo_anim_3.mp4 and b/app/src/main/assets/mp4/cp_userinfo_anim_3.mp4 differ diff --git a/app/src/main/assets/mp4/cp_userinfo_anim_4.mp4 b/app/src/main/assets/mp4/cp_userinfo_anim_4.mp4 index ad68e5c18..1ad167bef 100644 Binary files a/app/src/main/assets/mp4/cp_userinfo_anim_4.mp4 and b/app/src/main/assets/mp4/cp_userinfo_anim_4.mp4 differ diff --git a/app/src/main/assets/mp4/cp_userinfo_anim_5.mp4 b/app/src/main/assets/mp4/cp_userinfo_anim_5.mp4 index dd7b4ab2a..cc6611bc8 100644 Binary files a/app/src/main/assets/mp4/cp_userinfo_anim_5.mp4 and b/app/src/main/assets/mp4/cp_userinfo_anim_5.mp4 differ diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java index 1eaf4a732..8796040d5 100644 --- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java @@ -10,6 +10,7 @@ import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.Bitmap; import android.graphics.Color; +import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -38,6 +39,7 @@ import com.chwl.core.decoration.headwear.bean.HeadWearInfo; import com.example.lib_utils.UiUtils; import com.google.android.material.appbar.AppBarLayout; import com.netease.nim.uikit.StatusBarUtil; +import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.common.util.sys.TimeUtil; import com.netease.nim.uikit.impl.cache.NimUserInfoCache; import com.netease.nimlib.sdk.RequestCallbackWrapper; @@ -114,10 +116,10 @@ public class UserInfoActivity extends BaseBindingActivity { - UserInfoActivity.Companion.start(context,cpInfo.cpUid); - }); - }else { - mBinding.cpViews.setVisibility(View.INVISIBLE); - } - //cp 卡片 - mBinding.cpCardDay.setText(cpInfo.cpDay + ""+ ResUtil.getString(R.string.days)); - ImageLoadUtilsV2.loadImage(mBinding.cpCardUserAvatar, userInfo.getAvatar()); - ImageLoadUtilsV2.loadImage(mBinding.cpCardUserAvatarCp, cpInfo.cpAvatar); - mBinding.cpCardUserHead.loadFile(CpUtils.INSTANCE.getHeadSvga(cpInfo.cpLevel)); - mBinding.cpCardUserHeadCp.loadFile(CpUtils.INSTANCE.getHeadSvga(cpInfo.cpLevel)); - mBinding.cpCardLevel.setImageResource(CpUtils.INSTANCE.getLevelImg(cpInfo.cpLevel)); - mBinding.cpCardDay.setVisibility(cpInfo.cpDay > 0? View.VISIBLE : View.INVISIBLE); - mBinding.cpCardUserAvatarCp.setOnClickListener(v -> { + //头像 + if (cpInfo!= null && cpInfo.cpAvatar != null && !cpInfo.cpAvatar.isEmpty() && cpInfo.showCpAvatar){ + //cp 头像 + mBinding.cpViews.setVisibility(View.VISIBLE); + mBinding.ivHeadWear.loadFile(CpUtils.INSTANCE.getHeadSvga(cpInfo.cpLevel)); + mBinding.ivHeadWearCp.loadFile(CpUtils.INSTANCE.getHeadSvga(cpInfo.cpLevel)); + mBinding.ivHeadWearCpFlag.setImageResource(CpUtils.INSTANCE.getFlag(cpInfo.cpLevel)); + ImageLoadUtils.loadImage(mBinding.ivUserHeadCp, cpInfo.cpAvatar); + mBinding.ivUserHeadCp.setOnClickListener(v -> { UserInfoActivity.Companion.start(context,cpInfo.cpUid); }); - mBinding.cpCardLevelEmpty.setVisibility(View.INVISIBLE); - mBinding.cpCardLevel.setVisibility(View.VISIBLE); }else { mBinding.cpViews.setVisibility(View.INVISIBLE); - mBinding.cpCardUserAvatarCp.setImageResource(R.drawable.ic_user_info_cp_def_avatar); - mBinding.cpCardLevelEmpty.setVisibility(View.VISIBLE); - mBinding.cpCardDay.setVisibility(View.INVISIBLE); - mBinding.cpCardLevel.setVisibility(View.INVISIBLE); - mBinding.cpCardUserHead.setVisibility(View.INVISIBLE); - mBinding.cpCardUserHeadCp.setVisibility(View.INVISIBLE); //正常头像 HeadWearInfo headWearInfo = userInfo.getUserHeadwear(); if (headWearInfo != null && headWearInfo.getFirstUrl() != null) { AvatarHelper.loadAvatarFrame(mBinding.ivHeadWear, headWearInfo.getFirstUrl(), headWearInfo.getType()); mBinding.ivUserHead.setPadding(0, 0, 0, 0); - mBinding.ivUserHead.setStrokeWidth(0); mBinding.ivHeadWear.setVisibility(View.VISIBLE); } else { int padding = getResources().getDimensionPixelOffset(R.dimen.dp_0_5); mBinding.ivUserHead.setPadding(padding, padding, padding, padding); - mBinding.ivUserHead.setStrokeWidth(getResources().getDimensionPixelOffset(R.dimen.dp_1)); mBinding.cpViews.setVisibility(View.INVISIBLE); mBinding.ivHeadWear.setVisibility(View.INVISIBLE); } } + //cp 卡片 + if (cpInfo!= null && cpInfo.cpAvatar != null && !cpInfo.cpAvatar.isEmpty()) { + mBinding.cpCardDay.setText(cpInfo.cpDay + ""+ ResUtil.getString(R.string.days)); + mBinding.cpCardDay.setVisibility(cpInfo.cpDay > 0? View.VISIBLE : View.INVISIBLE); + + mBinding.cpCardLevel.setImageResource(CpUtils.INSTANCE.getLevelImg(cpInfo.cpLevel)); + mBinding.cpCardLevel.setVisibility(View.VISIBLE); + mBinding.cpCardLevelEmpty.setVisibility(View.INVISIBLE); + + ImageLoadUtilsV2.loadImage(mBinding.cpCardUserAvatar, userInfo.getAvatar()); + ImageLoadUtilsV2.loadImage(mBinding.cpCardUserAvatarCp, cpInfo.cpAvatar); + mBinding.cpCardUserHeadCp.setVisibility(View.VISIBLE); + mBinding.cpCardUserAvatarCp.setOnClickListener(v -> { + UserInfoActivity.Companion.start(context,cpInfo.cpUid); + }); + }else { + mBinding.cpCardDay.setVisibility(View.INVISIBLE); + mBinding.cpCardLevelEmpty.setVisibility(View.VISIBLE); + mBinding.cpCardLevel.setVisibility(View.INVISIBLE); + mBinding.cpCardUserAvatarCp.setImageResource(R.drawable.ic_user_info_cp_def_avatar); + mBinding.cpCardUserAvatarCp.setOnClickListener(null); + mBinding.cpCardUserHeadCp.setVisibility(View.INVISIBLE); + ImageLoadUtilsV2.loadImage(mBinding.cpCardUserAvatar, userInfo.getAvatar()); + } + //cp 动画 if (cpInfo != null && cpInfo.showCpAnim && isFirst) { String animUrl = CpUtils.INSTANCE.getUserInfoAnim(cpInfo.cpLevel); @@ -494,13 +497,26 @@ public class UserInfoActivity extends BaseBindingActivity { showUserPhoto(position); }) + .registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { + @Override + public void onPageSelected(int position) { + try { + if (mBinding.bannerViewIndex.getTag() != null) { + int itemCount = (int) mBinding.bannerViewIndex.getTag(); + mBinding.bannerViewIndex.setText((position+1)+"/"+itemCount); + } + } catch (Exception e) { + } + } + }) .setRTLMode(isRTL) .setIndicatorHeight(width) .setIndicatorGravity(isRTL ? IndicatorGravity.START : IndicatorGravity.END) .setIndicatorSliderWidth(width, width * 2) .setIndicatorSliderGap(context.getResources().getDimensionPixelOffset(R.dimen.dp_6)) .setIndicatorMargin(isRTL ? marginEnd : 0, 0, isRTL ? 0 : marginEnd, context.getResources().getDimensionPixelOffset(R.dimen.dp_71)) - .setAdapter(adapter).create(); + .setAdapter(adapter) + .create(); } /** @@ -509,8 +525,13 @@ public class UserInfoActivity extends BaseBindingActivity list) { if (list == null) { mBinding.bannerView.refreshData(new ArrayList()); + mBinding.bannerViewIndex.setTag(0); + mBinding.bannerViewIndex.setVisibility(View.INVISIBLE); } else { mBinding.bannerView.refreshData(list); + mBinding.bannerViewIndex.setTag(list.size()); + mBinding.bannerViewIndex.setText(1+"/"+list.size()); + mBinding.bannerViewIndex.setVisibility(View.VISIBLE); } } @@ -755,7 +776,8 @@ public class UserInfoActivity extends BaseBindingActivity { ImageLoadUtils.loadImage(mViewBinding.userAvatar,data.avatar) ImageLoadUtils.loadImage(mViewBinding.userAvatarCp,data.cpAvatar) - mViewBinding.userHead.loadFile(getHeadSvga(data.cpLevel)) - mViewBinding.userHeadCp.loadFile(getHeadSvga(data.cpLevel)) - - val max = (data.endExp - data.startExp) val current = (data.currentExp.toFloat() / max.toFloat()) * 100f @@ -43,6 +40,7 @@ class UserCpListAdapter : BaseAdapter { mViewBinding.cpNeedVal.text = ResUtil.getString(R.string.CP_Need_tips,NumberUtils.format((data.endExp - data.currentExp))) mViewBinding.cpDay.text = "${data.cpDay}${R.string.days.getString()}" + mViewBinding.cpDay.isVisible = data.cpDay > 0 helper.addOnClickListener(mViewBinding.cancel.id) diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java index a54621fe2..4bfe0c4ac 100644 --- a/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java @@ -22,7 +22,7 @@ import java.util.List; public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter { private final List mTitleList; - private int textSize = 20; + private int textSize = 18; private float minScale = 0.9f; private boolean showIndicator = true; private OnItemSelectListener mOnItemSelectListener; diff --git a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt index f31ebdf5e..c8703259d 100644 --- a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt @@ -52,6 +52,7 @@ class UserInfoDataFragment : BaseViewBindingFragment binding.magicIndicator.onPageSelected(position) onOtherTabChange(view?.text?.toString() ?: "") diff --git a/app/src/main/java/com/chwl/app/ui/utils/CpUtils.kt b/app/src/main/java/com/chwl/app/ui/utils/CpUtils.kt index 12d9471be..a2dfe880d 100644 --- a/app/src/main/java/com/chwl/app/ui/utils/CpUtils.kt +++ b/app/src/main/java/com/chwl/app/ui/utils/CpUtils.kt @@ -2,6 +2,7 @@ package com.chwl.app.ui.utils import android.graphics.Bitmap import android.view.View +import android.view.View.OnAttachStateChangeListener import androidx.core.view.isVisible import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException diff --git a/app/src/main/java/com/chwl/app/ui/utils/VipUtil.kt b/app/src/main/java/com/chwl/app/ui/utils/VipUtil.kt new file mode 100644 index 000000000..8b53e058f --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/utils/VipUtil.kt @@ -0,0 +1,22 @@ +package com.chwl.app.ui.utils + +import com.chwl.app.R + +object VipUtil { + + val vipIcons = arrayListOf( + R.drawable.vip_center_identification_vipidentity_lv1, + R.drawable.vip_center_identification_vipidentity_lv2, + R.drawable.vip_center_identification_vipidentity_lv3, + R.drawable.vip_center_identification_vipidentity_lv4, + R.drawable.vip_center_identification_vipidentity_lv5, + R.drawable.vip_center_identification_vipidentity_lv6, + R.drawable.vip_center_identification_vipidentity_lv7, + R.drawable.vip_center_identification_vipidentity_lv8, + R.drawable.vip_center_identification_vipidentity_lv9 + ) + + fun getVipIcon(level: Int) { + vipIcons.getOrNull(level)?:R.drawable.vip_center_identification_vipidentity_lv1 + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/widget/BonsellaJoinAttackLayout.kt b/app/src/main/java/com/chwl/app/ui/widget/BonsellaJoinAttackLayout.kt index d039f4892..30c8a6458 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/BonsellaJoinAttackLayout.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/BonsellaJoinAttackLayout.kt @@ -214,22 +214,21 @@ class BonsellaJoinAttackLayout @JvmOverloads constructor( LogUtils.d(" GiftComboLayout onRoomCustomMsg " ) if (giftInfo==null) return if (giftInfo.comboCount == 0) return - if (giftInfo.gift != null && giftInfo.gift.giftType != GiftType.GIFT_TYPE_NORMAL || giftInfo.gift.giftType != GiftType.GIFT_TYPE_SUPER_LUCKY || giftInfo.gift.giftType != GiftType.GIFT_TYPE_LUCKY_24) { - return; + if (giftInfo.gift != null && giftInfo.gift.giftType == GiftType.GIFT_TYPE_NORMAL || giftInfo.gift.giftType == GiftType.GIFT_TYPE_SUPER_LUCKY || giftInfo.gift.giftType == GiftType.GIFT_TYPE_LUCKY_24) { + val comboInfo = BonsellaJoinAttack().apply { + giftId = giftInfo.giftId + sentUserid = giftInfo.uid + sentUserName = giftInfo.nick + sentAvatar = giftInfo.avatar + receiverUserName = giftInfo.targetUsers?.getOrNull(0)?.nick?:"" + receiverNumber = giftInfo.targetUsers?.size?: giftInfo.targetUids?.size?: 1 + giftNumber = giftInfo.giftNum + giftImgUrl = giftInfo.gift?.giftUrl?:"" + comboCount = giftInfo.comboCount + isMulti = giftInfo.isMulti + } + add(comboInfo) } - val comboInfo = BonsellaJoinAttack().apply { - giftId = giftInfo.giftId - sentUserid = giftInfo.uid - sentUserName = giftInfo.nick - sentAvatar = giftInfo.avatar - receiverUserName = giftInfo.targetUsers?.getOrNull(0)?.nick?:"" - receiverNumber = giftInfo.targetUsers?.size?: giftInfo.targetUids?.size?: 1 - giftNumber = giftInfo.giftNum - giftImgUrl = giftInfo.gift?.giftUrl?:"" - comboCount = giftInfo.comboCount - isMulti = giftInfo.isMulti - } - add(comboInfo) } override fun onDetachedFromWindow() { diff --git a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt index 11601a12b..929f6ed70 100644 --- a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt @@ -226,7 +226,11 @@ class VipCenterActivity : BaseViewBindingActivity(), it?.let { // lifecycleScope.launch { // delay(500) - banner.setCurrentItem(it.vipLevel-1) + banner?.postDelayed(object : Runnable { + override fun run() { + banner.setCurrentItem(it.vipLevel-1) + } + }, 200) // } if (it.ownAuthTypes?.contains(13) == true && mTitleBar.actionCount == 1) { mTitleBar.addAction(object : TitleBar.ImageAction(R.drawable.ic_vip_setting) { @@ -403,7 +407,6 @@ class VipCenterActivity : BaseViewBindingActivity(), } if (it.buyAmount == 0) { binding.tvNoticeText.visibility = View.VISIBLE - binding.tvAdditionalText.visibility = View.GONE binding.tvOpenVip.visibility = View.GONE binding.layoutOpenVip.visibility = View.GONE binding.tvIcon.visibility = View.GONE @@ -419,7 +422,6 @@ class VipCenterActivity : BaseViewBindingActivity(), } binding.tvNoticeText.visibility = View.GONE - binding.tvAdditionalText.visibility = View.VISIBLE binding.tvOpenVip.visibility = View.VISIBLE binding.layoutOpenVip.visibility = View.VISIBLE binding.tvIcon.visibility = View.VISIBLE @@ -429,12 +431,7 @@ class VipCenterActivity : BaseViewBindingActivity(), ) }".also { binding.tvOpenVip.text = it } - val calendar = Calendar.getInstance() - calendar.add(Calendar.DAY_OF_YEAR, 30) - val dateFormat = SimpleDateFormat("yyyy/MM/dd 00:00", Locale.getDefault()) - val formattedDate = dateFormat.format(calendar.time) - val result = "$formattedDate ${getString(R.string.vip_center_6)}" - binding.tvAdditionalText.text = result + } } } @@ -455,12 +452,6 @@ class VipCenterActivity : BaseViewBindingActivity(), }".also { binding.tvOpenVip.text = it } } - val calendar = Calendar.getInstance() - calendar.add(Calendar.DAY_OF_YEAR, 30) - val dateFormat = SimpleDateFormat("yyyy/MM/dd 00:00", Locale.getDefault()) - val formattedDate = dateFormat.format(calendar.time) - val result = "$formattedDate ${getString(R.string.vip_center_6)}" - binding.tvAdditionalText.text = result } else { currentChargeInfo = null diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt index 7347ff24d..495f94e48 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt @@ -48,12 +48,15 @@ class VipCenterBannerAdapter( holder.dueText.visibility = View.GONE myVipInfo?.let { if (it.vipLevel >= data.vipLevel) { - val calendar = Calendar.getInstance() - calendar.add(Calendar.SECOND, it.remainSeconds) - val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) - val formattedDate = dateFormat.format(calendar.time) - val result = "${getString(R.string.vip_center_2)}$formattedDate" - holder.dueText.text = result + var result = getString(R.string.vip_center_8) + if (data.remainSeconds>0){ + val calendar = Calendar.getInstance() + calendar.add(Calendar.SECOND, data.remainSeconds) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH) + val formattedDate = dateFormat.format(calendar.time) + result = "${getString(R.string.vip_center_2)}$formattedDate" + } + holder.dueText.text = result holder.dueText.visibility = View.VISIBLE } else if (it.vipLevel < data.vipLevel) { holder.dueText.text = getString(R.string.vip_center_8) diff --git a/app/src/main/res/drawable-xxhdpi/ic_user_info_cp_def_avatar_head.png b/app/src/main/res/drawable-xxhdpi/ic_user_info_cp_def_avatar_head.png new file mode 100644 index 000000000..2596dd772 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_user_info_cp_def_avatar_head.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_user_info_follow.png b/app/src/main/res/drawable-xxhdpi/ic_user_info_follow.png new file mode 100644 index 000000000..0b1af5cec Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_user_info_follow.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_user_info_followed.png b/app/src/main/res/drawable-xxhdpi/ic_user_info_followed.png new file mode 100644 index 000000000..2e148fd84 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_user_info_followed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_user_info_send_msg.png b/app/src/main/res/drawable-xxhdpi/ic_user_info_send_msg.png new file mode 100644 index 000000000..32d191650 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_user_info_send_msg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/user_info_ic_copy.png b/app/src/main/res/drawable-xxhdpi/user_info_ic_copy.png new file mode 100644 index 000000000..a02867409 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/user_info_ic_copy.png differ diff --git a/app/src/main/res/drawable-xxhdpi/user_info_ic_copy.webp b/app/src/main/res/drawable-xxhdpi/user_info_ic_copy.webp deleted file mode 100644 index 7aebcc065..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/user_info_ic_copy.webp and /dev/null differ diff --git a/app/src/main/res/drawable/bg_user_info_banner_index.xml b/app/src/main/res/drawable/bg_user_info_banner_index.xml new file mode 100644 index 000000000..c334df32e --- /dev/null +++ b/app/src/main/res/drawable/bg_user_info_banner_index.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_user_info_medal_item.xml b/app/src/main/res/drawable/bg_user_info_medal_item.xml index fa4be1467..fa602de80 100644 --- a/app/src/main/res/drawable/bg_user_info_medal_item.xml +++ b/app/src/main/res/drawable/bg_user_info_medal_item.xml @@ -21,7 +21,7 @@ diff --git a/app/src/main/res/drawable/bg_user_info_medal_item_2.xml b/app/src/main/res/drawable/bg_user_info_medal_item_2.xml new file mode 100644 index 000000000..0194d6644 --- /dev/null +++ b/app/src/main/res/drawable/bg_user_info_medal_item_2.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 315047542..c23d15b40 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -38,19 +38,30 @@ android:layout_height="@dimen/dp_256" app:bvp_auto_play="true" app:bvp_can_loop="true" - app:bvp_indicator_checked_color="#FFFFFF" - app:bvp_indicator_gravity="end" - app:bvp_indicator_normal_color="#4CFFFFFF" - app:bvp_indicator_slide_mode="scale" - app:bvp_indicator_style="round_rect" - app:bvp_indicator_visibility="visible" + app:bvp_indicator_visibility="gone" app:bvp_interval="5000" app:bvp_scroll_duration="500" app:layout_constraintTop_toTopOf="parent" tools:background="@drawable/default_banner" /> + + - @@ -477,11 +482,12 @@ app:layout_constraintStart_toStartOf="@+id/cpCardUserHead" app:layout_constraintTop_toTopOf="@+id/cpCardUserHead" /> - @@ -496,10 +502,12 @@ app:layout_constraintStart_toStartOf="@+id/cpCardUserHeadCp" app:layout_constraintTop_toTopOf="@+id/cpCardUserHeadCp" /> - @@ -510,19 +518,17 @@ - + app:layout_constraintTop_toTopOf="@id/ivHeadWear" /> - + diff --git a/app/src/main/res/layout/item_user_cp_list.xml b/app/src/main/res/layout/item_user_cp_list.xml index 12c7fceac..f0b3391d5 100644 --- a/app/src/main/res/layout/item_user_cp_list.xml +++ b/app/src/main/res/layout/item_user_cp_list.xml @@ -1,6 +1,7 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -60,10 +62,11 @@ app:layout_constraintStart_toStartOf="@+id/userHead" app:layout_constraintTop_toTopOf="@+id/userHead" /> - @@ -79,10 +82,11 @@ app:layout_constraintStart_toStartOf="@+id/userHeadCp" app:layout_constraintTop_toTopOf="@+id/userHeadCp" /> - @@ -92,7 +96,7 @@ android:layout_width="26dp" android:layout_height="23dp" android:src="@drawable/ic_user_info_cp_cancel" - android:layout_marginTop="22dp" + android:layout_marginTop="25dp" android:layout_marginEnd="6dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -116,7 +120,8 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/white_transparent_80" + tools:text="111111" app:layout_constraintEnd_toEndOf="@id/cpPro" app:layout_constraintTop_toBottomOf="@id/cpPro" /> @@ -125,7 +130,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/white_transparent_80" + tools:text="111111" android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="@id/cpPro" app:layout_constraintTop_toBottomOf="@id/cpPro" /> diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml index 159d714a1..60c13e789 100644 --- a/app/src/main/res/layout/user_info_bottom_layout.xml +++ b/app/src/main/res/layout/user_info_bottom_layout.xml @@ -1,5 +1,6 @@ - + android:textStyle="bold"> - + + + + + + + android:textStyle="bold" > + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/user_info_data_fragment.xml b/app/src/main/res/layout/user_info_data_fragment.xml index e01e33522..af71948f5 100644 --- a/app/src/main/res/layout/user_info_data_fragment.xml +++ b/app/src/main/res/layout/user_info_data_fragment.xml @@ -78,6 +78,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_3" android:text="(0)" + android:visibility="gone" android:textColor="@color/white" android:textSize="@dimen/dp_16" android:textStyle="bold" @@ -160,11 +161,16 @@ android:layout_marginTop="@dimen/dp_10" app:layout_constraintTop_toBottomOf="@id/guildTitle" /> - تحتاج إلى %s للترقية معرّف العميل - معرّف النقابة: + معرّف النقابة نيك النقابة هل أنت متأكد من أنك تريد إنفاق %s قطعة نقدية لإلغاء CP الخاص بك مع %s ؟ الكوينز الذهبية diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d432e9751..4cdbce28c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -955,9 +955,9 @@ 需要 %s升級 - 公會長 ID： - 公會 ID： - 公會暱稱： + 公會長 ID + 公會 ID + 公會暱稱 您確定要花 %s 金幣來取消%s的 CP 嗎？ 我的金幣 確認充值 diff --git a/core/src/main/java/com/chwl/core/contacts/MyConstant.java b/core/src/main/java/com/chwl/core/contacts/MyConstant.java new file mode 100644 index 000000000..3c289fa27 --- /dev/null +++ b/core/src/main/java/com/chwl/core/contacts/MyConstant.java @@ -0,0 +1,10 @@ +package com.chwl.core.contacts; + +public @interface MyConstant { + + public @interface MicType{ + int open = 1; + int music =2; + int close = 3; + } +} diff --git a/mode.json b/mode.json new file mode 100644 index 000000000..1e384980c --- /dev/null +++ b/mode.json @@ -0,0 +1,229 @@ +{ + "code": 200, + "message": "success", + "data": { + "tabList": [ + { + "key": "normalGift", + "nameMap": { + "ar": "عادي", + "en": "Normal", + "zh": "普通" + }, + "seq": 1 + }, + { + "key": "luckyBagGift", + "nameMap": { + "ar": "صندوق الغموض", + "en": "Mystery Box", + "zh": "福袋" + }, + "seq": 2 + }, + { + "key": "superLuckyGift", + "nameMap": { + "ar": "هدية الحظ", + "en": "Lucky", + "zh": "幸運" + }, + "seq": 3 + }, + { + "key": "vipGift", + "nameMap": { + "ar": "كبار الشخصيات", + "en": "VIP", + "zh": "VIP" + }, + "seq": 4 + }, + { + "key": "countryGift", + "nameMap": { + "ar": "دولة", + "en": "Country", + "zh": "國家" + }, + "seq": 5 + }, + { + "key": "weekStarGift", + "nameMap": { + "ar": "نجم الأسبوع", + "en": "Weekly Star", + "zh": "周星" + }, + "seq": 6 + }, + { + "key": "singlePopularGift", + "nameMap": { + "ar": "شعبية", + "en": "FM", + "zh": "人氣" + }, + "seq": 7 + }, + { + "key": "cpGift", + "nameMap": { + "ar": "cp-ar", + "en": "cp-en", + "zh": "cp-zh" + }, + "seq": 8 + } + ], + "giftTabMap": { + "countryGift": [], + "superLuckyGift": [ + { + "giftId": 2265, + "giftName": "monik14", + "goldPrice": 20, + "giftUrl": "https://image.pekolive.com/FpHRJteaNhJrb-ZBvS3cweeZoPV4.png", + "nobleId": 0, + "isNobleGift": false, + "seqNo": -1900, + "giftType": 18, + "hasVggPic": false, + "vggUrl": null, + "hasLatest": false, + "hasTimeLimit": false, + "hasEffect": false, + "luckyGiftSvgaUrl": null, + "hasSvga": false, + "giftExplainUrl": null, + "otherViewType": 1, + "viewUrl": null, + "isWholeServer": false, + "isSkipRoom": false, + "isSendMsg": false, + "consumeType": 1, + "roomExclude": false, + "i18nGiftNameMap": { + "ar": "monik14", + "en": "monik14", + "zh": "monik14" + }, + "bannerUrl": "https://image.molistar.xyz/super_gift_banner_zh.png", + "skipUrl": "https://api.molistar.xyz/molistar/activity/activemodel/index.html?code=cjxylwzh" + }, + { + "giftId": 2264, + "giftName": "monik13", + "goldPrice": 10, + "giftUrl": "https://image.pekolive.com/11212.png", + "nobleId": 0, + "isNobleGift": false, + "seqNo": -1900, + "giftType": 18, + "hasVggPic": false, + "vggUrl": null, + "hasLatest": false, + "hasTimeLimit": false, + "hasEffect": false, + "luckyGiftSvgaUrl": null, + "hasSvga": false, + "giftExplainUrl": null, + "otherViewType": 1, + "viewUrl": null, + "isWholeServer": false, + "isSkipRoom": false, + "isSendMsg": false, + "consumeType": 1, + "roomExclude": false, + "i18nGiftNameMap": { + "ar": "monik13", + "en": "monik13", + "zh": "monik13" + }, + "bannerUrl": "https://image.molistar.xyz/super_gift_banner_zh.png", + "skipUrl": "https://api.molistar.xyz/molistar/activity/activemodel/index.html?code=cjxylwzh" + }, + { + "giftId": 2263, + "giftName": "monik12", + "goldPrice": 5, + "giftUrl": "https://image.pekolive.com/2233.png", + "nobleId": 0, + "isNobleGift": false, + "seqNo": -1900, + "giftType": 18, + "hasVggPic": false, + "vggUrl": null, + "hasLatest": false, + "hasTimeLimit": false, + "hasEffect": false, + "luckyGiftSvgaUrl": null, + "hasSvga": false, + "giftExplainUrl": null, + "otherViewType": 1, + "viewUrl": null, + "isWholeServer": false, + "isSkipRoom": false, + "isSendMsg": false, + "consumeType": 1, + "roomExclude": false, + "i18nGiftNameMap": { + "ar": "monik12", + "en": "monik12", + "zh": "monik12" + }, + "bannerUrl": "https://image.molistar.xyz/super_gift_banner_zh.png", + "skipUrl": "https://api.molistar.xyz/molistar/activity/activemodel/index.html?code=cjxylwzh" + }, + { + "giftId": 2227, + "giftName": "神燈", + "goldPrice": 100, + "giftUrl": "https://image.pekolive.com/shendeng.png", + "nobleId": 0, + "isNobleGift": false, + "seqNo": -100, + "giftType": 16, + "hasVggPic": false, + "vggUrl": "https://image.pekolive.com/shendeng.png", + "hasLatest": false, + "hasTimeLimit": false, + "hasEffect": false, + "luckyGiftSvgaUrl": null, + "hasSvga": false, + "giftExplainUrl": null, + "otherViewType": 0, + "viewUrl": null, + "isWholeServer": false, + "isSkipRoom": false, + "isSendMsg": false, + "consumeType": 1, + "roomExclude": false, + "i18nGiftNameMap": { + "ar": "مصباح سحري", + "en": "Magic lamp", + "zh": "神燈" + }, + "bannerUrl": "https://image.molistar.xyz/super_gift_banner_zh.png", + "skipUrl": "https://api.molistar.xyz/molistar/activity/activemodel/index.html?code=cjxylwzh" + }, + { + "giftId": 41, + "giftName": "魔力水晶鞋", + "goldPrice": 520, + "giftUrl": "https://image.lecheng163.com/FhyzfqLAxaDYXxxQLuYE93nppBVQ?imageslim", + "nobleId": 0, + "nobleName": "", + "isNobleGift": false, + "seqNo": 1, + "giftType": 16, + "hasVggPic": false, + "vggUrl": "https://image.hfighting.com/c566da03-a858-40d4-b94c-d16fdc9b1211", + "hasLatest": false, + "hasTimeLimit": false, + "hasEffect": false, + "luckyGiftSvgaUrl": null, + "hasSvga": false, + "giftExplainUrl": null, + "otherViewType": 0, + "viewUrl": "http://beta.img.pekolive.com