积分界面修改

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

@@ -3,14 +3,12 @@ package com.sheep.gamegroup.view.fragment;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Paint;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,8 +16,10 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.appstore.utils.adapter.recyclerview.RecyclerViewAdapter;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
@@ -42,8 +42,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import com.alibaba.fastjson.JSONObject;
-
 import java.util.List;
 import java.util.Locale;
 
@@ -57,30 +55,30 @@ import rx.schedulers.Schedulers;
  */
 public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListener {
     private SmartRefreshLayout refresh;
-    private View mSpace1;
     /**
-     * 7880
+     * 我的积分
      */
-    private TextView mExchangeCmccNum;
+    private TextView exchange_cmcc_my_core;
     /**
      * 查询积分
      */
-    private TextView mExchangeCmccLook;
-    private View mSpace2;
+    private TextView exchange_cmcc_look;
+    /**
+     * 积分数
+     */
+    private TextView exchange_cmcc_num;
     /**
      * 积分兑换的商品列表
      */
     private RecyclerView exchange_cmcc_list;
-    private View mSpace3;
     /**
-     * 兑换
+     * 兑换说明详情
      */
-    private TextView mExchangeCmccCommit;
-    private View mSpace4;
+    private TextView exchange_cmcc_info;
     /**
-     * 兑换说明?
+     * 兑换说明
      */
-    private TextView mExchangeCmccTip;
+    private TextView exchange_cmcc_tip;
 
     @Override
     public boolean userButterKnife() {
@@ -93,6 +91,7 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
     }
 
     private Activity activity;
+
     @Override
     public void onViewCreated() {
         activity = getActivity();
@@ -102,62 +101,55 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
 
     private void initData() {
         SheepApp.getInstance().getNetComponent().getApiService().getCMCCGoods()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                List<CMCCExchange> newList = baseMessage.getDataList(CMCCExchange.class);
-                                list.clear();
-                                ListUtil.addAllItem(list, newList);
-                                exchange_cmcc_list.getAdapter().notifyDataSetChanged();
-                                refresh.finishRefresh();
-                            }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        List<CMCCExchange> newList = baseMessage.getDataList(CMCCExchange.class);
+                        list.clear();
+                        ListUtil.addAllItem(list, newList);
+                        exchange_cmcc_list.getAdapter().notifyDataSetChanged();
+                        refresh.finishRefresh();
+                    }
 
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                G.showToast(baseMessage);
-                                refresh.finishRefresh();
-                            }
-                        });
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                        refresh.finishRefresh();
+                    }
+                });
     }
+
     private List<CMCCExchange> list = ListUtil.emptyList();
