领取分红分享

GoodMoney/app/src/main/AndroidManifest.xml

@@ -179,9 +179,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activitys.AccountMergeActivity"
-            android:screenOrientation="portrait">
-
-        </activity>
+            android:screenOrientation="portrait"/>
 
         <service
             android:name=".service.UpdateService"

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/banner/BannerManager.kt

@@ -52,7 +52,7 @@ object BannerManager {
                     .build()
             it.loadBannerExpressAd(adSlot, object : TTAdNative.NativeExpressAdListener {
                 override fun onNativeExpressAdLoad(ads: MutableList<TTNativeExpressAd>?) {
-                    if (ads == null || ads!!.size == 0) return
+                    if (ads == null || ads.size == 0) return
 
                     mTTAd = ads[0]
                     bindAdListener(frameLayout)

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/AccountMsgBean.java

@@ -48,7 +48,7 @@ public class AccountMsgBean implements Serializable {
          */
 
         private String head;
-        private int contribution;
+        private float contribution;
         private int sons;
         private String account;
         private int coin;
@@ -61,11 +61,11 @@ public class AccountMsgBean implements Serializable {
             this.head = head;
         }
 
-        public int getContribution() {
+        public float getContribution() {
             return contribution;
         }
 
-        public void setContribution(int contribution) {
+        public void setContribution(float contribution) {
             this.contribution = contribution;
         }
 
@@ -104,7 +104,7 @@ public class AccountMsgBean implements Serializable {
          */
 
         private String head;
-        private int contribution;
+        private float contribution;
         private int sons;
         private String account;
         private int coin;
@@ -117,11 +117,11 @@ public class AccountMsgBean implements Serializable {
             this.head = head;
         }
 
-        public int getContribution() {
+        public float getContribution() {
             return contribution;
         }
 
-        public void setContribution(int contribution) {
+        public void setContribution(float contribution) {
             this.contribution = contribution;
         }
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AccountMergeActivity.kt

@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import com.mints.goodmoney.R
 import com.mints.goodmoney.common.Constant
-import com.mints.goodmoney.manager.UserManager
 import com.mints.goodmoney.mvp.model.AccountMsgBean
 import com.mints.goodmoney.mvp.presenters.AccountMergePresenter
 import com.mints.goodmoney.mvp.views.AccountMergeView
@@ -91,10 +90,10 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
 
     private fun hintDialog(toDoKey: String, str: String, type: Int) {
         val content = SpanUtils()
-                .append("保留后微信会跟手机号绑定，仅保留")
+                .append("保留后微信会跟手机号绑定\r\n仅保留")
                 .append(str + "账号").setForegroundColor(resources.getColor(R.color.color_FF2326))
-                .append("下的数据，请使用")
-                .append("微信登录").setForegroundColor(resources.getColor(R.color.color_FF2326))
+                .append("下的数据\r\n")
+                .append("另一个账号的数据将会被删除")
                 .create()
 
         cdaa = CustomDialogAsApple(context, object : DialogListener() {
@@ -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.mobileUser.head, civ_avatar_right, R.mipmap.ic_my, R.mipmap.ic_my)
             tv_name_left.text = "" + it.wxUser.account
-            tv_coin_left.text = "" + it.wxUser.coin
-            tv_bonus_left.text = "" + it.wxUser.contribution
-            tv_invited_left.text = "" + it.wxUser.sons
+            tv_coin_left.text = "金币 " + it.wxUser.coin
+            tv_bonus_left.text = "贡献 " + it.wxUser.contribution
+            tv_invited_left.text = "亲友 " + it.wxUser.sons
             tv_name_right.text = "" + it.mobileUser.account
-            tv_coin_right.text = "" + it.mobileUser.coin
-            tv_bonus_right.text = "" + it.mobileUser.contribution
-            tv_invited_right.text = "" + it.mobileUser.sons
+            tv_coin_right.text = "金币 " + it.mobileUser.coin
+            tv_bonus_right.text = "贡献 " + it.mobileUser.contribution
+            tv_invited_right.text = "亲友 " + it.mobileUser.sons
         }
     }
 
@@ -140,7 +139,6 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
 
     override fun toKeepAccountSuc() {
         showToast("账号合并成功！")
-        
 
         readyGoThenKill(MainActivity::class.java)
     }

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt

@@ -69,6 +69,8 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
 
     private val ps by lazy { AppPreferences(context) }
 
+    private val userManager by lazy { UserManager.getInstance() }
+
     override fun getContentViewLayoutID() = R.layout.fragment_main_friends
 
     override fun initViewsAndEvents() {
@@ -145,7 +147,6 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
         })
 
         tab_friends.setupWithViewPager(view_pager_friends)
-
     }
 
     override fun onHiddenChanged(hidden: Boolean) {
@@ -367,7 +368,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
                     // 第一次邀请提示弹框
                     firstWeChatInvite()
                 } else {
-                    shareImgDialog()
+                    shareImgBounsDialog()
                 }
 
             }
@@ -379,8 +380,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
                 // 领取收益
                 mFriendsHallMsgBean?.let {
                     if (it.cash.toInt() > 0 && it.status == 0) {
-                        // 去提现
-                        friendsPresenter.getContributionOutToCash()
+                        shareImgBounsDialog()
                     } else {
                         if (it.button == "戳我分红") {
                             // 玩法规则
@@ -457,7 +457,61 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
      */
     private fun shareImgDialog() {
         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
                 }
             }
         })
-        cdaa!!.setTitle("提示")
-        cdaa!!.setContent("被邀请人需要登录才能获得贡献值")
-        cdaa!!.setLeft("取消")
-        cdaa!!.setRight("打开微信")
-        cdaa!!.show()
+        cdaa!!.run {
+            setTitle("提示")
+            setContent("被邀请人需要登录才能获得贡献值")
+            setLeft("取消")
+            setRight("打开微信")
+            show()
+        }
     }
 
 }
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt

@@ -47,7 +47,6 @@ import kotlinx.android.synthetic.main.view_title.*
 import net.grandcentrix.tray.AppPreferences
 import java.math.BigDecimal
 import java.util.*
-import kotlin.concurrent.schedule
 
 /**
  * 描述：我
@@ -368,6 +367,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
             item_title_gold_about.text = "约" + cashStr + "元"
 
             userGold = CommonUtils.formatString(userConfig!!.userMsg.coin.toString())
+            userManager.usercash = userConfig!!.userMsg.coin.toString()
         }
         item_title_gold_count.text = userGold
     }
@@ -778,10 +778,24 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
         val shareDialog = ShareDialog(requireActivity())
         shareDialog.setOnShareOKListener(object : ShareDialog.OnShareOKListener {
             override fun onShareOk() {
-
                 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()
     }
 
@@ -840,6 +854,5 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
         AppConfig.ylhAdCount = data.vedioRules.ylH_VEDIO.surplus
         AppConfig.wnVedioAdCount = data.vedioRules.sdhZ_VEDIO.surplus
         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

@@ -20,7 +20,6 @@ import com.mints.goodmoney.ui.fragment.base.BaseFragment
 import com.mints.library.utils.json.JsonUtil
 import kotlinx.android.synthetic.main.fragment_main_pan.*
 
-
 /**
  * 描述：大转盘
  * 作者：孟崔广

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/DrawcashVideoDialog.kt

@@ -30,7 +30,7 @@ import java.util.*
 /**
  * 微信授权弹窗
  */
-class BindWxDialog(context: Activity) :
+class DrawcashVideoDialog(context: Activity) :
         Dialog(context, R.style.dialog), OnLoginListener, SettingsView, View.OnClickListener {
 
     private var loginApi: LoginApi? = null

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/ShareDialog.kt

@@ -3,6 +3,8 @@ package com.mints.goodmoney.ui.widgets
 import android.app.Dialog
 import android.content.Context
 import android.graphics.Bitmap
+import android.text.Spanned
+import android.text.TextUtils
 import android.view.*
 import android.widget.CheckBox
 import android.widget.ImageView
@@ -11,19 +13,20 @@ import android.widget.TextView
 import androidx.viewpager.widget.ViewPager
 import cn.sharesdk.framework.Platform
 import cn.sharesdk.framework.Platform.ShareParams
+import cn.sharesdk.framework.PlatformActionListener
 import cn.sharesdk.framework.ShareSDK
 import cn.sharesdk.wechat.friends.Wechat
 import cn.sharesdk.wechat.moments.WechatMoments
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
 import com.mints.goodmoney.common.Constant
-import com.mints.goodmoney.manager.UserManager
 import com.mints.goodmoney.ui.adapter.SharePagerAdapter
 import com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils
 import com.mints.goodmoney.utils.QRCodeUtil
 import com.mints.goodmoney.utils.ToastUtil
 import com.mints.library.utils.GlideUtils
 import java.util.*
+import kotlin.collections.ArrayList
 import kotlin.concurrent.schedule
 
 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 llDialogShareQq: LinearLayout
     private val tvDialogShareNext: TextView
+    private val tvDialogShareTips: TextView
 
     private var mOnShareOKListener: OnShareOKListener? = null
+    private var mOnShareCompleteListener: OnShareCompleteListener? = null
 
     private val viewPager: ViewPager
     private val pagerAdapter: SharePagerAdapter
+    private val mViews: ArrayList<View>
 
     private val wechat by lazy { ShareSDK.getPlatform(Wechat.NAME) }
     private val wechatMoments by lazy { ShareSDK.getPlatform(WechatMoments.NAME) }
@@ -62,10 +68,12 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
         llDialogShareWx = findViewById<View>(R.id.llDialogShareWx) as LinearLayout
         llDialogShareQq = findViewById<View>(R.id.llDialogShareQq) as LinearLayout
         tvDialogShareNext = findViewById<View>(R.id.tvDialogShareNext) as TextView
+        tvDialogShareTips = findViewById<View>(R.id.tvDialogShareTips) as TextView
+
         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 view1 = 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) {
         view1.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)
-        val avatar2 = view2.findViewById<ImageView>(R.id.item_iv_avatar)
-        val name1 = view1.findViewById<TextView>(R.id.item_tv_name)
-        val name2 = view2.findViewById<TextView>(R.id.item_tv_name)
-        val info1 = view1.findViewById<TextView>(R.id.item_tv_info)
-        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快点加入跟我一起赚钱吧"
+        mViews = arrayListOf()
+        mViews.add(view1)
+        mViews.add(view2)
+        pagerAdapter = SharePagerAdapter(mViews)
+        viewPager.adapter = pagerAdapter
 
         val cb2 = view2.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) {
 
         })
 
-        val views = arrayListOf<View>()
-        views.add(view1)
-        views.add(view2)
-        pagerAdapter = SharePagerAdapter(views)
-        viewPager.adapter = pagerAdapter
-
         llDialogShareWx.setOnClickListener {
             shareWechat()
         }
@@ -149,9 +132,55 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
         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() {
         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.drawingCacheQuality = View.DRAWING_CACHE_QUALITY_HIGH
         child.buildDrawingCache()
@@ -162,20 +191,32 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
         wechatSp.imageData = bitmap
 
         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()
             wechat.share(wechatSp)
         } else {
             ToastUtil.show(MintsApplication.getContext(), "请先安装微信")
         }
 
-        Timer().schedule(1000,{
+        Timer().schedule(1000) {
             dismiss()
-        })
+        }
     }
 
     private fun shareWechatFavoite() {
         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.drawingCacheQuality = View.DRAWING_CACHE_QUALITY_HIGH
         child.buildDrawingCache()
@@ -186,14 +227,27 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
         wechatSp.imageData = bitmap
 
         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()
             wechatMoments.share(wechatSp)
         } else {
             ToastUtil.show(MintsApplication.getContext(), "请先安装微信")
         }
 
-        Timer().schedule(1000,{
+        Timer().schedule(1000) {
             dismiss()
-        })
+        }
     }
+
 }
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/QRCodeUtil.java

