邀请赚钱界面添加独立的新年界面

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

@@ -23,6 +23,7 @@ import skin.support.SkinCompatManager;
 import skin.support.app.SkinCardViewInflater;
 import skin.support.constraint.app.SkinConstraintViewInflater;
 import skin.support.design.app.SkinMaterialViewInflater;
+import skin.support.utils.SkinPreference;
 
 /**
  * Created by realicing on 2019/1/15.
@@ -46,18 +47,21 @@ public class SkinUtil {
 
     //恢复默认皮肤
     public static void restoreDefaultTheme() {
+        curPlugin = null;
         // 恢复应用默认皮肤
         SkinCompatManager.getInstance().restoreDefaultTheme();
     }
 
-    private static Plugin curPlugin;
+    public static Plugin curPlugin;
     public static final String KEY_CUR_SKIN_MD5 = "cur_skin";//当前正在使用的皮肤的key
     //切换皮肤
     public static void changeSkin(Action1<Object> action1) {
         curPlugin = getSkinByTime();//需要加载的皮肤
         String curSkinMd5 = PreferenceUtils.getPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, null);
         if(curPlugin == null){//默认皮肤
-            if(curSkinMd5 != null){
+            String curSkinName = SkinPreference.getInstance().getSkinName();
+            if(TextUtils.isEmpty(curSkinMd5) || !TextUtils.isEmpty(curSkinName)){
+                PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, "");
                 restoreDefaultTheme();
             }
             action1.call(null);
@@ -77,7 +81,8 @@ public class SkinUtil {
                         }
                         String md5 = Md5Util.getFileMD5(file);
                         String skinName = SheepPluginUtil.getFileName(curPlugin);
-                        if(curSkinMd5 != null && TextUtils.equals(md5, curSkinMd5)){//已经加载皮肤
+                        String curSkinName = SkinPreference.getInstance().getSkinName();
+                        if(curSkinMd5 != null && TextUtils.equals(md5, curSkinMd5) && TextUtils.equals(skinName, curSkinName)){//已经加载皮肤
                             action1.call(null);
                             return;
                         }
@@ -105,22 +110,28 @@ public class SkinUtil {
                 });
     }
 
+    public static boolean isUserPlugin = true;
     //根据时间生成对应的主题
     public static Plugin getSkinByTime() {
+        if(!isUserPlugin){
+            return null;
+        }
         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) || TestUtil.isTest()){//春节
+        if(isNewYear(year, month, day)){//春节
             return Plugin.skin_new_year;
         } else if(isChristmas(year, month, day)){//元旦
             return Plugin.skin_christmas;
+        } else if(TestUtil.isTest()){
+            return Plugin.skin_new_year;
         }
         return null;
     }
 
     private static boolean isChristmas(int year, int month, int day) {
-        return year == 2019 && month == 1;
+        return year == 2019 && month == 1 && day == 1;
     }
 
     private static boolean isNewYear(int year, int month, int day) {

app/src/main/java/com/sheep/gamegroup/util/MainTab.java

@@ -2,14 +2,14 @@ package com.sheep.gamegroup.util;
 
 import android.support.v4.app.Fragment;
 
+import com.sheep.gamegroup.module.plugin.model.Plugin;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyNewYear;
 import com.sheep.gamegroup.view.fragment.FgtFind;
 import com.sheep.gamegroup.view.fragment.FgtGameCenter;
-import com.sheep.gamegroup.view.fragment.FgtNull;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
-import com.sheep.gamegroup.view.fragment.FgtMainAudit;
-import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 
 /**
@@ -53,7 +53,7 @@ public enum MainTab {
     FgtMainAskGetMoney(R.string.main_tab_invite) {
         @Override
         public Fragment getFragment() {
-            return new FgtAskGetMoney();
+            return SkinUtil.curPlugin == Plugin.skin_new_year ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
         }
 
         @Override

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -260,7 +260,7 @@ public class TestUtil {
      */
     public static void test(final Activity activity) {
         final String[] items = {"复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
-                "少数民族姓名", "切换皮肤", "默认皮肤", "我的游戏", "优惠券弹窗", "填写收件地址弹窗",
+                "少数民族姓名", "开启皮肤", "不开启皮肤", "我的游戏", "优惠券弹窗", "填写收件地址弹窗",
                 "朗读文字", "游戏搜索", "测试插件","测试bitmap", "剪切视频", "我的关注", "足迹",
                 "测试联通卡", "测试联通卡2", "测试签名1", "测试签名2", "测试孔剑秋faq正式服",
                 "跳转QQ1", "跳转QQ2", "跳转QQ3", "跳转白白QQ", "龙猫竞猜", "龙猫竞猜-scheme",
@@ -283,11 +283,11 @@ public class TestUtil {
                             case "少数民族姓名":
                                 G.showToast(Boolean.toString(StringUtils.isChineseName("麦麦提·阿尤甫")));
                                 break;
-                            case "切换皮肤":
-                                SkinUtil.changeSkin(null);
+                            case "开启皮肤":
+                                SkinUtil.isUserPlugin = true;
                                 break;
-                            case "默认皮肤":
-                                SkinUtil.restoreDefaultTheme();
+                            case "不开启皮肤":
+                                SkinUtil.isUserPlugin = false;
                                 break;
                             case "我的游戏":
                                 Jump2View.getInstance().goActMyGameList(activity);

app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -1,12 +1,14 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
-import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
 import com.sheep.gamegroup.absBase.BaseUMActivity;
+import com.sheep.gamegroup.module.plugin.model.Plugin;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyNewYear;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
@@ -34,7 +36,7 @@ public class AskGetMoneyAct extends BaseUMActivity{
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
         if(fragment == null){
-            fragment = new FgtAskGetMoney();
+            fragment = SkinUtil.curPlugin == Plugin.skin_new_year ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
             transaction.add(R.id.frame_container, fragment, "tag");
             transaction.commitAllowingStateLoss();
         }else {

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

@@ -8,6 +8,8 @@ import android.widget.TextView;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Friend;
 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.util.CommonUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.TimeUtil;
@@ -52,7 +54,7 @@ public class FgtAskGetMoneyFriend extends BaseFragment {
 
     @Override
     public int getLayoutId() {
-        return R.layout.fgt_askgetmoney_friend;
+        return SkinUtil.curPlugin == Plugin.skin_new_year ? R.layout.new_year_fgt_askgetmoney_friend : R.layout.fgt_askgetmoney_friend;
     }
 
     @Override

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

@@ -0,0 +1,262 @@
+package com.sheep.gamegroup.view.fragment;
+
+import android.app.Activity;
+import android.support.v4.view.ViewPager;
+import android.support.v4.widget.NestedScrollView;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.view.View;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
+import com.sheep.gamegroup.model.entity.Lp;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
+import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import org.afinal.simplecache.ApiKey;
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.Locale;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+import rx.functions.Action1;
+
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
+
+/**
+ * Created by realicing on 2019/1/18.
+ * realicing@sina.com
+ * 邀请赚钱 --- 新年版本
+ */
+public class FgtAskGetMoneyNewYear extends BaseFragment {
+    @BindView(R.id.refresh)
+    SwipeRefreshLayout refresh;
+    @BindView(R.id.new_year_tab_1)
+    TextView new_year_tab_1;
+    @BindView(R.id.new_year_tab_2)
+    TextView new_year_tab_2;
+    @BindView(R.id.tv_size)
+    TextView tvSize;
+    @BindView(R.id.tv_money)
+    TextView tvMoney;
+    @BindView(R.id.new_year_ask_start_view)
+    View new_year_ask_start_view;
+    @BindView(R.id.new_year_ask_end_view)
+    View new_year_ask_end_view;
+    @BindView(R.id.ask_scroll_view)
+    NestedScrollView scrollView;
+    @BindView(R.id.pager)
+    ViewPager pager;
+    @BindView(R.id.my_invitation_tv)
+    TextView my_invitation_tv;
+    @BindView(R.id.ask_act_code)
+    TextView ask_act_code;
+    @BindView(R.id.copy_my_invitation_tv)
+    TextView copy_my_invitation_tv;
+
+    private FriendAndAwardEntity mEntity;
+
+    private Activity activity;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.new_year_x_ask_getmoney_act_layout;
+    }
+
+    //在viewPager的第一个位置或者在activity中通过transaction.replace(R.id.frame_container, fragment);方式加载的话，需要设置为true
+    private boolean isFirstFgt;
+    @Override
+    public void onViewCreated() {
+        activity = getActivity();
+        isFirstFgt = activity instanceof AskGetMoneyAct;
+        float n = G.WIDTH / 1088.0f;
+        LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(55));
+        LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(54));
+        ViewUtil.setDefaultText(tvSize);
+        ViewUtil.setDefaultText(tvMoney);
+        ViewUtil.setDefaultText(my_invitation_tv);
+        ViewUtil.setDefaultText(ask_act_code);
+
+        initListener();
+        if(isFirstFgt){
+            showViewPager();
+            try {
+                initData(true);
+            } catch (Exception e) {
+                e.printStackTrace();
+                G.showToast(e.getMessage());
+            }
+        }
+    }
+
+    @Override
+    protected void initViewOnVisibleToUser() {
+        if(!isFirstFgt) {
+            showViewPager();
+        }
+    }
+
+    @Override
+    public void initDataOnVisibleToUser() {
+        if(!isFirstFgt) {
+            try {
+                initData(true);
+            } catch (Exception e) {
+                e.printStackTrace();
+                G.showToast(e.getMessage());
+            }
+        }
+    }
+
+    public void initListener() {
+
+        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                refreshData();
+                refresh.setRefreshing(false);
+            }
+        });
+    }
+
+    public void refreshData() {
+        initData(false);
+    }
+
+    private UserEntity userEntity;
+
+    public void initData(final boolean isNotRefresh) {
+        if (!isNotRefresh) {
+            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.ASK_GETMONEY_FRIEND_REFRESH));
+        }
+        SheepApp.getInstance().getNetComponent().getApiService().FriendCountAndAward()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if (BuildConfig.DEBUG)
+                            G.showToast(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if (baseMessage != null) {
+                            boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.FRIEND_COUNT_AND_AWARD);
+                            if (mEntity == null || isNewData) {
+                                mEntity = baseMessage.getData(FriendAndAwardEntity.class);
+                                if (mEntity != null) {
+                                    int friendCount = mEntity.getFriend_count();
+                                    ViewUtil.setText(tvSize, String.valueOf(friendCount));
+                                    if(friendCount > 0)
+                                        ViewUtil.setText(new_year_tab_2, String.format(Locale.CHINA, "好友列表 (%d)", friendCount));
+                                    ViewUtil.setText(tvMoney, String.valueOf(mEntity.getAward()));
+                                }
+                            }
+                        }
+
+                    }
+                });
+        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+            @Override
+            public void call(UserEntity result) {
+                if (result != null) {
+                    boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.get_info);
+                    if (userEntity == null || isNewData) {
+                        userEntity = result;
+                        String audit_total_audit = String.format(activity.getResources().getString(R.string.my_invitation_str), userEntity.getInvitation_code());
+                        ask_act_code.setText(audit_total_audit);
+                        my_invitation_tv.setText(audit_total_audit);
+                    }
+                }
+            }
+        });
+    }
+
+    public static final String[] tabNames = {"排行榜", "好友列表"};
+    private TitleFragmentListAdapter mAdapter;
+
+    private void showViewPager() {
+        mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
+        mAdapter.add(FgtAskGetMoneyRank.newInstance(), tabNames[0]);
+        mAdapter.add(FgtAskGetMoneyFriend.newInstance(), tabNames[1]);
+        pager.setOffscreenPageLimit(2);
+        pager.setAdapter(mAdapter);
+        new_year_tab_1.setActivated(true);
+        new_year_tab_1.setOnClickListener(view -> {
+            int position = 0;
+            int curPosition = pager.getCurrentItem();
+            if(curPosition != position) {
+                pager.setCurrentItem(position, true);
+            }
+        });
+        new_year_tab_2.setOnClickListener(view -> {
+            int position = 1;
+            int curPosition = pager.getCurrentItem();
+            if(curPosition != position) {
+                pager.setCurrentItem(position, true);
+            }
+        });
+        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int i, float v, int i1) {
+
+            }
+
+            @Override
+            public void onPageSelected(int i) {
+                new_year_tab_1.setActivated(i == 0);
+                new_year_tab_2.setActivated(i == 1);
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int i) {
+
+            }
+        });
+    }
+
+    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.refresh, R.id.ask_act_rule, R.id.ask_act_code_copy})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.copy_my_invitation_tv:
+            case R.id.ask_act_code_copy:
+                if (userEntity == null) {
+                    G.showToast(R.string.loading_data);
+                    return;
+                }
+                QR_COPY.onEvent();
+                StringUtils.CopyText(userEntity.getInvitation_code() + "");
+                G.showToast(R.string.success_copy_inv_code);
+                break;
+            case R.id.ask_act_rule:
+                ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("活动规则").setBtnLeftText("我知道了").setTheme(DialogConfig.THEME_PURPLE)
+                        .setMsg(getString(R.string.tip_invite_for_more_coin)));
+                break;
+            case R.id.refresh://只是一个点击，用来遮盖底部不可见的view的点击
+                break;
+            case R.id.ask_invite_tv:
+                Jump2View.getInstance().goActInvitation(activity);
+                break;
+        }
+    }
+}

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

