Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -6,9 +6,9 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+//  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
 //    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
-//   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
+   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 
     public static final String V1 = "/v1/";
 

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

@@ -25,6 +25,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -194,6 +195,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         hideProgress();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
 //        BaseMessage baseMessage = (BaseMessage) o;
+        SpUtils.saveWithdral(activity, amount);
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.INTENT_AMOUNT_VALUE));
         Jump2View.getInstance().goWithdrawalResultview(activity, amount);
     }

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

@@ -16,6 +16,7 @@ import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -56,7 +57,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         EventBus.getDefault().register(this);
         activity = this;
         amount = getIntent().getStringExtra("amount");
-        withdrawalSuccessMoneyTv.setText("+"+amount+"元");
+        withdrawalSuccessMoneyTv.setText("+"+ SpUtils.getWithdral(activity) +"元");
         TitleBarUtils.getInstance()
                 .setTitle(activity, "提现成功")
                 .setTitleFinish(activity);
@@ -99,6 +100,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         super.onDestroy();
         ActivityManager.getInstance().endActivity(WithdrawalAct.class);
         EventBus.getDefault().unregister(this);
+        SpUtils.saveWithdral(activity,"");
     }
 
     @Subscribe
@@ -106,7 +108,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         switch (event.getEventTypes()) {
             case INTENT_AMOUNT_VALUE:
                 amount = event.getOthers() +"";
-                withdrawalSuccessMoneyTv.setText("+"+amount+"元");
+//                withdrawalSuccessMoneyTv.setText("+"+amount+"元");
                 break;
         }
     }

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

@@ -92,7 +92,7 @@ public class TaskListItemAdp extends BaseAdapter {
                 stateStr = "正在进行中";
                 break;
             case 3:
-                stateStr = "+ ety.getRelease_task().getBonus() 元";
+                stateStr = "+"+ ety.getRelease_task().getBonus() +"元";
                 break;
             case 4:
                 stateStr = "放弃任务";

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/SpUtils.java

@@ -57,6 +57,19 @@ public class SpUtils {
     public static String getAppToken(Context context) {
         SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
         return user.getString("apptoken", "");
+
+    }
+    public static void saveWithdral(Context context, String vaule) {
+        SharedPreferences user = context.getSharedPreferences("withdral", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putString("withdral_price", vaule);
+        editor.apply();
+    }
+
+
+    public static String getWithdral(Context context) {
+        SharedPreferences user = context.getSharedPreferences("withdral", Context.MODE_PRIVATE);
+        return user.getString("withdral_price", "");
     }