Skip to content

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

添加B包逻辑

parent d92d3aa7
Hide whitespace changes
Inline Side-by-side
Showing with 907 additions and 290 deletions
video/app/build.gradle
View file @ d70d540d
......@@ -325,10 +325,9 @@ dependencies {
api project(':picture_library')
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
// 流式布局
// implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar'
implementation 'com.hyman:flowlayout-lib:1.1.2'
// view模糊
implementation 'com.github.centerzx:ShapeBlurView:1.0.5'
implementation 'com.github.Dimezis:BlurView:version-2.0.6'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
......
video/app/src/main/AndroidManifest.xml
View file @ d70d540d
......@@ -3,6 +3,9 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.duben.roseplaylet">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- 健康运动 -->
<uses-permission
android:name="android.permission.ACTIVITY_RECOGNITION"
......@@ -38,9 +41,6 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:name=".MintsApplication"
android:allowBackup="true"
......@@ -256,7 +256,9 @@
<activity
android:name=".ui.activitys.BasicUserProfileActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activitys.AlbumActivity"
......
video/app/src/main/java/com/duben/library/utils/GlideUtils.kt
View file @ d70d540d
......@@ -216,7 +216,7 @@ object GlideUtils {
}
//加载毛玻璃图片
fun loadBlurImageView(mContext: Context, url: String, imageView: ImageView) {
fun loadBlurImageView(mContext: Context, url: String?, imageView: ImageView) {
Glide.with(mContext).load(url)
.apply(
RequestOptions.bitmapTransform(
......@@ -267,34 +267,20 @@ object GlideUtils {
).dontAnimate().into(mImageView)
}
//加载毛玻璃图片
fun loadIsThumbBlurImageView(
fun loadThumbRoundImageView(
mContext: Context,
path: String,
imageView: ImageView,
corners: Float = 10f,
isBlur: Boolean = false
) {
if (isBlur) {
// 加载带有毛玻璃效果和圆角的图片
val options = RequestOptions()
.transform(
BlurTransformation(25, 4)
)
Glide.with(mContext)
.load("$path?x-oss-process=image/resize,p_20")
.apply(options)
.into(imageView)
} else {
Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20")
.apply(
RequestOptions().transform(
CenterCrop(),
RoundedCorners(BubbleUtils.dp2px(corners.toInt()))
)
Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20")
.apply(
RequestOptions().transform(
CenterCrop(),
RoundedCorners(BubbleUtils.dp2px(corners.toInt()))
)
.into(imageView)
}
)
.into(imageView)
}
//默认加载
......
video/app/src/main/java/com/duben/roseplaylet/ad/express/MyExpressManager.kt
View file @ d70d540d
......@@ -23,6 +23,7 @@ import com.duben.roseplaylet.utils.UIUtils
import java.lang.Exception
import java.util.ArrayList
import com.duben.roseplaylet.BuildConfig
/**
* 信息流
*/
......@@ -87,8 +88,7 @@ class MyExpressManager {
* 2:如果是信息流自渲染广告，设置广告图片期望的图片宽高 ，不能为0
* 2:如果是信息流模板广告，宽度设置为希望的宽度，高度设置为0(0为高度选择自适应参数)
*/
.setImageAcceptedSize(UIUtils.getScreenWidth(activity), UIUtils.dp2px(activity, 340f))
// .setImageAcceptedSize(UIUtils.getAdWidth(MintsApplication.getContext()).toInt(), 0)
.setImageAcceptedSize(UIUtils.getScreenWidth(activity), UIUtils.dp2px(activity, 120f))
.setAdCount(3)//请求广告数量为1到3条 （优先采用平台配置的数量）
.build()
......
video/app/src/main/java/com/duben/roseplaylet/common/Constant.kt
View file @ d70d540d
......@@ -69,6 +69,9 @@ object Constant {
const val USER_LABEL_DATA = "USER_LABEL_DATA"
const val ALIPAY_AUTH_DATA = "ALIPAY_AUTH_DATA"
const val WECHAT_DRAW_CASH = "WECHAT_DRAW_CASH"
const val ALI_DRAW_CASH = "ALI_DRAW_CASH"
......
video/app/src/main/java/com/duben/roseplaylet/manager/IMHelper.kt
View file @ d70d540d
......@@ -100,8 +100,8 @@ class IMHelper private constructor() {
)
// 用户头像大小、圆角半径
// TUIConfigClassic.setMessageListAvatarSize(120)
// TUIConfigClassic.setMessageListAvatarRadius(120)
TUIConfigClassic.setMessageListAvatarSize(150)
TUIConfigClassic.setMessageListAvatarRadius(75)
// 聊天界面背景色
TUIChatConfigClassic.setBackground(ColorDrawable(appContext.resources.getColor(R.color.color_07060C)))
TUIConfigClassic.setSendBubbleBackground(
......
video/app/src/main/java/com/duben/roseplaylet/manager/UserHelper.kt
View file @ d70d540d
......@@ -47,7 +47,7 @@ class UserHelper private constructor() {
//用户是否实名
fun isUserAuth(): Boolean {
if (userInstance.idcardStatus == 1 || userInstance.userSex == 1) {
if (userInstance.idcardStatus == 1 || userInstance.idcardStatus == 2 || userInstance.userSex == 1) {
return true
}
receiveErrorCode(COMMON_ERROR_CODE_NO_AUTH)
......@@ -96,11 +96,22 @@ class UserHelper private constructor() {
}
fun loginAfterDoSomething() {
isBpkg()
if (isBpkg()) {
doBpkg()
}
IMHelper.instance.getImMsg()
}
private fun isBpkg() {
fun isBpkg(): Boolean {
val application = MintsApplication.getContext() as MintsApplication
if (MateUtils.getAppMetaData(application, "CHANNEL_NAME") == Constant.APP_B_PKG) {
// 如果不是B包 不处理
return true
}
return false
}
private fun doBpkg() {
val application = MintsApplication.getContext() as MintsApplication
if (MateUtils.getAppMetaData(application, "CHANNEL_NAME") != Constant.APP_B_PKG) {
......
video/app/src/main/java/com/duben/roseplaylet/manager/UserManager.java
View file @ d70d540d
......@@ -89,6 +89,12 @@ public class UserManager {
private static final String USER_HEAD_URL = "USER_HEAD_URL";
//提现支付宝账号 是否设置了
private static final String USER_ALIPAY_SET = "USER_ALIPAY_SET";
//能不能有绑定的输出框
private static final String B_PKG_CAHUPDATERUIDCODE = "B_PKG_CAHUPDATERUIDCODE";
//能不能修改
private static final String B_PKG_CANHAVERUIDCODE = "B_PKG_CANHAVERUIDCODE";
//绑定的码，没有是null
private static final String B_PKG_RUIDCODE = "B_PKG_RUIDCODE";
public static UserManager getInstance() {
if (_inst == null) {
......@@ -155,6 +161,41 @@ public class UserManager {
ps.put(HAS_BASE, user.isHasBase());
ps.put(IDCARD_STATUS, user.getIdcardStatus());
ps.put(SHARE_CODE, user.getShareCode());
ps.put(B_PKG_CAHUPDATERUIDCODE, user.isCanUpdateRuidCode());
ps.put(B_PKG_CANHAVERUIDCODE, user.isCanHaveRuidCode());
ps.put(B_PKG_RUIDCODE, user.getRuidCode());
}
/**
* 能不能有绑定的输出框
*/
public Boolean isCanUpdateRuidCode() {
if (ps == null) {
return false;
}
return ps.getBoolean(B_PKG_CAHUPDATERUIDCODE, false);
}
/**
* 能不能修改
*/
public Boolean isCanHaveRuidCode() {
if (ps == null) {
return false;
}
return ps.getBoolean(B_PKG_CANHAVERUIDCODE, false);
}
/**
* 绑定的码，没有是null
*/
public String getRuiCode() {
if (ps == null) {
return "";
}
return ps.getString(B_PKG_RUIDCODE, "");
}
/**
......
video/app/src/main/java/com/duben/roseplaylet/mvp/model/DrawCashBean.kt
View file @ d70d540d
......@@ -10,13 +10,15 @@ data class DrawCashBean(
val canCashoutMoney: Double,
val cashOutMinLimit: Int,
val frozenMoney: Double,
val frozenCoin: Int,
val canCashoutCoin: Int,
val miniLimit: Int,
val rewardCoin: Int
) : java.io.Serializable
data class AlipayMsgBean(
val idcard: Int,
val alipayAccount: Int,
val idcard: String,
val alipayAccount: String,
val idcardName: String
) : java.io.Serializable
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/model/UserBean.java
View file @ d70d540d
......@@ -32,6 +32,33 @@ public class UserBean implements Serializable {
private String age;//年龄
private String headerUrl;//头像
private boolean alipaySet;//提现支付宝账号 是否设置了，计划采用竞品方案，现在openid 不唯一了，没有uid
private boolean canUpdateRuidCode;//能不能有绑定的输出框
private boolean canHaveRuidCode;//能不能有绑定的输出框
private String ruidCode;//绑定的码，没有是null
public boolean isCanUpdateRuidCode() {
return canUpdateRuidCode;
}
public void setCanUpdateRuidCode(boolean canUpdateRuidCode) {
this.canUpdateRuidCode = canUpdateRuidCode;
}
public boolean isCanHaveRuidCode() {
return canHaveRuidCode;
}
public void setCanHaveRuidCode(boolean canHaveRuidCode) {
this.canHaveRuidCode = canHaveRuidCode;
}
public String getRuidCode() {
return ruidCode;
}
public void setRuidCode(String ruidCode) {
this.ruidCode = ruidCode;
}
public int getSex() {
return sex;
......
video/app/src/main/java/com/duben/roseplaylet/mvp/model/UserProfileData.kt
View file @ d70d540d
......@@ -37,5 +37,6 @@ data class UserProfileData(
var tagsOther: String? = null,
var uid: Long = 0,
var updateCount: Int = 0,
var userHeight: String? = null
var userHeight: String? = null,
var showTip: Boolean = false
) : java.io.Serializable
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/BasicUserProfilePresenter.kt
View file @ d70d540d
......@@ -6,10 +6,43 @@ import com.duben.roseplaylet.manager.AppHttpManager
import com.duben.roseplaylet.mvp.model.BaseResponse
import com.duben.roseplaylet.mvp.model.UserProfileData
import com.duben.roseplaylet.mvp.views.BasicUserProfileView
import com.google.gson.JsonObject
import java.util.HashMap
class BasicUserProfilePresenter : BasePresenter<BasicUserProfileView>() {
fun updateRuserShareCode(shareCode: String) {
val vo = HashMap<String, Any>()
vo["shareCode"] = shareCode
AppHttpManager.getInstance(loanApplication)
.call(loanService.updateRuserShareCode(vo),
object : BaseSubscriber<BaseResponse<JsonObject>>() {
override fun onCompleted() {
if (isLinkView) return
}
override fun onError(e: Throwable) {
if (isLinkView) return
view.showToast(e.message)
}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
if (isLinkView) return
val code = baseResponse.status
val message = baseResponse.message
when (code) {
200 -> {}
else -> {
view.showToast(message)
}
}
}
})
}
fun initBasicInfo(birthday: String, nickName: String, sex: Int, headerUrl: String) {
val vo = HashMap<String, Any>()
vo["birthday"] = birthday
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/UserProfilePresenter.kt
View file @ d70d540d
......@@ -29,11 +29,7 @@ class UserProfilePresenter : BasePresenter<UserProfileView>() {
when (code) {
200 -> {
var toLikeStatus = 0
if (status == 0) {
toLikeStatus = 1
}
view.toLikeSuc(toLikeStatus)
view.toLikeSuc(status)
}
else -> {
view.toLikeFail()
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/AlbumActivity.kt
View file @ d70d540d
......@@ -11,6 +11,7 @@ import android.os.Handler
import android.os.Looper
import android.text.TextUtils
import android.view.View
import androidx.core.app.ActivityCompat
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.roseplaylet.R
import com.duben.roseplaylet.common.OssType
......@@ -153,7 +154,13 @@ class AlbumActivity : BaseActivity(), View.OnClickListener, AlbumView {
.forResult(PictureConfig.CHOOSE_REQUEST)
} else {
LogUtil.d("AAAAAAAAA" + deniedList)
showMissingPermissionDialog("存储 相机")
val shouldShowRequestPermissionRationale =
ActivityCompat.shouldShowRequestPermissionRationale(
this,
Manifest.permission.READ_EXTERNAL_STORAGE
)
showMissingPermissionDialog("[ 存储 相机 ]")
}
}
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/AuthCenterActivity.kt
View file @ d70d540d
......@@ -4,6 +4,7 @@ import android.graphics.Color
import android.view.View
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.roseplaylet.R
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.ui.activitys.base.BaseActivity
import kotlinx.android.synthetic.main.activity_auth_center.*
import kotlinx.android.synthetic.main.header_layout.*
......@@ -40,6 +41,11 @@ class AuthCenterActivity : BaseActivity(), View.OnClickListener {
when (v?.id) {
R.id.iv_left_icon -> finish()
R.id.iv_auth_avatar -> {
if (UserManager.getInstance().idcardStatus == 2) {
showToast("正在认证审核中")
return
}
readyGo(RealAuthActivity::class.java)
}
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/BasicUserProfileActivity.kt
View file @ d70d540d
......@@ -5,7 +5,6 @@ import android.app.Activity
import android.content.Intent
import android.content.pm.ActivityInfo
import android.graphics.Color
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.text.TextUtils
......@@ -17,6 +16,8 @@ import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.roseplaylet.common.OssType
import com.duben.roseplaylet.common.UserProfile
import com.duben.roseplaylet.manager.OssManager
import com.duben.roseplaylet.manager.UserHelper
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.model.PickBean
import com.duben.roseplaylet.mvp.presenters.BasicUserProfilePresenter
import com.duben.roseplaylet.mvp.views.BasicUserProfileView
......@@ -44,6 +45,8 @@ import java.io.File
*/
class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUserProfileView {
private val userManager by lazy { UserManager.getInstance() }
private var mSinglePickDialog: SinglePickDialog? = null
private var avatarUrl: String? = null
......@@ -52,9 +55,9 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
private val basicUserProfilePresenter by lazy { BasicUserProfilePresenter() }
override fun getBundleExtras(extras: Bundle?) {
super.getBundleExtras(extras)
}
override fun toggleOverridePendingTransition() = true
override fun getOverridePendingTransitionMode() = TransitionMode.BOTTOM
override fun getContentViewLayoutID() = R.layout.activity_basic_user_profile
......@@ -64,10 +67,17 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
basicUserProfilePresenter.attachView(this)
tv_title.text = "完善资料"
tv_title.setTextColor(Color.WHITE)
iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_white)
line.visibility = View.GONE
if (UserHelper.instance.isBpkg()) {
// B包不能退出
iv_left_icon.visibility = View.GONE
} else {
iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_close_white)
}
initView()
initListener()
}
......@@ -80,6 +90,24 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
1
}
}
if (UserHelper.instance.isBpkg()) {
if (userManager.isCanUpdateRuidCode) {
// 有绑定的输出框
et_ruid_code.visibility = View.VISIBLE
} else {
et_ruid_code.visibility = View.GONE
}
if (userManager.isCanHaveRuidCode) {
// 能修改邀请码
et_ruid_code.isEnabled = true
} else {
et_ruid_code.isEnabled = false
et_ruid_code.setText(userManager.ruiCode)
}
} else {
et_ruid_code.visibility = View.GONE
}
}
override fun onClick(v: View?) {
......@@ -119,6 +147,16 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
avatarUrl = ""
}
if (UserHelper.instance.isBpkg()
&& userManager.isCanUpdateRuidCode
&& userManager.isCanHaveRuidCode
&& et_ruid_code.text.toString().isNotEmpty()
) {
basicUserProfilePresenter.updateRuserShareCode(et_ruid_code.text.toString())
}
basicUserProfilePresenter.initBasicInfo("$age-1-1", nickname, sex, avatarUrl!!)
}
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/BindAliPayActivity.kt
View file @ d70d540d
package com.duben.roseplaylet.ui.activitys
import android.graphics.Color
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.text.TextUtils
import android.view.View
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.roseplaylet.R
import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.mvp.model.AlipayMsgBean
import com.duben.roseplaylet.mvp.model.DrawCashBean
import com.duben.roseplaylet.mvp.model.VipBean
......@@ -22,16 +26,64 @@ import kotlinx.android.synthetic.main.header_layout.*
*/
class BindAliPayActivity : BaseActivity(), View.OnClickListener, DrawCashView {
private var data: AlipayMsgBean? = null
private val drawCashPresenter by lazy { DrawCashPresenter() }
override fun getContentViewLayoutID() = R.layout.activity_bind_alipay
override fun getBundleExtras(extras: Bundle?) {
super.getBundleExtras(extras)
extras?.let {
data = it.getSerializable(Constant.ALIPAY_AUTH_DATA) as AlipayMsgBean?
}
}
override fun initViewsAndEvents() {
drawCashPresenter.attachView(this)
initHeader()
initView()
initListener()
data?.let {
if (it.alipayAccount.isNotEmpty()
&& it.idcard.isNotEmpty()
&& it.idcardName.isNotEmpty()
) {
et_name.hint = maskName(it.idcardName)
et_account.hint = maskPhoneNumber(it.alipayAccount)
et_idcard_no.hint = maskIdCard(it.idcard)
}
}
}
private fun maskName(name: String): String {
if (name.length <= 1) {
return name
}
val masked = StringBuilder()
masked.append(name[0])
for (i in 1 until name.length) {
masked.append("*")
}
return masked.toString()
}
private fun maskIdCard(idCard: String): String {
if (idCard.length != 18) {
return idCard
}
val start = idCard.substring(0, 6)
val end = idCard.substring(14)
return "$start******$end"
}
private fun maskPhoneNumber(phoneNumber: String): String {
if (phoneNumber.length != 11) {
return phoneNumber
}
return phoneNumber.substring(0, 3) + "****" + phoneNumber.substring(7)
}
private fun initView() {}
......@@ -62,17 +114,17 @@ class BindAliPayActivity : BaseActivity(), View.OnClickListener, DrawCashView {
val name = et_name.text.toString()
val idcard_no = et_idcard_no.text.toString()
if (TextUtils.isEmpty(account)) {
if (TextUtils.isEmpty(account) || account.contains("*")) {
showToast("请填写支付宝账号")
return
}
if (TextUtils.isEmpty(name)) {
if (TextUtils.isEmpty(name) || name.contains("*")) {
showToast("请填写您的真实姓名")
return
}
if (TextUtils.isEmpty(idcard_no)) {
if (TextUtils.isEmpty(idcard_no) || idcard_no.contains("*")) {
showToast("请填写真实身份证号")
return
}
......@@ -107,7 +159,9 @@ class BindAliPayActivity : BaseActivity(), View.OnClickListener, DrawCashView {
override fun updateAlipayMsgSuc() {
showToast("支付宝绑定成功！")
finish()
Handler(Looper.getMainLooper()).postDelayed({
finish()
}, 500)
}
override fun updateAlipayMsgFail() {}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/BindMobileActivity.kt
View file @ d70d540d
......@@ -177,7 +177,7 @@ class BindMobileActivity : BaseActivity(), LoginView, View.OnClickListener {
tv_title.text = "绑定手机号"
tvLoginNext.text = "确认绑定"
iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_bottom)
iv_left_icon.setImageResource(R.mipmap.ic_close_white)
BackInputUtil.phoneNumAddSpace(etLoginMobile)
mobile = UserManager.getInstance().mobile
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/CommonDataActivity.kt
View file @ d70d540d
......@@ -18,7 +18,6 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener
import com.scwang.smartrefresh.layout.listener.OnRefreshListener
import kotlinx.android.synthetic.main.activity_common_data.*
import kotlinx.android.synthetic.main.fragment_square_list.*
import kotlinx.android.synthetic.main.header_layout.*
class CommonDataActivity : BaseActivity(), View.OnClickListener, OnRefreshListener, CommonView,
......@@ -61,9 +60,6 @@ class CommonDataActivity : BaseActivity(), View.OnClickListener, OnRefreshListen
2 -> {
// 看过我的
tv_title.text = "看过我的"
if (!UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1) {
tv_see_vip.visibility = View.VISIBLE
}
}
}
......@@ -74,8 +70,10 @@ class CommonDataActivity : BaseActivity(), View.OnClickListener, OnRefreshListen
private fun initRecy() {
commonListAdapter = CommonListAdapter()
if (mType == 2 && !UserManager.getInstance().vipFlag) {
commonListAdapter.setIsBlur(true)
if (mType == 2) {
if (UserManager.getInstance().userSex == 1 && !UserManager.getInstance().vipFlag) {
commonListAdapter.setIsBlur(true)
}
commonListAdapter.setIsLike(false)
} else {
commonListAdapter.setIsBlur(false)
......@@ -113,9 +111,15 @@ class CommonDataActivity : BaseActivity(), View.OnClickListener, OnRefreshListen
}
commonListAdapter.setOnClickLikeListener(object : CommonListAdapter.OnClickLikeListener {
override fun onClickLike(position: Int) {
if (mType == 1) return
val likeStatus = if (commonListAdapter.data[position].likeStatus == 0) {
1
} else {
0
}
commonPresenter.toLike(
commonListAdapter.data[position].uid.toString(),
commonListAdapter.data[position].likeStatus,
likeStatus,
position
)
}
......@@ -180,19 +184,22 @@ class CommonDataActivity : BaseActivity(), View.OnClickListener, OnRefreshListen
if (::commonListAdapter.isInitialized) {
if (page == 1) {
if (data.list.size > 0 && mType == 2) {
// 谁看过我
tv_see_count.visibility = View.VISIBLE
if (data.list.size > 10) {
tv_see_count.text = "10+位小姐姐对你感兴趣~"
} else {
tv_see_count.text = "" + data.list.size + "位小姐姐对你感兴趣~"
if (!UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1) {
tv_see_vip.visibility = View.VISIBLE
tv_see_count.visibility = View.VISIBLE
// 谁看过我
if (data.list.size > 10) {
tv_see_count.text = "10+位小姐姐对你感兴趣~"
} else {
tv_see_count.text = "" + data.list.size + "位小姐姐对你感兴趣~"
}
}
} else if (data.list.size > 0 && (mType == 0 || mType == 1)) {
tv_tips.visibility = View.VISIBLE
}
if (data.list.size < pageSize) {
srl_square.finishLoadMoreWithNoMoreData()
srl_data.finishLoadMoreWithNoMoreData()
}
srl_data.finishRefresh(true)
......@@ -208,7 +215,9 @@ class CommonDataActivity : BaseActivity(), View.OnClickListener, OnRefreshListen
}
}
override fun getCommonDataFail() {}
override fun getCommonDataFail() {
srl_data.resetNoMoreData()
}
override fun toLikeSuc(position: Int) {
if (commonListAdapter.data[position].likeStatus == 0) {
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/DrawCashActivity.kt
View file @ d70d540d
package com.duben.roseplaylet.ui.activitys
import android.graphics.Color
import android.os.Bundle
import android.text.Editable
import android.text.TextUtils
import android.text.TextWatcher
......@@ -28,6 +29,8 @@ class DrawCashActivity : BaseActivity(), View.OnClickListener, DrawCashView {
private var maxInput = 0
private var minInput = 0
private var alipayMsg: AlipayMsgBean? = null
private var drawCashType = Constant.ALI_DRAW_CASH// 提现类型
private val drawCashPresenter by lazy { DrawCashPresenter() }
......@@ -41,10 +44,14 @@ class DrawCashActivity : BaseActivity(), View.OnClickListener, DrawCashView {
initView()
initListener()
drawCashPresenter.getAlipayMsg()
drawCashPresenter.getCashouBaseMsg()
}
override fun onResume() {
super.onResume()
drawCashPresenter.getAlipayMsg()
}
private fun initView() {
et_draw_cash.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
......@@ -106,7 +113,9 @@ class DrawCashActivity : BaseActivity(), View.OnClickListener, DrawCashView {
}
R.id.ll_draw_cash_alipay -> {
// 绑定支付宝
readyGo(BindAliPayActivity::class.java)
val bundle = Bundle()
bundle.putSerializable(Constant.ALIPAY_AUTH_DATA, alipayMsg)
readyGo(BindAliPayActivity::class.java, bundle)
}
R.id.ll_draw_cash_wx -> {
}
......@@ -114,7 +123,7 @@ class DrawCashActivity : BaseActivity(), View.OnClickListener, DrawCashView {
}
private fun setDrawCashContent(type: String, isBind: Boolean) {
if (TextUtils.equals(type, Constant.WECHAT_DRAW_CASH)) {
if (TextUtils.equals(type, Constant.ALI_DRAW_CASH)) {
drawCashType = Constant.WECHAT_DRAW_CASH
iv_draw_cash_wx.setImageResource(R.mipmap.ic_vip_enable_blue)
iv_draw_cash_alipay.setImageResource(R.mipmap.ic_vip_none)
......@@ -134,8 +143,8 @@ class DrawCashActivity : BaseActivity(), View.OnClickListener, DrawCashView {
override fun getVipProductSuc(data: VipBean) {}
override fun getCashouBaseMsgSuc(data: DrawCashBean) {
tv_balance.text = "" + data.canCashoutMoney
tv_cash.text = "" + data.frozenMoney
tv_balance.text = "" + data.canCashoutCoin
tv_cash.text = "" + data.frozenCoin
if (data.cashOutMinLimit == 0) {
minInput = 0
maxInput = 0
......@@ -150,13 +159,14 @@ class DrawCashActivity : BaseActivity(), View.OnClickListener, DrawCashView {
override fun getCashouBaseMsgFail() {}
override fun addCashoutReqSuc() {
showToast("提现成功！")
}
override fun addCashoutReqFail() {}
override fun getAlipayMsgSuc(data: AlipayMsgBean) {
if (data.alipayAccount > 0) {
alipayMsg = data
if (data.alipayAccount.isNotEmpty()) {
setDrawCashContent(Constant.ALI_DRAW_CASH, true)
} else {
setDrawCashContent(Constant.ALI_DRAW_CASH, false)
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/MainActivity.kt
View file @ d70d540d
......@@ -134,9 +134,9 @@ class MainActivity : BaseActivity(), View.OnClickListener {
override fun onClick(view: View) {
if (!UserHelper.instance.isUserHaveBasic()
|| !UserHelper.instance.isUserAuth()
) return
if (!UserHelper.instance.isUserHaveBasic()) return
// 弹出真人认证
UserHelper.instance.isUserAuth()
when (view.id) {
R.id.tab_rl_video -> clickTab1Layout()
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/RealAuthActivity.kt
View file @ d70d540d
......@@ -554,7 +554,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
PermissionX.init(this)
.permissions(
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
// Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA
)
.request { allGranted: Boolean, _: List<String?>?, _: List<String?>? ->
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/ShareActivity.kt
View file @ d70d540d
......@@ -100,6 +100,9 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
showToast("请填写邀请码！")
return
}
if (TextUtils.equals("已绑定", tv_bind.text.toString()))
return
invitePresenter.updateRuserShareCode(et_code.text.toString())
}
R.id.tv_share_img -> {
......@@ -156,10 +159,10 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
if (TextUtils.isEmpty(sharePageMsg.rUserShareCode)) {
et_code.isEnabled = true
} else {
tv_bind.text = "已绑定"
et_code.isEnabled = false
et_code.setText(sharePageMsg.rUserShareCode)
}
tv_share_count.text = SpanUtils()
.append("" + sharePageMsg.count)
.setForegroundColor(ContextCompat.getColor(this, R.color.color_FF5967))
......@@ -209,6 +212,7 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
override fun updateRuserShareCodeSuc() {
showToast("绑定邀请码成功！")
et_code.isEnabled = false
tv_bind.text = "已绑定"
}
override fun updateRuserShareCodeFail() {
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/UserProfileActivity.kt
View file @ d70d540d
......@@ -2,14 +2,17 @@ package com.duben.roseplaylet.ui.activitys
import android.app.Dialog
import android.graphics.Color
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.duben.library.utils.GlideUtils
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.roseplaylet.MintsApplication
......@@ -34,8 +37,6 @@ import com.google.gson.Gson
import kotlinx.android.synthetic.main.activity_user_profile.*
import kotlinx.android.synthetic.main.layout_user_profile_case.*
import kotlinx.android.synthetic.main.layout_user_profile_head.*
import net.center.blurview.ShapeBlurView
import net.center.blurview.enu.BlurMode
import kotlin.math.abs
/**
......@@ -78,10 +79,6 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
userProfilePresenter.getMorePage(toUid)
}
override fun onResume() {
super.onResume()
}
private fun initView() {
if (userIsMale) {
// 男性
......@@ -90,7 +87,7 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
tv_wechat.visibility = View.GONE
rl_top_female.visibility = View.GONE
fl_head_male.visibility = View.VISIBLE
tv_days.visibility = View.VISIBLE
ll_days.visibility = View.VISIBLE
ll_impression.visibility = View.GONE
tv_info_7.visibility = View.VISIBLE
} else {
......@@ -100,7 +97,7 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
tv_wechat.visibility = View.VISIBLE
rl_top_female.visibility = View.VISIBLE
fl_head_male.visibility = View.GONE
tv_days.visibility = View.GONE
ll_days.visibility = View.GONE
ll_impression.visibility = View.VISIBLE
tv_info_5.visibility = View.VISIBLE
}
......@@ -143,7 +140,7 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
}
R.id.iv_like, R.id.tv_like_male -> {
userProfileData?.let {
if (UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1) {
if (!UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1) {
// 是男性且未开通VIP
val bundle = Bundle()
bundle.putString(VipActivity.OTHER_USER_ID, "" + it.uid)
......@@ -177,15 +174,18 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
userProfilePresenter.seeWechat(toUid)
}
} else {
if (UserManager.getInstance().idcardStatus == 1) {
// 直接聊
IMHelper.instance.startChatActivity("" + it.uid)
} else if (UserManager.getInstance().idcardStatus == 2) {
showToast("正在认证审核中")
return
} else {
// 女性 弹出认证弹框
UserHelper.instance.showRealAuthDialog()
when (UserManager.getInstance().idcardStatus) {
1 -> {
// 直接聊
IMHelper.instance.startChatActivity("" + it.uid)
}
2 -> {
showToast("正在认证审核中")
}
else -> {
// 女性 弹出认证弹框
UserHelper.instance.showRealAuthDialog()
}
}
}
}
......@@ -218,14 +218,17 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
userProfileData?.let {
if (UserManager.getInstance().userSex == 1 && !UserManager.getInstance().vipFlag) {
// 当前用户是否为男性，且不是VIP
if (it.canSeeSurCount <= 0) {
// 设置模糊
setViewBlur()
if (it.canSee) {
setViewBlur(true)
} else {
blurview.visibility = View.GONE
setViewBlur(false)
}
if (it.showTip) {
// 只要不是VIP 就弹解锁资料
showProfileCountDialog(it.canSeeSurCount)
}
// 只要不是VIP 就弹解锁资料
showProfileCountDialog(it.canSeeSurCount)
}
if (!TextUtils.isEmpty(it.images)) {
......@@ -268,7 +271,7 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
// tv_label_vip.visibility = View.GONE
// }
} else {
GlideUtils.loadThumbImageView(this, it.headerUrl, iv_avatar_female)
GlideUtils.loadHighRoundImageView(this, it.headerUrl, iv_avatar_female)
if (TextUtils.isEmpty(it.introduce)) {
tv_introduce_text.text = "不知道写什么耶，哥哥帮我想想～"
} else {
......@@ -292,8 +295,10 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
GlideUtils.loadThumbImageView(this, it.headerUrl, iv_head_avatar)
if (it.likeStatus == 0) {
tv_like_male.text = "喜欢"
iv_like.setImageResource(R.mipmap.ic_like_status_0)
} else {
tv_like_male.text = "不喜欢"
iv_like.setImageResource(R.mipmap.ic_like_status_1)
}
......@@ -396,7 +401,7 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
override fun getMorePageFail() {
// 不能看隐藏
setViewBlur()
setViewBlur(true)
}
override fun seeWechatSuc(data: SeeWechat) {
......@@ -457,8 +462,16 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
override fun toLikeSuc(status: Int) {
if (status == 0) {
userProfileData?.let {
tv_like_count.text = "" + (it.likeCount - 1) + "人喜欢"
}
tv_like_male.text = "喜欢"
iv_like.setImageResource(R.mipmap.ic_like_status_0)
} else {
userProfileData?.let {
tv_like_count.text = "" + (it.likeCount + 1) + "人喜欢"
}
tv_like_male.text = "不喜欢"
iv_like.setImageResource(R.mipmap.ic_like_status_1)
}
}
......@@ -660,10 +673,29 @@ class UserProfileActivity : BaseActivity(), View.OnClickListener, UserProfileVie
return Color.argb(alpha, 35, 33, 34)
}
private fun setViewBlur() {
blurview.visibility = View.VISIBLE
blurview?.refreshView(
ShapeBlurView.build(this).setBlurMode(BlurMode.MODE_RECTANGLE)
)
private fun setViewBlur(showBlur: Boolean) {
rcy_profile_album.addOnItemTouchListener(object : RecyclerView.OnItemTouchListener {
override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
return showBlur
}
override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {}
override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
})
if (showBlur) {
blurview.visibility = View.VISIBLE
blurview_head.visibility = View.VISIBLE
val windowBackground: Drawable = container.background
blurview.setupWith(fl_content)
.setFrameClearDrawable(windowBackground)
.setBlurRadius(10f)
blurview_head.setupWith(rl_top_female)
.setFrameClearDrawable(windowBackground)
.setBlurRadius(10f)
} else {
blurview.visibility = View.GONE
blurview_head.visibility = View.GONE
}
}
}
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/WalletActivity.kt
View file @ d70d540d
package com.duben.roseplaylet.ui.activitys
import android.app.Dialog
import android.content.Intent
import android.graphics.Color
import android.net.Uri
......@@ -22,6 +23,8 @@ import com.duben.roseplaylet.mvp.presenters.DrawCashPresenter
import com.duben.roseplaylet.mvp.views.DrawCashView
import com.duben.roseplaylet.ui.activitys.base.BaseActivity
import com.duben.roseplaylet.ui.adapter.CoinAdapter
import com.duben.roseplaylet.ui.widgets.CustomDialogAgreement
import com.duben.roseplaylet.ui.widgets.DialogListener
import com.jobo.alipay.AliPay
import com.jobo.alipay.AlipayInfoImpl
import com.jobo.rxpay.RxPay
......@@ -44,6 +47,8 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
private val userManager by lazy { UserManager.getInstance() }
private var isCheckAgreeFlag: Boolean = false
private lateinit var coinAdapter: CoinAdapter
private var beansData: MutableList<VipBean.ListBean> = mutableListOf()
private val drawCashPresenter by lazy { DrawCashPresenter() }
......@@ -94,8 +99,8 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_white)
line.visibility = View.GONE
tv_right.visibility = View.VISIBLE
tv_right.text = "明细"
// tv_right.visibility = View.VISIBLE
// tv_right.text = "明细"
}
private fun initListener() {
......@@ -109,6 +114,11 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
btn_alipay.setOnClickListener(this)
btn_wxpay.setOnClickListener(this)
tv_agreement.setOnClickListener(this)
cb_agreement.setOnCheckedChangeListener { _, isChecked ->
isCheckAgreeFlag = isChecked
}
}
override fun isApplyKitKatTranslucency() = false
......@@ -120,6 +130,12 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
R.id.iv_left_icon -> finish()
R.id.tv_right -> {
}
R.id.tv_agreement -> {
val bundle = Bundle()
bundle.putString(WebActivity.WEB_TITLE, getString(R.string.members_name))
bundle.putString(WebActivity.WEB_URL, Constant.MEMBERS_URL)
readyGo(WebActivity::class.java, bundle)
}
R.id.tv_cash_label -> {
readyGo(DrawCashActivity::class.java)
......@@ -134,6 +150,13 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
readyGo(ShareActivity::class.java)
}
R.id.btn_alipay -> {
if (beansData.isEmpty()) return
val vipBean = beansData[coinAdapter.getPosition()]
if (!isCheckAgreeFlag) {
vipAgreementDialog(vipBean, Constant.ALI_PAY)
return
}
// 支付宝支付
beansData.let {
val vipBean = it[coinAdapter.getPosition()]
......@@ -145,6 +168,12 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
}
}
R.id.btn_wxpay -> {
if (beansData.isEmpty()) return
val vipBean = beansData[coinAdapter.getPosition()]
if (!isCheckAgreeFlag) {
vipAgreementDialog(vipBean, Constant.WECHAT_PAY)
return
}
// 微信支付
beansData.let {
val vipBean = it[coinAdapter.getPosition()]
......@@ -158,6 +187,32 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
}
}
private fun vipAgreementDialog(bean: VipBean.ListBean, payType: String) {
val agreeStr = "会员付费协议"
val cdaa = CustomDialogAgreement(context, object : DialogListener() {
override fun onClick(dialog: Dialog?, v: View?) {
dialog?.dismiss()
when (v?.id) {
R.id.dialog_btn_right -> {
cb_agreement.isChecked = true
drawCashPresenter.getVipPayParams(
payType,
bean.pid,
VipActivity.ENTER_TYPE_ACTIVITY
)
}
}
}
})
cdaa.setTitle(agreeStr)
cdaa.setContent(agreeStr)
cdaa.setLeft("不同意")
cdaa.setLeftColor(R.color.gray)
cdaa.setRight("同意")
cdaa.setRightColor(R.color.main_mints)
cdaa.show()
}
override fun getVipProductSuc(data: VipBean) {
if (data.beansList.isEmpty()) return
beansData = data.beansList
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/CoinAdapter.kt
View file @ d70d540d
......@@ -31,11 +31,12 @@ class CoinAdapter : BaseQuickAdapter<VipBean.ListBean, BaseViewHolder>(R.layout.
val itemView = holder.getView<View>(R.id.item_view)
if (holder.adapterPosition == selectPosition) {
itemView.setBackgroundResource(R.mipmap.bg_drawcash_item)
viewCoin.setTextColor(ContextCompat.getColor(context, R.color.color_F6DA8F))
view.setTextColor(ContextCompat.getColor(context, R.color.color_F6DA8F))
} else {
viewCoin.setTextColor(ContextCompat.getColor(context, R.color.color_7E4A17))
view.setTextColor(ContextCompat.getColor(context, R.color.color_7E4A17))
} else {
viewCoin.setTextColor(ContextCompat.getColor(context, R.color.color_F6DA8F))
view.setTextColor(ContextCompat.getColor(context, R.color.color_F6DA8F))
itemView.setBackgroundResource(R.drawable.shape_coin_gray)
}
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/CommonListAdapter.kt
View file @ d70d540d
......@@ -3,14 +3,11 @@ package com.duben.roseplaylet.ui.adapter
import android.view.View
import android.widget.ImageView
import android.widget.TextView
import com.airbnb.lottie.LottieAnimationView
import com.airbnb.lottie.LottieComposition
import com.airbnb.lottie.LottieCompositionFactory
import com.airbnb.lottie.LottieDrawable
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.R
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.model.*
class CommonListAdapter : BaseQuickAdapter<UserData, BaseViewHolder>(R.layout.item_common_data) {
......@@ -21,7 +18,7 @@ class CommonListAdapter : BaseQuickAdapter<UserData, BaseViewHolder>(R.layout.it
override fun convert(holder: BaseViewHolder, item: UserData) {
holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
holder.getView<TextView>(R.id.tv_recommend_info).text =
item.age + " " + item.lastCity + " " + item.career
item.age + "岁 " + item.lastCity + " " + item.career
val tvRealLabel = holder.getView<ImageView>(R.id.tv_real_label)
if (item.idcardStatus == 1) {
......@@ -30,22 +27,22 @@ class CommonListAdapter : BaseQuickAdapter<UserData, BaseViewHolder>(R.layout.it
tvRealLabel.visibility = View.GONE
}
if (isBlur) {
if (isBlur && UserManager.getInstance().userSex == 1) {
GlideUtils.loadBlurImageView(
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header)
)
} else {
GlideUtils.loadImageViewNoAnim2(
GlideUtils.loadThumbImageView(
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header)
)
}
val viewDate = holder.getView<TextView>(R.id.tv_recommend_date)
val viewHeart = holder.getView<ImageView>(R.id.iv_recommend_heart)
val viewDate = holder.getView<TextView>(R.id.tv_recommend_date)
if (isLike) {
viewHeart.visibility = View.VISIBLE
......@@ -59,9 +56,9 @@ class CommonListAdapter : BaseQuickAdapter<UserData, BaseViewHolder>(R.layout.it
mOnClickLikeListener?.onClickLike(holder.adapterPosition)
}
} else {
viewDate.text = item.rtime
viewHeart.visibility = View.GONE
viewDate.visibility = View.VISIBLE
viewDate.text = item.rtime + "前"
viewHeart.visibility = View.GONE
}
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/ShareRankAdapter.kt
View file @ d70d540d
......@@ -37,7 +37,8 @@ class ShareRankAdapter : BaseQuickAdapter<ShareRank, BaseViewHolder>(R.layout.it
else -> {
tvView.visibility = View.VISIBLE
ivView.visibility = View.GONE
holder.getView<TextView>(R.id.tv_rank_count).text = "" + holder.adapterPosition + 1
holder.getView<TextView>(R.id.tv_rank_count).text =
"" + (holder.adapterPosition + 1)
}
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/SquareAdapter.kt
View file @ d70d540d
package com.duben.roseplaylet.ui.adapter
import android.content.Intent
import android.os.Bundle
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.LinearLayout
......@@ -12,12 +13,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.R
import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.model.HallList
import com.duben.roseplaylet.ui.activitys.UserProfileActivity
import com.google.gson.Gson
import kotlinx.android.synthetic.main.activity_user_profile.*
import eightbitlab.com.blurview.BlurView
class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layout.item_square) {
......@@ -26,7 +25,6 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
private var isBlur = false
override fun convert(holder: BaseViewHolder, item: HallList.ListDTO) {
holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
if (!item.distance.isNullOrEmpty()) {
holder.getView<TextView>(R.id.tv_recommend_location).text = "" + item.distance + "KM"
} else {
......@@ -51,6 +49,18 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
holder.getView<TextView>(R.id.tv_recommend_online).visibility = View.GONE
}
val blurViewHead = holder.getView<BlurView>(R.id.item_blurview_head)
if (isBlur) {
holder.getView<TextView>(R.id.tv_recommend_name).text = "****"
blurViewHead.visibility = View.VISIBLE
blurViewHead.setupWith(holder.itemView as ViewGroup)
.setFrameClearDrawable(holder.itemView.background)
.setBlurRadius(10f)
} else {
holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
blurViewHead.visibility = View.GONE
}
GlideUtils.loadThumbRoundImageView(
holder.itemView.context,
item.headerUrl,
......@@ -92,14 +102,31 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
holder.getView<LinearLayout>(R.id.ll_recommend_root)
.setBackgroundResource(R.drawable.shape_bg_black)
GlideUtils.loadIsThumbBlurImageView(
GlideUtils.loadThumbRoundImageView(
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header),
10f,
isBlur
)
val blurViewHead = holder.getView<BlurView>(R.id.item_blurview_head)
val blurViewImages = holder.getView<BlurView>(R.id.item_blurview_images)
if (isBlur) {
holder.getView<TextView>(R.id.tv_recommend_name).text = "****"
blurViewHead.visibility = View.VISIBLE
blurViewHead.setupWith(holder.itemView as ViewGroup)
.setFrameClearDrawable(ColorDrawable(Color.RED))
.setBlurRadius(30f)
blurViewImages.visibility = View.VISIBLE
blurViewImages.setupWith(holder.itemView as ViewGroup)
.setFrameClearDrawable(ColorDrawable(Color.RED))
.setBlurRadius(30f)
} else {
holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
blurViewHead.visibility = View.GONE
blurViewImages.visibility = View.GONE
}
holder.getView<RelativeLayout>(R.id.rl_album).visibility = View.VISIBLE
holder.getView<TextView>(R.id.tv_status).visibility = View.VISIBLE
holder.getView<TextView>(R.id.tv_status).text = item.hallTime
......@@ -149,14 +176,14 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
view1.visibility = View.VISIBLE
view2.visibility = View.VISIBLE
view3.visibility = View.VISIBLE
GlideUtils.loadIsThumbBlurImageView(
context, array[0], view1, 5f, isBlur
GlideUtils.loadThumbRoundImageView(
context, array[0], view1, 5f
)
GlideUtils.loadIsThumbBlurImageView(
context, array[1], view2, 5f, isBlur
GlideUtils.loadThumbRoundImageView(
context, array[1], view2, 5f
)
GlideUtils.loadIsThumbBlurImageView(
context, array[2], holder.getView(R.id.iv_photo_more), 5f, isBlur
GlideUtils.loadThumbRoundImageView(
context, array[2], holder.getView(R.id.iv_photo_more), 5f
)
holder.getView<TextView>(R.id.tv_more).visibility = View.VISIBLE
holder.getView<TextView>(R.id.tv_more).text = "+${array.size}"
......@@ -164,25 +191,21 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
view1.visibility = View.VISIBLE
view2.visibility = View.VISIBLE
view3.visibility = View.VISIBLE
GlideUtils.loadIsThumbBlurImageView(
context, array[0], view1, 5f, isBlur
)
GlideUtils.loadIsThumbBlurImageView(
context, array[1], view2, 5f, isBlur
)
GlideUtils.loadIsThumbBlurImageView(
context, array[2], holder.getView(R.id.iv_photo_more), 5f, isBlur
GlideUtils.loadThumbRoundImageView(context, array[0], view1, 5f)
GlideUtils.loadThumbRoundImageView(context, array[1], view2, 5f)
GlideUtils.loadThumbRoundImageView(
context, array[2], holder.getView(R.id.iv_photo_more), 5f
)
holder.getView<TextView>(R.id.tv_more).visibility = View.GONE
} else if (array.size == 2) {
view1.visibility = View.VISIBLE
view2.visibility = View.VISIBLE
GlideUtils.loadIsThumbBlurImageView(context, array[0], view1, 5f, isBlur)
GlideUtils.loadIsThumbBlurImageView(context, array[1], view2, 5f, isBlur)
GlideUtils.loadThumbRoundImageView(context, array[0], view1, 5f)
GlideUtils.loadThumbRoundImageView(context, array[1], view2, 5f)
view3.visibility = View.GONE
} else if (array.size == 1) {
view1.visibility = View.VISIBLE
GlideUtils.loadIsThumbBlurImageView(context, array[0], view1, 5f, isBlur)
GlideUtils.loadThumbRoundImageView(context, array[0], view1, 5f)
view2.visibility = View.GONE
view3.visibility = View.GONE
}
......@@ -206,14 +229,6 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
mOnClickLikeListener?.onClickLike(holder.adapterPosition)
}
}
holder.itemView.setOnClickListener {
val intent = Intent(it.context, UserProfileActivity::class.java)
val bundle = Bundle()
bundle.putString(Constant.TO_UID, item.uid.toString())
intent.putExtras(bundle)
it.context.startActivity(intent)
}
}
fun setIsBlur(isBlur: Boolean) {
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MyFragment.kt
View file @ d70d540d
......@@ -19,6 +19,7 @@ import com.duben.roseplaylet.mvp.presenters.MyPresenter
import com.duben.roseplaylet.mvp.views.MyView
import com.duben.roseplaylet.ui.activitys.*
import com.duben.roseplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.duben.roseplaylet.utils.LogUtil
import com.duben.roseplaylet.utils.SpanUtils
import com.duben.roseplaylet.utils.TimeRender
import com.duben.roseplaylet.utils.UIUtils
......@@ -165,9 +166,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
} else {
// 女性展示奖励的金币
tv_my_coin.text = "" + data.rewardCoin
ll_my_auth.visibility = View.VISIBLE
// if (data.idcardStatus == 0) {
// // 女性展示认证页面
// ll_my_auth.visibility = View.VISIBLE
......@@ -215,6 +214,10 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
override fun renderSuccess(adView: FrameLayout?): Boolean {
adView?.let {
it.post {
LogUtil.d("AAAAAAAA" + it.width + "---" + it.height)
}
UIUtils.removeFromParent(it)
fl_ad.removeAllViews()
fl_ad.addView(it)
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/SquareListFragment.kt
View file @ d70d540d
package com.duben.roseplaylet.ui.fragment
import android.app.Dialog
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import androidx.fragment.app.Fragment
import com.duben.roseplaylet.R
import com.duben.roseplaylet.ad.express.MainExpressManager
......@@ -14,13 +16,18 @@ import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.presenters.SquarePresenter
import com.duben.roseplaylet.mvp.views.SquareView
import com.duben.roseplaylet.ui.activitys.ShareActivity
import com.duben.roseplaylet.ui.activitys.UserProfileActivity
import com.duben.roseplaylet.ui.activitys.VipActivity
import com.duben.roseplaylet.ui.adapter.SquareAdapter
import com.duben.roseplaylet.ui.widgets.DialogListener
import com.duben.roseplaylet.ui.widgets.SquareNewDialog
import com.scwang.smartrefresh.layout.listener.OnRefreshListener
import kotlinx.android.synthetic.main.fragment_square_list.*
class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListener,
OnRefreshListener {
companion object {
private const val SQUARE_TYPE = "SQUARE_TYPE"
......@@ -70,8 +77,7 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
private fun initRecy() {
squareAdapter = SquareAdapter()
if (mType == 3 && !UserManager.getInstance().vipFlag
&& UserManager.getInstance().userSex == 1
if (mType == 3 && !UserManager.getInstance().vipFlag && UserManager.getInstance().userSex == 1
) {
squareAdapter.setIsBlur(true)
} else {
......@@ -82,22 +88,57 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
val emptyView =
LayoutInflater.from(requireContext()).inflate(R.layout.item_empty_data, null)
squareAdapter.setEmptyView(emptyView)
squareAdapter.setOnItemChildClickListener { adapter, view, position ->
squareAdapter.setOnItemClickListener { adapter, view, position ->
if (mType == 2 && !UserManager.getInstance().vipFlag) {
showUnlockWechatDialog(squareAdapter.data[position].headerUrl)
return@setOnItemClickListener
}
val bundle = Bundle()
bundle.putString(Constant.TO_UID, squareAdapter.data[position].uid.toString())
readyGo(UserProfileActivity::class.java, bundle)
}
squareAdapter.setOnClickLikeListener(object : SquareAdapter.OnClickLikeListener {
override fun onClickLike(position: Int) {
if (mType == 2 && !UserManager.getInstance().vipFlag) {
showUnlockWechatDialog(squareAdapter.data[position].headerUrl)
return
}
val likeStatus = if (squareAdapter.data[position].likeStatus == 0) {
1
} else {
0
}
squarePresenter.toLike(
squareAdapter.data[position].uid.toString(),
squareAdapter.data[position].likeStatus,
likeStatus,
position
)
}
})
}
private fun showUnlockWechatDialog(headUrl: String) {
SquareNewDialog(
requireContext(),
headUrl,
UserManager.getInstance().userSex,
object : DialogListener() {
override fun onClick(dialog: Dialog?, v: View?) {
super.onClick(dialog, v)
dialog?.dismiss()
when (v?.id) {
R.id.tv_vip_btn -> {
readyGo(ShareActivity::class.java)
}
R.id.tv_vip_coin -> {
readyGo(VipActivity::class.java)
}
else -> {}
}
}
}).show()
}
private fun initListener() {
srl_square.setEnableRefresh(true)
srl_square.setOnRefreshListener(this)
......
video/app/src/main/java/com/duben/roseplaylet/ui/preview/ImagePreviewActivity.java
View file @ d70d540d
......@@ -74,7 +74,7 @@ public class ImagePreviewActivity extends BaseActivity {
mShowImagePagerAdapter = new ShowImagePagerAdapter(getSupportFragmentManager(), getLifecycle());
viewPager.setAdapter(mShowImagePagerAdapter);
viewPager.setCurrentItem(position);
viewPager.setCurrentItem(position, false);
if (mImageList.size() == 1) {
mPosition.setVisibility(View.GONE);
......
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/ClearEditText.java
View file @ d70d540d
......@@ -130,7 +130,6 @@ public class ClearEditText extends EditText implements
this.setAnimation(shakeAnimation(5));
}
/**
* 晃动动画
*
......
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/ShareImageDialog.kt
View file @ d70d540d
......@@ -15,7 +15,6 @@ import cn.sharesdk.framework.ShareSDK
import cn.sharesdk.wechat.friends.Wechat
import cn.sharesdk.wechat.moments.WechatMoments
import com.duben.library.utils.ConstantUtil
import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.MintsApplication
import com.duben.roseplaylet.R
import com.duben.roseplaylet.ui.adapter.SharePagerAdapter
......@@ -31,10 +30,6 @@ class ShareImageDialog(
shareCode: String,
) : Dialog(context, R.style.dialog) {
companion object {
const val IMG_BG_URL = "https://mints-web.mints-id.com/web/app/rose/share1.jpg"
}
private val llDialogShareWx: LinearLayout
private val llDialogShareQq: LinearLayout
private val tvDialogShareNext: TextView
......@@ -79,12 +74,8 @@ class ShareImageDialog(
val inflater = LayoutInflater.from(context)
val view1 = inflater.inflate(R.layout.item_share_view, null)
GlideUtils.loadHighRoundImageView(
context,
IMG_BG_URL,
view1.findViewById(R.id.item_iv_bg)
)
view1.findViewById<ImageView>(R.id.item_iv_bg).setImageResource(R.mipmap.bg_share_poster)
view1.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode)
view1.findViewById<ImageView>(R.id.item_iv_avatar)
.setImageResource(R.mipmap.ic_launcher_main)
......
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/SquareNewDialog.kt 0 → 100644
View file @ d70d540d
package com.duben.roseplaylet.ui.widgets
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.view.KeyEvent
import android.view.View
import android.view.WindowManager
import android.widget.ImageView
import android.widget.TextView
import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.R
class SquareNewDialog(
private val context: Context,
private val headUrl: String?,
private val sex: Int = 0,
private val listener: DialogListener?
) :
Dialog(context, R.style.dialog) {
private val lp: WindowManager.LayoutParams
private val tv_unlock: TextView
private val tv_vip_btn: TextView
private val tv_vip_coin: TextView
private val iv_close: ImageView
private val iv_avatar: ImageView
init {
setContentView(R.layout.dialog_square_new)
// 设置window属性
lp = window!!.attributes
lp.gravity = Gravity.CENTER
lp.width = WindowManager.LayoutParams.MATCH_PARENT
lp.windowAnimations = R.style.DialogAnimFade
window!!.attributes = lp
// 设置外部不可关闭
setCancelable(false)
setCanceledOnTouchOutside(false)
setOnKeyListener { _, i, _ -> i == KeyEvent.KEYCODE_BACK }
tv_unlock = findViewById<View>(R.id.tv_unlock) as TextView
tv_vip_btn = findViewById<View>(R.id.tv_vip_btn) as TextView
tv_vip_coin = findViewById<View>(R.id.tv_vip_coin) as TextView
iv_close = findViewById<View>(R.id.iv_close) as ImageView
iv_avatar = findViewById<View>(R.id.iv_avatar) as ImageView
if (sex == 1) {
tv_vip_btn.visibility = View.GONE
tv_unlock.text = "会员可免费查看新人小姐姐！"
} else {
tv_unlock.text = "会员可免费查看新人小哥哥！"
}
GlideUtils.loadBlurImageView(context, headUrl, iv_avatar)
iv_close.setOnClickListener {
dismiss()
}
listener?.setDialog(this)
tv_vip_btn.setOnClickListener(listener)
tv_vip_coin.setOnClickListener(listener)
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/utils/ForegroundOrBackground.java
View file @ d70d540d
......@@ -88,7 +88,7 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
long diff = currentTimeMillis - activityStoppedTime;
long diffInSeconds = diff / 1000;
System.out.println("mcg -->>>>>:: diffInSeconds=" + diffInSeconds + " adSuccessStatus=" + SplashManager.INSTANCE.isSuccessStatus());
if (diffInSeconds >= 30 && SplashManager.INSTANCE.isSuccessStatus()) {
if (diffInSeconds >= 180 && SplashManager.INSTANCE.isSuccessStatus()) {
activity.startActivity(new Intent(activity, SplashForeAdActivity.class));
}
}
......
video/app/src/main/res/drawable/btn_index_submit.xml
View file @ d70d540d
......@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="345dp" android:height="44dp">
<shape android:shape="rectangle">
<solid android:color="@color/tv_message_recente_money" />
<solid android:color="@color/color_9F6A32" />
<corners android:radius="50dp" />
</shape>
</item>
......
video/app/src/main/res/drawable/btn_index_submit_unchecked.xml
View file @ d70d540d
......@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="345dp" android:height="44dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/tv_message_recente_money" />
<stroke android:width="1dp" android:color="@color/color_9F6A32" />
<solid android:color="#ffffff" />
<corners android:radius="50dp" />
</shape>
......
video/app/src/main/res/drawable/custom_cursor_drawable.xml 0 → 100644
View file @ d70d540d
<?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" /> <!-- 光标颜色 -->
<size
android:width="2dp"
android:height="20dp" /> <!-- 光标大小 -->
</shape>
video/app/src/main/res/drawable/line.xml 0 → 100644
View file @ d70d540d
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<size
android:width="1000dp"
android:height="2dp" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/rb_opinion_selected.xml
View file @ d70d540d
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" android:drawable="@drawable/btn_index_submit" android:state_checked="true"></item>
<item android:color="@color/tv_message_recente_money" android:drawable="@drawable/btn_index_submit_unchecked" android:state_checked="false"></item>
<item android:color="@color/color_9F6A32" android:drawable="@drawable/btn_index_submit_unchecked" android:state_checked="false"></item>
</selector>
\ No newline at end of file
video/app/src/main/res/drawable/shape_label_white.xml
View file @ d70d540d
......@@ -5,6 +5,6 @@
<solid android:color="#FFFFFF" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="3dip" />
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/triangle_right.xml 0 → 100644
View file @ d70d540d
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/color_6F6F71"
android:pathData="M0,0 L24,12 L0,24 Z" />
</vector>
\ No newline at end of file
video/app/src/main/res/layout/activity_alipaytime.xml
View file @ d70d540d
......@@ -16,7 +16,7 @@
android:layout_height="20dp"
android:layout_gravity="right"
android:layout_marginRight="30dp"
android:src="@mipmap/ic_quit_white"></ImageView>
android:src="@mipmap/ic_close_white"></ImageView>
<ImageView
android:layout_width="wrap_content"
......
video/app/src/main/res/layout/activity_basic_user_profile.xml
View file @ d70d540d
......@@ -51,7 +51,7 @@
android:text="上传本人真实清晰近照，能大大提高约会成功率"
android:textColor="@color/color_61616E" />
<EditText
<com.duben.roseplaylet.ui.widgets.ClearEditText
android:id="@+id/et_nickname"
android:layout_width="match_parent"
android:layout_height="45dp"
......@@ -83,6 +83,19 @@
android:textColorHint="@color/color_959595"
android:textSize="14sp" />
<com.duben.roseplaylet.ui.widgets.ClearEditText
android:id="@+id/et_ruid_code"
android:layout_width="200dp"
android:layout_height="45dp"
android:layout_marginTop="40dp"
android:background="@drawable/shape_bg_hall_btn1"
android:gravity="center"
android:hint="请输入邀请码"
android:textColor="@color/white"
android:textColorHint="@color/color_959595"
android:textSize="14sp"
android:visibility="gone" />
<RadioGroup
android:id="@+id/rg_sex"
android:layout_width="match_parent"
......
video/app/src/main/res/layout/activity_bind_alipay.xml
View file @ d70d540d
......@@ -55,7 +55,7 @@
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
<com.duben.roseplaylet.ui.widgets.ClearEditText
android:id="@+id/et_account"
android:layout_width="match_parent"
android:layout_height="50dp"
......@@ -69,7 +69,7 @@
android:paddingEnd="20dp"
android:textSize="16sp" />
<TextView
<com.duben.roseplaylet.ui.widgets.ClearEditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
......@@ -78,7 +78,7 @@
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
<com.duben.roseplaylet.ui.widgets.ClearEditText
android:id="@+id/et_name"
android:layout_width="match_parent"
android:layout_height="50dp"
......@@ -101,7 +101,7 @@
android:textColor="@color/white"
android:textSize="16sp" />
<EditText
<com.duben.roseplaylet.ui.widgets.ClearEditText
android:id="@+id/et_idcard_no"
android:layout_width="match_parent"
android:layout_height="50dp"
......@@ -132,7 +132,6 @@
android:textSize="18sp"
android:textStyle="bold" />
</FrameLayout>
</com.duben.roseplaylet.ui.widgets.ElasticScrollView>
......
video/app/src/main/res/layout/activity_common_data.xml
View file @ d70d540d
......@@ -56,8 +56,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/tv_see_vip"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="120dp"
android:text="2位小姐姐对你感兴趣"
android:textColor="@color/white"
android:textSize="20sp"
......@@ -71,12 +72,18 @@
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="50dp"
android:background="@drawable/shape_chat_tips"
android:background="@drawable/shape_vip_btn"
android:gravity="center"
android:text="VIP查看谁看过"
android:textColor="@color/color_232122"
android:textStyle="bold"
android:visibility="gone" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:src="@mipmap/bg_fire" />
</RelativeLayout>
video/app/src/main/res/layout/activity_drawcash.xml
View file @ d70d540d
<?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"
......@@ -8,22 +9,20 @@
<include layout="@layout/header_layout" />
<com.duben.roseplaylet.ui.widgets.ElasticScrollView
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:overScrollMode="never">
android:layout_height="match_parent">
<FrameLayout
<com.duben.roseplaylet.ui.widgets.ElasticScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="90dp"
......@@ -46,7 +45,7 @@
android:id="@+id/tv_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="15dp"
android:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
......@@ -69,7 +68,7 @@
android:id="@+id/tv_cash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="15dp"
android:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
......@@ -227,7 +226,6 @@
android:background="@null"
android:hint="请输入需要提现的金额"
android:inputType="number"
android:text="100"
android:textSize="18sp" />
<View style="@style/view_line_column_E6E6E6" />
......@@ -297,24 +295,23 @@
</LinearLayout>
</com.duben.roseplaylet.ui.widgets.ElasticScrollView>
<Button
android:id="@+id/btn_drawcash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="30dp"
android:background="@drawable/shape_draw_cash_orange"
android:elevation="2dp"
android:text="提取奖励"
android:textColor="@color/color_31343B"
android:textSize="18sp"
android:textStyle="bold" />
</FrameLayout>
</LinearLayout>
<Button
android:id="@+id/btn_drawcash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="30dp"
android:background="@drawable/shape_draw_cash_orange"
android:elevation="2dp"
android:text="提取奖励"
android:textColor="@color/color_31343B"
android:textSize="18sp"
android:textStyle="bold" />
</FrameLayout>
</com.duben.roseplaylet.ui.widgets.ElasticScrollView>
</LinearLayout>
\ No newline at end of file
video/app/src/main/res/layout/activity_feekback.xml
View file @ d70d540d
......@@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="14dp"
android:background="@color/color_6F6F71"
android:background="@color/color_31343B"
android:gravity="center_vertical">
<TextView
......@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="反馈类型"
android:textColor="@android:color/black"
android:textColor="@android:color/white"
android:textSize="15dp" />
<RadioGroup
......@@ -96,8 +96,9 @@
<EditText
android:id="@+id/etFeedbackContent"
android:layout_width="match_parent"
android:padding="10dp"
android:layout_height="match_parent"
android:background="@color/full_transparent"
android:background="@drawable/shape_et_signature"
android:gravity="top"
android:hint="请留下您的批评、表扬或者建议，我们会虚心听取， 认真改正。(请保持在5-150字内)"
android:textColor="@color/white"
......
video/app/src/main/res/layout/activity_share.xml
View file @ d70d540d
......@@ -21,7 +21,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="420dp"
android:src="@mipmap/bg_share" />
android:src="@mipmap/bg_share_poster" />
<LinearLayout
android:layout_width="match_parent"
......@@ -84,7 +84,7 @@
android:id="@+id/tv_share_img"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="15dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/shape_share_btn"
android:elevation="2dp"
......@@ -98,7 +98,7 @@
android:id="@+id/tv_share_url"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="15dp"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:background="@drawable/shape_share_btn"
android:elevation="2dp"
......
video/app/src/main/res/layout/activity_user_profile.xml
View file @ d70d540d
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg_female">
......@@ -55,6 +56,11 @@
android:text="近日活跃"
android:textColor="@color/white" />
<eightbitlab.com.blurview.BlurView
android:id="@+id/blurview_head"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<View
......@@ -90,6 +96,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<FrameLayout
android:id="@+id/fl_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -292,11 +299,10 @@
</LinearLayout>
<net.center.blurview.ShapeBlurView
<eightbitlab.com.blurview.BlurView
android:id="@+id/blurview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
android:layout_height="match_parent" />
</FrameLayout>
......
video/app/src/main/res/layout/activity_wallet.xml
View file @ d70d540d
......@@ -41,7 +41,7 @@
android:id="@+id/tv_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="15dp"
android:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
......@@ -64,7 +64,7 @@
android:id="@+id/tv_cash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="15dp"
android:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
......@@ -77,12 +77,21 @@
android:id="@+id/tv_cash_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收益(币) ▷"
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" />
<View
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginStart="5dp"
android:background="@drawable/triangle_right"
app:layout_constraintBottom_toBottomOf="@id/tv_cash_label"
app:layout_constraintStart_toEndOf="@id/tv_cash_label"
app:layout_constraintTop_toTopOf="@id/tv_cash_label" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
......@@ -115,7 +124,6 @@
android:id="@+id/btn_alipay"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/shape_alipay_blue"
......@@ -124,14 +132,13 @@
android:text="支付宝支付"
android:textColor="@color/white"
android:textSize="16sp"
app:drawableLeftCompat="@mipmap/ic_alipay" />
app:drawableLeftCompat="@mipmap/ic_alipay_white" />
<Button
android:id="@+id/btn_wxpay"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/shape_wechat_green"
android:drawablePadding="-15dp"
......@@ -139,13 +146,36 @@
android:text="微信支付"
android:textColor="@color/white"
android:textSize="16sp"
app:drawableLeftCompat="@mipmap/ic_call_wx" />
app:drawableLeftCompat="@mipmap/ic_wechat_white" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<CheckBox
android:id="@+id/cb_agreement"
style="@style/CustomCheckboxTheme"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false" />
<TextView
android:id="@+id/tv_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="点击购买即表示您同意《会员付费协议》"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_vip_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
......@@ -162,6 +192,7 @@
android:textSize="18sp" />
<LinearLayout
android:id="@+id/ll_vip_container"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/shape_wallet_gray"
......@@ -225,9 +256,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginTop="20dp"
android:text="联系客服"
android:textColor="@color/graya" />
android:textColor="@color/graya"
android:visibility="gone" />
</LinearLayout>
......
video/app/src/main/res/layout/dialog_delete_photo_confirm.xml
View file @ d70d540d
......@@ -49,6 +49,6 @@
android:layout_below="@id/ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_quit_white" />
android:src="@mipmap/ic_close_white" />
</RelativeLayout>
video/app/src/main/res/layout/dialog_profile_count.xml
View file @ d70d540d
......@@ -73,7 +73,7 @@
android:layout_below="@id/ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_quit_white" />
android:src="@mipmap/ic_close_white" />
</RelativeLayout>
......
video/app/src/main/res/layout/dialog_real_auth.xml
View file @ d70d540d
......@@ -36,6 +36,6 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:padding="6dp"
android:src="@mipmap/ic_quit_white" />
android:src="@mipmap/ic_close_white" />
</RelativeLayout>
video/app/src/main/res/layout/dialog_see_wechat.xml
View file @ d70d540d
......@@ -110,7 +110,7 @@
android:layout_below="@id/ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_quit_white" />
android:src="@mipmap/ic_close_white" />
</RelativeLayout>
......
video/app/src/main/res/layout/dialog_square_new.xml 0 → 100644
View file @ d70d540d
<?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">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/iv_avatar"
android:background="@drawable/shape_bg_profile_count"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="20dp">
<TextView
android:id="@+id/tv_unlock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:textColor="@color/color_FCE8BA"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_vip_btn"
android:layout_width="260dp"
android:layout_height="40dp"
android:layout_marginTop="40dp"
android:background="@drawable/shape_bg_hall_btn2"
android:gravity="center"
android:text="分享得会员"
android:textColor="@color/color_9F6A32"
android:textSize="14sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_vip_coin"
android:layout_width="260dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_bg_hall_btn3"
android:gravity="center"
android:text="开通会员"
android:textColor="@color/color_FCE8BA"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_vip_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
android:text=""
android:textColor="@color/color_FCE8BA"
android:textSize="14sp"
android:visibility="gone" />
</LinearLayout>
<com.duben.roseplaylet.ui.widgets.CircleImageView
android:id="@+id/iv_avatar"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="-35dp"
android:src="@mipmap/ic_my_avat" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_below="@id/ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_close_white" />
</RelativeLayout>
</FrameLayout>
video/app/src/main/res/layout/dialog_unlock_wechat.xml
View file @ d70d540d
......@@ -93,7 +93,7 @@
android:layout_below="@id/ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_quit_white" />
android:src="@mipmap/ic_close_white" />
</RelativeLayout>
......
video/app/src/main/res/layout/fragment_csjmovie.xml
View file @ d70d540d
......@@ -18,11 +18,11 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_pic_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:minHeight="800dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:overScrollMode="never" />
</FrameLayout>
......@@ -30,7 +30,7 @@
<com.scwang.smartrefresh.layout.footer.ClassicsFooter
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:srlAccentColor="@color/black"
app:srlPrimaryColor="#f0f2f5" />
app:srlAccentColor="@color/white"
app:srlPrimaryColor="@color/black" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</FrameLayout>
\ No newline at end of file
video/app/src/main/res/layout/fragment_csjvedio.xml
View file @ d70d540d
......@@ -116,7 +116,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="6dp"
android:src="@mipmap/ic_quit_white" />
android:src="@mipmap/ic_close_white" />
<TextView
android:id="@+id/tv_main_watching_goto"
......
video/app/src/main/res/layout/fragment_main_my.xml
View file @ d70d540d
......@@ -11,7 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="15dp"
android:paddingEnd="15dp">
......@@ -237,7 +237,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="65dp"
android:layout_marginTop="10dp">
<LinearLayout
......@@ -253,10 +253,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:layout_marginTop="8dp"
android:text="钱包"
android:textColor="@color/white"
android:textSize="18sp" />
android:textSize="16sp" />
<TextView
android:id="@+id/tv_my_coin"
......@@ -266,7 +266,7 @@
android:layout_marginTop="5dp"
android:text="10"
android:textColor="@color/white"
android:textSize="16sp" />
android:textSize="14sp" />
</LinearLayout>
......@@ -283,10 +283,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:layout_marginTop="8dp"
android:text="邀请有礼"
android:textColor="@color/white"
android:textSize="18sp" />
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
......@@ -527,16 +527,13 @@
</LinearLayout>
<LinearLayout
<com.duben.roseplaylet.ui.widgets.RoundRectLayout
android:id="@+id/fl_ad"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_write" />
<com.duben.roseplaylet.ui.widgets.RoundRectLayout
android:id="@+id/fl_ad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_write" />
</LinearLayout>
</LinearLayout>
</com.duben.roseplaylet.ui.widgets.ElasticScrollView>
</FrameLayout>
......
video/app/src/main/res/layout/fragment_square.xml
View file @ d70d540d
......@@ -3,8 +3,8 @@
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:paddingTop="30dp">
android:background="@mipmap/bg_female"
android:paddingTop="40dp">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
......@@ -27,7 +27,7 @@
<com.youth.banner.Banner
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="120dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" />
......
video/app/src/main/res/layout/item_common_data.xml
View file @ d70d540d
......@@ -3,7 +3,6 @@
android:id="@+id/ll_recommend_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:orientation="horizontal"
android:padding="10dp"
android:paddingStart="10dp"
......
video/app/src/main/res/layout/item_express_ad.xml
View file @ d70d540d
......@@ -6,6 +6,7 @@
<com.duben.roseplaylet.ui.widgets.RoundRectLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_write" />
</FrameLayout>
video/app/src/main/res/layout/item_share_rank.xml
View file @ d70d540d
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center_vertical">
<LinearLayout
......@@ -15,6 +16,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:padding="2dp"
android:src="@mipmap/ic_call_wx"
android:visibility="gone" />
......@@ -26,7 +28,7 @@
android:gravity="center"
android:text="1"
android:textColor="@color/black"
android:textSize="14sp"
android:textSize="16sp"
android:textStyle="bold" />
<com.duben.roseplaylet.ui.widgets.CircleImageView
......
video/app/src/main/res/layout/item_square.xml
View file @ d70d540d
......@@ -37,6 +37,12 @@
android:textSize="10sp"
android:visibility="gone" />
<eightbitlab.com.blurview.BlurView
android:id="@+id/item_blurview_head"
android:layout_width="110dp"
android:layout_height="110dp"
android:visibility="gone" />
</FrameLayout>
<FrameLayout
......@@ -246,12 +252,18 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:gravity="center"
android:gravity="end"
android:text="近日活跃"
android:textColor="@color/color_838087"
android:textSize="10sp"
android:visibility="gone" />
<eightbitlab.com.blurview.BlurView
android:id="@+id/item_blurview_images"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
......
video/app/src/main/res/layout/layout_basic_edit.xml
View file @ d70d540d
......@@ -29,9 +29,11 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/label_start"
android:background="@null"
android:gravity="end"
android:textColor="@color/color_999999"
android:textColor="@color/white"
android:textColorHint="@color/color_999999"
android:textCursorDrawable="@drawable/custom_cursor_drawable"
android:textSize="16sp"
android:visibility="visible" />
......
video/app/src/main/res/layout/layout_user_profile_case.xml
View file @ d70d540d
......@@ -124,7 +124,7 @@
android:visibility="gone" />
<TextView
android:id="@+id/tv_label_distance_male"
android:id="@+id/tv_label_distance_female"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
......@@ -138,27 +138,31 @@
android:textSize="12sp"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:visibility="gone">
<TextView
android:id="@+id/tv_label_distance_female"
android:id="@+id/tv_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_label_distance_male"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:paddingStart="6dp"
android:paddingTop="2dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
......
video/app/src/main/res/mipmap-xxhdpi/bg_share_poster.png 0 → 100644
View file @ d70d540d
This diff is collapsed.
video/app/src/main/res/values/colors.xml
View file @ d70d540d
......@@ -36,6 +36,7 @@
<color name="color_FFF0D4">#FFF0D4</color>
<color name="transparent90_white">#E5ffffff</color>
<color name="transparent80_black">#CC000000</color>
<color name="color_F1F2F8">#F1F2F8</color>
<color name="color_ff33b5e5">#ff33b5e5</color>
<color name="color_FF4144">#FF4144</color>
......@@ -111,6 +112,7 @@
<color name="color_d5bc9a">#d5bc9a</color>
<color name="color_1fb89c">#1fb89c</color>
<color name="color_7E4A17">#7E4A17</color>
<color name="color_BB141726">#BB141726</color>
<color name="color_252429">#252429</color>
......
video/build.gradle
View file @ d70d540d
......@@ -57,5 +57,5 @@ ext {
androidCompileSdkVersion = 31
androidBuildToolsVersion = '31.0.0'
androidMinSdkVersion = 21
androidTargetSdkVersion = 35
androidTargetSdkVersion = 31
}
\ No newline at end of file
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