withdraw with service charge

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

@@ -283,7 +283,7 @@ public class Jump2View {
             return;
         }
         if (
-                TestUtil.isDev() ||
+//                TestUtil.isDev() ||
                         TextUtils.isEmpty(DataUtil.getInstance().getUserWxOpenId())) {//这里认定没有微信id  为   没有绑定微信号
             goNoBindWx(context, ChangeWxOrTelAct.TYPE_RECHARGE);
             return;

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

@@ -56,6 +56,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     TextView weixin_name_tv;
     @BindView(R.id.withdrawal_click_bindname_tv)
     TextView withdrawal_click_bindname_tv;
+    @BindView(R.id.withdrawal_service_charge_tv)
+    TextView withdrawal_service_charge_tv;
 
     Activity activity;
     @Inject
@@ -66,9 +68,11 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     private WithdrawalAdapter adapter;
     private int select;
     private String amount;
+    private int withdrawCount;
     private float balanceAmount;//余额
 
-    private  UserEntity userEntity;
+    private UserEntity userEntity;
+
     @Override
     protected int getLayoutId() {
         return R.layout.withdrawal_layout;
@@ -80,6 +84,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         TitleBarUtils
                 .getInstance()
                 .setShowOrHide(this, true)
+                .setTitleBackgroud(this, R.color.bg_color)
                 .setTitle(activity, "提现")
                 .setTitleFinish(activity);
         DaggerWithdrawalComponent.builder()
@@ -95,15 +100,16 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 select = position;
-                for(int i=0;i<wlLists.size();i++){
-                    if(position == i){
+                for (int i = 0; i < wlLists.size(); i++) {
+                    if (position == i) {
                         wlLists.get(i).getGridViewEntity().setSelectState(true);
-                    }else {
+                    } else {
                         wlLists.get(i).getGridViewEntity().setSelectState(false);
 
                     }
                     adapter.notifyDataSetChanged();
                 }
+                showWithdrawServiceCharge();
             }
         });
         showProgress();
@@ -112,9 +118,9 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     }
 
     @Override
-    public void onNewIntent(Intent intent){
+    public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        if("FINISH".equals(intent.getStringExtra("INTENT_ACTION"))) {
+        if ("FINISH".equals(intent.getStringExtra("INTENT_ACTION"))) {
             finish();
         }
     }
@@ -136,7 +142,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
     public void mInitData() {
         userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null){
+        if (userEntity != null) {
             ViewUtil.setText(weixin_name_tv, userEntity.getWx_nickname());
         }
         setBalanceAmount();
@@ -154,7 +160,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     //执行充值
     private void doWithdrawal() {
         UMConfigUtils.Event.SHEEP_TIXIAN_COMMIT.onEvent();
-        if(ListUtil.hasIndex(wlLists, select)) {
+        if (ListUtil.hasIndex(wlLists, select)) {
             amount = wlLists.get(select).getGridViewEntity().getValue();
             if (TextUtils.isEmpty(amount)) {
                 G.showToast("请选择金额");
@@ -175,7 +181,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     @Override
     public void failData(Object o) {
         hideProgress();
-        if(o instanceof BaseMessage)
+        if (o instanceof BaseMessage)
             G.showToast((BaseMessage) o);
     }
 
@@ -191,20 +197,39 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     @Override
     public void failBalanceData(BaseMessage o) {
         hideProgress();
-        G.showToast(o.getMsg()+"");
+        G.showToast(o.getMsg() + "");
     }
 
     //服务端返回可以提现金额
     @Override
     public void updateBalanceView(BaseMessage baseMessage) {
-
         hideProgress();
-        balanceAmount = baseMessage.getData(Float.class);
+        WithdrawAmountCountEntity entity = baseMessage.getData(WithdrawAmountCountEntity.class);
+        balanceAmount = entity.amount;
+        withdrawCount = entity.count;
         setBalanceAmount();
+        showWithdrawServiceCharge();
+    }
+
+    private void showWithdrawServiceCharge() {
+        try {
+            float money = Float.parseFloat(wlLists.get(select).getGridViewEntity().getValue());
+            if (withdrawCount < 2) {
+                if (money >= 50) {
+                    withdrawal_service_charge_tv.setText("提现手续费：" + (money * 15 / 1000));
+                } else {
+                    withdrawal_service_charge_tv.setText("新人免手续费");
+                }
+            } else {
+                withdrawal_service_charge_tv.setText("提现手续费：" + (money * 15 / 1000));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     //显示可以提现金额
-    private void setBalanceAmount(){
+    private void setBalanceAmount() {
 
         String sr = "可提现金额 <font color='#ff2d4b'><big>" + NumberFormatUtils.retainMost2(balanceAmount) + "</big></font> 元";
         withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
@@ -212,34 +237,40 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
     @Override
     public void failWithdrawAmountOptionData(BaseMessage o) {
-        G.showToast(o.getMsg()+"");
+        G.showToast(o.getMsg() + "");
     }
 
     //服务端返回可提现金额选项
     @Override
     public void updateWithdrawAmountOptionView(BaseMessage o) {
-        try{
+        try {
             List<WithdrawalList> withdrawalLists = JSONArray.parseArray(JSONArray.toJSONString(o.getData()), WithdrawalList.class);
             wlLists.clear();
-            for(int i=0;i< withdrawalLists.size(); i++){
+            for (int i = 0; i < withdrawalLists.size(); i++) {
                 WithdrawalList withdrawalList = withdrawalLists.get(i);
-                if(withdrawalList.getType() != 2){
+                if (withdrawalList.getType() != 2) {
                     GridViewEntity gridViewEntity = new GridViewEntity();
-                    if(i == 0){
+                    if (i == 0) {
                         gridViewEntity.setSelectState(true);
-                    }else {
+                    } else {
                         gridViewEntity.setSelectState(false);
                     }
-                    gridViewEntity.setValue(withdrawalList.getAmount()+"");
+                    gridViewEntity.setValue(withdrawalList.getAmount() + "");
                     withdrawalList.setGridViewEntity(gridViewEntity);
 
                     wlLists.add(withdrawalList);
                 }
             }
             adapter.notifyDataSetChanged();
-        }catch (Exception e){
+            showWithdrawServiceCharge();
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    public static class WithdrawAmountCountEntity {
+        public float amount = 0f;
+        public int count = 0;
+    }
+
 }

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

@@ -68,6 +68,14 @@
                     android:visibility="visible"
                     android:background="@color/white"
                     android:listSelector="@color/transparent"/>
+                <TextView
+                    android:id="@+id/withdrawal_service_charge_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/txt_gray_929292"
+                    android:textSize="@dimen/text_size_12"
+                    android:layout_marginTop="@dimen/content_padding_20"
+                    android:visibility="visible"/>
             </LinearLayout>
             <TextView
                 android:id="@+id/withdrawal_sure"
@@ -85,6 +93,18 @@
                 android:textColor="@color/txt_gray_929292"
                 android:textSize="@dimen/text_size_1"
                 android:layout_gravity="center_horizontal"/>
+
+            <TextView
+                android:layout_marginTop="@dimen/content_padding_20"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/content_padding"
+                android:layout_marginRight="@dimen/content_padding"
+                android:lineSpacingExtra="8dp"
+                android:text="注意：\n1. 新用户提现，提现不超过50元，可免提现手续费2次\n2. 犹豫微信升级，提现将不再免费，每次提现收取1.5%微信提现手续费"
+                android:textColor="@color/txt_gray_929292"
+                android:textSize="@dimen/text_size_1"
+                android:layout_gravity="center_horizontal"/>
         </LinearLayout>
     </ScrollView>