diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java index f9676d24e..2a9852895 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java @@ -137,19 +137,19 @@ public class MainRedPointTab extends RelativeLayout { } private int getDefaultRes(int tabType, boolean select) { - int resId = select ? R.mipmap.ic_main_tab_game_pressed : R.mipmap.ic_main_tab_game_home; + int resId = select ? R.drawable.ic_main_tab_game_pressed : R.drawable.ic_main_tab_game_home; switch (tabType) { case MainTabType.TAB_TYPE_SQUARE: - resId = select ? R.mipmap.ic_main_tab_find_pressed : R.mipmap.ic_main_tab_find; + resId = select ? R.drawable.ic_main_tab_find_pressed : R.drawable.ic_main_tab_find; break; case MainTabType.TAB_TYPE_GAME: resId = select ? R.mipmap.ic_main_tab_peace_pressed : R.mipmap.ic_main_tab_peace; break; case MainTabType.TAB_TYPE_MSG: - resId = select ? R.mipmap.ic_main_tab_msg_pressed : R.mipmap.ic_main_tab_msg; + resId = select ? R.drawable.ic_main_tab_msg_pressed : R.drawable.ic_main_tab_msg; break; case MainTabType.TAB_TYPE_ME: - resId = select ? R.mipmap.ic_main_tab_me_pressed : R.mipmap.ic_main_tab_me; + resId = select ? R.drawable.ic_main_tab_me_pressed : R.drawable.ic_main_tab_me; break; default: break; diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainTab.java index 61a20c5f7..b522baf1f 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainTab.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainTab.java @@ -43,8 +43,8 @@ public class MainTab extends androidx.appcompat.widget.AppCompatTextView { setCompoundDrawablePadding(ScreenUtil.dip2px(0)); TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MainTab); - mTabIcon = typedArray.getResourceId(R.styleable.MainTab_tab_icon, R.mipmap.ic_main_tab_game_home); - mTabIconSelect = typedArray.getResourceId(R.styleable.MainTab_tab_icon_select, R.mipmap.ic_main_tab_game_pressed); + mTabIcon = typedArray.getResourceId(R.styleable.MainTab_tab_icon, R.drawable.ic_main_tab_game_home); + mTabIconSelect = typedArray.getResourceId(R.styleable.MainTab_tab_icon_select, R.drawable.ic_main_tab_game_pressed); mTabtextColor = typedArray.getColor(R.styleable.MainTab_tab_text_color, DEFAULT_COLOR); mTabTextSelectColor = typedArray.getColor(R.styleable.MainTab_tab_text_color_select, DEFAULT_COLOR); diff --git a/app/src/main/res/color/color_selector_main_tab.xml b/app/src/main/res/color/color_selector_main_tab.xml index 36ffb7525..d2286e589 100644 --- a/app/src/main/res/color/color_selector_main_tab.xml +++ b/app/src/main/res/color/color_selector_main_tab.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable-xhdpi/default_avatar.webp b/app/src/main/res/drawable-xhdpi/default_avatar.webp deleted file mode 100644 index ccbe6f9d2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/default_avatar.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/default_banner.webp b/app/src/main/res/drawable-xhdpi/default_banner.webp deleted file mode 100644 index f4e65ce08..000000000 Binary files a/app/src/main/res/drawable-xhdpi/default_banner.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/default_cover.webp b/app/src/main/res/drawable-xhdpi/default_cover.webp deleted file mode 100644 index 343e3b231..000000000 Binary files a/app/src/main/res/drawable-xhdpi/default_cover.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/splash_bottom.webp b/app/src/main/res/drawable-xhdpi/splash_bottom.webp deleted file mode 100644 index 1f82bc4e4..000000000 Binary files a/app/src/main/res/drawable-xhdpi/splash_bottom.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/splash_logo.webp b/app/src/main/res/drawable-xhdpi/splash_logo.webp deleted file mode 100644 index dc863ea67..000000000 Binary files a/app/src/main/res/drawable-xhdpi/splash_logo.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/default_avatar.webp b/app/src/main/res/drawable-xxhdpi/default_avatar.webp new file mode 100644 index 000000000..f9aefdac2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/default_avatar.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/default_banner.webp b/app/src/main/res/drawable-xxhdpi/default_banner.webp new file mode 100644 index 000000000..6435f7723 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/default_banner.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/default_cover.webp b/app/src/main/res/drawable-xxhdpi/default_cover.webp new file mode 100644 index 000000000..da5aea6d2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/default_cover.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_find.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_find.webp new file mode 100644 index 000000000..85d4d46c8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_find.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_find_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_find_pressed.webp new file mode 100644 index 000000000..7f2782705 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_find_pressed.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_home.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_home.webp new file mode 100644 index 000000000..dccc6495a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_home.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.webp new file mode 100644 index 000000000..32d5d3e1a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.webp new file mode 100644 index 000000000..96f1db4b4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.webp new file mode 100644 index 000000000..d99bfd75c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.webp new file mode 100644 index 000000000..df67a7a3a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.webp new file mode 100644 index 000000000..c34211c68 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_bg_bottom.webp b/app/src/main/res/drawable-xxhdpi/splash_bg_bottom.webp new file mode 100644 index 000000000..1cc8757bf Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash_bg_bottom.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_bg_logo.webp b/app/src/main/res/drawable-xxhdpi/splash_bg_logo.webp new file mode 100644 index 000000000..58a898393 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash_bg_logo.webp differ diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml index 7ed577a83..fc3339ab5 100644 --- a/app/src/main/res/drawable/bg_splash.xml +++ b/app/src/main/res/drawable/bg_splash.xml @@ -3,24 +3,24 @@ - + - + + android:src="@drawable/splash_bg_logo" /> + android:gravity="bottom|fill_horizontal" + android:src="@drawable/splash_bg_bottom" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 63adaf0bd..b816132e4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -24,8 +24,8 @@ android:id="@+id/main_tab_layout" android:layout_width="0dp" android:layout_height="wrap_content" - android:paddingBottom="@dimen/dp_3" - android:paddingTop="@dimen/dp_10" + android:paddingBottom="@dimen/dp_6" + android:paddingTop="@dimen/dp_5" android:elevation="0.5dp" android:background="@color/color_white" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/maint_tab_red_poin_layout.xml b/app/src/main/res/layout/maint_tab_red_poin_layout.xml index 27bb318ed..b7f3569ca 100644 --- a/app/src/main/res/layout/maint_tab_red_poin_layout.xml +++ b/app/src/main/res/layout/maint_tab_red_poin_layout.xml @@ -15,8 +15,8 @@ #FFFFCB47 #5CAAFF - #66333333 + #C3C4C7 #FFFFFF diff --git a/modules/module_google/src/main/java/com/example/module_google/billing/BillingService.kt b/modules/module_google/src/main/java/com/example/module_google/billing/BillingService.kt index 08ca288ba..48ead9315 100644 --- a/modules/module_google/src/main/java/com/example/module_google/billing/BillingService.kt +++ b/modules/module_google/src/main/java/com/example/module_google/billing/BillingService.kt @@ -30,7 +30,7 @@ class BillingService(/*活动*/ /*购买key*/ private const val BASE_64_ENCODED_PUBLIC_KEY = - "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNboVqeCAvW1s2mNCaNipu0bd15HC6FP86E1+dTEdMTD9XLWkYiXCzEbt+ciTda/XdAOYYe4YNnyfW7T/a9E7O0ZyjPj08q2LQaMqgTBecpzQhE7ZhYYmh3DdWrGKCEMLImX4yNuEEX9yC/dVP49nHNqfLWxmnzhDrJ5JDSlpvguOI4lMRe0/1gx7kfEeB8DOg8HfvdibiVZI4vhjk9Oz6sWJQZd1/bOuUe4huAj9Ys/4zcgniE8Da45lGdefjn12y7ELhcUZpFLLKvXmj0qnfqBX94CB+wfbEOYvALKaFb+bBZe/a8YEn/9zA4UsA0j+eRweXBb6e1AqaZJ4wp/JQIDAQAB" + "" } /*客户端*/