修改登陆页和启动页
|
|
@ -165,13 +165,14 @@ dependencies {
|
|||
implementation 'com.getui:gysdk:3.1.7.0' //一键认证sdk
|
||||
implementation 'com.getui:gtc:3.2.16.0' //个推公共库,如已接其他个推sdk则保留一个最高版本即可
|
||||
|
||||
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0' //微信
|
||||
//微信
|
||||
implementation 'com.tencent.mm.opensdk:wechat-sdk-android:+'
|
||||
//友盟
|
||||
implementation 'com.umeng.umsdk:common:9.6.3'// 必选
|
||||
implementation 'com.umeng.umsdk:asms:1.8.0'// 必选
|
||||
implementation 'com.umeng.umsdk:apm:1.9.1' // U-APM包依赖(必选)
|
||||
implementation 'com.umeng.umsdk:share-core:7.3.2'//分享核心库,必选
|
||||
implementation 'com.umeng.umsdk:share-wx:7.3.2' //微信完整版
|
||||
implementation 'com.umeng.umsdk:common:+'// 必选
|
||||
implementation 'com.umeng.umsdk:asms:+'// 必选
|
||||
implementation 'com.umeng.umsdk:apm:+'// U-APM产品包依赖,必选
|
||||
implementation 'com.umeng.umsdk:share-core:+'//分享核心库,必选
|
||||
implementation 'com.umeng.umsdk:share-wx:+' //微信完整版
|
||||
|
||||
implementation 'top.zibin:Luban:1.1.8' //图片压缩
|
||||
implementation 'com.github.Dimezis:BlurView:version-2.0.6' //毛玻璃效果
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
package com.cheng.bole.bean
|
||||
|
||||
import java.io.Serializable
|
||||
|
||||
data class BannerEntity(
|
||||
val image: String,
|
||||
val page: String,
|
||||
val type: String
|
||||
) : Serializable
|
||||
|
|
@ -28,9 +28,6 @@ class ConfigEntity {
|
|||
@SerializedName("client.login.type") //登录方式
|
||||
var loginType: List<String>? = emptyList()
|
||||
|
||||
@SerializedName("client.banner.urls") //首页banner
|
||||
var banners: List<com.cheng.bole.bean.BannerEntity>? = emptyList()
|
||||
|
||||
@SerializedName("client.ad.switch") //广告总开关
|
||||
var adSwitch: Boolean = false
|
||||
|
||||
|
|
|
|||
|
|
@ -31,4 +31,6 @@ object Constants {
|
|||
val dDIN_PRO_M = Typeface.createFromAsset(Utils.getApp().assets, "fonts/D-DIN-PRO-500-Medium.otf")
|
||||
val youSheBiaoTiHei = Typeface.createFromAsset(Utils.getApp().assets, "fonts/YouSheBiaoTiHei.ttf")
|
||||
|
||||
val douyinsansB = Typeface.createFromAsset(Utils.getApp().assets, "fonts/DouyinSansBold.otf")
|
||||
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@ package com.cheng.bole.manager
|
|||
import android.os.Build
|
||||
import android.text.TextUtils
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import com.cheng.bole.net.ApiFactory
|
||||
import com.example.base.extensions.toast
|
||||
import com.example.base.utils.MMKVUtils
|
||||
import com.example.base.utils.Utils
|
||||
|
|
@ -11,7 +12,6 @@ import com.github.gzuliyujiang.oaid.DeviceIdentifier
|
|||
import com.github.gzuliyujiang.oaid.IGetter
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.reflect.TypeToken
|
||||
import com.cheng.bole.net.ApiFactory
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.launch
|
||||
|
|
@ -78,7 +78,6 @@ object UserConfigManager {
|
|||
saveNoLoginPay(data.config!!.noLoginPayEnable!!)
|
||||
savePayAgreementEnable(data.config!!.payAgreementEnable!!)
|
||||
saveLoginType(data.config!!.loginType!!)
|
||||
saveBanners(data.config!!.banners!!)
|
||||
saveShareEntity(data.config!!.wxShareEntity)
|
||||
saveAdSwitch(data.config!!.adSwitch)
|
||||
saveServicePhoneList(data.config!!.servicePhoneList)
|
||||
|
|
@ -100,6 +99,17 @@ object UserConfigManager {
|
|||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否同意隐私政策
|
||||
*/
|
||||
fun saveAgree() {
|
||||
MMKVUtils.put("isAgree", true)
|
||||
}
|
||||
|
||||
fun isAgree(): Boolean {
|
||||
return MMKVUtils.getBoolean("isAgree", false)
|
||||
}
|
||||
|
||||
private fun saveGuidePayEnable(temp: Boolean) {
|
||||
MMKVUtils.put("guide_pay", temp)//引导页是否可以支付
|
||||
}
|
||||
|
|
@ -168,18 +178,6 @@ object UserConfigManager {
|
|||
return emptyList()
|
||||
}
|
||||
|
||||
private fun saveBanners(list: List<com.cheng.bole.bean.BannerEntity>) {
|
||||
MMKVUtils.put("home_banner", Gson().toJson(list))
|
||||
}
|
||||
|
||||
fun getBanners(): List<com.cheng.bole.bean.BannerEntity> {
|
||||
val s = MMKVUtils.getString("home_banner")
|
||||
if (!TextUtils.isEmpty(s)) {
|
||||
return Gson().fromJson(s, object : TypeToken<List<com.cheng.bole.bean.BannerEntity>>() {}.type)
|
||||
}
|
||||
return emptyList()
|
||||
}
|
||||
|
||||
private fun saveShareEntity(entity: com.cheng.bole.bean.WxShareEntity?) {
|
||||
MMKVUtils.put("weixin_share", Gson().toJson(entity))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ class LauncherActivity : BaseActivity() {
|
|||
ImmersionBar.with(this).hideBar(BarHide.FLAG_HIDE_NAVIGATION_BAR).init()
|
||||
backApp()
|
||||
|
||||
if (MMKVUtils.getBoolean("isAgree")) {
|
||||
if (UserConfigManager.isAgree()) {
|
||||
loadingDialog.show()
|
||||
UserConfigManager.saveBDVID()
|
||||
UserConfigManager.getUserConfig {
|
||||
|
|
@ -74,7 +74,7 @@ class LauncherActivity : BaseActivity() {
|
|||
privacyPolicyDialog.setOnSelectListener {
|
||||
if (it == DialogEnum.CLICK_OK) {
|
||||
loadingDialog.show()
|
||||
MMKVUtils.put("isAgree", true)
|
||||
UserConfigManager.saveAgree()
|
||||
UserConfigManager.saveBDVID()
|
||||
UserConfigManager.getUserConfig {
|
||||
EventReportManager.eventReport(EventConstants.APP_LAUNCH, "", "")
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class LoginTipDialog :DialogFragment(){
|
|||
|
||||
binding = DialogLoginTipBinding.bind(view)
|
||||
|
||||
binding.tvTitle.typeface = Constants.youSheBiaoTiHei
|
||||
binding.tvTitle.typeface = Constants.douyinsansB
|
||||
|
||||
if (type == 0){
|
||||
initLoginPrivacyTv()
|
||||
|
|
@ -72,12 +72,12 @@ class LoginTipDialog :DialogFragment(){
|
|||
SpanUtils.with(binding.tvTip)
|
||||
.append("登录之前须先查看并同意")
|
||||
.append("《用户协议》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startUserAgreement(requireContext())
|
||||
}
|
||||
.append("和")
|
||||
.append("《隐私政策》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startPrivacyPolicy(requireContext())
|
||||
}
|
||||
.create()
|
||||
|
|
@ -87,17 +87,17 @@ class LoginTipDialog :DialogFragment(){
|
|||
SpanUtils.with(binding.tvTip)
|
||||
.append("登录之前须先查看并同意")
|
||||
.append("《${preLoginResult.privacyName}》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl, false)
|
||||
}
|
||||
.append("、")
|
||||
.append("《用户协议》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startUserAgreement(requireContext())
|
||||
}
|
||||
.append("、")
|
||||
.append("《隐私政策》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startPrivacyPolicy(requireContext())
|
||||
}
|
||||
.create()
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class PayTipDialog : DialogFragment() {
|
|||
|
||||
binding = DialogPayTipBinding.bind(view)
|
||||
|
||||
binding.tvTitle.typeface = Constants.youSheBiaoTiHei
|
||||
binding.tvTitle.typeface = Constants.douyinsansB
|
||||
|
||||
binding.tvOk.onClick {
|
||||
mOnBackListener?.invoke(DialogEnum.CLICK_OK)
|
||||
|
|
@ -65,13 +65,13 @@ class PayTipDialog : DialogFragment() {
|
|||
val spanUtils = SpanUtils.with(binding.tvContent)
|
||||
.append("我已阅读并同意")
|
||||
.append("《会员服务协议规则》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startUserAgreement(requireContext(), "会员服务协议规则")
|
||||
}
|
||||
if (showRenew) {
|
||||
spanUtils.append("和")
|
||||
spanUtils.append("《自动续费服务规则》")
|
||||
spanUtils.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
spanUtils.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startRenewAgreement(requireContext())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class PrivacyPolicyDialog : DialogFragment() {
|
|||
val view = layoutInflater.inflate(R.layout.dialog_privacy_policy, null)
|
||||
|
||||
binding = DialogPrivacyPolicyBinding.bind(view)
|
||||
binding.tvTitle.typeface = Constants.youSheBiaoTiHei
|
||||
binding.tvTitle.typeface = Constants.douyinsansB
|
||||
|
||||
binding.btnNext.onClick {
|
||||
mOnBackListener?.invoke(DialogEnum.CLICK_OK)
|
||||
|
|
@ -73,19 +73,19 @@ class PrivacyPolicyDialog : DialogFragment() {
|
|||
.append("请你务必审慎阅读、充分理解")
|
||||
.append("《服务协议》")
|
||||
.setBold()
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startUserAgreement(requireContext())
|
||||
}
|
||||
.append("和")
|
||||
.append("《隐私政策》")
|
||||
.setBold()
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startPrivacyPolicy(requireContext())
|
||||
}
|
||||
.append("各条款,包括但不限于:为了更好的向你提供服务,我们需要访问你的相册、位置信息等。你可阅读")
|
||||
.append("《隐私政策》")
|
||||
.setBold()
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startPrivacyPolicy(requireContext())
|
||||
}
|
||||
.append("了解详细信息。如果你同意,请点击下面同意按钮开始接受我们的服务。")
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import com.example.base.extensions.onClick
|
|||
import com.example.base.extensions.visible
|
||||
import com.example.base.utils.ScreenUtils
|
||||
import com.cheng.bole.R
|
||||
import com.cheng.bole.common.Constants
|
||||
import com.cheng.bole.databinding.DialogSimpleTipBinding
|
||||
import com.cheng.bole.manager.DialogEnum
|
||||
|
||||
|
|
@ -46,6 +47,8 @@ class SimpleTipDialog : DialogFragment() {
|
|||
|
||||
binding = DialogSimpleTipBinding.bind(view)
|
||||
|
||||
binding.tvContent.typeface = Constants.douyinsansB
|
||||
|
||||
content = arguments?.getCharSequence("content")
|
||||
leftText = arguments?.getString("leftText")
|
||||
rightText = arguments?.getString("rightText")
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class TipDialog : DialogFragment() {
|
|||
|
||||
binding = DialogTipBinding.bind(view)
|
||||
|
||||
binding.tvTitle.typeface = Constants.youSheBiaoTiHei
|
||||
binding.tvTitle.typeface = Constants.douyinsansB
|
||||
|
||||
title = arguments?.getString("title")
|
||||
content = arguments?.getCharSequence("content")
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class UpdateVersionDialog : DialogFragment() {
|
|||
|
||||
binding = DialogUpdateVerisonBinding.bind(view)
|
||||
|
||||
binding.tvUpdateTitle.typeface = Constants.youSheBiaoTiHei
|
||||
binding.tvUpdateTitle.typeface = Constants.douyinsansB
|
||||
|
||||
val versionEntity = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
arguments?.getSerializable("versionEntity", com.cheng.bole.bean.VersionEntity::class.java)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class VipLoginTipDialog(mFragment: Fragment) : BaseDialog(mFragment.requireConte
|
|||
|
||||
binding = DialogVipLoginTipBinding.bind(view)
|
||||
|
||||
binding.tvTitle.typeface = Constants.youSheBiaoTiHei
|
||||
binding.tvTitle.typeface = Constants.douyinsansB
|
||||
|
||||
binding.btnOk.onClick {
|
||||
mOnBackListener?.invoke()
|
||||
|
|
|
|||
|
|
@ -174,12 +174,12 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>() {
|
|||
SpanUtils.with(binding.tvAgree)
|
||||
.append("我已阅读并同意")
|
||||
.append("《用户协议》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startUserAgreement(requireContext())
|
||||
}
|
||||
.append("和")
|
||||
.append("《隐私政策》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startPrivacyPolicy(requireContext())
|
||||
}
|
||||
.create()
|
||||
|
|
|
|||
|
|
@ -236,22 +236,21 @@ class OneKeyLoginFragment : BaseFragment<FragmentOnekeyLoginBinding, OnekeyLogin
|
|||
private fun initPrivacyTv() {
|
||||
val preLoginResult = GYManager.getInstance().preLoginResult
|
||||
SpanUtils.with(binding.tvAgree)
|
||||
.append("登录即认可")
|
||||
.append("我已同意并阅读了")
|
||||
.append("《${preLoginResult.privacyName}》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl, false)
|
||||
}
|
||||
.append("、")
|
||||
.append("《用户协议》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startUserAgreement(requireContext())
|
||||
}
|
||||
.append("和")
|
||||
.append("《隐私政策》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startPrivacyPolicy(requireContext())
|
||||
}
|
||||
.append("并使用本机号码登录")
|
||||
.create()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -313,13 +313,13 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
|
|||
val spanUtils = SpanUtils.with(binding.tvAgree)
|
||||
.append("我已阅读并同意")
|
||||
.append("《会员服务协议规则》")
|
||||
.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startUserAgreement(requireContext(), "会员服务协议规则")
|
||||
}
|
||||
if (!TextUtils.isEmpty(vipGoodsEntity?.sign_value) && payType == 1) {
|
||||
spanUtils.append("和")
|
||||
spanUtils.append("《自动续费服务规则》")
|
||||
spanUtils.setClickSpan(getColor(R.color.color_466afd), false) {
|
||||
spanUtils.setClickSpan(getColor(R.color.color_125ffe), false) {
|
||||
UrlHelper.startRenewAgreement(requireContext())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<item android:id="@android:id/progress">
|
||||
<clip>
|
||||
<shape>
|
||||
<solid android:color="@color/color_466afd" />
|
||||
<solid android:color="@color/color_125ffe" />
|
||||
<size android:height="6dp" />
|
||||
<corners android:radius="28dp" />
|
||||
</shape>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="@color/color_466afd" android:state_checked="true" />
|
||||
<item android:color="@color/color_125ffe" android:state_checked="true" />
|
||||
<item android:color="@color/color_999999" android:state_checked="false" />
|
||||
</selector>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="@color/color_466afd" android:state_checked="true"/>
|
||||
<item android:color="@color/color_125ffe" android:state_checked="true"/>
|
||||
<item android:color="@color/color_676e87" android:state_checked="false"/>
|
||||
</selector>
|
||||
|
|
@ -4,5 +4,5 @@
|
|||
<solid android:color="#1a466afd" />
|
||||
<stroke
|
||||
android:width="@dimen/dp_1"
|
||||
android:color="@color/color_466afd" />
|
||||
android:color="@color/color_125ffe" />
|
||||
</shape>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/color_466afd"/>
|
||||
<solid android:color="@color/color_125ffe"/>
|
||||
<corners android:radius="@dimen/dp_25"/>
|
||||
</shape>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="@dimen/dp_4" />
|
||||
<solid android:color="@color/color_466afd"/>
|
||||
<solid android:color="@color/color_125ffe"/>
|
||||
</shape>
|
||||
|
|
@ -5,5 +5,5 @@
|
|||
<corners android:radius="@dimen/dp_6" />
|
||||
<stroke
|
||||
android:width="@dimen/dp_1"
|
||||
android:color="@color/color_466afd" />
|
||||
android:color="@color/color_125ffe" />
|
||||
</shape>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="@dimen/dp_50" />
|
||||
<stroke
|
||||
android:width="@dimen/dp_1"
|
||||
android:color="@color/color_dfdfdf" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?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_f3f5f9" />
|
||||
<solid android:color="@color/color_f7f9fd" />
|
||||
<corners android:radius="10dp" />
|
||||
</shape>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/color_466afd"/>
|
||||
<solid android:color="@color/color_125ffe"/>
|
||||
<corners android:radius="@dimen/dp_10"/>
|
||||
</shape>
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.cheng.bole.widget.StrokeTextView
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
android:textColor="@color/color_90ffffff"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintDimensionRatio="w,116:40"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@
|
|||
android:background="@drawable/shape_dfdfdf_line_cor8"
|
||||
android:gravity="center"
|
||||
android:text="获取验证码"
|
||||
android:textColor="@color/color_466afd"
|
||||
android:textColor="@color/color_125ffe"
|
||||
android:textSize="@dimen/sp_15"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/et_code"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
android:textStyle="bold"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintDimensionRatio="h,351:46"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@
|
|||
android:textStyle="bold"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintDimensionRatio="h,351:46"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_26"
|
||||
android:background="@drawable/shape_white_cor16"
|
||||
android:paddingBottom="@dimen/dp_20"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
|
@ -16,18 +15,18 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.cheng.bole.widget.StrokeTextView
|
||||
<TextView
|
||||
android:id="@+id/tvTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginBottom="@dimen/dp_15"
|
||||
android:text="温馨提示"
|
||||
android:textColor="@color/color_212226"
|
||||
android:textSize="@dimen/sp_24"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_17"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tvTip"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
@ -49,7 +48,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_30"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_14"
|
||||
android:layout_marginEnd="@dimen/dp_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/dialog_login_tip"
|
||||
|
|
@ -63,22 +62,14 @@
|
|||
android:id="@+id/tvOk"
|
||||
android:layout_width="@dimen/dp_130"
|
||||
android:layout_height="@dimen/dp_40"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_26"
|
||||
android:text="同意"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_25"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvTip" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_4"
|
||||
android:src="@mipmap/ic_notify_icon"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -10,18 +10,17 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.cheng.bole.widget.StrokeTextView
|
||||
<TextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:text="温馨提示"
|
||||
android:textColor="@color/color_212226"
|
||||
android:textSize="22sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_17"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
@ -41,7 +40,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_14"
|
||||
android:layout_marginEnd="@dimen/dp_20"
|
||||
android:gravity="center"
|
||||
android:text="开通会员之前须先查看并同意\n《会员服务协议》"
|
||||
|
|
@ -64,7 +63,7 @@
|
|||
android:text="我已查看并同意"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_25"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_2090fe"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -10,18 +10,17 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.cheng.bole.widget.StrokeTextView
|
||||
<TextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:text="欢迎使用"
|
||||
android:textColor="@color/color_212226"
|
||||
android:textSize="@dimen/sp_24"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_17"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
@ -30,9 +29,9 @@
|
|||
android:id="@+id/tv_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_28"
|
||||
android:layout_marginTop="@dimen/dp_8"
|
||||
android:layout_marginEnd="@dimen/dp_28"
|
||||
android:layout_marginStart="@dimen/dp_17"
|
||||
android:layout_marginTop="@dimen/dp_14"
|
||||
android:layout_marginEnd="@dimen/dp_17"
|
||||
android:lineSpacingExtra="3dp"
|
||||
android:text="@string/policy_content"
|
||||
android:textColor="@color/color_727686"
|
||||
|
|
@ -45,17 +44,17 @@
|
|||
android:id="@+id/btn_disagree"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_14"
|
||||
android:layout_marginTop="@dimen/dp_18"
|
||||
android:layout_marginEnd="@dimen/dp_12"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_26"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:paddingTop="@dimen/dp_10"
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
android:text="@string/disagree_txt"
|
||||
android:textColor="@color/color_a3a7b9"
|
||||
android:textColor="@color/color_9a9ea7"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_25"
|
||||
app:csb_fillColor="@color/color_f1f2f6"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_ebf5ff"
|
||||
app:layout_constraintEnd_toStartOf="@id/btn_next"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_content" />
|
||||
|
|
@ -65,16 +64,16 @@
|
|||
android:id="@+id/btn_next"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_18"
|
||||
android:layout_marginEnd="@dimen/dp_14"
|
||||
android:layout_marginTop="@dimen/dp_26"
|
||||
android:layout_marginEnd="@dimen/dp_20"
|
||||
android:paddingTop="@dimen/dp_10"
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
android:text="@string/agree_txt"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_25"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/btn_disagree"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_content" />
|
||||
|
|
|
|||
|
|
@ -9,18 +9,17 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_28"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:text="提示"
|
||||
android:textColor="@color/color_212226"
|
||||
android:textSize="@dimen/sp_16"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_17"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
@ -37,8 +36,8 @@
|
|||
android:text="确定"
|
||||
android:textColor="@color/color_90ffffff"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_cancel"
|
||||
|
|
@ -54,11 +53,11 @@
|
|||
android:background="?android:selectableItemBackground"
|
||||
android:gravity="center"
|
||||
android:text="取消"
|
||||
android:textColor="@color/color_80859b"
|
||||
android:textColor="@color/color_9a9ea7"
|
||||
android:textSize="@dimen/sp_16"
|
||||
android:visibility="gone"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_f1f2f6"
|
||||
app:csb_fillColor="@color/color_ebf5ff"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tv_ok"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -9,18 +9,17 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.cheng.bole.widget.StrokeTextView
|
||||
<TextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:text="提示"
|
||||
android:textColor="@color/color_212226"
|
||||
android:textSize="@dimen/sp_22"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_17"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
@ -30,7 +29,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:layout_marginTop="@dimen/dp_14"
|
||||
android:layout_marginEnd="@dimen/dp_20"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center"
|
||||
|
|
@ -54,8 +53,8 @@
|
|||
android:text="确定"
|
||||
android:textColor="@color/color_90ffffff"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintDimensionRatio="w,110:40"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
@ -71,10 +70,10 @@
|
|||
android:background="?android:selectableItemBackground"
|
||||
android:gravity="center"
|
||||
android:text="取消"
|
||||
android:textColor="@color/color_80859b"
|
||||
android:textColor="@color/color_9a9ea7"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_f1f2f6"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_ebf5ff"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintDimensionRatio="w,110:40"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tv_ok"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_40"
|
||||
android:layout_marginTop="@dimen/dp_44"
|
||||
android:background="@drawable/shape_white_cor16"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
|
|
@ -31,15 +31,14 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.cheng.bole.widget.StrokeTextView
|
||||
<TextView
|
||||
android:id="@+id/tv_update_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:textColor="@color/color_212226"
|
||||
android:textSize="@dimen/sp_24"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_17"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="新版本更新" />
|
||||
|
|
@ -48,11 +47,10 @@
|
|||
android:id="@+id/tv_version_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:textColor="@color/color_666666"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_update_title"
|
||||
android:layout_marginTop="@dimen/dp_5"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_14"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_update_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_update_title"
|
||||
tools:text="V2.2.0" />
|
||||
|
|
@ -61,13 +59,12 @@
|
|||
android:id="@+id/tv_update_desc"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:layout_marginBottom="@dimen/dp_12"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:lineSpacingExtra="@dimen/dp_5"
|
||||
android:maxWidth="@dimen/dp_300"
|
||||
android:textColor="@color/color_727686"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:textSize="@dimen/sp_14"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_version_name"
|
||||
tools:text="文字描述文字描述文字描述文字描述文字描述文字描述文字描述文字描述" />
|
||||
|
|
@ -84,10 +81,10 @@
|
|||
android:paddingTop="@dimen/dp_10"
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
android:text="@string/cancel_txt"
|
||||
android:textColor="@color/color_80859b"
|
||||
android:textColor="@color/color_9a9ea7"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_f1f2f6"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_ebf5ff"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/updateBtn"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -106,8 +103,8 @@
|
|||
android:text="@string/update_txt"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/cancelBtn"
|
||||
|
|
@ -139,7 +136,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="-9dp"
|
||||
android:text="0%"
|
||||
android:textColor="@color/color_466afd"
|
||||
android:textColor="@color/color_125ffe"
|
||||
android:textSize="8sp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@id/progressbar"
|
||||
|
|
@ -149,11 +146,11 @@
|
|||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_bg"
|
||||
android:layout_width="@dimen/dp_100"
|
||||
android:layout_height="@dimen/dp_100"
|
||||
android:layout_marginStart="@dimen/dp_4"
|
||||
android:layout_width="138dp"
|
||||
android:layout_height="138dp"
|
||||
android:layout_marginEnd="-8dp"
|
||||
android:src="@mipmap/ic_update_top_bg"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -9,18 +9,17 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_tip_dialog_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,816:300"
|
||||
app:layout_constraintDimensionRatio="h,816:360"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.cheng.bole.widget.StrokeTextView
|
||||
<TextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_22"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:text="郑重提示"
|
||||
android:textColor="@color/color_212226"
|
||||
android:textSize="@dimen/sp_22"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textSize="@dimen/sp_17"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
@ -30,7 +29,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_30"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:layout_marginTop="@dimen/dp_14"
|
||||
android:layout_marginEnd="@dimen/dp_30"
|
||||
android:gravity="center"
|
||||
android:text="系统检测到您目前尚未登录,但您已成为我们尊贵的会员,为了防止您的会员账号丢失,建议您立即前往登录"
|
||||
|
|
@ -51,8 +50,8 @@
|
|||
android:text="立即登录"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_cornerRadius="@dimen/dp_10"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@
|
|||
android:textStyle="bold"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
android:textStyle="bold"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_25"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/white">
|
||||
android:layout_height="match_parent">
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -8,14 +8,14 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_login_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,375:251"
|
||||
app:layout_constraintDimensionRatio="h,1125:1270"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_logo"
|
||||
android:layout_width="@dimen/dp_80"
|
||||
android:layout_height="@dimen/dp_80"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_32"
|
||||
android:src="@mipmap/ic_login_logo"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -46,64 +46,50 @@
|
|||
<androidx.appcompat.widget.AppCompatEditText
|
||||
android:id="@+id/ed_phone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:background="@null"
|
||||
android:drawableStart="@mipmap/ic_login_phone"
|
||||
android:drawablePadding="@dimen/dp_8"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
android:background="@drawable/shape_dfdfdf_line_cor50"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="请输入您的手机号"
|
||||
android:inputType="number"
|
||||
android:maxLength="11"
|
||||
android:paddingStart="@dimen/dp_14"
|
||||
android:paddingEnd="@dimen/dp_14"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textColorHint="@color/color_bcbcbc"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:layout_constraintDimensionRatio="h,300:54"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/view_line1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:background="@color/color_dfdfdf"
|
||||
app:layout_constraintTop_toBottomOf="@id/ed_phone" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatEditText
|
||||
android:id="@+id/ed_code"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:background="@null"
|
||||
android:drawableStart="@mipmap/ic_login_code"
|
||||
android:drawablePadding="@dimen/dp_8"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
android:layout_marginTop="@dimen/dp_26"
|
||||
android:background="@drawable/shape_dfdfdf_line_cor50"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="请输入验证码"
|
||||
android:inputType="number"
|
||||
android:maxLength="6"
|
||||
android:paddingStart="@dimen/dp_14"
|
||||
android:textColor="@color/color_1a1a1a"
|
||||
android:textColorHint="@color/color_bcbcbc"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:layout_constraintDimensionRatio="h,300:54"
|
||||
app:layout_constraintTop_toBottomOf="@+id/view_line1" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/ed_phone" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_send_code"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_14"
|
||||
android:padding="@dimen/dp_5"
|
||||
android:text="获取验证码"
|
||||
android:textColor="@color/color_466afd"
|
||||
android:textColor="@color/color_125ffe"
|
||||
android:textSize="@dimen/sp_14"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/ed_code"
|
||||
app:layout_constraintEnd_toEndOf="@+id/ed_code"
|
||||
app:layout_constraintTop_toTopOf="@+id/ed_code" />
|
||||
|
||||
<View
|
||||
android:id="@+id/view_line2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:background="@color/color_dfdfdf"
|
||||
app:layout_constraintTop_toBottomOf="@id/ed_code" />
|
||||
|
||||
<com.cheng.bole.widget.CommonShapeView
|
||||
android:id="@+id/loginBtn"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -115,7 +101,7 @@
|
|||
android:textStyle="bold"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintDimensionRatio="h,300:50"
|
||||
app:layout_constraintEnd_toEndOf="@id/ed_code"
|
||||
app:layout_constraintStart_toStartOf="@+id/ed_code"
|
||||
|
|
@ -173,19 +159,19 @@
|
|||
android:layout_width="@dimen/dp_20"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
app:layout_constraintTop_toTopOf="@id/tv_other_login"
|
||||
android:background="@color/color_aaaaaa"
|
||||
app:layout_constraintBottom_toBottomOf="@id/tv_other_login"
|
||||
app:layout_constraintEnd_toStartOf="@id/tv_other_login"
|
||||
android:background="@color/color_aaaaaa"/>
|
||||
app:layout_constraintTop_toTopOf="@id/tv_other_login" />
|
||||
|
||||
<View
|
||||
android:layout_width="@dimen/dp_20"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:layout_marginStart="@dimen/dp_10"
|
||||
app:layout_constraintTop_toTopOf="@id/tv_other_login"
|
||||
android:background="@color/color_aaaaaa"
|
||||
app:layout_constraintBottom_toBottomOf="@id/tv_other_login"
|
||||
app:layout_constraintStart_toEndOf="@id/tv_other_login"
|
||||
android:background="@color/color_aaaaaa"/>
|
||||
app:layout_constraintTop_toTopOf="@id/tv_other_login" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_onekey_login"
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:src="@mipmap/ic_login_top_bg"
|
||||
app:layout_constraintDimensionRatio="h,375:251"
|
||||
app:layout_constraintDimensionRatio="h,1125:1270"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_logo"
|
||||
android:layout_width="@dimen/dp_80"
|
||||
android:layout_height="@dimen/dp_80"
|
||||
android:layout_marginTop="@dimen/dp_100"
|
||||
android:layout_marginTop="@dimen/dp_32"
|
||||
android:src="@mipmap/ic_login_logo"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_50"
|
||||
android:paddingStart="@dimen/dp_38"
|
||||
android:paddingEnd="@dimen/dp_38"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
|
@ -61,14 +61,14 @@
|
|||
android:id="@+id/loginBtn"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="@dimen/dp_60"
|
||||
android:layout_marginTop="@dimen/dp_50"
|
||||
android:text="本机号码一键登录"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
android:textStyle="bold"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintDimensionRatio="h,300:50"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_slogan" />
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@
|
|||
android:textStyle="bold"
|
||||
app:csb_activeEnable="true"
|
||||
app:csb_cornerRadius="@dimen/dp_50"
|
||||
app:csb_fillColor="@color/color_466afd"
|
||||
app:csb_fillColor="@color/color_125ffe"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
android:layout_gravity="end"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
android:text="保存"
|
||||
android:textColor="@color/color_466afd"
|
||||
android:textColor="@color/color_125ffe"
|
||||
android:textSize="@dimen/sp_15"
|
||||
android:textStyle="bold" />
|
||||
</com.example.base.widget.TitleBar>
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 232 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 112 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
|
@ -4,14 +4,14 @@
|
|||
<color name="colorPrimaryDark">@color/white</color>
|
||||
<color name="colorAccent">@color/black</color>
|
||||
|
||||
<color name="windowBackground">@color/color_f3f5f9</color>
|
||||
<color name="windowBackground">@color/color_f7f9fd</color>
|
||||
<color name="actionMenuTextColor">@color/black</color>
|
||||
<color name="colorOnSecondary">@color/black</color>
|
||||
|
||||
<color name="transparent">#00000000</color>
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFF</color>
|
||||
<color name="color_f3f5f9">#F3F5F9</color>
|
||||
<color name="color_f7f9fd">#F7F9FD</color>
|
||||
|
||||
<!--图片选择器UI-->
|
||||
<!--前景色-->
|
||||
|
|
@ -62,15 +62,14 @@
|
|||
<color name="color_fb7528">#FB7528</color>
|
||||
<color name="color_fdf4f2">#FDF4F2</color>
|
||||
|
||||
<color name="color_466afd">#466AFD</color>
|
||||
<color name="color_125ffe">#125FFE</color>
|
||||
<color name="color_ebf5ff">#EBF5FF</color>
|
||||
<color name="color_9a9ea7">#9A9EA7</color>
|
||||
<color name="color_212226">#212226</color>
|
||||
<color name="color_727686">#727686</color>
|
||||
<color name="color_a3a7b9">#A3A7B9</color>
|
||||
<color name="color_f1f2f6">#F1F2F6</color>
|
||||
<color name="color_676e87">#676E87</color>
|
||||
<color name="color_54230c">#54230C</color>
|
||||
<color name="color_f94747">#F94747</color>
|
||||
<color name="color_896451">#896451</color>
|
||||
<color name="color_54220b">#54220B</color>
|
||||
<color name="color_80859b">#80859B</color>
|
||||
</resources>
|
||||