Przeglądaj źródła

withdraw status

billyyoyo 5 lat temu
rodzic
commit
2111f9aa58

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -494,8 +494,9 @@ public class Jump2View {
      * @param context
      * @param o
      */
-    public void goWithdrawalResultview(Context context, float o) {
+    public void goWithdrawalResultview(Context context, boolean s, float o) {
         Intent intent = new Intent(context, WithdrawalResultAct.class);
+        intent.putExtra(Boolean.class.getSimpleName(), s);
         intent.putExtra(Float.class.getSimpleName(), o);
         context.startActivity(intent);
     }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -742,7 +742,7 @@ public class TestUtil {
                 Jump2View.getInstance().goUnderstandSheep(activity, null);
                 break;
             case "提现成功":
-                Jump2View.getInstance().goWithdrawalResultview(activity, 1000);
+                Jump2View.getInstance().goWithdrawalResultview(activity, false, 1000);
                 break;
 
         }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/MiddleAct.java

@@ -135,7 +135,7 @@ public class MiddleAct extends Activity {
                 Jump2View.getInstance().tryGoWithdrawal(activity, (UserEntity) null);
                 break;
             case 621://提现结果页面
-                Jump2View.getInstance().goWithdrawalResultview(activity, NumberFormatUtils.parseFloat(msg.getMsg()));
+                Jump2View.getInstance().goWithdrawalResultview(activity, false, NumberFormatUtils.parseFloat(msg.getMsg()));
                 break;
             case 63://充值Q币
                 Jump2View.getInstance().goRechargeQAct(activity, "推送");

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalAct.java

@@ -210,6 +210,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         hideProgress();
         if (o instanceof BaseMessage)
             G.showToast((BaseMessage) o);
+        Jump2View.getInstance().goWithdrawalResultview(activity, true, NumberFormatUtils.parseFloat(amount));
     }
 
     //执行提现之后
@@ -218,7 +219,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         hideProgress();
         CommonUtil.getInstance().updateUserInfo(null);
         presenter.getCanWithdrawAmount(fromToken);
-        Jump2View.getInstance().goWithdrawalResultview(activity, NumberFormatUtils.parseFloat(amount));
+        Integer status = ((Integer) ((BaseMessage) o).getData());
+        Jump2View.getInstance().goWithdrawalResultview(activity, status == 2, NumberFormatUtils.parseFloat(amount));
     }
 
     @Override

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalResultAct.java

@@ -12,6 +12,7 @@ import com.sheep.gamegroup.di.modules.WithdrawalResultModule;
 import com.sheep.gamegroup.presenter.WithdrawalResultContract;
 import com.sheep.gamegroup.presenter.WithdrawalResultPresenter;
 import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -41,6 +42,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
     TextView withdrawalSuccessMoneyTv;
 
     private float amount;
+    private boolean status;
 
     @Override
     protected int getLayoutId() {
@@ -52,10 +54,12 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         GlideImageLoader.setImage(withdrawal_image_iv, "http://cdngame.kuaifazs.com/yellow_yang.png");
         activity = this;
         amount = getIntent().getFloatExtra(Float.class.getSimpleName(), 0);
+        status = getIntent().getBooleanExtra(Boolean.class.getSimpleName(), false);
         withdrawalSuccessMoneyTv.setText(String.format(Locale.CHINA, "+%.1f元", amount));
+        LogUtil.logE("----------------" + status + " : " + amount + "---------------");
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
-                .setTitle(activity, "提现审核中")
+                .setTitle(activity, status ? "提现成功" : "提现审核中")
                 .setTitleFinish(activity);
         DaggerWithdrawalResultComponent.builder()
                 .netComponent(SheepApp.getInstance().getNetComponent())

+ 3 - 3
app/src/main/res/layout/withdrawal_success_layout.xml

@@ -8,8 +8,9 @@
 
     <ImageView
         android:id="@+id/withdrawal_image_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
         android:layout_gravity="center_horizontal"/>
 
     <TextView
@@ -24,7 +25,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/got_task_benefit"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/content_padding_15"
         android:textSize="@dimen/text_size_15"