修改我的资产界面

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.IHomePageSearch;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.CreateUserVideoReq;
 import com.sheep.gamegroup.model.entity.UserFootprint;
 
 import org.afinal.simplecache.ApiKey;

app/src/main/java/com/sheep/gamegroup/model/entity/RechargeLog.java

@@ -151,6 +151,11 @@ public class RechargeLog implements ILog {
     }
 
     @Override
+    public boolean equals(Object obj) {
+        return obj instanceof RechargeLog && ((RechargeLog) obj).getId() == id;
+    }
+
+    @Override
     public String getStateText() {
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append(type== 1?"+ ":"- ");

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

@@ -576,18 +576,7 @@ public class CommonUtil {
      */
     private boolean checkLongMao(Activity activity, IJump jump) {
         if (jump.getTitle() != null && jump.getTitle().startsWith(LONG_MAO_APP_NAME) && PackageUtil.isAppInstalled(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME)) {
-            try {
-                PackageUtil.startApp(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME);
-            } catch (Exception ignore) {
-                try {
-                    Intent intent = Intent.parseUri(LONG_MAO_APP_URI, Intent.URI_INTENT_SCHEME);
-                    intent.setComponent(null);
-                    activity.startActivity(intent);
-                } catch (Exception ignore2) {
-                    return true;
-                }
-            }
-            return false;
+            return !Jump2View.getInstance().gotoLongMao(activity);
         }
         return true;
     }

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

@@ -153,6 +153,7 @@ import com.sheep.jiuyan.samllsheep.service.ListenerShotNewService;
 import com.sheep.jiuyan.samllsheep.service.ListenerShotService;
 import com.sheep.jiuyan.samllsheep.ui.activity.SignActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.youmi.android.offer.BaseActYmPermissionCheck;
 import com.youmi.android.offer.YmConfig;
@@ -177,6 +178,8 @@ import me.iwf.photopicker.PhotoPicker;
 import me.iwf.photopicker.PhotoPreview;
 import rx.functions.Action1;
 
+import static com.sheep.gamegroup.util.CommonUtil.LONG_MAO_APP_PACKAGE_NAME;
+import static com.sheep.gamegroup.util.CommonUtil.LONG_MAO_APP_URI;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.ASK_MAKE_MONEY_INVITATION;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_ITEM;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_DOWNLOAD_WELFARE_LIST;
@@ -2499,4 +2502,31 @@ public class Jump2View {
     public void goActVip(Activity activity) {
 
     }
+
+    /**
+     * 跳转龙猫界面
+     * @param activity
+     */
+    public boolean gotoLongMao(Activity activity) {
+        try {
+            PackageUtil.startApp(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME);
+        } catch (Exception ignore) {
+            try {
+                Intent intent = Intent.parseUri(LONG_MAO_APP_URI, Intent.URI_INTENT_SCHEME);
+                intent.setComponent(null);
+                activity.startActivity(intent);
+            } catch (Exception ignore2) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 跳转商城优惠购物界面
+     * @param activity
+     */
+    public void gotoYfShop(Activity activity) {
+
+    }
 }

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

@@ -109,6 +109,7 @@ public class ActMyMoney extends BaseActivity {
         viewPager.setAdapter(mAdapter);
         new_tab();
         //refresh
+        refresh.setHeaderInsetStart(G.getRealPix(24));
         refresh.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
 
             @Override
@@ -248,22 +249,40 @@ public class ActMyMoney extends BaseActivity {
             return;
         }
         my_money_total_money.setText(getString(R.string.total_money, userAssets.getSheep_bi_total()));
-        my_money_task_reward.setText(getString(R.string.task_reward, userAssets.getTask_reward()));
-        my_money_agent_extract.setText(getString(R.string.agent_extract, userAssets.getExtension_extract()));
-        my_money_recharge_amount.setText(getString(R.string.recharge_amount, userAssets.getRecharge_amount()));
+        my_money_task_reward.setText(getString(R.string.total_money, userAssets.getTask_reward()));
+        my_money_agent_extract.setText(getString(R.string.total_money, userAssets.getExtension_extract()));
+        my_money_recharge_amount.setText(getString(R.string.total_money, userAssets.getRecharge_amount()));
         my_money_available_amount.setText(getString(R.string.available_amount, NumberFormatUtils.retainMost2(userAssets.getCash_withdrawal())));
-        my_money_dingxiang_amount.setText(getString(R.string.dingxiang_amount, NumberFormatUtils.retainMost2(userAssets.getDirectional_currency())));
+        my_money_dingxiang_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2(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.task_reward, "0.00"));
-        my_money_agent_extract.setText(getString(R.string.agent_extract, "0.00"));
-        my_money_recharge_amount.setText(getString(R.string.recharge_amount, "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.dingxiang_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().goActVip(this);
     }
 
+    //点击游戏直充
+    public void onClickGameRecharge(View view) {
+        Jump2View.getInstance().goGameRecharge(this, null);
+    }
+
+    //点击龙猫电竞
+    public void onClickLongMao(View view) {
+        Jump2View.getInstance().gotoLongMao(this);
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpMiDong.java

@@ -77,7 +77,7 @@ public class AdpMiDong extends AdbCommonRecycler<AdData> {
         }
 
         if (!TextUtils.isEmpty(data.getTodayTask())) {
-            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>%s元</font>", data.getUprice())));
+            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>%s</font>", data.getPrice())));
             tv_date.setText(data.getTodayTask());
             if(TimeUtil.newInstance().big2Today(data.getTodayTask(), TimeUtil.FORMAT_DD_LINE)){
                 task_top.setEnabled(true);
@@ -86,8 +86,7 @@ public class AdpMiDong extends AdbCommonRecycler<AdData> {
             }
             task_top.setVisibility(View.VISIBLE);
         } else {//(data.getUprice() + data.getUsign_price_total())
-            double price = data.getUprice() + data.getUsign_price_total();
-            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>%s元</font>", NumberFormatUtils.retainMost2(price))));
+            ((TextView) holder.itemView.findViewById(R.id.item_date_tv)).setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>%s</font>", data.getPrice_all_exdw())));
             task_top.setVisibility(View.GONE);
         }
 

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogMidong.java

@@ -11,6 +11,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -69,7 +70,7 @@ public class DialogMidong {
             CommonUtil.getInstance().setDownloadTvText(activity,midong_btn_tv, data);
          } else {
            String todayTask = data.getDate();
-            if (todayTask != null && todayTask.equals(TimeUtil.newInstance().TimeStamp2Date(System.currentTimeMillis(), "yyyy-MM-dd"))) {
+            if (todayTask != null && todayTask.equals(TimeUtil. TimeStamp2Date(System.currentTimeMillis(), "yyyy-MM-dd"))) {
                 CommonUtil.getInstance().setDownloadTvText(activity,midong_btn_tv, data);
                 midong_btn_tv.setEnabled(true);
                 midong_btn_tv.setTextColor(activity.getResources().getColor(R.color.blue_34a6e7));
@@ -81,9 +82,9 @@ public class DialogMidong {
         }
         item_date_tv.setText((TextUtils.isEmpty(data.getSize())?"0":data.getSize() +"M"));
         if (!TextUtils.isEmpty(data.getTodayTask())) {
-            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>+%s元</font>", data.getUsign_price_total())));
+            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "签到可获得<font color='#ff4a5f'>+%s</font>", data.getPrice())));
         }else {
-            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>+%s元</font>,签到还可继续得<font color='#ff4a5f'>+%s元</font>", data.getUprice() , data.getUsign_price_total())));
+            item_num_tv.setText(Html.fromHtml(String.format(Locale.CHINA, "安装可获得<font color='#ff4a5f'>+%s元</font>,签到还可继续得<font color='#ff4a5f'>+%s元</font>", NumberFormatUtils.retainMost2(data.getUprice()) , NumberFormatUtils.retainMost2(data.getUsign_price_total()))));
         }
 
         midong_btn_tv.setOnClickListener(new View.OnClickListener() {

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

@@ -2,10 +2,12 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.support.v7.widget.RecyclerView;
 
+import com.alibaba.fastjson.JSON;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.GetAdListListener;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.view.adapter.AdpMiDong;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -30,6 +32,7 @@ public class FgtMiDongAdTskList extends BaseListFragment<AdData> {
         AdManager.getInstance(SheepApp.getInstance()).getAdListAsync(activity, new GetAdListListener() {
             @Override
             public void onLoadAdSuccess(final List<AdData> newList) {
+                LogUtil.println(FgtMiDongAdTskList.class.getSimpleName(), "onLoadAdSuccess", JSON.toJSONString(newList));
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {

app/src/main/res/drawable/shape_2b0a4c60_solid_rectangle_10.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="10dp"/>
+    <solid android:color="#2B0A4C60" />
+</shape>

app/src/main/res/drawable/shape_white_solid_rectangle_left.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:bottomLeftRadius="14dp" android:topLeftRadius="14dp" />
+    <solid android:color="#ffffff" />
+</shape>

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

@@ -2,12 +2,15 @@
 <RelativeLayout 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="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.sheep.gamegroup.view.activity.ActMyMoney">
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/status_bar_height">
 
         <android.support.v4.widget.NestedScrollView
             android:id="@+id/scrollView"
@@ -28,67 +31,138 @@
 
                 <android.support.constraint.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@mipmap/home_blue_bg"
-                    android:paddingTop="@dimen/status_bar_height"
-                    android:paddingBottom="52dp">
+                    android:layout_height="wrap_content">
 
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="30dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="fitXY"
+                        android:src="@mipmap/home_blue_bg"
+                        app:layout_constraintTop_toTopOf="parent" />
                     <View
                         android:id="@+id/act_my_money_top_v"
                         android:layout_width="match_parent"
-                        android:layout_height="?attr/actionBarSize" />
+                        android:layout_height="?attr/actionBarSize"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:background="@color/white_light" />
+
+                    <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="#2BCEFA"
+                        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="#2BCEFA"
+                        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="@dimen/content_padding_20"
-                        android:layout_marginTop="@dimen/content_padding_10"
+                        android:layout_marginStart="22dp"
                         android:text="@string/total_money_lable"
-                        android:textColor="@color/white"
+                        android:textColor="#DCF3FD"
                         android:textSize="15sp"
+                        app:layout_constraintBottom_toBottomOf="@id/my_money_withdraw_tv"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/act_my_money_top_v" />
+                        app:layout_constraintTop_toTopOf="@id/my_money_recharge_tv" />
 
                     <LinearLayout
-                        android:id="@+id/my_money_ll"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/content_padding_20"
                         android:orientation="vertical"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/act_my_money_top_v">
+                        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_agent_extract"
+                            android:id="@+id/my_money_total_money"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp"
-                            android:text="@string/agent_extract"
+                            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="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/content_padding_20"
-                            android:text="@string/task_reward"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
                             android:textColor="@color/white"
                             android:textSize="12sp" />
 
                         <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingTop="10dp"
-                            android:paddingBottom="10dp">
+                            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/dingxiang_amount"
+                                android:text="@string/total_money"
                                 android:textColor="@color/white"
                                 android:textSize="12sp" />
 
@@ -102,120 +176,121 @@
 
                         <TextView
                             android:id="@+id/my_money_recharge_amount"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:text="@string/recharge_amount"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/total_money"
                             android:textColor="@color/white"
                             android:textSize="12sp" />
 
                     </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/my_money_available_amount"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/content_padding_20"
-                        android:text="@string/available_amount"
-                        android:textColor="@color/white"
-                        android:textSize="12sp"
-                        app:layout_constraintBottom_toBottomOf="@+id/my_money_ll"
-                        app:layout_constraintStart_toStartOf="parent" />
-
-                    <TextView
-                        android:id="@+id/my_money_total_money"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/content_padding_20"
-                        android:layout_marginBottom="@dimen/content_padding_10"
-                        android:text="@string/total_money"
-                        android:textColor="@color/white"
-                        android:textSize="25sp"
-                        app:layout_constraintBottom_toTopOf="@+id/my_money_available_amount"
-                        app:layout_constraintStart_toStartOf="parent" />
-
-                </android.support.constraint.ConstraintLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding_10"
-                    android:layout_marginTop="-37dp"
-                    android:layout_marginEnd="@dimen/content_padding_10"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                    android:orientation="vertical">
-
                     <LinearLayout
+                        android:id="@+id/my_money_ll"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
+                        android:layout_marginTop="2dp"
                         android:orientation="horizontal"
-                        android:paddingStart="@dimen/content_padding_20"
-                        android:paddingTop="@dimen/content_padding_10"
-                        android:paddingEnd="@dimen/content_padding_20"
-                        android:paddingBottom="@dimen/content_padding_10">
-
-                        <ImageView
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:src="@drawable/selector_tab_my_money1" />
+                        app:layout_constraintTop_toBottomOf="@id/my_money_amount_ll">
 
                         <TextView
-                            android:id="@+id/my_money_recharge_tv"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/content_padding_10"
                             android:layout_weight="1"
-                            android:text="充值"
-                            android:textColor="@color/gray_4"
-                            android:textSize="15sp" />
-
-                        <ImageView
-                            android:layout_width="15dp"
-                            android:layout_height="15dp"
-                            android:src="@mipmap/x_ic_next" />
-
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1px"
-                        android:layout_marginLeft="@dimen/content_padding_20"
-                        android:layout_marginRight="@dimen/content_padding_20"
-                        android:background="@color/white_bg_line" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingStart="@dimen/content_padding_20"
-                        android:paddingTop="@dimen/content_padding_10"
-                        android:paddingEnd="@dimen/content_padding_20"
-                        android:paddingBottom="@dimen/content_padding_10">
+                            android:gravity="center"
+                            android:text="@string/agent_extract"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                        <ImageView
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:src="@drawable/selector_tab_my_money2" />
+                        <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_withdraw_tv"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/content_padding_10"
                             android:layout_weight="1"
-                            android:text="提现"
-                            android:textColor="@color/gray_4"
-                            android:textSize="15sp" />
+                            android:gravity="center"
+                            android:text="@string/dingxiang_amount"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
 
-                        <ImageView
-                            android:layout_width="15dp"
-                            android:layout_height="15dp"
-                            android:src="@mipmap/x_ic_next" />
+                        <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>
-                </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_weight="1"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/ic_coupons"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickCoupons"
+                        android:textSize="12sp"
+                        android:text="优惠购物"/>
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/ic_vip"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickVip"
+                        android:textSize="12sp"
+                        android:text="VIP"/>
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/ic_game_recharge"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickGameRecharge"
+                        android:textSize="12sp"
+                        android:text="游戏直充"/>
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@mipmap/ic_long_mao"
+                        android:drawablePadding="10dp"
+                        android:gravity="center"
+                        android:textColor="#ff333333"
+                        android:onClick="onClickLongMao"
+                        android:textSize="12sp"
+                        android:text="龙猫电竞"/>
+                </LinearLayout>
                 <android.support.design.widget.TabLayout
                     android:id="@+id/indicator"
                     android:layout_width="match_parent"
@@ -245,8 +320,8 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/status_bar_height"
-        android:background="@drawable/shape_gradient_main">
+        android:background="@drawable/shape_gradient_main"
+        android:paddingTop="@dimen/status_bar_height">
 
         <ImageView
             android:id="@+id/img_baseactivity_title"

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

@@ -11,13 +11,13 @@
     <string name="last_page">&#060;</string>
     <string name="next_page">&#062;</string>
 
-    <string name="total_money_lable">绵羊币总余额：</string>
+    <string name="total_money_lable">绵羊币\n总余额：</string>
     <string name="total_money">%s元</string>
-    <string name="task_reward">任务奖励总额：%s元</string>
-    <string name="agent_extract">推广提成总额：%s元</string>
-    <string name="recharge_amount">充值总额：%s元</string>
+    <string name="task_reward">奖励余额</string>
+    <string name="agent_extract">推广提成</string>
+    <string name="recharge_amount">充值余额</string>
     <string name="available_amount">可提现金额：%s元</string>
-    <string name="dingxiang_amount">福利总额：%s元</string>
+    <string name="dingxiang_amount">定向消费</string>
 
     <string name="rechargeq_amount">当前绵羊币余额：%s元</string>