feat:完成首页Tab、默认图、启动页 UI改版

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;

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);

app/src/main/res/color/color_selector_main_tab.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:color="@color/color_333333" android:state_selected="true" />
+    <item android:color="#141414" android:state_selected="true" />
 
     <item android:color="@color/main_tab_normal" />
 

app/src/main/res/drawable/bg_splash.xml

@@ -3,24 +3,24 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
+            <solid android:color="@color/base_color_theme" />
         </shape>
     </item>
 
-    <item android:top="180dp">
+    <item android:top="@dimen/dp_188">
         <bitmap
             android:dither="true"
             android:filter="true"
             android:gravity="top"
-            android:src="@drawable/splash_logo" />
+            android:src="@drawable/splash_bg_logo" />
     </item>
 
     <item>
         <bitmap
             android:dither="true"
             android:filter="true"
-            android:gravity="bottom"
-            android:src="@drawable/splash_bottom" />
+            android:gravity="bottom|fill_horizontal"
+            android:src="@drawable/splash_bg_bottom" />
     </item>
 
 </layer-list>

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"

app/src/main/res/layout/maint_tab_red_poin_layout.xml

@@ -15,8 +15,8 @@
 
         <com.opensource.svgaplayer.SVGAImageView
             android:id="@+id/iv_tab_icon"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
+            android:layout_width="@dimen/dp_28"
+            android:layout_height="@dimen/dp_28"
             android:src="@drawable/default_cover" />
 
         <TextView

app/src/main/res/values/colors.xml

@@ -591,7 +591,7 @@
     <color name="color_7727e4">#FFFFCB47</color>
     <color name="color_5caaff">#5CAAFF</color>
     <!-- 首页tab未选中颜色 -->
-    <color name="main_tab_normal">#66333333</color>
+    <color name="main_tab_normal">#C3C4C7</color>
     <!-- 按钮文字颜色一级 -->
     <color name="text_button_color_first">#FFFFFF</color>
     <!-- 按钮文字颜色二级 -->

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"
+            ""
     }
 
     /*客户端*/