Skip to content

A
android_goodmoney
Commit 8409c607 authored by jyx's avatar jyx
Browse files
Options

领取分红分享

parent 8d8d5930
Hide whitespace changes
Inline Side-by-side
Showing with 655 additions and 429 deletions
GoodMoney/app/src/main/AndroidManifest.xml
View file @ 8409c607
...@@ -179,9 +179,7 @@ ...@@ -179,9 +179,7 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activitys.AccountMergeActivity" android:name=".ui.activitys.AccountMergeActivity"
android:screenOrientation="portrait"> android:screenOrientation="portrait"/>
</activity>
<service <service
android:name=".service.UpdateService" android:name=".service.UpdateService"
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/banner/BannerManager.kt
View file @ 8409c607
...@@ -52,7 +52,7 @@ object BannerManager { ...@@ -52,7 +52,7 @@ object BannerManager {
.build() .build()
it.loadBannerExpressAd(adSlot, object : TTAdNative.NativeExpressAdListener { it.loadBannerExpressAd(adSlot, object : TTAdNative.NativeExpressAdListener {
override fun onNativeExpressAdLoad(ads: MutableList<TTNativeExpressAd>?) { override fun onNativeExpressAdLoad(ads: MutableList<TTNativeExpressAd>?) {
if (ads == null || ads!!.size == 0) return if (ads == null || ads.size == 0) return
mTTAd = ads[0] mTTAd = ads[0]
bindAdListener(frameLayout) bindAdListener(frameLayout)
......
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/AccountMsgBean.java
View file @ 8409c607
...@@ -48,7 +48,7 @@ public class AccountMsgBean implements Serializable { ...@@ -48,7 +48,7 @@ public class AccountMsgBean implements Serializable {
*/ */
private String head; private String head;
private int contribution; private float contribution;
private int sons; private int sons;
private String account; private String account;
private int coin; private int coin;
...@@ -61,11 +61,11 @@ public class AccountMsgBean implements Serializable { ...@@ -61,11 +61,11 @@ public class AccountMsgBean implements Serializable {
this.head = head; this.head = head;
} }
public int getContribution() { public float getContribution() {
return contribution; return contribution;
} }
public void setContribution(int contribution) { public void setContribution(float contribution) {
this.contribution = contribution; this.contribution = contribution;
} }
...@@ -104,7 +104,7 @@ public class AccountMsgBean implements Serializable { ...@@ -104,7 +104,7 @@ public class AccountMsgBean implements Serializable {
*/ */
private String head; private String head;
private int contribution; private float contribution;
private int sons; private int sons;
private String account; private String account;
private int coin; private int coin;
...@@ -117,11 +117,11 @@ public class AccountMsgBean implements Serializable { ...@@ -117,11 +117,11 @@ public class AccountMsgBean implements Serializable {
this.head = head; this.head = head;
} }
public int getContribution() { public float getContribution() {
return contribution; return contribution;
} }
public void setContribution(int contribution) { public void setContribution(float contribution) {
this.contribution = contribution; this.contribution = contribution;
} }
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AccountMergeActivity.kt
View file @ 8409c607
...@@ -4,7 +4,6 @@ import android.os.Bundle ...@@ -4,7 +4,6 @@ import android.os.Bundle
import android.view.View import android.view.View
import com.mints.goodmoney.R import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.mvp.model.AccountMsgBean import com.mints.goodmoney.mvp.model.AccountMsgBean
import com.mints.goodmoney.mvp.presenters.AccountMergePresenter import com.mints.goodmoney.mvp.presenters.AccountMergePresenter
import com.mints.goodmoney.mvp.views.AccountMergeView import com.mints.goodmoney.mvp.views.AccountMergeView
...@@ -91,10 +90,10 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV ...@@ -91,10 +90,10 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
private fun hintDialog(toDoKey: String, str: String, type: Int) { private fun hintDialog(toDoKey: String, str: String, type: Int) {
val content = SpanUtils() val content = SpanUtils()
.append("保留后微信会跟手机号绑定，仅保留") .append("保留后微信会跟手机号绑定\r\n仅保留")
.append(str + "账号").setForegroundColor(resources.getColor(R.color.color_FF2326)) .append(str + "账号").setForegroundColor(resources.getColor(R.color.color_FF2326))
.append("下的数据，请使用") .append("下的数据\r\n")
.append("微信登录").setForegroundColor(resources.getColor(R.color.color_FF2326)) .append("另一个账号的数据将会被删除")
.create() .create()
cdaa = CustomDialogAsApple(context, object : DialogListener() { cdaa = CustomDialogAsApple(context, object : DialogListener() {
...@@ -126,13 +125,13 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV ...@@ -126,13 +125,13 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
GlideUtils.loadImageViewLoding(context, it.wxUser.head, civ_avatar_left, R.mipmap.ic_my, R.mipmap.ic_my) GlideUtils.loadImageViewLoding(context, it.wxUser.head, civ_avatar_left, R.mipmap.ic_my, R.mipmap.ic_my)
GlideUtils.loadImageViewLoding(context, it.mobileUser.head, civ_avatar_right, R.mipmap.ic_my, R.mipmap.ic_my) GlideUtils.loadImageViewLoding(context, it.mobileUser.head, civ_avatar_right, R.mipmap.ic_my, R.mipmap.ic_my)
tv_name_left.text = "" + it.wxUser.account tv_name_left.text = "" + it.wxUser.account
tv_coin_left.text = "" + it.wxUser.coin tv_coin_left.text = "金币 " + it.wxUser.coin
tv_bonus_left.text = "" + it.wxUser.contribution tv_bonus_left.text = "贡献 " + it.wxUser.contribution
tv_invited_left.text = "" + it.wxUser.sons tv_invited_left.text = "亲友 " + it.wxUser.sons
tv_name_right.text = "" + it.mobileUser.account tv_name_right.text = "" + it.mobileUser.account
tv_coin_right.text = "" + it.mobileUser.coin tv_coin_right.text = "金币 " + it.mobileUser.coin
tv_bonus_right.text = "" + it.mobileUser.contribution tv_bonus_right.text = "贡献 " + it.mobileUser.contribution
tv_invited_right.text = "" + it.mobileUser.sons tv_invited_right.text = "亲友 " + it.mobileUser.sons
} }
} }
...@@ -140,7 +139,6 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV ...@@ -140,7 +139,6 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
override fun toKeepAccountSuc() { override fun toKeepAccountSuc() {
showToast("账号合并成功！") showToast("账号合并成功！")
readyGoThenKill(MainActivity::class.java) readyGoThenKill(MainActivity::class.java)
} }
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt
View file @ 8409c607
...@@ -69,6 +69,8 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC ...@@ -69,6 +69,8 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
private val ps by lazy { AppPreferences(context) } private val ps by lazy { AppPreferences(context) }
private val userManager by lazy { UserManager.getInstance() }
override fun getContentViewLayoutID() = R.layout.fragment_main_friends override fun getContentViewLayoutID() = R.layout.fragment_main_friends
override fun initViewsAndEvents() { override fun initViewsAndEvents() {
...@@ -145,7 +147,6 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC ...@@ -145,7 +147,6 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
}) })
tab_friends.setupWithViewPager(view_pager_friends) tab_friends.setupWithViewPager(view_pager_friends)
} }
override fun onHiddenChanged(hidden: Boolean) { override fun onHiddenChanged(hidden: Boolean) {
...@@ -367,7 +368,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC ...@@ -367,7 +368,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
// 第一次邀请提示弹框 // 第一次邀请提示弹框
firstWeChatInvite() firstWeChatInvite()
} else { } else {
shareImgDialog() shareImgBounsDialog()
} }
} }
...@@ -379,8 +380,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC ...@@ -379,8 +380,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
// 领取收益 // 领取收益
mFriendsHallMsgBean?.let { mFriendsHallMsgBean?.let {
if (it.cash.toInt() > 0 && it.status == 0) { if (it.cash.toInt() > 0 && it.status == 0) {
// 去提现 shareImgBounsDialog()
friendsPresenter.getContributionOutToCash()
} else { } else {
if (it.button == "戳我分红") { if (it.button == "戳我分红") {
// 玩法规则 // 玩法规则
...@@ -457,7 +457,61 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC ...@@ -457,7 +457,61 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
*/ */
private fun shareImgDialog() { private fun shareImgDialog() {
val shareDialog = ShareDialog(requireActivity()) val shareDialog = ShareDialog(requireActivity())
shareDialog.show() val title: String
if (userManager.wxName.isEmpty()) {
var mobile = userManager.mobile
if (mobile.isNotEmpty()) {
mobile = mobile.substring(0, 3) + "****" + mobile.substring(mobile.length - 4, mobile.length)
}
title = "Hi,我是$mobile"
} else {
title = "Hi,我是" + userManager.wxName
}
val content = "送你一个赚钱的新模式，\r\n快点加入跟我一起赚钱吧"
shareDialog.run {
setShareAvatar(userManager.wxHeader)
setShareTitle(title)
setShareContent(content)
show()
}
}
/**
* 领取分红分享
*/
private fun shareImgBounsDialog() {
val shareDialog = ShareDialog(requireActivity())
val title: String
if (userManager.wxName.isEmpty()) {
var mobile = userManager.mobile
if (mobile.isNotEmpty()) {
mobile = mobile.substring(0, 3) + "****" + mobile.substring(mobile.length - 4, mobile.length)
}
title = "Hi,我是$mobile"
} else {
title = "Hi,我是" + userManager.wxName
}
val content = SpanUtils()
.append("我已在好赚钱赚了")
.append("100").setFontSize(BubbleUtils.dp2px(10)).setForegroundColor(resources.getColor(R.color.color_E72C2B))
.append("元 ，快来跟我一起赚钱吧，满")
.append("0.3").setFontSize(BubbleUtils.dp2px(10)).setForegroundColor(resources.getColor(R.color.color_E72C2B))
.append("元就可以提现")
.create()
shareDialog.run {
setOnShareCompleteListener(object : ShareDialog.OnShareCompleteListener {
override fun onShareComplete() {
// 去提现
friendsPresenter.getContributionOutToCash()
}
})
setShareAvatar(userManager.wxHeader)
setShareTitle(title)
setShareTips("Tips:分享朋友圈成功后领取分红收益")
setShareWithNoWechatFavoiter(true)
setShareContent(content)
show()
}
} }
/** /**
...@@ -481,11 +535,13 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC ...@@ -481,11 +535,13 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
} }
} }
}) })
cdaa!!.setTitle("提示") cdaa!!.run {
cdaa!!.setContent("被邀请人需要登录才能获得贡献值") setTitle("提示")
cdaa!!.setLeft("取消") setContent("被邀请人需要登录才能获得贡献值")
cdaa!!.setRight("打开微信") setLeft("取消")
cdaa!!.show() setRight("打开微信")
show()
}
} }
} }
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @ 8409c607
...@@ -47,7 +47,6 @@ import kotlinx.android.synthetic.main.view_title.* ...@@ -47,7 +47,6 @@ import kotlinx.android.synthetic.main.view_title.*
import net.grandcentrix.tray.AppPreferences import net.grandcentrix.tray.AppPreferences
import java.math.BigDecimal import java.math.BigDecimal
import java.util.* import java.util.*
import kotlin.concurrent.schedule
/** /**
* 描述：我 * 描述：我
...@@ -368,6 +367,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi ...@@ -368,6 +367,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
item_title_gold_about.text = "约" + cashStr + "元" item_title_gold_about.text = "约" + cashStr + "元"
userGold = CommonUtils.formatString(userConfig!!.userMsg.coin.toString()) userGold = CommonUtils.formatString(userConfig!!.userMsg.coin.toString())
userManager.usercash = userConfig!!.userMsg.coin.toString()
} }
item_title_gold_count.text = userGold item_title_gold_count.text = userGold
} }
...@@ -778,10 +778,24 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi ...@@ -778,10 +778,24 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
val shareDialog = ShareDialog(requireActivity()) val shareDialog = ShareDialog(requireActivity())
shareDialog.setOnShareOKListener(object : ShareDialog.OnShareOKListener { shareDialog.setOnShareOKListener(object : ShareDialog.OnShareOKListener {
override fun onShareOk() { override fun onShareOk() {
myPresenter.cmtShareStatus() myPresenter.cmtShareStatus()
} }
}) })
val userManager = UserManager.getInstance()
val title: String
if (userManager.wxName.isEmpty()) {
var mobile = userManager.mobile
if (mobile.isNotEmpty()) {
mobile = mobile.substring(0, 3) + "****" + mobile.substring(mobile.length - 4, mobile.length)
}
title = "Hi,我是$mobile"
} else {
title = "Hi,我是" + userManager.wxName
}
val content = "送你一个赚钱的新模式，\r\n快点加入跟我一起赚钱吧"
shareDialog.setShareAvatar(userManager.wxHeader)
shareDialog.setShareTitle(title)
shareDialog.setShareContent(content)
shareDialog.show() shareDialog.show()
} }
...@@ -840,6 +854,5 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi ...@@ -840,6 +854,5 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
AppConfig.ylhAdCount = data.vedioRules.ylH_VEDIO.surplus AppConfig.ylhAdCount = data.vedioRules.ylH_VEDIO.surplus
AppConfig.wnVedioAdCount = data.vedioRules.sdhZ_VEDIO.surplus AppConfig.wnVedioAdCount = data.vedioRules.sdhZ_VEDIO.surplus
LogUtil.d(TAG, "首页视频数：csjCount:${AppConfig.csjVedioAdCount} ylhCount:${AppConfig.ylhAdCount} sdhzCount:${AppConfig.wnVedioAdCount}") LogUtil.d(TAG, "首页视频数：csjCount:${AppConfig.csjVedioAdCount} ylhCount:${AppConfig.ylhAdCount} sdhzCount:${AppConfig.wnVedioAdCount}")
} }
} }
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/PanFragment.kt
View file @ 8409c607
...@@ -20,7 +20,6 @@ import com.mints.goodmoney.ui.fragment.base.BaseFragment ...@@ -20,7 +20,6 @@ import com.mints.goodmoney.ui.fragment.base.BaseFragment
import com.mints.library.utils.json.JsonUtil import com.mints.library.utils.json.JsonUtil
import kotlinx.android.synthetic.main.fragment_main_pan.* import kotlinx.android.synthetic.main.fragment_main_pan.*
/** /**
* 描述：大转盘 * 描述：大转盘
* 作者：孟崔广 * 作者：孟崔广
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/DrawcashVideoDialog.kt
View file @ 8409c607
...@@ -30,7 +30,7 @@ import java.util.* ...@@ -30,7 +30,7 @@ import java.util.*
/** /**
* 微信授权弹窗 * 微信授权弹窗
*/ */
class BindWxDialog(context: Activity) : class DrawcashVideoDialog(context: Activity) :
Dialog(context, R.style.dialog), OnLoginListener, SettingsView, View.OnClickListener { Dialog(context, R.style.dialog), OnLoginListener, SettingsView, View.OnClickListener {
private var loginApi: LoginApi? = null private var loginApi: LoginApi? = null
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/ShareDialog.kt
View file @ 8409c607
...@@ -3,6 +3,8 @@ package com.mints.goodmoney.ui.widgets ...@@ -3,6 +3,8 @@ package com.mints.goodmoney.ui.widgets
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap
import android.text.Spanned
import android.text.TextUtils
import android.view.* import android.view.*
import android.widget.CheckBox import android.widget.CheckBox
import android.widget.ImageView import android.widget.ImageView
...@@ -11,19 +13,20 @@ import android.widget.TextView ...@@ -11,19 +13,20 @@ import android.widget.TextView
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import cn.sharesdk.framework.Platform import cn.sharesdk.framework.Platform
import cn.sharesdk.framework.Platform.ShareParams import cn.sharesdk.framework.Platform.ShareParams
import cn.sharesdk.framework.PlatformActionListener
import cn.sharesdk.framework.ShareSDK import cn.sharesdk.framework.ShareSDK
import cn.sharesdk.wechat.friends.Wechat import cn.sharesdk.wechat.friends.Wechat
import cn.sharesdk.wechat.moments.WechatMoments import cn.sharesdk.wechat.moments.WechatMoments
import com.mints.goodmoney.MintsApplication import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.R import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.ui.adapter.SharePagerAdapter import com.mints.goodmoney.ui.adapter.SharePagerAdapter
import com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils import com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils
import com.mints.goodmoney.utils.QRCodeUtil import com.mints.goodmoney.utils.QRCodeUtil
import com.mints.goodmoney.utils.ToastUtil import com.mints.goodmoney.utils.ToastUtil
import com.mints.library.utils.GlideUtils import com.mints.library.utils.GlideUtils
import java.util.* import java.util.*
import kotlin.collections.ArrayList
import kotlin.concurrent.schedule import kotlin.concurrent.schedule
class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
...@@ -31,11 +34,14 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { ...@@ -31,11 +34,14 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
private val llDialogShareWx: LinearLayout private val llDialogShareWx: LinearLayout
private val llDialogShareQq: LinearLayout private val llDialogShareQq: LinearLayout
private val tvDialogShareNext: TextView private val tvDialogShareNext: TextView
private val tvDialogShareTips: TextView
private var mOnShareOKListener: OnShareOKListener? = null private var mOnShareOKListener: OnShareOKListener? = null
private var mOnShareCompleteListener: OnShareCompleteListener? = null
private val viewPager: ViewPager private val viewPager: ViewPager
private val pagerAdapter: SharePagerAdapter private val pagerAdapter: SharePagerAdapter
private val mViews: ArrayList<View>
private val wechat by lazy { ShareSDK.getPlatform(Wechat.NAME) } private val wechat by lazy { ShareSDK.getPlatform(Wechat.NAME) }
private val wechatMoments by lazy { ShareSDK.getPlatform(WechatMoments.NAME) } private val wechatMoments by lazy { ShareSDK.getPlatform(WechatMoments.NAME) }
...@@ -62,10 +68,12 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { ...@@ -62,10 +68,12 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
llDialogShareWx = findViewById<View>(R.id.llDialogShareWx) as LinearLayout llDialogShareWx = findViewById<View>(R.id.llDialogShareWx) as LinearLayout
llDialogShareQq = findViewById<View>(R.id.llDialogShareQq) as LinearLayout llDialogShareQq = findViewById<View>(R.id.llDialogShareQq) as LinearLayout
tvDialogShareNext = findViewById<View>(R.id.tvDialogShareNext) as TextView tvDialogShareNext = findViewById<View>(R.id.tvDialogShareNext) as TextView
tvDialogShareTips = findViewById<View>(R.id.tvDialogShareTips) as TextView
viewPager = findViewById(R.id.view_pager) viewPager = findViewById(R.id.view_pager)
viewPager.pageMargin = BubbleUtils.dp2px(20) viewPager.pageMargin = BubbleUtils.dp2px(30)
val QRCode = QRCodeUtil.createQRCode(Constant.SHARE_URL, 80) val QRCode = QRCodeUtil.createQRCode(Constant.SHARE_URL, 50)
val inflater = LayoutInflater.from(context) val inflater = LayoutInflater.from(context)
val view1 = inflater.inflate(R.layout.item_share_view, null) val view1 = inflater.inflate(R.layout.item_share_view, null)
val view2 = inflater.inflate(R.layout.item_share_view, null) val view2 = inflater.inflate(R.layout.item_share_view, null)
...@@ -74,30 +82,11 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { ...@@ -74,30 +82,11 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
view1.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode) view1.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode)
view2.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode) view2.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode)
val avatar1 = view1.findViewById<ImageView>(R.id.item_iv_avatar) mViews = arrayListOf()
val avatar2 = view2.findViewById<ImageView>(R.id.item_iv_avatar) mViews.add(view1)
val name1 = view1.findViewById<TextView>(R.id.item_tv_name) mViews.add(view2)
val name2 = view2.findViewById<TextView>(R.id.item_tv_name) pagerAdapter = SharePagerAdapter(mViews)
val info1 = view1.findViewById<TextView>(R.id.item_tv_info) viewPager.adapter = pagerAdapter
val info2 = view2.findViewById<TextView>(R.id.item_tv_info)
val userManager = UserManager.getInstance()
GlideUtils.loadImageViewLoding(context, userManager.wxHeader, avatar1, R.mipmap.ic_my, R.mipmap.ic_my)
GlideUtils.loadImageViewLoding(context, userManager.wxHeader, avatar2, R.mipmap.ic_my, R.mipmap.ic_my)
if (userManager.wxName.isEmpty()) {
var mobile = userManager.mobile
if (mobile.isNotEmpty()) {
mobile = mobile.substring(0, 3) + "****" + mobile.substring(mobile.length - 4, mobile.length)
}
name1.text = "手机:$mobile"
name2.text = "手机:$mobile"
} else {
name1.text = userManager.wxName
name2.text = userManager.wxName
}
info1.text = "送你一个赚钱的新模式，\r\n快点加入跟我一起赚钱吧"
info2.text = "送你一个赚钱的新模式，\r\n快点加入跟我一起赚钱吧"
val cb2 = view2.findViewById<CheckBox>(R.id.item_cb_check) val cb2 = view2.findViewById<CheckBox>(R.id.item_cb_check)
val cb1 = view1.findViewById<CheckBox>(R.id.item_cb_check) val cb1 = view1.findViewById<CheckBox>(R.id.item_cb_check)
...@@ -122,12 +111,6 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { ...@@ -122,12 +111,6 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
}) })
val views = arrayListOf<View>()
views.add(view1)
views.add(view2)
pagerAdapter = SharePagerAdapter(views)
viewPager.adapter = pagerAdapter
llDialogShareWx.setOnClickListener { llDialogShareWx.setOnClickListener {
shareWechat() shareWechat()
} }
...@@ -149,9 +132,55 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { ...@@ -149,9 +132,55 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
fun onShareOk() fun onShareOk()
} }
fun setOnShareCompleteListener(onShareCompleteListener: OnShareCompleteListener) {
mOnShareCompleteListener = onShareCompleteListener
}
interface OnShareCompleteListener {
fun onShareComplete()
}
fun setShareAvatar(imgSrc: String) {
mViews.forEach {
val avatar = it.findViewById<ImageView>(R.id.item_iv_avatar)
GlideUtils.loadImageViewLoding(context, imgSrc, avatar, R.mipmap.ic_my, R.mipmap.ic_my)
}
}
fun setShareTitle(title: String) {
mViews.forEach {
it.findViewById<TextView>(R.id.item_tv_name).text = title
}
}
fun setShareContent(content: String) {
mViews.forEach {
it.findViewById<TextView>(R.id.item_tv_info).text = content
}
}
fun setShareContent(content: Spanned) {
mViews.forEach {
it.findViewById<TextView>(R.id.item_tv_info).text = content
}
}
fun setShareWithNoWechatFavoiter(flag: Boolean) {
if (flag) {
llDialogShareWx.visibility = View.GONE
}
}
fun setShareTips(tips: String) {
if (!TextUtils.isEmpty(tips)) {
tvDialogShareTips.visibility = View.VISIBLE
tvDialogShareTips.text = tips
}
}
private fun shareWechat() { private fun shareWechat() {
val currentItem = viewPager.currentItem val currentItem = viewPager.currentItem
val child = viewPager.getChildAt(currentItem).findViewById<View>(R.id.item_iv_bg) val child = mViews[currentItem].findViewById<View>(R.id.item_iv_bg)
child.isDrawingCacheEnabled = true child.isDrawingCacheEnabled = true
child.drawingCacheQuality = View.DRAWING_CACHE_QUALITY_HIGH child.drawingCacheQuality = View.DRAWING_CACHE_QUALITY_HIGH
child.buildDrawingCache() child.buildDrawingCache()
...@@ -162,20 +191,32 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { ...@@ -162,20 +191,32 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
wechatSp.imageData = bitmap wechatSp.imageData = bitmap
if (wechat.isClientValid) { if (wechat.isClientValid) {
wechat.platformActionListener = object : PlatformActionListener {
override fun onComplete(p0: Platform?, p1: Int, p2: HashMap<String, Any>?) {
mOnShareCompleteListener?.onShareComplete()
}
override fun onError(p0: Platform?, p1: Int, p2: Throwable?) {
}
override fun onCancel(p0: Platform?, p1: Int) {
}
}
mOnShareOKListener?.onShareOk() mOnShareOKListener?.onShareOk()
wechat.share(wechatSp) wechat.share(wechatSp)
} else { } else {
ToastUtil.show(MintsApplication.getContext(), "请先安装微信") ToastUtil.show(MintsApplication.getContext(), "请先安装微信")
} }
Timer().schedule(1000,{ Timer().schedule(1000) {
dismiss() dismiss()
}) }
} }
private fun shareWechatFavoite() { private fun shareWechatFavoite() {
val currentItem = viewPager.currentItem val currentItem = viewPager.currentItem
val child = viewPager.getChildAt(currentItem).findViewById<View>(R.id.item_iv_bg) val child = mViews[currentItem].findViewById<View>(R.id.item_iv_bg)
child.isDrawingCacheEnabled = true child.isDrawingCacheEnabled = true
child.drawingCacheQuality = View.DRAWING_CACHE_QUALITY_HIGH child.drawingCacheQuality = View.DRAWING_CACHE_QUALITY_HIGH
child.buildDrawingCache() child.buildDrawingCache()
...@@ -186,14 +227,27 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) { ...@@ -186,14 +227,27 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
wechatSp.imageData = bitmap wechatSp.imageData = bitmap
if (wechatMoments.isClientValid) { if (wechatMoments.isClientValid) {
wechatMoments.platformActionListener = object : PlatformActionListener {
override fun onComplete(p0: Platform?, p1: Int, p2: HashMap<String, Any>?) {
mOnShareCompleteListener?.onShareComplete()
}
override fun onError(p0: Platform?, p1: Int, p2: Throwable?) {
}
override fun onCancel(p0: Platform?, p1: Int) {
}
}
mOnShareOKListener?.onShareOk() mOnShareOKListener?.onShareOk()
wechatMoments.share(wechatSp) wechatMoments.share(wechatSp)
} else { } else {
ToastUtil.show(MintsApplication.getContext(), "请先安装微信") ToastUtil.show(MintsApplication.getContext(), "请先安装微信")
} }
Timer().schedule(1000,{ Timer().schedule(1000) {
dismiss() dismiss()
}) }
} }
} }
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/utils/QRCodeUtil.java
View file @ 8409c607
...@@ -2,19 +2,15 @@ package com.mints.goodmoney.utils; ...@@ -2,19 +2,15 @@ package com.mints.goodmoney.utils;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.text.TextUtils;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType; import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.WriterException; import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix; import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import java.util.HashMap;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Map;
public class QRCodeUtil { public class QRCodeUtil {
...@@ -30,7 +26,7 @@ public class QRCodeUtil { ...@@ -30,7 +26,7 @@ public class QRCodeUtil {
Hashtable<EncodeHintType, Object> hints = new Hashtable<>(); Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
hints.put(EncodeHintType.CHARACTER_SET, "utf-8"); hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
hints.put(EncodeHintType.MARGIN, 0); hints.put(EncodeHintType.MARGIN, 1);
BitMatrix bitMatrix = new QRCodeWriter().encode(text, BitMatrix bitMatrix = new QRCodeWriter().encode(text,
BarcodeFormat.QR_CODE, size, size, hints); BarcodeFormat.QR_CODE, size, size, hints);
......
GoodMoney/app/src/main/res/drawable/shape_tab_friends.xml
View file @ 8409c607
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<padding android:top="1dp" />
<solid android:color="#00CCCCCC" />
<corners
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding android:top="1dp" />
<solid android:color="#10CCCCCC" />
<corners
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding android:top="1dp" />
<solid android:color="#20CCCCCC" />
<corners
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="1dp"
android:top="1dp" />
<solid android:color="#30CCCCCC" />
<corners
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>
</item>
<solid android:color="@color/white" /> <!-- 中心背景 -->
<item>
<corners <shape
android:topLeftRadius="20dp" android:shape="rectangle"
android:topRightRadius="20dp" /> android:useLevel="false">
<!-- 实心 -->
</shape> <solid android:color="#ffffff" />
\ No newline at end of file <corners
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_white_border.xml 0 → 100644
View file @ 8409c607
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<padding
android:bottom="1dp"
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<solid android:color="#00CCCCCC" />
<corners android:radius="10dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="1dp"
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<solid android:color="#10CCCCCC" />
<corners android:radius="10dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="1dp"
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<solid android:color="#20CCCCCC" />
<corners android:radius="10dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="1dp"
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<solid android:color="#30CCCCCC" />
<corners android:radius="10dp" />
</shape>
</item>
<!-- <item>-->
<!-- <shape android:shape="rectangle">-->
<!-- <padding-->
<!-- android:bottom="2dp"-->
<!-- android:left="2dp"-->
<!-- android:right="2dp"-->
<!-- android:top="2dp" />-->
<!-- <solid android:color="#50CCCCCC" />-->
<!-- <corners android:radius="8dp" />-->
<!-- </shape>-->
<!-- </item>-->
<!-- 中心背景 -->
<item>
<shape
android:shape="rectangle"
android:useLevel="false">
<!-- 实心 -->
<solid android:color="#ffffff" />
<corners android:radius="10dp" />
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/activity_account_merge.xml
View file @ 8409c607
...@@ -42,39 +42,41 @@ ...@@ -42,39 +42,41 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:ellipsize="end"
android:lines="1"
android:text="@string/dot" android:text="@string/dot"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <TextView
android:id="@+id/tv_coin_left" android:id="@+id/tv_coin_left"
android:gravity="center_vertical" android:layout_width="120dp"
android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:gravity="center"
android:text="@string/dot" android:text="@string/dot"
android:textSize="16sp" android:textSize="16sp"
app:drawableStartCompat="@mipmap/ic_coin" /> app:drawableStartCompat="@mipmap/ic_coin" />
<TextView <TextView
android:id="@+id/tv_bonus_left" android:id="@+id/tv_bonus_left"
android:layout_width="100dp" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:gravity="center"
android:text="@string/dot" android:text="@string/dot"
android:textSize="16sp" android:textSize="16sp"
app:drawableStartCompat="@mipmap/ic_gongxian" /> app:drawableStartCompat="@mipmap/ic_gongxian" />
<TextView <TextView
android:id="@+id/tv_invited_left" android:id="@+id/tv_invited_left"
android:layout_width="100dp" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:gravity="center"
android:text="@string/dot" android:text="@string/dot"
android:textSize="16sp" android:textSize="16sp"
app:drawableStartCompat="@mipmap/ic_invited" /> app:drawableStartCompat="@mipmap/ic_invited" />
...@@ -95,9 +97,9 @@ ...@@ -95,9 +97,9 @@
<ImageView <ImageView
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_marginTop="50dp" android:layout_marginTop="48dp"
android:paddingStart="10dp" android:paddingStart="26dp"
android:paddingEnd="10dp" android:paddingEnd="26dp"
android:src="@mipmap/icon_exchange" /> android:src="@mipmap/icon_exchange" />
<LinearLayout <LinearLayout
...@@ -124,39 +126,41 @@ ...@@ -124,39 +126,41 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:ellipsize="end"
android:lines="1"
android:text="@string/dot" android:text="@string/dot"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <TextView
android:id="@+id/tv_coin_right" android:id="@+id/tv_coin_right"
android:layout_width="100dp" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:gravity="end|center_vertical" android:gravity="center"
android:text="@string/dot" android:text="@string/dot"
android:textSize="16sp" android:textSize="16sp"
app:drawableEndCompat="@mipmap/ic_coin" /> app:drawableEndCompat="@mipmap/ic_coin" />
<TextView <TextView
android:id="@+id/tv_bonus_right" android:id="@+id/tv_bonus_right"
android:layout_width="100dp" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:gravity="end|center_vertical" android:gravity="center"
android:text="@string/dot" android:text="@string/dot"
android:textSize="16sp" android:textSize="16sp"
app:drawableEndCompat="@mipmap/ic_gongxian" /> app:drawableEndCompat="@mipmap/ic_gongxian" />
<TextView <TextView
android:id="@+id/tv_invited_right" android:id="@+id/tv_invited_right"
android:layout_width="100dp" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:gravity="end|center_vertical" android:gravity="center"
android:text="@string/dot" android:text="@string/dot"
android:textSize="16sp" android:textSize="16sp"
app:drawableEndCompat="@mipmap/ic_invited" /> app:drawableEndCompat="@mipmap/ic_invited" />
......
GoodMoney/app/src/main/res/layout/dialog_main.xml
View file @ 8409c607
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<Button <Button
android:id="@+id/dialog_btn_left" android:id="@+id/dialog_btn_left"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:gravity="center" android:gravity="center"
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<Button <Button
android:id="@+id/dialog_btn_right" android:id="@+id/dialog_btn_right"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:gravity="center" android:gravity="center"
......
GoodMoney/app/src/main/res/layout/dialog_share.xml
View file @ 8409c607
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="110dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -81,6 +81,16 @@ ...@@ -81,6 +81,16 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/tvDialogShareTips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center"
android:text="取消"
android:textSize="12sp"
android:visibility="gone" />
<View style="@style/line_3" /> <View style="@style/line_3" />
<TextView <TextView
......
GoodMoney/app/src/main/res/layout/fragment_main_friends.xml
View file @ 8409c607
...@@ -95,151 +95,157 @@ ...@@ -95,151 +95,157 @@
</RelativeLayout> </RelativeLayout>
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/shape_gold_card" android:background="@drawable/shape_white_border"
android:elevation="1dp"
android:orientation="vertical"
android:padding="15dp"> android:padding="15dp">
<RelativeLayout <TextView
android:layout_width="match_parent" android:id="@+id/tv_bonus_rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="15dp"> android:text="@string/dot"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_bonus_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/dot"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout2"
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="5dp"
android:background="@mipmap/bg_invite_friends_left"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/rl_wrap"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_bonus_rate"
app:layout_constraintVertical_bias="0.0">
<TextView <TextView
android:id="@+id/tv_bonus_rate" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="center|end"
android:text="昨日贡献值"
android:textColor="@color/color_AF6F36"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@id/textView3"
app:layout_constraintEnd_toStartOf="@id/tv_yesterday_bonus"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1" />
<TextView
android:id="@+id/textView3"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center|end"
android:text="今日贡献值"
android:textColor="@color/color_912C36"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_today_bonus"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
app:layout_constraintVertical_weight="1" />
<TextView
android:id="@+id/tv_yesterday_bonus"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
android:paddingEnd="10dp"
android:text="@string/dot" android:text="@string/dot"
android:textSize="14sp" /> android:textSize="22sp"
app:layout_constraintBottom_toTopOf="@id/tv_today_bonus"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/textView2"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1" />
<TextView <TextView
android:id="@+id/tv_bonus_hint" android:id="@+id/tv_today_bonus"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_alignParentRight="true" android:gravity="center"
android:layout_marginTop="2dp" android:paddingEnd="10dp"
android:textSize="12sp" /> android:text="@string/dot"
</RelativeLayout> android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/textView3"
app:layout_constraintTop_toBottomOf="@id/tv_yesterday_bonus"
app:layout_constraintVertical_weight="1" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:id="@+id/rl_wrap"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_gravity="center_horizontal" android:layout_height="80dp"
android:orientation="horizontal"> android:layout_marginStart="5dp"
android:layout_marginTop="10dp"
android:background="@mipmap/bg_invite_friends_right"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/linearLayout2"
app:layout_constraintTop_toBottomOf="@+id/tv_bonus_hint">
<LinearLayout <TextView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="6dp" android:layout_marginStart="6dp"
android:layout_weight="1" android:layout_marginTop="15dp"
android:background="@mipmap/bg_invite_friends_left" android:text="分红收益"
android:orientation="horizontal"> android:textColor="@color/color_CF7E7E" />
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/tv_bonus_money"
android:layout_height="match_parent" android:layout_width="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:gravity="center"
android:text="昨日贡献值"
android:textColor="@color/color_AF6F36"
android:textSize="12sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="今日贡献值"
android:textColor="@color/color_912C36"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_yesterday_bonus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingEnd="10dp"
android:text="@string/dot"
android:textSize="22sp" />
<TextView
android:id="@+id/tv_today_bonus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingEnd="10dp"
android:text="@string/dot"
android:textSize="22sp" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_weight="1" android:layout_marginTop="40dp"
android:background="@mipmap/bg_invite_friends_right"> android:text="@string/dot"
android:textSize="22sp" />
<TextView
android:layout_width="wrap_content" <Button
android:layout_height="wrap_content" android:id="@+id/btn_get_bonus"
android:layout_marginStart="6dp" android:layout_width="60dp"
android:layout_marginTop="15dp" android:layout_height="26dp"
android:text="分红收益" android:layout_alignParentEnd="true"
android:textColor="@color/color_CF7E7E" /> android:layout_centerVertical="true"
android:layout_marginEnd="5dp"
<TextView android:background="@drawable/btn_friends_selectored"
android:id="@+id/tv_bonus_money" android:text="结算中"
android:layout_width="wrap_content" android:textColor="@drawable/btn_friends_text_color_selectored"
android:layout_height="wrap_content" android:textSize="12sp" />
android:layout_marginStart="6dp"
android:layout_marginTop="40dp"
android:text="@string/dot"
android:textSize="22sp" />
<Button
android:id="@+id/btn_get_bonus"
android:layout_width="60dp"
android:layout_height="26dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="5dp"
android:background="@drawable/btn_friends_selectored"
android:text="结算中"
android:textColor="@drawable/btn_friends_text_color_selectored"
android:textSize="12sp" />
</RelativeLayout>
</LinearLayout> </RelativeLayout>
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -247,8 +253,7 @@ ...@@ -247,8 +253,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/shape_gold_card" android:background="@drawable/shape_white_border"
android:elevation="1dp"
android:padding="15dp"> android:padding="15dp">
<TextView <TextView
...@@ -391,35 +396,22 @@ ...@@ -391,35 +396,22 @@
</com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.CollapsingToolbarLayout>
<LinearLayout <com.androidkun.xtablayout.XTabLayout
android:id="@+id/tab_friends"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/shape_tab_friends" android:background="@drawable/shape_tab_friends"
android:elevation="4dip" app:xTabIndicatorColor="#FB560C"
android:orientation="vertical"> app:xTabIndicatorHeight="4dp"
app:xTabIndicatorRoundX="50dp"
<com.androidkun.xtablayout.XTabLayout app:xTabIndicatorRoundY="50dp"
android:id="@+id/tab_friends" app:xTabIndicatorWidth="36dp"
android:layout_width="wrap_content" app:xTabMode="fixed"
android:layout_height="wrap_content" app:xTabSelectedTextColor="#FB560C"
android:layout_gravity="center_horizontal" app:xTabSelectedTextSize="18sp"
app:xTabIndicatorColor="#FB560C" app:xTabTextColor="#666666"
app:xTabIndicatorHeight="4dp" app:xTabTextSize="15sp" />
app:xTabIndicatorRoundX="50dp"
app:xTabIndicatorRoundY="50dp"
app:xTabIndicatorWidth="36dp"
app:xTabMode="fixed"
app:xTabSelectedTextColor="#FB560C"
app:xTabSelectedTextSize="18sp"
app:xTabTextColor="#666666"
app:xTabTextSize="15sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F8F" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
......
GoodMoney/app/src/main/res/layout/fragment_main_my.xml
View file @ 8409c607
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/item_fragment_main_my_title" /> <include layout="@layout/item_fragment_main_my_title" />
...@@ -40,12 +39,16 @@ ...@@ -40,12 +39,16 @@
<FrameLayout <FrameLayout
android:id="@+id/fl_my_banner" android:id="@+id/fl_my_banner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="280dp" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:visibility="gone" /> android:visibility="gone" />
<include
android:id="@+id/item_divider"
layout="@layout/item_divider_gray" />
<include layout="@layout/item_fragment_main_my_promotions" /> <include layout="@layout/item_fragment_main_my_promotions" />
<include layout="@layout/item_divider_gray" /> <include layout="@layout/item_divider_gray" />
...@@ -61,9 +64,7 @@ ...@@ -61,9 +64,7 @@
android:nestedScrollingEnabled="false" android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<include <include layout="@layout/item_fragment_main_my_customer_service" />
android:id="@+id/item_customer_service"
layout="@layout/item_fragment_main_my_customer_service" />
</LinearLayout> </LinearLayout>
......
GoodMoney/app/src/main/res/layout/item_fragment_main_my_clock.xml
View file @ 8409c607
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/ll_my_sign" android:id="@+id/ll_my_sign"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:background="@mipmap/bg_sign" android:background="@mipmap/bg_sign">
android:orientation="vertical">
<LinearLayout <ImageView
android:layout_width="wrap_content" android:id="@+id/item_clock_sign"
android:layout_height="wrap_content" android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="10dp"
android:gravity="center_vertical" android:src="@mipmap/ic_sign_icon"
android:orientation="horizontal"> app:layout_constraintBottom_toTopOf="@+id/item_clock_signview"
app:layout_constraintStart_toStartOf="parent"
<ImageView app:layout_constraintTop_toTopOf="parent" />
android:id="@+id/item_clock_sign"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@mipmap/ic_sign_icon" />
<TextView <TextView
android:id="@+id/item_clock_signday" android:id="@+id/item_clock_signday"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/item_clock_sign"
</LinearLayout> app:layout_constraintStart_toEndOf="@+id/item_clock_sign"
app:layout_constraintTop_toTopOf="@+id/item_clock_sign" />
<com.mints.goodmoney.ui.widgets.SignView <com.mints.goodmoney.ui.widgets.SignView
android:id="@+id/item_clock_signview" android:id="@+id/item_clock_signview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" /> android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toBottomOf="parent" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file \ No newline at end of file
GoodMoney/app/src/main/res/layout/item_fragment_main_my_customer_service.xml
View file @ 8409c607
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingTop="20dp"
android:paddingBottom="20dp">
<TextView <TextView
android:id="@+id/item_bottom_text" android:id="@+id/item_customer_service"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:text="官方QQ群(点击咨询)：" /> android:text="官方QQ群(点击咨询)：" />
<TextView <TextView
android:id="@+id/item_bottom_qqGroupNum" android:id="@+id/item_bottom_qqGroupNum"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" /> android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginBottom="20dp" />
</LinearLayout> </merge>
\ No newline at end of file \ No newline at end of file
GoodMoney/app/src/main/res/layout/item_fragment_main_my_promotions.xml
View file @ 8409c607
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
android:id="@+id/item_promotions_egv" android:id="@+id/item_promotions_egv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:columnWidth="80dp" android:columnWidth="80dp"
......
GoodMoney/app/src/main/res/layout/item_fragment_main_my_title.xml
View file @ 8409c607
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="204dp"
android:orientation="vertical">
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_my_login" android:id="@+id/ll_my_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_margin="15dp">
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp"
android:orientation="horizontal">
<com.mints.goodmoney.ui.widgets.CircleImageView <com.mints.goodmoney.ui.widgets.CircleImageView
android:id="@+id/item_title_avatar" android:id="@+id/item_title_avatar"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" /> android:layout_height="70dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/item_title_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_marginTop="4dp"
android:orientation="vertical"> android:text="未登录"
android:textColor="@color/black"
<TextView android:textSize="18sp"
android:id="@+id/item_title_id" android:textStyle="bold"
android:layout_width="wrap_content" app:layout_constraintStart_toEndOf="@id/item_title_avatar"
android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="@id/item_title_avatar" />
android:text="未登录"
android:textColor="@color/black" <TextView
android:textSize="18sp" android:id="@+id/item_title_invitecode"
android:textStyle="bold" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<LinearLayout android:layout_marginStart="10dp"
android:layout_width="wrap_content" android:textColor="@color/color_333"
android:layout_height="wrap_content" android:textSize="14sp"
android:layout_marginTop="6dp" app:layout_constraintBottom_toBottomOf="parent"
android:orientation="horizontal"> app:layout_constraintStart_toEndOf="@id/item_title_avatar"
app:layout_constraintTop_toBottomOf="@id/item_title_id" />
<TextView
android:id="@+id/item_title_invitecode" <TextView
android:layout_width="wrap_content" android:id="@+id/item_title_invitecode_copy"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical" android:layout_height="match_parent"
android:textColor="@color/color_333" android:layout_marginStart="6dp"
android:textSize="14sp" /> android:background="@drawable/shape_tv_gold_gury"
android:paddingLeft="10dp"
<TextView android:paddingTop="2dp"
android:id="@+id/item_title_invitecode_copy" android:paddingRight="10dp"
android:layout_width="wrap_content" android:paddingBottom="2dp"
android:layout_height="wrap_content" android:text="复制"
android:layout_gravity="center_vertical" android:textColor="@color/color_666"
android:layout_marginStart="10dp" android:textSize="12sp"
android:background="@drawable/shape_tv_gold_gury" app:layout_constraintBottom_toBottomOf="parent"
android:paddingLeft="10dp" app:layout_constraintStart_toEndOf="@id/item_title_invitecode"
android:paddingTop="2dp" app:layout_constraintTop_toBottomOf="@id/item_title_id" />
android:paddingRight="10dp"
android:paddingBottom="2dp" </androidx.constraintlayout.widget.ConstraintLayout>
android:text="复制"
android:textColor="@color/color_666" <androidx.constraintlayout.widget.ConstraintLayout
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="90dp" android:layout_height="90dp"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:background="@drawable/shape_gold_card" android:layout_marginBottom="10dp"
android:elevation="1dip" android:background="@drawable/shape_white_border">
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingEnd="10dp">
<ImageView <ImageView
android:id="@+id/imageView2"
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="32dp"
android:src="@mipmap/ic_gold" /> android:layout_marginStart="10dp"
android:src="@mipmap/ic_gold"
app:layout_constraintBottom_toBottomOf="parent"
<RelativeLayout app:layout_constraintStart_toStartOf="parent"
android:layout_width="0dp" app:layout_constraintTop_toTopOf="parent" />
android:layout_height="70dp"
android:layout_weight="1">
<TextView
android:id="@+id/item_title_gold_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="6dp"
android:text="0"
android:textColor="@color/color_FB560C"
android:textSize="26sp" />
<TextView
android:id="@+id/item_title_gold_about"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-14dp"
android:layout_toRightOf="@+id/item_title_gold_count"
android:background="@mipmap/ic_goldtry_about"
android:gravity="center"
android:paddingLeft="1dp"
android:paddingRight="1dp"
android:text="约0.00元"
android:textColor="@color/white"
android:textSize="10sp" />
</RelativeLayout>
<LinearLayout <TextView
android:id="@+id/item_title_gold_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginStart="10dp"
android:text="0"
<Button android:textColor="@color/color_FB560C"
android:id="@+id/btn_coinRecord" android:textSize="26sp"
android:layout_width="60dp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="30dp" app:layout_constraintStart_toEndOf="@id/imageView2"
android:background="@drawable/shape_btn_switch" app:layout_constraintTop_toTopOf="parent" />
android:text="明细"
android:textColor="@color/white" <TextView
android:textSize="16sp" /> android:id="@+id/item_title_gold_about"
android:layout_width="wrap_content"
<Button android:layout_height="wrap_content"
android:id="@+id/btn_withdraw" android:layout_marginTop="8dp"
android:layout_width="60dp" android:background="@mipmap/ic_goldtry_about"
android:layout_marginTop="6dp" android:gravity="center"
android:layout_height="30dp" android:text="约0.00元"
android:background="@drawable/shape_btn_switch" android:textColor="@color/white"
android:text="提现" android:textSize="10sp"
android:textColor="@color/white" app:layout_constraintStart_toEndOf="@id/item_title_gold_count"
android:textSize="16sp" /> app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
<Button
</LinearLayout> android:id="@+id/btn_coinRecord"
android:layout_width="60dp"
</LinearLayout> android:layout_height="30dp"
\ No newline at end of file android:layout_marginTop="6dp"
android:layout_marginEnd="10dp"
android:background="@drawable/shape_btn_switch"
android:text="明细"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/btn_withdraw"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="6dp"
android:background="@drawable/shape_btn_switch"
android:text="提现"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</merge>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_share_view.xml
View file @ 8409c607
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="10dp" /> android:layout_marginEnd="6dp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -35,12 +35,13 @@ ...@@ -35,12 +35,13 @@
android:layout_width="90dp" android:layout_width="90dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:lines="1"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="10sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/item_tv_info" android:id="@+id/item_tv_info"
android:layout_width="90dp" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
...@@ -52,7 +53,8 @@ ...@@ -52,7 +53,8 @@
android:id="@+id/item_iv_qrcode" android:id="@+id/item_iv_qrcode"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentEnd="true" /> android:layout_alignParentEnd="true"
android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
......
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