bug修改

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

@@ -1189,6 +1189,8 @@ public class CommonUtil {
 
                         ViewUtil.newInstance().hideProgress((Activity) context);
                         G.showToast(baseMessage.getMsg() + "");
+                        if(action1 != null)
+                            action1.call(baseMessage);
                     }
 
                     @Override

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

@@ -202,18 +202,18 @@ public class ActGameAgencyRecharge extends BaseActivity {
                         1002));
                 break;
             case "1003":
-
                 platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_xiaomi_icon,
-                        "小米游戏代充",
+                        R.mipmap.game_platform_sheep_icon,
+                        "腾讯游戏代充",
                         "充值有福利",
-                        1004));
+                        1003));
+
                 break;
             case "1004":
 
                 platformList.add(new GameAgencyRechargePlatformEntity(
-                        R.mipmap.game_platform_sheep_icon,
-                        "腾讯游戏代充",
+                        R.mipmap.game_xiaomi_icon,
+                        "小米游戏代充",
                         "充值有福利",
                         1004));
                 break;
@@ -266,6 +266,7 @@ public class ActGameAgencyRecharge extends BaseActivity {
                     public void onNext(BaseMessage baseMessage) {
                         List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
                         if(releaseEtyList != null){
+                            releaseEtyLists.clear();
                             releaseEtyLists.addAll(releaseEtyList);
                             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.GAME_AGENCY_PAYMENT, releaseEtyLists),1);
                             notifyDataSetChanged();

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

@@ -82,6 +82,9 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
             }
         }
         TextView item_title_tv = holder.itemView.findViewById(R.id.item_title_tv);
+        item_title_tv.setVisibility(View.VISIBLE);
+        item_title_tv.setTextColor(context.getResources().getColor(R.color.txt_gray_e6e4e4));
+        item_title_tv.setPadding(3,3,3,3);
         switch (recyleObj.getRecyleType()){
             case GAME_ACCOUNT_PLATFORM:
                 item_title_tv.setText("快发平台账号");

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

@@ -390,6 +390,8 @@ public class DialogPayGame {
                     }
                     adapter.notifyDataSetChanged();
                 }
+                makePriceShow(wlLists.get(position).getGridViewEntity().getValue());
+                money_et.setText("");
             }
         });
         if(ListUtil.hasIndex(wlLists, select)) {
@@ -446,10 +448,12 @@ public class DialogPayGame {
      * 计算金额显示
      */
     private void makePriceShow(String price){
-        if(ListUtil.isEmpty(list))
+        if(ListUtil.isEmpty(list) || gameVoucherAndRatio == null || TextUtils.isEmpty(price))
             return;
-        String p = "绵羊币 (可用"+ 0 +") 指非定向货币+定向货币";
+        double showPrice = gameVoucherAndRatio.getGift_ratio() * Integer.valueOf(price) /100;
+        String p = "绵羊币 (可用"+ (showPrice > gameVoucherAndRatio.getVoucher() ? gameVoucherAndRatio.getVoucher(): showPrice) +") 指非定向货币+定向货币";
         TextView textView = pay_listview.getChildAt(0).findViewById(R.id.pay_game_dialog_item_tv);
         textView.setText(p);
+        adpPayGameDialog.notifyDataSetChanged();
     }
 }