Merge remote-tracking branch 'origin/2.8' into 2.8

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -262,6 +262,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
             case R.id.order_layout://订单管理
                 Jump2View.getInstance().goGameTaskOrderList(activity);
                 break;
+            case R.id.proxy_game_account_layout://游戏账号
+                Jump2View.getInstance().goGameAccount(activity, null);
+                break;
         }
     }
 

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

@@ -10,6 +10,25 @@ public class GamePayList implements Serializable {
     private String name;
     private String game_id;
 
+    private int gift_ratio;
+    private double voucher;
+
+    public int getGift_ratio() {
+        return gift_ratio;
+    }
+
+    public void setGift_ratio(int gift_ratio) {
+        this.gift_ratio = gift_ratio;
+    }
+
+    public double getVoucher() {
+        return voucher;
+    }
+
+    public void setVoucher(double voucher) {
+        this.voucher = voucher;
+    }
+
     public GamePayList(String name, String game_id) {
         this.name = name;
         this.game_id = game_id;

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

@@ -28,6 +28,7 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.GamePayList;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
@@ -1148,7 +1149,7 @@ public class CommonUtil {
     }
 
     /**
-     * 删除账号
+     * 修改游戏账号密码
      */
     public void modifyGameAccount(final Context context, final JSONObject jsonObject, final Action1<Integer> action1) {
         ViewUtil.newInstance().showProgress((Activity) context);
@@ -1170,4 +1171,33 @@ public class CommonUtil {
                     }
                 });
     }
+    /**
+     * 修改游戏账号密码
+     */
+    public void getVoucherAndRatio(final Context context, final String gameId, final Action1<BaseMessage> action1) {
+        ViewUtil.newInstance().showProgress((Activity) context);
+
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getVoucherAndRatio(gameId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+
+                        ViewUtil.newInstance().hideProgress((Activity) context);
+                        G.showToast(baseMessage.getMsg() + "");
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        ViewUtil.newInstance().hideProgress((Activity) context);
+
+                        if(action1 != null)
+                            action1.call(baseMessage);
+                    }
+                });
+    }
 }

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

