Skip to content

A
android_vediosocial
Commit ac61e180 authored by jyx's avatar jyx
Browse files
Options

更新页面样式UI

parent 4bec4cec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1033 additions and 736 deletions
video/app/src/main/AndroidManifest.xml
View file @ ac61e180
......@@ -154,7 +154,7 @@
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activitys.AboutusActivity"
android:name=".ui.activitys.AboutUsActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
......
video/app/src/main/java/com/duben/roseplaylet/mvp/model/ShareRank.kt
View file @ ac61e180
......@@ -11,10 +11,19 @@ data class ShareRank(
val share: Int
) : java.io.Serializable
data class ShareInvite(
val nickName: String,
val head: String,
val status: String,
val sex: String,
val cash: Int
data class SharePageMsg(
val shareCode: String = "",
val rUserShareCode: String = "",
val allCash: String = "",
val canCash: String = "",
val count: Int = 0,
val list: ArrayList<ShareUserMsg> = arrayListOf(),
) : java.io.Serializable
data class ShareUserMsg(
val cash: String = "",
val sex: String = "",
val nickName: String = "",
val status: String = "",
val head: String = "",
) : java.io.Serializable
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/InvitePresenter.kt
View file @ ac61e180
......@@ -4,6 +4,7 @@ import com.duben.library.net.neterror.BaseSubscriber
import com.duben.library.net.neterror.Throwable
import com.duben.roseplaylet.manager.AppHttpManager
import com.duben.roseplaylet.mvp.model.BaseResponse
import com.duben.roseplaylet.mvp.model.SharePageMsg
import com.duben.roseplaylet.mvp.model.ShareRankList
import com.duben.roseplaylet.mvp.views.InviteView
import com.google.gson.JsonObject
......@@ -13,7 +14,7 @@ class InvitePresenter : BasePresenter<InviteView>() {
fun getSharePageMsg() {
AppHttpManager.getInstance(loanApplication)
.call(loanService.sharePageMsg,
object : BaseSubscriber<BaseResponse<JsonObject>>() {
object : BaseSubscriber<BaseResponse<SharePageMsg>>() {
override fun onCompleted() {
if (isLinkView) return
}
......@@ -24,7 +25,7 @@ class InvitePresenter : BasePresenter<InviteView>() {
view.getSharePageMsgFail()
}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
override fun onNext(baseResponse: BaseResponse<SharePageMsg>) {
if (isLinkView) return
val code = baseResponse.status
......@@ -32,10 +33,7 @@ class InvitePresenter : BasePresenter<InviteView>() {
when (code) {
200 -> {
view.getSharePageMsgSuc(
baseResponse.data.get("shareCode").asString,
baseResponse.data.get("rUserShareCode").asString
)
view.getSharePageMsgSuc(baseResponse.data)
}
else -> {
view.showToast(message)
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/VipPresenter.kt
View file @ ac61e180
......@@ -17,7 +17,7 @@ class VipPresenter : BasePresenter<VipView>() {
val vo = HashMap<String, Any>()
vo["os"] = "android"
AppHttpManager.getInstance(loanApplication)
.call(loanService.getMyInfo(vo),
.call(loanService.getBaseMsg(vo),
object : BaseSubscriber<BaseResponse<UserBean>>() {
override fun onCompleted() {
......
video/app/src/main/java/com/duben/roseplaylet/mvp/views/InviteView.kt
View file @ ac61e180
package com.duben.roseplaylet.mvp.views
import com.duben.roseplaylet.mvp.model.SharePageMsg
import com.duben.roseplaylet.mvp.model.ShareRankList
interface InviteView : BaseView {
fun getSharePageMsgSuc(shareCode: String, rUserShareCode: String?)
fun getSharePageMsgSuc(sharePageMsg: SharePageMsg)
fun getSharePageMsgFail()
fun getShareOrderSuc(data: ShareRankList)
......
video/app/src/main/java/com/duben/roseplaylet/net/LoanService.java
View file @ ac61e180
......@@ -9,7 +9,9 @@ import com.duben.roseplaylet.mvp.model.FaceParam;
import com.duben.roseplaylet.mvp.model.HallList;
import com.duben.roseplaylet.mvp.model.RecommendBannerList;
import com.duben.roseplaylet.mvp.model.SeeWechat;
import com.duben.roseplaylet.mvp.model.SharePageMsg;
import com.duben.roseplaylet.mvp.model.ShareRankList;
import com.duben.roseplaylet.mvp.model.UserHallMsg;
import com.duben.roseplaylet.mvp.model.UserList;
import com.duben.roseplaylet.mvp.model.UserProfileData;
import com.duben.roseplaylet.mvp.model.UserProfileDataInfo;
......@@ -492,7 +494,7 @@ public interface LoanService {
* 邀请页基础信息
*/
@POST("roseApi/share/sharePageMsg")
Observable<BaseResponse<JsonObject>> getSharePageMsg();
Observable<BaseResponse<SharePageMsg>> getSharePageMsg();
/**
* 邀请页排行榜
......@@ -558,7 +560,7 @@ public interface LoanService {
* 用户页基本信息
*/
@POST("roseApi/hall/userHallMsg")
Observable<BaseResponse<JsonObject>> getUserHallMsg();
Observable<BaseResponse<UserHallMsg>> getUserHallMsg();
/**
* 默认http工厂
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/AboutusActivity.kt → video/app/src/main/java/com/duben/roseplaylet/ui/activitys/AboutUsActivity.kt
View file @ ac61e180
......@@ -2,22 +2,17 @@ package com.duben.roseplaylet.ui.activitys
import android.annotation.SuppressLint
import android.os.Bundle
import android.util.Log
import android.view.View
import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast
import com.bytedance.hume.readapk.HumeSDK
import com.duben.roseplaylet.BuildConfig
import com.duben.roseplaylet.MintsApplication
import com.duben.roseplaylet.R
import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.manager.TrackManager
import com.duben.roseplaylet.ui.activitys.base.BaseActivity
import com.duben.roseplaylet.utils.MateUtils
import com.duben.roseplaylet.utils.ToastUtil
import com.duben.library.utils.ConstantUtil
import com.duben.library.utils.json.JsonUtil
import com.duben.library.utils.nodoubleclick.AntiShake
import kotlinx.android.synthetic.main.activity_aboutus.*
import kotlinx.android.synthetic.main.header_layout.*
......@@ -28,7 +23,7 @@ import kotlinx.android.synthetic.main.header_layout.*
* 时间：2020/9/23 18:39
*/
@SuppressLint("SetTextI18n")
class AboutusActivity : BaseActivity(), View.OnClickListener {
class AboutUsActivity : BaseActivity(), View.OnClickListener {
override fun getContentViewLayoutID() = R.layout.activity_aboutus
......@@ -53,14 +48,6 @@ class AboutusActivity : BaseActivity(), View.OnClickListener {
tvAboutasVersion.setOnLongClickListener {
ToastUtil.showLong(this, "包名：" + Constant.MINTS_PKG_NAME)
// TTMediationTestTool.launchTestTools(
// this@AboutusActivity,
// object : TTMediationTestTool.ImageCallBack {
// override fun loadImage(imageView: ImageView?, s: String?) {}
// })
// readyGo(NinePayActivity::class.java)
// VoiceRedEnvelopeManager.load(23,23)
true
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/CommonDataActivity.kt
View file @ ac61e180
......@@ -181,9 +181,9 @@ class CommonDataActivity : BaseActivity(), View.OnClickListener, OnRefreshListen
// 谁看过我
tv_see_count.visibility = View.VISIBLE
if (data.list.size > 10) {
tv_see_count.text = "10+位小姐姐对你感兴趣"
tv_see_count.text = "10+位小姐姐对你感兴趣~"
} else {
tv_see_count.text = "" + data.list.size + "位小姐姐对你感兴趣"
tv_see_count.text = "" + data.list.size + "位小姐姐对你感兴趣~"
}
} else if (data.list.size > 0 && (mType == 0 || mType == 1)) {
tv_tips.visibility = View.VISIBLE
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/EditProfileActivity.kt
View file @ ac61e180
......@@ -182,7 +182,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
etWechat.setText("")
} else {
etWechat.hint = "填写微信号"
etWechat.hint = "请填写您的微信号"
etWechat.setText("")
}
......@@ -193,7 +193,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvSx.text = ""
} else {
tvSx.text = "不详"
tvSx.text = "请选择您的身形"
}
layout_sx.setOnClickListener(this)
}
......@@ -203,6 +203,11 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
layout_jyjm.visibility = View.VISIBLE
layout_jyjm.findViewById<TextView>(R.id.label_start).text = UserProfile.PROFILE_JYJM.str
tvJyjm = layout_jyjm.findViewById(R.id.label_tv)
if (!TextUtils.isEmpty(userProfileData?.interest)) {
tvJyjm.text = ""
} else {
tvJyjm.text = "请选择您的交友节目"
}
layout_jyjm.setOnClickListener(this)
// 喜欢的女生特质
......@@ -210,6 +215,11 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
layout_xhdnstz.findViewById<TextView>(R.id.label_start).text =
UserProfile.SPECIAL_LIKE_FEMALE.str
tvXhdnstz = layout_xhdnstz.findViewById(R.id.label_tv)
if (!TextUtils.isEmpty(userProfileData?.findDescribe)) {
tvXhdnstz.text = ""
} else {
tvXhdnstz.text = "请选择喜欢的女生特质"
}
layout_xhdnstz.setOnClickListener(this)
initXhdnstzRcy()
......@@ -239,7 +249,6 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
// 头像
ivAvatar = layout_avatar.findViewById(R.id.iv_avatar)
layout_avatar.findViewById<TextView>(R.id.label_tv).text = "点击修改头像"
layout_avatar.findViewById<TextView>(R.id.label_tv).setTextColor(Color.WHITE)
layout_avatar.setOnClickListener(this)
// 昵称
......@@ -248,7 +257,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvNickname.setText("")
} else {
tvNickname.hint = "填写昵称"
tvNickname.hint = "请填写您的昵称"
}
// 个性签名
......@@ -257,7 +266,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvSign.text = ""
} else {
tvSign.text = "不详"
tvSign.text = "请填写您的个性签名"
}
layout_gxqm.setOnClickListener(this)
......@@ -267,7 +276,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvAge.text = ""
} else {
tvAge.text = "不详"
tvAge.text = "请选择您的年龄"
}
layout_nl.setOnClickListener(this)
......@@ -277,7 +286,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvJob.text = ""
} else {
tvJob.text = "不详"
tvJob.text = "请选择您的职业"
}
layout_zy.setOnClickListener(this)
......@@ -287,7 +296,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvHeight.text = ""
} else {
tvHeight.text = "不详"
tvHeight.text = "请选择您的身高"
}
layout_sg.setOnClickListener(this)
......@@ -297,7 +306,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvWeight.text = ""
} else {
tvWeight.text = "不详"
tvWeight.text = "请选择您的体重"
}
layout_tz.setOnClickListener(this)
......@@ -307,7 +316,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
if (!TextUtils.isEmpty("")) {
tvJyfw.text = ""
} else {
tvJyfw.text = "不详"
tvJyfw.text = "请选择您的交友范围"
}
layout_jyfw.setOnClickListener(this)
......@@ -327,6 +336,9 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
UserProfile.PROFILE_TZ.str -> {
UserProfile.PROFILE_TZ.arr
}
UserProfile.PROFILE_NL.str -> {
UserProfile.PROFILE_NL.arr
}
UserProfile.PROFILE_SX.str -> {
UserProfile.PROFILE_SX.arr
}
......@@ -448,6 +460,22 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
})
mSinglePickDialog?.show()
}
UserProfile.PROFILE_NL.str -> {
mSinglePickDialog = SinglePickDialog(
this,
UserProfile.PROFILE_NL.str,
getPickerData(UserProfile.PROFILE_NL.str),
defaultValue
)
mSinglePickDialog?.setPickResultListener(object :
SinglePickDialog.OnPickResultListener {
override fun onPickResult(result: String) {
userProfileData?.birthday = result
tvAge.text = result
}
})
mSinglePickDialog?.show()
}
UserProfile.PROFILE_SX.str -> {
mSinglePickDialog = SinglePickDialog(
this,
......@@ -526,16 +554,31 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
readyGoForResult(WriteSignatureActivity::class.java, Constant.EDIT_PROFILE_CODE)
}
R.id.layout_nl -> {
showPickDialog(UserProfile.PROFILE_NL.str, userProfileData?.age)
val defaultValue = if (TextUtils.isEmpty(userProfileData?.age)) {
"2000"
} else {
userProfileData?.age
}
showPickDialog(UserProfile.PROFILE_NL.str, defaultValue)
}
R.id.layout_zy -> {
showJobPick()
}
R.id.layout_sg -> {
showPickDialog(UserProfile.PROFILE_SG.str, userProfileData?.userHeight)
val defaultValue = if (TextUtils.isEmpty(userProfileData?.userHeight)) {
"165CM"
} else {
userProfileData?.userHeight
}
showPickDialog(UserProfile.PROFILE_SG.str, defaultValue)
}
R.id.layout_tz -> {
showPickDialog(UserProfile.PROFILE_TZ.str, userProfileData?.bodyWeight)
val defaultValue = if (TextUtils.isEmpty(userProfileData?.bodyWeight)) {
"50KG"
} else {
userProfileData?.bodyWeight
}
showPickDialog(UserProfile.PROFILE_TZ.str, defaultValue)
}
R.id.layout_sx -> {
showPickDialog(UserProfile.PROFILE_SX.str, userProfileData?.appearance)
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/MainActivity.kt
View file @ ac61e180
......@@ -37,9 +37,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
private var currentFragment: Fragment? = null
private var phoneDialog: PhoneDialog? = null
override fun getContentViewLayoutID(): Int {
return R.layout.activity_main
}
override fun getContentViewLayoutID() = R.layout.activity_main
override fun initViewsAndEvents() {
audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/RealAuthActivity.kt
View file @ ac61e180
......@@ -10,6 +10,7 @@ import android.view.View
import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.bigkoo.pickerview.builder.OptionsPickerBuilder
import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.R
import com.duben.roseplaylet.ui.activitys.base.BaseActivity
......@@ -25,6 +26,7 @@ import com.duben.roseplaylet.mvp.views.RealAuthView
import com.duben.roseplaylet.ui.adapter.ProfileLabelAdapter
import com.duben.roseplaylet.ui.widgets.pick.SinglePickDialog
import com.duben.roseplaylet.utils.GlideEngine
import com.duben.roseplaylet.utils.JobData
import com.google.gson.Gson
import com.luck.picture.lib.PictureSelector
import com.luck.picture.lib.compress.Luban
......@@ -39,6 +41,10 @@ import com.tbruyelle.rxpermissions.RxPermissions
import com.yalantis.ucrop.UCrop
import kotlinx.android.synthetic.main.activity_real_auth.*
import kotlinx.android.synthetic.main.header_layout.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File
class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
......@@ -62,6 +68,9 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
private var wechatQrCodeUrl = ""
private var readAuthImageUrl = ""
private var jobOptions1Items: MutableList<JobBean>? = mutableListOf()
private var jopOptions2Items: MutableList<ArrayList<String>>? = mutableListOf()
private var mSinglePickDialog: SinglePickDialog? = null
override fun getContentViewLayoutID() = R.layout.activity_real_auth
......@@ -77,6 +86,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
iv_left_icon.setImageResource(R.mipmap.ic_arrow_white)
line.visibility = View.GONE
initJobData()
initProfile()
initGxbqRcy()
initListener()
......@@ -84,6 +94,21 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
changeStepStatus(1)
}
private fun initJobData() {
MainScope().launch {
withContext(Dispatchers.IO) {
val jobData = JobData.getJsonData(this@RealAuthActivity)
try {
jobOptions1Items = jobData.options1Items
jopOptions2Items = jobData.options2Items
} catch (e: Exception) {
e.printStackTrace()
}
}
}
}
private fun initGxbqRcy() {
val recyclerView = layout_gxbq.findViewById<RecyclerView>(R.id.rv_basic)
gxbqAdapter = ProfileLabelAdapter()
......@@ -116,16 +141,18 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
// 交友范围
layout_jyfw.findViewById<TextView>(R.id.label_start).text = UserProfile.PROFILE_JYFW.str
jyfwTv = layout_jyfw.findViewById(R.id.label_tv)
jyfwTv.text = "请选择您的交友范围"
layout_jyfw.setOnClickListener(this)
// 职业
layout_zy.findViewById<TextView>(R.id.label_start).text = UserProfile.PROFILE_ZY.str
zyTv = layout_zy.findViewById(R.id.label_tv)
sxTv.text = "请选择您的职业"
zyTv.text = "请选择您的职业"
layout_zy.setOnClickListener(this)
// 个性标签
layout_gxbq.findViewById<TextView>(R.id.label_start).text = UserProfile.PROFILE_GXBQ.str
layout_gxbq.findViewById<TextView>(R.id.label_tv).text = "请选择您的个性标签"
layout_gxbq.setOnClickListener(this)
}
......@@ -171,7 +198,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
showPickDialog(UserProfile.PROFILE_JYFW.str, userProfileData?.findCity)
}
R.id.layout_zy -> {
showPickDialog(UserProfile.PROFILE_ZY.str, userProfileData?.career)
showJobPick()
}
R.id.layout_gxbq -> {
readyGoForResult(UserLabelActivity::class.java, Constant.USER_LABEL_REQUEST_CODE)
......@@ -284,6 +311,37 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
iv_wechat_qrcode.setOnClickListener(this)
}
private fun showJobPick() {
val provinceIndex = 0
val cityIndex = 0
// 弹出选择器
val pvOptions = OptionsPickerBuilder(this) { options1, options2, _, _ ->
//返回的分别是三个级别的选中位置
val opt1tx = if (jobOptions1Items!!.isNotEmpty()) jobOptions1Items!![options1]
.pickerViewText else ""
val opt2tx = if (jopOptions2Items!!.size > 0
&& jopOptions2Items!![options1].size > 0
) jopOptions2Items!![options1][options2] else ""
val tx = "$opt1tx-$opt2tx"
userProfileData?.career = tx
zyTv.text = tx
}
.setSelectOptions(provinceIndex, cityIndex)
.setDividerColor(Color.BLACK)
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
.setContentTextSize(20)
.build<Any>()
pvOptions.setPicker(
jobOptions1Items as List<Nothing>,
jopOptions2Items as List<Nothing>
) //三级选择器
pvOptions.show()
}
private fun showPickDialog(pickerType: String, defaultValue: String?) {
when (pickerType) {
UserProfile.PROFILE_SG.str -> {
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/ShareActivity.kt
View file @ ac61e180
......@@ -4,10 +4,12 @@ import android.graphics.Color
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View
import androidx.core.content.ContextCompat
import com.duben.roseplaylet.R
import com.duben.roseplaylet.ui.activitys.base.BaseActivity
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.model.SharePageMsg
import com.duben.roseplaylet.mvp.model.ShareRankList
import com.duben.roseplaylet.mvp.presenters.InvitePresenter
import com.duben.roseplaylet.mvp.views.InviteView
......@@ -56,12 +58,24 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
private fun initView() {
tv_my_code.text = userManager.shareCode
// rcy_my_invite.adapter =
// tv_share_cash.text = SpanUtils()
// .append()
// .create()
tv_share_count.text = SpanUtils()
.append("0")
.setForegroundColor(ContextCompat.getColor(this, R.color.color_FF5967))
.setFontSize(26, true)
.append(" 人")
.create()
tv_share_reward.text = SpanUtils()
.append("0")
.setForegroundColor(ContextCompat.getColor(this, R.color.color_FF5967))
.setFontSize(26, true)
.append(" 元")
.create()
tv_share_cash.text = SpanUtils()
.append("0")
.setForegroundColor(ContextCompat.getColor(this, R.color.color_FF5967))
.setFontSize(26, true)
.append(" 元")
.create()
mShareRankAdapter = ShareRankAdapter()
mShareRankAdapter.animationEnable = false
......@@ -81,6 +95,12 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
when (v?.id) {
R.id.iv_left_icon -> finish()
R.id.tv_share_img -> {
shareImgDialog()
}
R.id.tv_share_url -> {
shareWx()
}
R.id.tv_copy -> {
showToast("邀请码已复制到剪切板!")
UcropUtils.clipData(userManager.shareCode)
......@@ -88,9 +108,15 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
}
}
private fun shareWx() {
}
private fun initListener() {
iv_left_icon.setOnClickListener(this)
tv_copy.setOnClickListener(this)
tv_share_img.setOnClickListener(this)
tv_share_url.setOnClickListener(this)
}
/**
......@@ -99,8 +125,7 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
private fun shareImgDialog() {
val shareDialog = ShareDialog(this, myShareUrl)
shareDialog.setOnShareOKListener(object : ShareDialog.OnShareOKListener {
override fun onShareOk() {
}
override fun onShareOk() {}
})
val content = "送你一个赚钱的新模式，\r\n快点加入跟我一起赚钱吧"
shareDialog.setShareAvatar("https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/ic_my_coin.png")
......@@ -114,17 +139,34 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
invitePresenter.detachView()
}
override fun getSharePageMsgSuc(
shareCode: String, rUserShareCode: String?,
) {
tv_my_code.text = shareCode
if (TextUtils.isEmpty(rUserShareCode)) {
override fun getSharePageMsgSuc(sharePageMsg: SharePageMsg) {
tv_my_code.text = sharePageMsg.shareCode
if (TextUtils.isEmpty(sharePageMsg.rUserShareCode)) {
et_code.isEnabled = true
} else {
et_code.isEnabled = false
et_code.setText(rUserShareCode!!)
et_code.setText(sharePageMsg.rUserShareCode)
}
tv_share_count.text = SpanUtils()
.append("" + sharePageMsg.count)
.setForegroundColor(ContextCompat.getColor(this, R.color.color_FF5967))
.setFontSize(20, true)
.append(" 人")
.create()
tv_share_reward.text = SpanUtils()
.append("" + sharePageMsg.allCash)
.setForegroundColor(ContextCompat.getColor(this, R.color.color_FF5967))
.setFontSize(20, true)
.append(" 元")
.create()
tv_share_cash.text = SpanUtils()
.append("" + sharePageMsg.canCash)
.setForegroundColor(ContextCompat.getColor(this, R.color.color_FF5967))
.setFontSize(20, true)
.append(" 元")
.create()
mShareInviteAdapter.setNewInstance(sharePageMsg.list)
}
override fun getSharePageMsgFail() {
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/WalletActivity.kt
View file @ ac61e180
......@@ -72,7 +72,7 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
private fun initView() {
tv_balance.text = "" + userManager.userBeans
tv_cash.text = "" + userManager.userRewardCash
tv_cash.text = "" + userManager.userRewardCoin
}
private fun initRecy() {
......@@ -82,6 +82,7 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
coinAdapter.setEmptyView(emptyView)
coinAdapter.setOnItemClickListener { adapter, view, position ->
coinAdapter.setPosition(position)
coinAdapter.notifyDataSetChanged()
}
rv_wallet_coin.layoutManager = GridLayoutManager(this, 3)
rv_wallet_coin.adapter = coinAdapter
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/CoinAdapter.kt
View file @ ac61e180
package com.duben.roseplaylet.ui.adapter
import android.view.View
import android.widget.TextView
import androidx.core.content.ContextCompat
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.duben.roseplaylet.R
......@@ -25,14 +25,13 @@ class CoinAdapter : BaseQuickAdapter<VipBean.ListBean, BaseViewHolder>(R.layout.
override fun convert(holder: BaseViewHolder, item: VipBean.ListBean) {
val viewCoin = holder.getView<TextView>(R.id.item_coin)
viewCoin.text = item.title
holder.getView<TextView>(R.id.item_cash).text = "" + item.firstPayPrice
holder.getView<TextView>(R.id.item_cash).text = "￥" + item.firstPayPrice
val itemView = holder.getView<View>(R.id.item_view)
if (holder.adapterPosition == selectPosition) {
viewCoin.setTextColor(ContextCompat.getColor(context, R.color.color_EBCA7B))
itemView.setBackgroundResource(R.drawable.shape_coin_orange)
} else {
viewCoin.setTextColor(ContextCompat.getColor(context, R.color.graya))
itemView.setBackgroundResource(R.drawable.shape_coin_gray)
}
}
fun getPosition() = selectPosition
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/ShareInviteAdapter.kt
View file @ ac61e180
......@@ -7,14 +7,13 @@ import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.R
import com.duben.roseplaylet.mvp.model.*
class ShareInviteAdapter : BaseQuickAdapter<ShareInvite, BaseViewHolder>(R.layout.item_share_invite) {
class ShareInviteAdapter : BaseQuickAdapter<ShareUserMsg, BaseViewHolder>(R.layout.item_share_invite) {
override fun convert(holder: BaseViewHolder, item: ShareInvite) {
override fun convert(holder: BaseViewHolder, item: ShareUserMsg) {
holder.getView<TextView>(R.id.tv_name).text = item.nickName
holder.getView<TextView>(R.id.tv_sex).text = "" + item.sex
holder.getView<TextView>(R.id.tv_status).text = "" + item.status
holder.getView<TextView>(R.id.tv_reward).text = "" + item.cash
GlideUtils.loadImageView(context, item.head, holder.getView(R.id.iv_avatar))
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MainFragment.kt
View file @ ac61e180
......@@ -116,7 +116,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
homePresenter.signAfterSeconds()
}
// IMHelper.instance.getImMsg()
TrackManager.getInstance().getMyInfo()
TrackManager.getInstance().getBaseMsg()
}
AppConfig.showVipAdDialog = false
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MessageFragment.kt
View file @ ac61e180
......@@ -36,10 +36,10 @@ class MessageFragment : LazyLoadBaseFragment(), View.OnClickListener {
tv_clear_list.setOnClickListener(this)
tabsData.add(String.format("聊天"))
tabsData.add(String.format("系统消息"))
// tabsData.add(String.format("系统消息"))
fragmentsData.add(TUIConversationFragment())
fragmentsData.add(SystemMsgFragment())
// fragmentsData.add(SystemMsgFragment())
vpAdapter = MsgPageAdapter(tabsData, fragmentsData, requireActivity())
vp2.adapter = vpAdapter
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MyFragment.kt
View file @ ac61e180
......@@ -64,6 +64,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
}
if (!TextUtils.isEmpty(userManager?.userID)) {
myPresenter.getBaseMsg()
myPresenter.getUserHallMsg()
} else {
myPresenter.userLogin()
}
......@@ -98,7 +99,11 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
readyGo(CommonDataActivity::class.java, bundle)
}
R.id.ll_my_wallet -> {
readyGo(WalletActivity::class.java)
if (UserManager.getInstance().userSex == 1) {
readyGo(WalletActivity::class.java)
} else {
readyGo(DrawCashActivity::class.java)
}
}
R.id.ll_my_invite -> {
readyGo(ShareActivity::class.java)
......@@ -120,18 +125,13 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
R.id.ll_my_settings -> {
readyGo(SettingsActivity::class.java)
}
// R.id.tv_my_account -> {
// if (!userManager.userIsLogin()) {
// readyGo(BindMobileActivity::class.java)
// }
// }
}
}
override fun getBaseMsgSuc(data: UserBean) {
toUid = data.idcode
tv_my_nickname.text = data.nickName
tv_my_label.text = "" + data.age + "岁 " + data.city
tv_my_label.text = "" + data.age + " " + data.city
tv_my_id.text = "ID:" + data.idcode
GlideUtils.loadImageView(requireContext(), data.headerUrl, civ_my_avatar)
......
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/ShareDialog.kt
View file @ ac61e180
......@@ -22,7 +22,6 @@ import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.BuildConfig
import com.duben.roseplaylet.MintsApplication
import com.duben.roseplaylet.R
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.ui.adapter.SharePagerAdapter
import com.duben.roseplaylet.utils.BubbleUtils
import com.duben.roseplaylet.utils.QRCodeUtil
......
video/app/src/main/res/color/item_text_sel.xml
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#E5C565" android:state_selected="true" />
<item android:color="#8E8E8E" android:state_selected="false" />
<item android:color="@color/color_E5C565" android:state_selected="true" />
<item android:color="@color/color_8E8E8E" android:state_selected="false" />
</selector>
\ No newline at end of file
video/app/src/main/res/drawable/shape_alipay_blue.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_367EE2" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="30dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_coin_gray.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_424446" />
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_coin_orange.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="141"
android:endColor="#fff6c85a"
android:startColor="#fff7c95a" />
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_copy_red.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_FF5967" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="5dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_draw_cash_orange.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_FFE9CF" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="50dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_setting_black.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_15141A" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_share_btn.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="50dp" />
<gradient
android:angle="270"
android:endColor="@color/color_CBA37F"
android:startColor="@color/color_F4D9BE" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_wallet_gray.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_424446" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_wechat_green.xml 0 → 100644
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_48C550" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="30dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/layout/activity_album.xml
View file @ ac61e180
......@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_232122"
android:background="@color/black"
android:orientation="vertical">
<include layout="@layout/header_layout" />
......@@ -11,10 +11,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="@color/gray"
android:background="@color/color_1F1F1E"
android:gravity="center"
android:text="最多上传6张图片,长按可删除照片"
android:textColor="@color/white" />
android:textColor="@color/color_929297" />
<com.duben.roseplaylet.ui.widgets.nineImage.AddImagesView
android:id="@+id/aiv"
......
video/app/src/main/res/layout/activity_bind_alipay.xml
View file @ ac61e180
......@@ -13,118 +13,127 @@
android:fillViewport="true"
android:overScrollMode="never">
<LinearLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="选择提现方式"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:drawableEnd="@mipmap/ic_alipay"
android:gravity="center_vertical"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="支付宝"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="账号"
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
android:id="@+id/et_account"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:hint="请填写支付宝账号"
android:inputType="number"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="姓名"
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
android:id="@+id/et_name"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:hint="请填写您的真实姓名"
android:inputType="text"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="身份证号"
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
android:id="@+id/et_idcard_no"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:hint="请填写真实身份证号"
android:inputType="number"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="16sp" />
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="选择提现方式"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:drawableEnd="@mipmap/ic_alipay"
android:gravity="center_vertical"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="支付宝"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="账号"
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
android:id="@+id/et_account"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:hint="请填写支付宝账号"
android:inputType="number"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="姓名"
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
android:id="@+id/et_name"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:hint="请填写您的真实姓名"
android:inputType="text"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:text="身份证号"
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
android:id="@+id/et_idcard_no"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_bg_write"
android:hint="请填写真实身份证号"
android:inputType="number"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="16sp" />
</LinearLayout>
<Button
android:id="@+id/btn_submit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="30dp"
android:layout_marginTop="80dp"
android:layout_marginEnd="30dp"
android:background="@drawable/btn_index_submit"
android:layout_marginBottom="30dp"
android:background="@drawable/shape_draw_cash_orange"
android:elevation="2dp"
android:text="确认提交"
android:textColor="@color/black"
android:textSize="16sp"
android:textColor="@color/color_31343B"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
</FrameLayout>
</com.duben.roseplaylet.ui.widgets.ElasticScrollView>
</LinearLayout>
video/app/src/main/res/layout/activity_common_data.xml
View file @ ac61e180
......@@ -14,9 +14,10 @@
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_below="@id/head"
android:background="@color/gray"
android:background="@color/color_1F1F1E"
android:gravity="center"
android:text="为保护用户隐私，已隐身的用户会被隐藏"
android:textColor="@color/color_929297"
android:textSize="12sp"
android:visibility="gone" />
......
video/app/src/main/res/layout/activity_edit_profile.xml
View file @ ac61e180
......@@ -27,7 +27,7 @@
android:id="@+id/layout_avatar"
layout="@layout/layout_basic_header"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="70dp"
android:layout_marginBottom="10dp" />
<include
......
video/app/src/main/res/layout/activity_main.xml
View file @ ac61e180
......@@ -50,8 +50,7 @@
android:layout_height="wrap_content"
android:text="剧场"
android:textColor="@color/item_text_sel"
android:textSize="16sp"
android:textStyle="bold" />
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
......@@ -76,8 +75,7 @@
android:layout_height="wrap_content"
android:text="广场"
android:textColor="@color/item_text_sel"
android:textSize="16sp"
android:textStyle="bold" />
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
......@@ -102,8 +100,7 @@
android:layout_height="wrap_content"
android:text="邀请有奖"
android:textColor="@color/item_text_sel"
android:textSize="16sp"
android:textStyle="bold" />
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
......@@ -128,8 +125,7 @@
android:layout_height="wrap_content"
android:text="消息"
android:textColor="@color/item_text_sel"
android:textSize="16sp"
android:textStyle="bold" />
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
......@@ -154,8 +150,7 @@
android:layout_height="wrap_content"
android:text="我的"
android:textColor="@color/item_text_sel"
android:textSize="16sp"
android:textStyle="bold" />
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
......
video/app/src/main/res/layout/activity_settings.xml
View file @ ac61e180
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:orientation="vertical">
<include layout="@layout/header_layout" />
......@@ -14,53 +15,112 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:paddingStart="15dp"
android:paddingEnd="15dp">
<include
android:id="@+id/item_invitedCode"
layout="@layout/item_settings" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@drawable/shape_setting_black"
android:orientation="vertical"
android:paddingStart="10dp"
android:paddingTop="20dp"
android:paddingEnd="10dp"
android:paddingBottom="20dp">
<include
android:id="@+id/item_phone"
layout="@layout/item_settings" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="账号与安全"
android:textColor="@color/white"
android:textSize="18sp" />
<include
android:id="@+id/item_cleanCache"
layout="@layout/item_settings" />
<include
android:id="@+id/layout_phone"
layout="@layout/layout_basic_text" />
<include
android:id="@+id/item_userAgree"
layout="@layout/item_settings" />
<include
android:id="@+id/layout_cancel"
layout="@layout/layout_basic_text" />
<include
android:id="@+id/item_privacyAgree"
layout="@layout/item_settings" />
</LinearLayout>
<include
android:id="@+id/item_aboutUs"
layout="@layout/item_settings" />
<include
android:id="@+id/item_cancel"
layout="@layout/item_settings" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@drawable/shape_setting_black"
android:orientation="vertical"
android:paddingStart="10dp"
android:paddingTop="20dp"
android:paddingEnd="10dp"
android:paddingBottom="20dp">
<include
android:id="@+id/item_back"
layout="@layout/item_settings"
android:visibility="gone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="缓存管理"
android:textColor="@color/white"
android:textSize="18sp" />
<Button
android:id="@+id/btn_switch"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_gravity="center"
<include
android:id="@+id/layout_cache"
layout="@layout/layout_basic_text" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shape_btn_gold_left"
android:background="@drawable/shape_setting_black"
android:orientation="vertical"
android:paddingStart="10dp"
android:paddingTop="20dp"
android:paddingEnd="10dp"
android:paddingBottom="20dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="关于玫瑰陪看"
android:textColor="@color/white"
android:textSize="18sp" />
<include
android:id="@+id/layout_feedback"
layout="@layout/layout_basic_text" />
<include
android:id="@+id/layout_about_us"
layout="@layout/layout_basic_text" />
</LinearLayout>
<Button
android:id="@+id/btn_login_out"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginTop="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="30dp"
android:background="@drawable/shape_draw_cash_orange"
android:elevation="2dp"
android:text="退出登录"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="gone" />
android:textColor="@color/color_31343B"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
......
video/app/src/main/res/layout/activity_wallet.xml
View file @ ac61e180
......@@ -25,7 +25,7 @@
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_banner_write">
android:background="@drawable/shape_label_white">
<View
android:id="@+id/line_draw"
......@@ -41,8 +41,7 @@
android:id="@+id/tv_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="0.00"
android:layout_marginTop="18dp"
android:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
......@@ -56,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="充值金额(币)"
android:textColor="@color/gray"
android:textColor="@color/color_6F6F71"
app:layout_constraintEnd_toEndOf="@id/line_draw"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_balance" />
......@@ -65,8 +64,7 @@
android:id="@+id/tv_cash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="0.00"
android:layout_marginTop="18dp"
android:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
......@@ -79,8 +77,8 @@
android:id="@+id/tv_cash_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收益(币) >"
android:textColor="@color/gray"
android:text="收益(币) ▷"
android:textColor="@color/color_6F6F71"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/line_draw"
app:layout_constraintTop_toBottomOf="@id/tv_cash" />
......@@ -100,7 +98,7 @@
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:text="选择充值套餐"
android:textColor="@color/graya"
android:textColor="@color/color_EFEEEB"
android:textSize="18sp" />
<androidx.recyclerview.widget.RecyclerView
......@@ -118,9 +116,9 @@
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="15dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/shape_green"
android:background="@drawable/shape_alipay_blue"
android:drawablePadding="-15dp"
android:paddingStart="15dp"
android:text="支付宝支付"
......@@ -132,10 +130,10 @@
android:id="@+id/btn_wxpay"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginStart="15dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/shape_green"
android:background="@drawable/shape_wechat_green"
android:drawablePadding="-15dp"
android:paddingStart="15dp"
android:text="微信支付"
......@@ -160,13 +158,13 @@
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:text="我的优享"
android:textColor="@color/graya"
android:textColor="@color/color_EFEEEB"
android:textSize="18sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@color/gray"
android:background="@drawable/shape_wallet_gray"
android:gravity="center_vertical"
android:paddingStart="20dp"
android:paddingEnd="20dp">
......@@ -176,19 +174,19 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="会员特权=优享特权+免费畅聊"
android:textColor="@color/graya" />
android:textColor="@color/color_A5A5A7" />
<TextView
android:id="@+id/tv_go_vip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_hall_btn3"
android:paddingStart="10dp"
android:paddingStart="15dp"
android:paddingTop="4dp"
android:paddingEnd="10dp"
android:paddingEnd="15dp"
android:paddingBottom="4dp"
android:text="去开通"
android:textColor="@color/color_FCE8BA" />
android:textColor="@color/color_F6DA8F" />
</LinearLayout>
......@@ -196,7 +194,7 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="15dp"
android:background="@color/gray"
android:background="@drawable/shape_wallet_gray"
android:gravity="center_vertical"
android:paddingStart="20dp"
android:paddingEnd="20dp">
......@@ -206,19 +204,19 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="分享有奖=免费VIP/金币奖励"
android:textColor="@color/graya" />
android:textColor="@color/color_A5A5A7" />
<TextView
android:id="@+id/tv_go_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_hall_btn3"
android:paddingStart="10dp"
android:paddingStart="15dp"
android:paddingTop="4dp"
android:paddingEnd="10dp"
android:paddingEnd="15dp"
android:paddingBottom="4dp"
android:text="去分享"
android:textColor="@color/color_FCE8BA" />
android:textColor="@color/color_F6DA8F" />
</LinearLayout>
......
video/app/src/main/res/layout/dialog_delete_photo_confirm.xml
View file @ ac61e180
......@@ -49,6 +49,6 @@
android:layout_below="@id/ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_close" />
android:src="@mipmap/ic_quit_white" />
</RelativeLayout>
video/app/src/main/res/layout/item_coin.xml
View file @ ac61e180
......@@ -5,7 +5,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shape_chat_gray"
android:id="@+id/item_view"
android:background="@drawable/shape_coin_gray"
android:gravity="center_horizontal"
android:orientation="vertical">
......@@ -17,8 +18,8 @@
android:drawablePadding="6dp"
android:gravity="center"
android:text="210"
android:textColor="@color/graya"
android:textSize="18sp"
android:textColor="@color/color_F6DA8F"
android:textSize="20sp"
app:drawableStartCompat="@mipmap/ic_call_wx" />
<TextView
......@@ -28,6 +29,6 @@
android:layout_marginTop="10dp"
android:layout_marginBottom="20dp"
android:text="￥30"
android:textColor="@color/graya" />
android:textColor="@color/color_F6DA8F" />
</LinearLayout>
\ No newline at end of file
video/app/src/main/res/layout/item_common_data.xml
View file @ ac61e180
......@@ -53,9 +53,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_recommend_name"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="308.1km"
android:textColor="@color/color_D2D2D2"
android:textColor="@color/color_929297"
android:textSize="12sp" />
<TextView
......@@ -66,8 +67,7 @@
android:layout_centerVertical="true"
android:gravity="center"
android:text="2025-1-1"
android:textColor="@color/color_D2D2D2"
android:textSize="12sp" />
android:textColor="@color/color_929297" />
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/iv_recommend_heart"
......
video/app/src/main/res/layout/layout_basic_edit.xml
View file @ ac61e180
......@@ -10,9 +10,8 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="QQ"
android:textColor="@color/gray"
android:textSize="18sp" />
android:textSize="16sp" />
<TextView
android:id="@+id/label_start2"
......@@ -31,14 +30,13 @@
android:layout_centerVertical="true"
android:layout_toEndOf="@id/label_start"
android:gravity="end"
android:hint="点击输入QQ"
android:textColor="@color/white"
android:textSize="18sp"
android:textColor="@color/color_999999"
android:textColorHint="@color/color_999999"
android:textSize="16sp"
android:visibility="visible" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:background="@color/my_color_gray" />
style="@style/view_line_28282E"
android:layout_alignParentBottom="true" />
</RelativeLayout>
\ No newline at end of file
video/app/src/main/res/layout/layout_basic_header.xml
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="70dp"
android:paddingStart="15dp"
android:paddingEnd="15dp">
......@@ -17,14 +17,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="30dp"
android:layout_toEndOf="@id/iv_avatar"
android:drawableEnd="@mipmap/ic_label_right"
android:gravity="end"
android:textColor="@color/black"
android:textSize="18sp" />
android:textColor="@color/color_999999"
android:textSize="16sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@mipmap/ic_arrow_right_gray" />
<View
style="@style/view_line_E6E6E6"
style="@style/view_line_28282E"
android:layout_alignParentBottom="true" />
</RelativeLayout>
\ No newline at end of file
video/app/src/main/res/layout/layout_basic_text.xml
View file @ ac61e180
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
......@@ -16,7 +15,6 @@
android:layout_width="120dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="QQ"
android:textColor="@color/color_999999"
android:textSize="16sp" />
......@@ -25,7 +23,6 @@
android:layout_width="120dp"
android:layout_height="wrap_content"
android:layout_below="@id/label_start"
android:text="QQ"
android:textColor="@color/gray"
android:textSize="10sp"
android:visibility="gone" />
......@@ -39,7 +36,7 @@
android:layout_toEndOf="@id/label_start"
android:gravity="end"
android:textColor="@color/color_999999"
android:textSize="18sp" />
android:textSize="16sp" />
<ImageView
android:layout_width="20dp"
......
video/app/src/main/res/values/colors.xml
View file @ ac61e180
......@@ -85,6 +85,25 @@
<color name="color_999999">#999999</color>
<color name="color_818181">#818181</color>
<color name="color_E8C265">#E8C265</color>
<color name="color_FF5967">#FF5967</color>
<color name="color_633C1B">#633C1B</color>
<color name="color_F4D9BE">#F4D9BE</color>
<color name="color_CBA37F">#CBA37F</color>
<color name="color_F8F8FA">#F8F8FA</color>
<color name="color_656565">#656565</color>
<color name="color_F1D6BA">#F1D6BA</color>
<color name="color_A5A5A7">#A5A5A7</color>
<color name="color_F6DA8F">#F6DA8F</color>
<color name="color_424446">#424446</color>
<color name="color_367EE2">#367EE2</color>
<color name="color_48C550">#48C550</color>
<color name="color_6F6F71">#6F6F71</color>
<color name="color_EFEEEB">#EFEEEB</color>
<color name="color_31343B">#31343B</color>
<color name="color_FFE9CF">#FFE9CF</color>
<color name="color_929297">#929297</color>
<color name="color_1F1F1E">#1F1F1E</color>
<color name="color_252429">#252429</color>
......
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