添加新年皮肤到测试版本

app/src/main/java/com/sheep/gamegroup/module/plugin/model/Plugin.java

@@ -59,7 +59,7 @@ public enum  Plugin {
             return loadMediaPlugin();
         }
     },
-    skin_new_year(BuildConfig.APPLICATION_ID + ".skin_new_year", ".skin"){
+    skin_new_year(BuildConfig.APPLICATION_ID + ".skin_newYear", ".skin"){
         @Override
         public boolean loadPlugin() {
             return true;

app/src/main/java/com/sheep/gamegroup/module/skin/util/SkinUtil.java

@@ -106,12 +106,12 @@ public class SkinUtil {
     }
 
     //根据时间生成对应的主题
-    private static Plugin getSkinByTime() {
+    public static Plugin getSkinByTime() {
         java.util.Calendar curCalendar = java.util.Calendar.getInstance();
         int year = curCalendar.get(java.util.Calendar.YEAR);
         int month = curCalendar.get(java.util.Calendar.MONTH);
         int day = curCalendar.get(java.util.Calendar.DAY_OF_MONTH);
-        if(isNewYear(year, month, day)){//春节
+        if(isNewYear(year, month, day) || TestUtil.isTest()){//春节
             return Plugin.skin_new_year;
         } else if(isChristmas(year, month, day)){//元旦
             return Plugin.skin_christmas;
@@ -120,7 +120,7 @@ public class SkinUtil {
     }
 
     private static boolean isChristmas(int year, int month, int day) {
-        return year == 2019 && month == 1 || TestUtil.isDev();
+        return year == 2019 && month == 1;
     }
 
     private static boolean isNewYear(int year, int month, int day) {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -43,6 +43,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -68,6 +69,8 @@ import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.plugin.model.Plugin;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
@@ -87,6 +90,7 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.util.string.SpannableSb;
 import com.sheep.gamegroup.view.activity.ActMsg;
 import com.sheep.gamegroup.view.activity.NotificationsUtils;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
@@ -96,7 +100,6 @@ import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.gamegroup.view.dialog.DialogNotificationOfArrival;
-import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -619,8 +622,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
 
     //banner的高度
-    private int bannerHeight = G.WIDTH * 17 / 40;
+    private int bannerHeight;
 
+    private void initBannerHeight(){
+        bannerHeight = (G.WIDTH - G.getRealPix(24)) * 17 / 40;
+    }
     public void initView() {
         try {
             EventBus.getDefault().register(this);
@@ -635,7 +641,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 .inject(this);
         recyclerInitView();
         ViewGroup.LayoutParams bannerLayoutParams = banner.getLayoutParams();
-        bannerHeight = G.WIDTH * 17 / 40;
+        initBannerHeight();
         bannerLayoutParams.height = bannerHeight;//图片比例发生变化 ：306*720
 //        bannerLayoutParams.height = G.WIDTH * 25 / 72;
         banner.setLayoutParams(bannerLayoutParams);
@@ -957,7 +963,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
                     if (cashAwarsEntity != null) {
 
-                        String award = String.format(activity.getResources().getString(R.string.homepage_award), NumberFormatUtils.retainMost2(cashAwarsEntity.getAward()));
+                        CharSequence award = new SpannableSb().append("你还有").append(NumberFormatUtils.retainMost2(cashAwarsEntity.getAward()) + "元", "#FF2D4B").append("的奖励未领取", "#333333").getSsb();
                         String cash = String.format(activity.getResources().getString(R.string.homepage_cash), NumberFormatUtils.retainMost2(cashAwarsEntity.getCash()));
                         String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), NumberFormatUtils.retainMost2(cashAwarsEntity.getWelfare()));
                         homepage_item_get_award_name_tv.setText(award);
@@ -1408,7 +1414,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             public void displayImage(Context context, Object o, ImageView imageView) {
                 try {
                     if (o instanceof SlideshowEty && activity != null && !activity.isDestroyed())
-                        Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().dontAnimate()).into(imageView);
+                        Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().centerCrop().transform(new RoundedCorners(G.getRealPix(10)))).into(imageView);
+//                        Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().transform(new RoundedCornersTransformation(G.getRealPix(10), 0))).into(imageView);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -1640,13 +1647,23 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
      * 新手任务
      */
     private void addNewTask() {
+        boolean isNewYear = SkinUtil.getSkinByTime() == Plugin.skin_new_year;
+        if(isNewYear) {//新年皮肤，加载网络图片
+            int max = 11;
+            int i = 0;
+            for (HomeListEntity homeListEntity : homeListEntitys) {
+                int position = i == 8 ? 12 : i;//position为8的图片上传成功了却下载不了，实在是。。。
+                homeListEntity.setIcon(ViewUtil.getNetImgByNameAndSuffix("ic_new_year_" + position + ".png"));
+                i = (i + 1) % (max + 1);
+            }
+        }
 
         if (CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListEntitysGridview != null) {
             HomeListEntity homeListEntityNewTask = new HomeListEntity();
             homeListEntityNewTask.setTitle(getString(R.string.fresh_task));
             homeListEntityNewTask.setDesc(getString(R.string.fresh_task));
             homeListEntityNewTask.setJump("-1");
-            homeListEntityNewTask.setIcon("http://cdngame.kuaifazs.com/homepage_xinshourw.png");
+            homeListEntityNewTask.setIcon(ViewUtil.getNetImgByName((isNewYear ? "ic_new_year_" : "") + "homepage_xinshourw"));
             homeListEntitys.add(0, homeListEntityNewTask);
         }
         if (homeListEntitys.size() > 8) {
@@ -1654,13 +1671,14 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             homeListEntity.setTitle("更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
-            homeListEntity.setIcon("http://cdngame.kuaifazs.com/homepage_chakangd.png");
+            homeListEntity.setIcon(ViewUtil.getNetImgByName((isNewYear ? "ic_new_year_" : "") + "homepage_chakangd"));
             homeListEntitys.add(7, homeListEntity);
         }
         setValueList(false);
     }
 
     private void setValueList(boolean flag) {
+        boolean isNewYear = SkinUtil.getSkinByTime() == Plugin.skin_new_year;
         homeListEntitysGridview.clear();
         for (int i = 0; i < homeListEntitys.size(); i++) {
             if (flag) {
@@ -1678,11 +1696,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             if (flag) {
                 homeListEntity.setTitle("收起");
                 homeListEntity.setDesc("收起模块");
-                homeListEntity.setIcon("http://cdngame.kuaifazs.com/homepage_chakangd_click.png");
+                homeListEntity.setIcon(ViewUtil.getNetImgByName(isNewYear ? "ic_new_year_homepage_chakangd" : "homepage_chakangd_click"));
             } else {
                 homeListEntity.setTitle("更多");
                 homeListEntity.setDesc("查看更多");
-                homeListEntity.setIcon("http://cdngame.kuaifazs.com/homepage_chakangd.png");
+                homeListEntity.setIcon(ViewUtil.getNetImgByName((isNewYear ? "ic_new_year_" : "") + "homepage_chakangd"));
             }
             homeListEntitysGridview.set(7, homeListEntity);
         }

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/shape_bg_home_search"/>
+
+</selector>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+</shape>

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

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="15dp" />
-    <solid android:color="@color/gray_F0F0F0" />
+    <solid android:color="#33F7F7F7" />
 </shape>

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

@@ -4,9 +4,8 @@
     android:id="@+id/home_root_rl"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
-    android:clipChildren="true"
-    android:fitsSystemWindows="true">
+    android:background="@color/bg_home_color"
+    android:clipChildren="true">
 
     <include
         android:id="@+id/to_search_but_rl"
@@ -46,34 +45,38 @@
                     layout="@layout/homepage_item_gridview_listview"
                     android:visibility="visible" />
 
-                <include layout="@layout/homepage_item_notice_and_currenttime" />
                 <!--超维对决HomeList-->
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/full_home_list_rv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:visibility="gone" />
-
-                <View
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:background="#fff5f5f5" />
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/content_padding"
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:layout_marginEnd="@dimen/content_padding"
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    android:orientation="vertical">
 
-                <include layout="@layout/homepage_item_get_award" />
+                    <include layout="@layout/homepage_item_notice_and_currenttime" />
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:background="#fff5f5f5" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@color/color_bg_line_home" />
 
-                <include
-                    layout="@layout/homepage_item_notice"
-                    android:visibility="gone" />
+                    <include layout="@layout/homepage_item_get_award" />
 
-                <include
-                    layout="@layout/homepage_item_currenttime_reward"
-                    android:visibility="gone" />
+                    <include
+                        layout="@layout/homepage_item_notice"
+                        android:visibility="gone" />
+
+                    <include
+                        layout="@layout/homepage_item_currenttime_reward"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <include
                     layout="@layout/homepage_item_4module"
@@ -87,25 +90,33 @@
                     layout="@layout/homepage_item_gridview_listview"
                     android:visibility="gone" />
 
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/recyclerview"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingLeft="3dp"
-                    android:paddingRight="3dp" />
-
-                <View
-                    android:id="@+id/recyclerview_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:layout_marginTop="@dimen/content_padding_8"
-                    android:layout_marginBottom="@dimen/content_padding_8"
-                    android:background="#fff5f5f5"
-                    android:visibility="gone" />
-
-                <!--选项卡-->
-                <include layout="@layout/tablayout_viewpager_layout" />
+                    android:layout_marginTop="@dimen/content_padding"
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:layout_marginEnd="@dimen/content_padding"
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    android:orientation="vertical">
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/recyclerview"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingLeft="3dp"
+                        android:paddingRight="3dp" />
+
+                    <View
+                        android:id="@+id/recyclerview_line"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="#fff5f5f5"
+                        android:visibility="gone" />
+
+                    <!--选项卡-->
+                    <include layout="@layout/tablayout_viewpager_layout" />
+
+                </LinearLayout>
 
             </LinearLayout>
 

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

@@ -4,6 +4,8 @@
     android:id="@+id/banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/content_padding"
+    android:layout_marginEnd="@dimen/content_padding"
     app:indicator_margin="2dp"
     app:indicator_height="5dp"
     app:indicator_width="5dp"

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

@@ -3,9 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/content_padding_10"
-    android:paddingBottom="@dimen/content_padding_10"
-    android:paddingTop="@dimen/content_padding_10">
+    android:layout_margin="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/homepage_item_get_award_iv"
@@ -18,24 +16,26 @@
         android:id="@+id/homepage_item_get_award_name_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/content_padding_30"
         android:text="@string/homepage_award"
         android:textColor="@color/black_333333"
         android:textSize="@dimen/text_size_3"
         app:layout_constraintLeft_toRightOf="@id/homepage_item_get_award_iv"
+        app:layout_constraintEnd_toEndOf="parent"
         android:paddingTop="@dimen/content_padding_3"/>
 
     <TextView
         android:id="@+id/homepage_item_money_tv"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/common_margin_10"
         android:text="11"
-        android:textColor="@color/black_999999"
-        android:textSize="11sp"
-        app:layout_constraintStart_toStartOf="@id/homepage_item_get_award_name_tv"
+        android:textColor="#2EBEF2"
+        android:textSize="10sp"
+        android:gravity="center"
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         app:layout_constraintBottom_toBottomOf="@+id/homepage_item_get_award_iv"
+        app:layout_constraintStart_toEndOf="@id/homepage_item_get_award_iv"
+        app:layout_constraintEnd_toStartOf="@id/homepage_item_juan_tv"
         android:paddingBottom="@dimen/content_padding_3"/>
 
     <TextView
@@ -45,8 +45,8 @@
         android:layout_marginTop="@dimen/common_margin_10"
         android:layout_marginEnd="2dp"
         android:text=""
-        android:textColor="@color/black_999999"
-        android:textSize="11sp"
+        android:textColor="#2EBEF2"
+        android:textSize="10sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         app:layout_constraintBottom_toBottomOf="@+id/homepage_item_get_award_iv"

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

@@ -17,7 +17,10 @@
         android:listSelector="@color/transparent"
         android:numColumns="4"
         android:scrollbars="none"
-        android:verticalSpacing="@dimen/content_padding_5" />
+        android:verticalSpacing="@dimen/content_padding_5"
+        android:layout_marginStart="@dimen/content_padding"
+        android:layout_marginEnd="@dimen/content_padding"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
 
     <com.sheep.gamegroup.util.MyListview
         android:id="@+id/home_list_gridview_listview"

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/content_padding_10">
+    android:padding="7dp">
 
     <ImageView
         android:id="@+id/notice_currenttime_iv"

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

@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@drawable/drawable_selector_bg_home_search">
+
+    <View
+        android:id="@+id/home_search_top"
+        android:layout_width="match_parent"
+        android:layout_height="20dp" />
 
     <ImageView
         android:id="@+id/home_search_msg_iv"
         android:layout_width="44dp"
         android:layout_height="44dp"
+        android:layout_below="@id/home_search_top"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
@@ -17,21 +24,24 @@
         android:id="@+id/home_search_msg_tv"
         android:layout_width="wrap_content"
         android:layout_height="14dp"
+        android:layout_below="@id/home_search_top"
+        android:layout_alignParentEnd="true"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="8dp"
+        android:background="@drawable/shape_f81b5f_rec_7"
+        android:gravity="center"
+        android:minWidth="14dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:layout_alignParentEnd="true"
-        android:minWidth="14dp"
-        android:gravity="center"
-        android:textSize="9sp"
         android:text="0"
         android:textColor="@color/white"
-        android:background="@drawable/shape_f81b5f_rec_7"/>
+        android:textSize="9sp" />
+
     <LinearLayout
         android:id="@+id/to_search_but"
         android:layout_width="match_parent"
         android:layout_height="30dp"
+        android:layout_below="@id/home_search_top"
         android:layout_marginStart="27dp"
         android:layout_marginTop="7dp"
         android:layout_marginEnd="22dp"
@@ -54,14 +64,14 @@
             android:layout_marginStart="6dp"
             android:layout_weight="1"
             android:text="@string/search_hint_txt"
-            android:textColor="#8f8f8f"
+            android:textColor="@color/tc_home_search_1"
             android:textSize="12sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/search_but_text"
-            android:textColor="@color/black_6_3"
+            android:textColor="@color/tc_home_search_2"
             android:textSize="14sp" />
     </LinearLayout>
 

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

@@ -14,4 +14,8 @@
     <color name="tc_dialog_gtg_name">#272727</color>
     <color name="tc_dialog_gtg_amout">#ffff2d4b</color>
     <color name="red_FD2D54">#FD2D54</color>
+    <color name="bg_home_color">#ffffff</color>
+    <color name="color_bg_line_home">#fff5f5f5</color>
+    <color name="tc_home_search_1">#8f8f8f</color>
+    <color name="tc_home_search_2">#333333</color>
 </resources>

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

@@ -79,8 +79,8 @@
     <string name="audit_failed">奖励失败\n%s</string>
 
     <string name="homepage_award">你还有%s元的奖励未领取</string>
-    <string name="homepage_cash">现金奖励:%s元</string>
-    <string name="homepage_welfare">游戏福利:%s元</string>
+    <string name="homepage_cash">现金奖励：%s元 ></string>
+    <string name="homepage_welfare">游戏福利：%s元 ></string>
 
     <string name="last_this_month_rank">查看上月排行</string>
     <string name="last_this_month_rank_top5">上月排行榜top5</string>

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="gray_6">#D9D9D9</color>
-
     <color name="tc_dialog_gtg_name">#ffffff</color>
     <color name="tc_dialog_gtg_amout">#ffffff</color>
     <color name="red_FD2D54">#FDDD36</color>

skin_christmas/src/main/res/values/view_colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="gray_6">#D9D9D9</color>
+</resources>

skin_newYear/src/main/res/drawable/bg_h_dgtg1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <size android:height="120dp" android:width="1dp"/>
+    <size android:height="70dp" android:width="1dp"/>
 </shape>

skin_newYear/src/main/res/drawable/bg_h_dgtg2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <size android:height="5dp" android:width="1dp"/>
+    <size android:height="15dp" android:width="1dp"/>
 </shape>

skin_newYear/src/main/res/drawable/drawable_selector_bg_home_search.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/new_year_1"/>
+
+</selector>

skin_newYear/src/main/res/drawable/selector_btn_blue.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
   <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
-  <item android:state_focused="true" android:drawable="@mipmap/lanse" />
-  <item android:state_checked="true" android:drawable="@mipmap/lanse"/>
-  <item android:state_selected="true" android:drawable="@mipmap/lanse"/>
-  <item android:state_pressed="true" android:drawable="@mipmap/lanse"/>
-  <item android:drawable="@mipmap/lanse"/>
+  <item android:state_focused="true" android:drawable="@mipmap/huanyig" />
+  <item android:state_checked="true" android:drawable="@mipmap/huanyig"/>
+  <item android:state_selected="true" android:drawable="@mipmap/huanyig"/>
+  <item android:state_pressed="true" android:drawable="@mipmap/huanyig"/>
+  <item android:drawable="@mipmap/huanyig"/>
 </selector>

skin_newYear/src/main/res/drawable/shape_f81b5f_rec_7.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <corners android:radius="7dp"/>
+    <solid android:color="#1FC351" />
+</shape>

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="gray_6">#D9D9D9</color>
-
     <color name="tc_dialog_gtg_name">#ffffff</color>
     <color name="tc_dialog_gtg_amout">#ffffff</color>
     <color name="red_FD2D54">#FDDD36</color>
+    <color name="bg_home_color">#CB0404</color>
+    <color name="color_bg_line_home">#EDEAEA</color>
+    <color name="tc_home_search_1">#66ffffff</color>
+    <color name="tc_home_search_2">#ffffff</color>
 </resources>

skin_newYear/src/main/res/values/view_colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="gray_6">#D9D9D9</color>
+</resources>