@@ -48,6 +48,7 @@ import java.util.List;
 import java.util.Locale;
 
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
@@ -282,7 +283,7 @@ public class TestUtil {
      * @param activity
      */
     public static void test(final Activity activity) {
-        final String[] items = {"复制token","复制打点数据","游戏搜索","游戏帐号","游戏代充","尝试开启第三方应用使用情况","测试代理页面","第三方应用使用情况",
+        final String[] items = {"测试可用金额","复制token","复制打点数据","游戏搜索","游戏帐号","游戏代充","尝试开启第三方应用使用情况","测试代理页面","第三方应用使用情况",
                 "开启第三方应用使用情况","h5跳转","新手对话框","md5","空间不足提示框",
                 "显示已经安装应用列表","复制faq地址","复制代理地址","复制世界杯地址","任务游戏列表","世界杯活动","交通银行信用卡测试",
                 "浦发银行信用卡测试", "测试游戏模块","打卡成功提示","定向货币详情","进入绑定身份认证界面时的提示","提交身份认证时的提示", "检查标签",
@@ -293,6 +294,15 @@ public class TestUtil {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
+                            case "测试可用金额":
+                                CommonUtil.getInstance()
+                                        .getVoucherAndRatio(activity, 115+"", new Action1<BaseMessage>() {
+                                            @Override
+                                            public void call(BaseMessage baseMessage) {
+
+                                            }
+                                        });
+                                break;
                             case "游戏帐号":
                                 Jump2View.getInstance().goGameAccount(activity, "http://10.8.210.172:8081/#/?authorization=123123");
                                 break;

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

@@ -173,15 +173,17 @@ public class ActGameAccount extends BaseActivity {
     private void notifyDataSetChanged(GameAccountSuper gameAccountSuper){
         checkAndInitView();
         adpGameAccount.notifyDataSetChanged();
-        if(gameAccountSuper == null)
+        refresh.setRefreshing(false);
+        if(gameAccountSuper == null){
             empty_view.setVisibility(View.VISIBLE);
-        if(ListUtil.isEmpty(gameAccountSuper.getPlatform()) && ListUtil.isEmpty(gameAccountSuper.getPlatform()) && ListUtil.isEmpty(gameAccountSuper.getPlatform())){
+            return;
+        }
+        if(ListUtil.isEmpty(gameAccountSuper.getPlatform()) && ListUtil.isEmpty(gameAccountSuper.getTengxun()) && ListUtil.isEmpty(gameAccountSuper.getXiaomi())){
 
             empty_view.setVisibility(View.VISIBLE);
         }else {
             empty_view.setVisibility(View.GONE);
         }
-        refresh.setRefreshing(false);
     }
 
     @Override

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

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -95,7 +96,7 @@ public class ActGameAgencyRecharge extends BaseActivity {
                         new View.OnClickListener() {//搜索
                             @Override
                             public void onClick(View v) {
-
+                                Jump2View.getInstance().goGameSearch(activity, null);
                             }
                         });
         adpGameAgencyRecharge = new AdpGameAgencyRecharge(activity, gridviewList);
@@ -112,6 +113,7 @@ public class ActGameAgencyRecharge extends BaseActivity {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         recyclerview.setAdapter(tryMakeMoneyAdp);
+        setValue();//gridview data
     }
 
     @Override
@@ -159,8 +161,8 @@ public class ActGameAgencyRecharge extends BaseActivity {
                         ((GridViewEntity) gridviewList.get(i)).setSelectState(false);
 
                     }
-                    adpGameAgencyRecharge.notifyDataSetChanged();
                 }
+                adpGameAgencyRecharge.notifyDataSetChanged();
                 try{
                     //刷新界面
                     initData();
@@ -178,8 +180,60 @@ public class ActGameAgencyRecharge extends BaseActivity {
         for (int i = 0; i < 2; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
-        setValue();//gridview data
 
+        //平台游戏
+        platformList.clear();
+        if(TextUtils.isEmpty(task_type)){
+            task_type = "1002"+",1003"+",1004";
+        }
+        switch (task_type){
+            case "1002":
+
+                platformList.add(new GameAgencyRechargePlatformEntity(
+                        R.mipmap.game_platform_sheep_icon,
+                        "平台游戏代充",
+                        "充值有福利",
+                        1002));
+                break;
+            case "1003":
+
+                platformList.add(new GameAgencyRechargePlatformEntity(
+                        R.mipmap.game_xiaomi_icon,
+                        "小米游戏代充",
+                        "充值有福利",
+                        1004));
+                break;
+            case "1004":
+
+                platformList.add(new GameAgencyRechargePlatformEntity(
+                        R.mipmap.game_platform_sheep_icon,
+                        "腾讯游戏代充",
+                        "充值有福利",
+                        1004));
+                break;
+            case "1002"+",1003"+",1004":
+            default:
+                platformList.add(new GameAgencyRechargePlatformEntity(
+                        R.mipmap.game_platform_sheep_icon,
+                        "平台游戏代充",
+                        "充值有福利",
+                        1002));
+                platformList.add(new GameAgencyRechargePlatformEntity(
+                        R.mipmap.game_xiaomi_icon,
+                        "小米游戏代充",
+                        "充值有福利",
+                        1004));
+                platformList.add(new GameAgencyRechargePlatformEntity(
+                        R.mipmap.game_platform_sheep_icon,
+                        "腾讯游戏代充",
+                        "充值有福利",
+                        1004));
+                break;
+
+        }
+
+        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.GAME_AGENCY_PAYMENT_PLATFORM, platformList),0);
+        notifyDataSetChanged();
         if(gridViewEntity == null)
             return;
         SheepApp.getInstance()
@@ -228,7 +282,7 @@ public class ActGameAgencyRecharge extends BaseActivity {
      */
     private void changeGridview(){
 
-        int itemWidth = AppUtil.dp2px(activity, (G.WIDTH >G.HEIGHT?G.HEIGHT:G.WIDTH) / 4 -30);
+        int itemWidth = (G.WIDTH >G.HEIGHT?G.HEIGHT:G.WIDTH) / 4 -30;
         int itemPaddingh = AppUtil.dp2px(activity, 1);
 
         int size = 4;
@@ -254,59 +308,6 @@ public class ActGameAgencyRecharge extends BaseActivity {
         gridviewList.add(new GridViewEntity(false, "腾讯游戏", 1003+""));
         gridViewEntity = (GridViewEntity) gridviewList.get(0);
 
-        //平台游戏
-        platformList.clear();
-        if(TextUtils.isEmpty(task_type)){
-            task_type = "1002"+",1003"+",1004";
-        }
-        switch (task_type){
-            case "1002":
-
-                platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_platform_sheep_icon,
-                        "平台游戏代充",
-                        "充值有福利",
-                        1002));
-                break;
-            case "1003":
-
-                platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_xiaomi_icon,
-                        "小米游戏代充",
-                        "充值有福利",
-                        1004));
-                break;
-            case "1004":
-
-                platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_platform_sheep_icon,
-                        "腾讯游戏代充",
-                        "充值有福利",
-                        1004));
-                break;
-            case "1002"+",1003"+",1004":
-            default:
-                platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_platform_sheep_icon,
-                        "平台游戏代充",
-                        "充值有福利",
-                        1002));
-                platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_xiaomi_icon,
-                        "小米游戏代充",
-                        "充值有福利",
-                        1004));
-                platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_platform_sheep_icon,
-                        "腾讯游戏代充",
-                        "充值有福利",
-                        1004));
-                break;
-
-        }
-
-        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.GAME_AGENCY_PAYMENT_PLATFORM, platformList),0);
-        notifyDataSetChanged();
 
     }
 

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

