moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:恢复收益记录-明细H5入口、恢复我的-邀请好友入口

Browse Source
This commit is contained in:
max
2024-05-13 15:38:27 +08:00
parent 7c8685d652
commit ca8f581c69
6 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt
View File

@@ -11,6 +11,8 @@ import com.chwl.app.base.BaseViewBindingActivity
import com.chwl.app.databinding.ActivityEarnRecordBinding import com.chwl.app.databinding.ActivityEarnRecordBinding
import com.chwl.app.earn.EarnRecordViewModel import com.chwl.app.earn.EarnRecordViewModel
import com.chwl.app.ui.pay.ChargeActivity 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 import com.chwl.core.earn.bean.RoomTypeInfo
/** /**
@@ -71,8 +73,8 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
fun initListener() { fun initListener() {
binding.tvCharge.setOnClickListener(this) binding.tvCharge.setOnClickListener(this)
// binding.tvDiamondDetail.setOnClickListener(this) binding.tvDiamondDetail.setOnClickListener(this)
// binding.tvGoldDetail.setOnClickListener(this) binding.tvGoldDetail.setOnClickListener(this)
binding.tvConvertDiamond.setOnClickListener(this) binding.tvConvertDiamond.setOnClickListener(this)
} }
@@ -90,12 +92,13 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
// ) // )
// } // }
} }
// R.id.tvDiamondDetail -> {//钻石明细 R.id.tvDiamondDetail -> {//钻石明细
// CommonWebViewActivity.start(context, UriProvider.getDiamondDetail()) CommonWebViewActivity.start(context, UriProvider.getDiamondDetail())
// } }
// R.id.tvGoldDetail -> {//金币明细
// CommonWebViewActivity.start(context, UriProvider.getGoldDetail()) R.id.tvGoldDetail -> {//金币明细
// } CommonWebViewActivity.start(context, UriProvider.getGoldDetail())
}
R.id.tvConvertDiamond -> {//兑换钻石 R.id.tvConvertDiamond -> {//兑换钻石
earnRecordModel.getGoldToDiamondInfo() earnRecordModel.getGoldToDiamondInfo()
} }

9
app/src/main/java/com/chwl/app/home/MeViewModel.kt
View File

@@ -3,6 +3,7 @@ package com.chwl.app.home
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import com.chwl.app.R import com.chwl.app.R
import com.chwl.app.base.BaseViewModel import com.chwl.app.base.BaseViewModel
import com.chwl.core.UriProvider
import com.chwl.core.home.bean.BannerInfo import com.chwl.core.home.bean.BannerInfo
import com.chwl.core.home.model.HomeModel import com.chwl.core.home.model.HomeModel
import com.chwl.core.im.custom.bean.RouterType import com.chwl.core.im.custom.bean.RouterType
@@ -58,6 +59,14 @@ class MeViewModel : BaseViewModel() {
skipType = RouterType.MY_ROOM 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( add(
MeCenterInfo( MeCenterInfo(
icon = R.drawable.me_ic_menu_revenue, icon = R.drawable.me_ic_menu_revenue,

BIN
app/src/main/res/drawable-xxhdpi/me_ic_menu_invite_fan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

54
app/src/main/res/layout/activity_earn_record.xml
View File

@@ -76,20 +76,19 @@
app:stroke_color="@color/color_93570B" app:stroke_color="@color/color_93570B"
app:stroke_width="1dp" /> app:stroke_width="1dp" />
<!-- <TextView--> <TextView
<!-- android:visibility="gone"--> android:id="@+id/tvDiamondDetail"
<!-- android:id="@+id/tvDiamondDetail"--> android:layout_width="wrap_content"
<!-- android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!-- android:layout_height="wrap_content"--> android:layout_marginTop="@dimen/dp_18"
<!-- android:layout_marginTop="@dimen/dp_18"--> android:layout_marginEnd="@dimen/dp_20"
<!-- android:layout_marginEnd="@dimen/dp_20"--> android:drawablePadding="@dimen/dp_2"
<!-- android:drawablePadding="@dimen/dp_2"--> android:text="@string/detail"
<!-- android:text="@string/detail"--> android:textColor="@color/color_1B1558"
<!-- android:textColor="@color/color_1B1558"--> android:textSize="@dimen/sp_13"
<!-- android:textSize="@dimen/sp_13"--> app:drawableEndCompat="@drawable/arrow_right_3"
<!-- app:drawableEndCompat="@drawable/arrow_right_3"--> app:layout_constraintEnd_toEndOf="parent"
<!-- app:layout_constraintEnd_toEndOf="parent"--> app:layout_constraintTop_toTopOf="parent" />
<!-- app:layout_constraintTop_toTopOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -154,20 +153,19 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvGoldNum" /> app:layout_constraintTop_toBottomOf="@+id/tvGoldNum" />
<!-- <TextView--> <TextView
<!-- android:visibility="gone"--> android:id="@+id/tvGoldDetail"
<!-- android:id="@+id/tvGoldDetail"--> android:layout_width="wrap_content"
<!-- android:layout_width="wrap_content"--> android:layout_height="wrap_content"
<!-- android:layout_height="wrap_content"--> android:layout_marginTop="@dimen/dp_18"
<!-- android:layout_marginTop="@dimen/dp_18"--> android:layout_marginEnd="@dimen/dp_20"
<!-- android:layout_marginEnd="@dimen/dp_20"--> android:drawablePadding="@dimen/dp_2"
<!-- android:drawablePadding="@dimen/dp_2"--> android:text="@string/detail"
<!-- android:text="@string/detail"--> android:textColor="@color/color_582815"
<!-- android:textColor="@color/color_582815"--> android:textSize="@dimen/sp_13"
<!-- android:textSize="@dimen/sp_13"--> app:drawableEndCompat="@drawable/arrow_right_3"
<!-- app:drawableEndCompat="@drawable/arrow_right_3"--> app:layout_constraintEnd_toEndOf="parent"
<!-- app:layout_constraintEnd_toEndOf="parent"--> app:layout_constraintTop_toTopOf="parent" />
<!-- app:layout_constraintTop_toTopOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/values/strings.xml
View File

@@ -114,7 +114,7 @@
<string name="menu_my_wallet">My Wallet</string> <string name="menu_my_wallet">My Wallet</string>
<string name="menu_my_income">My Gift Points</string> <string name="menu_my_income">My Gift Points</string>
<string name="menu_my_level">My Level</string> <string name="menu_my_level">My Level</string>
<string name="menu_my_invite">Invite Friends</string> <string name="menu_my_invite">Invite Fan</string>
<string name="menu_my_relation">Intimate Relationships</string> <string name="menu_my_relation">Intimate Relationships</string>
<string name="menu_my_decoration">My Decorations</string> <string name="menu_my_decoration">My Decorations</string>
<string name="menu_my_union">My Union</string> <string name="menu_my_union">My Union</string>
@@ -420,7 +420,7 @@
<string name="family_join_family">Join Family</string> <string name="family_join_family">Join Family</string>
<string name="family_exit_family">Exit Family</string> <string name="family_exit_family">Exit Family</string>
<string name="family_exit_family_tip">After exiting the family, your family currency will not be usable.\nYou can restore it by rejoining. Are you sure you want to exit?</string> <string name="family_exit_family_tip">After exiting the family, your family currency will not be usable.\nYou can restore it by rejoining. Are you sure you want to exit?</string>
<string name="family_invite_friends">Invite Friends</string> <string name="family_invite_friends">Invite Fan</string>
<string name="family_invite_friends_slogan">[MoliStar] Express emotions with voices, inherit smiles with families.</string> <string name="family_invite_friends_slogan">[MoliStar] Express emotions with voices, inherit smiles with families.</string>
<string name="family_join">Join</string> <string name="family_join">Join</string>
<string name="family_search_member_hint">Search Member ID/Nickname </string> <string name="family_search_member_hint">Search Member ID/Nickname </string>
@@ -4381,7 +4381,7 @@
<string name="miniworld_activity_miniworldguestpageactivity_018">%d members</string> <string name="miniworld_activity_miniworldguestpageactivity_018">%d members</string>
<string name="miniworld_activity_miniworldguestpageactivity_019">World Guest Page - View Member List</string> <string name="miniworld_activity_miniworldguestpageactivity_019">World Guest Page - View Member List</string>
<string name="miniworld_activity_miniworldguestpageactivity_020">You need to join the world to view it!</string> <string name="miniworld_activity_miniworldguestpageactivity_020">You need to join the world to view it!</string>
<string name="miniworld_activity_miniworldguestpageactivity_021">Invite friends</string> <string name="miniworld_activity_miniworldguestpageactivity_021">Invite Fan</string>
<string name="miniworld_activity_miniworldguestpageactivity_022">Go to</string> <string name="miniworld_activity_miniworldguestpageactivity_022">Go to</string>
<string name="miniworld_activity_miniworldguestpageactivity_023">It</string> <string name="miniworld_activity_miniworldguestpageactivity_023">It</string>
<string name="miniworld_activity_miniworldguestpageactivity_024">World Guest Page - Group members insufficient to invite friends</string> <string name="miniworld_activity_miniworldguestpageactivity_024">World Guest Page - Group members insufficient to invite friends</string>
@@ -4462,7 +4462,7 @@
<string name="miniworld_activity_topicmainactivity_06">Post Trends - Topic</string> <string name="miniworld_activity_topicmainactivity_06">Post Trends - Topic</string>
<string name="miniworld_activity_topicmainactivity_07">Post Trends - Distinguish Topic-</string> <string name="miniworld_activity_topicmainactivity_07">Post Trends - Distinguish Topic-</string>
<string name="miniworld_activity_topicmainactivity_08">After exiting the topic, you will be removed from the group chat. Confirm exit?</string> <string name="miniworld_activity_topicmainactivity_08">After exiting the topic, you will be removed from the group chat. Confirm exit?</string>
<string name="miniworld_activity_topicmainactivity_09">Invite Friends</string> <string name="miniworld_activity_topicmainactivity_09">Invite Fan</string>
<string name="miniworld_activity_topicmainactivity_010">Go</string> <string name="miniworld_activity_topicmainactivity_010">Go</string>
<string name="miniworld_activity_topicmainactivity_011">for it</string> <string name="miniworld_activity_topicmainactivity_011">for it</string>
<string name="miniworld_activity_topicmainactivity_012">World Guest Page - Group members insufficient to invite friends</string> <string name="miniworld_activity_topicmainactivity_012">World Guest Page - Group members insufficient to invite friends</string>

20
core/src/main/java/com/chwl/core/UriProvider.java
View File

@@ -221,4 +221,24 @@ public class UriProvider {
return IM_SERVER_URL.concat("/molistar/modules/rank/index.html#/rank"); 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");
}
} }