-    private int curPosition;
+
     private void initListener() {
-        setLayoutParamsHeight(mSpace1, 140 / 375.0F);
-        setLayoutParamsHeight(mSpace2, 29 / 375.0F);
-//        setLayoutParamsHeight(exchange_cmcc_list, 290 / 375.0F);
-        setLayoutParamsHeight(mSpace3, 32 / 375.0F);
-        setLayoutParams(mExchangeCmccCommit, 267 / 375.0F, 55 / 375.0F);
-        setLayoutParamsHeight(mSpace4, 10 / 375.0F);
-        mExchangeCmccLook.setOnClickListener(this);
-        mExchangeCmccCommit.setOnClickListener(this);
-        mExchangeCmccTip.setOnClickListener(this);
-        mExchangeCmccTip.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线
+        setLayoutParamsTop(exchange_cmcc_my_core, 160 / 375.0F);
+        setLayoutParamsTop(exchange_cmcc_look, 170 / 375.0F);
+        setLayoutParamsTop(exchange_cmcc_num, 180 / 375.0F);
+        exchange_cmcc_look.setOnClickListener(this);
         GridLayoutManager layoutManager = new GridLayoutManager(activity, 2);
         exchange_cmcc_list.setLayoutManager(layoutManager);
         exchange_cmcc_list.setNestedScrollingEnabled(false);
         exchange_cmcc_list.setAdapter(new RecyclerViewAdapter<CMCCExchange>(activity, R.layout.item_exchange_cmcc, list) {
             @Override
             public void convert(ViewHolder viewHolder, CMCCExchange item, final int position) {
-                ImageView item_exchange_cmcc_iv = viewHolder.itemView.findViewById(R.id.item_exchange_cmcc_iv);
                 TextView item_exchange_cmcc_score = viewHolder.itemView.findViewById(R.id.item_exchange_cmcc_score);
                 TextView item_exchange_cmcc_amout = viewHolder.itemView.findViewById(R.id.item_exchange_cmcc_amout);
-                if(item == null){
+                TextView item_exchange_cmcc_commit = viewHolder.itemView.findViewById(R.id.item_exchange_cmcc_commit);
+                if (item == null) {
                     ViewUtil.setDefaultText(item_exchange_cmcc_score);
                     ViewUtil.setDefaultText(item_exchange_cmcc_amout);
                 } else {
                     ViewUtil.setText(item_exchange_cmcc_score, String.format(Locale.CHINA, "%d积分兑换", item.getScore()));
                     ViewUtil.setText(item_exchange_cmcc_score, String.format(Locale.CHINA, "%s绵羊币", NumberFormatUtils.retainMost2(item.getAmount())));
-                    item_exchange_cmcc_iv.setImageResource(position == curPosition ? R.drawable.bg_exchnage_item_choose : R.drawable.bg_exchnage_item );
+                    item_exchange_cmcc_commit.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            G.showToast(R.string.coming_soon);
+                        }
+                    });
                 }
-                viewHolder.itemView.setOnClickListener(new View.OnClickListener(){
-                    @Override
-                    public void onClick(View view) {
-                        curPosition = position;
-                        notifyDataSetChanged();
-                    }
-                });
             }
         });
         refresh.setOnRefreshListener(new OnRefreshListener() {
@@ -170,29 +162,23 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
         initData();
     }
 
-    private void setLayoutParams(View view, float wRatio, float hRatio) {
-        ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
-        layoutParams.width = (int) (G.WIDTH * wRatio);
-        layoutParams.height = (int) (G.WIDTH * hRatio);
-        view.setLayoutParams(layoutParams);
-    }
-    private void setLayoutParamsHeight(View view, float ratio) {
-        ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
-        layoutParams.height = (int) (G.WIDTH * ratio);
-        view.setLayoutParams(layoutParams);
+    private void setLayoutParamsTop(View view, float ratio) {
+        ViewGroup.LayoutParams viewLayoutParams = view.getLayoutParams();
+        if (viewLayoutParams instanceof RelativeLayout.LayoutParams) {
+            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) viewLayoutParams;
+            layoutParams.topMargin = (int) (G.WIDTH * ratio);
+            view.setLayoutParams(layoutParams);
+        }
     }
 
     public void initView(View view) {
         refresh = view.findViewById(R.id.refresh);
-        mSpace1 = (View) view.findViewById(R.id.space_1);
-        mExchangeCmccNum = (TextView) view.findViewById(R.id.exchange_cmcc_num);
-        mExchangeCmccLook = (TextView) view.findViewById(R.id.exchange_cmcc_look);
-        mSpace2 = (View) view.findViewById(R.id.space_2);
+        exchange_cmcc_my_core = (TextView) view.findViewById(R.id.exchange_cmcc_my_core);
+        exchange_cmcc_look = (TextView) view.findViewById(R.id.exchange_cmcc_look);
+        exchange_cmcc_num = (TextView) view.findViewById(R.id.exchange_cmcc_num);
         exchange_cmcc_list = view.findViewById(R.id.exchange_cmcc_list);
-        mSpace3 = (View) view.findViewById(R.id.space_3);
-        mExchangeCmccCommit = (TextView) view.findViewById(R.id.exchange_cmcc_commit);
-        mSpace4 = (View) view.findViewById(R.id.space_4);
-        mExchangeCmccTip = (TextView) view.findViewById(R.id.exchange_cmcc_tip);
+        exchange_cmcc_info = (TextView) view.findViewById(R.id.exchange_cmcc_info);
+        exchange_cmcc_tip = (TextView) view.findViewById(R.id.exchange_cmcc_tip);
     }
 
     @Override
@@ -204,7 +190,7 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
                 showCMCCLookDialog(activity, new DialogConfig().setParentLayoutId(R.layout.dialog_parent_cmcc).setLayoutId(R.layout.x_msg_dialog_cmcc_look)
                         .setTitle("查询积分"));
                 break;
-            case R.id.exchange_cmcc_commit:
+            case R.id.exchange_cmcc_info:
                 ViewUtil.showMsgDialog(activity, new DialogConfig().setParentLayoutId(R.layout.dialog_parent_cmcc).setLayoutId(R.layout.x_msg_dialog_cmcc)
                         .setTitle("确认兑换").setMsg("\n确认是进行兑换吗\n").setBtnLeftText("取消").setBtnRightText("兑换")
                         .setBtnRightOnClickListener(new View.OnClickListener() {
@@ -214,14 +200,11 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
                             }
                         }));
                 break;