@@ -299,7 +299,6 @@ public class DialogAddAccount {
             G.showToast("请选择游戏平台!");
             return;
         }
-        ViewUtil.newInstance().showProgress(activity);
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()
@@ -310,13 +309,11 @@ public class DialogAddAccount {
                     @Override
                     public void onError(BaseMessage baseMessage) {
 
-                        ViewUtil.newInstance().hideProgress(activity);
                         G.showToast(baseMessage.getMsg() + "");
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        ViewUtil.newInstance().hideProgress(activity);
                         List<GameAccountEntity> gameAccountEntitys = baseMessage.getDatas(GameAccountEntity.class);
                         if (!ListUtil.isEmpty(gameAccountEntitys)) {
                             gameAccountListEntity.clear();
@@ -346,7 +343,7 @@ public class DialogAddAccount {
                             @Override
                             public boolean convert(int position, View convertView, ViewGroup parent, GameAccountEntity item) {
                                 final TextView name_tv = ViewFindUtils.find(convertView, R.id.name_tv);
-                                name_tv.setText(item + "");
+                                name_tv.setText(item.getTask_name() + "");
                                 return true;
                             }
                         })
@@ -354,7 +351,7 @@ public class DialogAddAccount {
                 .showPop();
     }
     /**
-     * 游戏列表显示
+     * 账号列表显示
      */
     private void showListAccount(){
         SelfPopupWindow.newInstance()
@@ -372,7 +369,7 @@ public class DialogAddAccount {
                             @Override
                             public boolean convert(int position, View convertView, ViewGroup parent, Object item) {
                                 final TextView name_tv = ViewFindUtils.find(convertView, R.id.name_tv);
-                                name_tv.setText(item + "");
+                                name_tv.setText(((GameAccountEntity)item).getTask_name() + "");
                                 return true;
                             }
                         })
@@ -403,7 +400,7 @@ public class DialogAddAccount {
                             @Override
                             public boolean convert(int position, View convertView, ViewGroup parent, Object item) {
                                 final TextView name_tv = ViewFindUtils.find(convertView, R.id.name_tv);
-                                name_tv.setText(item + "");
+                                name_tv.setText(((GridViewEntity)item).getName() + "");
                                 return true;
                             }
                         })

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

@@ -13,10 +13,14 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
+import org.greenrobot.eventbus.EventBus;
+
 import rx.functions.Action1;
 
 
@@ -78,7 +82,7 @@ public class DialogModifyAccount {
                 switch (sureTv.getText().toString()){
                     case "我知道了":
                     default:
-
+                        dialog.dismiss();
                         break;
                     case "立即修改":
                         String game_new_pwd_ets = game_new_pwd_et.getText().toString().trim() + "";
@@ -94,7 +98,12 @@ public class DialogModifyAccount {
                                 .modifyGameAccount(activity, jsonObject, new Action1<Integer>() {
                                     @Override
                                     public void call(Integer integer) {
-
+                                        if (integer == 1){
+                                            G.showToast("修改成功!");
+                                            dialog.dismiss();
+                                        }else {
+                                            G.showToast("修改成功!");
+                                        }
                                     }
                                 });
                         break;

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

@@ -233,37 +233,4 @@ public class DialogPayAccount {
                 .showPop();
     }
 
-    /**
-     * 获取可用金额和比率
-     */
-    private void getVoucherAndRatio(){
-
-        ViewUtil.newInstance().showProgress(activity);
-        SheepApp.getInstance()
-                .getNetComponent()
-                .getApiService()
-                .getVoucherAndRatio(gameId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-
-                        ViewUtil.newInstance().hideProgress(activity);
-                        G.showToast(baseMessage.getMsg() + "");
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        ViewUtil.newInstance().hideProgress(activity);
-                        List<GamePayList> taskReleaseEtyList = baseMessage.getDatas(GamePayList.class);
-                        if (!ListUtil.isEmpty(taskReleaseEtyList)) {
-                            gamePayLists.clear();
-                            gamePayLists.addAll(taskReleaseEtyList);
-                            showListAccount(game_et);
-                        }
-                    }
-                });
-    }
-
 }

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

@@ -3,7 +3,9 @@ package com.sheep.gamegroup.view.dialog;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
@@ -14,6 +16,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.GamePayList;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.model.entity.PayEntity;
 import com.sheep.gamegroup.model.entity.RechargeEntity;
@@ -38,6 +41,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -47,7 +51,6 @@ import rx.schedulers.Schedulers;
 public class DialogPayGame {
     private Activity activity;
     private String game_account_etStr;
-    private String game_pay_etStr;
     private int gao;
     private int maxShowCount;
     private RefreshLayout swipe_container;
@@ -75,10 +78,11 @@ public class DialogPayGame {
     private int select;
     private String amount;
 
+    private GamePayList gameVoucherAndRatio;
+
     public DialogPayGame(Activity activity, PayEntity payEntity) {
         this.activity = activity;
         this.game_account_etStr = game_account_etStr;
-        this.game_pay_etStr = game_pay_etStr;
         this.gameId = gameId;
         this.payEntity = payEntity;
         gao = SheepApp.getInstance().getResources().getDimensionPixelSize(R.dimen.content_padding_10)*5;
@@ -103,7 +107,7 @@ public class DialogPayGame {
         TextView sureTv = view.findViewById(R.id.pay_sure_tv);
         //你需要支付1110元
         TextView pay_game_show_price_tv = view.findViewById(R.id.pay_game_show_price_tv);
-        pay_game_show_price_tv.setText("你需要支付"+ game_pay_etStr +"元");
+        pay_game_show_price_tv.setText("你需要支付"+ 0 +"元");
         money_et = view.findViewById(R.id.money_et);
         pay_listview = view.findViewById(R.id.pay_listview);
         adpPayGameDialog = new AdpPayGameDialog(list ,activity);
@@ -143,7 +147,9 @@ public class DialogPayGame {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        initData();
+        gameId = payEntity.getGame_id();
+//        initData();
+        getVoucherAndRatio();
     }
 
     public void initData(){
@@ -151,7 +157,7 @@ public class DialogPayGame {
         ViewUtil.newInstance()
                 .showProgress(activity, false);
         gameId = payEntity.getGame_id();
-        SheepApp.getInstance().getNetComponent().getApiService().can_user_sheep_amount(Integer.valueOf(game_pay_etStr), gameId)
+        SheepApp.getInstance().getNetComponent().getApiService().can_user_sheep_amount(Integer.valueOf(0), gameId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
@@ -179,6 +185,22 @@ public class DialogPayGame {
                 });
 
     }
+
+    /**\
+     * if(Double.valueOf(balance) > 0){
+     ;
+     if(Float.valueOf(game_pay_etStr) > Float.valueOf(balance)){
+     balanceStr = balance;
+     }else {
+     balanceStr = game_pay_etStr;
+     }
+     RechargeEntity rechargeEntity = new RechargeEntity();
+     rechargeEntity.setSelect(true);
+     rechargeEntity.setId(3);
+     rechargeEntity.setName("绵羊币 (可用"+ 0 +") 指非定向货币+定向货币");
+     list.add(rechargeEntity);
+     }
+     */
     private void getNetComponent(){
         ViewUtil.newInstance()
                 .showProgress(activity, false);
@@ -194,20 +216,11 @@ public class DialogPayGame {
                         List<RechargeEntity> lists = baseMessage.getDatas(RechargeEntity.class);
                         list.clear();
                         try{
-                            String balanceStr;
-                            if(Double.valueOf(balance) > 0){
-                                ;
-                                if(Float.valueOf(game_pay_etStr) > Float.valueOf(balance)){
-                                    balanceStr = balance;
-                                }else {
-                                    balanceStr = game_pay_etStr;
-                                }
-                                RechargeEntity rechargeEntity = new RechargeEntity();
-                                rechargeEntity.setSelect(true);
-                                rechargeEntity.setId(3);
-                                rechargeEntity.setName("绵羊币 (可用"+ balanceStr +") 指非定向货币+定向货币");
-                                list.add(rechargeEntity);
-                            }
+                            RechargeEntity rechargeEntity = new RechargeEntity();
+                            rechargeEntity.setSelect(true);
+                            rechargeEntity.setId(3);
+                            rechargeEntity.setName("绵羊币 (可用"+ 0 +") 指非定向货币+定向货币");
+                            list.add(rechargeEntity);
                         }catch (Exception e){
                             e.printStackTrace();
                         }
@@ -292,7 +305,7 @@ public class DialogPayGame {
                 .showProgress(activity, false);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("account", payEntity.getAccount());
-        jsonObject.put("amount", Float.valueOf(game_pay_etStr));
+        jsonObject.put("amount", Float.valueOf(0));//todo
         jsonObject.put("game_id", payEntity.getGame_id()+"");
         jsonObject.put("pay_type", pay_type);
         jsonObject.put("use_voucher", use_voucher);
@@ -391,5 +404,51 @@ public class DialogPayGame {
         if(!TextUtils.isEmpty(money_et.getText()) && !TextUtils.isEmpty(money_et.getText().toString().trim())){
             amount = money_et.getText().toString().trim();
         }
+
+        money_et.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (!TextUtils.isEmpty(s) && s.length() > 0) {
+                    makePriceShow(s.toString());
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    }
+
+
+    /**
+     * 获取可用金额和比率
+     */
+    private void getVoucherAndRatio(){
+
+        CommonUtil.getInstance()
+                .getVoucherAndRatio(activity, gameId, new Action1<BaseMessage>() {
+                    @Override
+                    public void call(BaseMessage baseMessage) {
+                        if(baseMessage != null){
+                            gameVoucherAndRatio = baseMessage.getData(GamePayList.class);
+                        }
+                        getNetComponent();
+                    }
+                });
+    }
+
+    /**
+     * 计算金额显示
+     */
+    private void makePriceShow(String price){
+        String p = "绵羊币 (可用"+ 0 +") 指非定向货币+定向货币";
+        TextView textView = pay_listview.getChildAt(0).findViewById(R.id.pay_game_dialog_item_tv);
+        textView.setText(p);
     }
 }

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

@@ -206,4 +206,47 @@
             android:layout_centerVertical="true"/>
 
     </RelativeLayout>
+
+    <View
+        android:id="@+id/proxy_game_account_layout_line"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
+        android:id="@+id/proxy_game_account_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:padding="15dp"
+        >
+        <ImageView
+            android:id="@+id/proxy_game_account_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_game_account"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="游戏账号"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:layout_alignBottom="@+id/proxy_game_account_item_icon_iv"
+            android:layout_toEndOf="@+id/proxy_game_account_item_icon_iv" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
 </LinearLayout>

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

@@ -4,7 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:visibility="visible"
-    android:paddingBottom="@dimen/content_padding_16">
+    android:paddingBottom="@dimen/content_padding_16"
+    android:paddingTop="@dimen/content_padding_12">
 
     <LinearLayout
         android:id="@+id/title_item_layout"
@@ -52,8 +53,7 @@
         android:id="@+id/item_show_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/content_padding_12">
+        android:orientation="vertical">
         <LinearLayout
             android:id="@+id/item_detail_show_layout"
             android:layout_width="match_parent"