diff --git a/app/build.gradle b/app/build.gradle index 48b9c42..294289b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' //毛玻璃效果 diff --git a/app/src/main/assets/fonts/DouyinSansBold.otf b/app/src/main/assets/fonts/DouyinSansBold.otf new file mode 100644 index 0000000..d63f58d Binary files /dev/null and b/app/src/main/assets/fonts/DouyinSansBold.otf differ diff --git a/app/src/main/java/com/cheng/bole/bean/BannerEntity.kt b/app/src/main/java/com/cheng/bole/bean/BannerEntity.kt deleted file mode 100644 index 9f04f69..0000000 --- a/app/src/main/java/com/cheng/bole/bean/BannerEntity.kt +++ /dev/null @@ -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 \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/bean/ConfigEntity.kt b/app/src/main/java/com/cheng/bole/bean/ConfigEntity.kt index f750bea..761985a 100644 --- a/app/src/main/java/com/cheng/bole/bean/ConfigEntity.kt +++ b/app/src/main/java/com/cheng/bole/bean/ConfigEntity.kt @@ -28,9 +28,6 @@ class ConfigEntity { @SerializedName("client.login.type") //登录方式 var loginType: List? = emptyList() - @SerializedName("client.banner.urls") //首页banner - var banners: List? = emptyList() - @SerializedName("client.ad.switch") //广告总开关 var adSwitch: Boolean = false diff --git a/app/src/main/java/com/cheng/bole/common/Constants.kt b/app/src/main/java/com/cheng/bole/common/Constants.kt index 2cc160d..6ac7c78 100644 --- a/app/src/main/java/com/cheng/bole/common/Constants.kt +++ b/app/src/main/java/com/cheng/bole/common/Constants.kt @@ -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") + } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt b/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt index 256fabd..874e373 100644 --- a/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt +++ b/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt @@ -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) { - MMKVUtils.put("home_banner", Gson().toJson(list)) - } - - fun getBanners(): List { - val s = MMKVUtils.getString("home_banner") - if (!TextUtils.isEmpty(s)) { - return Gson().fromJson(s, object : TypeToken>() {}.type) - } - return emptyList() - } - private fun saveShareEntity(entity: com.cheng.bole.bean.WxShareEntity?) { MMKVUtils.put("weixin_share", Gson().toJson(entity)) } diff --git a/app/src/main/java/com/cheng/bole/ui/activity/LauncherActivity.kt b/app/src/main/java/com/cheng/bole/ui/activity/LauncherActivity.kt index c68224a..e6654f6 100644 --- a/app/src/main/java/com/cheng/bole/ui/activity/LauncherActivity.kt +++ b/app/src/main/java/com/cheng/bole/ui/activity/LauncherActivity.kt @@ -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, "", "") diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/LoginTipDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/LoginTipDialog.kt index ab88e00..2b270d4 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/LoginTipDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/LoginTipDialog.kt @@ -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() diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/PayTipDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/PayTipDialog.kt index 4b1a006..5402765 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/PayTipDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/PayTipDialog.kt @@ -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()) } } diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/PrivacyPolicyDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/PrivacyPolicyDialog.kt index 2890286..de5c407 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/PrivacyPolicyDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/PrivacyPolicyDialog.kt @@ -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("了解详细信息。如果你同意,请点击下面同意按钮开始接受我们的服务。") diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/SimpleTipDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/SimpleTipDialog.kt index 7c38fbc..15e3dbe 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/SimpleTipDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/SimpleTipDialog.kt @@ -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") diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/TipDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/TipDialog.kt index 3e0dd60..0583f00 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/TipDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/TipDialog.kt @@ -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") diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/UpdateVersionDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/UpdateVersionDialog.kt index 2e26dfd..c5261a1 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/UpdateVersionDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/UpdateVersionDialog.kt @@ -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) diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/VipLoginTipDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/VipLoginTipDialog.kt index 202ac79..f50d38f 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/VipLoginTipDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/VipLoginTipDialog.kt @@ -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() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/login/LoginFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/login/LoginFragment.kt index 66035a3..50ca263 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/login/LoginFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/login/LoginFragment.kt @@ -174,12 +174,12 @@ class LoginFragment : BaseFragment() { 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() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/login/onekey/OneKeyLoginFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/login/onekey/OneKeyLoginFragment.kt index 3374809..9470431 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/login/onekey/OneKeyLoginFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/login/onekey/OneKeyLoginFragment.kt @@ -236,22 +236,21 @@ class OneKeyLoginFragment : BaseFragment() { 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()) } } diff --git a/app/src/main/res/drawable/layer_progress_z_grey_28.xml b/app/src/main/res/drawable/layer_progress_z_grey_28.xml index ececf3f..d8b74b6 100644 --- a/app/src/main/res/drawable/layer_progress_z_grey_28.xml +++ b/app/src/main/res/drawable/layer_progress_z_grey_28.xml @@ -19,7 +19,7 @@ - + diff --git a/app/src/main/res/drawable/selector_feedback_text_color.xml b/app/src/main/res/drawable/selector_feedback_text_color.xml index 2052438..53f1e84 100644 --- a/app/src/main/res/drawable/selector_feedback_text_color.xml +++ b/app/src/main/res/drawable/selector_feedback_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_main_navigation_color.xml b/app/src/main/res/drawable/selector_main_navigation_color.xml index c7f95b7..e358cdd 100644 --- a/app/src/main/res/drawable/selector_main_navigation_color.xml +++ b/app/src/main/res/drawable/selector_main_navigation_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_10466afd_cor4.xml b/app/src/main/res/drawable/shape_10466afd_cor4.xml index c8bbfb6..85644d7 100644 --- a/app/src/main/res/drawable/shape_10466afd_cor4.xml +++ b/app/src/main/res/drawable/shape_10466afd_cor4.xml @@ -4,5 +4,5 @@ + android:color="@color/color_125ffe" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_466afd_cor25.xml b/app/src/main/res/drawable/shape_466afd_cor25.xml index 2c269e2..6dc00f5 100644 --- a/app/src/main/res/drawable/shape_466afd_cor25.xml +++ b/app/src/main/res/drawable/shape_466afd_cor25.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_466afd_cor4.xml b/app/src/main/res/drawable/shape_466afd_cor4.xml index c8a4b77..d22fef7 100644 --- a/app/src/main/res/drawable/shape_466afd_cor4.xml +++ b/app/src/main/res/drawable/shape_466afd_cor4.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_466afd_line_cor6.xml b/app/src/main/res/drawable/shape_466afd_line_cor6.xml index 79effde..9f40cad 100644 --- a/app/src/main/res/drawable/shape_466afd_line_cor6.xml +++ b/app/src/main/res/drawable/shape_466afd_line_cor6.xml @@ -5,5 +5,5 @@ + android:color="@color/color_125ffe" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_dfdfdf_line_cor50.xml b/app/src/main/res/drawable/shape_dfdfdf_line_cor50.xml new file mode 100644 index 0000000..b7903d7 --- /dev/null +++ b/app/src/main/res/drawable/shape_dfdfdf_line_cor50.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_f3f5f9_cor10.xml b/app/src/main/res/drawable/shape_f3f5f9_cor10.xml index b212de1..a674237 100644 --- a/app/src/main/res/drawable/shape_f3f5f9_cor10.xml +++ b/app/src/main/res/drawable/shape_f3f5f9_cor10.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_mine_nologin_tip.xml b/app/src/main/res/drawable/shape_mine_nologin_tip.xml index 1abd087..7f1b986 100644 --- a/app/src/main/res/drawable/shape_mine_nologin_tip.xml +++ b/app/src/main/res/drawable/shape_mine_nologin_tip.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_account_list.xml b/app/src/main/res/layout/dialog_account_list.xml index d82c75b..eb3b955 100644 --- a/app/src/main/res/layout/dialog_account_list.xml +++ b/app/src/main/res/layout/dialog_account_list.xml @@ -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" /> @@ -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" /> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_pay_tip.xml b/app/src/main/res/layout/dialog_pay_tip.xml index 49249cd..c87fc3d 100644 --- a/app/src/main/res/layout/dialog_pay_tip.xml +++ b/app/src/main/res/layout/dialog_pay_tip.xml @@ -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" /> - @@ -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" diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml index f5835ba..3c163b8 100644 --- a/app/src/main/res/layout/dialog_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_privacy_policy.xml @@ -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" /> - @@ -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" /> diff --git a/app/src/main/res/layout/dialog_simple_tip.xml b/app/src/main/res/layout/dialog_simple_tip.xml index cf01216..966bb3a 100644 --- a/app/src/main/res/layout/dialog_simple_tip.xml +++ b/app/src/main/res/layout/dialog_simple_tip.xml @@ -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" /> @@ -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" diff --git a/app/src/main/res/layout/dialog_tip.xml b/app/src/main/res/layout/dialog_tip.xml index 7c5c732..6b17b16 100644 --- a/app/src/main/res/layout/dialog_tip.xml +++ b/app/src/main/res/layout/dialog_tip.xml @@ -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" /> - @@ -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" diff --git a/app/src/main/res/layout/dialog_update_verison.xml b/app/src/main/res/layout/dialog_update_verison.xml index 23539b0..dd43bcf 100644 --- a/app/src/main/res/layout/dialog_update_verison.xml +++ b/app/src/main/res/layout/dialog_update_verison.xml @@ -8,7 +8,7 @@ @@ -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" /> - @@ -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 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_vip_login_tip.xml b/app/src/main/res/layout/dialog_vip_login_tip.xml index 4ac9164..9e6a9f5 100644 --- a/app/src/main/res/layout/dialog_vip_login_tip.xml +++ b/app/src/main/res/layout/dialog_vip_login_tip.xml @@ -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" /> - @@ -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" diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml index 2fae928..68cf699 100644 --- a/app/src/main/res/layout/fragment_feedback.xml +++ b/app/src/main/res/layout/fragment_feedback.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_guide_content.xml b/app/src/main/res/layout/fragment_guide_content.xml index 9205c5a..a640dc5 100644 --- a/app/src/main/res/layout/fragment_guide_content.xml +++ b/app/src/main/res/layout/fragment_guide_content.xml @@ -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" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3728533..77d9ef6 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -1,7 +1,6 @@ + android:layout_height="match_parent"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 8650bec..a428846 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -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" /> - - + app:layout_constraintTop_toBottomOf="@+id/ed_phone" /> - - + app:layout_constraintTop_toTopOf="@id/tv_other_login" /> + app:layout_constraintTop_toTopOf="@id/tv_other_login" /> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index cbbab43..627a261 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_user_setting.xml b/app/src/main/res/layout/fragment_user_setting.xml index 8566fb8..2119fbf 100644 --- a/app/src/main/res/layout/fragment_user_setting.xml +++ b/app/src/main/res/layout/fragment_user_setting.xml @@ -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" /> diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_logo.png b/app/src/main/res/mipmap-xxhdpi/ic_login_logo.png new file mode 100644 index 0000000..2072fc6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_login_logo.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_logo.webp b/app/src/main/res/mipmap-xxhdpi/ic_login_logo.webp deleted file mode 100644 index e7f8891..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_login_logo.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_top_bg.png b/app/src/main/res/mipmap-xxhdpi/ic_login_top_bg.png new file mode 100644 index 0000000..fc5be77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_login_top_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_top_bg.webp b/app/src/main/res/mipmap-xxhdpi/ic_login_top_bg.webp deleted file mode 100644 index c770208..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_login_top_bg.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_onekey_login.png b/app/src/main/res/mipmap-xxhdpi/ic_onekey_login.png new file mode 100644 index 0000000..0d97b2d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_onekey_login.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_onekey_login.webp b/app/src/main/res/mipmap-xxhdpi/ic_onekey_login.webp deleted file mode 100644 index a23110c..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_onekey_login.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_phone_login.png b/app/src/main/res/mipmap-xxhdpi/ic_phone_login.png new file mode 100644 index 0000000..777ff89 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_phone_login.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_phone_login.webp b/app/src/main/res/mipmap-xxhdpi/ic_phone_login.webp deleted file mode 100644 index eb26ff1..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_phone_login.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_tip_dialog_top_bg.png b/app/src/main/res/mipmap-xxhdpi/ic_tip_dialog_top_bg.png new file mode 100644 index 0000000..d955acd Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_tip_dialog_top_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_tip_dialog_top_bg.webp b/app/src/main/res/mipmap-xxhdpi/ic_tip_dialog_top_bg.webp deleted file mode 100644 index 4651426..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_tip_dialog_top_bg.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_update_top_bg.png b/app/src/main/res/mipmap-xxhdpi/ic_update_top_bg.png new file mode 100644 index 0000000..91c5364 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_update_top_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_update_top_bg.webp b/app/src/main/res/mipmap-xxhdpi/ic_update_top_bg.webp deleted file mode 100644 index 0843204..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_update_top_bg.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_wx_login.png b/app/src/main/res/mipmap-xxhdpi/ic_wx_login.png new file mode 100644 index 0000000..af4100c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_wx_login.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_wx_login.webp b/app/src/main/res/mipmap-xxhdpi/ic_wx_login.webp deleted file mode 100644 index 94b2500..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_wx_login.webp and /dev/null differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5effc03..0a9ad1c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,14 +4,14 @@ @color/white @color/black - @color/color_f3f5f9 + @color/color_f7f9fd @color/black @color/black #00000000 #FF000000 #FFFFFF - #F3F5F9 + #F7F9FD @@ -62,15 +62,14 @@ #FB7528 #FDF4F2 - #466AFD + #125FFE + #EBF5FF + #9A9EA7 #212226 #727686 - #A3A7B9 - #F1F2F6 #676E87 #54230C #F94747 #896451 #54220B - #80859B \ No newline at end of file