-            case R.id.exchange_cmcc_tip:
-                ViewUtil.showMsgDialog(activity, new DialogConfig().setParentLayoutId(R.layout.dialog_parent_cmcc).setLayoutId(R.layout.x_msg_dialog_cmcc)
-                        .setTitle("兑换说明").setMsg(R.string.exchange_cmcc_tip).setMsgGravity(Gravity.START));
-                break;
         }
     }
 
     private SelfCountDownTimer selfCountDownTimer;
+
     public AlertDialog showCMCCLookDialog(Context context, final DialogConfig dialogConfig) {
         final Context mContext = context == null ? ActivityManager.getInstance().currentActivity() : context;
         String title = dialogConfig.getTitle();
@@ -244,7 +227,7 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
         final EditText dialog_cmcc_look_code = (EditText) view.findViewById(R.id.dialog_cmcc_look_code);
         final TextView dialog_cmcc_look_code_send = (TextView) view.findViewById(R.id.dialog_cmcc_look_code_send);
         TextView dialog_cmcc_look_commit = (TextView) view.findViewById(R.id.dialog_cmcc_look_commit);
-        if(selfCountDownTimer == null) {
+        if (selfCountDownTimer == null) {
             selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000, SelfCountDownTimer.FULL_SECOND) {
                 @Override
                 public void onTimerRest() {
@@ -265,7 +248,7 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
             };
         }
         String mobile = DataUtil.getInstance().getUserMobile();
-        if(StringUtils.isMobile(mobile)) {
+        if (StringUtils.isMobile(mobile)) {
             dialog_cmcc_look_phone.setEnabled(false);
             dialog_cmcc_look_phone.setText(mobile);
         }
@@ -323,56 +306,59 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
         }
         return dialog;
     }
+
     private String phone;
+
     //查询积分前发送手机验证码
     private void sendSms(String phone, final View send) {
         selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
-        if(StringUtils.isMobile(phone)){
+        if (StringUtils.isMobile(phone)) {
             send.setEnabled(false);
             this.phone = phone;
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("mobile", phone);
             SheepApp.getInstance().getNetComponent().getApiService().smsCMCC(jsonObject)
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                                @Override
-                                public void onNext(BaseMessage baseMessage) {
-                                    selfCountDownTimer.start();
-                                    G.showToast("发送验证码成功");
-                                }
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+                            selfCountDownTimer.start();
+                            G.showToast("发送验证码成功");
+                        }
 
-                                @Override
-                                public void onError(BaseMessage baseMessage) {
-                                    send.setEnabled(true);
-                                    G.showToast(baseMessage);
-                                }
-                            });
+                        @Override
+                        public void onError(BaseMessage baseMessage) {
+                            send.setEnabled(true);
+                            G.showToast(baseMessage);
+                        }
+                    });
         } else {
             G.showToast("请填写正确的手机号!");
         }
     }
+
     //查询积分
     private void lookScore(String phone, String code) {
-        if(TextUtils.isEmpty(code)){
+        if (TextUtils.isEmpty(code)) {
             G.showToast("验证码不能为空!");
         } else {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("mobile", this.phone);
             jsonObject.put("code", code);
             SheepApp.getInstance().getNetComponent().getApiService().getCMCCScore(jsonObject)
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                                @Override
-                                public void onNext(BaseMessage baseMessage) {
-                                }
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+                        }
 
-                                @Override
-                                public void onError(BaseMessage baseMessage) {
-                                    G.showToast(baseMessage);
-                                }
-                            });
+                        @Override
+                        public void onError(BaseMessage baseMessage) {
+                            G.showToast(baseMessage);
+                        }
+                    });
         }
     }
 }

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_focused="true" android:drawable="@mipmap/btn_item_exchange_commit_click" />
+  <item android:state_checked="true" android:drawable="@mipmap/btn_item_exchange_commit_click"/>
+  <item android:state_selected="true" android:drawable="@mipmap/btn_item_exchange_commit_click"/>
+  <item android:state_pressed="true" android:drawable="@mipmap/btn_item_exchange_commit_click"/>
+  <item android:drawable="@mipmap/btn_item_exchange_commit"/>
+</selector>

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

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

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

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

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

