春节皮肤：我的资产

app/src/main/AndroidManifest.xml

@@ -433,6 +433,10 @@
             android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
+            android:name="com.sheep.gamegroup.view.activity.NewYearActMyMoney"
+            android:theme="@style/AppActionTheme"
+            android:screenOrientation="portrait" />
+        <activity
             android:name="com.sheep.gamegroup.view.activity.FeedbackAct"
             android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />

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

@@ -66,6 +66,7 @@ import com.sheep.gamegroup.module.login.ChangePasswordAct;
 import com.sheep.gamegroup.module.login.LoginAct;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.module.user.activity.ActVip;
 import com.sheep.gamegroup.module.user.model.UserAddressInfo;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
@@ -142,6 +143,7 @@ import com.sheep.gamegroup.view.activity.FeedbackAct;
 import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
+import com.sheep.gamegroup.view.activity.NewYearActMyMoney;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.gamegroup.view.activity.PersonalInfoAct;
 import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
@@ -1069,7 +1071,7 @@ public class Jump2View {
      * @param o
      */
     public void goMyMoney(Context context, Object o) {
-        Intent intent = new Intent(context, ActMyMoney.class);
+        Intent intent = new Intent(context, SkinUtil.isLoadNewYearSkin() ? NewYearActMyMoney.class : ActMyMoney.class);
         context.startActivity(intent);
         USER_MY_MONEY.onEvent();
     }

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

@@ -0,0 +1,327 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
+import android.support.v4.widget.NestedScrollView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.utils.NumberFormatUtils;
+import com.kfzs.duanduan.utils.StatusBarUtils;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
+import com.sheep.gamegroup.absBase.ILoadMore;
+import com.sheep.gamegroup.absBase.IRefresh;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.UserAssets;
+import com.sheep.gamegroup.model.entity.WebParams;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.personal.fragment.FgtRechargeBalanceLog;
+import com.sheep.gamegroup.module.personal.fragment.FgtRechargeLog;
+import com.sheep.gamegroup.module.personal.fragment.FgtWithdraw;
+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.Jump2View;
+import com.sheep.gamegroup.util.RefreshUtil;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
+import com.sheep.jiuyan.samllsheep.Config;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import org.afinal.simplecache.ApiKey;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.MY_MONEY_TAB;
+/**
+ * Created by realicing on 2019/1/28.
+ * realicing@sina.com
+ * 小绵羊3.4.10新增 -- 我的资产界面（直接修改，根本没法添加皮肤）
+ */
+public class NewYearActMyMoney extends BaseActivity {
+
+    @BindView(R.id.refresh)
+    SmartRefreshLayout refresh;
+    @BindView(R.id.scrollView)
+    NestedScrollView scrollView;
+
+    @BindView(R.id.indicator)
+    TabLayout indicator;
+    @BindView(R.id.pager)
+    ViewPager viewPager;
+
+    @BindView(R.id.my_money_total_money)
+    TextView my_money_total_money;
+    @BindView(R.id.my_money_task_reward)
+    TextView my_money_task_reward;
+    @BindView(R.id.my_money_agent_extract)
+    TextView my_money_agent_extract;
+    @BindView(R.id.my_money_recharge_amount)
+    TextView my_money_recharge_amount;
+    @BindView(R.id.my_money_available_amount)
+    TextView my_money_available_amount;
+    @BindView(R.id.my_money_dingxiang_amount)
+    TextView my_money_dingxiang_amount;
+
+    private TitleFragmentListAdapter mAdapter;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StatusBarUtils.setTranslucent(this);
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.new_year_act_my_money;
+    }
+
+    public static final String[] tabNames = {"充值记录", "提现记录", "收支明细"};
+
+    @Override
+    public void initView() {
+        TitleBarUtils.getInstance()
+                .setTitle(this, "我的资产")
+                .setTitleFinish(this);
+        mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
+        mAdapter.add(new FgtRechargeBalanceLog(), tabNames[0]);
+        mAdapter.add(new FgtWithdraw(), tabNames[1]);
+        mAdapter.add(new FgtRechargeLog(), tabNames[2]);
+        for (int i = 0; i < mAdapter.getCount(); i++) {
+            Fragment fragment = mAdapter.getItem(i);
+            if (fragment instanceof BaseRefreshLoadMoreFragment) {
+                ((BaseRefreshLoadMoreFragment) fragment).setSmartRefreshLayout(refresh);
+            }
+        }
+        viewPager.setOffscreenPageLimit(mAdapter.getCount());
+        viewPager.setAdapter(mAdapter);
+        viewPager.setMinimumHeight(G.HEIGHT - G.getRealPix(120));
+        new_tab();
+        //refresh
+        refresh.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
+
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                refreshData();
+            }
+
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                loadMoreData();
+            }
+        });
+        RefreshUtil.newInstance().publicParameterLoadMore(refresh, this);
+    }
+
+    private void new_tab() {
+        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[0], true)));
+        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[1], true)));
+        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[2], false)));
+        //Tablayout自定义view绑定ViewPager
+        viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
+        indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager) {
+            private void smoothScrollView(){
+                scrollView.smoothScrollTo(0, indicator.getTop());
+            }
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+                super.onTabReselected(tab);
+                smoothScrollView();
+            }
+
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                super.onTabSelected(tab);
+                smoothScrollView();
+            }
+        });
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int i, float v, int i1) {
+
+            }
+
+            @Override
+            public void onPageSelected(int i) {
+                MY_MONEY_TAB.onEvent("tab_name", tabNames[i]);
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int i) {
+
+            }
+        });
+
+    }
+
+    private int refreshDataCount = 0;
+
+    //刷新数据
+    public void refreshData() {
+        refreshData(viewPager.getCurrentItem());
+    }
+
+    //刷新数据
+    public void refreshData(int position) {
+        boolean isRefresh = false;
+        if (refreshDataCount != 0) {
+            Fragment item = mAdapter.getItem(position);
+            if (item instanceof IRefresh) {//可刷新，就调用当前fragment刷新数据
+                ((IRefresh) item).refreshData();
+                isRefresh = true;
+            }
+        }
+        refreshDataCount++;
+        if (!isRefresh)
+            notifyDataSetChanged();
+    }
+
+    //加载更多数据
+    private void loadMoreData() {
+        Fragment item = mAdapter.getItem(viewPager.getCurrentItem());
+        if (item instanceof ILoadMore) {//可加载更多，就调用当前fragment刷新数据
+            ((ILoadMore) item).loadMoreData();
+        } else {
+            notifyDataSetChanged();
+        }
+    }
+
+    private void notifyDataSetChanged() {
+        if (refresh != null) {
+            refresh.finishRefresh();
+            refresh.finishLoadMore();
+        }
+    }
+
+    private View tab_icon(String name, boolean isShow) {
+        View newtab = LayoutInflater.from(this).inflate(R.layout.new_year_tab_item, null);
+        TextView tv = newtab.findViewById(R.id.tabtext);
+        View tab_line = newtab.findViewById(R.id.tab_line);
+        tab_line.setVisibility(isShow ? View.VISIBLE : View.INVISIBLE);
+        tv.setText(name);
+        return newtab;
+    }
+
+    public TitleFragmentListAdapter getmAdapter() {
+        return mAdapter;
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @OnClick({R.id.my_money_withdraw_tv,
+            R.id.my_money_recharge_tv,
+            R.id.my_money_dingxiang_amount_iv,
+            R.id.my_money_dingxiang_amount,
+            R.id.my_money_dingxiang_tag})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.my_money_withdraw_tv://提现
+                Jump2View.getInstance().tryGoWithdrawal(NewYearActMyMoney.this, null);
+                break;
+            case R.id.my_money_recharge_tv://充值
+                Jump2View.getInstance().goRechargeAct(NewYearActMyMoney.this, "我的资产");
+                break;
+            case R.id.my_money_dingxiang_amount_iv://定向货币详情
+            case R.id.my_money_dingxiang_amount://定向货币详情
+            case R.id.my_money_dingxiang_tag://定向货币详情
+                CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_DIRECTIONAL_LIST_URL, url -> {
+                    url = url + "?authorization=" + SpUtils.getToken(this) + "&ssnocache=1";
+                    WebParams webParams = new WebParams(url, "定向消费").setShowTitle(false);
+                    Jump2View.getInstance().goWeb(this, webParams);
+                });
+                break;
+        }
+    }
+
+    @Override
+    public void initData() {
+        showProgress();
+        resetData();
+        SheepApp.getInstance().getNetComponent().getApiService().getMyAssets()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(this) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.MY_ASSETS);
+                        if (isNewData) {
+                            CommonUtil.getInstance().updateUserInfo(null);
+                        }
+                        UserAssets userAssets = baseMessage.getData(UserAssets.class);
+
+                        loadData(userAssets);
+                        hideProgress();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                        resetData();
+                        hideProgress();
+                    }
+                });
+    }
+
+    private void loadData(UserAssets userAssets) {
+        if (my_money_total_money == null) {
+            return;
+        }
+        my_money_total_money.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getSheep_bi_total())));
+        my_money_task_reward.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getTask_reward())));
+        my_money_agent_extract.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getExtension_extract())));
+        my_money_recharge_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getRecharge_amount())));
+        my_money_available_amount.setText(getString(R.string.available_amount, NumberFormatUtils.retainMost2W(userAssets.getCash_withdrawal())));
+        my_money_dingxiang_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getDirectional_currency())));
+    }
+
+    private void resetData() {
+        if (my_money_total_money == null) {
+            return;
+        }
+        my_money_total_money.setText(getString(R.string.total_money, "0.00"));
+        my_money_task_reward.setText(getString(R.string.total_money, "0.00"));
+        my_money_agent_extract.setText(getString(R.string.total_money, "0.00"));
+        my_money_recharge_amount.setText(getString(R.string.total_money, "0.00"));
+        my_money_available_amount.setText(getString(R.string.available_amount, "0.00"));
+        my_money_dingxiang_amount.setText(getString(R.string.total_money, "0.00"));
+    }
+
+    //点击优惠购物
+    public void onClickCoupons(View view) {
+        Jump2View.getInstance().gotoYfShop(this);
+    }
+
+    //点击VIP
+    public void onClickVip(View view) {
+        Jump2View.getInstance().gotoVip(this);
+    }
+
+    //点击游戏直充
+    public void onClickGameRecharge(View view) {
+        Jump2View.getInstance().goGameRecharge(this, null);
+    }
+
+    //点击龙猫电竞
+    public void onClickLongMao(View view) {
+        Jump2View.getInstance().gotoLongMao(this);
+    }
+}