@@ -16,6 +16,8 @@ import com.sheep.gamegroup.model.entity.AskTop;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 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.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
@@ -70,7 +72,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
 
     @Override
     public int getLayoutId() {
-        return R.layout.fgt_askgetmoney_rank;
+        return SkinUtil.curPlugin == Plugin.skin_new_year ? R.layout.new_year_fgt_askgetmoney_rank : R.layout.fgt_askgetmoney_rank;
     }
 
     @Override

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false" android:color="#F4A8A7" />
+    <item android:state_activated="true" android:color="#ffc25703" />
+    <item android:state_focused="true" android:color="#ffc25703" />
+    <item android:state_checked="true" android:color="#ffc25703"/>
+    <item android:state_selected="true" android:color="#ffc25703"/>
+    <item android:state_pressed="true" android:color="#ffc25703"/>
+    <item android:color="#F4A8A7"/>
+</selector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="30dp" />
+    <gradient
+        android:angle="90"
+        android:startColor="#FFDA93"
+        android:endColor="#FEF3C8"
+        android:centerColor="#FFE088" />
+</shape>

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

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

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

@@ -0,0 +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="@drawable/new_year_button_full_normal_purple_click" />
+  <item android:state_checked="true" android:drawable="@drawable/new_year_button_full_normal_purple_click"/>
+  <item android:state_selected="true" android:drawable="@drawable/new_year_button_full_normal_purple_click"/>
+  <item android:state_pressed="true" android:drawable="@drawable/new_year_button_full_normal_purple_click"/>
+  <item android:drawable="@drawable/new_year_button_full_normal_purple_click"/>
+</selector>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:startColor="#D02530"
+        android:endColor="#F76142" />
+</shape>

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