@@ -15,33 +15,29 @@
         android:scrollbars="none"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="#fffcd46c">
 
-            <ImageView
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:adjustViewBounds="true"
-                android:scaleType="fitXY"
-                android:src="@drawable/bg_cmcc_exchange" />
+                android:layout_height="wrap_content">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <View
-                    android:id="@+id/space_1"
+                <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp" />
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/bg_cmcc_exchange" />
 
                 <TextView
+                    android:id="@+id/exchange_cmcc_my_core"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="160dp"
                     android:text="我的积分"
                     android:textColor="@color/white"
                     android:textSize="12sp" />
@@ -50,63 +46,55 @@
                     android:id="@+id/exchange_cmcc_num"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="未查询"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="170dp"
+                    android:text="7880"
                     android:textColor="@color/white"
                     android:textSize="24sp" />
 
                 <TextView
                     android:id="@+id/exchange_cmcc_look"
                     android:layout_width="wrap_content"
-                    android:layout_height="16dp"
-                    android:background="@drawable/shape_rectangle_red_8"
-                    android:paddingStart="9dp"
-                    android:paddingEnd="9dp"
+                    android:layout_height="30dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="175dp"
+                    android:background="@drawable/shape_white_solid_rectangle"
+                    android:gravity="center"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="12dp"
                     android:text="查询积分"
-                    android:textColor="#ffffffff"
-                    android:textSize="11sp" />
-
-                <View
-                    android:id="@+id/space_2"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp" />
+                    android:textColor="#E7141A"
+                    android:textSize="13sp" />
+            </RelativeLayout>
 
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/exchange_cmcc_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
-                    android:minHeight="50dp" />
-
-                <View
-                    android:id="@+id/space_3"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp" />
-
-                <TextView
-                    android:id="@+id/exchange_cmcc_commit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/btn_orange_ww"
-                    android:gravity="center"
-                    android:text="兑换"
-                    android:textColor="#ffffffff"
-                    android:textSize="18sp" />
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/exchange_cmcc_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="50dp"
+                android:paddingTop="10dp" />
 
-                <View
-                    android:id="@+id/space_4"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp" />
+            <TextView
+                android:id="@+id/exchange_cmcc_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="26dp"
+                android:text="兑换说明"
+                android:textColor="#ffd38b0e"
+                android:textSize="13sp" />
 
-                <TextView
-                    android:id="@+id/exchange_cmcc_tip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="兑换说明?"
-                    android:textColor="#ffd38b0e"
-                    android:textSize="12sp" />
-            </LinearLayout>
-        </RelativeLayout>
+            <TextView
+                android:id="@+id/exchange_cmcc_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="15dp"
+                android:lineSpacingMultiplier="1.4"
+                android:text="@string/exchange_cmcc_tip"
+                android:textColor="#D78536"
+                android:textSize="12sp" />
+        </LinearLayout>
     </android.support.v4.widget.NestedScrollView>
 </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 

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

@@ -2,16 +2,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="13dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="13dp"
-    android:paddingBottom="10dp">
+    android:layout_marginTop="10dp">
 
     <ImageView
-        android:id="@+id/item_exchange_cmcc_iv"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/bg_exchnage_item_choose" />
+        android:layout_centerInParent="true"
+        android:src="@mipmap/bg_exchange_item" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -25,20 +22,28 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="316积分兑换"
-            android:textColor="#ffffffff"
+            android:textColor="#666666"
             android:textSize="13sp" />
 
         <TextView
             android:id="@+id/item_exchange_cmcc_amout"
             android:layout_width="wrap_content"
-            android:layout_height="24dp"
+
+            android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:background="@drawable/shape_white_solid_rectangle_12"
-            android:gravity="center"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
             android:text="1绵羊币"
-            android:textColor="#fffd5948"
+            android:textColor="#666666"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/item_exchange_cmcc_commit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="25dp"
+            android:background="@drawable/selector_btn_item_exchange_commit"
+            android:gravity="center"
+            android:text="兑换"
+            android:textColor="#fffff8ec"
             android:textSize="13sp" />
     </LinearLayout>