Commit 49308f8c authored by mengcuiguang's avatar mengcuiguang

代码优化

parent c3511594
...@@ -10,8 +10,8 @@ android { ...@@ -10,8 +10,8 @@ android {
applicationId "com.duben.dayplayletd" applicationId "com.duben.dayplayletd"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 722 versionCode 723
versionName "7.2.2" versionName "7.2.3"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -33,6 +33,7 @@ import com.duben.dayplayletd.ui.adapter.VipBannerAdapter ...@@ -33,6 +33,7 @@ import com.duben.dayplayletd.ui.adapter.VipBannerAdapter
import com.duben.dayplayletd.ui.widgets.* import com.duben.dayplayletd.ui.widgets.*
import com.duben.dayplayletd.ui.widgets.countdowntimer.CountDownTimerSupport import com.duben.dayplayletd.ui.widgets.countdowntimer.CountDownTimerSupport
import com.duben.dayplayletd.ui.widgets.countdowntimer.OnCountDownTimerListener import com.duben.dayplayletd.ui.widgets.countdowntimer.OnCountDownTimerListener
import com.duben.dayplayletd.utils.SpanUtils
import com.duben.library.utils.GlideUtils import com.duben.library.utils.GlideUtils
import com.duben.library.utils.nodoubleclick.AntiShake import com.duben.library.utils.nodoubleclick.AntiShake
import com.jobo.alipay.AliPay import com.jobo.alipay.AliPay
...@@ -220,7 +221,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -220,7 +221,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
} }
if (!TextUtils.isEmpty(bean.buttonText)) { if (!TextUtils.isEmpty(bean.buttonText)) {
if (bean.isShowCycTips) {
tvVipPay.text = SpanUtils()
.append(bean.buttonText + "\n")
.setFontSize(20, true)
.append(bean.remarks)
.setFontSize(10, true)
.setForegroundColor(Color.parseColor("#A24240"))
.create()
} else {
tvVipPay.text = bean.buttonText tvVipPay.text = bean.buttonText
}
tvVipAgreement.text = "点击购买即表示您同意《自动续费协议》" tvVipAgreement.text = "点击购买即表示您同意《自动续费协议》"
} else { } else {
tvVipPay.text = "立即开通" tvVipPay.text = "立即开通"
......
...@@ -39,7 +39,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base ...@@ -39,7 +39,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// 禁止截图 // 禁止截图
// getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) { if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
......
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2058m
android.injected.testOnly=false
android.useAndroidX=true
android.enableJetifier=true
android.nonTransitiveRClass=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#DEBUG_URL="https://test.mints-id.com/camera-api/"
#DEBUG_URL="http://cui.mints-id.com/"
DEBUG_URL="https://api.mints-tech.cn/camera-api/"
RELEASE_URL="https://api.mints-tech.cn/camera-api/"
RELEASE_KEY_PASSWORD=mintsdayplayletd
RELEASE_KEY_ALIAS=mints_dayplayletd
RELEASE_STORE_PASSWORD=mintsdayplayletd
RELEASE_STORE_FILE=mints_dayplayletd.jks
#ShareSDK
RELEASE_SHARESDK_KEY=38af89ff44247
RELEASE_SHARESDK_SECRET=96cb295278eb0f53b70e1cb807a74869
#weixin
WEIXIN_APP_PAY_ID ="wx78fff52fb3b373c5"
WEIXIN_APP_ID =wx78fff52fb3b373c5
WEIXIN_APP_SECRET =63a98dbec4bbc432dc92039be7229540
#umeng
RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
#TalkingData
RELEASE_TALKING_DATA_KEY="51E408B7C0FE404F97A4F80B0BDC3C06"
GROMORE_APP_ID="5551036"
GROMORE_SPLASH_CODE="102911237"
GROMORE_VIDEO_CODE="102911235"
GROMORE_EXPRESS_CODE="102911236"
GROMORE_MY_EXPRESS_CODE="102911236"
GROMORE_MAIN_EXPRESS_CODE="102911236"
GROMORE_DRAW_CODE="aa"
GROMORE_BANNER_CODE="102911238"
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