@@ -2,19 +2,15 @@ package com.mints.goodmoney.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.text.TextUtils;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
-import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
-import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.Map;
 
 public class QRCodeUtil {
 
@@ -30,7 +26,7 @@ public class QRCodeUtil {
             Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
             hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
             hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-            hints.put(EncodeHintType.MARGIN, 0);
+            hints.put(EncodeHintType.MARGIN, 1);
 
             BitMatrix bitMatrix = new QRCodeWriter().encode(text,
                     BarcodeFormat.QR_CODE, size, size, hints);

GoodMoney/app/src/main/res/drawable/shape_tab_friends.xml

 <?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" />
-
-    <corners
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp" />
-
-</shape>
+    <!-- 中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <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

+<?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

@@ -42,39 +42,41 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
+                    android:ellipsize="end"
+                    android:lines="1"
                     android:text="@string/dot"
                     android:textColor="@color/black"
                     android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/tv_coin_left"
-                    android:gravity="center_vertical"
-                    android:layout_width="100dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
                     android:drawablePadding="6dp"
+                    android:gravity="center"
                     android:text="@string/dot"
                     android:textSize="16sp"
                     app:drawableStartCompat="@mipmap/ic_coin" />
 
                 <TextView
                     android:id="@+id/tv_bonus_left"
-                    android:layout_width="100dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"
+                    android:gravity="center"
                     android:text="@string/dot"
                     android:textSize="16sp"
                     app:drawableStartCompat="@mipmap/ic_gongxian" />
 
                 <TextView
                     android:id="@+id/tv_invited_left"
-                    android:layout_width="100dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"
+                    android:gravity="center"
                     android:text="@string/dot"
                     android:textSize="16sp"
                     app:drawableStartCompat="@mipmap/ic_invited" />
@@ -95,9 +97,9 @@
             <ImageView
                 android:layout_width="80dp"
                 android:layout_height="80dp"
-                android:layout_marginTop="50dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
+                android:layout_marginTop="48dp"
+                android:paddingStart="26dp"
+                android:paddingEnd="26dp"
                 android:src="@mipmap/icon_exchange" />
 
             <LinearLayout
@@ -124,39 +126,41 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
+                    android:ellipsize="end"
+                    android:lines="1"
                     android:text="@string/dot"
                     android:textColor="@color/black"
                     android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/tv_coin_right"
-                    android:layout_width="100dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
                     android:drawablePadding="6dp"
-                    android:gravity="end|center_vertical"
+                    android:gravity="center"
                     android:text="@string/dot"
                     android:textSize="16sp"
                     app:drawableEndCompat="@mipmap/ic_coin" />
 
                 <TextView
                     android:id="@+id/tv_bonus_right"
-                    android:layout_width="100dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"
-                    android:gravity="end|center_vertical"
+                    android:gravity="center"
                     android:text="@string/dot"
                     android:textSize="16sp"
                     app:drawableEndCompat="@mipmap/ic_gongxian" />
 
                 <TextView
                     android:id="@+id/tv_invited_right"
-                    android:layout_width="100dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"
-                    android:gravity="end|center_vertical"
+                    android:gravity="center"
                     android:text="@string/dot"
                     android:textSize="16sp"
                     app:drawableEndCompat="@mipmap/ic_invited" />

GoodMoney/app/src/main/res/layout/dialog_main.xml

@@ -49,7 +49,7 @@
         <Button
             android:id="@+id/dialog_btn_left"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:background="@null"
             android:gravity="center"
@@ -64,7 +64,7 @@
         <Button
             android:id="@+id/dialog_btn_right"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="50dp"
             android:layout_weight="1"
             android:background="@null"
             android:gravity="center"

GoodMoney/app/src/main/res/layout/dialog_share.xml

@@ -31,7 +31,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="120dp"
+            android:layout_height="110dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -81,6 +81,16 @@
             </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" />
 
         <TextView

GoodMoney/app/src/main/res/layout/fragment_main_my.xml

@@ -28,7 +28,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
                 android:orientation="vertical">
 
                 <include layout="@layout/item_fragment_main_my_title" />
@@ -40,12 +39,16 @@
                 <FrameLayout
                     android:id="@+id/fl_my_banner"
                     android:layout_width="match_parent"
-                    android:layout_height="280dp"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginLeft="4dp"
                     android:layout_marginRight="4dp"
                     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_divider_gray" />
@@ -61,9 +64,7 @@
                     android:nestedScrollingEnabled="false"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-                <include
-                    android:id="@+id/item_customer_service"
-                    layout="@layout/item_fragment_main_my_customer_service" />
+                <include layout="@layout/item_fragment_main_my_customer_service" />
 
             </LinearLayout>
 

GoodMoney/app/src/main/res/layout/item_fragment_main_my_clock.xml

 <?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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="6dp"
     android:layout_marginEnd="6dp"
-    android:background="@mipmap/bg_sign"
-    android:orientation="vertical">
+    android:background="@mipmap/bg_sign">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <ImageView
+        android:id="@+id/item_clock_sign"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
         android:layout_marginStart="30dp"
         android:layout_marginTop="30dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/item_clock_sign"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:src="@mipmap/ic_sign_icon" />
+        android:layout_marginBottom="10dp"
+        android:src="@mipmap/ic_sign_icon"
+        app:layout_constraintBottom_toTopOf="@+id/item_clock_signview"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/item_clock_signday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
+    <TextView
+        android:id="@+id/item_clock_signday"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/item_clock_sign"
+        app:layout_constraintStart_toEndOf="@+id/item_clock_sign"
+        app:layout_constraintTop_toTopOf="@+id/item_clock_sign" />
 
     <com.mints.goodmoney.ui.widgets.SignView
         android:id="@+id/item_clock_signview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp" />
+        android:layout_marginStart="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

GoodMoney/app/src/main/res/layout/item_fragment_main_my_customer_service.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView
-        android:id="@+id/item_bottom_text"
+        android:id="@+id/item_customer_service"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"
         android:text="官方QQ群(点击咨询)：" />
 
     <TextView
         android:id="@+id/item_bottom_qqGroupNum"
         android:layout_width="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

GoodMoney/app/src/main/res/layout/item_fragment_main_my_promotions.xml

@@ -3,6 +3,7 @@
     android:id="@+id/item_promotions_egv"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:visibility="gone"
     android:layout_marginTop="10dp"
     android:layout_marginBottom="16dp"
     android:columnWidth="80dp"

GoodMoney/app/src/main/res/layout/item_share_view.xml

@@ -21,7 +21,7 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="10dp" />
+                android:layout_marginEnd="6dp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -35,12 +35,13 @@
                     android:layout_width="90dp"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
+                    android:lines="1"
                     android:textColor="@color/black"
-                    android:textSize="10sp" />
+                    android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/item_tv_info"
-                    android:layout_width="90dp"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:layout_marginBottom="2dp"
@@ -52,7 +53,8 @@
                 android:id="@+id/item_iv_qrcode"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_alignParentEnd="true" />
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true" />
 
         </RelativeLayout>