@@ -1,6 +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"/>
+    <item android:drawable="@drawable/shape_bg_null"/>
 
 </selector>

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

@@ -6,7 +6,7 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:src="@drawable/drawable_selector_bg_home_search"/>
+        android:src="@drawable/skin_drawable_selector_bg_home_search"/>
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
         android:layout_marginTop="20dp"

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

@@ -6,7 +6,7 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:src="@drawable/drawable_selector_bg_home_search"/>
+        android:src="@drawable/skin_drawable_selector_bg_home_search"/>
     <RelativeLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/drawable_selector_bg_home_search">
+    android:background="@drawable/skin_drawable_selector_bg_home_search">
 
     <View
         android:id="@+id/home_search_top"

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

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/content_padding_20"
+    android:layout_marginStart="11dp"
+    android:layout_marginEnd="11dp"
+    android:background="@drawable/new_year_bg_ask_item"
+    android:orientation="vertical">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@mipmap/new_year_bg_ask_small_skill"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="邀请小技巧"
+        android:visibility="gone"
+        android:textColor="@color/purple_BE0FFF"
+        android:textSize="15sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/content_padding_9"
+        android:text="建议好友用手机登录"
+        android:textColor="@color/tc_ask_make_money"
+        android:textSize="11sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginTop="@dimen/content_padding_20">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="41dp"
+                android:layout_height="41dp"
+                android:src="@mipmap/new_year_ask_getmoney_jiaren" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="@dimen/content_padding_8"
+                android:gravity="center"
+                android:text="邀请家人、朋友提升成功率"
+                android:textColor="@color/tc_ask_make_money"
+                android:textSize="11sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="41dp"
+                android:layout_height="41dp"
+                android:src="@mipmap/new_year_ask_getmoney_qun" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="@dimen/content_padding_8"
+                android:gravity="center"
+                android:text="分享到3个以上微信、QQ群"
+                android:textColor="@color/tc_ask_make_money"
+                android:textSize="11sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="41dp"
+                android:layout_height="41dp"
+                android:src="@mipmap/new_year_ask_getmoney_hongbao" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="@dimen/content_padding_8"
+                android:gravity="center"
+                android:text="告知10元新人红包可直接提现"
+                android:textColor="@color/tc_ask_make_money"
+                android:textSize="11sp" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_marginTop="@dimen/content_padding_35"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/button_full_nomal_yellow_click"
+        android:visibility="gone"
+        android:padding="@dimen/dp_10">
+        <TextView
+            android:id="@+id/my_invitation_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/my_invitation_str"
+            android:textColor="@color/purple_996633"
+            android:textSize="@dimen/text_size_12"
+            android:layout_marginLeft="@dimen/content_padding_15"/>
+
+        <TextView
+            android:id="@+id/copy_my_invitation_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="复制"
+            android:textColor="@color/purple_BE0FFF"
+            android:textSize="@dimen/text_size_12"
+            android:layout_marginLeft="@dimen/content_padding_15"
+            android:layout_marginRight="@dimen/content_padding_15"/>
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/content_padding_10"
+    android:layout_marginTop="@dimen/content_padding_10"
+    android:layout_marginEnd="@dimen/content_padding_10"
+    android:background="@drawable/new_year_bg_ask_item"
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/content_padding_10">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/new_year_bg_ask_friend_vp_item_top" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginBottom="@dimen/content_padding_10"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:text="已邀请好友列表"
+        android:textColor="#ffffff"
+        android:textSize="@dimen/text_size_15" />
+
+    <include layout="@layout/x_ask_getmoney_act_layout_include" />
+
+    <LinearLayout
+        android:id="@+id/friend_list_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="200dp"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/empty_view_img"
+            android:layout_width="wrap_content"
+            android:layout_height="80dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="60dp"
+            android:gravity="center"
+            android:scaleType="centerInside"
+            android:src="@mipmap/wushuju"
+            android:visibility="visible" />
+
+        <TextView
+            android:id="@+id/empty_view_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/empty_view_img"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/content_padding_5"
+            android:text="@string/wushuju"
+            android:textColor="#ffffff"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/pager_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/friend_extract_last_page_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/content_padding_20"
+            android:background="@drawable/shape_page"
+            android:paddingStart="17dp"
+            android:paddingTop="2dp"
+            android:paddingEnd="17dp"
+            android:paddingBottom="2dp"
+            android:text="@string/last_page"
+            android:textColor="#ffffff"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/friend_extract_page_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:paddingStart="7dp"
+            android:paddingTop="2dp"
+            android:paddingEnd="7dp"
+            android:paddingBottom="2dp"
+            android:text="1"
+            android:textColor="#ffffff"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/friend_extract_next_page_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:background="@drawable/shape_page"
+            android:paddingStart="17dp"
+            android:paddingTop="2dp"
+            android:paddingEnd="17dp"
+            android:paddingBottom="2dp"
+            android:text="@string/next_page"
+            android:textColor="#ffffff"
+            android:textSize="12sp" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/new_year_bg_ask_item"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp"
+    android:paddingBottom="@dimen/content_padding_10">
+
+    <ImageView
+        android:id="@+id/fgt_askgetmoney_rank_2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/new_year_bg_ask_friend_vp_item_top"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/this_last_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="all"
+        android:paddingTop="@dimen/content_padding_10"
+        android:paddingEnd="3dp"
+        android:text="@string/last_this_month_rank"
+        android:textColor="#FFD269"
+        app:layout_constraintEnd_toEndOf="@+id/ask_top3_tip"
+        app:layout_constraintTop_toBottomOf="@id/fgt_askgetmoney_rank_2" />
+
+    <TextView
+        android:id="@+id/ask_top5_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/content_padding_10"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:text="@string/this_month_rank_top5"
+        android:textColor="#ffffff"
+        android:textSize="14sp"
+        app:layout_constraintTop_toBottomOf="@+id/this_last_tv" />
+
+    <TextView
+        android:id="@+id/ask_top5_not_you"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="你还未上榜，再接再厉"
+        android:textColor="#ffffff"
+        android:textSize="10sp"
+        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
+        app:layout_constraintEnd_toStartOf="@+id/ask_top3_tip"
+        app:layout_constraintTop_toTopOf="@+id/ask_top5_title" />
+
+    <ImageView
+        android:id="@+id/ask_top3_tip"
+        android:layout_width="18dp"
+        android:layout_height="38dp"
+        android:paddingStart="3dp"
+        android:paddingTop="@dimen/content_padding_10"
+        android:paddingEnd="3dp"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:src="@mipmap/ask_top5_tip"
+        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/ask_top5_title" />
+
+    <RelativeLayout
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_list"
+        app:layout_constraintTop_toTopOf="@+id/ask_top5_list">
+
+        <ImageView
+            android:id="@+id/empty_view_img"
+            android:layout_width="wrap_content"
+            android:layout_height="80dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="140dp"
+            android:gravity="center"
+            android:scaleType="centerInside"
+            android:src="@mipmap/wushuju" />
+
+        <TextView
+            android:id="@+id/empty_view_msg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/empty_view_img"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/content_padding_10"
+            android:gravity="center"
+            android:text="@string/wushuju"
+            android:textColor="#ffffff"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/ask_top5_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/ask_top5_title" />
+
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.sheep.gamegroup.util.SheepSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/refresh"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v4.widget.NestedScrollView
+        android:id="@+id/ask_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginBottom="60dp"
+        android:fillViewport="true"
+        android:orientation="vertical"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/new_year_ask_iv1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="fitXY"
+                android:src="@drawable/new_year_yaoqingzq_bg_3"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/ask_act_rule"
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_marginTop="28dp"
+                android:background="@drawable/sp_bg_purple_left_radius_12"
+                android:gravity="center"
+                android:paddingStart="10dp"
+                android:paddingEnd="6dp"
+                android:text="活动规则"
+                android:textColor="#ffffffff"
+                android:textSize="10sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/ask_act_code"
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="28dp"
+                android:background="@drawable/sp_bg_purple_left_radius_12"
+                android:gravity="center"
+                android:paddingStart="6dp"
+                android:paddingEnd="10dp"
+                android:text="我的邀请码：976873"
+                android:textColor="#ffffffff"
+                android:textSize="10sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/ask_act_code_copy"
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_marginStart="2dp"
+                android:layout_marginTop="28dp"
+                android:background="@drawable/sp_bg_purple_right_radius_12"
+                android:gravity="center"
+                android:paddingStart="7dp"
+                android:paddingEnd="10dp"
+                android:text="复制"
+                android:textColor="#ffffffff"
+                android:textSize="10sp"
+                app:layout_constraintStart_toEndOf="@id/ask_act_code"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <android.support.constraint.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/new_year_shape_ask_bg"
+                app:layout_constraintTop_toBottomOf="@id/new_year_ask_iv1">
+
+                <ImageView
+                    android:id="@+id/new_year_ask_iv2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/new_year_agm_bg_2"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:id="@+id/new_year_ask_start_view"
+                    android:layout_width="14dp"
+                    android:layout_height="1dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:id="@+id/new_year_ask_end_view"
+                    android:layout_width="14dp"
+                    android:layout_height="1dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tv_size"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:gravity="center"
+                    android:text="0"
+                    android:textColor="#ffffff"
+                    android:textSize="24sp"
+                    app:layout_constraintBottom_toBottomOf="@id/new_year_ask_iv2"
+                    app:layout_constraintEnd_toStartOf="@id/tv_money"
+                    app:layout_constraintStart_toEndOf="@id/new_year_ask_start_view"
+                    app:layout_constraintTop_toTopOf="@id/new_year_ask_iv2" />
+
+                <TextView
+                    android:id="@+id/tv_money"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:text="0"
+                    android:textColor="#ffffff"
+                    android:textSize="24sp"
+                    app:layout_constraintBottom_toBottomOf="@id/new_year_ask_iv2"
+                    app:layout_constraintEnd_toStartOf="@id/new_year_ask_end_view"
+                    app:layout_constraintStart_toEndOf="@id/tv_size"
+                    app:layout_constraintTop_toTopOf="@id/new_year_ask_iv2" />
+
+                <TextView
+                    android:id="@+id/new_year_ask_tv1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text="@string/friend"
+                    android:textColor="#ffffff"
+                    android:textSize="13sp"
+                    app:layout_constraintEnd_toStartOf="@id/new_year_ask_tv2"
+                    app:layout_constraintStart_toEndOf="@id/new_year_ask_start_view"
+                    app:layout_constraintTop_toBottomOf="@id/new_year_ask_iv2" />
+
+                <TextView
+                    android:id="@+id/new_year_ask_tv2"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text="@string/reward"
+                    android:textColor="#ffffff"
+                    android:textSize="13sp"
+                    app:layout_constraintEnd_toStartOf="@id/new_year_ask_end_view"
+                    app:layout_constraintStart_toEndOf="@id/new_year_ask_tv1"
+                    app:layout_constraintTop_toBottomOf="@id/new_year_ask_iv2" />
+
+                <TextView
+                    android:id="@+id/new_year_tab_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    android:background="@drawable/new_year_drawable_selector_ask_tab_bg"
+                    android:gravity="center"
+                    android:paddingBottom="4dp"
+                    android:text="邀请好友"
+                    android:textColor="@color/new_year_selector_color_main_tab"
+                    android:textSize="15sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@id/new_year_ask_tv2"
+                    app:layout_constraintStart_toEndOf="@id/new_year_ask_start_view"
+                    app:layout_constraintTop_toBottomOf="@id/new_year_ask_tv1" />
+
+                <TextView
+                    android:id="@+id/new_year_tab_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    android:background="@drawable/new_year_drawable_selector_ask_tab_bg"
+                    android:gravity="center"
+                    android:paddingBottom="4dp"
+                    android:text="好友列表"
+                    android:textColor="@color/new_year_selector_color_main_tab"
+                    android:textSize="15sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@id/new_year_ask_end_view"
+                    app:layout_constraintStart_toEndOf="@id/new_year_ask_tv1"
+                    app:layout_constraintTop_toBottomOf="@id/new_year_ask_tv1" />
+
+                <com.kfzs.android.view.widget.WrapContentHeightViewPager
+                    android:id="@+id/pager"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="11dp"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginEnd="11dp"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                    app:layout_constraintTop_toBottomOf="@id/new_year_tab_1" />
+
+                <!--邀请小技巧-->
+
+                <include
+                    android:id="@+id/new_year_ask_notice"
+                    layout="@layout/new_year_ask_getmoney_act_item_three_notice_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:layout_marginTop="@dimen/content_padding_20"
+                    android:layout_marginEnd="11dp"
+                    android:background="@drawable/new_year_bg_ask_item"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/pager" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:background="#CB0404"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/new_year_ask_notice">
+
+                    <TextView
+                        android:id="@+id/ask_invite_tv"
+                        style="@style/style_button_purple"
+                        android:text="立即邀请" />
+
+                </LinearLayout>
+            </android.support.constraint.ConstraintLayout>
+
+
+        </android.support.constraint.ConstraintLayout>
+    </android.support.v4.widget.NestedScrollView>
+</com.sheep.gamegroup.util.SheepSwipeRefreshLayout>

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

@@ -10,6 +10,8 @@
 
     <color name="bg_class_grey">#f9f9f9</color>
     <color name="gray_CBCBCB">#cbcbcb</color>
+    <color name="tc_ask_make_money">#FFECEC</color>
+    <color name="tc_ask_make_money_btn">#C25703</color>
 
     <!--支持换肤的颜色-->
     <color name="tc_dialog_gtg_name">#272727</color>

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

@@ -18,8 +18,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/selector_button_full_purple</item>
-        <item name="android:textColor">#ffffff</item>
+        <item name="android:background">@drawable/new_year_selector_button_full_purple</item>
+        <item name="android:textColor">@color/tc_ask_make_money_btn</item>
         <item name="android:layout_margin">@dimen/dp_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>

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

@@ -1,6 +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"/>
+    <item android:drawable="@drawable/skin_drawable_selector_bg_home_search"/>
 
 </selector>