diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java index e045fa4a6..cddfd9699 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java @@ -54,8 +54,6 @@ public class ChargeActivity extends BaseMvpActivity finish()); mRecyclerView.setLayoutManager(new LinearLayoutManager(context)); mChargeAdapter = new ChargeAdapter(); mRecyclerView.setAdapter(mChargeAdapter); diff --git a/app/src/main/res/drawable/bg_common_confirm_normal.xml b/app/src/main/res/drawable/bg_common_confirm_normal.xml index d2d66ddcf..060b3dcd8 100644 --- a/app/src/main/res/drawable/bg_common_confirm_normal.xml +++ b/app/src/main/res/drawable/bg_common_confirm_normal.xml @@ -8,6 +8,6 @@ android:startColor="#ED66FF" android:type="linear" android:useLevel="true" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_common_normal.xml b/app/src/main/res/drawable/bg_common_normal.xml new file mode 100644 index 000000000..b083095f6 --- /dev/null +++ b/app/src/main/res/drawable/bg_common_normal.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_common_top_14_white.xml b/app/src/main/res/drawable/bg_common_top_14_white.xml new file mode 100644 index 000000000..febb03d85 --- /dev/null +++ b/app/src/main/res/drawable/bg_common_top_14_white.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_common_translate_rectangle.webp b/app/src/main/res/drawable/bg_common_translate_rectangle.webp new file mode 100644 index 000000000..ed841f5cf Binary files /dev/null and b/app/src/main/res/drawable/bg_common_translate_rectangle.webp differ diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index c03b2d40d..122cf0dd5 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -1,294 +1,96 @@ - - - + + + + + + + + - + android:layout_height="88dp" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_16" + android:background="@drawable/bg_common_translate_rectangle" + app:layout_constraintBottom_toBottomOf="@+id/iv_bg" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent"/> + app:layout_constraintStart_toStartOf="parent" + app:drawableStartCompat="@mipmap/ic_charge_diamond" /> + + + + + + - - - - + android:layout_height="45dp" + android:layout_marginStart="60dp" + android:layout_marginTop="50dp" + android:layout_marginEnd="@dimen/dp_60" + android:background="@drawable/bg_common_confirm_normal" + android:gravity="center" + android:text="确认充值" + android:textColor="@color/white" + android:textSize="@dimen/dp_15" + app:layout_constraintBottom_toBottomOf="parent" /> - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/build.gradle b/build.gradle index 81ed860e0..d6d732841 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.3.0' //realm 数据库插件 classpath "io.realm:realm-gradle-plugin:5.3.0" // android 资源混淆插件 diff --git a/core/build.gradle b/core/build.gradle index 4511a64e8..9fb90080a 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -9,8 +9,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 32 - versionCode 1 - versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -97,8 +95,8 @@ dependencies { implementation 'com.google.firebase:firebase-core:19.0.0' //googleplay内购 - api 'com.google.android.gms:play-services-wallet:18.1.3' - api 'com.android.billingclient:billing:4.0.0' + api 'com.google.android.gms:play-services-wallet:19.1.0' + api 'com.android.billingclient:billing:4.1.0' api project(':nim_uikit') api project(':library') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dc527a6be..24aaf831c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index c78c4b217..796d2081d 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -6,8 +6,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 32 - versionCode 1 - versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }