Skip to content

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

页面样式更新

parent 1208ee59
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 145 deletions
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/FriendsPresenter.kt
View file @ ebb71992
package com.mints.goodmoney.mvp.presenters
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.AppHttpManager
import com.mints.goodmoney.mvp.model.BaseResponse
import com.mints.goodmoney.mvp.model.FriendsTaskBean
import com.mints.goodmoney.mvp.views.FriendsView
import com.mints.library.net.neterror.BaseSubscriber
import com.mints.library.net.neterror.Throwable
import java.util.HashMap
class FriendsPresenter : BasePresenter<FriendsView>() {
......@@ -14,7 +16,7 @@ class FriendsPresenter : BasePresenter<FriendsView>() {
*/
fun getLeaders() {
AppHttpManager.getInstance(loanApplication)
.call(loanService.leaders, object : BaseSubscriber<BaseResponse< FriendsTaskBean.FriendsBean>>() {
.call(loanService.leaders, object : BaseSubscriber<BaseResponse<FriendsTaskBean.FriendsBean>>() {
override fun onCompleted() {
if (isLinkView) return
}
......@@ -23,10 +25,10 @@ class FriendsPresenter : BasePresenter<FriendsView>() {
if (isLinkView) return
}
override fun onNext(baseResponse: BaseResponse< FriendsTaskBean.FriendsBean>) {
override fun onNext(baseResponse: BaseResponse<FriendsTaskBean.FriendsBean>) {
if (isLinkView) return
when (baseResponse.status) {
200 -> view.getWorldRank(baseResponse.data)
200 -> view.getWorldRankSuc(baseResponse.data)
}
}
})
......@@ -50,12 +52,39 @@ class FriendsPresenter : BasePresenter<FriendsView>() {
if (isLinkView) return
when (baseResponse.status) {
200 -> {
view.getFriendsRank(baseResponse.data)
view.getFriendsRankSuc(baseResponse.data)
}
}
}
})
}
/**
* 设置邀请成功
*
*/
fun cmtShareStatus() {
val vo = HashMap<String, Any>()
vo["carrierType"] = Constant.CHALLENGE_SHAREFRIEND
vo["value"] = "1"
AppHttpManager.getInstance(loanApplication)
.call(loanService.setStatusInOneDayByCarrierType(vo), object : BaseSubscriber<BaseResponse<Any>>() {
override fun onCompleted() {
if (isLinkView) return
}
override fun onError(e: Throwable) {
if (isLinkView) return
}
override fun onNext(baseResponse: BaseResponse<Any>) {
if (isLinkView) return
when (baseResponse.status) {
// 200 -> baseMsg()
}
}
})
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/views/FriendsView.kt
View file @ ebb71992
......@@ -4,8 +4,8 @@ import com.mints.goodmoney.mvp.model.FriendsTaskBean
interface FriendsView : BaseView {
fun getWorldRank(data: FriendsTaskBean.FriendsBean)
fun getWorldRankSuc(data: FriendsTaskBean.FriendsBean)
fun getFriendsRank(data: FriendsTaskBean)
fun getFriendsRankSuc(data: FriendsTaskBean)
}
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SettingsActivity.kt
View file @ ebb71992
package com.mints.goodmoney.ui.activitys
import android.os.Bundle
import android.view.Gravity
import android.view.LayoutInflater
import android.view.View
import android.view.Window
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import android.widget.ImageView
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.ui.activitys.base.BaseActivity
import com.mints.goodmoney.ui.widgets.CustomDialogAsApple
import com.mints.goodmoney.ui.widgets.DialogListener
import com.mints.goodmoney.utils.CacheUtil
import kotlinx.android.synthetic.main.activity_settings.*
import kotlinx.android.synthetic.main.header_layout.*
class SettingsActivity : BaseActivity(), View.OnClickListener {
private var cdaa: CustomDialogAsApple? = null
private val userManager by lazy { UserManager.getInstance() }
override fun initViewsAndEvents() {
......@@ -41,7 +43,7 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
item_phone.findViewById<TextView>(R.id.tv_title).text = "手机号"
val phone = resources.getDrawable(R.mipmap.icon_settings_tel)
phone.setBounds(0, 0, 50, 50)
phone.setBounds(0, 0, 56, 56)
item_phone.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(phone, null, null, null)
item_phone.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
item_phone.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
......@@ -53,23 +55,23 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
item_wechat.findViewById<TextView>(R.id.tv_title).text = "微信号"
val wechat = resources.getDrawable(R.mipmap.icon_settings_wechat)
wechat.setBounds(0, 0, 50, 50)
wechat.setBounds(0, 0, 56, 56)
item_wechat.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(wechat, null, null, null)
item_wechat.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
item_wechat.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
item_invitedCode.findViewById<TextView>(R.id.tv_title).text = "邀请码"
val invitedCode = resources.getDrawable(R.mipmap.icon_settings_invite)
invitedCode.setBounds(0, 0, 50, 50)
item_invitedCode.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(invitedCode, null, null, null)
item_invitedCode.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
item_invitedCode.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
item_invitedCode.findViewById<TextView>(R.id.tv_right).text = "填写邀请码 海量金币等你拿"
// item_invitedCode.findViewById<TextView>(R.id.tv_title).text = "邀请码"
// val invitedCode = resources.getDrawable(R.mipmap.icon_settings_invite)
// invitedCode.setBounds(0, 0, 56, 56)
// item_invitedCode.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(invitedCode, null, null, null)
// item_invitedCode.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
// item_invitedCode.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
// item_invitedCode.findViewById<TextView>(R.id.tv_right).text = "填写邀请码 海量金币等你拿"
item_cleanCache.findViewById<TextView>(R.id.tv_title).text = "清理缓存"
val cleanCache = resources.getDrawable(R.mipmap.icon_settings_clean)
cleanCache.setBounds(0, 0, 50, 50)
cleanCache.setBounds(0, 0, 56, 56)
item_cleanCache.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(cleanCache, null, null, null)
item_cleanCache.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
item_cleanCache.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
......@@ -77,21 +79,21 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
item_userAgree.findViewById<TextView>(R.id.tv_title).text = "服务协议"
val userAgree = resources.getDrawable(R.mipmap.icon_settings_user)
userAgree.setBounds(0, 0, 50, 50)
userAgree.setBounds(0, 0, 56, 56)
item_userAgree.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(userAgree, null, null, null)
item_userAgree.findViewById<TextView>(R.id.tv_right).visibility = View.GONE
item_userAgree.findViewById<ImageView>(R.id.iv_right).visibility = View.VISIBLE
item_privacyAgree.findViewById<TextView>(R.id.tv_title).text = "隐私协议"
val privacyAgree = resources.getDrawable(R.mipmap.icon_settings_privacy)
privacyAgree.setBounds(0, 0, 50, 50)
privacyAgree.setBounds(0, 0, 56, 56)
item_privacyAgree.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(privacyAgree, null, null, null)
item_privacyAgree.findViewById<TextView>(R.id.tv_right).visibility = View.GONE
item_privacyAgree.findViewById<ImageView>(R.id.iv_right).visibility = View.VISIBLE
item_aboutUs.findViewById<TextView>(R.id.tv_title).text = "关于我们"
val aboutUs = resources.getDrawable(R.mipmap.icon_settings_about)
aboutUs.setBounds(0, 0, 50, 50)
aboutUs.setBounds(0, 0, 56, 56)
item_aboutUs.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(aboutUs, null, null, null)
item_aboutUs.findViewById<TextView>(R.id.tv_right).visibility = View.GONE
item_aboutUs.findViewById<ImageView>(R.id.iv_right).visibility = View.VISIBLE
......@@ -114,7 +116,7 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
}
}
R.id.item_invitedCode -> {
submitInvitedCode()
}
R.id.item_cleanCache -> {
clearDialog()
......@@ -144,47 +146,59 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
}
private fun submitInvitedCode() {
cdaa = CustomDialogAsApple(context, object : DialogListener() {
override fun onClick(v: View) {
when (v.id) {
R.id.dialog_btn_right -> {
val view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_invite, null)
val etInput = view.findViewById<EditText>(R.id.et_input)
val dialog = AlertDialog.Builder(this)
.setTitle("请输入邀请码")
.setPositiveButton("确定") { dialog, which ->
if (etInput.text.isEmpty()) {
showToast("请输入邀请码")
} else {
dialog.dismiss()
}
}
cdaa?.dismiss()
cdaa = null
}
})
cdaa?.let {
it.setContent("提交邀请码")
it.setLeft("取消")
it.setRight("确认")
it.show()
}
.setNegativeButton("取消") { dialog, which ->
dialog.dismiss()
}
.create()
dialog.setOnShowListener {
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
imm.showSoftInput(etInput, InputMethodManager.SHOW_IMPLICIT)
}
dialog.setView(view)
// val window = dialog.window
// window?.setGravity(Gravity.CENTER)
// window?.setWindowAnimations(R.style.DialogAnimBottom)
dialog.show()
}
private fun clearDialog() {
cdaa = CustomDialogAsApple(context, object : DialogListener() {
override fun onClick(v: View) {
when (v.id) {
R.id.dialog_btn_right ->
try {
CacheUtil.clearAllCache(context)
item_cleanCache.findViewById<TextView>(R.id.tv_right).text = "0KB"
} catch (e: Exception) {
e.printStackTrace()
}
val dialog = AlertDialog.Builder(this)
.setTitle("确定清除缓存吗?")
.setPositiveButton("确定") { dialog, _ ->
try {
CacheUtil.clearAllCache(context)
item_cleanCache.findViewById<TextView>(R.id.tv_right).text = "0KB"
} catch (e: Exception) {
e.printStackTrace()
} finally {
dialog.dismiss()
}
}
.setNegativeButton("取消") { dialog, _ ->
dialog.dismiss()
}
.create()
cdaa?.dismiss()
}
})
cdaa?.let {
it.setContent("确定清除缓存吗?")
it.setLeft("取消")
it.setRight("清除")
it.show()
}
val window = dialog.window
window?.setGravity(Gravity.CENTER)
window?.setWindowAnimations(R.style.DialogAnimBottom)
dialog.show()
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/base/BaseActivity.java
View file @ ebb71992
......@@ -8,7 +8,9 @@ import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.os.Build;
import android.os.Bundle;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.MotionEvent;
......@@ -41,7 +43,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
try {
if (TextUtils.equals(getClass().getSimpleName(), "SplashActivity") ||
TextUtils.equals(getClass().getSimpleName(), "GuideActivity") ) {
TextUtils.equals(getClass().getSimpleName(), "GuideActivity")) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
} else {
......@@ -87,7 +89,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
// 根据EditText所在坐标和用户点击的坐标相对比，来判断是否隐藏键盘
private boolean HideKeyboard(View view, MotionEvent event) {
if (view != null && (view instanceof EditText)) {
if (view instanceof EditText) {
int[] location = {0, 0};
view.getLocationInWindow(location);
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/BannerTaskAdapter.kt
View file @ ebb71992
......@@ -14,7 +14,7 @@ class BannerTaskAdapter(context: Context) : BannerBaseAdapter<FriendsTaskBean.Ch
override fun convert(convertView: View, data: FriendsTaskBean.ChallengeBean.ListBean) {
convertView.findViewById<TextView>(R.id.item_bv_friends_task_title).text = data.title
convertView.findViewById<TextView>(R.id.item_bv_friends_task_info).text = data.remarks
convertView.findViewById<Button>(R.id.item_bv_friends_task_btn).text = data.button
convertView.findViewById<TextView>(R.id.item_bv_friends_task_btn).text = data.button
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/InvitedAdapter.kt
View file @ ebb71992
......@@ -11,32 +11,50 @@ import com.mints.goodmoney.R
import com.mints.goodmoney.mvp.model.FriendsTaskBean
import com.mints.library.utils.GlideUtils
class InvitedAdapter : RecyclerView.Adapter<InvitedAdapter.InvitedHolder> {
class InvitedAdapter(context: Context, invitedData: MutableList<FriendsTaskBean.FriendsBean.ListBeanX>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
constructor(context: Context, invitedData: MutableList<FriendsTaskBean.FriendsBean.ListBeanX>) {
mContext = context
this.invitedData = invitedData
companion object {
const val HOLDER_TYPE_EMPTY = 0
const val HOLDER_TYPE_INVITED = 1
}
private var mContext: Context
private var invitedData: List<FriendsTaskBean.FriendsBean.ListBeanX>? = null
private var mContext: Context = context
private var invitedData: List<FriendsTaskBean.FriendsBean.ListBeanX> = invitedData
private var mOnItemClickListener: OnItemClickListener? = null
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InvitedHolder {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
if (viewType == HOLDER_TYPE_EMPTY) {
val emptyView = LayoutInflater.from(parent.context).inflate(R.layout.item_empty, parent, false)
return EmptyHolder(emptyView)
}
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_recy_invited, parent, false)
return InvitedHolder(view)
}
override fun getItemCount(): Int {
return if (invitedData == null) {
0
return if (invitedData.isEmpty()) {
1
} else {
invitedData!!.size
invitedData.size
}
}
override fun getItemViewType(position: Int): Int {
if (invitedData.isEmpty()) {
return HOLDER_TYPE_EMPTY
}
return HOLDER_TYPE_INVITED
}
override fun onBindViewHolder(holder: InvitedHolder, position: Int) {
override fun onBindViewHolder(viewHolder: RecyclerView.ViewHolder, position: Int) {
if (viewHolder is EmptyHolder) {
return
}
val holder = viewHolder as InvitedHolder
when (position) {
0 -> {
holder.tvNum.visibility = View.GONE
......@@ -56,12 +74,12 @@ class InvitedAdapter : RecyclerView.Adapter<InvitedAdapter.InvitedHolder> {
else -> {
holder.tvNum.visibility = View.VISIBLE
holder.ivRanking.visibility = View.GONE
holder.tvNum.text = "" + position + 1
holder.tvNum.text = "" + (position + 1)
}
}
val data = invitedData!![position]
GlideUtils.loadImageViewLoding(mContext, data.head, holder.ivAvatar, R.mipmap.ic_avatar_ph, R.mipmap.ic_avatar_ph)
if (data.nickName.isNotEmpty()) {
val data = invitedData[position]
GlideUtils.loadCircleImageView(mContext, data.head, holder.ivAvatar, R.mipmap.ic_avatar_ph, R.mipmap.ic_avatar_ph)
if (data.nickName != null) {
holder.tvName.text = data.nickName
} else {
holder.tvName.text = data.mobile
......@@ -75,6 +93,8 @@ class InvitedAdapter : RecyclerView.Adapter<InvitedAdapter.InvitedHolder> {
}
}
inner class EmptyHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
inner class InvitedHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val tvNum: TextView = itemView.findViewById(R.id.item_invited_tv_num)
val ivAvatar: ImageView = itemView.findViewById(R.id.item_invited_iv_avatar)
......@@ -91,4 +111,5 @@ class InvitedAdapter : RecyclerView.Adapter<InvitedAdapter.InvitedHolder> {
fun setOnItemClickListener(listener: OnItemClickListener) {
mOnItemClickListener = listener
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt
View file @ ebb71992
package com.mints.goodmoney.ui.fragment
import android.graphics.Typeface
import android.os.Bundle
import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.DividerItemDecoration
import cn.sharesdk.framework.Platform
import cn.sharesdk.framework.PlatformActionListener
import cn.sharesdk.framework.ShareSDK
import cn.sharesdk.wechat.friends.Wechat
import com.mints.goodmoney.R
import com.mints.goodmoney.common.AppConfig
import com.mints.goodmoney.common.Constant
......@@ -12,23 +18,26 @@ import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.mvp.model.FriendsTaskBean
import com.mints.goodmoney.mvp.presenters.FriendsPresenter
import com.mints.goodmoney.mvp.views.FriendsView
import com.mints.goodmoney.ui.activitys.AwardActivity
import com.mints.goodmoney.ui.adapter.BannerBaseAdapter
import com.mints.goodmoney.ui.adapter.BannerTaskAdapter
import com.mints.goodmoney.ui.adapter.InvitedAdapter
import com.mints.goodmoney.ui.fragment.base.BaseFragment
import com.mints.goodmoney.ui.widgets.tablayout.TabLayout
import com.mints.goodmoney.utils.ImageUtil
import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.listener.OnRefreshListener
import kotlinx.android.synthetic.main.fragment_main_friends.*
import kotlinx.android.synthetic.main.fragment_main_friends.srl_my
import kotlinx.android.synthetic.main.header_layout.*
import java.util.HashMap
/**
* 描述：邀请好友
* 作者：孟崔广
* 时间：2020/9/20 17:30
*/
class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener {
class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, PlatformActionListener {
private val friendsPresenter by lazy { FriendsPresenter() }
......@@ -53,17 +62,18 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener {
private fun initView() {
tv_title.text = "邀请好友"
view_title1.findViewById<TextView>(R.id.view_title).text = "邀好友 做任务 赚现金"
img_invite.setOnClickListener {
invitedFriends()
}
}
private fun initRecy() {
tab_friends.addTab(tab_friends.newTab().setText("我的好友").setTag("my_friends"))
tab_friends.addTab(tab_friends.newTab().setText("世界人民").setTag("world_person"))
tab_friends.setOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
override fun onTabReselected(tab: TabLayout.Tab?) {}
override fun onTabReselected(tab: TabLayout.Tab) {}
override fun onTabUnselected(tab: TabLayout.Tab?) {
override fun onTabUnselected(tab: TabLayout.Tab) {
val title =
((tab_friends.getChildAt(0) as LinearLayout).getChildAt(tab!!.position) as LinearLayout).getChildAt(
1
......@@ -74,7 +84,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener {
}
}
override fun onTabSelected(tab: TabLayout.Tab?) {
override fun onTabSelected(tab: TabLayout.Tab) {
val title =
((tab_friends.getChildAt(0) as LinearLayout).getChildAt(tab!!.position) as LinearLayout).getChildAt(
1
......@@ -84,9 +94,9 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener {
typeface = Typeface.defaultFromStyle(Typeface.BOLD)
}
tab?.let {
tab.let {
if (it.tag == "my_friends") {
friendsPresenter.getFriendsMsg()
} else {
friendsPresenter.getLeaders()
}
......@@ -111,7 +121,9 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener {
bannerTaskAdapter?.let {
it.setOnPageTouchListener(object : BannerBaseAdapter.OnPageTouchListener<FriendsTaskBean.ChallengeBean.ListBean> {
override fun onPageClick(position: Int, t: FriendsTaskBean.ChallengeBean.ListBean?) {
if (t?.status == 0) {
invitedFriends()
}
}
override fun onPageDown() {
......@@ -165,15 +177,59 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener {
}
}
override fun getWorldRank(data: FriendsTaskBean.FriendsBean) {
private fun invitedFriends() {
val wechatSp = Platform.ShareParams()
wechatSp.shareType = Platform.SHARE_IMAGE
wechatSp.imageData = ImageUtil.drawableToBitmap(ContextCompat.getDrawable(mContext, R.mipmap.ic_launcher))
val wechat = ShareSDK.getPlatform(Wechat.NAME)
if (wechat.isClientValid) {
friendsPresenter.cmtShareStatus()
wechat.platformActionListener = this // 设置分享事件回调
// 执行图文分享
wechat.share(wechatSp)
} else {
showToast("请先安装微信")
}
}
override fun getWorldRankSuc(data: FriendsTaskBean.FriendsBean) {
srl_my.finishRefresh(true)
// if (data.list.size == 0) {
// iv_empty.visibility = View.VISIBLE
// recy_friends.visibility = View.GONE
// } else {
// iv_empty.visibility = View.GONE
// recy_friends.visibility = View.VISIBLE
invitedData.clear()
invitedData.addAll(data.list)
invitedAdapter?.notifyDataSetChanged()
// }
}
override fun getFriendsRank(data: FriendsTaskBean) {
override fun getFriendsRankSuc(data: FriendsTaskBean) {
srl_my.finishRefresh(true)
bvTaskData = data.challenge.list
bannerTaskAdapter?.setData(bvTaskData)
if (tab_friends.selectedTabPosition == 0) {
invitedData.clear()
invitedData.addAll(data.friends.list)
invitedAdapter?.notifyDataSetChanged()
}
}
override fun onComplete(p0: Platform?, p1: Int, p2: HashMap<String, Any>?) {
val bundle = Bundle()
bundle.putInt(Constant.MAIN_CUR_COIN, 50)
bundle.putString(Constant.MAIN_CARRIER_TYPE, Constant.CHALLENGE_SHAREFRIEND)
readyGo(AwardActivity::class.java, bundle)
}
override fun onError(p0: Platform?, p1: Int, p2: Throwable?) = showToast("邀请取消")
override fun onCancel(p0: Platform?, p1: Int) = showToast("邀请取消")
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @ ebb71992
......@@ -139,7 +139,7 @@ class MyFragment : BaseFragment(), MyView, MainMyAdapter.OnItemChildClickListene
}
override fun getUserTaskMsgSuc(data: MyInfo?) {
if (srl_my != null) srl_my.finishRefresh(true)
srl_my.finishRefresh(true)
if (data == null) {
userConfig = null
......@@ -154,7 +154,7 @@ class MyFragment : BaseFragment(), MyView, MainMyAdapter.OnItemChildClickListene
}
override fun getUserTaskMsgFail() {
if (srl_my != null) srl_my.finishRefresh(false)
srl_my.finishRefresh(false)
userConfig = null
item_promotions_egv.visibility = View.GONE
......@@ -164,9 +164,9 @@ class MyFragment : BaseFragment(), MyView, MainMyAdapter.OnItemChildClickListene
override fun getMyHotActivitySuc(data: BannerBean?) {
// if (UserManager.getInstance().adShowFlag) {
data?.let {
item_promotions_egv.visibility = View.VISIBLE
hotList = it.list
item_promotions_egv.adapter = GvMyAdapter(mContext, hotList)
// item_promotions_egv.visibility = View.VISIBLE
// hotList = it.list
// item_promotions_egv.adapter = GvMyAdapter(mContext, hotList)
}
// } else {
// item_promotions_egv.visibility = View.GONE
......@@ -314,9 +314,11 @@ class MyFragment : BaseFragment(), MyView, MainMyAdapter.OnItemChildClickListene
}
private fun setUserLoginStatus() {
val code = userConfig!!.userMsg.idcode
if (code.isNotEmpty()) {
item_title_invitecode.text = "邀请码：$code"
if (userConfig != null) {
val code = userConfig!!.userMsg.idcode
if (code.isNotEmpty()) {
item_title_invitecode.text = "邀请码：$code"
}
}
if (userManager.userIsLogin()) {
......@@ -385,10 +387,10 @@ class MyFragment : BaseFragment(), MyView, MainMyAdapter.OnItemChildClickListene
val task6 = TaskBean(R.mipmap.icon_my_demo, "试玩平台", "", "", 5)
dataList.add(task1)
dataList.add(task2)
dataList.add(task3)
dataList.add(task4)
dataList.add(task5)
dataList.add(task6)
// dataList.add(task3)
// dataList.add(task4)
// dataList.add(task5)
// dataList.add(task6)
mainMyAdapter?.notifyDataSetChanged()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/SignView.java
View file @ ebb71992
......@@ -187,7 +187,8 @@ public class SignView extends LinearLayout implements View.OnClickListener {
tvContent.setBackground(resources.getDrawable(R.mipmap.ic_sign_newgift_close));
} else {
tvContent.setBackground(resources.getDrawable(R.mipmap.ic_sign_finish));
tvContent.setTextColor(resources.getColor(R.color.my_color_orange2));
tvContent.setBackground(resources.getDrawable(R.mipmap.ic_sign_nofinish));
}
tvDay.setTextColor(resources.getColor(R.color.black));
break;
......
GoodMoney/app/src/main/java/com/mints/library/utils/GlideUtils.java
View file @ ebb71992
......@@ -47,6 +47,15 @@ public class GlideUtils {
Glide.with(mContext).load(path).apply(requestOptions).into(mImageView);
}
//设置加载中以及加载失败圆形图片
public static void loadCircleImageView(Context mContext, String path, ImageView mImageView, int lodingImage, int errorImageView) {
RequestOptions requestOptions = new RequestOptions();
requestOptions.placeholder(lodingImage);
requestOptions.error(errorImageView);
requestOptions.circleCrop();
Glide.with(mContext).load(path).apply(requestOptions).into(mImageView);
}
//加载Gif
public static void loadImageViewGif(Context mContext, int drawable, ImageView imageView) {
Glide.with(mContext).load(drawable).into(imageView);
......
GoodMoney/app/src/main/res/drawable/shape_dialog_bg.xml 0 → 100755
View file @ ebb71992
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<corners android:radius="5dip" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/activity_settings.xml
View file @ ebb71992
......@@ -16,7 +16,8 @@
<include
android:id="@+id/item_invitedCode"
layout="@layout/item_settings" />
layout="@layout/item_settings"
android:visibility="gone" />
<include
android:id="@+id/item_cleanCache"
......
GoodMoney/app/src/main/res/layout/dialog_edit_invite.xml 0 → 100644
View file @ ebb71992
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText
android:id="@+id/et_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:hint="请输入邀请码"
android:inputType="number" />
</FrameLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/dialog_main.xml
View file @ ebb71992
......@@ -3,7 +3,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="30dp"
android:background="@color/white"
android:background="@drawable/shape_dialog_bg"
android:gravity="center">
<TextView
......@@ -16,7 +16,7 @@
android:gravity="center"
android:singleLine="true"
android:textColor="@color/dialog_text_color"
android:textSize="15sp"
android:textSize="16sp"
android:visibility="gone" />
<TextView
......@@ -32,7 +32,7 @@
android:scrollbars="vertical"
android:singleLine="false"
android:textColor="@color/dialog_text_color"
android:textSize="13sp" />
android:textSize="14sp" />
<View
style="@style/line_1"
......
GoodMoney/app/src/main/res/layout/fragment_main_friends.xml
View file @ ebb71992
......@@ -59,20 +59,8 @@
<include layout="@layout/item_divider_gray" />
<!-- <com.mints.goodmoney.ui.widgets.BannerView-->
<!-- android:id="@+id/bv_friends_banner"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="100dp"-->
<!-- app:bannerAnimDuration="1500"-->
<!-- app:bannerAnimScroll="true"-->
<!-- app:bannerAutoScroll="true"-->
<!-- app:bannerPageAlpha="0"-->
<!-- app:bannerPageMargin="8dp"-->
<!-- app:bannerPagePercent="0.9"-->
<!-- app:bannerPageScale="0.8"-->
<!-- app:bannerScrollDuration="4000" />-->
<ImageView
android:id="@+id/img_invite"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="15dp"
......@@ -91,8 +79,8 @@
android:layout_height="56dp"
android:layout_gravity="center_horizontal"
app:indicatorEndColor="#e73820"
app:indicatorMarginEnd="20dp"
app:indicatorMarginStart="20dp"
app:indicatorMarginEnd="24dp"
app:indicatorMarginStart="24dp"
app:indicatorStartColor="#d6694e"
app:tabIndicatorHeight="4dp"
app:tabMode="scrollable"
......@@ -100,6 +88,11 @@
app:tabTextAppearance="@style/TabLayoutTextSize"
app:tabTextColor="@color/main_bg_text" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
......
GoodMoney/app/src/main/res/layout/fragment_main_my.xml
View file @ ebb71992
......@@ -13,7 +13,6 @@
android:id="@+id/srl_my"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/blue"
app:srlAccentColor="@color/gray"
app:srlPrimaryColor="@color/white">
......@@ -22,9 +21,9 @@
android:layout_height="wrap_content" />
<androidx.core.widget.NestedScrollView
android:overScrollMode="never"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
......@@ -38,9 +37,13 @@
<include layout="@layout/item_divider_gray" />
<include layout="@layout/item_fragment_main_my_promotions" />
<include
layout="@layout/item_fragment_main_my_promotions"
android:visibility="gone" />
<include layout="@layout/item_divider_gray" />
<include
layout="@layout/item_divider_gray"
android:visibility="gone" />
<include layout="@layout/view_title" />
......@@ -53,7 +56,9 @@
android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<include layout="@layout/item_fragment_main_my_bottom" />
<include
layout="@layout/item_fragment_main_my_bottom"
android:visibility="gone" />
</LinearLayout>
......
GoodMoney/app/src/main/res/layout/item_bv_friends_task.xml
View file @ ebb71992
......@@ -40,12 +40,13 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/item_bv_friends_task_iv" />
<Button
<TextView
android:id="@+id/item_bv_friends_task_btn"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_btn_orange"
android:gravity="center"
android:text="去邀请"
android:textColor="@color/my_color_orange"
app:layout_constraintBottom_toBottomOf="parent"
......
GoodMoney/app/src/main/res/layout/item_empty.xml 0 → 100644
View file @ ebb71992
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="200dp"
android:src="@mipmap/ic_record_empty" />
</FrameLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_fragment_main_my_task.xml
View file @ ebb71992
......@@ -23,31 +23,30 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginBottom="6dp"
android:text="首次喝水打卡"
android:textColor="@color/black"
android:textSize="16sp" />
android:textSize="15sp" />
<TextView
android:id="@+id/item_task_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginStart="6dp"
android:layout_toEndOf="@+id/item_task_title"
android:gravity="center_vertical"
android:text="1000"
android:textColor="@color/black"
android:textSize="16sp" />
android:textSize="15sp" />
</RelativeLayout>
<TextView
android:id="@+id/item_task_click"
android:layout_width="80dp"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_btn_orange"
android:gravity="center"
android:text="立即领取"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:textColor="@color/my_color_orange"
android:textSize="14sp" />
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_fragment_main_my_title.xml
View file @ ebb71992
......@@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:textColor="@color/my_color_orange"
android:textSize="30sp" />
android:textSize="28sp" />
<Button
android:id="@+id/btn_withdraw"
......
GoodMoney/app/src/main/res/layout/item_recy_invited.xml
View file @ ebb71992
......@@ -15,9 +15,12 @@
<TextView
android:id="@+id/item_invited_tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1" />
android:layout_width="30dp"
android:layout_height="30dp"
android:gravity="center"
android:textColor="@color/black_text"
android:textSize="@dimen/font_size_16"
android:visibility="gone" />
<ImageView
android:id="@+id/item_invited_iv_avatar"
......@@ -31,7 +34,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:text="我的好友"
android:textColor="@color/black_text"
android:textSize="16sp" />
......@@ -39,13 +41,13 @@
android:id="@+id/item_invited_tv_coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="999999"
android:textColor="@color/my_color_orange"
android:textSize="20sp" />
android:textSize="22sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="金币"
android:textColor="@color/my_color_orange"
android:textSize="14sp" />
......
GoodMoney/app/src/main/res/layout/view_sign.xml
View file @ ebb71992
......@@ -7,10 +7,10 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="14dp"
android:layout_marginTop="-7dp"
android:layout_marginEnd="27dp"
android:background="@color/order_hint_color" />
android:layout_marginStart="20dp"
android:layout_marginTop="-10dp"
android:layout_marginEnd="20dp"
android:background="@color/color_F5F" />
<LinearLayout
android:layout_width="match_parent"
......
GoodMoney/app/src/main/res/values/colors.xml
View file @ ebb71992
......@@ -152,6 +152,7 @@
<color name="my_color_black">#343C4F</color>
<color name="my_color_orange">#FB560C</color>
<color name="my_color_orange2">#EBB20D</color>
<color name="color_999">#999999</color>
<color name="color_555">#555555</color>
<color name="color_F5F">#F5F5F5</color>
......
GoodMoney/app/src/main/res/values/styles.xml
View file @ ebb71992
......@@ -121,7 +121,7 @@
<!--默认Tablayout字体大小-->
<style name="TabLayoutTextSize">
<item name="android:textSize">@dimen/font_size_18</item>
<item name="android:textSize">@dimen/font_size_16</item>
</style>
<!--设置Tablayout字体加粗-->
<style name="TabLayoutTextStyle">
......
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