Commit 45b49f61 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent e34a7048
......@@ -97,7 +97,7 @@ object Constant {
const val CARRIER_WALK = "WALK" //走路
const val CARRIER_EATMEAL = "EATMEAL" // 打卡
const val CARRIER_EATMEAL_SUBSIDY = "EATMEAL_SUBSIDY" //饭补
const val CARRIER_EATMEAL_SUBSIDY_NOT = "EATMEAL_SUBSIDY_NOT" //饭补
const val CARRIER_EATMEAL_SUBSIDY_NOT = "EATMEAL_SUBSIDY_NOT" //未到时间饭补
const val CARRIER_WALK_BUBBLE = "WALK_BUBBLE" //走路汽泡
const val CARRIER_NEW_USER = "CARRIER_NEW_USER" //新用户红包
const val CARRIER_NEW_VISITOR = "CARRIER_NEW_VISITOR" //游戏首次登录
......
......@@ -31,6 +31,7 @@ public class FriendHallMsgBean implements Serializable {
private int directFriendsCount;
private int indirectFriendsCount;
private String rules;
private String remark;
public String getRules() {
return rules;
......@@ -138,6 +139,14 @@ public class FriendHallMsgBean implements Serializable {
this.status = status;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public List<ListBean> getList() {
return list;
}
......
......@@ -69,7 +69,7 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
Constant.SHAREFRIEND_COMPLETE_1, Constant.SHAREFRIEND_COMPLETE_2,
Constant.SHAREFRIEND_COMPLETE_3, Constant.SHAREFRIEND_COMPLETE_4,
Constant.SHAREFRIEND_COMPLETE_5, Constant.SHAREFRIEND_COMPLETE_6,
Constant.CARRIER_GAME_ONLINE -> {
Constant.CARRIER_GAME_ONLINE, Constant.CARRIER_EATMEAL -> {
val vo = HashMap<String, Any>()
vo["carrierType"] = carrierType
awardPresenter.reportAddCoinMsg(vo)
......
......@@ -15,6 +15,7 @@ import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.mvp.model.TurntableBean
import com.mints.goodmoney.ui.activitys.base.BaseActivity
import com.mints.goodmoney.utils.LogUtil
import com.mints.library.utils.json.JsonUtil
import kotlinx.android.synthetic.main.activity_erase.*
import kotlinx.android.synthetic.main.header_layout.*
......@@ -111,6 +112,7 @@ class EraseActivity : BaseActivity(), View.OnClickListener{
private fun getTurnUrl() {
val tokenID: String = userManager.getTokenID()
val url: String = BuildConfig.MainIp+ "hang/card.html?carrierType=" + carrierType + "&token=" + tokenID
LogUtil.d("getTurnUrl",url)
blEarseWebview.loadUrl(url)
}
......
......@@ -17,6 +17,7 @@ import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.mvp.model.FriendHallMsgBean
import com.mints.goodmoney.mvp.presenters.FriendsPresenter
import com.mints.goodmoney.mvp.views.FriendsView
import com.mints.goodmoney.ui.activitys.DrawcashActivity
import com.mints.goodmoney.ui.activitys.FriendsActivity
import com.mints.goodmoney.ui.adapter.FriendsPagerAdapter
import com.mints.goodmoney.ui.adapter.InvitedAdapter
......@@ -238,6 +239,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
.append("昨日汇率:").setForegroundColor(resources.getColor(R.color.black))
.append(data.rate).setForegroundColor(resources.getColor(R.color.color_E72C2B))
.create()
tv_bonus_hint.text = data.remark
}
private fun hintDialog(flag: Boolean) {
......@@ -377,7 +379,26 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
// 提现成功
override fun getContributionOutToCashSuc() {
showToast("提现成功")
bonusDialog = BonusDialog(requireActivity(), object : DialogListener() {
override fun onClick(v: View) {
when (v.id) {
R.id.btn_submit -> {
if (activity != null && !activity!!.isFinishing &&
bonusDialog != null && bonusDialog!!.isShowing
) {
readyGo(DrawcashActivity::class.java)
bonusDialog!!.dismiss()
}
}
}
}
})
bonusDialog?.let {
it.setTitle("提示")
it.setContent("收益已领取成功")
it.setBtnStr("去查看")
it.show()
}
}
}
\ No newline at end of file
......@@ -7,15 +7,8 @@
<include layout="@layout/header_layout" />
<com.mints.goodmoney.ui.widgets.ElasticScrollView
<com.github.lzyzsd.jsbridge.BridgeWebView
android:id="@+id/blEarseWebview"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.github.lzyzsd.jsbridge.BridgeWebView
android:id="@+id/blEarseWebview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.mints.goodmoney.ui.widgets.ElasticScrollView>
android:layout_height="match_parent" />
</LinearLayout>
......@@ -105,20 +105,34 @@
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_gold_card"
android:elevation="1dp"
android:orientation="vertical"
android:padding="15dp">
<TextView
android:id="@+id/tv_bonus_rate"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:text="@string/dot"
android:textSize="16sp" />
android:layout_marginBottom="15dp">
<TextView
android:id="@+id/tv_bonus_rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dot"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_bonus_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="15dp"
android:textSize="14sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
......@@ -367,8 +381,8 @@
android:layout_marginBottom="6dp"
android:background="@drawable/shape_btn_switch"
android:text="邀请亲友"
android:textSize="16sp"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -386,10 +400,10 @@
</com.google.android.material.appbar.CollapsingToolbarLayout>
<RelativeLayout
android:elevation="2dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_tab_friends">
android:background="@drawable/shape_tab_friends"
android:elevation="2dp">
<com.androidkun.xtablayout.XTabLayout
android:id="@+id/tab_friends"
......
GoodMoney/app/src/main/res/mipmap-xhdpi/bg_guide1.png

35.3 KB | W: | H:

GoodMoney/app/src/main/res/mipmap-xhdpi/bg_guide1.png

93.7 KB | W: | H:

GoodMoney/app/src/main/res/mipmap-xhdpi/bg_guide1.png
GoodMoney/app/src/main/res/mipmap-xhdpi/bg_guide1.png
GoodMoney/app/src/main/res/mipmap-xhdpi/bg_guide1.png
GoodMoney/app/src/main/res/mipmap-xhdpi/bg_guide1.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment