diff --git a/app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt index 409cfa0c6..ec2023bfd 100644 --- a/app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt +++ b/app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt @@ -11,6 +11,8 @@ import com.chwl.app.base.BaseViewBindingActivity import com.chwl.app.databinding.ActivityEarnRecordBinding import com.chwl.app.earn.EarnRecordViewModel import com.chwl.app.ui.pay.ChargeActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.core.UriProvider import com.chwl.core.earn.bean.RoomTypeInfo /** @@ -71,8 +73,8 @@ class EarnRecordActivity : BaseViewBindingActivity(), fun initListener() { binding.tvCharge.setOnClickListener(this) -// binding.tvDiamondDetail.setOnClickListener(this) -// binding.tvGoldDetail.setOnClickListener(this) + binding.tvDiamondDetail.setOnClickListener(this) + binding.tvGoldDetail.setOnClickListener(this) binding.tvConvertDiamond.setOnClickListener(this) } @@ -90,12 +92,13 @@ class EarnRecordActivity : BaseViewBindingActivity(), // ) // } } -// R.id.tvDiamondDetail -> {//钻石明细 -// CommonWebViewActivity.start(context, UriProvider.getDiamondDetail()) -// } -// R.id.tvGoldDetail -> {//金币明细 -// CommonWebViewActivity.start(context, UriProvider.getGoldDetail()) -// } + R.id.tvDiamondDetail -> {//钻石明细 + CommonWebViewActivity.start(context, UriProvider.getDiamondDetail()) + } + + R.id.tvGoldDetail -> {//金币明细 + CommonWebViewActivity.start(context, UriProvider.getGoldDetail()) + } R.id.tvConvertDiamond -> {//兑换钻石 earnRecordModel.getGoldToDiamondInfo() } diff --git a/app/src/main/java/com/chwl/app/home/MeViewModel.kt b/app/src/main/java/com/chwl/app/home/MeViewModel.kt index 4c4d919c9..1315b102f 100644 --- a/app/src/main/java/com/chwl/app/home/MeViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/MeViewModel.kt @@ -3,6 +3,7 @@ package com.chwl.app.home import androidx.lifecycle.MutableLiveData import com.chwl.app.R import com.chwl.app.base.BaseViewModel +import com.chwl.core.UriProvider import com.chwl.core.home.bean.BannerInfo import com.chwl.core.home.model.HomeModel import com.chwl.core.im.custom.bean.RouterType @@ -58,6 +59,14 @@ class MeViewModel : BaseViewModel() { skipType = RouterType.MY_ROOM ) ) + add( + MeCenterInfo( + icon = R.drawable.me_ic_menu_invite_fan, + centerName = ResUtil.getString(R.string.menu_my_invite), + skipType = RouterType.H5, + centerUrl = UriProvider.getInviteFan() + ) + ) add( MeCenterInfo( icon = R.drawable.me_ic_menu_revenue, diff --git a/app/src/main/res/drawable-xxhdpi/me_ic_menu_invite_fan.png b/app/src/main/res/drawable-xxhdpi/me_ic_menu_invite_fan.png new file mode 100644 index 000000000..19cc68ec0 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/me_ic_menu_invite_fan.png differ diff --git a/app/src/main/res/layout/activity_earn_record.xml b/app/src/main/res/layout/activity_earn_record.xml index ad6d5a435..ac16abf4a 100644 --- a/app/src/main/res/layout/activity_earn_record.xml +++ b/app/src/main/res/layout/activity_earn_record.xml @@ -76,20 +76,19 @@ app:stroke_color="@color/color_93570B" app:stroke_width="1dp" /> - - - - - - - - - - - - - - + @@ -154,20 +153,19 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvGoldNum" /> - - - - - - - - - - - - - - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e56794d06..77a8aea3b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -114,7 +114,7 @@ My Wallet My Gift Points My Level - Invite Friends + Invite Fan Intimate Relationships My Decorations My Union @@ -420,7 +420,7 @@ Join Family Exit Family After exiting the family, your family currency will not be usable.\nYou can restore it by rejoining. Are you sure you want to exit? - Invite Friends + Invite Fan [MoliStar] Express emotions with voices, inherit smiles with families. Join Search Member ID/Nickname @@ -4381,7 +4381,7 @@ %d members World Guest Page - View Member List You need to join the world to view it! - Invite friends + Invite Fan Go to It World Guest Page - Group members insufficient to invite friends @@ -4462,7 +4462,7 @@ Post Trends - Topic Post Trends - Distinguish Topic- After exiting the topic, you will be removed from the group chat. Confirm exit? - Invite Friends + Invite Fan Go for it World Guest Page - Group members insufficient to invite friends diff --git a/core/src/main/java/com/chwl/core/UriProvider.java b/core/src/main/java/com/chwl/core/UriProvider.java index 4d510405d..1157b8de4 100644 --- a/core/src/main/java/com/chwl/core/UriProvider.java +++ b/core/src/main/java/com/chwl/core/UriProvider.java @@ -221,4 +221,24 @@ public class UriProvider { return IM_SERVER_URL.concat("/molistar/modules/rank/index.html#/rank"); } + /** + * 钻石明细 + */ + public static String getDiamondDetail() { + return JAVA_WEB_URL.concat("/molistar/modules/myincome/index.html#/DiamondLog"); + } + + /** + * 金币明细 + */ + public static String getGoldDetail() { + return JAVA_WEB_URL.concat("/molistar/modules/myincome/index.html#/GoldLog"); + } + + /** + * 邀请好友 + */ + public static String getInviteFan() { + return JAVA_WEB_URL.concat("/molistar/activity/2024-invitationFission/index.html"); + } }