app/src/main/res/color/new_year_selector_color_tab2.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="#30BFF2" />
+    <item android:state_activated="true" android:color="#30BFF2" />
+    <item android:state_focused="true" android:color="#30BFF2" />
+    <item android:state_checked="true" android:color="#30BFF2"/>
+    <item android:state_selected="true" android:color="#30BFF2"/>
+    <item android:state_pressed="true" android:color="#30BFF2"/>
+    <item android:color="#444444"/>
+</selector>

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

@@ -110,19 +110,16 @@
             android:textColor="@color/white"
             android:textSize="@dimen/text_size_13"
             app:layout_constraintStart_toEndOf="@id/act_audit_line_2"
-            app:layout_constraintEnd_toStartOf="@id/my_money_dingxiang_amount_iv"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"/>
 
         <ImageView
             android:id="@+id/my_money_dingxiang_amount_iv"
             android:layout_width="35dp"
             android:layout_height="35dp"
-            android:layout_gravity="end"
             android:padding="10dp"
             android:src="@mipmap/question_mark"
-            android:layout_marginStart="-10dp"
             app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"
-            app:layout_constraintStart_toEndOf="@id/audit_total_welfare_tv"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/audit_total_complete_tv" />
     </android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context="com.sheep.gamegroup.view.activity.NewYearActMyMoney">
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_gradient_main"
+        android:paddingTop="@dimen/status_bar_height">
+
+        <ImageView
+            android:id="@+id/img_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="?attr/actionBarSize"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/content_padding_20"
+            android:paddingEnd="@dimen/content_padding_20"
+            android:scaleType="centerInside"
+            android:src="@drawable/narrow_back_white"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/txt_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_4"
+            app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
+    </android.support.constraint.ConstraintLayout>
+
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/scrollView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_vertical"
+            android:fillViewport="true"
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
+
+                <android.support.constraint.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <ImageView
+                        android:id="@+id/act_my_money_bg_iv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:adjustViewBounds="true"
+                        android:scaleType="fitXY"
+                        android:src="@mipmap/new_year_home_blue_bg_hb"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <View
+                        android:id="@+id/act_my_money_top_v"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/my_money_recharge_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="28dp"
+                        android:background="@drawable/shape_white_solid_rectangle_left"
+                        android:gravity="center_vertical"
+                        android:paddingStart="14dp"
+                        android:paddingEnd="10dp"
+                        android:text="充值 >"
+                        android:textColor="#333333"
+                        android:textSize="15sp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/act_my_money_top_v" />
+
+                    <TextView
+                        android:id="@+id/my_money_withdraw_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="28dp"
+                        android:layout_marginTop="13dp"
+                        android:background="@drawable/shape_white_solid_rectangle_left"
+                        android:gravity="center_vertical"
+                        android:paddingStart="14dp"
+                        android:paddingEnd="10dp"
+                        android:text="提现 >"
+                        android:textColor="#333333"
+                        android:textSize="15sp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/my_money_recharge_tv" />
+
+                    <TextView
+                        android:id="@+id/my_money_total_money_lable"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="22dp"
+                        android:text="@string/total_money_lable"
+                        android:textColor="#DCF3FD"
+                        android:textSize="15sp"
+                        app:layout_constraintBottom_toBottomOf="@id/my_money_withdraw_tv"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/my_money_recharge_tv" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintBottom_toBottomOf="@id/my_money_withdraw_tv"
+                        app:layout_constraintStart_toEndOf="@id/my_money_total_money_lable"
+                        app:layout_constraintTop_toTopOf="@id/my_money_recharge_tv">
+
+                        <TextView
+                            android:id="@+id/my_money_total_money"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:text="@string/total_money"
+                            android:textColor="@color/white"
+                            android:textSize="25sp" />
+
+                        <TextView
+                            android:id="@+id/my_money_available_amount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="9dp"
+                            android:layout_marginTop="2dp"
+                            android:background="@drawable/shape_2b0a4c60_solid_rectangle_10"
+                            android:paddingStart="6dp"
+                            android:paddingTop="3dp"
+                            android:paddingEnd="6dp"
+                            android:paddingBottom="3dp"
+                            android:text="@string/available_amount"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/my_money_amount_ll"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="18dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        app:layout_constraintTop_toBottomOf="@id/my_money_withdraw_tv">
+
+                        <TextView
+                            android:id="@+id/my_money_agent_extract"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+
+                        <TextView
+                            android:id="@+id/my_money_task_reward"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/my_money_dingxiang_amount"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/total_money"
+                                android:textColor="@color/white"
+                                android:textSize="12sp" />
+
+                            <ImageView
+                                android:id="@+id/my_money_dingxiang_amount_iv"
+                                android:layout_width="19dp"
+                                android:layout_height="35dp"
+                                android:paddingStart="2dp"
+                                android:paddingTop="10dp"
+                                android:paddingEnd="2dp"
+                                android:paddingBottom="10dp"
+                                android:src="@mipmap/question_mark" />
+                        </LinearLayout>
+
+                        <TextView
+                            android:id="@+id/my_money_recharge_amount"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/my_money_ll"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:orientation="horizontal"
+                        app:layout_constraintTop_toBottomOf="@id/my_money_amount_ll">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/agent_extract"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/task_reward"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+
+                        <TextView
+                            android:id="@+id/my_money_dingxiang_tag"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/dingxiang_amount"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/recharge_amount"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+
+                    </LinearLayout>
+                </android.support.constraint.ConstraintLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="7dp"
+                    android:text="管家推介"
+                    android:textColor="#ff333333"
+                    android:textSize="14sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/ic_coupons"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:onClick="onClickCoupons"
+                        android:text="优惠购物"
+                        android:textColor="#ff333333"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/ic_vip"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:onClick="onClickVip"
+                        android:text="VIP"
+                        android:textColor="#ff333333"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/ic_game_recharge"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:onClick="onClickGameRecharge"
+                        android:text="游戏直充"
+                        android:textColor="#ff333333"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/ic_long_mao"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:onClick="onClickLongMao"
+                        android:text="龙猫电竞"
+                        android:textColor="#ff333333"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <android.support.design.widget.TabLayout
+                    android:id="@+id/indicator"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginTop="@dimen/content_padding_20"
+                    android:background="#F5F5F5"
+                    app:tabGravity="center"
+                    app:tabIndicatorColor="#4bc1fe"
+                    app:tabIndicatorHeight="0dp"
+                    app:tabMode="fixed"
+                    app:tabSelectedTextColor="@android:color/white"
+                    app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+                    app:tabTextColor="#444444" />
+
+                <com.kfzs.android.view.widget.WrapContentHeightViewPager
+                    android:id="@+id/pager"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dip"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,31 @@
+<?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="50dp">
+
+    <View
+        android:id="@+id/tab_line"
+        android:layout_width="1dp"
+        android:layout_height="20dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:background="#CCCCCC" />
+
+    <TextView
+        android:id="@+id/tabtext"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerHorizontal="true"
+        android:layout_toStartOf="@id/tab_line"
+        android:gravity="center"
+        android:text="TAB"
+        android:textColor="@color/new_year_selector_color_tab2"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/selector_tab_triangle" />
+</RelativeLayout>

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

@@ -13,7 +13,7 @@
 
     <string name="total_money_lable">绵羊币\n总余额：</string>
     <string name="total_money">%s元</string>
-    <string name="task_reward">奖励余额</string>
+    <string name="task_reward">奖励总额</string>
     <string name="agent_extract">推广提成</string>
     <string name="recharge_amount">充值余额</string>
     <string name="available_amount">可提现金额：%s元</string>

skin_newYear/src/main/res/drawable/shape_gradient_main.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/skin_drawable_selector_bg_home_search"/>
+
+</selector>